Perform fragile layout for stored properties in classes #15720

slavapestov · 2018-04-03T23:12:41Z

Fixes rdar://problem/38506059 and https://bugs.swift.org/browse/SR-7206.

slavapestov · 2018-04-04T01:29:48Z

@swift-ci Please test source compatibility

slavapestov · 2018-04-04T01:30:20Z

@swift-ci Please test source compatibility

slavapestov · 2018-04-04T02:39:14Z

Assertion failed: (V[I]->getType() == T->getTypeAtIndex(I) && "Initializer for composite element doesn't match!"), function ConstantAggregate, file /Users/buildnode/jenkins/workspace-private/swift-PR-source-compat-suite/llvm/lib/IR/Constants.cpp, line 878.
21:04:22 0  swift                    0x000000010b46a9e8 llvm::sys::PrintStackTrace(llvm::raw_ostream&) + 40
21:04:22 1  swift                    0x000000010b46b076 SignalHandler(int) + 422
21:04:22 2  libsystem_platform.dylib 0x00007fff4fd30f5a _sigtramp + 26
21:04:22 3  libsystem_malloc.dylib   0x00007fff4fc58384 tiny_malloc_from_free_list + 431
21:04:22 4  libsystem_c.dylib        0x00007fff4fb5b312 abort + 127
21:04:22 5  libsystem_c.dylib        0x00007fff4fb23368 basename_r + 0
21:04:22 6  swift                    0x000000010b292a7f llvm::ConstantAggregate::ConstantAggregate(llvm::CompositeType*, llvm::Value::ValueTy, llvm::ArrayRef<llvm::Constant*>) + 447
21:04:22 7  swift                    0x000000010b2a16f7 llvm::ConstantUniqueMap<llvm::ConstantStruct>::create(llvm::StructType*, llvm::ConstantAggrKeyType<llvm::ConstantStruct>, std::__1::pair<unsigned int, std::__1::pair<llvm::StructType*, llvm::ConstantAggrKeyType<llvm::ConstantStruct> > >&) + 71
21:04:22 8  swift                    0x000000010b293df2 llvm::ConstantUniqueMap<llvm::ConstantStruct>::getOrCreate(llvm::StructType*, llvm::ConstantAggrKeyType<llvm::ConstantStruct>) + 386
21:04:22 9  swift                    0x000000010b293bdb llvm::ConstantStruct::get(llvm::StructType*, llvm::ArrayRef<llvm::Constant*>) + 203
21:04:22 10 swift                    0x0000000107afaa60 swift::irgen::emitConstantObject(swift::irgen::IRGenModule&, swift::ObjectInst*, swift::irgen::StructLayout*) + 560
21:04:22 11 swift                    0x0000000107bedaf5 swift::irgen::IRGenModule::emitSILStaticInitializers() + 453
21:04:22 12 swift                    0x0000000107b01649 swift::irgen::IRGenerator::emitGlobalTopLevel() + 601
21:04:22 13 swift                    0x0000000107bc77de performIRGeneration(swift::IRGenOptions&, swift::ModuleDecl*, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule> >, llvm::StringRef, swift::PrimarySpecificPaths const&, llvm::LLVMContext&, swift::SourceFile*, llvm::GlobalVariable**, unsigned int) + 1198
21:04:22 14 swift                    0x0000000107bc613d swift::performIRGeneration(swift::IRGenOptions&, swift::ModuleDecl*, std::__1::unique_ptr<swift::SILModule, std::__1::default_delete<swift::SILModule> >, llvm::StringRef, swift::PrimarySpecificPaths const&, llvm::LLVMContext&, llvm::ArrayRef<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > >, llvm::GlobalVariable**) + 829
21:04:22 15 swift                    0x0000000107a64e3f performCompile(swift::CompilerInstance&, swift::CompilerInvocation&, llvm::ArrayRef<char const*>, int&, swift::FrontendObserver*, swift::UnifiedStatsReporter*) + 15535
21:04:22 16 swift                    0x0000000107a6017e swift::performFrontend(llvm::ArrayRef<char const*>, char const*, void*, swift::FrontendObserver*) + 3310
21:04:22 17 swift                    0x0000000107a1e5b3 main + 2051
21:04:22 18 libdyld.dylib            0x00007fff4faaf115 start + 1

Sigh... this hack might not work out in practice.

slavapestov · 2018-04-10T00:35:32Z

@swift-ci Please test source compatibility

slavapestov · 2018-04-10T00:35:43Z

@swift-ci Please test source compatibility

slavapestov · 2018-04-10T01:06:36Z

@swift-ci Please test source compatibility

slavapestov · 2018-04-10T01:06:55Z

@swift-ci Please test source compatibility

…silient()

This allows us to perform fragile layout of resilient fields without completely disabling value type resilience.

Fixes <rdar://problem/38506059>.

slavapestov · 2018-04-10T06:08:40Z

@swift-ci Please test

slavapestov · 2018-04-10T06:09:28Z

@swift-ci Please test

swift-ci · 2018-04-10T06:59:49Z

Build failed
Swift Test Linux Platform
Git Sha - 852ee8db63a63b6fe52c41b9a885cf3bac3085af

@objc

- Narrow the fix to classes with @objc ancestry only - Pass -enable-class-resilience in class resilience executable test so that we exercise resilience there - Only enable fragile layout if the class has @objc ancestry - Add an IRGen test

slavapestov · 2018-04-10T07:01:30Z

@swift-ci Please test

slavapestov · 2018-04-10T07:01:33Z

@swift-ci Please test

swift-ci · 2018-04-10T07:01:57Z

Build failed
Swift Test OS X Platform
Git Sha - 852ee8db63a63b6fe52c41b9a885cf3bac3085af

swift-ci · 2018-04-10T07:03:16Z

Build failed
Swift Test Linux Platform
Git Sha - 852ee8db63a63b6fe52c41b9a885cf3bac3085af

jrose-apple

I'm not an IRGen expert, but it looks good to me (well, as good as possible for this kind of workaround), and ready to go for the 4.2 branch. Glad the field access thing wasn't too bad.

jrose-apple · 2018-04-10T17:27:18Z

lib/IRGen/GenClass.cpp

@@ -245,6 +249,10 @@ namespace {
        }

        if (superclass->hasClangNode()) {
+          // Perform fragile layout if the class has @objc ancestry.


This comment's out of date since we ended up deciding not to conditionalize on that.

The comment is still valid. Note that we only set CompletelyFragileLayout if the superclass has a Clang node.

Oh. That's not sufficient; you could be the grandchild of an imported class. I'm…sorry for not catching that sooner.

That's fine. We walk all superclasses up to the root here.

jrose-apple · 2018-04-10T17:29:01Z

lib/IRGen/GenType.h

+    TC.pushCompletelyFragile();
+  }
+
+  CompletelyFragileScope(IRGenModule &IGM)


Nitpick: can you make these constructors explicit?

Oops, I usually remember to do that. I'll make a follow up patch.

slavapestov requested a review from jrose-apple April 3, 2018 23:12

slavapestov force-pushed the class-resilience-hack branch from aeda303 to a0a5d5c Compare April 4, 2018 01:29

slavapestov force-pushed the class-resilience-hack branch from a0a5d5c to 720134d Compare April 10, 2018 00:35

slavapestov force-pushed the class-resilience-hack branch from 720134d to b33cba3 Compare April 10, 2018 01:03

slavapestov added 6 commits April 9, 2018 21:53

IRGen: Replace a few AST isResilient() queries with IRGenModule::isRe…

b03a1ee

…silient()

IRGen: Remove unused TypeConverter::getTypeThatLoweredTo()

8b94c73

IRGen: Add mode for lowering types in a completely fragile manner

2232203

IRGen: Bring back the -enable-class-resilience staging flag

c7853fe

IRGen: ElementLayout now stores two TypeInfos

d5868e5

This allows us to perform fragile layout of resilient fields without completely disabling value type resilience.

IRGen: Fragile layout of resiliently-typed class fields

86970b0

Fixes <rdar://problem/38506059>.

slavapestov force-pushed the class-resilience-hack branch from b33cba3 to 852ee8d Compare April 10, 2018 06:08

slavapestov added 2 commits April 10, 2018 00:00

Small fixes for fragile class layout

cfd5ac0

- Narrow the fix to classes with @objc ancestry only - Pass -enable-class-resilience in class resilience executable test so that we exercise resilience there - Only enable fragile layout if the class has @objc ancestry - Add an IRGen test

Sema: Remove unused variable

d751dcc

slavapestov force-pushed the class-resilience-hack branch from 852ee8d to d751dcc Compare April 10, 2018 07:01

slavapestov merged commit ddea849 into swiftlang:master Apr 10, 2018

jrose-apple reviewed Apr 10, 2018

View reviewed changes

slavapestov mentioned this pull request Apr 25, 2018

IRGen: CompletelyFragileScope constructor should be explicit #16150

Merged

This was referenced Apr 10, 2018

[SR-7206] ld: symbol(s) not found for classes defined in Swift marked as @objc #49754

Closed

[SR-7221] Class lookup at runtime fails in master toolchains #49769

Closed

Perform fragile layout for stored properties in classes #15720

Perform fragile layout for stored properties in classes #15720

Uh oh!

Conversation

slavapestov commented Apr 3, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

slavapestov commented Apr 4, 2018

Uh oh!

slavapestov commented Apr 4, 2018

Uh oh!

slavapestov commented Apr 4, 2018

Uh oh!

slavapestov commented Apr 10, 2018

Uh oh!

slavapestov commented Apr 10, 2018

Uh oh!

slavapestov commented Apr 10, 2018

Uh oh!

slavapestov commented Apr 10, 2018

Uh oh!

slavapestov commented Apr 10, 2018

Uh oh!

slavapestov commented Apr 10, 2018

Uh oh!

swift-ci commented Apr 10, 2018

Uh oh!

slavapestov commented Apr 10, 2018

Uh oh!

slavapestov commented Apr 10, 2018

Uh oh!

swift-ci commented Apr 10, 2018

Uh oh!

swift-ci commented Apr 10, 2018

Uh oh!

jrose-apple left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jrose-apple Apr 10, 2018

Choose a reason for hiding this comment

Uh oh!

slavapestov Apr 11, 2018

Choose a reason for hiding this comment

Uh oh!

jrose-apple Apr 11, 2018

Choose a reason for hiding this comment

Uh oh!

slavapestov Apr 25, 2018

Choose a reason for hiding this comment

Uh oh!

jrose-apple Apr 10, 2018

Choose a reason for hiding this comment

Uh oh!

slavapestov Apr 11, 2018

Choose a reason for hiding this comment

Uh oh!

Uh oh!

slavapestov commented Apr 3, 2018 •

edited

Loading

jrose-apple left a comment •

edited

Loading