2013-09-04 12:12:25 +08:00
|
|
|
// RUN: %clang_cc1 -fblocks -fobjc-arc -fobjc-runtime-has-weak -triple i386-apple-darwin -print-ivar-layout -emit-llvm -o /dev/null %s > %t-32.layout
|
2013-01-17 08:25:06 +08:00
|
|
|
// RUN: FileCheck --input-file=%t-32.layout %s
|
2012-11-06 02:14:34 +08:00
|
|
|
// rdar://12184410
|
2013-01-17 08:25:06 +08:00
|
|
|
// rdar://12752901
|
2012-11-06 02:14:34 +08:00
|
|
|
|
|
|
|
|
void x(id y) {}
|
|
|
|
|
void y(int a) {}
|
|
|
|
|
|
|
|
|
|
extern id opaque_id();
|
|
|
|
|
|
|
|
|
|
void f() {
|
|
|
|
|
__weak id wid;
|
|
|
|
|
__block int byref_int = 0;
|
|
|
|
|
char ch = 'a';
|
|
|
|
|
char ch1 = 'b';
|
|
|
|
|
char ch2 = 'c';
|
|
|
|
|
short sh = 2;
|
|
|
|
|
const id bar = (id) opaque_id();
|
|
|
|
|
id baz = 0;
|
|
|
|
|
__strong id strong_void_sta;
|
|
|
|
|
__block id byref_bab = (id)0;
|
|
|
|
|
__block id bl_var1;
|
|
|
|
|
int i; double dob;
|
|
|
|
|
|
|
|
|
|
// The patterns here are a sequence of bytes, each saying first how
|
|
|
|
|
// many sizeof(void*) chunks to skip (high nibble) and then how many
|
|
|
|
|
// to scan (low nibble). A zero byte says that we've reached the end
|
|
|
|
|
// of the pattern.
|
|
|
|
|
//
|
|
|
|
|
// All of these patterns start with 01 3x because the block header on
|
|
|
|
|
// LP64 consists of an isa pointer (which we're supposed to scan for
|
|
|
|
|
// some reason) followed by three words (2 ints, a function pointer,
|
|
|
|
|
// and a descriptor pointer).
|
|
|
|
|
|
|
|
|
|
// Test 1
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Inline block variable layout: 0x0320, BL_STRONG:3, BL_BYREF:2, BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^b)() = ^{
|
|
|
|
|
byref_int = sh + ch+ch1+ch2 ;
|
|
|
|
|
x(bar);
|
|
|
|
|
x(baz);
|
|
|
|
|
x((id)strong_void_sta);
|
|
|
|
|
x(byref_bab);
|
|
|
|
|
};
|
|
|
|
|
b();
|
|
|
|
|
|
|
|
|
|
// Test 2
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Inline block variable layout: 0x0331, BL_STRONG:3, BL_BYREF:3, BL_WEAK:1, BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^c)() = ^{
|
|
|
|
|
byref_int = sh + ch+ch1+ch2 ;
|
|
|
|
|
x(bar);
|
|
|
|
|
x(baz);
|
|
|
|
|
x((id)strong_void_sta);
|
|
|
|
|
x(wid);
|
|
|
|
|
bl_var1 = 0;
|
|
|
|
|
x(byref_bab);
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@class NSString, NSNumber;
|
|
|
|
|
void g() {
|
|
|
|
|
NSString *foo;
|
|
|
|
|
NSNumber *bar;
|
|
|
|
|
unsigned int bletch;
|
|
|
|
|
__weak id weak_delegate;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
NSString *y;
|
|
|
|
|
NSString *z;
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Inline block variable layout: 0x0401, BL_STRONG:4, BL_WEAK:1, BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^c)() = ^{
|
|
|
|
|
int j = i + bletch;
|
|
|
|
|
x(foo);
|
|
|
|
|
x(bar);
|
|
|
|
|
x(weak_delegate);
|
|
|
|
|
x(y);
|
|
|
|
|
x(z);
|
|
|
|
|
};
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Test 5 (unions/structs and their nesting):
|
|
|
|
|
void h() {
|
|
|
|
|
struct S5 {
|
|
|
|
|
int i1;
|
|
|
|
|
__unsafe_unretained id o1;
|
|
|
|
|
struct V {
|
|
|
|
|
int i2;
|
|
|
|
|
__unsafe_unretained id o2;
|
|
|
|
|
} v1;
|
|
|
|
|
int i3;
|
|
|
|
|
union UI {
|
|
|
|
|
void * i1;
|
|
|
|
|
__unsafe_unretained id o1;
|
|
|
|
|
int i3;
|
|
|
|
|
__unsafe_unretained id o3;
|
|
|
|
|
}ui;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
union U {
|
|
|
|
|
void * i1;
|
|
|
|
|
__unsafe_unretained id o1;
|
|
|
|
|
int i3;
|
|
|
|
|
__unsafe_unretained id o3;
|
|
|
|
|
}ui;
|
|
|
|
|
|
|
|
|
|
struct S5 s2;
|
|
|
|
|
union U u2;
|
|
|
|
|
__block id block_id;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
block variable layout: BL_NON_OBJECT_WORD:1, BL_UNRETAINE:1, BL_NON_OBJECT_WORD:1,
|
|
|
|
|
BL_UNRETAINE:1, BL_NON_OBJECT_WORD:3, BL_BYREF:1, BL_OPERATOR:0
|
|
|
|
|
*/
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_BYREF:1, BL_NON_OBJECT_WORD:1, BL_UNRETAINED:1, BL_NON_OBJECT_WORD:1, BL_UNRETAINED:1, BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^c)() = ^{
|
|
|
|
|
x(s2.ui.o1);
|
|
|
|
|
x(u2.o1);
|
|
|
|
|
block_id = 0;
|
|
|
|
|
};
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Test for array of stuff.
|
|
|
|
|
void arr1() {
|
|
|
|
|
struct S {
|
|
|
|
|
__unsafe_unretained id unsafe_unretained_var[4];
|
|
|
|
|
} imported_s;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_UNRETAINED:4, BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^c)() = ^{
|
|
|
|
|
x(imported_s.unsafe_unretained_var[2]);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Test2 for array of stuff.
|
|
|
|
|
void arr2() {
|
|
|
|
|
struct S {
|
|
|
|
|
int a;
|
|
|
|
|
__unsafe_unretained id unsafe_unretained_var[4];
|
|
|
|
|
} imported_s;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_NON_OBJECT_WORD:1, BL_UNRETAINED:4, BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^c)() = ^{
|
|
|
|
|
x(imported_s.unsafe_unretained_var[2]);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Test3 for array of stuff.
|
|
|
|
|
void arr3() {
|
|
|
|
|
struct S {
|
|
|
|
|
int a;
|
|
|
|
|
__unsafe_unretained id unsafe_unretained_var[0];
|
|
|
|
|
} imported_s;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^c)() = ^{
|
|
|
|
|
int i = imported_s.a;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Test4 for array of stuff.
|
|
|
|
|
@class B;
|
|
|
|
|
void arr4() {
|
|
|
|
|
struct S {
|
|
|
|
|
struct s0 {
|
|
|
|
|
__unsafe_unretained id s_f0;
|
|
|
|
|
__unsafe_unretained id s_f1;
|
|
|
|
|
} f0;
|
|
|
|
|
|
|
|
|
|
__unsafe_unretained id f1;
|
|
|
|
|
|
|
|
|
|
struct s1 {
|
|
|
|
|
int *f0;
|
|
|
|
|
__unsafe_unretained B *f1;
|
|
|
|
|
} f4[2][2];
|
|
|
|
|
} captured_s;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_UNRETAINED:3, BL_NON_OBJECT_WORD:1, BL_UNRETAINED:1, BL_NON_OBJECT_WORD:1, BL_UNRETAINED:1, BL_NON_OBJECT_WORD:1, BL_UNRETAINED:1, BL_NON_OBJECT_WORD:1, BL_UNRETAINED:1, BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^c)() = ^{
|
|
|
|
|
id i = captured_s.f0.s_f1;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Test1 bitfield in cpatured aggregate.
|
|
|
|
|
void bf1() {
|
|
|
|
|
struct S {
|
|
|
|
|
int flag : 25;
|
|
|
|
|
int flag1: 7;
|
|
|
|
|
int flag2 :1;
|
|
|
|
|
int flag3: 7;
|
|
|
|
|
int flag4: 24;
|
|
|
|
|
} s;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
int (^c)() = ^{
|
|
|
|
|
return s.flag;
|
|
|
|
|
};
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Test2 bitfield in cpatured aggregate.
|
|
|
|
|
void bf2() {
|
|
|
|
|
struct S {
|
|
|
|
|
int flag : 1;
|
|
|
|
|
} s;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
int (^c)() = ^{
|
|
|
|
|
return s.flag;
|
|
|
|
|
};
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Test3 bitfield in cpatured aggregate.
|
|
|
|
|
void bf3() {
|
|
|
|
|
|
|
|
|
|
struct {
|
|
|
|
|
unsigned short _reserved : 16;
|
|
|
|
|
|
|
|
|
|
unsigned char _draggedNodesAreDeletable: 1;
|
|
|
|
|
unsigned char _draggedOutsideOutlineView : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_addRootPaths : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_moveDataNodes : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_removeRootDataNode : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_doubleClickDataNode : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_selectDataNode : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_textDidEndEditing : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_updateAndSaveRoots : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_askToDeleteRootNodes : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_contextMenuForSelectedNodes : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_pasteboardFilenamesForNodes : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_writeItemsToPasteboard : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_writeItemsToPasteboardXXXX : 1;
|
|
|
|
|
|
|
|
|
|
unsigned int _filler : 32;
|
|
|
|
|
} _flags;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
unsigned char (^c)() = ^{
|
|
|
|
|
return _flags._draggedNodesAreDeletable;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Test4 unnamed bitfield
|
|
|
|
|
void bf4() {
|
|
|
|
|
|
|
|
|
|
struct {
|
|
|
|
|
unsigned short _reserved : 16;
|
|
|
|
|
|
|
|
|
|
unsigned char _draggedNodesAreDeletable: 1;
|
|
|
|
|
unsigned char _draggedOutsideOutlineView : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_addRootPaths : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_moveDataNodes : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_removeRootDataNode : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_doubleClickDataNode : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_selectDataNode : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_textDidEndEditing : 1;
|
|
|
|
|
|
|
|
|
|
unsigned long long : 64;
|
|
|
|
|
|
|
|
|
|
unsigned char _adapterRespondsTo_updateAndSaveRoots : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_askToDeleteRootNodes : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_contextMenuForSelectedNodes : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_pasteboardFilenamesForNodes : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_writeItemsToPasteboard : 1;
|
|
|
|
|
unsigned char _adapterRespondsTo_writeItemsToPasteboardXXXX : 1;
|
|
|
|
|
|
|
|
|
|
unsigned int _filler : 32;
|
|
|
|
|
} _flags;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
unsigned char (^c)() = ^{
|
|
|
|
|
return _flags._draggedNodesAreDeletable;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Test5 unnamed bitfield.
|
|
|
|
|
void bf5() {
|
|
|
|
|
struct {
|
|
|
|
|
unsigned char flag : 1;
|
|
|
|
|
unsigned int : 32;
|
|
|
|
|
unsigned char flag1 : 1;
|
|
|
|
|
} _flags;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
unsigned char (^c)() = ^{
|
|
|
|
|
return _flags.flag;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Test6 0 length bitfield.
|
|
|
|
|
void bf6() {
|
|
|
|
|
struct {
|
|
|
|
|
unsigned char flag : 1;
|
|
|
|
|
unsigned int : 0;
|
|
|
|
|
unsigned char flag1 : 1;
|
|
|
|
|
} _flags;
|
|
|
|
|
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
unsigned char (^c)() = ^{
|
|
|
|
|
return _flags.flag;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
c();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Test7 large number of captured variables.
|
|
|
|
|
void Test7() {
|
|
|
|
|
__weak id wid;
|
|
|
|
|
__weak id wid1, wid2, wid3, wid4;
|
|
|
|
|
__weak id wid5, wid6, wid7, wid8;
|
|
|
|
|
__weak id wid9, wid10, wid11, wid12;
|
|
|
|
|
__weak id wid13, wid14, wid15, wid16;
|
|
|
|
|
const id bar = (id) opaque_id();
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_STRONG:1, BL_WEAK:16, BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^b)() = ^{
|
|
|
|
|
x(bar);
|
|
|
|
|
x(wid1);
|
|
|
|
|
x(wid2);
|
|
|
|
|
x(wid3);
|
|
|
|
|
x(wid4);
|
|
|
|
|
x(wid5);
|
|
|
|
|
x(wid6);
|
|
|
|
|
x(wid7);
|
|
|
|
|
x(wid8);
|
|
|
|
|
x(wid9);
|
|
|
|
|
x(wid10);
|
|
|
|
|
x(wid11);
|
|
|
|
|
x(wid12);
|
|
|
|
|
x(wid13);
|
|
|
|
|
x(wid14);
|
|
|
|
|
x(wid15);
|
|
|
|
|
x(wid16);
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Test 8 very large number of captured variables.
|
|
|
|
|
void Test8() {
|
|
|
|
|
__weak id wid;
|
|
|
|
|
__weak id wid1, wid2, wid3, wid4;
|
|
|
|
|
__weak id wid5, wid6, wid7, wid8;
|
|
|
|
|
__weak id wid9, wid10, wid11, wid12;
|
|
|
|
|
__weak id wid13, wid14, wid15, wid16;
|
|
|
|
|
__weak id w1, w2, w3, w4;
|
|
|
|
|
__weak id w5, w6, w7, w8;
|
|
|
|
|
__weak id w9, w10, w11, w12;
|
|
|
|
|
__weak id w13, w14, w15, w16;
|
|
|
|
|
const id bar = (id) opaque_id();
|
Compute and preserve alignment more faithfully in IR-generation.
Introduce an Address type to bundle a pointer value with an
alignment. Introduce APIs on CGBuilderTy to work with Address
values. Change core APIs on CGF/CGM to traffic in Address where
appropriate. Require alignments to be non-zero. Update a ton
of code to compute and propagate alignment information.
As part of this, I've promoted CGBuiltin's EmitPointerWithAlignment
helper function to CGF and made use of it in a number of places in
the expression emitter.
The end result is that we should now be significantly more correct
when performing operations on objects that are locally known to
be under-aligned. Since alignment is not reliably tracked in the
type system, there are inherent limits to this, but at least we
are no longer confused by standard operations like derived-to-base
conversions and array-to-pointer decay. I've also fixed a large
number of bugs where we were applying the complete-object alignment
to a pointer instead of the non-virtual alignment, although most of
these were hidden by the very conservative approach we took with
member alignment.
Also, because IRGen now reliably asserts on zero alignments, we
should no longer be subject to an absurd but frustrating recurring
bug where an incomplete type would report a zero alignment and then
we'd naively do a alignmentAtOffset on it and emit code using an
alignment equal to the largest power-of-two factor of the offset.
We should also now be emitting much more aggressive alignment
attributes in the presence of over-alignment. In particular,
field access now uses alignmentAtOffset instead of min.
Several times in this patch, I had to change the existing
code-generation pattern in order to more effectively use
the Address APIs. For the most part, this seems to be a strict
improvement, like doing pointer arithmetic with GEPs instead of
ptrtoint. That said, I've tried very hard to not change semantics,
but it is likely that I've failed in a few places, for which I
apologize.
ABIArgInfo now always carries the assumed alignment of indirect and
indirect byval arguments. In order to cut down on what was already
a dauntingly large patch, I changed the code to never set align
attributes in the IR on non-byval indirect arguments. That is,
we still generate code which assumes that indirect arguments have
the given alignment, but we don't express this information to the
backend except where it's semantically required (i.e. on byvals).
This is likely a minor regression for those targets that did provide
this information, but it'll be trivial to add it back in a later
patch.
I partially punted on applying this work to CGBuiltin. Please
do not add more uses of the CreateDefaultAligned{Load,Store}
APIs; they will be going away eventually.
llvm-svn: 246985
2015-09-08 16:05:57 +08:00
|
|
|
// CHECK: Block variable layout: BL_STRONG:1, BL_WEAK:16, BL_WEAK:16, BL_WEAK:1, BL_OPERATOR:0
|
2012-11-06 02:14:34 +08:00
|
|
|
void (^b)() = ^{
|
|
|
|
|
x(bar);
|
|
|
|
|
x(wid1);
|
|
|
|
|
x(wid2);
|
|
|
|
|
x(wid3);
|
|
|
|
|
x(wid4);
|
|
|
|
|
x(wid5);
|
|
|
|
|
x(wid6);
|
|
|
|
|
x(wid7);
|
|
|
|
|
x(wid8);
|
|
|
|
|
x(wid9);
|
|
|
|
|
x(wid10);
|
|
|
|
|
x(wid11);
|
|
|
|
|
x(wid12);
|
|
|
|
|
x(wid13);
|
|
|
|
|
x(wid14);
|
|
|
|
|
x(wid15);
|
|
|
|
|
x(wid16);
|
|
|
|
|
x(w1);
|
|
|
|
|
x(w2);
|
|
|
|
|
x(w3);
|
|
|
|
|
x(w4);
|
|
|
|
|
x(w5);
|
|
|
|
|
x(w6);
|
|
|
|
|
x(w7);
|
|
|
|
|
x(w8);
|
|
|
|
|
x(w9);
|
|
|
|
|
x(w10);
|
|
|
|
|
x(w11);
|
|
|
|
|
x(w12);
|
|
|
|
|
x(w13);
|
|
|
|
|
x(w14);
|
|
|
|
|
x(w15);
|
|
|
|
|
x(w16);
|
|
|
|
|
x(wid);
|
|
|
|
|
};
|
|
|
|
|
}
|