WIP getting master-next up and running with clang::ModuleMacro #10519

jrose-apple · 2017-06-22T22:46:52Z

For pre-review purposes, mostly. The interesting commit is the one about ModuleMacro, though really we should be able to apply that to regular-master when it's ready.

jrose-apple · 2017-06-22T22:47:01Z

cc @compnerd, @bob-wilson

jrose-apple · 2017-06-22T22:47:21Z

I haven't been able to test this because of various other problems on the master-next branch.

I'm not a SIL author, so it's likely that this could be improved, but I think this is closest to the old LLVM behavior.

The tests still need to be updated.

jrose-apple · 2017-06-23T19:50:25Z

cc @gottesmm

gottesmm · 2017-06-23T20:16:56Z

@jrose-apple Thanks Jordan!

gottesmm · 2017-06-23T20:19:35Z

Also cc @lhames

gottesmm · 2017-06-23T20:21:07Z

btw, @jrose-apple cross repo testing works with master-next if you want to try the two PRs together.

jrose-apple · 2017-06-23T22:05:25Z

Still plenty of local failures for now. :-(

Untested and still missing a few pieces.

jrose-apple · 2017-06-23T23:05:33Z

Okay, this isn't right yet, but it's back in a shape where we can make progress. Let's see where we are.

apple/swift-clang#93
@swift-ci Please test

swift-ci · 2017-06-23T23:22:33Z

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - b02d6a8db20bffc1a77222e62542042b2eea5723
Test requested by - @jrose-apple

swift-ci · 2017-06-23T23:30:32Z

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - b02d6a8db20bffc1a77222e62542042b2eea5723
Test requested by - @jrose-apple

gottesmm · 2017-06-24T06:24:18Z

@jrose-apple Just took a quick look at the failure on OS X (for some reason, the ci display is saying that builds are still running, but I think the display is wrong).

The error is:


Assertion failed: (isa<X>(Val) && "cast_or_null<Ty>() argument of incompatible type!"), function cast_or_null, file /Users/buildnode/jenkins/workspace/swift-PR-osx/branch-master-next/llvm/include/llvm/Support/Casting.h, line 299.
17:13:57 0  swift                    0x0000000107cd45d8 llvm::sys::PrintStackTrace(llvm::raw_ostream&) + 40
17:13:57 1  swift                    0x0000000107cd4c96 SignalHandler(int) + 470
17:13:57 2  libsystem_platform.dylib 0x00007fffafa0bb3a _sigtramp + 26
17:13:57 3  swift                    0x00000001080bbe41 encodeBase64StringEntry(char*, unsigned long long)::Alphabet + 106289
17:13:57 4  libsystem_c.dylib        0x00007fffaf890420 abort + 129
17:13:57 5  libsystem_c.dylib        0x00007fffaf857893 basename_r + 0
17:13:57 6  swift                    0x0000000106112e7b llvm::DIScope::getFilename() const + 187
17:13:57 7  swift                    0x000000010610ca3f llvm::DwarfCompileUnit::constructImportedEntityDIE(llvm::DIImportedEntity const*) + 383
17:13:57 8  swift                    0x00000001061131b2 llvm::DwarfDebug::constructAndAddImportedEntityDIE(llvm::DwarfCompileUnit&, llvm::DIImportedEntity const*) + 114
17:13:57 9  swift                    0x0000000106113f3a llvm::DwarfDebug::beginModule() + 3162
17:13:57 10 swift                    0x00000001060e7f70 llvm::AsmPrinter::doInitialization(llvm::Module&) + 1392
17:13:57 11 swift                    0x0000000107bafe0b llvm::FPPassManager::doInitialization(llvm::Module&) + 75
17:13:57 12 swift                    0x0000000107bb01af llvm::legacy::PassManagerImpl::run(llvm::Module&) + 687
17:13:57 13 swift                    0x00000001049fb130 clang::EmitBackendOutput(clang::DiagnosticsEngine&, clang::HeaderSearchOptions const&, clang::CodeGenOptions const&, clang::TargetOptions const&, clang::LangOptions const&, llvm::DataLayout const&, llvm::Module*, clang::BackendAction, std::__1::unique_ptr<llvm::raw_pwrite_stream, std::__1::default_delete<llvm::raw_pwrite_stream> >) + 12976
17:13:57 14 swift                    0x0000000104c56d04 (anonymous namespace)::PCHContainerGenerator::HandleTranslationUnit(clang::ASTContext&) + 1316
17:13:57 15 swift                    0x0000000106f89dac clang::MultiplexConsumer::HandleTranslationUnit(clang::ASTContext&) + 44
17:13:57 16 swift                    0x0000000107090dd2 clang::ParseAST(clang::Sema&, bool, bool) + 466
17:13:57 17 swift                    0x0000000106f6322c clang::FrontendAction::Execute() + 76
17:13:57 18 swift                    0x0000000106f266e1 clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) + 1217
17:13:57 19 swift                    0x0000000106f2f8a4 void llvm::function_ref<void ()>::callback_fn<compileModuleImpl(clang::CompilerInstance&, clang::SourceLocation, llvm::StringRef, clang::FrontendInputFile, llvm::StringRef, llvm::StringRef, llvm::function_ref<void (clang::CompilerInstance&)>, llvm::function_ref<void (clang::CompilerInstance&)>)::$_3>(long) + 52
17:13:57 20 swift                    0x0000000107c706ee llvm::CrashRecoveryContext::RunSafely(llvm::function_ref<void ()>) + 222
17:13:57 21 swift                    0x0000000107c70870 RunSafelyOnThread_Dispatch(void*) + 48
17:13:57 22 swift                    0x0000000107cd5eed ExecuteOnThread_Dispatch(void*) + 13
17:13:57 23 libsystem_pthread.dylib  0x00007fffafa1593b _pthread_body + 180
17:13:57 24 libsystem_pthread.dylib  0x00007fffafa15887 _pthread_body + 0
17:13:57 25 libsystem_pthread.dylib  0x00007fffafa1508d thread_start + 13
17:13:57 Stack dump:
17:13:57 0.	<eof> parser at end of file
17:13:57 1.	Code generation
17:13:57 
17:13:57

That suggests we need to call in @adrian-prantl.

jrose-apple · 2017-06-28T18:25:29Z

lib/SIL/SILBasicBlock.cpp

@@ -355,3 +355,7 @@ bool SILBasicBlock::isTrampoline() const {
    return false;
  return begin() == Branch->getIterator();
 }
+
+bool SILBasicBlock::isLegalToHoistInto() const {
+  return true;


@gottesmm, is this the right implementation for now? If so I'll extract it out into a separate PR so we can land it and be done.

Yes. I talked with Arnold and I don't think we use this. If you do extract this, can you change the return to false so we are conservative?

Jordan pointed out via IM that this is used in other parts of loop info that we may use and that the old behavior was to always hoist. So given that, I am fine just taking this if it gets the build going. We can fix the test failures later. But at least we know things build.

gottesmm · 2017-06-30T21:52:06Z

Jordan says that he is unavailable to merge this. I am going to merge this for him so we can get the build going.

jrose-apple added 2 commits June 23, 2017 12:49

[SIL] Implement a very simple isLegalToHoistInto for llvm::LoopInfo.

c22168d

I'm not a SIL author, so it's likely that this could be improved, but I think this is closest to the old LLVM behavior.

WIP: [IRGen] Update for changes to how autolinking works in LLVM.

90ca8f1

The tests still need to be updated.

jrose-apple force-pushed the ModuleMacro-master-next branch from b02d6a8 to dc16e16 Compare June 23, 2017 19:50

jrose-apple mentioned this pull request Jun 23, 2017

[Lex] Expose a ModuleMacro's IdentifierInfo. apple/swift-clang#93

Merged

WIP Update to use clang::ModuleMacro instead of clang::MacroInfo.

c3d6be6

Untested and still missing a few pieces.

jrose-apple force-pushed the ModuleMacro-master-next branch from dc16e16 to c3d6be6 Compare June 23, 2017 23:04

jrose-apple commented Jun 28, 2017

View reviewed changes

gottesmm merged commit 78713ce into apple:master-next Jun 30, 2017

jrose-apple mentioned this pull request Jul 25, 2017

[master-next] Trivial updates in getting master-next to build #11181

Merged

jrose-apple deleted the ModuleMacro-master-next branch July 25, 2017 22:09

jrose-apple mentioned this pull request Jul 26, 2017

[master-next] Finish getting the importer over to using clang::ModuleMacro #11211

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP getting master-next up and running with clang::ModuleMacro #10519

WIP getting master-next up and running with clang::ModuleMacro #10519

jrose-apple commented Jun 22, 2017

jrose-apple commented Jun 22, 2017

jrose-apple commented Jun 22, 2017

jrose-apple commented Jun 23, 2017

gottesmm commented Jun 23, 2017

gottesmm commented Jun 23, 2017

gottesmm commented Jun 23, 2017

jrose-apple commented Jun 23, 2017

jrose-apple commented Jun 23, 2017

swift-ci commented Jun 23, 2017

swift-ci commented Jun 23, 2017

gottesmm commented Jun 24, 2017

jrose-apple Jun 28, 2017

gottesmm Jun 28, 2017

gottesmm Jun 29, 2017

gottesmm commented Jun 30, 2017

WIP getting master-next up and running with clang::ModuleMacro #10519

WIP getting master-next up and running with clang::ModuleMacro #10519

Conversation

jrose-apple commented Jun 22, 2017

jrose-apple commented Jun 22, 2017

jrose-apple commented Jun 22, 2017

jrose-apple commented Jun 23, 2017

gottesmm commented Jun 23, 2017

gottesmm commented Jun 23, 2017

gottesmm commented Jun 23, 2017

jrose-apple commented Jun 23, 2017

jrose-apple commented Jun 23, 2017

swift-ci commented Jun 23, 2017

swift-ci commented Jun 23, 2017

gottesmm commented Jun 24, 2017

jrose-apple Jun 28, 2017

Choose a reason for hiding this comment

gottesmm Jun 28, 2017

Choose a reason for hiding this comment

gottesmm Jun 29, 2017

Choose a reason for hiding this comment

gottesmm commented Jun 30, 2017