From dd4f052db6ca4ee02f4fc564488a9a6ca5434003 Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames@gmail.com>
Date: Mon, 9 Feb 2015 07:47:32 +0000
Subject: [PATCH] [Orc] Try another workaround for the GCC 4.7.2 ICE introduced
 in r228557. NFC.

llvm-svn: 228568
---
 llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h  | 10 +++++-----
 llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h b/llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
index 556856d..9761cd7 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
@@ -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();
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h b/llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
index f9cb285..127dfc91 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
@@ -224,8 +224,8 @@ public:
         [=](){
           if (H->NeedsFinalization()) {
             H->Finalize();
-            if (NotifyFinalized)
-              NotifyFinalized(H);
+            if (this->NotifyFinalized)
+              this->NotifyFinalized(H);
           }
           return Addr;
         });
-- 
2.7.4