[llvm] r228568 - [Orc] Try another workaround for the GCC 4.7.2 ICE introduced in r228557. NFC.

[Lang Hames]

Author: lhames
Date: Mon Feb  9 01:47:32 2015
New Revision: 228568

URL: http://llvm.org/viewvc/llvm-project?rev=228568&view=rev
Log:
[Orc] Try another workaround for the GCC 4.7.2 ICE introduced in r228557. NFC.

Modified:
    llvm/trunk/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
    llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h

Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h?rev=228568&r1=228567&r2=228568&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h Mon Feb  9 01:47:32 2015
@@ -45,12 +45,12 @@ private:
         if (provides(Name, ExportedSymbolsOnly))
           return JITSymbol(
               [=,&B]() -> TargetAddress {
-                if (EmitState == Emitting)
+                if (this->EmitState == Emitting)
                   return 0;
-                else if (EmitState != Emitted) {
-                  EmitState = Emitting;
-                  Handle = emit(B);
-                  EmitState = Emitted;
+                else if (this->EmitState != Emitted) {
+                  this->EmitState = Emitting;
+                  Handle = this->emit(B);
+                  this->EmitState = Emitted;
                 }
                 return B.findSymbolIn(Handle, Name, ExportedSymbolsOnly)
                           .getAddress();

Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h?rev=228568&r1=228567&r2=228568&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h Mon Feb  9 01:47:32 2015
@@ -224,8 +224,8 @@ public:
         [=](){
           if (H->NeedsFinalization()) {
             H->Finalize();
-            if (NotifyFinalized)
-              NotifyFinalized(H);
+            if (this->NotifyFinalized)
+              this->NotifyFinalized(H);
           }
           return Addr;
         });