@@ -50,28 +50,28 @@ class SanitizerArgsTest : public ::testing::Test {
50
50
protected:
51
51
const Command &emulateSingleCompilation (std::vector<std::string> ExtraArgs,
52
52
std::vector<std::string> ExtraFiles) {
53
- assert (!Driver && " Running twice is not allowed" );
53
+ assert (!DriverInstance && " Running twice is not allowed" );
54
54
55
55
llvm::IntrusiveRefCntPtr<DiagnosticOptions> Opts = new DiagnosticOptions;
56
56
DiagnosticsEngine Diags (
57
57
new DiagnosticIDs, Opts,
58
58
new TextDiagnosticPrinter (llvm::errs (), Opts.get ()));
59
- Driver .emplace (ClangBinary, " x86_64-unknown-linux-gnu" , Diags,
60
- prepareFS (ExtraFiles));
59
+ DriverInstance .emplace (ClangBinary, " x86_64-unknown-linux-gnu" , Diags,
60
+ prepareFS (ExtraFiles));
61
61
62
62
std::vector<const char *> Args = {ClangBinary};
63
63
for (const auto &A : ExtraArgs)
64
64
Args.push_back (A.c_str ());
65
65
Args.push_back (" -c" );
66
66
Args.push_back (InputFile);
67
67
68
- Compilation .reset (Driver ->BuildCompilation (Args));
68
+ CompilationJob .reset (DriverInstance ->BuildCompilation (Args));
69
69
70
70
if (Diags.hasErrorOccurred ())
71
71
ADD_FAILURE () << " Error occurred while parsing compilation arguments. "
72
72
" See stderr for details." ;
73
73
74
- const auto &Commands = Compilation ->getJobs ().getJobs ();
74
+ const auto &Commands = CompilationJob ->getJobs ().getJobs ();
75
75
assert (Commands.size () == 1 );
76
76
return *Commands.front ();
77
77
}
@@ -88,8 +88,8 @@ class SanitizerArgsTest : public ::testing::Test {
88
88
return FS;
89
89
}
90
90
91
- llvm::Optional<Driver> Driver ;
92
- std::unique_ptr<driver::Compilation> Compilation ;
91
+ llvm::Optional<Driver> DriverInstance ;
92
+ std::unique_ptr<driver::Compilation> CompilationJob ;
93
93
};
94
94
95
95
TEST_F (SanitizerArgsTest, Blacklists) {
0 commit comments