[Orc] Try another workaround for the GCC 4.7.2 ICE introduced in r228557. NFC.
authorLang Hames <lhames@gmail.com>
Mon, 9 Feb 2015 07:47:32 +0000 (07:47 +0000)
committerLang Hames <lhames@gmail.com>
Mon, 9 Feb 2015 07:47:32 +0000 (07:47 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@228568 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h

index 556856d..9761cd7 100644 (file)
@@ -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();
index f9cb285..127dfc9 100644 (file)
@@ -224,8 +224,8 @@ public:
         [=](){
           if (H->NeedsFinalization()) {
             H->Finalize();
-            if (NotifyFinalized)
-              NotifyFinalized(H);
+            if (this->NotifyFinalized)
+              this->NotifyFinalized(H);
           }
           return Addr;
         });