[llvm] e074d58 - [ms] [llvm-ml] Disable C-style comments
Eric Astor via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 25 20:12:40 PDT 2021
Author: Eric Astor
Date: 2021-06-25T23:09:13-04:00
New Revision: e074d580b28b8cdf31fc4813cbc886ef5149d203
URL: https://github.com/llvm/llvm-project/commit/e074d580b28b8cdf31fc4813cbc886ef5149d203
DIFF: https://github.com/llvm/llvm-project/commit/e074d580b28b8cdf31fc4813cbc886ef5149d203.diff
LOG: [ms] [llvm-ml] Disable C-style comments
Added:
Modified:
llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
llvm/test/tools/llvm-ml/basic_data.asm
llvm/test/tools/llvm-ml/builtin_types.asm
llvm/test/tools/llvm-ml/dot_operator.asm
llvm/test/tools/llvm-ml/include.asm
llvm/test/tools/llvm-ml/line_continuations.asm
llvm/test/tools/llvm-ml/ml32-context.asm
llvm/test/tools/llvm-ml/proc.asm
llvm/test/tools/llvm-ml/proc_frame.asm
llvm/test/tools/llvm-ml/radix.asm
llvm/test/tools/llvm-ml/reserved_words_conflict.asm
llvm/test/tools/llvm-ml/rip-relative-addressing.asm
llvm/test/tools/llvm-ml/run.asm
llvm/test/tools/llvm-ml/struct.asm
llvm/test/tools/llvm-ml/struct_errors.asm
llvm/test/tools/llvm-ml/type_operators.asm
llvm/test/tools/llvm-ml/variable.asm
Removed:
################################################################################
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
index cb34a8aef7a4..b5351358e4e5 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
@@ -144,6 +144,7 @@ X86MCAsmInfoMicrosoftMASM::X86MCAsmInfoMicrosoftMASM(const Triple &Triple)
DollarIsPC = true;
SeparatorString = "\n";
CommentString = ";";
+ AllowAdditionalComments = false;
AllowQuestionAtStartOfIdentifier = true;
AllowDollarAtStartOfIdentifier = true;
AllowAtAtStartOfIdentifier = true;
diff --git a/llvm/test/tools/llvm-ml/basic_data.asm b/llvm/test/tools/llvm-ml/basic_data.asm
index 4f659c1c225a..f11f786b64bc 100644
--- a/llvm/test/tools/llvm-ml/basic_data.asm
+++ b/llvm/test/tools/llvm-ml/basic_data.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
.data
BYTE 2, 4, 6, 8
diff --git a/llvm/test/tools/llvm-ml/builtin_types.asm b/llvm/test/tools/llvm-ml/builtin_types.asm
index e46c4c8a34e1..03b1d29c3b28 100644
--- a/llvm/test/tools/llvm-ml/builtin_types.asm
+++ b/llvm/test/tools/llvm-ml/builtin_types.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
.data
diff --git a/llvm/test/tools/llvm-ml/dot_operator.asm b/llvm/test/tools/llvm-ml/dot_operator.asm
index 0e7a1db953f9..37f753eeba51 100644
--- a/llvm/test/tools/llvm-ml/dot_operator.asm
+++ b/llvm/test/tools/llvm-ml/dot_operator.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s
.data
diff --git a/llvm/test/tools/llvm-ml/include.asm b/llvm/test/tools/llvm-ml/include.asm
index a0057c6c7fd8..29028da85825 100644
--- a/llvm/test/tools/llvm-ml/include.asm
+++ b/llvm/test/tools/llvm-ml/include.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -filetype=s %s /I %S /Fo - | FileCheck %s
+; RUN: llvm-ml -filetype=s %s /I %S /Fo - | FileCheck %s
include included.inc
diff --git a/llvm/test/tools/llvm-ml/line_continuations.asm b/llvm/test/tools/llvm-ml/line_continuations.asm
index afeb69adf366..1afee82c65b2 100644
--- a/llvm/test/tools/llvm-ml/line_continuations.asm
+++ b/llvm/test/tools/llvm-ml/line_continuations.asm
@@ -1,17 +1,17 @@
-# RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
.code
t1:
mov eax, \
ebx
-# CHECK: t1:
-# CHECK-NEXT: mov eax, ebx
+; CHECK: t1:
+; CHECK-NEXT: mov eax, ebx
t2:
mov eax, [ebx + \
1]
-# CHECK: t2:
-# CHECK-NEXT: mov eax, dword ptr [ebx + 1]
+; CHECK: t2:
+; CHECK-NEXT: mov eax, dword ptr [ebx + 1]
END
diff --git a/llvm/test/tools/llvm-ml/ml32-context.asm b/llvm/test/tools/llvm-ml/ml32-context.asm
index ab949e577689..a701605a8af5 100644
--- a/llvm/test/tools/llvm-ml/ml32-context.asm
+++ b/llvm/test/tools/llvm-ml/ml32-context.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -m32 -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -m32 -filetype=s %s /Fo - | FileCheck %s
.386p
.model flat
diff --git a/llvm/test/tools/llvm-ml/proc.asm b/llvm/test/tools/llvm-ml/proc.asm
index 2e574dc89c05..c8ad81817603 100644
--- a/llvm/test/tools/llvm-ml/proc.asm
+++ b/llvm/test/tools/llvm-ml/proc.asm
@@ -1,5 +1,5 @@
-# RUN: llvm-ml -m32 -filetype=s %s /Fo - | FileCheck %s
-# RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -m32 -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s
.code
diff --git a/llvm/test/tools/llvm-ml/proc_frame.asm b/llvm/test/tools/llvm-ml/proc_frame.asm
index e3a4c96e865b..e3967f1d9bec 100644
--- a/llvm/test/tools/llvm-ml/proc_frame.asm
+++ b/llvm/test/tools/llvm-ml/proc_frame.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s
.code
diff --git a/llvm/test/tools/llvm-ml/radix.asm b/llvm/test/tools/llvm-ml/radix.asm
index 401abc7122d9..fa4abdc2148d 100644
--- a/llvm/test/tools/llvm-ml/radix.asm
+++ b/llvm/test/tools/llvm-ml/radix.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
.code
diff --git a/llvm/test/tools/llvm-ml/reserved_words_conflict.asm b/llvm/test/tools/llvm-ml/reserved_words_conflict.asm
index 164769cdd010..69e55d0b9c23 100644
--- a/llvm/test/tools/llvm-ml/reserved_words_conflict.asm
+++ b/llvm/test/tools/llvm-ml/reserved_words_conflict.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
.code
diff --git a/llvm/test/tools/llvm-ml/rip-relative-addressing.asm b/llvm/test/tools/llvm-ml/rip-relative-addressing.asm
index 5d538576f9b3..8e8c63cb54a3 100644
--- a/llvm/test/tools/llvm-ml/rip-relative-addressing.asm
+++ b/llvm/test/tools/llvm-ml/rip-relative-addressing.asm
@@ -1,5 +1,5 @@
-# RUN: llvm-ml -m32 -filetype=s %s /Fo - | FileCheck %s --check-prefix=CHECK-32
-# RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s --check-prefix=CHECK-64
+; RUN: llvm-ml -m32 -filetype=s %s /Fo - | FileCheck %s --check-prefix=CHECK-32
+; RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s --check-prefix=CHECK-64
.code
mov eax, [4]
diff --git a/llvm/test/tools/llvm-ml/run.asm b/llvm/test/tools/llvm-ml/run.asm
index d40b63a89681..0e4f2bf137f1 100644
--- a/llvm/test/tools/llvm-ml/run.asm
+++ b/llvm/test/tools/llvm-ml/run.asm
@@ -1,3 +1,3 @@
-# RUN: llvm-ml --help | FileCheck %s
+; RUN: llvm-ml --help | FileCheck %s
-# CHECK: USAGE: llvm-ml
+; CHECK: USAGE: llvm-ml
diff --git a/llvm/test/tools/llvm-ml/struct.asm b/llvm/test/tools/llvm-ml/struct.asm
index f2cd7c1a95da..7fb22fe2a0aa 100644
--- a/llvm/test/tools/llvm-ml/struct.asm
+++ b/llvm/test/tools/llvm-ml/struct.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s
.data
BAZ STRUCT
diff --git a/llvm/test/tools/llvm-ml/struct_errors.asm b/llvm/test/tools/llvm-ml/struct_errors.asm
index 3040c9dcf567..44bbecfd56ec 100644
--- a/llvm/test/tools/llvm-ml/struct_errors.asm
+++ b/llvm/test/tools/llvm-ml/struct_errors.asm
@@ -1,4 +1,4 @@
-# RUN: not llvm-ml -filetype=s %s /Fo /dev/null 2>&1 | FileCheck %s --dump-input=always
+; RUN: not llvm-ml -filetype=s %s /Fo /dev/null 2>&1 | FileCheck %s --dump-input=always
.data
int_test STRUCT
@@ -7,13 +7,13 @@ int_test STRUCT
int_test ENDS
t1 int_test <<1,2,3>>
-// CHECK: error: Initializer too long for field; expected at most 2 elements, got 3
+; CHECK: error: Initializer too long for field; expected at most 2 elements, got 3
t2 int_test <4>
-// CHECK: error: Cannot initialize array field with scalar value
+; CHECK: error: Cannot initialize array field with scalar value
t3 int_test <,<5,6>>
-// CHECK: error: Cannot initialize scalar field with array value
+; CHECK: error: Cannot initialize scalar field with array value
real_test STRUCT
real_arr REAL4 ?, ?, ?
@@ -21,13 +21,13 @@ real_test STRUCT
real_test ENDS
t4 real_test <<1.0,0.0,-1.0,-2.0>>
-// CHECK: error: Initializer too long for field; expected at most 3 elements, got 4
+; CHECK: error: Initializer too long for field; expected at most 3 elements, got 4
t5 real_test <2.0>
-// CHECK: error: Cannot initialize array field with scalar value
+; CHECK: error: Cannot initialize array field with scalar value
t6 real_test <,<2.0,-2.0>>
-// CHECK: error: Cannot initialize scalar field with array value
+; CHECK: error: Cannot initialize scalar field with array value
inner_struct STRUCT
a BYTE ?
@@ -39,19 +39,19 @@ struct_test STRUCT
struct_test ENDS
t7 struct_test <<<>, <>, <>, <>, <>>>
-// CHECK: error: Initializer too long for field; expected at most 4 elements, got 5
+; CHECK: error: Initializer too long for field; expected at most 4 elements, got 5
t8 struct_test <,<<>, <>>>
-// CHECK: error: 'inner_struct' initializer initializes too many fields
+; CHECK: error: 'inner_struct' initializer initializes too many fields
t9 STRUCT 3
-// CHECK: error: alignment must be a power of two; was 3
+; CHECK: error: alignment must be a power of two; was 3
t9 ENDS
t10 STRUCT 1, X
-// CHECK: error: Unrecognized qualifier for 'STRUCT' directive; expected none or NONUNIQUE
+; CHECK: error: Unrecognized qualifier for 'STRUCT' directive; expected none or NONUNIQUE
t10 ENDS
t11 STRUCT
diff erent_struct ENDS
-// CHECK: error: mismatched name in ENDS directive; expected 't11'
+; CHECK: error: mismatched name in ENDS directive; expected 't11'
diff --git a/llvm/test/tools/llvm-ml/type_operators.asm b/llvm/test/tools/llvm-ml/type_operators.asm
index 7d5bbe603c85..81183232fd9c 100644
--- a/llvm/test/tools/llvm-ml/type_operators.asm
+++ b/llvm/test/tools/llvm-ml/type_operators.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
.data
diff --git a/llvm/test/tools/llvm-ml/variable.asm b/llvm/test/tools/llvm-ml/variable.asm
index 268a03d608fd..6d3062638754 100644
--- a/llvm/test/tools/llvm-ml/variable.asm
+++ b/llvm/test/tools/llvm-ml/variable.asm
@@ -1,4 +1,4 @@
-# RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
+; RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
.data
t1_value equ 1 or 2
More information about the llvm-commits
mailing list