Revert "[MC] Support symbolic expressions in assembly directives"

This reverts commit r271028, it causes the directive_fill.s to fail.

llvm-svn: 271038

3 files changed, 28 insertions, 47 deletions

diff --git a/llvm/test/MC/AsmParser/directive_fill.s b/llvm/test/MC/AsmParser/directive_fill.s
index 96a4bd09c45..28d7fa2a343 100644
--- a/llvm/test/MC/AsmParser/directive_fill.s
+++ b/llvm/test/MC/AsmParser/directive_fill.s
@@ -1,53 +1,66 @@
 # RUN: llvm-mc -triple i386-unknown-unknown %s 2> %t.err | FileCheck %s
 # RUN: FileCheck --check-prefix=CHECK-WARNINGS %s < %t.err
-# RUN: llvm-mc -triple i386-unknown-unknown -filetype=obj -o %t.o %s 2> %t.err
-# RUN: FileCheck --check-prefix=OBJ-WARNINGS %s < %t.err
 
 # CHECK: TEST0:
-# CHECK: .fill 1, 1, 0xa
+# CHECK: .byte 10
 TEST0:  
         .fill 1, 1, 10
 
 # CHECK: TEST1:
-# CHECK: .fill 2, 2, 0x3
+# CHECK: .short 3
+# CHECK: .short 3
 TEST1:  
         .fill 2, 2, 3
 
 # CHECK: TEST2:
-# CHECK: .fill 1, 8, 0x4
+# CHECK: .long 4
+# CHECK: .long 0
 TEST2:  
         .fill 1, 8, 4
 
 # CHECK: TEST3
-# CHECK: .fill 4
+# CHECK: .byte 0
+# CHECK: .byte 0
+# CHECK: .byte 0
+# CHECK: .byte 0
 TEST3:
 	.fill 4
 
 # CHECK: TEST4
-# CHECK: .fill 4, 2
+# CHECK: .short 0
+# CHECK: .short 0
+# CHECK: .short 0
+# CHECK: .short 0
 TEST4:
 	.fill 4, 2
 
 # CHECK: TEST5
-# CHECK: .fill 4, 3, 0x2
+# CHECK: .short  2
+# CHECK: .byte   0
+# CHECK: .short  2
+# CHECK: .byte   0
+# CHECK: .short  2
+# CHECK: .byte   0
+# CHECK: .short  2
+# CHECK: .byte   0
 TEST5:
 	.fill 4, 3, 2
 
 # CHECK: TEST6
-# CHECK: .fill 1, 8, 0x2
+# CHECK: .long 2
+# CHECK: .long 0
 # CHECK-WARNINGS: '.fill' directive with size greater than 8 has been truncated to 8
 TEST6:
 	.fill 1, 9, 2
 
 # CHECK: TEST7
-# CHECK: .fill 1, 8, 0x100000000
+# CHECK: .long 0
+# CHECK: .long 0
 # CHECK-WARNINGS: '.fill' directive pattern has been truncated to 32-bits
 TEST7:
 	.fill 1, 8, 1<<32
 
-# CHECK: TEST8
-# CHECK: .fill -1, 8, 0x1
-# OBJ-WARNINGS: '.fill' directive with negative repeat count has no effect
+# CHECK-WARNINGS: '.fill' directive with negative repeat count has no effect
 TEST8:
 	.fill -1, 8, 1
 
@@ -56,17 +69,7 @@ TEST9:
 	.fill 1, -1, 1
 
 # CHECK: TEST10
-# CHECK: .fill 1, 3, 0x12345678
+# CHECK: .short  22136
+# CHECK: .byte   52
 TEST10:
 	.fill 1, 3, 0x12345678
-
-# CHECK: TEST11
-# CHECK: .fill TEST11-TEST10, 1, 0x0
-TEST11:
-  .fill TEST11 - TEST10
-
-# CHECK: TEST12
-# CHECK: .fill TEST11-TEST12, 3, 0x12345678
-# OBJ-WARNINGS: '.fill' directive with negative repeat count has no effect
-TEST12:
-  .fill TEST11 - TEST12, 3, 0x12345678
diff --git a/llvm/test/MC/AsmParser/directive_space.s b/llvm/test/MC/AsmParser/directive_space.s
index eadc4fc6383..fc5aeb4b633 100644
--- a/llvm/test/MC/AsmParser/directive_space.s
+++ b/llvm/test/MC/AsmParser/directive_space.s
@@ -14,8 +14,3 @@ TEST1:
 # CHECK: .space 1
 TEST2:
         .skip 1
-
-# CHECK: TEST3
-# CHECK: .space TEST0-TEST1
-TEST3:
-        .space TEST0 - TEST1
diff --git a/llvm/test/MC/AsmParser/symbolic-expression.s b/llvm/test/MC/AsmParser/symbolic-expression.s
deleted file mode 100644
index 4b780dbcf82..00000000000
--- a/llvm/test/MC/AsmParser/symbolic-expression.s
+++ /dev/null
@@ -1,17 +0,0 @@
-# RUN: llvm-mc -filetype=obj -triple=i386-unknown-elf %s | llvm-objdump -t - | FileCheck %s
-
-# CHECK: 00000000         .text           00000000 TEST0
-TEST0:
-  .fill 0x10
-# CHECK: 00000010         .text           00000000 TEST1
-TEST1:
-  .fill TEST1 - TEST0 + 0x5
-# CHECK: 00000025         .text           00000000 TEST2
-TEST2:
-  .zero TEST2 - (TEST1 + 0x5)
-# CHECK: 00000035         .text           00000000 TEST3
-TEST3:
-  .skip (TEST1 - TEST0) * 2
-# CHECK: 00000055         .text           00000000 TEST4
-TEST4:
-  .space TEST2 - TEST1, 1