diff options
author | Derek Schuff <dschuff@chromium.org> | 2013-02-04 10:44:25 -0800 |
---|---|---|
committer | Derek Schuff <dschuff@chromium.org> | 2013-02-04 10:44:25 -0800 |
commit | 334e37be3e88c1d125bc833531a7d3056cc606a9 (patch) | |
tree | cd83c10664d0282d2dfb3148686f3a0f14e5476e /include/llvm/CodeGen/LexicalScopes.h | |
parent | 80abe0746cec97dd07ba74db157e85f6e83487a2 (diff) | |
parent | 8bdbdf71c987b7604a178c1ebabfab3d22c0e85b (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'include/llvm/CodeGen/LexicalScopes.h')
-rw-r--r-- | include/llvm/CodeGen/LexicalScopes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/llvm/CodeGen/LexicalScopes.h b/include/llvm/CodeGen/LexicalScopes.h index 30f167d8f4..04710bc448 100644 --- a/include/llvm/CodeGen/LexicalScopes.h +++ b/include/llvm/CodeGen/LexicalScopes.h @@ -164,8 +164,10 @@ public: #endif // @LOCALMOD-BEGIN -- Hack for bug // http://code.google.com/p/nativeclient/issues/detail?id=2786 +#ifndef NDEBUG Desc.make_weak(); InlinedAtLocation.make_weak(); +#endif // @LOCALMOD-END if (Parent) |