commit fc05decf08feefd2ffe8cc250219aee6eab3119c
author Anna Zaks <ganna@apple.com> Thu Aug 09 02:57:02 2012 +0000
committer Anna Zaks <ganna@apple.com> Thu Aug 09 02:57:02 2012 +0000
tree f876157828a188ba3a7b4a6342093f2a145c23de
parent 431e35c279972a28be8adc31e127a207e666498d

Unbreak the build.

Declaring "const Decl *Decl" is not a good idea.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@161567 91177308-0d34-0410-b5e6-96231b3b80d8

include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h

diff --git a/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h b/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
index ab1bcf1..67bc142 100644
--- a/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
+++ b/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
@@ -68,12 +68,15 @@
   }
 };
 
-struct RuntimeDefinition {
-  const Decl *Decl;
-  const MemRegion *Reg;
-  RuntimeDefinition(): Decl(0), Reg(0) {}
-  RuntimeDefinition(const class Decl *D): Decl(D), Reg(0) {}
-  RuntimeDefinition(const class Decl *D, const MemRegion *R): Decl(D), Reg(R){}
+class RuntimeDefinition {
+  const Decl *D;
+  const MemRegion *R;
+public:
+  RuntimeDefinition(): D(0), R(0) {}
+  RuntimeDefinition(const Decl *InD): D(InD), R(0) {}
+  RuntimeDefinition(const Decl *InD, const MemRegion *InR): D(InD), R(InR) {}
+  const Decl *getDecl() { return D;}
+  const MemRegion *getReg() {return R;}
 };
 
 /// \brief Represents an abstract call to a function or method along a

lib/StaticAnalyzer/Core/CallEvent.cpp

diff --git a/lib/StaticAnalyzer/Core/CallEvent.cpp b/lib/StaticAnalyzer/Core/CallEvent.cpp
index 2d96a1e..8b96035 100644
--- a/lib/StaticAnalyzer/Core/CallEvent.cpp
+++ b/lib/StaticAnalyzer/Core/CallEvent.cpp
@@ -383,7 +383,7 @@
 
 
 RuntimeDefinition CXXInstanceCall::getRuntimeDefinition() const {
-  const Decl *D = SimpleCall::getRuntimeDefinition().Decl;
+  const Decl *D = SimpleCall::getRuntimeDefinition().getDecl();
   if (!D)
     return RuntimeDefinition();
 
@@ -513,7 +513,7 @@
 }
 
 RuntimeDefinition CXXDestructorCall::getRuntimeDefinition() const {
-  const Decl *D = AnyFunctionCall::getRuntimeDefinition().Decl;
+  const Decl *D = AnyFunctionCall::getRuntimeDefinition().getDecl();
   if (!D)
     return RuntimeDefinition();
 

lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp

diff --git a/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp b/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
index 9dd100a..d3d097c 100644
--- a/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
+++ b/lib/StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
@@ -545,10 +545,10 @@
     State = InlinedFailedState;
   } else if (getAnalysisManager().shouldInlineCall()) {
     RuntimeDefinition RD = Call->getRuntimeDefinition();
-    const Decl *D = RD.Decl;
+    const Decl *D = RD.getDecl();
     if (D) {
       // Explore with and without inlining the call.
-      const MemRegion *BifurReg = RD.Reg;
+      const MemRegion *BifurReg = RD.getReg();
       if (BifurReg &&
           getAnalysisManager().IPAMode == DynamicDispatchBifurcate) {
         BifurcateCall(BifurReg, *Call, D, Bldr, Pred);