From: Lang Hames <lhames@gmail.com>
Date: Mon, 9 Feb 2015 18:16:43 +0000 (+0000)
Subject: [Orc] Revert r228567 (GCC ICE workaround) - it doesn't seem to have helped.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=5a81520668d68a6f02f7490c4f5e7046854cc781

[Orc] Revert r228567 (GCC ICE workaround) - it doesn't seem to have helped.

As far as I can tell r228568 was the right workaround, and r228567 was
unnecessary. If reverting this causes problems on the bots I'll reinstate it.


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

diff --git a/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h b/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
index 9761cd70183..ebc28595f58 100644
--- a/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+++ b/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
@@ -44,7 +44,7 @@ private:
       case NotEmitted:
         if (provides(Name, ExportedSymbolsOnly))
           return JITSymbol(
-              [=,&B]() -> TargetAddress {
+              [this,ExportedSymbolsOnly,Name,&B]() -> TargetAddress {
                 if (this->EmitState == Emitting)
                   return 0;
                 else if (this->EmitState != Emitted) {
diff --git a/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h b/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
index 127dfc91c01..3c742ff3421 100644
--- a/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
+++ b/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
@@ -221,7 +221,7 @@ public:
                          bool ExportedSymbolsOnly) {
     if (auto Addr = H->getSymbolAddress(Name, ExportedSymbolsOnly))
       return JITSymbol(
-        [=](){
+        [this, Addr, H](){
           if (H->NeedsFinalization()) {
             H->Finalize();
             if (this->NotifyFinalized)