Skip to content

[Driver] Pass -emit-irgen thru to frontend. #76803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2024
Merged

[Driver] Pass -emit-irgen thru to frontend. #76803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/swift/Basic/FileTypes.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ TYPE("assembly", Assembly, "s", "")
TYPE("raw-sil", RawSIL, "sil", "")
TYPE("raw-sib", RawSIB, "sib", "")
TYPE("llvm-ir", LLVM_IR, "ll", "")
TYPE("raw-llvm-ir", RawLLVM_IR, "ll", "")
TYPE("llvm-bc", LLVM_BC, "bc", "")
TYPE("diagnostics", SerializedDiagnostics, "dia", "")
TYPE("clang-header", ClangHeader, "h", "")
Expand Down
4 changes: 4 additions & 0 deletions lib/Basic/FileTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ bool file_types::isTextual(ID Id) {
case file_types::TY_Assembly:
case file_types::TY_ASTDump:
case file_types::TY_RawSIL:
case file_types::TY_RawLLVM_IR:
case file_types::TY_LLVM_IR:
case file_types::TY_ClangHeader:
case file_types::TY_AutolinkFile:
Expand Down Expand Up @@ -165,6 +166,7 @@ bool file_types::isAfterLLVM(ID Id) {
case file_types::TY_ClangHeader:
case file_types::TY_AutolinkFile:
case file_types::TY_Image:
case file_types::TY_RawLLVM_IR:
case file_types::TY_dSYM:
case file_types::TY_SIB:
case file_types::TY_RawSIB:
Expand Down Expand Up @@ -214,6 +216,7 @@ bool file_types::isPartOfSwiftCompilation(ID Id) {
case file_types::TY_RawSIB:
return true;
case file_types::TY_Assembly:
case file_types::TY_RawLLVM_IR:
case file_types::TY_LLVM_IR:
case file_types::TY_LLVM_BC:
case file_types::TY_Object:
Expand Down Expand Up @@ -275,6 +278,7 @@ bool file_types::isProducedFromDiagnostics(ID Id) {
case file_types::TY_SIB:
case file_types::TY_RawSIB:
case file_types::TY_Assembly:
case file_types::TY_RawLLVM_IR:
case file_types::TY_LLVM_IR:
case file_types::TY_LLVM_BC:
case file_types::TY_Object:
Expand Down
4 changes: 4 additions & 0 deletions lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,6 +1167,9 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
break;

case options::OPT_emit_irgen:
OI.CompilerOutputType = file_types::TY_RawLLVM_IR;
break;

case options::OPT_emit_ir:
OI.CompilerOutputType = file_types::TY_LLVM_IR;
break;
Expand Down Expand Up @@ -1668,6 +1671,7 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
case file_types::TY_dSYM:
case file_types::TY_Dependencies:
case file_types::TY_Assembly:
case file_types::TY_RawLLVM_IR:
case file_types::TY_LLVM_IR:
case file_types::TY_LLVM_BC:
case file_types::TY_SerializedDiagnostics:
Expand Down
5 changes: 5 additions & 0 deletions lib/Driver/ToolChains.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,8 @@ const char *ToolChain::JobContext::computeFrontendModeForCompile() const {
return "-emit-sibgen";
case file_types::TY_SIB:
return "-emit-sib";
case file_types::TY_RawLLVM_IR:
return "-emit-irgen";
case file_types::TY_LLVM_IR:
return "-emit-ir";
case file_types::TY_LLVM_BC:
Expand Down Expand Up @@ -977,6 +979,9 @@ ToolChain::constructInvocation(const BackendJobAction &job,
case file_types::TY_Object:
FrontendModeOption = "-c";
break;
case file_types::TY_RawLLVM_IR:
FrontendModeOption = "-emit-irgen";
break;
case file_types::TY_LLVM_IR:
FrontendModeOption = "-emit-ir";
break;
Expand Down
2 changes: 2 additions & 0 deletions lib/Frontend/FrontendOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,8 @@ FrontendOptions::formatForPrincipalOutputFileForAction(ActionType action) {
return TY_Assembly;

case ActionType::EmitIRGen:
return TY_RawLLVM_IR;

case ActionType::EmitIR:
return TY_LLVM_IR;

Expand Down
3 changes: 3 additions & 0 deletions test/Driver/emit-irgen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// RUN: %swiftc_driver -### -emit-irgen %s -o - | %FileCheck %s

// CHECK: -emit-irgen
5 changes: 3 additions & 2 deletions unittests/Basic/FileTypes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ TEST(FileSystem, lookupTypeFromFilename) {
// no extension, skip.
if (Entry.first.empty())
continue;
// raw-sil and raw-sib do not have unique extension.
if (Entry.second == TY_RawSIL || Entry.second == TY_RawSIB)
// raw-sil, raw-sib, and raw-llvm-ir do not have unique extensions.
if (Entry.second == TY_RawSIL || Entry.second == TY_RawSIB ||
Entry.second == TY_RawLLVM_IR)
continue;

std::string Filename = "Myfile." + Entry.first;
Expand Down