Update test to explicitly test with -fintegrated-as and -fno-integrated-as and to expect warnings when appropriate.

[dyung]

Summary

This is for fixing tests with out-of-tree compilers that default to -fno-integrated-as.

[thakis]

clang/lib/Driver/ToolChains/Clang.cpp

3559 ↗

(On Diff #214227)

We shouldn't claim the OPT_m flags if we don't use integrated-as. Claiming Wa_COMMA and Xassembler makes sense to me.

[dyung]

clang/lib/Driver/ToolChains/Clang.cpp

3559 ↗

(On Diff #214227)

If we do not, then one of the tests you included in this change will fail if a platform defaults to not using the integrated assembler. Should I remove this change and just update the test to explicitly set -fintegrated-as/-fno-integrated-as and test for the expected result?

[thakis]

clang/lib/Driver/ToolChains/Clang.cpp

3559 ↗

(On Diff #214227)

Yes, tests for the -m flags should pass -fintegrated-as. Sorry about missing that. Out of curiosity, which platforms still use external assemblers by default?

[dyung]

Reverted changes in Clang.cpp and updated test to expect warning when an external assembler is requested.

[dyung]

clang/lib/Driver/ToolChains/Clang.cpp

3559 ↗

(On Diff #214227)

Thanks, I have done this and uploaded a new revision with the test changes.

We use an external assembler internally for some legacy projects/reasons.

[thakis]

Thanks! Looks like the change to the cpp file got lost? I only see the test change now.

[dyung]

In D65974#1623140, @thakis wrote:

Thanks! Looks like the change to the cpp file got lost? I only see the test change now.

Yes, I abandoned that change as I thought you said it was unnecessary and just left the test changes, but updated the test changes to look for the warning when a -m option is used with -fno-integrated-as.

[dyung]

Oh, I just re-read your comments and realized that we should claim the Wa_COMMA and Xassembler arguments, I'll reinstate the change to just claim those.

[dyung]

Actually it seems your original change already implemented that, so I think only the updated test change that I made is needed. Let me know if you disagree with that.

[thakis]

Can you update the patch description to say what the patch does? With that, lgtm :)

[thakis]

Something like "fix test for out-of-tree targets that don't enable the internal assembler by default by explicitly passing -fintegrated-as everywhere" or something like that.

[dyung]

In D65974#1623368, @thakis wrote:

Something like "fix test for out-of-tree targets that don't enable the internal assembler by default by explicitly passing -fintegrated-as everywhere" or something like that.

Thanks. I had to figure out how to update the summary as I have never done that before!

Let me know if you have any other objections, otherwise, I'll make a further update to the summary just before I commit the change.

[thakis]

lgtm

Thanks. I moved your new description into the (previously still stale) revision title and put in a new description. lgtm.

cfe/trunk/test/Driver/as-options.s

 // RUN:   -Ifoo_dir -### 2>&1 \
 // RUN:   | FileCheck %s
 
 // CHECK: "-I" "foo_dir"
 
 // Test that assembler options don't cause warnings when there's no assembler
 // stage.
 
-// RUN: %clang -mincremental-linker-compatible -E \
+// RUN: %clang -mincremental-linker-compatible -E -fintegrated-as \
 // RUN:   -o /dev/null -x c++ %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
-// RUN: %clang -mincremental-linker-compatible -E \
+// RUN: %clang -mincremental-linker-compatible -E -fno-integrated-as \
+// RUN:   -o /dev/null -x c++ %s 2>&1 \
+// RUN:   | FileCheck --check-prefix=WARN --allow-empty %s
+
+// RUN: %clang -mincremental-linker-compatible -E -fintegrated-as \
 // RUN:   -o /dev/null -x assembler-with-cpp %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
+// RUN: %clang -mincremental-linker-compatible -E -fno-integrated-as \
+// RUN:   -o /dev/null -x assembler-with-cpp %s 2>&1 \
+// RUN:   | FileCheck --check-prefix=WARN --allow-empty %s
+
 // RUN: %clang -mimplicit-it=always -target armv7-linux-gnueabi -E \
-// RUN:   -o /dev/null -x c++ %s 2>&1 \
+// RUN:   -fintegrated-as -o /dev/null -x c++ %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
 // RUN: %clang -mimplicit-it=always -target armv7-linux-gnueabi -E \
-// RUN:   -o /dev/null -x assembler-with-cpp %s 2>&1 \
+// RUN:   -fno-integrated-as -o /dev/null -x c++ %s 2>&1 \
+// RUN:   | FileCheck --check-prefix=WARN --allow-empty %s
+
+// RUN: %clang -mimplicit-it=always -target armv7-linux-gnueabi -E \
+// RUN:   -fintegrated-as -o /dev/null -x assembler-with-cpp %s 2>&1 \
+// RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
+// RUN: %clang -mimplicit-it=always -target armv7-linux-gnueabi -E \
+// RUN:   -fno-integrated-as -o /dev/null -x assembler-with-cpp %s 2>&1 \
+// RUN:   | FileCheck --check-prefix=WARN --allow-empty %s
+
+// RUN: %clang -Wa,-mbig-obj -target i386-pc-windows -E -fintegrated-as \
+// RUN:   -o /dev/null -x c++ %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
-// RUN: %clang -Wa,-mbig-obj -target i386-pc-windows -E \
+// RUN: %clang -Wa,-mbig-obj -target i386-pc-windows -E -fno-integrated-as \
 // RUN:   -o /dev/null -x c++ %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
-// RUN: %clang -Wa,-mbig-obj -target i386-pc-windows -E \
+
+// RUN: %clang -Wa,-mbig-obj -target i386-pc-windows -E -fintegrated-as \
 // RUN:   -o /dev/null -x assembler-with-cpp %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
-// RUN: %clang -Xassembler -mbig-obj -target i386-pc-windows -E \
+// RUN: %clang -Wa,-mbig-obj -target i386-pc-windows -E -fno-integrated-as \
+// RUN:   -o /dev/null -x assembler-with-cpp %s 2>&1 \
+// RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
+
+// RUN: %clang -Xassembler -mbig-obj -target i386-pc-windows -E -fintegrated-as \
 // RUN:   -o /dev/null -x c++ %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
 // RUN: %clang -Xassembler -mbig-obj -target i386-pc-windows -E \
+// RUN:   -fno-integrated-as -o /dev/null -x c++ %s 2>&1 \
+// RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
+
+// RUN: %clang -Xassembler -mbig-obj -target i386-pc-windows -E -fintegrated-as \
 // RUN:   -o /dev/null -x assembler-with-cpp %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
+// RUN: %clang -Xassembler -mbig-obj -target i386-pc-windows -E \
+// RUN:   -fno-integrated-as -o /dev/null -x assembler-with-cpp %s 2>&1 \
+// RUN:   | FileCheck --check-prefix=NOWARN --allow-empty %s
+
 // NOWARN-NOT: unused
 
 // Test that unsupported arguments do not cause errors when -fno-integrated-as
 // is set.
 // RUN: %clang -Wa,-mno-warn-deprecated -fno-integrated-as %s -S 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOERROR --allow-empty %s
 // NOERROR-NOT: error: unsupported argument '-mno-warn-deprecated' to option 'Wa,'