summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2015-02-09 07:22:56 +0000
committerLang Hames <lhames@gmail.com>2015-02-09 07:22:56 +0000
commitd78b17f48ab119483c94034b6f2d68e5313650bd (patch)
tree82d73b7928f36add6e657cb21d14ed923c9b3df3 /llvm
parent8d3cb829cea6082d7165a7b76a2ded7913634b01 (diff)
downloadbcm5719-llvm-d78b17f48ab119483c94034b6f2d68e5313650bd.tar.gz
bcm5719-llvm-d78b17f48ab119483c94034b6f2d68e5313650bd.zip
[Orc] Tweak lambda capture lists to try to avoid an ICE on gcc-4.7.2. NFC.
Apparently gcc-4.7.2 is touchy about 'this' appearing in a lambda capture list along with other captures. I've rewritten my captures to try to avoid the issue. llvm-svn: 228567
Diffstat (limited to 'llvm')
-rw-r--r--llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h2
-rw-r--r--llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h b/llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
index a56f8b6f9a2..556856d95e4 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
@@ -44,7 +44,7 @@ private:
case NotEmitted:
if (provides(Name, ExportedSymbolsOnly))
return JITSymbol(
- [this,ExportedSymbolsOnly,Name,&B]() -> TargetAddress {
+ [=,&B]() -> TargetAddress {
if (EmitState == Emitting)
return 0;
else if (EmitState != Emitted) {
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h b/llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
index ce306e67dde..f9cb285927e 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h
+++ b/llvm/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 (NotifyFinalized)
OpenPOWER on IntegriCloud