Skip to content

[IRGen] Revert EmptyBoxType changes from #10326 #10371

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

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

[IRGen] Revert EmptyBoxType changes from #10326 #10371

wants to merge 2 commits into from

Conversation

jrose-apple
Copy link
Contributor

Reverts #10326 and its follow-up clean-up #10357 because it broke the Ubuntu 16.10 bot. Not sure why this wasn't caught by PR testing.

/usr/bin/ld.gold: error: stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/HeapObject.cpp.o: cannot make copy relocation for protected symbol '_EmptyBoxStorage', defined in lib/swift/linux/x86_64/libswiftCore.so

@jrose-apple
Revert "Merge pull request swiftlang#10357 from aschwaighofer/irgen_c…
2cf7a56 
…leanup_code"

This reverts commit 45dda95, reversing
changes made to 48e889b.
@jrose-apple
Revert "IRGen: EmptyBoxType's representation cannot be nil because of…
459c4a7 
… a conflict with extra inhabitant assumption in indirect enums (swiftlang#10326)"

This reverts commit 48e889b.
@jrose-apple
Copy link
Contributor Author

@swift-ci Please smoke test

@jrose-apple
Copy link
Contributor Author

cc @shahmishal

aschwaighofer
aschwaighofer approved these changes Jun 19, 2017
View reviewed changes
Copy link
Contributor

@aschwaighofer aschwaighofer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to fail in unittests/runtime/LongTests/SwiftRuntimeLongTests maybe we don't run the long running tests as part of "please test".

@jrose-apple
Copy link
Contributor Author

Ah, huh. Wait, I thought we didn't run long tests on any incremental bots either.

@aschwaighofer
Copy link
Contributor

This only seems to reproduce on 16_10.

Maybe we need to a GlobalObjects.cpp.o to the link line ...

: && /usr/bin/clang++ -Wno-unknown-warning-option -Werror=unguarded-availability-new -fno-stack-protector -fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wstring-conversion -Werror=date-time -std=c++11 -fcolor-diagnostics -ffunction-sections -fdata-sections -Wdocumentation -Wimplicit-fallthrough -Wunreachable-code -Woverloaded-virtual -DOBJC_OLD_DISPATCH_PROTOTYPES=0 -O3 -Wl,-O3 -Wl,--gc-sections -latomic -fuse-ld=gold stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/AnyHashableSupport.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Casting.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/CygwinPort.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Demangle.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Enum.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/ErrorObjectConstants.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/ErrorObjectNative.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Errors.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/ErrorDefaultImpls.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Exclusivity.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Heap.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/HeapObject.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/ImageInspectionMachO.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/ImageInspectionELF.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/ImageInspectionWin32.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/KnownMetadata.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Metadata.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/MetadataLookup.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/MutexPThread.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/MutexWin32.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Once.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Portability.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/ProtocolConformance.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/RefCount.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/RuntimeEntrySymbols.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir////lib/Demangling/OldDemangler.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir////lib/Demangling/Demangler.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir////lib/Demangling/NodePrinter.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir////lib/Demangling/Context.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir////lib/Demangling/ManglingUtils.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir////lib/Demangling/Punycode.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/ErrorObject.mm.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/SwiftObject.mm.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/SwiftValue.mm.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir/Reflection.mm.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir////lib/Demangling/OldRemangler.cpp.o stdlib/public/runtime/CMakeFiles/swiftRuntime-linux-x86_64.dir////lib/Demangling/Remangler.cpp.o unittests/runtime/LongTests/CMakeFiles/SwiftRuntimeLongTests.dir/LongRefcounting.cpp.o unittests/runtime/LongTests/CMakeFiles/SwiftRuntimeLongTests.dir/__/Stdlib.cpp.o -o unittests/runtime/LongTests/SwiftRuntimeLongTests -L/home/buildnode/jenkins/workspace/oss-swift-incremental-RA-linux-ubuntu-16_10/buildbot_incremental/llvm-linux-x86_64/./lib /home/buildnode/jenkins/workspace/oss-swift-incremental-RA-linux-ubuntu-16_10/buildbot_incremental/llvm-linux-x86_64/lib/libLLVMSupport.a -lpthread /home/buildnode/jenkins/workspace/oss-swift-incremental-RA-linux-ubuntu-16_10/buildbot_incremental/llvm-linux-x86_64/lib/libgtest_main.a /home/buildnode/jenkins/workspace/oss-swift-incremental-RA-linux-ubuntu-16_10/buildbot_incremental/llvm-linux-x86_64/lib/libgtest.a -lpthread lib/swift/linux/x86_64/libswiftCore.so -latomic /home/buildnode/jenkins/workspace/oss-swift-incremental-RA-linux-ubuntu-16_10/buildbot_incremental/llvm-linux-x86_64/lib/libLLVMSupport.a -lrt -ldl -ltinfo -lpthread -lm /home/buildnode/jenkins/workspace/oss-swift-incremental-RA-linux-ubuntu-16_10/buildbot_incremental/llvm-linux-x86_64/lib/libLLVMDemangle.a -lpthread -Wl,-rpath,/home/buildnode/jenkins/workspace/oss-swift-incremental-RA-linux-ubuntu-16_10/buildbot_incremental/llvm-linux-x86_64/./lib:/home/buildnode/jenkins/workspace/oss-swift-incremental-RA-linux-ubuntu-16_10/buildbot_incremental/swift-linux-x86_64/lib/swift/linux/x86_64 && :

@aschwaighofer
Copy link
Contributor

Jordan pointed out a layering violation I introduced by putting a swiftRuntime only used type into the stdlib stubs directory. I will fix this asap.

@aschwaighofer
Copy link
Contributor

#10373 should fix this

@jrose-apple
Copy link
Contributor Author

Arnold's fix did the trick. Closing!

@jrose-apple jrose-apple deleted the revert-irgen_fix_emptyboxtype branch June 19, 2017 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aschwaighofer aschwaighofer aschwaighofer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jrose-apple @aschwaighofer