Skip to content

Commit abb8172

Browse files
committed
---
yaml --- r: 323535 b: refs/heads/tensorflow-next c: 838efd9 h: refs/heads/master i: 323533: 64aaa5d 323531: 98b4728 323527: 10326da 323519: b81473b
1 parent 6a7a88a commit abb8172

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
14611461
refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
14621462
refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
14631463
refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
1464-
refs/heads/tensorflow-next: d534de54925c78aedefa6fa7b4e48088f9c2c46c
1464+
refs/heads/tensorflow-next: 838efd9889b643065b59ca81efdcfb38428d2a2e

branches/tensorflow-next/lib/IRGen/IRGenModule.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,12 @@ llvm::SmallString<32> getTargetDependentLibraryOption(const llvm::Triple &T,
10101010
void IRGenModule::addLinkLibrary(const LinkLibrary &linkLib) {
10111011
llvm::LLVMContext &ctx = Module.getContext();
10121012

1013+
// The debugger gets the autolink information directly from
1014+
// the LinkLibraries of the module, so there's no reason to
1015+
// emit it into the IR of debugger expressions.
1016+
if (Context.LangOpts.DebuggerSupport)
1017+
return;
1018+
10131019
switch (linkLib.getKind()) {
10141020
case LibraryKind::Library: {
10151021
llvm::SmallString<32> opt =

branches/tensorflow-next/test/Serialization/autolinking.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
// RUN: %FileCheck %s < %t/force-load.txt
1616
// RUN: %FileCheck -check-prefix FORCE-LOAD-CLIENT -check-prefix FORCE-LOAD-CLIENT-%target-object-format %s < %t/force-load.txt
1717

18+
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -debugger-support %s -I %t > %t/force-load.txt
19+
// RUN: %FileCheck -check-prefix NO-FORCE-LOAD-CLIENT %s < %t/force-load.txt
20+
1821
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-dynamic-replacements -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift | %FileCheck --check-prefix=NO-FORCE-LOAD %s
1922
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load | %FileCheck --check-prefix=FORCE-LOAD %s
2023
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name 0module %S/../Inputs/empty.swift -autolink-force-load | %FileCheck --check-prefix=FORCE-LOAD-HEX %s
@@ -35,13 +38,16 @@ import someModule
3538
// FRAMEWORK-DAG: !{{[0-9]+}} = !{!"-framework", !"someModule"}
3639

3740
// NO-FORCE-LOAD-NOT: FORCE_LOAD
41+
// NO-FORCE-LOAD-NOT -lmodule
42+
// NO-FORCE-LOAD-NOT -lmagic
3843
// FORCE-LOAD: define{{( dllexport)?}} void @"_swift_FORCE_LOAD_$_module"() {
3944
// FORCE-LOAD: ret void
4045
// FORCE-LOAD: }
4146
// FORCE-LOAD-HEX: define{{( dllexport)?}} void @"_swift_FORCE_LOAD_$306d6f64756c65"() {
4247
// FORCE-LOAD-HEX: ret void
4348
// FORCE-LOAD-HEX: }
4449

50+
// NO-FORCE-LOAD-CLIENT-NOT: FORCE_LOAD
4551
// FORCE-LOAD-CLIENT: @"_swift_FORCE_LOAD_$_module_$_autolinking" = weak_odr hidden constant void ()* @"_swift_FORCE_LOAD_$_module"
4652
// FORCE-LOAD-CLIENT: @llvm.used = appending global [{{[0-9]+}} x i8*] [
4753
// FORCE-LOAD-CLIENT: i8* bitcast (void ()** @"_swift_FORCE_LOAD_$_module_$_autolinking" to i8*)

0 commit comments

Comments
 (0)