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

Issue 6815010: Merge r7516, r7541 into 3.1 branch. (Closed)

Created:
9 years, 8 months ago by Vyacheslav Egorov (Chromium)
Modified:
9 years, 7 months ago
CC:
v8-dev
Visibility:
Public.

Description

Merge r7516, r7541 into 3.1 branch. Committed: http://code.google.com/p/v8/source/detail?r=7555

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+505 lines, -381 lines) Patch
M src/accessors.cc View 2 chunks +6 lines, -4 lines 0 comments Download
M src/arm/lithium-codegen-arm.h View 5 chunks +63 lines, -2 lines 0 comments Download
M src/arm/lithium-codegen-arm.cc View 17 chunks +78 lines, -63 lines 0 comments Download
M src/deoptimizer.h View 4 chunks +10 lines, -38 lines 0 comments Download
M src/deoptimizer.cc View 13 chunks +22 lines, -62 lines 0 comments Download
M src/frames.h View 3 chunks +11 lines, -8 lines 0 comments Download
M src/frames.cc View 5 chunks +9 lines, -54 lines 0 comments Download
M src/frames-inl.h View 1 chunk +15 lines, -4 lines 0 comments Download
M src/ia32/lithium-codegen-ia32.h View 4 chunks +61 lines, -9 lines 0 comments Download
M src/ia32/lithium-codegen-ia32.cc View 44 chunks +107 lines, -90 lines 0 comments Download
M src/ia32/macro-assembler-ia32.h View 1 chunk +4 lines, -0 lines 0 comments Download
M src/regexp-macro-assembler-irregexp-inl.h View 0 chunks +-1 lines, --1 lines 0 comments Download
M src/runtime.cc View 7 chunks +12 lines, -13 lines 0 comments Download
M src/version.cc View 1 chunk +1 line, -1 line 0 comments Download
M src/x64/lithium-codegen-x64.h View 5 chunks +45 lines, -2 lines 0 comments Download
M src/x64/lithium-codegen-x64.cc View 14 chunks +66 lines, -40 lines 0 comments Download
M src/x64/macro-assembler-x64.h View 1 chunk +4 lines, -0 lines 0 comments Download
M test/mjsunit/array-constructor.js View 0 chunks +-1 lines, --1 lines 0 comments Download
M test/mjsunit/array-functions-prototype-misc.js View 0 chunks +-1 lines, --1 lines 0 comments Download
M test/mjsunit/global-load-from-eval-in-with.js View 0 chunks +-1 lines, --1 lines 0 comments Download
M test/mjsunit/local-load-from-eval.js View 0 chunks +-1 lines, --1 lines 0 comments Download
M test/mjsunit/property-load-across-eval.js View 0 chunks +-1 lines, --1 lines 0 comments Download
M test/mjsunit/regress/regress-269.js View 0 chunks +-1 lines, --1 lines 0 comments Download
M test/mjsunit/regress/regress-334.js View 0 chunks +-1 lines, --1 lines 0 comments Download
A + test/mjsunit/regress/regress-78270.js View 0 chunks +-1 lines, --1 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
Vyacheslav Egorov (Chromium)
Søren, Can you take a look? Merge was not clean cause 3.1 is pre-isolate, so ...
9 years, 8 months ago (2011-04-07 18:37:27 UTC) #1
Søren Thygesen Gjesse
9 years, 8 months ago (2011-04-08 06:56:14 UTC) #2
LGTM

The diff for test/mjsunit/regress/regress-78270.js shows no difference even
though the file is added - maybe that is not a problem?

Powered by Google App Engine
This is Rietveld 408576698