2010-04-19 16:08:26 +00:00
|
|
|
// Copyright 2007-2008 the V8 project authors. All rights reserved.
|
|
|
|
// Redistribution and use in source and binary forms, with or without
|
|
|
|
// modification, are permitted provided that the following conditions are
|
|
|
|
// met:
|
|
|
|
//
|
|
|
|
// * Redistributions of source code must retain the above copyright
|
|
|
|
// notice, this list of conditions and the following disclaimer.
|
|
|
|
// * Redistributions in binary form must reproduce the above
|
|
|
|
// copyright notice, this list of conditions and the following
|
|
|
|
// disclaimer in the documentation and/or other materials provided
|
|
|
|
// with the distribution.
|
|
|
|
// * Neither the name of Google Inc. nor the names of its
|
|
|
|
// contributors may be used to endorse or promote products derived
|
|
|
|
// from this software without specific prior written permission.
|
|
|
|
//
|
|
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
2014-06-03 08:12:43 +00:00
|
|
|
#include "src/v8.h"
|
2010-04-19 16:08:26 +00:00
|
|
|
|
2019-05-17 12:13:44 +00:00
|
|
|
#include "src/api/api-inl.h"
|
2015-07-31 11:07:50 +00:00
|
|
|
#include "src/debug/liveedit.h"
|
2019-05-23 08:51:46 +00:00
|
|
|
#include "src/objects/objects-inl.h"
|
2014-06-03 08:12:43 +00:00
|
|
|
#include "test/cctest/cctest.h"
|
2010-04-19 16:08:26 +00:00
|
|
|
|
2017-08-11 11:22:28 +00:00
|
|
|
namespace v8 {
|
|
|
|
namespace internal {
|
2010-04-19 16:08:26 +00:00
|
|
|
namespace {
|
|
|
|
void CompareStringsOneWay(const char* s1, const char* s2,
|
2018-06-20 14:02:24 +00:00
|
|
|
int expected_diff_parameter,
|
|
|
|
std::vector<SourceChangeRange>* changes) {
|
|
|
|
i::Isolate* isolate = CcTest::i_isolate();
|
|
|
|
i::Handle<i::String> i_s1 = isolate->factory()->NewStringFromAsciiChecked(s1);
|
|
|
|
i::Handle<i::String> i_s2 = isolate->factory()->NewStringFromAsciiChecked(s2);
|
|
|
|
changes->clear();
|
|
|
|
LiveEdit::CompareStrings(isolate, i_s1, i_s2, changes);
|
2010-04-19 16:08:26 +00:00
|
|
|
|
2019-04-29 14:56:08 +00:00
|
|
|
int len1 = static_cast<int>(strlen(s1));
|
|
|
|
int len2 = static_cast<int>(strlen(s2));
|
2010-04-19 16:08:26 +00:00
|
|
|
|
|
|
|
int pos1 = 0;
|
|
|
|
int pos2 = 0;
|
|
|
|
|
|
|
|
int diff_parameter = 0;
|
2018-06-20 14:02:24 +00:00
|
|
|
for (const auto& diff : *changes) {
|
|
|
|
int diff_pos1 = diff.start_position;
|
2010-04-19 16:08:26 +00:00
|
|
|
int similar_part_length = diff_pos1 - pos1;
|
|
|
|
int diff_pos2 = pos2 + similar_part_length;
|
|
|
|
|
2018-06-20 14:02:24 +00:00
|
|
|
CHECK_EQ(diff_pos2, diff.new_start_position);
|
2010-04-19 16:08:26 +00:00
|
|
|
|
|
|
|
for (int j = 0; j < similar_part_length; j++) {
|
2015-12-07 05:36:41 +00:00
|
|
|
CHECK(pos1 + j < len1);
|
|
|
|
CHECK(pos2 + j < len2);
|
|
|
|
CHECK_EQ(s1[pos1 + j], s2[pos2 + j]);
|
2010-04-19 16:08:26 +00:00
|
|
|
}
|
2018-06-20 14:02:24 +00:00
|
|
|
int diff_len1 = diff.end_position - diff.start_position;
|
|
|
|
int diff_len2 = diff.new_end_position - diff.new_start_position;
|
|
|
|
diff_parameter += diff_len1 + diff_len2;
|
|
|
|
pos1 = diff_pos1 + diff_len1;
|
|
|
|
pos2 = diff_pos2 + diff_len2;
|
2010-04-19 16:08:26 +00:00
|
|
|
}
|
|
|
|
{
|
|
|
|
// After last chunk.
|
|
|
|
int similar_part_length = len1 - pos1;
|
2015-12-07 05:36:41 +00:00
|
|
|
CHECK_EQ(similar_part_length, len2 - pos2);
|
2010-04-19 16:08:26 +00:00
|
|
|
USE(len2);
|
|
|
|
for (int j = 0; j < similar_part_length; j++) {
|
2015-12-07 05:36:41 +00:00
|
|
|
CHECK(pos1 + j < len1);
|
|
|
|
CHECK(pos2 + j < len2);
|
|
|
|
CHECK_EQ(s1[pos1 + j], s2[pos2 + j]);
|
2010-04-19 16:08:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (expected_diff_parameter != -1) {
|
2015-12-07 05:36:41 +00:00
|
|
|
CHECK_EQ(expected_diff_parameter, diff_parameter);
|
2010-04-19 16:08:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-20 14:02:24 +00:00
|
|
|
void CompareStringsOneWay(const char* s1, const char* s2,
|
|
|
|
int expected_diff_parameter = -1) {
|
|
|
|
std::vector<SourceChangeRange> changes;
|
|
|
|
CompareStringsOneWay(s1, s2, expected_diff_parameter, &changes);
|
|
|
|
}
|
|
|
|
|
|
|
|
void CompareStringsOneWay(const char* s1, const char* s2,
|
|
|
|
std::vector<SourceChangeRange>* changes) {
|
|
|
|
CompareStringsOneWay(s1, s2, -1, changes);
|
|
|
|
}
|
2010-04-19 16:08:26 +00:00
|
|
|
|
|
|
|
void CompareStrings(const char* s1, const char* s2,
|
|
|
|
int expected_diff_parameter = -1) {
|
|
|
|
CompareStringsOneWay(s1, s2, expected_diff_parameter);
|
|
|
|
CompareStringsOneWay(s2, s1, expected_diff_parameter);
|
|
|
|
}
|
|
|
|
|
2018-06-20 14:02:24 +00:00
|
|
|
void CompareOneWayPlayWithLF(const char* s1, const char* s2) {
|
|
|
|
std::string s1_one_line(s1);
|
|
|
|
std::replace(s1_one_line.begin(), s1_one_line.end(), '\n', ' ');
|
|
|
|
std::string s2_one_line(s2);
|
|
|
|
std::replace(s2_one_line.begin(), s2_one_line.end(), '\n', ' ');
|
|
|
|
CompareStringsOneWay(s1, s2, -1);
|
|
|
|
CompareStringsOneWay(s1_one_line.c_str(), s2, -1);
|
|
|
|
CompareStringsOneWay(s1, s2_one_line.c_str(), -1);
|
|
|
|
CompareStringsOneWay(s1_one_line.c_str(), s2_one_line.c_str(), -1);
|
|
|
|
}
|
2010-04-19 16:08:26 +00:00
|
|
|
|
2018-06-20 14:02:24 +00:00
|
|
|
void CompareStringsPlayWithLF(const char* s1, const char* s2) {
|
|
|
|
CompareOneWayPlayWithLF(s1, s2);
|
|
|
|
CompareOneWayPlayWithLF(s2, s1);
|
|
|
|
}
|
|
|
|
} // anonymous namespace
|
2010-04-19 16:08:26 +00:00
|
|
|
|
|
|
|
TEST(LiveEditDiffer) {
|
2018-06-20 14:02:24 +00:00
|
|
|
v8::HandleScope handle_scope(CcTest::isolate());
|
2010-04-19 16:08:26 +00:00
|
|
|
CompareStrings("zz1zzz12zz123zzz", "zzzzzzzzzz", 6);
|
|
|
|
CompareStrings("zz1zzz12zz123zzz", "zz0zzz0zz0zzz", 9);
|
|
|
|
CompareStrings("123456789", "987654321", 16);
|
|
|
|
CompareStrings("zzz", "yyy", 6);
|
|
|
|
CompareStrings("zzz", "zzz12", 2);
|
|
|
|
CompareStrings("zzz", "21zzz", 2);
|
|
|
|
CompareStrings("cat", "cut", 2);
|
|
|
|
CompareStrings("ct", "cut", 1);
|
|
|
|
CompareStrings("cat", "ct", 1);
|
|
|
|
CompareStrings("cat", "cat", 0);
|
|
|
|
CompareStrings("", "", 0);
|
|
|
|
CompareStrings("cat", "", 3);
|
|
|
|
CompareStrings("a cat", "a capybara", 7);
|
|
|
|
CompareStrings("abbabababababaaabbabababababbabbbbbbbababa",
|
|
|
|
"bbbbabababbbabababbbabababababbabbababa");
|
2018-06-20 14:02:24 +00:00
|
|
|
CompareStringsPlayWithLF("", "");
|
|
|
|
CompareStringsPlayWithLF("a", "b");
|
|
|
|
CompareStringsPlayWithLF(
|
|
|
|
"yesterday\nall\nmy\ntroubles\nseemed\nso\nfar\naway",
|
|
|
|
"yesterday\nall\nmy\ntroubles\nseem\nso\nfar\naway");
|
|
|
|
CompareStringsPlayWithLF(
|
|
|
|
"yesterday\nall\nmy\ntroubles\nseemed\nso\nfar\naway",
|
|
|
|
"\nall\nmy\ntroubles\nseemed\nso\nfar\naway");
|
|
|
|
CompareStringsPlayWithLF(
|
|
|
|
"yesterday\nall\nmy\ntroubles\nseemed\nso\nfar\naway",
|
|
|
|
"all\nmy\ntroubles\nseemed\nso\nfar\naway");
|
|
|
|
CompareStringsPlayWithLF(
|
|
|
|
"yesterday\nall\nmy\ntroubles\nseemed\nso\nfar\naway",
|
|
|
|
"yesterday\nall\nmy\ntroubles\nseemed\nso\nfar\naway\n");
|
|
|
|
CompareStringsPlayWithLF(
|
|
|
|
"yesterday\nall\nmy\ntroubles\nseemed\nso\nfar\naway",
|
|
|
|
"yesterday\nall\nmy\ntroubles\nseemed\nso\n");
|
2010-04-19 16:08:26 +00:00
|
|
|
}
|
2017-08-11 11:22:28 +00:00
|
|
|
|
2018-06-20 14:02:24 +00:00
|
|
|
TEST(LiveEditTranslatePosition) {
|
|
|
|
v8::HandleScope handle_scope(CcTest::isolate());
|
|
|
|
std::vector<SourceChangeRange> changes;
|
|
|
|
CompareStringsOneWay("a", "a", &changes);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 0), 0);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 1), 1);
|
|
|
|
CompareStringsOneWay("a", "b", &changes);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 0), 0);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 1), 1);
|
|
|
|
CompareStringsOneWay("ababa", "aaa", &changes);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 0), 0);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 1), 1);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 2), 1);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 3), 2);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 4), 2);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 5), 3);
|
|
|
|
CompareStringsOneWay("ababa", "acaca", &changes);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 0), 0);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 1), 1);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 2), 2);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 3), 3);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 4), 4);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 5), 5);
|
|
|
|
CompareStringsOneWay("aaa", "ababa", &changes);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 0), 0);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 1), 2);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 2), 4);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 3), 5);
|
|
|
|
CompareStringsOneWay("aabbaaaa", "aaaabbaa", &changes);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 0), 0);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 1), 1);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 2), 4);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 3), 5);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 4), 6);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 5), 7);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 6), 8);
|
|
|
|
CHECK_EQ(LiveEdit::TranslatePosition(changes, 8), 8);
|
|
|
|
}
|
2018-06-21 14:24:46 +00:00
|
|
|
|
|
|
|
namespace {
|
|
|
|
void PatchFunctions(v8::Local<v8::Context> context, const char* source_a,
|
|
|
|
const char* source_b,
|
|
|
|
v8::debug::LiveEditResult* result = nullptr) {
|
|
|
|
v8::Isolate* isolate = context->GetIsolate();
|
2018-06-26 10:14:12 +00:00
|
|
|
i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
v8::EscapableHandleScope scope(isolate);
|
2018-06-21 14:24:46 +00:00
|
|
|
v8::Local<v8::Script> script_a =
|
|
|
|
v8::Script::Compile(context, v8_str(isolate, source_a)).ToLocalChecked();
|
|
|
|
script_a->Run(context).ToLocalChecked();
|
|
|
|
i::Handle<i::Script> i_script_a(
|
2018-06-26 10:14:12 +00:00
|
|
|
i::Script::cast(v8::Utils::OpenHandle(*script_a)->shared().script()),
|
|
|
|
i_isolate);
|
2018-06-21 14:24:46 +00:00
|
|
|
|
|
|
|
if (result) {
|
|
|
|
LiveEdit::PatchScript(
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
i_isolate, i_script_a,
|
|
|
|
i_isolate->factory()->NewStringFromAsciiChecked(source_b), false,
|
2018-06-21 14:24:46 +00:00
|
|
|
result);
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
if (result->status == v8::debug::LiveEditResult::COMPILE_ERROR) {
|
|
|
|
result->message = scope.Escape(result->message);
|
|
|
|
}
|
2018-06-21 14:24:46 +00:00
|
|
|
} else {
|
|
|
|
v8::debug::LiveEditResult result;
|
|
|
|
LiveEdit::PatchScript(
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
i_isolate, i_script_a,
|
|
|
|
i_isolate->factory()->NewStringFromAsciiChecked(source_b), false,
|
2018-06-21 14:24:46 +00:00
|
|
|
&result);
|
|
|
|
CHECK_EQ(result.status, v8::debug::LiveEditResult::OK);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
TEST(LiveEditPatchFunctions) {
|
2018-06-21 14:24:46 +00:00
|
|
|
LocalContext env;
|
|
|
|
v8::HandleScope scope(env->GetIsolate());
|
|
|
|
v8::Local<v8::Context> context = env.local();
|
|
|
|
// Check that function is removed from compilation cache.
|
|
|
|
i::FLAG_allow_natives_syntax = true;
|
|
|
|
PatchFunctions(context, "42;", "%AbortJS('')");
|
|
|
|
PatchFunctions(context, "42;", "239;");
|
|
|
|
i::FLAG_allow_natives_syntax = false;
|
|
|
|
|
|
|
|
// Basic test cases.
|
|
|
|
PatchFunctions(context, "42;", "2;");
|
|
|
|
PatchFunctions(context, "42;", " 42;");
|
|
|
|
PatchFunctions(context, "42;", "42;");
|
|
|
|
// Trivial return value change.
|
|
|
|
PatchFunctions(context, "function foo() { return 1; }",
|
|
|
|
"function foo() { return 42; }");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "foo()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
42);
|
|
|
|
// It is expected, we do not reevaluate top level function.
|
|
|
|
PatchFunctions(context, "var a = 1; function foo() { return a; }",
|
|
|
|
"var a = 3; function foo() { return a; }");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "foo()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
1);
|
|
|
|
// Throw exception since var b is not defined in original source.
|
|
|
|
PatchFunctions(context, "var a = 1; function foo() { return a; }",
|
|
|
|
"var b = 4; function foo() { return b; }");
|
|
|
|
{
|
|
|
|
v8::TryCatch try_catch(env->GetIsolate());
|
|
|
|
CompileRun("foo()");
|
|
|
|
CHECK(try_catch.HasCaught());
|
|
|
|
}
|
|
|
|
// But user always can add new variable to function and use it.
|
|
|
|
PatchFunctions(context, "var a = 1; function foo() { return a; }",
|
|
|
|
"var b = 4; function foo() { var b = 5; return b; }");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "foo()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
5);
|
|
|
|
|
|
|
|
PatchFunctions(context, "var a = 1; function foo() { return a; }",
|
|
|
|
"var b = 4; function foo() { var a = 6; return a; }");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "foo()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
6);
|
|
|
|
|
|
|
|
PatchFunctions(context, "var a = 1; function foo() { return a; }",
|
|
|
|
"var d = (() => ({a:2}))(); function foo() { return d; }");
|
|
|
|
{
|
|
|
|
v8::TryCatch try_catch(env->GetIsolate());
|
|
|
|
CompileRun("foo()");
|
|
|
|
CHECK(try_catch.HasCaught());
|
|
|
|
}
|
|
|
|
|
|
|
|
PatchFunctions(context, "var a = 1; function foo() { return a; }",
|
|
|
|
"var b = 1; var a = 2; function foo() { return a; }");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "foo()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
1);
|
|
|
|
|
|
|
|
PatchFunctions(context, "var a = 1; function foo() { return a; }",
|
|
|
|
"var b = 1; var a = 2; function foo() { return b; }");
|
|
|
|
{
|
|
|
|
v8::TryCatch try_catch(env->GetIsolate());
|
|
|
|
CompileRun("foo()");
|
|
|
|
CHECK(try_catch.HasCaught());
|
|
|
|
}
|
|
|
|
|
|
|
|
PatchFunctions(context, "function foo() { var a = 1; return a; }",
|
|
|
|
"function foo() { var b = 1; return b; }");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "foo()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
1);
|
|
|
|
|
|
|
|
PatchFunctions(context, "var a = 3; function foo() { var a = 1; return a; }",
|
|
|
|
"function foo() { var b = 1; return a; }");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "foo()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
3);
|
|
|
|
|
|
|
|
PatchFunctions(context, "var a = 3; var c = 7; function foo() { return a; }",
|
|
|
|
"var b = 5; var a = 3; function foo() { return b; }");
|
|
|
|
{
|
|
|
|
v8::TryCatch try_catch(env->GetIsolate());
|
|
|
|
CompileRun("foo()");
|
|
|
|
CHECK(try_catch.HasCaught());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add argument.
|
|
|
|
PatchFunctions(context, "function fooArgs(a1, b1) { return a1 + b1; }",
|
|
|
|
"function fooArgs(a2, b2, c2) { return a2 + b2 + c2; }");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "fooArgs(1,2,3)")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
6);
|
|
|
|
|
|
|
|
PatchFunctions(context, "function fooArgs(a1, b1) { return a1 + b1; }",
|
|
|
|
"function fooArgs(a1, b1, c1) { return a1 + b1 + c1; }");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "fooArgs(1,2,3)")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
6);
|
|
|
|
|
|
|
|
i::FLAG_allow_natives_syntax = true;
|
|
|
|
PatchFunctions(context,
|
|
|
|
"function foo(a, b) { return a + b; }; "
|
2019-04-30 11:04:41 +00:00
|
|
|
"%PrepareFunctionForOptimization(foo);"
|
2018-06-21 14:24:46 +00:00
|
|
|
"%OptimizeFunctionOnNextCall(foo); foo(1,2);",
|
|
|
|
"function foo(a, b) { return a * b; };");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "foo(5,7)")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
35);
|
|
|
|
i::FLAG_allow_natives_syntax = false;
|
|
|
|
|
|
|
|
// Check inner function.
|
|
|
|
PatchFunctions(
|
|
|
|
context,
|
|
|
|
"function foo(a,b) { function op(a,b) { return a + b } return op(a,b); }",
|
|
|
|
"function foo(a,b) { function op(a,b) { return a * b } return op(a,b); "
|
|
|
|
"}");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "foo(8,9)")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
72);
|
|
|
|
|
|
|
|
// Update constructor.
|
|
|
|
PatchFunctions(context,
|
|
|
|
"class Foo { constructor(a,b) { this.data = a + b; } };",
|
|
|
|
"class Foo { constructor(a,b) { this.data = a * b; } };");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "new Foo(4,5).data")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
20);
|
|
|
|
// Change inner functions.
|
|
|
|
PatchFunctions(
|
|
|
|
context,
|
|
|
|
"function f(evt) { function f2() {} f2(),f3(); function f3() {} } "
|
|
|
|
"function f4() {}",
|
|
|
|
"function f(evt) { function f2() { return 1; } return f2() + f3(); "
|
|
|
|
"function f3() { return 2; } } function f4() {}");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "f()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
2018-06-21 14:24:46 +00:00
|
|
|
->Value(),
|
|
|
|
3);
|
|
|
|
// Change usage of outer scope.
|
|
|
|
PatchFunctions(context,
|
|
|
|
"function ChooseAnimal(a, b) {\n "
|
|
|
|
" if (a == 7 && b == 7) {\n"
|
|
|
|
" return;\n"
|
|
|
|
" }\n"
|
|
|
|
" return function Chooser() {\n"
|
|
|
|
" return 'Cat' + a;\n"
|
|
|
|
" };\n"
|
|
|
|
"}\n"
|
|
|
|
"var old_closure = ChooseAnimal(2, 3);",
|
|
|
|
"function ChooseAnimal(a, b) {\n "
|
|
|
|
" if (a == 7 && b == 7) {\n"
|
|
|
|
" return;\n"
|
|
|
|
" }\n"
|
|
|
|
" return function Chooser() {\n"
|
|
|
|
" return 'Capybara' + b;\n"
|
|
|
|
" };\n"
|
|
|
|
"}\n");
|
|
|
|
CompileRunChecked(env->GetIsolate(), "var new_closure = ChooseAnimal(3, 4);");
|
|
|
|
v8::Local<v8::String> call_result =
|
|
|
|
CompileRunChecked(env->GetIsolate(), "new_closure()").As<v8::String>();
|
|
|
|
v8::String::Utf8Value new_result_utf8(env->GetIsolate(), call_result);
|
|
|
|
CHECK_NOT_NULL(strstr(*new_result_utf8, "Capybara4"));
|
|
|
|
call_result =
|
|
|
|
CompileRunChecked(env->GetIsolate(), "old_closure()").As<v8::String>();
|
|
|
|
v8::String::Utf8Value old_result_utf8(env->GetIsolate(), call_result);
|
|
|
|
CHECK_NOT_NULL(strstr(*old_result_utf8, "Cat2"));
|
|
|
|
|
|
|
|
// Update const literals.
|
|
|
|
PatchFunctions(context, "function foo() { return 'a' + 'b'; }",
|
|
|
|
"function foo() { return 'c' + 'b'; }");
|
|
|
|
{
|
|
|
|
v8::Local<v8::String> result =
|
|
|
|
CompileRunChecked(env->GetIsolate(), "foo()").As<v8::String>();
|
|
|
|
v8::String::Utf8Value new_result_utf8(env->GetIsolate(), result);
|
|
|
|
CHECK_NOT_NULL(strstr(*new_result_utf8, "cb"));
|
|
|
|
}
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
|
|
|
|
// TODO(kozyatinskiy): should work when we remove (.
|
|
|
|
PatchFunctions(context, "f = () => 2", "f = a => a");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "f(3)")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
->Value(),
|
|
|
|
2);
|
|
|
|
|
|
|
|
// Replace function with not a function.
|
|
|
|
PatchFunctions(context, "f = () => 2", "f = a == 2");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "f(3)")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
->Value(),
|
|
|
|
2);
|
|
|
|
|
|
|
|
// TODO(kozyatinskiy): should work when we put function into (...).
|
|
|
|
PatchFunctions(context, "f = a => 2", "f = (a => 5)()");
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "f()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
->Value(),
|
|
|
|
2);
|
|
|
|
|
|
|
|
PatchFunctions(context,
|
|
|
|
"f2 = null;\n"
|
|
|
|
"f = () => {\n"
|
|
|
|
" f2 = () => 5;\n"
|
|
|
|
" return f2();\n"
|
|
|
|
"}\n"
|
|
|
|
"f()\n",
|
|
|
|
"f2 = null;\n"
|
|
|
|
"f = () => {\n"
|
|
|
|
" for (var a = (() => 7)(), b = 0; a < 10; ++a,++b);\n"
|
|
|
|
" return b;\n"
|
|
|
|
"}\n"
|
|
|
|
"f()\n");
|
|
|
|
// TODO(kozyatinskiy): ditto.
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "f2()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
->Value(),
|
|
|
|
5);
|
|
|
|
CHECK_EQ(CompileRunChecked(env->GetIsolate(), "f()")
|
2018-07-24 16:37:58 +00:00
|
|
|
->ToInt32(context)
|
|
|
|
.ToLocalChecked()
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
->Value(),
|
|
|
|
3);
|
2018-06-21 14:24:46 +00:00
|
|
|
}
|
|
|
|
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
TEST(LiveEditCompileError) {
|
2018-06-21 14:24:46 +00:00
|
|
|
LocalContext env;
|
|
|
|
v8::HandleScope scope(env->GetIsolate());
|
|
|
|
v8::Local<v8::Context> context = env.local();
|
|
|
|
debug::LiveEditResult result;
|
|
|
|
PatchFunctions(
|
|
|
|
context,
|
|
|
|
"var something1 = 25; \n"
|
|
|
|
" function ChooseAnimal() { return 'Cat'; } \n"
|
|
|
|
" ChooseAnimal.Helper = function() { return 'Help!'; }\n",
|
|
|
|
"var something1 = 25; \n"
|
|
|
|
" function ChooseAnimal() { return 'Cap' + ) + 'bara'; "
|
|
|
|
"} \n"
|
|
|
|
" ChooseAnimal.Helper = function() { return 'Help!'; }\n",
|
|
|
|
&result);
|
|
|
|
CHECK_EQ(result.status, debug::LiveEditResult::COMPILE_ERROR);
|
|
|
|
CHECK_EQ(result.line_number, 2);
|
|
|
|
CHECK_EQ(result.column_number, 51);
|
|
|
|
v8::String::Utf8Value result_message(env->GetIsolate(), result.message);
|
|
|
|
CHECK_NOT_NULL(
|
|
|
|
strstr(*result_message, "Uncaught SyntaxError: Unexpected token )"));
|
|
|
|
|
|
|
|
{
|
|
|
|
v8::Local<v8::String> result =
|
|
|
|
CompileRunChecked(env->GetIsolate(), "ChooseAnimal()").As<v8::String>();
|
|
|
|
v8::String::Utf8Value new_result_utf8(env->GetIsolate(), result);
|
|
|
|
CHECK_NOT_NULL(strstr(*new_result_utf8, "Cat"));
|
|
|
|
}
|
|
|
|
|
|
|
|
PatchFunctions(context, "function foo() {}",
|
|
|
|
"function foo() { return a # b; }", &result);
|
|
|
|
CHECK_EQ(result.status, debug::LiveEditResult::COMPILE_ERROR);
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
CHECK_EQ(result.line_number, 1);
|
|
|
|
CHECK_EQ(result.column_number, 26);
|
2018-06-21 14:24:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
TEST(LiveEditFunctionExpression) {
|
|
|
|
const char* original_source =
|
|
|
|
"(function() {\n "
|
|
|
|
" return 'Cat';\n"
|
|
|
|
"})\n";
|
|
|
|
const char* updated_source =
|
|
|
|
"(function() {\n "
|
|
|
|
" return 'Capy' + 'bara';\n"
|
|
|
|
"})\n";
|
|
|
|
LocalContext env;
|
|
|
|
v8::HandleScope scope(env->GetIsolate());
|
|
|
|
v8::Local<v8::Context> context = env.local();
|
|
|
|
v8::Isolate* isolate = context->GetIsolate();
|
2018-06-26 10:14:12 +00:00
|
|
|
i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
|
2018-06-21 14:24:46 +00:00
|
|
|
v8::Local<v8::Script> script =
|
|
|
|
v8::Script::Compile(context, v8_str(isolate, original_source))
|
|
|
|
.ToLocalChecked();
|
|
|
|
v8::Local<v8::Function> f =
|
|
|
|
script->Run(context).ToLocalChecked().As<v8::Function>();
|
|
|
|
i::Handle<i::Script> i_script(
|
2018-06-26 10:14:12 +00:00
|
|
|
i::Script::cast(v8::Utils::OpenHandle(*script)->shared().script()),
|
|
|
|
i_isolate);
|
2018-06-21 14:24:46 +00:00
|
|
|
debug::LiveEditResult result;
|
|
|
|
LiveEdit::PatchScript(
|
Reland "[debug] liveedit in native"
This is a reland of 3dfaf8264f8abd3e101d5f2e72739c4e8475ff78
Original change's description:
> [debug] liveedit in native
>
> Liveedit step-by-step:
> 1. calculate diff between old source and new source,
> 2. map function literals from old source to new source,
> 3. create new script for new_source,
> 4. mark literals with changed code as changed, all others as unchanged,
> 5. check that for changed literals there are no:
> - running generators in the heap,
> - non droppable frames (e.g. running generator) above them on stack.
> 6. mark the bottom most frame with changed function as scheduled for
> restart if any.
> 7. for unchanged functions:
> - deoptimize,
> - remove from cache,
> - update source positions,
> - move to new script,
> - reset feedback information and preparsed scope information if any,
> - replace any sfi in constant pool with changed one if any.
> 8. for changed functions:
> - deoptimize
> - remove from cache,
> - reset feedback information,
> - update all links from js functions to old shared with new one.
> 9. swap scripts.
>
> TBR=ulan@chromium.org
>
> Bug: v8:7862,v8:5713
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
> Change-Id: I8f6f6156318cc82d6f36d7ebc1c9f7d5f3aa1461
> Reviewed-on: https://chromium-review.googlesource.com/1105493
> Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#54146}
TBR=dgozman@chromium.org
Bug: v8:7862, v8:5713
Change-Id: I163ed2fd2ca3115ba0de74cb35a6fac9e40fdd94
Cq-Include-Trybots: luci.chromium.try:linux_chromium_headless_rel;luci.chromium.try:linux_chromium_rel_ng;master.tryserver.blink:linux_trusty_blink_rel
Reviewed-on: https://chromium-review.googlesource.com/1124879
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54187}
2018-07-03 17:16:35 +00:00
|
|
|
i_isolate, i_script,
|
|
|
|
i_isolate->factory()->NewStringFromAsciiChecked(updated_source), false,
|
2018-06-21 14:24:46 +00:00
|
|
|
&result);
|
|
|
|
CHECK_EQ(result.status, debug::LiveEditResult::OK);
|
|
|
|
{
|
|
|
|
v8::Local<v8::String> result =
|
|
|
|
f->Call(context, context->Global(), 0, nullptr)
|
|
|
|
.ToLocalChecked()
|
|
|
|
.As<v8::String>();
|
|
|
|
v8::String::Utf8Value new_result_utf8(env->GetIsolate(), result);
|
|
|
|
CHECK_NOT_NULL(strstr(*new_result_utf8, "Capybara"));
|
|
|
|
}
|
|
|
|
}
|
2017-08-11 11:22:28 +00:00
|
|
|
} // namespace internal
|
|
|
|
} // namespace v8
|