<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 17, 2015 at 4:51 AM, Marina Yatsina via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: myatsina<br>
Date: Thu Dec 17 06:51:51 2015<br>
New Revision: 255890<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=255890&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=255890&view=rev</a><br>
Log:<br>
[ms-inline-asm] Add support for composite structs in MS inline asm<br>
<br>
Add MS inline asm support for structs that contain fields that are also structs.<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D15578" rel="noreferrer" target="_blank">http://reviews.llvm.org/D15578</a><br>
<br>
<br>
Modified:<br>
cfe/trunk/lib/Sema/SemaStmtAsm.cpp<br>
cfe/trunk/test/CodeGen/ms-inline-asm.c<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaStmtAsm.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmtAsm.cpp?rev=255890&r1=255889&r2=255890&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmtAsm.cpp?rev=255890&r1=255889&r2=255890&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaStmtAsm.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaStmtAsm.cpp Thu Dec 17 06:51:51 2015<br>
@@ -617,45 +617,57 @@ ExprResult Sema::LookupInlineAsmIdentifi<br>
bool Sema::LookupInlineAsmField(StringRef Base, StringRef Member,<br>
unsigned &Offset, SourceLocation AsmLoc) {<br>
Offset = 0;<br>
+ SmallVector<StringRef, 2> Members;<br>
+ Member.split(Members, ".");<br>
+<br>
LookupResult BaseResult(*this, &Context.Idents.get(Base), SourceLocation(),<br>
LookupOrdinaryName);<br>
<br>
if (!LookupName(BaseResult, getCurScope()))<br>
return true;<br>
<br>
- if (!BaseResult.isSingleResult())<br>
- return true;<br>
+ LookupResult CurrBaseResult(BaseResult);<br>
<br>
- const RecordType *RT = nullptr;<br>
- NamedDecl *FoundDecl = BaseResult.getFoundDecl();<br>
- if (VarDecl *VD = dyn_cast<VarDecl>(FoundDecl))<br>
- RT = VD->getType()->getAs<RecordType>();<br>
- else if (TypedefNameDecl *TD = dyn_cast<TypedefNameDecl>(FoundDecl)) {<br>
- MarkAnyDeclReferenced(TD->getLocation(), TD, /*OdrUse=*/false);<br>
- RT = TD->getUnderlyingType()->getAs<RecordType>();<br>
- } else if (TypeDecl *TD = dyn_cast<TypeDecl>(FoundDecl))<br>
- RT = TD->getTypeForDecl()->getAs<RecordType>();<br>
- if (!RT)<br>
- return true;<br>
-<br>
- if (RequireCompleteType(AsmLoc, QualType(RT, 0), 0))<br>
- return true;<br>
+ for (StringRef NextMember : Members) {<br>
<br>
- LookupResult FieldResult(*this, &Context.Idents.get(Member), SourceLocation(),<br>
- LookupMemberName);<br>
-<br>
- if (!LookupQualifiedName(FieldResult, RT->getDecl()))<br>
- return true;<br>
-<br>
- // FIXME: Handle IndirectFieldDecl?<br>
- FieldDecl *FD = dyn_cast<FieldDecl>(FieldResult.getFoundDecl());<br>
- if (!FD)<br>
- return true;<br>
+ if (!CurrBaseResult.isSingleResult())<br>
+ return true;<br>
<br>
- const ASTRecordLayout &RL = Context.getASTRecordLayout(RT->getDecl());<br>
- unsigned i = FD->getFieldIndex();<br>
- CharUnits Result = Context.toCharUnitsFromBits(RL.getFieldOffset(i));<br>
- Offset = (unsigned)Result.getQuantity();<br>
+ const RecordType *RT = nullptr;<br>
+ NamedDecl *FoundDecl = CurrBaseResult.getFoundDecl();<br>
+ if (VarDecl *VD = dyn_cast<VarDecl>(FoundDecl))<br>
+ RT = VD->getType()->getAs<RecordType>();<br>
+ else if (TypedefNameDecl *TD = dyn_cast<TypedefNameDecl>(FoundDecl)) {<br>
+ MarkAnyDeclReferenced(TD->getLocation(), TD, /*OdrUse=*/false);<br>
+ RT = TD->getUnderlyingType()->getAs<RecordType>();<br>
+ } else if (TypeDecl *TD = dyn_cast<TypeDecl>(FoundDecl))<br>
+ RT = TD->getTypeForDecl()->getAs<RecordType>();<br>
+ else if (FieldDecl *TD = dyn_cast<FieldDecl>(FoundDecl))<br>
+ RT = TD->getType()->getAs<RecordType>();<br>
+ if (!RT)<br>
+ return true;<br>
+<br>
+ if (RequireCompleteType(AsmLoc, QualType(RT, 0), 0))<br>
+ return true;<br>
+<br>
+ LookupResult FieldResult(*this, &Context.Idents.get(NextMember),<br>
+ SourceLocation(), LookupMemberName);<br>
+<br>
+ if (!LookupQualifiedName(FieldResult, RT->getDecl()))<br>
+ return true;<br>
+<br>
+ // FIXME: Handle IndirectFieldDecl?<br>
+ FieldDecl *FD = dyn_cast<FieldDecl>(FieldResult.getFoundDecl());<br>
+ if (!FD)<br>
+ return true;<br>
+<br>
+ CurrBaseResult = FieldResult;<br></blockquote><div><br></div><div>LookupResults shouldn't be/aren't really copyable (it's deprecated in C++11 to copy them, because they have a non-trivial dtor, which is reasonable - the default copy ctor would produce bad behavior if the interesting members (explicitly destroyed in the user-defined dtor) were present/non-null when the copy took place).<br><br>Perhaps you could generalize/do something like the change I made in <a href="http://llvm.org/viewvc/llvm-project?rev=248761&view=rev">http://llvm.org/viewvc/llvm-project?rev=248761&view=rev</a> ?<br><br>At some point it'd be nice to enable -Wdeprecated for the Clang-on-clang build directly, but there's a few wrinkles I need to sort out (when I find the time/motivation) before that happens.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
+<br>
+ const ASTRecordLayout &RL = Context.getASTRecordLayout(RT->getDecl());<br>
+ unsigned i = FD->getFieldIndex();<br>
+ CharUnits Result = Context.toCharUnitsFromBits(RL.getFieldOffset(i));<br>
+ Offset += (unsigned)Result.getQuantity();<br>
+ }<br>
<br>
return false;<br>
}<br>
<br>
Modified: cfe/trunk/test/CodeGen/ms-inline-asm.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ms-inline-asm.c?rev=255890&r1=255889&r2=255890&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ms-inline-asm.c?rev=255890&r1=255889&r2=255890&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/ms-inline-asm.c (original)<br>
+++ cfe/trunk/test/CodeGen/ms-inline-asm.c Thu Dec 17 06:51:51 2015<br>
@@ -470,6 +470,18 @@ typedef struct {<br>
int b;<br>
} A;<br>
<br>
+typedef struct {<br>
+ int b1;<br>
+ A b2;<br>
+} B;<br>
+<br>
+typedef struct {<br>
+ int c1;<br>
+ A c2;<br>
+ int c3;<br>
+ B c4;<br>
+} C;<br>
+<br>
void t39() {<br>
// CHECK-LABEL: define void @t39<br>
__asm mov eax, [eax].A.b<br>
@@ -478,6 +490,14 @@ void t39() {<br>
// CHECK: mov eax, [eax] .4<br>
__asm mov eax, fs:[0] A.b<br>
// CHECK: mov eax, fs:[$$0] .4<br>
+ __asm mov eax, [eax].B.b2.a<br>
+// CHECK: mov eax, [eax].4<br>
+ __asm mov eax, [eax] B.b2.b<br>
+// CHECK: mov eax, [eax] .8<br>
+ __asm mov eax, fs:[0] C.c2.b<br>
+// CHECK: mov eax, fs:[$$0] .8<br>
+ __asm mov eax, [eax]C.c4.b2.b<br>
+// CHECK: mov eax, [eax].24<br>
// CHECK: "~{eax},~{dirflag},~{fpsr},~{flags}"()<br>
}<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>