Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Issue 512933006: LLVM 3.5 merge: Subzero (Closed)

Created:
6 years, 3 months ago by JF
Modified:
6 years, 2 months ago
Reviewers:
Jim Stichnoth
CC:
native-client-reviews_googlegroups.com
Base URL:
https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Visibility:
Public.

Description

LLVM 3.5 merge: Subzero OwningPtr is now unique_ptr. Variable's copy ctor is deleted and Variable::asType returns a Variable. That used to work because of return value optimization and doesn't work anymore because the implicitly-declared move ctor is getting deleted (because at least one data member, IceString, isn't trivially copyable). This wouldn't be a problem in C++14, but it is in C++11, the implicitly declared move ctor therefore needs to be force-generated by marking it with '= default'. InstX8632Lockable::dump was declared but never defined, causing a link error because of a missing vtable. getFileOrSTDIN now uses ErrorOr. LLVM now uses C++11's std::error_code. Add missing header for SmallString. ValueHandle.h changed location. LLVM_OVERRIDE is now override (and doesn't require virtual). Add missing header for LLVM_DELETED_FUNCTION. R= stichnot@chromium.org BUG= https://code.google.com/p/nativeclient/issues/detail?id=3930 TEST= ???

Patch Set 1 #

Patch Set 2 : More fixes. #

Patch Set 3 : Rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+44 lines, -35 lines) Patch
M src/IceCfg.h View 1 2 2 chunks +6 lines, -5 lines 0 comments Download
M src/IceCfg.cpp View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/IceGlobalContext.h View 1 2 3 chunks +3 lines, -2 lines 0 comments Download
M src/IceOperand.h View 1 2 6 chunks +6 lines, -0 lines 0 comments Download
M src/IceTranslator.h View 1 2 2 chunks +4 lines, -2 lines 0 comments Download
M src/IceTranslator.cpp View 1 2 1 chunk +1 line, -1 line 0 comments Download
M src/PNaClTranslator.cpp View 1 2 16 chunks +23 lines, -24 lines 0 comments Download

Messages

Total messages: 5 (0 generated)
JF
6 years, 3 months ago (2014-08-28 01:31:48 UTC) #1
JF
This isn't ready to be committed yet: I'll need to pass all tests, and commit ...
6 years, 3 months ago (2014-08-28 01:32:38 UTC) #2
Jim Stichnoth
Science-dog &&LGTM. Since asType() explicitly only happens for Variable type, maybe the default move ctor ...
6 years, 3 months ago (2014-08-28 16:56:23 UTC) #3
JF
A few more fixes. It looks like subzero now builds and links. InstX8632Lockable::dump was declared ...
6 years, 3 months ago (2014-08-29 22:15:28 UTC) #4
JF
6 years, 2 months ago (2014-09-26 16:52:24 UTC) #5
Message was sent while issue was closed.
Closing this CL since Jim generously self-migrated to C++11 with a 95% success
rate. I'll send a separate CL for LLVM's header changes (those are gated on
3.5).

Powered by Google App Engine
This is Rietveld 408576698