dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix off-by-one error in block mangling. 

This restores the ABI prior to r214699.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@312700 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Richard Smith 2017-09-07 05:41:24 +00:00
parent 775487c265
commit 0e5289226e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/ItaniumMangle.cpp
View File

@ -1669,6 +1669,10 @@ void CXXNameMangler::mangleUnqualifiedBlock(const BlockDecl *Block) {
// the symbol in question isn't externally visible. // the symbol in question isn't externally visible.
if (!Number) if (!Number)
Number = Context.getBlockId(Block, false); Number = Context.getBlockId(Block, false);
else {
// Stored mangling numbers are 1-based.
--Number;
}
Out << "Ub"; Out << "Ub";
if (Number > 0) if (Number > 0)
Out << Number - 1; Out << Number - 1;

10
test/CodeGenObjCXX/mangle-blocks.mm
View File

@ -1,8 +1,9 @@
// RUN: %clang_cc1 -emit-llvm -fblocks -o - -triple x86_64-apple-darwin10 -fobjc-runtime=macosx-fragile-10.5 %s | FileCheck %s // RUN: %clang_cc1 -emit-llvm -fblocks -o - -triple x86_64-apple-darwin10 -fobjc-runtime=macosx-fragile-10.5 %s | FileCheck %s
// CHECK: @_ZZZN26externally_visible_statics1S3fooEiEd_Ub0_E1k = linkonce_odr global i32 0 // CHECK-DAG: @_ZZZN26externally_visible_statics1S3fooEiEd_Ub_E1k = linkonce_odr global i32 0
// CHECK: @_ZZZN26externally_visible_statics10inlinefuncEvEUb0_E1i = linkonce_odr global i32 0 // CHECK-DAG: @_ZZZN26externally_visible_statics10inlinefuncEvEUb_E1i = linkonce_odr global i32 0
// CHECK: @_ZZ26externally_visible_statics1S1xMUb0_E1j = linkonce_odr global i32 0 // CHECK-DAG: @_ZZZN26externally_visible_statics10inlinefuncEvEUb0_E1j = linkonce_odr global i32 0
// CHECK-DAG: @_ZZ26externally_visible_statics1S1xMUb_E1j = linkonce_odr global i32 0
int f(); int f();
@ -68,6 +69,9 @@ namespace externally_visible_statics {
^{ ^{
static int i = f(); static int i = f();
}(); }();
^{
static int j = f();
}();
} }
struct S { struct S {
int x = ^{ int x = ^{