[compiler-rt] r365841 - Use clang driver for libfuzzer tests on Windows

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Thu Jul 11 16:20:04 2019
New Revision: 365841

URL: http://llvm.org/viewvc/llvm-project?rev=365841&view=rev
Log:
Use clang driver for libfuzzer tests on Windows

Summary:
There's no real reason to use clang-cl on Windows, the clang driver
works just as well. This fixes a test which uses the -O0 flag, which was
recently removed from clang-cl to match MSVC, which lacks this flag.

While I'm here, remove the explicit -std=c++11 flag. Previously, this
flag was necessary when the default C++ standard was C++98. Now that the
default is C++14, this is no longer necessary. It's problematic on
Windows, because the Visual C++ standard library relies on C++14
features, and attempting to compile it with C++11 results in errors.
Rather than adding logic to conditionally set the standard to C++11 only
on non-Win, this flag can be removed.

See http://lab.llvm.org:8011/builders/clang-x64-windows-msvc and
https://reviews.llvm.org/D64506.

Reviewers: morehouse, thakis

Subscribers: #sanitizers, llvm-commits

Tags: #sanitizers, #llvm

Differential Revision: https://reviews.llvm.org/D64587

Modified:
    compiler-rt/trunk/test/fuzzer/lit.cfg.py
    compiler-rt/trunk/test/fuzzer/windows-opt-ref.test

Modified: compiler-rt/trunk/test/fuzzer/lit.cfg.py
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/fuzzer/lit.cfg.py?rev=365841&r1=365840&r2=365841&view=diff
==============================================================================
--- compiler-rt/trunk/test/fuzzer/lit.cfg.py (original)
+++ compiler-rt/trunk/test/fuzzer/lit.cfg.py Thu Jul 11 16:20:04 2019
@@ -66,10 +66,8 @@ def generate_compiler_cmd(is_cpp=True, f
   compiler_cmd = config.clang
   extra_cmd = config.target_flags
 
-  if is_cpp and 'windows-msvc' in config.target_triple:
-    std_cmd = '--driver-mode=cl'
-  elif is_cpp:
-    std_cmd = '--driver-mode=g++ -std=c++11'
+  if is_cpp:
+    std_cmd = '--driver-mode=g++'
   else:
     std_cmd = ''
 

Modified: compiler-rt/trunk/test/fuzzer/windows-opt-ref.test
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/fuzzer/windows-opt-ref.test?rev=365841&r1=365840&r2=365841&view=diff
==============================================================================
--- compiler-rt/trunk/test/fuzzer/windows-opt-ref.test (original)
+++ compiler-rt/trunk/test/fuzzer/windows-opt-ref.test Thu Jul 11 16:20:04 2019
@@ -1,7 +1,7 @@
 REQUIRES: windows
 // Verify that the linker eliminating unreferenced functions (/OPT:REF) does not
 // strip sancov module constructor.
-RUN: %cpp_compiler %S/SimpleCmpTest.cpp -o %t-SimpleCmpTest /link /OPT:REF
+RUN: %cpp_compiler %S/SimpleCmpTest.cpp -o %t-SimpleCmpTest -Wl,-OPT:REF
 
 RUN: not %run %t-SimpleCmpTest -seed=1 -runs=100000000 2>&1 | FileCheck %s