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

[Lang Hames]

Author: lhames
Date: Mon Feb  9 12:16:43 2015
New Revision: 228585

URL: http://llvm.org/viewvc/llvm-project?rev=228585&view=rev
Log:
[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.

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=228585&r1=228584&r2=228585&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h Mon Feb  9 12:16:43 2015
@@ -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) {

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=228585&r1=228584&r2=228585&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h Mon Feb  9 12:16:43 2015
@@ -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)