Skip to content

Commit 28b790b

Browse files
aaronpuchertaaronpuchert
committedJun 15, 2019
[Clang] Rename -split-dwarf-file to -split-dwarf-output
Summary: This is the first in a series of changes trying to align clang -cc1 flags for Split DWARF with those of llc. The unfortunate side effect of having -split-dwarf-output for single file Split DWARF will disappear again in a subsequent change. The change is the result of a discussion in D59673. Reviewers: dblaikie, echristo Reviewed By: dblaikie Differential Revision: https://reviews.llvm.org/D63130 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@363494 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent ce5b229 commit 28b790b

15 files changed

+43
-43
lines changed
 

‎include/clang/Basic/CodeGenOptions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class CodeGenOptions : public CodeGenOptionsBase {
187187

188188
/// The name for the split debug info file that we'll break out. This is used
189189
/// in the backend for setting the name in the skeleton cu.
190-
std::string SplitDwarfFile;
190+
std::string SplitDwarfOutput;
191191

192192
/// The name of the relocation model to use.
193193
llvm::Reloc::Model RelocationModel;

‎include/clang/Driver/CC1Options.td

+1-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ def version : Flag<["-"], "version">,
683683
HelpText<"Print the compiler version">;
684684
def main_file_name : Separate<["-"], "main-file-name">,
685685
HelpText<"Main file name to use for debug info">;
686-
def split_dwarf_file : Separate<["-"], "split-dwarf-file">,
686+
def split_dwarf_output : Separate<["-"], "split-dwarf-output">,
687687
HelpText<"File name to use for split dwarf debug info output">;
688688

689689
}

‎lib/CodeGen/BackendUtil.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ static void initTargetOptions(llvm::TargetOptions &Options,
472472
Options.EmitAddrsig = CodeGenOpts.Addrsig;
473473

474474
if (CodeGenOpts.getSplitDwarfMode() != CodeGenOptions::NoFission)
475-
Options.MCOptions.SplitDwarfFile = CodeGenOpts.SplitDwarfFile;
475+
Options.MCOptions.SplitDwarfFile = CodeGenOpts.SplitDwarfOutput;
476476
Options.MCOptions.MCRelaxAll = CodeGenOpts.RelaxAll;
477477
Options.MCOptions.MCSaveTempLabels = CodeGenOpts.SaveTempLabels;
478478
Options.MCOptions.MCUseDwarfDirectory = !CodeGenOpts.NoDwarfDirectoryAsm;
@@ -862,9 +862,9 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
862862
break;
863863

864864
default:
865-
if (!CodeGenOpts.SplitDwarfFile.empty() &&
865+
if (!CodeGenOpts.SplitDwarfOutput.empty() &&
866866
(CodeGenOpts.getSplitDwarfMode() == CodeGenOptions::SplitFileFission)) {
867-
DwoOS = openOutputFile(CodeGenOpts.SplitDwarfFile);
867+
DwoOS = openOutputFile(CodeGenOpts.SplitDwarfOutput);
868868
if (!DwoOS)
869869
return;
870870
}
@@ -1275,9 +1275,9 @@ void EmitAssemblyHelper::EmitAssemblyWithNewPassManager(
12751275
NeedCodeGen = true;
12761276
CodeGenPasses.add(
12771277
createTargetTransformInfoWrapperPass(getTargetIRAnalysis()));
1278-
if (!CodeGenOpts.SplitDwarfFile.empty() &&
1278+
if (!CodeGenOpts.SplitDwarfOutput.empty() &&
12791279
CodeGenOpts.getSplitDwarfMode() == CodeGenOptions::SplitFileFission) {
1280-
DwoOS = openOutputFile(CodeGenOpts.SplitDwarfFile);
1280+
DwoOS = openOutputFile(CodeGenOpts.SplitDwarfOutput);
12811281
if (!DwoOS)
12821282
return;
12831283
}
@@ -1428,7 +1428,7 @@ static void runThinLTOBackend(ModuleSummaryIndex *CombinedIndex, Module *M,
14281428
Conf.RemarksWithHotness = CGOpts.DiagnosticsWithHotness;
14291429
Conf.RemarksFilename = CGOpts.OptRecordFile;
14301430
Conf.RemarksPasses = CGOpts.OptRecordPasses;
1431-
Conf.DwoPath = CGOpts.SplitDwarfFile;
1431+
Conf.DwoPath = CGOpts.SplitDwarfOutput;
14321432
switch (Action) {
14331433
case Backend_EmitNothing:
14341434
Conf.PreCodeGenModuleHook = [](size_t Task, const Module &Mod) {

‎lib/CodeGen/CGDebugInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ void CGDebugInfo::CreateCompileUnit() {
616616
CGOpts.DwarfDebugFlags, RuntimeVers,
617617
(CGOpts.getSplitDwarfMode() != CodeGenOptions::NoFission)
618618
? ""
619-
: CGOpts.SplitDwarfFile,
619+
: CGOpts.SplitDwarfOutput,
620620
EmissionKind, DwoId, CGOpts.SplitDwarfInlining,
621621
CGOpts.DebugInfoForProfiling,
622622
CGM.getTarget().getTriple().isNVPTX()

‎lib/Driver/ToolChains/Clang.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4110,7 +4110,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
41104110
isa<BackendJobAction>(JA));
41114111
const char *SplitDWARFOut;
41124112
if (SplitDWARF) {
4113-
CmdArgs.push_back("-split-dwarf-file");
4113+
CmdArgs.push_back("-split-dwarf-output");
41144114
SplitDWARFOut = SplitDebugName(Args, Input, Output);
41154115
CmdArgs.push_back(SplitDWARFOut);
41164116
}
@@ -6180,7 +6180,7 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
61806180
Arg *A;
61816181
if (getDebugFissionKind(D, Args, A) == DwarfFissionKind::Split &&
61826182
T.isOSBinFormatELF()) {
6183-
CmdArgs.push_back("-split-dwarf-file");
6183+
CmdArgs.push_back("-split-dwarf-output");
61846184
CmdArgs.push_back(SplitDebugName(Args, Input, Output));
61856185
}
61866186

‎lib/Frontend/CompilerInvocation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
726726
Opts.MacroDebugInfo = Args.hasArg(OPT_debug_info_macro);
727727
Opts.WholeProgramVTables = Args.hasArg(OPT_fwhole_program_vtables);
728728
Opts.LTOVisibilityPublicStd = Args.hasArg(OPT_flto_visibility_public_std);
729-
Opts.SplitDwarfFile = Args.getLastArgValue(OPT_split_dwarf_file);
729+
Opts.SplitDwarfOutput = Args.getLastArgValue(OPT_split_dwarf_output);
730730
Opts.SplitDwarfInlining = !Args.hasArg(OPT_fno_split_dwarf_inlining);
731731

732732
if (Arg *A =

‎test/CodeGen/split-debug-filename.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: x86-registered-target
2-
// RUN: %clang_cc1 -debug-info-kind=limited -split-dwarf-file foo.dwo -S -emit-llvm -o - %s | FileCheck %s
3-
// RUN: %clang_cc1 -debug-info-kind=limited -enable-split-dwarf -split-dwarf-file foo.dwo -S -emit-llvm -o - %s | FileCheck --check-prefix=VANILLA %s
4-
// RUN: %clang_cc1 -triple x86_64-unknown-linux -debug-info-kind=limited -enable-split-dwarf -split-dwarf-file %t.dwo -emit-obj -o - %s | llvm-readobj -S - | FileCheck --check-prefix=O %s
2+
// RUN: %clang_cc1 -debug-info-kind=limited -split-dwarf-output foo.dwo -S -emit-llvm -o - %s | FileCheck %s
3+
// RUN: %clang_cc1 -debug-info-kind=limited -enable-split-dwarf -split-dwarf-output foo.dwo -S -emit-llvm -o - %s | FileCheck --check-prefix=VANILLA %s
4+
// RUN: %clang_cc1 -triple x86_64-unknown-linux -debug-info-kind=limited -enable-split-dwarf -split-dwarf-output %t.dwo -emit-obj -o - %s | llvm-readobj -S - | FileCheck --check-prefix=O %s
55
// RUN: llvm-readobj -S %t.dwo | FileCheck --check-prefix=DWO %s
66

77
int main (void) {

‎test/CodeGen/split-debug-single-file.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
// Testing to ensure -enable-split-dwarf=single allows to place .dwo sections into regular output object.
44
// RUN: %clang_cc1 -debug-info-kind=limited -triple x86_64-unknown-linux \
5-
// RUN: -enable-split-dwarf=single -split-dwarf-file %t.o -emit-obj -o %t.o %s -fno-experimental-new-pass-manager
5+
// RUN: -enable-split-dwarf=single -split-dwarf-output %t.o -emit-obj -o %t.o %s -fno-experimental-new-pass-manager
66
// RUN: llvm-readobj -S %t.o | FileCheck --check-prefix=MODE-SINGLE %s
77
// RUN: %clang_cc1 -debug-info-kind=limited -triple x86_64-unknown-linux \
8-
// RUN: -enable-split-dwarf=single -split-dwarf-file %t.o -emit-obj -o %t.o %s -fexperimental-new-pass-manager
8+
// RUN: -enable-split-dwarf=single -split-dwarf-output %t.o -emit-obj -o %t.o %s -fexperimental-new-pass-manager
99
// RUN: llvm-readobj -S %t.o | FileCheck --check-prefix=MODE-SINGLE %s
1010
// MODE-SINGLE: .dwo
1111

1212
// Testing to ensure -enable-split-dwarf=split does not place .dwo sections into regular output object.
1313
// RUN: %clang_cc1 -debug-info-kind=limited -triple x86_64-unknown-linux \
14-
// RUN: -enable-split-dwarf=split -split-dwarf-file %t.o -emit-obj -o %t.o %s -fno-experimental-new-pass-manager
14+
// RUN: -enable-split-dwarf=split -split-dwarf-output %t.o -emit-obj -o %t.o %s -fno-experimental-new-pass-manager
1515
// RUN: llvm-readobj -S %t.o | FileCheck --check-prefix=MODE-SPLIT %s
1616
// RUN: %clang_cc1 -debug-info-kind=limited -triple x86_64-unknown-linux \
17-
// RUN: -enable-split-dwarf=split -split-dwarf-file %t.o -emit-obj -o %t.o %s -fexperimental-new-pass-manager
17+
// RUN: -enable-split-dwarf=split -split-dwarf-output %t.o -emit-obj -o %t.o %s -fexperimental-new-pass-manager
1818
// RUN: llvm-readobj -S %t.o | FileCheck --check-prefix=MODE-SPLIT %s
1919
// MODE-SPLIT-NOT: .dwo
2020

‎test/CodeGen/thinlto-split-dwarf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu \
1212
// RUN: -emit-obj -fthinlto-index=%t.o.thinlto.bc \
13-
// RUN: -o %t.native.o -split-dwarf-file %t.native.dwo -x ir %t.o
13+
// RUN: -o %t.native.o -split-dwarf-output %t.native.dwo -x ir %t.o
1414

1515
// RUN: llvm-readobj -S %t.native.o | FileCheck --check-prefix=O %s
1616
// RUN: llvm-readobj -S %t.native.dwo | FileCheck --check-prefix=DWO %s

‎test/Driver/fuchsia.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,4 @@
204204
// RUN: %clang %s -### --target=x86_64-fuchsia \
205205
// RUN: -gsplit-dwarf -c %s 2>&1 \
206206
// RUN: | FileCheck %s -check-prefix=CHECK-SPLIT-DWARF
207-
// CHECK-SPLIT-DWARF: "-split-dwarf-file" "fuchsia.dwo"
207+
// CHECK-SPLIT-DWARF: "-split-dwarf-output" "fuchsia.dwo"

‎test/Driver/split-debug.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -c -### %s 2> %t
44
// RUN: FileCheck -check-prefix=CHECK-ACTIONS < %t %s
55
//
6-
// CHECK-ACTIONS: "-split-dwarf-file" "split-debug.dwo"
6+
// CHECK-ACTIONS: "-split-dwarf-output" "split-debug.dwo"
77

88
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -c -### %s 2> %t
99
// RUN: FileCheck -check-prefix=CHECK-ACTIONS < %t %s
@@ -14,12 +14,12 @@
1414
// RUN: FileCheck -check-prefix=CHECK-ACTIONS-SINGLE-SPLIT < %t %s
1515
//
1616
// CHECK-ACTIONS-SINGLE-SPLIT: "-enable-split-dwarf=single"
17-
// CHECK-ACTIONS-SINGLE-SPLIT: "-split-dwarf-file" "split-debug.o"
17+
// CHECK-ACTIONS-SINGLE-SPLIT: "-split-dwarf-output" "split-debug.o"
1818

1919
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf=single -c -### -o %tfoo.o %s 2> %t
2020
// RUN: FileCheck -check-prefix=CHECK-SINGLE-SPLIT-FILENAME < %t %s
2121
//
22-
// CHECK-SINGLE-SPLIT-FILENAME: "-split-dwarf-file" "{{.*}}foo.o"
22+
// CHECK-SINGLE-SPLIT-FILENAME: "-split-dwarf-output" "{{.*}}foo.o"
2323

2424
// RUN: %clang -target x86_64-macosx -gsplit-dwarf -c -### %s 2> %t
2525
// RUN: FileCheck -check-prefix=CHECK-NO-ACTIONS < %t %s
@@ -41,7 +41,7 @@
4141
// RUN: %clang -target amdgcn-amd-amdhsa -gsplit-dwarf -c -### %s 2> %t
4242
// RUN: FileCheck -check-prefix=CHECK-OPTION < %t %s
4343
//
44-
// CHECK-OPTION: "-split-dwarf-file" "split-debug.dwo"
44+
// CHECK-OPTION: "-split-dwarf-output" "split-debug.dwo"
4545

4646
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -S -### %s 2> %t
4747
// RUN: FileCheck -check-prefix=CHECK-ASM < %t %s
@@ -58,7 +58,7 @@
5858
//
5959
// CHECK-GMLT-WITH-SPLIT: "-enable-split-dwarf"
6060
// CHECK-GMLT-WITH-SPLIT: "-debug-info-kind=line-tables-only"
61-
// CHECK-GMLT-WITH-SPLIT: "-split-dwarf-file"
61+
// CHECK-GMLT-WITH-SPLIT: "-split-dwarf-output"
6262

6363
// RUN: %clang -target x86_64-unknown-linux-gnu -g -fno-split-dwarf-inlining -S -### %s 2> %t
6464
// RUN: FileCheck -check-prefix=CHECK-NOINLINE-WITHOUT-SPLIT < %t %s
@@ -72,34 +72,34 @@
7272
//
7373
// CHECK-SPLIT-WITH-GMLT: "-enable-split-dwarf"
7474
// CHECK-SPLIT-WITH-GMLT: "-debug-info-kind=limited"
75-
// CHECK-SPLIT-WITH-GMLT: "-split-dwarf-file"
75+
// CHECK-SPLIT-WITH-GMLT: "-split-dwarf-output"
7676

7777
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -fno-split-dwarf-inlining -S -### %s 2> %t
7878
// RUN: FileCheck -check-prefix=CHECK-SPLIT-WITH-NOINL < %t %s
7979
//
8080
// CHECK-SPLIT-WITH-NOINL: "-enable-split-dwarf"
8181
// CHECK-SPLIT-WITH-NOINL: "-debug-info-kind=limited"
82-
// CHECK-SPLIT-WITH-NOINL: "-split-dwarf-file"
82+
// CHECK-SPLIT-WITH-NOINL: "-split-dwarf-output"
8383

8484
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -gmlt -S -### %s 2> %t
8585
// RUN: FileCheck -check-prefix=CHECK-GMLT-OVER-SPLIT < %t %s
8686
//
8787
// CHECK-GMLT-OVER-SPLIT-NOT: "-enable-split-dwarf"
8888
// CHECK-GMLT-OVER-SPLIT: "-debug-info-kind=line-tables-only"
89-
// CHECK-GMLT-OVER-SPLIT-NOT: "-split-dwarf-file"
89+
// CHECK-GMLT-OVER-SPLIT-NOT: "-split-dwarf-output"
9090

9191
// RUN: %clang -target x86_64-unknown-linux-gnu -gmlt -gsplit-dwarf -S -### %s 2> %t
9292
// RUN: FileCheck -check-prefix=CHECK-SPLIT-OVER-GMLT < %t %s
9393
//
9494
// CHECK-SPLIT-OVER-GMLT: "-enable-split-dwarf" "-debug-info-kind=limited"
95-
// CHECK-SPLIT-OVER-GMLT: "-split-dwarf-file"
95+
// CHECK-SPLIT-OVER-GMLT: "-split-dwarf-output"
9696

9797
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -g0 -fno-split-dwarf-inlining -S -### %s 2> %t
9898
// RUN: FileCheck -check-prefix=CHECK-G0-OVER-SPLIT < %t %s
9999
//
100100
// CHECK-G0-OVER-SPLIT-NOT: "-enable-split-dwarf"
101101
// CHECK-G0-OVER-SPLIT-NOT: "-debug-info-kind
102-
// CHECK-G0-OVER-SPLIT-NOT: "-split-dwarf-file"
102+
// CHECK-G0-OVER-SPLIT-NOT: "-split-dwarf-output"
103103

104104
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -g0 -S -### %s 2> %t
105105
// RUN: FileCheck -check-prefix=CHECK-G0-OVER-SPLIT < %t %s
@@ -108,12 +108,12 @@
108108
//
109109
// CHECK-G0-OVER-SPLIT-NOT: "-enable-split-dwarf"
110110
// CHECK-G0-OVER-SPLIT-NOT: "-debug-info-kind
111-
// CHECK-G0-OVER-SPLIT-NOT: "-split-dwarf-file"
111+
// CHECK-G0-OVER-SPLIT-NOT: "-split-dwarf-output"
112112

113113
// RUN: %clang -target x86_64-unknown-linux-gnu -g0 -gsplit-dwarf -S -### %s 2> %t
114114
// RUN: FileCheck -check-prefix=CHECK-SPLIT-OVER-G0 < %t %s
115115
// RUN: %clang -target x86_64-unknown-linux-gnu -g0 -gsplit-dwarf=split -S -### %s 2> %t
116116
// RUN: FileCheck -check-prefix=CHECK-SPLIT-OVER-G0 < %t %s
117117
//
118118
// CHECK-SPLIT-OVER-G0: "-enable-split-dwarf" "-debug-info-kind=limited"
119-
// CHECK-SPLIT-OVER-G0: "-split-dwarf-file"
119+
// CHECK-SPLIT-OVER-G0: "-split-dwarf-output"

‎test/Driver/split-debug.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf -c -### %s 2> %t
44
// RUN: FileCheck -check-prefix=CHECK-ACTIONS < %t %s
55
//
6-
// CHECK-ACTIONS: "-split-dwarf-file" "split-debug.dwo"
6+
// CHECK-ACTIONS: "-split-dwarf-output" "split-debug.dwo"
77

8-
// Check we pass -split-dwarf-file to `as` if -gsplit-dwarf=split.
8+
// Check we pass -split-dwarf-output to `as` if -gsplit-dwarf=split.
99
// RUN: %clang -target x86_64-unknown-linux-gnu -gsplit-dwarf=split -c -### %s 2> %t
1010
// RUN: FileCheck -check-prefix=CHECK-ACTIONS < %t %s
1111

‎test/Misc/cc1as-split-dwarf.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// REQUIRES: x86-registered-target
2-
// RUN: %clang -cc1as -triple x86_64-pc-linux-gnu %s -filetype obj -o %t1 -split-dwarf-file %t2
2+
// RUN: %clang -cc1as -triple x86_64-pc-linux-gnu %s -filetype obj -o %t1 -split-dwarf-output %t2
33
// RUN: llvm-objdump -s %t1 | FileCheck --check-prefix=O %s
44
// RUN: llvm-objdump -s %t2 | FileCheck --check-prefix=DWO %s
55

‎test/Modules/pch_container.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717

1818
// RUN: not llvm-objdump --section-headers %t-raw/DependsOnModule.pcm
1919

20-
// RUN: %clang_cc1 -split-dwarf-file t-split.dwo -triple=x86_64-linux-elf -fmodules -fimplicit-module-maps -fdisable-module-hash -fmodules-cache-path=%t-ELF_SPLIT -F %S/Inputs %s -o %t-split.o
20+
// RUN: %clang_cc1 -split-dwarf-output t-split.dwo -triple=x86_64-linux-elf -fmodules -fimplicit-module-maps -fdisable-module-hash -fmodules-cache-path=%t-ELF_SPLIT -F %S/Inputs %s -o %t-split.o

‎tools/driver/cc1as_main.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ struct AssemblerInvocation {
9898
llvm::DebugCompressionType CompressDebugSections =
9999
llvm::DebugCompressionType::None;
100100
std::string MainFileName;
101-
std::string SplitDwarfFile;
101+
std::string SplitDwarfOutput;
102102

103103
/// @}
104104
/// @name Frontend Options
@@ -258,7 +258,7 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts,
258258
}
259259
Opts.LLVMArgs = Args.getAllArgValues(OPT_mllvm);
260260
Opts.OutputPath = Args.getLastArgValue(OPT_o);
261-
Opts.SplitDwarfFile = Args.getLastArgValue(OPT_split_dwarf_file);
261+
Opts.SplitDwarfOutput = Args.getLastArgValue(OPT_split_dwarf_output);
262262
if (Arg *A = Args.getLastArg(OPT_filetype)) {
263263
StringRef Name = A->getValue();
264264
unsigned OutputType = StringSwitch<unsigned>(Name)
@@ -367,8 +367,8 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts,
367367
if (!FDOS)
368368
return true;
369369
std::unique_ptr<raw_fd_ostream> DwoOS;
370-
if (!Opts.SplitDwarfFile.empty())
371-
DwoOS = getOutputStream(Opts.SplitDwarfFile, Diags, IsBinary);
370+
if (!Opts.SplitDwarfOutput.empty())
371+
DwoOS = getOutputStream(Opts.SplitDwarfOutput, Diags, IsBinary);
372372

373373
// FIXME: This is not pretty. MCContext has a ptr to MCObjectFileInfo and
374374
// MCObjectFileInfo needs a MCContext reference in order to initialize itself.
@@ -527,8 +527,8 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts,
527527
if (Failed) {
528528
if (Opts.OutputPath != "-")
529529
sys::fs::remove(Opts.OutputPath);
530-
if (!Opts.SplitDwarfFile.empty() && Opts.SplitDwarfFile != "-")
531-
sys::fs::remove(Opts.SplitDwarfFile);
530+
if (!Opts.SplitDwarfOutput.empty() && Opts.SplitDwarfOutput != "-")
531+
sys::fs::remove(Opts.SplitDwarfOutput);
532532
}
533533

534534
return Failed;

0 commit comments

Comments
 (0)
Please sign in to comment.