dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed diagnostic nondeterministic order bug (pr14901). 

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175289 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Enea Zaffanella 2013-02-15 20:09:55 +00:00
parent dc2efa1c10
commit 3285c78041
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Sema/AnalysisBasedWarnings.cpp
View File

@ -41,6 +41,7 @@
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableMap.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/PostOrderIterator.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/SmallVector.h"
@ -1149,7 +1150,11 @@ struct SLocSort {
class UninitValsDiagReporter : public UninitVariablesHandler {
Sema &S;
typedef SmallVector<UninitUse, 2> UsesVec;
typedef llvm::DenseMap<const VarDecl *, std::pair<UsesVec*, bool> > UsesMap;
typedef std::pair<UsesVec*, bool> MappedType;
// Prefer using MapVector to DenseMap, so that iteration order will be
// the same as insertion order. This is needed to obtain a deterministic
// order of diagnostics when calling flushDiagnostics().
typedef llvm::MapVector<const VarDecl *, MappedType> UsesMap;
UsesMap *uses;
public:
@ -1158,11 +1163,11 @@ public:
flushDiagnostics();
}
std::pair<UsesVec*, bool> &getUses(const VarDecl *vd) {
MappedType &getUses(const VarDecl *vd) {
if (!uses)
uses = new UsesMap();
UsesMap::mapped_type &V = (*uses)[vd];
MappedType &V = (*uses)[vd];
UsesVec *&vec = V.first;
if (!vec)
vec = new UsesVec();
@ -1181,12 +1186,10 @@ public:
void flushDiagnostics() {
if (!uses)
return;
// FIXME: This iteration order, and thus the resulting diagnostic order,
// is nondeterministic.
for (UsesMap::iterator i = uses->begin(), e = uses->end(); i != e; ++i) {
const VarDecl *vd = i->first;
const UsesMap::mapped_type &V = i->second;
const MappedType &V = i->second;
UsesVec *vec = V.first;
bool hasSelfInit = V.second;

13
test/Sema/uninit-det-order.c Normal file
View File

@ -0,0 +1,13 @@
// RUN: %clang_cc1 -Wuninitialized -fsyntax-only %s 2>&1 | FileCheck %s
void pr14901(int a) {
int b, c;
a = b;
a = c;
}
// CHECK: 5:8: warning: variable 'b' is uninitialized when used here
// CHECK: 4:9: note: initialize the variable 'b' to silence this warning
// CHECK: 6:8: warning: variable 'c' is uninitialized when used here
// CHECK: 4:12: note: initialize the variable 'c' to silence this warning