<div dir="ltr">what is this ${:uid} thing? Could the comment in Sema::GetOrCreateMSAsmLabel explain it?<div><br></div><div>-- Sean Silva</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 28, 2016 at 4:39 PM, Reid Kleckner 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:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rnk<br>
Date: Mon Nov 28 18:39:37 2016<br>
New Revision: 288093<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=288093&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=288093&view=rev</a><br>
Log:<br>
Use ${:uid} to generate unique MS asm labels, not {:uid}<br>
<br>
Modified:<br>
cfe/trunk/lib/Sema/<wbr>SemaStmtAsm.cpp<br>
cfe/trunk/test/CodeGen/<wbr>mozilla-ms-inline-asm.c<br>
cfe/trunk/test/CodeGen/ms-<wbr>inline-asm.c<br>
cfe/trunk/test/CodeGen/ms-<wbr>inline-asm.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/<wbr>SemaStmtAsm.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmtAsm.cpp?rev=288093&r1=288092&r2=288093&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Sema/<wbr>SemaStmtAsm.cpp?rev=288093&r1=<wbr>288092&r2=288093&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Sema/<wbr>SemaStmtAsm.cpp (original)<br>
+++ cfe/trunk/lib/Sema/<wbr>SemaStmtAsm.cpp Mon Nov 28 18:39:37 2016<br>
@@ -753,7 +753,7 @@ LabelDecl *Sema::GetOrCreateMSAsmLabel(S<br>
// Create an internal name for the label. The name should not be a valid mangled<br>
// name, and should be unique. We use a dot to make the name an invalid mangled<br>
// name.<br>
- OS << "__MSASMLABEL_.{:uid}__";<br>
+ OS << "__MSASMLABEL_.${:uid}__";<br>
for (char C : ExternalLabelName) {<br>
OS << C;<br>
// We escape '$' in asm strings by replacing it with "$$"<br>
<br>
Modified: cfe/trunk/test/CodeGen/<wbr>mozilla-ms-inline-asm.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/mozilla-ms-inline-asm.c?rev=288093&r1=288092&r2=288093&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>CodeGen/mozilla-ms-inline-asm.<wbr>c?rev=288093&r1=288092&r2=<wbr>288093&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CodeGen/<wbr>mozilla-ms-inline-asm.c (original)<br>
+++ cfe/trunk/test/CodeGen/<wbr>mozilla-ms-inline-asm.c Mon Nov 28 18:39:37 2016<br>
@@ -20,7 +20,7 @@ void invoke(void* that, unsigned methodI<br>
// CHECK: call void asm sideeffect inteldialect<br>
// CHECK: mov edx,dword ptr $1<br>
// CHECK: test edx,edx<br>
-// CHECK: jz {{[^_]*}}__MSASMLABEL_.{:uid}_<wbr>_noparams<br>
+// CHECK: jz {{[^_]*}}__MSASMLABEL_.${:uid}<wbr>__noparams<br>
// ^ Can't use {{.*}} here because the matching is greedy.<br>
// CHECK: mov eax,edx<br>
// CHECK: shl eax,$$3<br>
@@ -28,7 +28,7 @@ void invoke(void* that, unsigned methodI<br>
// CHECK: mov ecx,esp<br>
// CHECK: push dword ptr $0<br>
// CHECK: call dword ptr $2<br>
-// CHECK: {{.*}}__MSASMLABEL_.{:uid}__<wbr>noparams:<br>
+// CHECK: {{.*}}__MSASMLABEL_.${:uid}__<wbr>noparams:<br>
// CHECK: mov ecx,dword ptr $3<br>
// CHECK: push ecx<br>
// CHECK: mov edx,[ecx]<br>
<br>
Modified: cfe/trunk/test/CodeGen/ms-<wbr>inline-asm.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ms-inline-asm.c?rev=288093&r1=288092&r2=288093&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>CodeGen/ms-inline-asm.c?rev=<wbr>288093&r1=288092&r2=288093&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CodeGen/ms-<wbr>inline-asm.c (original)<br>
+++ cfe/trunk/test/CodeGen/ms-<wbr>inline-asm.c Mon Nov 28 18:39:37 2016<br>
@@ -249,7 +249,7 @@ void t23() {<br>
the_label:<br>
}<br>
// CHECK: t23<br>
-// CHECK: call void asm sideeffect inteldialect "{{.*}}__MSASMLABEL_.{:uid}__<wbr>the_label:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
+// CHECK: call void asm sideeffect inteldialect "{{.*}}__MSASMLABEL_.${:uid}__<wbr>the_label:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
}<br>
<br>
void t24_helper(void) {}<br>
@@ -595,7 +595,7 @@ void label1() {<br>
jmp label<br>
}<br>
// CHECK-LABEL: define void @label1()<br>
- // CHECK: call void asm sideeffect inteldialect "{{.*}}__MSASMLABEL_.{:uid}__<wbr>label:\0A\09jmp {{.*}}__MSASMLABEL_.{:uid}__<wbr>label", "~{dirflag},~{fpsr},~{flags}"(<wbr>) [[ATTR1:#[0-9]+]]<br>
+ // CHECK: call void asm sideeffect inteldialect "{{.*}}__MSASMLABEL_.${:uid}__<wbr>label:\0A\09jmp {{.*}}__MSASMLABEL_.${:uid}__<wbr>label", "~{dirflag},~{fpsr},~{flags}"(<wbr>) [[ATTR1:#[0-9]+]]<br>
}<br>
<br>
void label2() {<br>
@@ -604,7 +604,7 @@ void label2() {<br>
label:<br>
}<br>
// CHECK-LABEL: define void @label2<br>
- // CHECK: call void asm sideeffect inteldialect "jmp {{.*}}__MSASMLABEL_.{:uid}__<wbr>label\0A\09{{.*}}__MSASMLABEL_<wbr>.{:uid}__label:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
+ // CHECK: call void asm sideeffect inteldialect "jmp {{.*}}__MSASMLABEL_.${:uid}__<wbr>label\0A\09{{.*}}__MSASMLABEL_<wbr>.${:uid}__label:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
}<br>
<br>
void label3() {<br>
@@ -613,7 +613,7 @@ void label3() {<br>
mov eax, label<br>
}<br>
// CHECK-LABEL: define void @label3<br>
- // CHECK: call void asm sideeffect inteldialect "{{.*}}__MSASMLABEL_.{:uid}__<wbr>label:\0A\09mov eax, {{.*}}__MSASMLABEL_.{:uid}__<wbr>label", "~{eax},~{dirflag},~{fpsr},~{<wbr>flags}"()<br>
+ // CHECK: call void asm sideeffect inteldialect "{{.*}}__MSASMLABEL_.${:uid}__<wbr>label:\0A\09mov eax, {{.*}}__MSASMLABEL_.${:uid}__<wbr>label", "~{eax},~{dirflag},~{fpsr},~{<wbr>flags}"()<br>
}<br>
<br>
void label4() {<br>
@@ -622,7 +622,7 @@ void label4() {<br>
mov eax, [label]<br>
}<br>
// CHECK-LABEL: define void @label4<br>
- // CHECK: call void asm sideeffect inteldialect "{{.*}}__MSASMLABEL_.{:uid}__<wbr>label:\0A\09mov eax, {{.*}}__MSASMLABEL_.{:uid}__<wbr>label", "~{eax},~{dirflag},~{fpsr},~{<wbr>flags}"()<br>
+ // CHECK: call void asm sideeffect inteldialect "{{.*}}__MSASMLABEL_.${:uid}__<wbr>label:\0A\09mov eax, {{.*}}__MSASMLABEL_.${:uid}__<wbr>label", "~{eax},~{dirflag},~{fpsr},~{<wbr>flags}"()<br>
}<br>
<br>
void label5() {<br>
@@ -631,7 +631,7 @@ void label5() {<br>
dollar_label$:<br>
}<br>
// CHECK-LABEL: define void @label5<br>
- // CHECK: call void asm sideeffect inteldialect "jmp {{.*}}__MSASMLABEL_.{:uid}__<wbr>dollar_label$$\0A\09{{.*}}__<wbr>MSASMLABEL_.{:uid}__dollar_<wbr>label$$:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
+ // CHECK: call void asm sideeffect inteldialect "jmp {{.*}}__MSASMLABEL_.${:uid}__<wbr>dollar_label$$\0A\09{{.*}}__<wbr>MSASMLABEL_.${:uid}__dollar_<wbr>label$$:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
}<br>
<br>
void label6(){<br>
@@ -640,7 +640,7 @@ void label6(){<br>
label:<br>
}<br>
// CHECK-LABEL: define void @label6<br>
- // CHECK: call void asm sideeffect inteldialect "jmp {{.*}}__MSASMLABEL_.{:uid}__<wbr>label\0A\09{{.*}}__MSASMLABEL_<wbr>.{:uid}__label:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
+ // CHECK: call void asm sideeffect inteldialect "jmp {{.*}}__MSASMLABEL_.${:uid}__<wbr>label\0A\09{{.*}}__MSASMLABEL_<wbr>.${:uid}__label:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
}<br>
<br>
typedef union _LARGE_INTEGER {<br>
<br>
Modified: cfe/trunk/test/CodeGen/ms-<wbr>inline-asm.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/ms-inline-asm.cpp?rev=288093&r1=288092&r2=288093&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>CodeGen/ms-inline-asm.cpp?rev=<wbr>288093&r1=288092&r2=288093&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CodeGen/ms-<wbr>inline-asm.cpp (original)<br>
+++ cfe/trunk/test/CodeGen/ms-<wbr>inline-asm.cpp Mon Nov 28 18:39:37 2016<br>
@@ -126,14 +126,14 @@ void t7_using() {<br>
void t8() {<br>
__asm some_label:<br>
// CHECK-LABEL: define void @_Z2t8v()<br>
- // CHECK: call void asm sideeffect inteldialect "L__MSASMLABEL_.{:uid}__some_<wbr>label:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
+ // CHECK: call void asm sideeffect inteldialect "L__MSASMLABEL_.${:uid}__some_<wbr>label:", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
struct A {<br>
static void g() {<br>
__asm jmp some_label ; This should jump forwards<br>
__asm some_label:<br>
__asm nop<br>
// CHECK-LABEL: define internal void @_ZZ2t8vEN1A1gEv()<br>
- // CHECK: call void asm sideeffect inteldialect "jmp L__MSASMLABEL_.{:uid}__some_<wbr>label\0A\09L__MSASMLABEL_.{:<wbr>uid}__some_label:\0A\09nop", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
+ // CHECK: call void asm sideeffect inteldialect "jmp L__MSASMLABEL_.${:uid}__some_<wbr>label\0A\09L__MSASMLABEL_.${:<wbr>uid}__some_label:\0A\09nop", "~{dirflag},~{fpsr},~{flags}"(<wbr>)<br>
}<br>
};<br>
A::g();<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">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/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>