Skip to content

Commit 3a3e467

Browse files
committed
Rename initializeSwiftModules to initializeSwiftSILModules().
1 parent 6b4e706 commit 3a3e467

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import SIL
1414
import OptimizerBridging
1515

16-
@_cdecl("initializeSwiftModules")
17-
public func initializeSwiftModules() {
16+
@_cdecl("initializeSwiftSILModules")
17+
public func initializeSwiftSILModules() {
1818
registerSILClasses()
1919
registerSwiftAnalyses()
2020
registerSwiftPasses()

SwiftCompilerSources/stubs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
extern "C" {
1414

15-
void initializeSwiftModules();
15+
void initializeSwiftSILModules();
1616

1717
}
1818

19-
void initializeSwiftModules() {}
19+
void initializeSwiftSILModules() {}

include/swift/Basic/InitializeSwiftModules.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
extern "C" {
1818
#endif
1919

20-
void initializeSwiftModules();
20+
void initializeSwiftSILModules();
2121
void initializeSwiftParseModules();
2222

2323
#ifdef __cplusplus

lib/DriverTool/driver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static int run_driver(StringRef ExecName,
224224

225225
// This is done here and not done in FrontendTool.cpp, because
226226
// FrontendTool.cpp is linked to tools, which don't use swift modules.
227-
initializeSwiftModules();
227+
initializeSwiftSILModules();
228228

229229
bool isRepl = false;
230230

lib/SIL/Utils/SILBridging.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ namespace {
2929

3030
bool nodeMetatypesInitialized = false;
3131

32-
// Filled in by class registration in initializeSwiftModules().
32+
// Filled in by class registration in initializeSwiftSILModules().
3333
SwiftMetatype nodeMetatypes[(unsigned)SILNodeKind::Last_SILNode + 1];
3434

3535
}
3636

37-
// Does return null if initializeSwiftModules() is never called.
37+
// Does return null if initializeSwiftSILModules() is never called.
3838
SwiftMetatype SILNode::getSILNodeMetatype(SILNodeKind kind) {
3939
SwiftMetatype metatype = nodeMetatypes[(unsigned)kind];
4040
assert((!nodeMetatypesInitialized || metatype) &&
@@ -62,7 +62,7 @@ static void setUnimplementedRange(SwiftMetatype metatype,
6262
}
6363

6464
/// Registers the metatype of a swift SIL class.
65-
/// Called by initializeSwiftModules().
65+
/// Called by initializeSwiftSILModules().
6666
void registerBridgedClass(StringRef className, SwiftMetatype metatype) {
6767
nodeMetatypesInitialized = true;
6868

lib/SILOptimizer/PassManager/Passes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ static void runBridgedFunctionPass(BridgedFunctionPassRunFn &runFunction,
273273
runFunction({{f}, {passManager->getSwiftPassInvocation()}});
274274
}
275275

276-
// Called from initializeSwiftModules().
276+
// Called from initializeSwiftSILModules().
277277
void SILPassManager_registerModulePass(llvm::StringRef name,
278278
BridgedModulePassRunFn runFn) {
279279
bridgedModulePassRunFunctions[name] = runFn;

lib/SILOptimizer/SILCombiner/SILCombine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ void SILCombiner::runSwiftInstructionPass(SILInstruction *inst,
539539
static llvm::StringMap<BridgedInstructionPassRunFn> swiftInstPasses;
540540
static bool passesRegistered = false;
541541

542-
// Called from initializeSwiftModules().
542+
// Called from initializeSwiftSILModules().
543543
void SILCombine_registerInstructionPass(llvm::StringRef instClassName,
544544
BridgedInstructionPassRunFn runFn) {
545545
swiftInstPasses[instClassName] = runFn;

tools/SourceKit/tools/sourcekitd/lib/Service/Requests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void sourcekitd::initializeService(
112112
std::function<void(sourcekitd_response_t)> postNotification) {
113113
INITIALIZE_LLVM();
114114
initializeSwiftParseModules();
115-
initializeSwiftModules();
115+
initializeSwiftSILModules();
116116
llvm::EnablePrettyStackTrace();
117117
GlobalCtx = new SourceKit::Context(swiftExecutablePath, runtimeLibPath,
118118
diagnosticDocumentationPath,

tools/swift-ide-test/swift-ide-test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4241,7 +4241,7 @@ int main(int argc, char *argv[]) {
42414241
PROGRAM_START(argc, argv);
42424242
INITIALIZE_LLVM();
42434243
initializeSwiftParseModules();
4244-
initializeSwiftModules();
4244+
initializeSwiftSILModules();
42454245

42464246
std::string mainExecutablePath = llvm::sys::fs::getMainExecutable(
42474247
argv[0], reinterpret_cast<void *>(&anchorForGetMainExecutable));

0 commit comments

Comments
 (0)