clang-cl: Don't treat linker input files differently when /TP or /TC is specified.

[• ehsan]

Summary

This fixes http://llvm.org/PR20923.

[hans]

lib/Driver/Driver.cpp

1079–1089

I would not base this check on what mode we're emulating, but which flag is being used as InputTypeArg, i.e. check that InputTypeArg is now OPT_x.

Also, we probably shouldn't do InputTypeArg->claim() if we don't end up using it to set the type.

[hans]

lib/Driver/Driver.cpp

1079–1089

Oops, s/now/not/ in my comment above.

[• ehsan]

Addressed the review comments.

[hans]

lgtm with nits addressed.

lib/Driver/Driver.cpp

1080

Nit: I think we've usually spelled the cl.exe style options with slashes in comments.

test/Driver/cl-inputs.c

39

This should warn that /TP is unused. I'd add a check for that.

[• ehsan]

test/Driver/cl-inputs.c

39

It doesn't right now, because we get the /TC or /TP option using getLastArg which claims the argument. I'll fix that in a separate patch (checked with Hans on IRC.)

[• ehsan]

Closed by commit rL217699 (authored by @ehsan).

lib/Driver/Driver.cpp

if (A->getOption().getKind() == Option::InputClass) {
         if (Ty != types::TY_Object) {
           if (Args.hasArg(options::OPT_ObjC))
             Ty = types::TY_ObjC;
           else if (Args.hasArg(options::OPT_ObjCXX))
             Ty = types::TY_ObjCXX;
         }
       } else {
         assert(InputTypeArg && "InputType set w/o InputTypeArg");
-        InputTypeArg->claim();
+        if (!InputTypeArg->getOption().matches(options::OPT_x)) {
+          // If emulating cl.exe, make sure that -TC and -TP don't affect input
+          // object files.
+          const char *Ext = strrchr(Value, '.');
+          if (Ext && TC.LookupTypeForExtension(Ext + 1) == types::TY_Object)
+            Ty = types::TY_Object;
+        }
+        if (Ty == types::TY_INVALID) {
           Ty = InputType;
+          InputTypeArg->claim();
+        }
       }
 
       if (DiagnoseInputExistence(*this, Args, Value))
         Inputs.push_back(std::make_pair(Ty, A));
 
     } else if (A->getOption().matches(options::OPT__SLASH_Tc)) {
       StringRef Value = A->getValue();
       if (DiagnoseInputExistence(*this, Args, Value)) {

test/Driver/cl-inputs.c

 // Tp-NOT: note
 
 // RUN: %clang_cl /TP /TC /TP -### -- %s 2>&1 | FileCheck -check-prefix=WARN %s
 // WARN: warning: overriding '/TP' option with '/TC'
 // WARN: warning: overriding '/TC' option with '/TP'
 // WARN: note: The last /TC or /TP option takes precedence over earlier instances
 // WARN-NOT: note
 
+// RUN: env LIB=%S/Inputs/cl-libs %clang_cl /c /TP cl-test.lib %s -### 2>&1 | FileCheck -check-prefix=TPlib %s
+// TPlib: warning: cl-test.lib: 'linker' input unused
+// TPlib-NOT: cl-test.lib
+
+// RUN: env LIB=%S/Inputs/cl-libs %clang_cl /c /TC cl-test.lib %s -### 2>&1 | FileCheck -check-prefix=TClib %s
+// TClib: warning: cl-test.lib: 'linker' input unused
+// TClib-NOT: cl-test.lib
+
 // RUN: not %clang_cl - 2>&1 | FileCheck -check-prefix=STDIN %s
 // STDIN: error: use /Tc or /Tp
 
 // RUN: %clang_cl -### /Tc - 2>&1 | FileCheck -check-prefix=STDINTc %s
 // STDINTc: "-x" "c"
 
 // RUN: env LIB=%S/Inputs/cl-libs %clang_cl -### -- %s cl-test.lib 2>&1 | FileCheck -check-prefix=LIBINPUT %s
 // LIBINPUT: link.exe"
 // LIBINPUT: "cl-test.lib"
 
 // RUN: env LIB=%S/Inputs/cl-libs %clang_cl -### -- %s cl-test2.lib 2>&1 | FileCheck -check-prefix=LIBINPUT2 %s
 // LIBINPUT2: error: no such file or directory: 'cl-test2.lib'
 // LIBINPUT2: link.exe"
 // LIBINPUT2-NOT: "cl-test2.lib"
 
 void f();