Reapply "[Dexter] Remove builder from Dexter"

Fixes a test which was broken on the green dragon buildbot, and further
failures on the SIE buildbot.

This reverts commit 8df9eff.

cross-project-tests/debuginfo-tests/dexter-tests/aggregate-indirect-arg.cpp

@@ -1,9 +1,9 @@
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
 //
+// RUN: %clang -O0 -g -lstdc++ %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" \
-// RUN:     --ldflags="-lstdc++" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 // Radar 8945514
 
 class SVal {

cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp

@@ -8,10 +8,9 @@
 // lldb-8, even outside of dexter, will sometimes trigger an asan fault in
 // the debugged process and generally freak out.
 
+// RUN: %clang -O1 -glldb -fsanitize=address -arch x86_64 %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-O1 -glldb -fsanitize=address -arch x86_64" \
-// RUN:     --ldflags="-fsanitize=address" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 #include <deque>
 
 struct A {

cross-project-tests/debuginfo-tests/dexter-tests/asan.c

@@ -3,10 +3,10 @@
 //           Zorg configures the ASAN stage2 bots to not build the asan
 //           compiler-rt. Only run this test on non-asanified configurations.
 //
+// RUN: %clang --driver-mode=gcc -O0 -glldb -fblocks -arch x86_64 \
+// RUN:     -fsanitize=address %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang-c' --debugger 'lldb' \
-// RUN:     --cflags "--driver-mode=gcc -O0 -glldb -fblocks -arch x86_64 \
-// RUN:     -fsanitize=address" --ldflags="-fsanitize=address" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 
 struct S {
   int a[8];

cross-project-tests/debuginfo-tests/dexter-tests/ctor.cpp

@@ -1,8 +1,9 @@
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
 //
+// RUN: %clang -O0 -glldb %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' --cflags "-O0 -glldb" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 
 class A {
 public:

cross-project-tests/debuginfo-tests/dexter-tests/dbg-arg.c

@@ -2,9 +2,9 @@
 // UNSUPPORTED: system-windows
 //
 // This test case checks debug info during register moves for an argument.
+// RUN: %clang -m64 -mllvm -fast-isel=false -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder clang-c --debugger 'lldb' \
-// RUN:     --cflags "-m64 -mllvm -fast-isel=false -g" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 //
 // Radar 8412415
 

cross-project-tests/debuginfo-tests/dexter-tests/deferred_globals.cpp

@@ -4,10 +4,9 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-
+// RUN: %clang -O0 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-g -O0" -v -- %s
+// RUN:     --binary  %t --debugger 'lldb' -v -- %s
 
 const int d = 100;
 

cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: system-windows
 //
-// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
-// RUN:      --debugger 'dbgeng' --cflags '/Z7 /Zi' --ldflags '/Z7 /Zi' -- %s
+// RUN: %clang_cl /Z7 /Zi %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 
 // Check that global constants have debug info.
 

cross-project-tests/debuginfo-tests/dexter-tests/hello.c

@@ -1,7 +1,7 @@
 // REQUIRES: system-windows
 //
-// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
-// RUN:      --debugger 'dbgeng' --cflags '/Z7 /Zi' --ldflags '/Z7 /Zi' -- %s
+// RUN: %clang_cl /Z7 /Zi %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 
 #include <stdio.h>
 int main() {

cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp

@@ -1,12 +1,11 @@
 // REQUIRES: system-windows
 //
-// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
-// RUN:      --debugger 'dbgeng' --cflags '/Od /Z7 /Zi' \
-// RUN:      --ldflags '/Od /Z7 /Zi' -- %s
+// RUN: %clang_cl /Od /Z7 /Zi %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 //
-// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
-// RUN:      --debugger 'dbgeng' --cflags '/O2 /Z7 /Zi' \
-// RUN:      --ldflags '/O2 /Z7 /Zi' -- %s
+// RUN: %clang_cl /O2 /Z7 /Zi %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --binary %t \
+// RUN:      --debugger 'dbgeng' -- %s
 
 // This code is structured to have an early exit with an epilogue in the middle
 // of the function, which creates a gap between the beginning of the inlined

cross-project-tests/debuginfo-tests/dexter-tests/memvars/bitcast.c

@@ -3,8 +3,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder 'clang-c' --cflags "-O3 -glldb" -- %s
+// RUN: %clang -O3 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 
 //// Adapted from https://bugs.llvm.org/show_bug.cgi?id=34136#c1
 //// LowerDbgDeclare has since been updated to look through bitcasts. We still

cross-project-tests/debuginfo-tests/dexter-tests/memvars/const-branch.c

@@ -3,8 +3,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder 'clang-c' --cflags "-O3 -glldb" -- %s
+// RUN: %clang -O3 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 
 //// Adapted from https://bugs.llvm.org/show_bug.cgi?id=34136#c4
 

cross-project-tests/debuginfo-tests/dexter-tests/memvars/ctrl-flow.c

@@ -1,7 +1,7 @@
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder clang-c  --cflags "-O2 -glldb" -- %s
+// RUN: %clang -O2 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 
 //// Check that we give good locations to a variable ('local') which is escaped
 //// down some control paths and not others. This example is handled well currently.

cross-project-tests/debuginfo-tests/dexter-tests/memvars/implicit-ptr.c

@@ -3,8 +3,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder 'clang-c'  --cflags "-O3 -glldb" -- %s
+// RUN: %clang -O3 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 
 //// Check that 'param' in 'fun' can be read throughout, and that 'pa' and 'pb'
 //// can be dereferenced in the debugger even if we can't provide the pointer

cross-project-tests/debuginfo-tests/dexter-tests/memvars/inline-escaping-function.c

@@ -3,8 +3,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder 'clang-c'  --cflags "-O3 -glldb" -- %s
+// RUN: %clang -O3 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 
 // 1. param is escaped by inlineme(&param) so it is not promoted by
 //    SROA/mem2reg.

cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining-dse.c

@@ -3,8 +3,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder clang-c  --cflags "-O2 -glldb" -- %s
+// RUN: %clang -O2 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 //
 //// Check that once-escaped variable 'param' can still be read after we
 //// perform inlining + mem2reg, and that we see the DSE'd value 255.

cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining.c

@@ -1,7 +1,7 @@
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder clang-c  --cflags "-O2 -glldb" -- %s
+// RUN: %clang -O2 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 //
 //// Check that the once-escaped variable 'param' can still be read after
 //// we perform inlining + mem2reg. See D89810 and D85555.

cross-project-tests/debuginfo-tests/dexter-tests/memvars/loop.c

@@ -3,8 +3,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder 'clang-c'  --cflags "-O3 -glldb" -- %s
+// RUN: %clang -O3 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 
 //// Check that escaped local 'param' in function 'fun' has sensible debug info
 //// after the escaping function 'use' gets arg promotion (int* -> int). Currently

cross-project-tests/debuginfo-tests/dexter-tests/memvars/merged-store.c

@@ -3,8 +3,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder 'clang-c'  --cflags "-O3 -glldb" -- %s
+// RUN: %clang -O3 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 
 // 1. parama is escaped by esc(&parama) so it is not promoted by
 //    SROA/mem2reg.

cross-project-tests/debuginfo-tests/dexter-tests/memvars/ptr-to.c

@@ -4,8 +4,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder clang-c --cflags "-O2 -glldb" -- %s
+// RUN: %clang -O2 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 //
 //// Check that a pointer to a variable living on the stack dereferences to the
 //// variable value.

cross-project-tests/debuginfo-tests/dexter-tests/memvars/struct-dse.c

@@ -4,8 +4,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
-// RUN:     --builder clang-c --cflags "-O2 -glldb" -- %s
+// RUN: %clang -O2 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
 //
 //// Check debug-info for the escaped struct variable num is reasonable.
 

cross-project-tests/debuginfo-tests/dexter-tests/memvars/unused-merged-value.c

@@ -5,8 +5,8 @@
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
-// RUN: %dexter --fail-lt 0.1 -w --debugger lldb \
-// RUN:     --builder 'clang-c'  --cflags "-O3 -glldb" -- %s
+// RUN: %clang -O3 -glldb %s -o %t
+// RUN: %dexter --fail-lt 0.1 -w --debugger lldb --binary %t -- %s
 // See NOTE at end for more info about the RUN command.
 
 // 1. SROA/mem2reg fully promotes parama.

cross-project-tests/debuginfo-tests/dexter-tests/namespace.cpp

@@ -5,9 +5,9 @@
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
 
+// RUN: %clang -g -O0 %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-g -O0" -v -- %s
+// RUN:     --binary %t --debugger 'lldb' -v -- %s
 
 #include <stdio.h>
 

cross-project-tests/debuginfo-tests/dexter-tests/nrvo-string.cpp

@@ -7,13 +7,13 @@
 //           Zorg configures the ASAN stage2 bots to not build the asan
 //           compiler-rt. Only run this test on non-asanified configurations.
 //
+// RUN: %clang -O0 -glldb -fno-exceptions %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-O0 -glldb -fno-exceptions" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 //
+// RUN: %clang -O1 -glldb -fno-exceptions %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-O1 -glldb -fno-exceptions" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 //
 // PR34513
 volatile int sideeffect = 0;

cross-project-tests/debuginfo-tests/dexter-tests/nrvo.cpp

@@ -3,8 +3,8 @@
 //
 // REQUIRES: system-windows
 //
-// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
-// RUN:      --debugger 'dbgeng' --cflags '/Z7 /Zi' --ldflags '/Z7 /Zi' -- %s
+// RUN: %clang_cl /Z7 /Zi %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 
 struct string {
   string() {}

cross-project-tests/debuginfo-tests/dexter-tests/optnone-fastmath.cpp

@@ -1,9 +1,9 @@
+// RUN: %clang -O2 -ffast-math -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-ffast-math -O2 -g" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
+// RUN: %clang -O0 -ffast-math -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-ffast-math -O0 -g" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows

cross-project-tests/debuginfo-tests/dexter-tests/optnone-loops.cpp

@@ -5,9 +5,9 @@
 // UNSUPPORTED: system-windows
 // UNSUPPORTED: system-darwin
 
+// RUN: %clang -O2 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-O2 -g" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 
 // A simple loop of assignments.
 // With optimization level > 0 the compiler reorders basic blocks

cross-project-tests/debuginfo-tests/dexter-tests/optnone-simple-functions.cpp

@@ -1,9 +1,9 @@
+// RUN: %clang -O2 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-O2 -g" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
+// RUN: %clang -O0 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-O0 -g" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 
 // REQUIRES: lldb, D136396
 // UNSUPPORTED: system-windows

cross-project-tests/debuginfo-tests/dexter-tests/optnone-struct-and-methods.cpp

@@ -1,9 +1,9 @@
+// RUN: %clang++ -O2 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-g -O2" -v -- %s
+// RUN:     --binary %t --debugger 'lldb' -v -- %s
+// RUN: %clang++ -O0 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-g -O0" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows

cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp

@@ -1,9 +1,9 @@
+// RUN: %clang++ -O2 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-g -O2" -v -- %s
+// RUN:     --binary %t --debugger 'lldb' -v -- %s
+// RUN: %clang++ -O0 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-g -O0" -- %s
+// RUN:     --binary %t --debugger 'lldb' -- %s
 
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
@@ -77,12 +77,11 @@ T test2(T x, T y) {
 //   DexExpectWatchValue('tmp[1]', 8, on_line=ref('break_2'))
 //   DexExpectWatchValue('tmp[2]', 10, on_line=ref('break_2'))
 //   DexExpectWatchValue('tmp[3]', 12, on_line=ref('break_2'))
-// DexLimitSteps('i', 3, on_line=ref('break_3'))
+// DexLimitSteps('i', 3, from_line=ref('break_3'), to_line=ref('break_5'))
 //   DexExpectWatchValue('tmp[0]', 63, on_line=ref('break_3'))
 //   DexExpectWatchValue('tmp[1]', 94, on_line=ref('break_3'))
 //   DexExpectWatchValue('tmp[2]', 95, on_line=ref('break_3'))
 //   DexExpectWatchValue('tmp[3]', 120, on_line=ref('break_3'))
-// DexLimitSteps('i', 3, on_line=ref('break_5'))
 //   DexExpectWatchValue('tmp[0]', 15, on_line=ref('break_5'))
 
 template<typename T>

cross-project-tests/debuginfo-tests/dexter-tests/realigned-frame.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: system-windows
 //
-// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
-// RUN:      --debugger 'dbgeng' --cflags '/Z7 /Zi' --ldflags '/Z7 /Zi' -- %s
+// RUN: %clang_cl /Z7 /Zi %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 
 // From https://llvm.org/pr38857, where we had issues with stack realignment.
 

cross-project-tests/debuginfo-tests/dexter-tests/stack-var.c

@@ -1,8 +1,8 @@
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
 //
-// RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder clang-c --debugger 'lldb' --cflags "-O -glldb" -- %s
+// RUN: %clang -O -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'lldb' -- %s
 
 void __attribute__((noinline, optnone)) bar(int *test) {}
 int main() {

cross-project-tests/debuginfo-tests/dexter-tests/vla.c

@@ -2,8 +2,8 @@
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
 //
-// RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder clang-c --debugger 'lldb' --cflags "-O0 -glldb" -- %s
+// RUN: %clang -O0 -glldb %s -o %t
+// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'lldb' -- %s
 
 void init_vla(int size) {
   int i;