<div dir="ltr"><div>Hi Manman,</div><div><br></div><div>I reverted this commit and follow-up commit r191695 in r191725.</div><div><br></div>See my messages on llvm-commits for some crashes this triggered. FYI, the problematic test case is using -relaxed-aliasing. I'll try to get you a reduced testcase tomorrow.<br>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Sep 27, 2013 at 4:06 PM, Manman Ren <span dir="ltr"><<a href="mailto:manman.ren@gmail.com" target="_blank">manman.ren@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mren<br>
Date: Fri Sep 27 18:06:41 2013<br>
New Revision: 191586<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=191586&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=191586&view=rev</a><br>
Log:<br>
TBAA: use the same format for scalar TBAA and struct-path aware TBAA.<br>
<br>
Struct-path aware TBAA generates tags to specify the access path,<br>
while scalar TBAA only generates tags to scalar types.<br>
<br>
Modified:<br>
cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp<br>
cfe/trunk/test/CodeGen/may-alias.c<br>
cfe/trunk/test/CodeGen/tbaa-class.cpp<br>
cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp<br>
cfe/trunk/test/CodeGen/tbaa-struct.cpp<br>
cfe/trunk/test/CodeGen/tbaa.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=191586&r1=191585&r2=191586&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=191586&r1=191585&r2=191586&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Fri Sep 27 18:06:41 2013<br>
@@ -243,14 +243,14 @@ llvm::MDNode *CodeGenModule::getTBAAStru<br>
return TBAA->getTBAAStructTagInfo(BaseTy, AccessN, O);<br>
}<br>
<br>
-/// Decorate the instruction with a TBAA tag. For scalar TBAA, the tag<br>
-/// is the same as the type. For struct-path aware TBAA, the tag<br>
-/// is different from the type: base type, access type and offset.<br>
+/// Decorate the instruction with a TBAA tag. For both scalar TBAA<br>
+/// and struct-path aware TBAA, the tag has the same format:<br>
+/// base type, access type and offset.<br>
/// When ConvertTypeToTag is true, we create a tag based on the scalar type.<br>
void CodeGenModule::DecorateInstruction(llvm::Instruction *Inst,<br>
llvm::MDNode *TBAAInfo,<br>
bool ConvertTypeToTag) {<br>
- if (ConvertTypeToTag && TBAA && CodeGenOpts.StructPathTBAA)<br>
+ if (ConvertTypeToTag && TBAA)<br>
Inst->setMetadata(llvm::LLVMContext::MD_tbaa,<br>
TBAA->getTBAAScalarTagInfo(TBAAInfo));<br>
else<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp?rev=191586&r1=191585&r2=191586&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp?rev=191586&r1=191585&r2=191586&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp Fri Sep 27 18:06:41 2013<br>
@@ -50,16 +50,11 @@ llvm::MDNode *CodeGenTBAA::getRoot() {<br>
return Root;<br>
}<br>
<br>
-// For struct-path aware TBAA, the scalar type has the same format as<br>
-// the struct type: name, offset, pointer to another node in the type DAG.<br>
-// For scalar TBAA, the scalar type is the same as the scalar tag:<br>
-// name and a parent pointer.<br>
+// For both scalar TBAA and struct-path aware TBAA, the scalar type has the<br>
+// same format: name, parent node, and offset.<br>
llvm::MDNode *CodeGenTBAA::createTBAAScalarType(StringRef Name,<br>
llvm::MDNode *Parent) {<br>
- if (CodeGenOpts.StructPathTBAA)<br>
- return MDHelper.createTBAAScalarTypeNode(Name, Parent);<br>
- else<br>
- return MDHelper.createTBAANode(Name, Parent);<br>
+ return MDHelper.createTBAAScalarTypeNode(Name, Parent);<br>
}<br>
<br>
llvm::MDNode *CodeGenTBAA::getChar() {<br>
@@ -211,8 +206,7 @@ CodeGenTBAA::CollectFields(uint64_t Base<br>
uint64_t Offset = BaseOffset;<br>
uint64_t Size = Context.getTypeSizeInChars(QTy).getQuantity();<br>
llvm::MDNode *TBAAInfo = MayAlias ? getChar() : getTBAAInfo(QTy);<br>
- llvm::MDNode *TBAATag = CodeGenOpts.StructPathTBAA ?<br>
- getTBAAScalarTagInfo(TBAAInfo) : TBAAInfo;<br>
+ llvm::MDNode *TBAATag = getTBAAScalarTagInfo(TBAAInfo);<br>
Fields.push_back(llvm::MDBuilder::TBAAStructField(Offset, Size, TBAATag));<br>
return true;<br>
}<br>
@@ -293,11 +287,12 @@ CodeGenTBAA::getTBAAStructTypeInfo(QualT<br>
return StructMetadataCache[Ty] = NULL;<br>
}<br>
<br>
+/// Return a TBAA tag node for both scalar TBAA and struct-path aware TBAA.<br>
llvm::MDNode *<br>
CodeGenTBAA::getTBAAStructTagInfo(QualType BaseQTy, llvm::MDNode *AccessNode,<br>
uint64_t Offset) {<br>
if (!CodeGenOpts.StructPathTBAA)<br>
- return AccessNode;<br>
+ return getTBAAScalarTagInfo(AccessNode);<br>
<br>
const Type *BTy = Context.getCanonicalType(BaseQTy).getTypePtr();<br>
TBAAPathTag PathTag = TBAAPathTag(BTy, AccessNode, Offset);<br>
<br>
Modified: cfe/trunk/test/CodeGen/may-alias.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/may-alias.c?rev=191586&r1=191585&r2=191586&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/may-alias.c?rev=191586&r1=191585&r2=191586&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/may-alias.c (original)<br>
+++ cfe/trunk/test/CodeGen/may-alias.c Fri Sep 27 18:06:41 2013<br>
@@ -27,10 +27,12 @@ void test1(struct Test1MA *p1, struct Te<br>
// PATH: store i32 3, i32* {{%.*}}, !tbaa [[TAG_test1_x:!.*]]<br>
p2->x = 3;<br>
}<br>
-// CHECK: metadata !{metadata !"any pointer", metadata [[TAG_CHAR]]}<br>
-// CHECK: [[TAG_CHAR]] = metadata !{metadata !"omnipotent char", metadata [[TAG_CXX_TBAA:!.*]]}<br>
+// CHECK: metadata !{metadata !"any pointer", metadata [[TYPE_CHAR:!.*]],<br>
+// CHECK: [[TYPE_CHAR]] = metadata !{metadata !"omnipotent char", metadata [[TAG_CXX_TBAA:!.*]],<br>
// CHECK: [[TAG_CXX_TBAA]] = metadata !{metadata !"Simple C/C++ TBAA"}<br>
-// CHECK: [[TAG_INT]] = metadata !{metadata !"int", metadata [[TAG_CHAR]]}<br>
+// CHECK: [[TAG_CHAR]] = metadata !{metadata [[TYPE_CHAR]], metadata [[TYPE_CHAR]], i64 0}<br>
+// CHECK: [[TAG_INT]] = metadata !{metadata [[TYPE_INT:!.*]], metadata [[TYPE_INT]], i64 0}<br>
+// CHECK: [[TYPE_INT]] = metadata !{metadata !"int", metadata [[TYPE_CHAR]]<br>
<br>
// PATH: [[TYPE_CHAR:!.*]] = metadata !{metadata !"omnipotent char", metadata !{{.*}}<br>
// PATH: [[TAG_CHAR]] = metadata !{metadata [[TYPE_CHAR]], metadata [[TYPE_CHAR]], i64 0}<br>
<br>
Modified: cfe/trunk/test/CodeGen/tbaa-class.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa-class.cpp?rev=191586&r1=191585&r2=191586&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa-class.cpp?rev=191586&r1=191585&r2=191586&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/tbaa-class.cpp (original)<br>
+++ cfe/trunk/test/CodeGen/tbaa-class.cpp Fri Sep 27 18:06:41 2013<br>
@@ -198,10 +198,12 @@ uint32_t g12(StructC *C, StructD *D, uin<br>
return b1->a.f32;<br>
}<br>
<br>
-// CHECK: [[TAG_char:!.*]] = metadata !{metadata !"omnipotent char", metadata [[TAG_cxx_tbaa:!.*]]}<br>
+// CHECK: [[TYPE_char:!.*]] = metadata !{metadata !"omnipotent char", metadata [[TAG_cxx_tbaa:!.*]],<br>
// CHECK: [[TAG_cxx_tbaa]] = metadata !{metadata !"Simple C/C++ TBAA"}<br>
-// CHECK: [[TAG_i32]] = metadata !{metadata !"int", metadata [[TAG_char]]}<br>
-// CHECK: [[TAG_i16]] = metadata !{metadata !"short", metadata [[TAG_char]]}<br>
+// CHECK: [[TAG_i32]] = metadata !{metadata [[TYPE_i32:!.*]], metadata [[TYPE_i32]], i64 0}<br>
+// CHECK: [[TYPE_i32]] = metadata !{metadata !"int", metadata [[TYPE_char]],<br>
+// CHECK: [[TAG_i16]] = metadata !{metadata [[TYPE_i16:!.*]], metadata [[TYPE_i16]], i64 0}<br>
+// CHECK: [[TYPE_i16]] = metadata !{metadata !"short", metadata [[TYPE_char]],<br>
<br>
// PATH: [[TYPE_CHAR:!.*]] = metadata !{metadata !"omnipotent char", metadata<br>
// PATH: [[TAG_i32]] = metadata !{metadata [[TYPE_INT:!.*]], metadata [[TYPE_INT]], i64 0}<br>
<br>
Modified: cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp?rev=191586&r1=191585&r2=191586&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp?rev=191586&r1=191585&r2=191586&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp (original)<br>
+++ cfe/trunk/test/CodeGen/tbaa-for-vptr.cpp Fri Sep 27 18:06:41 2013<br>
@@ -23,5 +23,6 @@ void CallFoo(A *a) {<br>
<br>
// CHECK: %{{.*}} = load {{.*}} !tbaa ![[NUM:[0-9]+]]<br>
// CHECK: store {{.*}} !tbaa ![[NUM]]<br>
-// CHECK: [[NUM]] = metadata !{metadata !"vtable pointer", metadata !{{.*}}}<br>
+// CHECK: [[NUM]] = metadata !{metadata [[TYPE:!.*]], metadata [[TYPE]], i64 0}<br>
+// CHECK: [[TYPE]] = metadata !{metadata !"vtable pointer", metadata !{{.*}}<br>
// NOTBAA-NOT: = metadata !{metadata !"Simple C/C++ TBAA"}<br>
<br>
Modified: cfe/trunk/test/CodeGen/tbaa-struct.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa-struct.cpp?rev=191586&r1=191585&r2=191586&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa-struct.cpp?rev=191586&r1=191585&r2=191586&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/tbaa-struct.cpp (original)<br>
+++ cfe/trunk/test/CodeGen/tbaa-struct.cpp Fri Sep 27 18:06:41 2013<br>
@@ -65,10 +65,12 @@ void copy5(struct six *a, struct six *b)<br>
<br>
// CHECK: [[TS]] = metadata !{i64 0, i64 2, metadata !{{.*}}, i64 4, i64 4, metadata !{{.*}}, i64 8, i64 1, metadata !{{.*}}, i64 12, i64 4, metadata !{{.*}}}<br>
// CHECK: [[CHAR:!.*]] = metadata !{metadata !"omnipotent char", metadata !{{.*}}}<br>
-// CHECK: [[INT:!.*]] = metadata !{metadata !"int", metadata [[CHAR]]}<br>
+// CHECK: [[TAG_INT:!.*]] = metadata !{metadata [[INT:!.*]], metadata [[INT]], i64 0}<br>
+// CHECK: [[INT]] = metadata !{metadata !"int", metadata [[CHAR]]<br>
+// CHECK: [[TAG_CHAR:!.*]] = metadata !{metadata [[CHAR]], metadata [[CHAR]], i64 0}<br>
// (offset, size) = (0,1) char; (4,2) short; (8,4) int; (12,1) char; (16,4) int; (20,4) int<br>
// CHECK: [[TS2]] = metadata !{i64 0, i64 1, metadata !{{.*}}, i64 4, i64 2, metadata !{{.*}}, i64 8, i64 4, metadata !{{.*}}, i64 12, i64 1, metadata !{{.*}}, i64 16, i64 4, metadata {{.*}}, i64 20, i64 4, metadata {{.*}}}<br>
// (offset, size) = (0,8) char; (0,2) char; (4,8) char<br>
// CHECK: [[TS3]] = metadata !{i64 0, i64 8, metadata !{{.*}}, i64 0, i64 2, metadata !{{.*}}, i64 4, i64 8, metadata !{{.*}}}<br>
-// CHECK: [[TS4]] = metadata !{i64 0, i64 1, metadata [[CHAR]], i64 1, i64 4, metadata [[INT]], i64 1, i64 1, metadata [[CHAR]], i64 2, i64 1, metadata [[CHAR]]}<br>
-// CHECK: [[TS5]] = metadata !{i64 0, i64 1, metadata [[CHAR]], i64 4, i64 4, metadata [[INT]], i64 4, i64 1, metadata [[CHAR]], i64 5, i64 1, metadata [[CHAR]]}<br>
+// CHECK: [[TS4]] = metadata !{i64 0, i64 1, metadata [[TAG_CHAR]], i64 1, i64 4, metadata [[TAG_INT]], i64 1, i64 1, metadata [[TAG_CHAR]], i64 2, i64 1, metadata [[TAG_CHAR]]}<br>
+// CHECK: [[TS5]] = metadata !{i64 0, i64 1, metadata [[TAG_CHAR]], i64 4, i64 4, metadata [[TAG_INT]], i64 4, i64 1, metadata [[TAG_CHAR]], i64 5, i64 1, metadata [[TAG_CHAR]]}<br>
<br>
Modified: cfe/trunk/test/CodeGen/tbaa.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa.cpp?rev=191586&r1=191585&r2=191586&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/tbaa.cpp?rev=191586&r1=191585&r2=191586&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/tbaa.cpp (original)<br>
+++ cfe/trunk/test/CodeGen/tbaa.cpp Fri Sep 27 18:06:41 2013<br>
@@ -236,10 +236,13 @@ uint32_t g15(StructS *S, StructS3 *S3, u<br>
return S->f32;<br>
}<br>
<br>
-// CHECK: [[TAG_char]] = metadata !{metadata !"omnipotent char", metadata [[TAG_cxx_tbaa:!.*]]}<br>
+// CHECK: [[TYPE_char:!.*]] = metadata !{metadata !"omnipotent char", metadata [[TAG_cxx_tbaa:!.*]],<br>
// CHECK: [[TAG_cxx_tbaa]] = metadata !{metadata !"Simple C/C++ TBAA"}<br>
-// CHECK: [[TAG_i32]] = metadata !{metadata !"int", metadata [[TAG_char]]}<br>
-// CHECK: [[TAG_i16]] = metadata !{metadata !"short", metadata [[TAG_char]]}<br>
+// CHECK: [[TAG_i32]] = metadata !{metadata [[TYPE_i32:!.*]], metadata [[TYPE_i32]], i64 0}<br>
+// CHECK: [[TYPE_i32]] = metadata !{metadata !"int", metadata [[TYPE_char]],<br>
+// CHECK: [[TAG_i16]] = metadata !{metadata [[TYPE_i16:!.*]], metadata [[TYPE_i16]], i64 0}<br>
+// CHECK: [[TYPE_i16]] = metadata !{metadata !"short", metadata [[TYPE_char]],<br>
+// CHECK: [[TAG_char]] = metadata !{metadata [[TYPE_char]], metadata [[TYPE_char]], i64 0}<br>
<br>
// PATH: [[TYPE_CHAR:!.*]] = metadata !{metadata !"omnipotent char", metadata<br>
// PATH: [[TAG_i32]] = metadata !{metadata [[TYPE_INT:!.*]], metadata [[TYPE_INT]], i64 0}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>