Fix llvm 10 #3144

thewilsonator · 2019-08-28T07:59:11Z

This fixes some compilation errors with LLVM 10.

Not fixed is the issue with change of CallSite to CallBase that changed with IRBuilder::CreateMemSet

thewilsonator · 2019-08-28T08:00:00Z

driver/codegenerator.cpp

        diagnosticsFilename, EC, llvm::sys::fs::F_None);
    if (EC) {
      irs.dmodule->error("Could not create file %s: %s",
                         diagnosticsFilename.c_str(), EC.message().c_str());
      fatal();
    }

+    //FIXME: this has been replaced by setDiagnosticHandler


N.B. I'm not sure how tot get back the original behaviour.

do you have a link to the commit that removed setDiagnosticsOutputFile ?

No, that was purely speculative as it appears that setDiagnosticsOutputFile no longer exists and setDiagnosticHandler is the only thing there that could logically replace its functionality.

Here: llvm-mirror/llvm@78ee34a#diff-b1ec65e53a672d9db72a97451556fe87

Adapted in #3166.

gen/modules.cpp

thewilsonator · 2019-08-28T08:20:14Z

@Robertorosmaninho if you are trying to build with the latest LLVM you'll need to use this patch. You'll also need to comment out this line as I haven't managed to work out a solution for this CallSite use.

gen/passes/GarbageCollect2Stack.cpp

Hardcode84 · 2019-08-28T13:40:19Z

I don't like make_unique ifdefs copypaste everywhere but I don't see a good solution here. We can write our make_unique wrapper with ifdefs but it will be bigger than actual make_unique implementation :)

thewilsonator · 2019-08-28T14:15:46Z

Neither do I (I wanted to put this up sooner so that @Robertorosmaninho can have a functioning LDC to start his work on).

I could have sworn we used to have an llvm compatibility module somewhere but I couldn't find it, otherwise I'd have put it in there. I think we are going to have to have something like that for the CallSite changes anyway, those look pretty nasty.

gen/modules.cpp

JohanEngelen · 2019-08-28T17:01:49Z

driver/linker-gcc.cpp

@@ -29,6 +29,12 @@
 #include "lld/Common/Driver.h"
 #endif

+#if LDC_LLVM_VER >= 1000
+using std::make_unique;


shouldn't this depend on C++ version? LLVM 10 requires C++14?

Possibly, see http://lists.llvm.org/pipermail/llvm-dev/2019-April/131486.html

So as kinke already mentioned, this breaks with c++14 compilation for LLVM < 10. So change the condition to cplusplus version, instead of LLVM version.

gen/optimizer.cpp

gen/passes/GarbageCollect2Stack.cpp

JohanEngelen · 2019-08-28T17:06:06Z

gen/pgo_ASTbased.cpp

@@ -34,6 +34,11 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/MD5.h"

+#if LDC_LLVM_VER >= 1000
+using std::make_unique;


let's move this repeated piece into a helper header file?

I swear we used to have an LLVM compatibility file somewhere, did it get removed? Because I can't find it.

JohanEngelen · 2019-08-28T17:09:45Z

@thewilsonator Can you track down which LLVM commit / phabricator removed removeCallEdgeFor?

gen/modules.cpp

gen/passes/GarbageCollect2Stack.cpp

"createAddressSanitizerModulePass" is outdated, new version is "createModuleAddressSanitizerLegacyPassPass" from llvm/Transforms/Instrumentation/AddressSanitizer.h

gen/passes/GarbageCollect2Stack.cpp

thewilsonator · 2019-08-30T07:26:00Z

@Robertorosmaninho you'll also need to apply druntime.txt to druntime to get the runtime to build.

thewilsonator · 2019-08-31T08:01:43Z

Any guesses as to why MSVC think that the call to make_unique is ambiguous? are we using std, or llvm somewhere in the includes?

kinke · 2019-08-31T10:42:18Z

Any guesses as to why MSVC think that the call to make_unique is ambiguous? are we using std, or llvm somewhere in the includes?

Nope, no relevant using namespace std or using std::make_unique here. The problem is apparently argument-dependent lookup, i.e., std::make_unique is found automatically because we pass a std::error_code argument (and now use an unqualified make_unique name), so that the std namespace is searched too (and MSVC has had std::make_unique for ages).
Don't blame MSVC :] - this is clang v8.0.1. ;)

JohanEngelen · 2019-08-31T10:47:58Z

my guess is that we enable c++11 (not 14), which does not have std::make_unique and ADL doesn't trigger. Clang being incorrect here doesn't sound likely to me.

kinke · 2019-08-31T10:54:37Z

MS cl (from VS 2019) behaves identically, so the clang-cl wrapper is correctly compatible here. The MS compiler doesn't support C++11 anymore: /std:<c++14|c++17|c++latest> and defaults to C++14.

So this apparently just shows that this PR can currently only be compiled as C++11 and not with any later version (with LLVM < 10). Edit: And we seem to just inherit the C++ lang version from the LLVM C++ flags.

kinke · 2019-08-31T11:09:30Z

Microsoft is obviously a PITA and chose to use 199711 for predefined __cplusplus. So for MSVC, one should check _MSVC_LANG (= 201402) instead.

Include some of Nicholas' fixes in ldc-developers#3144.

Including some of Nicholas' fixes in ldc-developers#3144.

kinke · 2019-10-18T22:32:40Z

This has been incorporated as #3166 and #3187, right?

JohanEngelen · 2019-10-19T00:04:46Z

yeah

thewilsonator added 3 commits August 28, 2019 15:52

llvm ->std make_unique

8e80897

getOrInsertFunction

23b1d7f

getProfileSummary

1b61278

thewilsonator commented Aug 28, 2019

View reviewed changes

thewilsonator added 3 commits August 28, 2019 16:04

PassManagerBuilder DisableUnitAtATime was removed

f1bf77e

calcite one

99b8cb5

fix condition

ccb0027

fix old llvms

eaec8dd

Hardcode84 reviewed Aug 28, 2019

View reviewed changes

gen/passes/GarbageCollect2Stack.cpp Outdated Show resolved Hide resolved

thewilsonator and others added 2 commits August 28, 2019 17:05

typo

86173e9

use auto

6a6b2ab

typo

b82d733

JohanEngelen reviewed Aug 28, 2019

View reviewed changes

gen/modules.cpp Outdated Show resolved Hide resolved

JohanEngelen reviewed Aug 28, 2019

View reviewed changes

gen/optimizer.cpp Show resolved Hide resolved

JohanEngelen reviewed Aug 28, 2019

View reviewed changes

gen/passes/GarbageCollect2Stack.cpp Outdated Show resolved Hide resolved

JohanEngelen reviewed Aug 28, 2019

View reviewed changes

thewilsonator added 3 commits August 29, 2019 09:54

comment for non-context sensitive profile

a1fd416

fix versioning for unitAtATime

b24b2d3

formatting

c409c67

JohanEngelen reviewed Aug 29, 2019

View reviewed changes

gen/modules.cpp Outdated Show resolved Hide resolved

Robertorosmaninho reviewed Aug 29, 2019

View reviewed changes

gen/passes/GarbageCollect2Stack.cpp Outdated Show resolved Hide resolved

thewilsonator and others added 4 commits August 30, 2019 08:01

comments

7cf3d80

typo

54fbfc8

Update optimizer.cpp

c8167e0

"createAddressSanitizerModulePass" is outdated, new version is "createModuleAddressSanitizerLegacyPassPass" from llvm/Transforms/Instrumentation/AddressSanitizer.h

typo

cff09f9

thewilsonator added 3 commits August 30, 2019 13:23

Fix SanitizerCoverage

8c1377f

Fix pass for old LLVMs

d730e6c

fix removeCallEdgeFor

5b1c5c4

thewilsonator commented Aug 30, 2019

View reviewed changes

gen/passes/GarbageCollect2Stack.cpp Show resolved Hide resolved

Fix old LLVM take 2

2d56ff5

take 3

b50775a

kinke added a commit to kinke/ldc that referenced this pull request Sep 20, 2019

Add support for LLVM 9.0.0

610b131

Include some of Nicholas' fixes in ldc-developers#3144.

kinke added a commit to kinke/ldc that referenced this pull request Sep 21, 2019

Add support for LLVM 9.0.0

a1426de

Including some of Nicholas' fixes in ldc-developers#3144.

kinke added a commit to kinke/ldc that referenced this pull request Sep 21, 2019

Add support for LLVM 9.0.0

e6e5fd2

Including some of Nicholas' fixes in ldc-developers#3144.

kinke added a commit to kinke/ldc that referenced this pull request Sep 24, 2019

Add support for LLVM 9.0.0

8adf2c1

Including some of Nicholas' fixes in ldc-developers#3144.

kinke added a commit to kinke/ldc that referenced this pull request Sep 25, 2019

Add support for LLVM 9.0.0

0301234

Including some of Nicholas' fixes in ldc-developers#3144.

JohanEngelen mentioned this pull request Oct 7, 2019

Fix compilation with LLVM 10 #3187

Merged

JohanEngelen closed this Oct 19, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix llvm 10 #3144

Fix llvm 10 #3144

thewilsonator commented Aug 28, 2019

thewilsonator Aug 28, 2019

JohanEngelen Aug 28, 2019

thewilsonator Aug 29, 2019

kinke Sep 20, 2019

thewilsonator commented Aug 28, 2019

Hardcode84 commented Aug 28, 2019

thewilsonator commented Aug 28, 2019

JohanEngelen Aug 28, 2019

thewilsonator Aug 29, 2019

JohanEngelen Sep 1, 2019

JohanEngelen Aug 28, 2019

thewilsonator Aug 29, 2019 •

edited

JohanEngelen commented Aug 28, 2019

thewilsonator commented Aug 30, 2019

thewilsonator commented Aug 31, 2019

kinke commented Aug 31, 2019 •

edited

JohanEngelen commented Aug 31, 2019

kinke commented Aug 31, 2019 •

edited

kinke commented Aug 31, 2019 •

edited

kinke commented Oct 18, 2019

JohanEngelen commented Oct 19, 2019

Fix llvm 10 #3144

Fix llvm 10 #3144

Conversation

thewilsonator commented Aug 28, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thewilsonator commented Aug 28, 2019

Hardcode84 commented Aug 28, 2019

thewilsonator commented Aug 28, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thewilsonator Aug 29, 2019 • edited

Choose a reason for hiding this comment

JohanEngelen commented Aug 28, 2019

thewilsonator commented Aug 30, 2019

thewilsonator commented Aug 31, 2019

kinke commented Aug 31, 2019 • edited

JohanEngelen commented Aug 31, 2019

kinke commented Aug 31, 2019 • edited

kinke commented Aug 31, 2019 • edited

kinke commented Oct 18, 2019

JohanEngelen commented Oct 19, 2019

thewilsonator Aug 29, 2019 •

edited

kinke commented Aug 31, 2019 •

edited

kinke commented Aug 31, 2019 •

edited

kinke commented Aug 31, 2019 •

edited