Revision: 18873
Author: [email protected]
Date: Tue Jan 28 10:48:19 2014 UTC
Log: Merged r18697 into 3.23 branch.
Fix representation requirement in HReturn.
[email protected]
BUG=
Review URL: https://codereview.chromium.org/148213008
http://code.google.com/p/v8/source/detail?r=18873
Added:
/branches/3.23/test/mjsunit/regress-333594.js
Modified:
/branches/3.23/src/hydrogen-instructions.cc
/branches/3.23/src/hydrogen-instructions.h
/branches/3.23/src/version.cc
=======================================
--- /dev/null
+++ /branches/3.23/test/mjsunit/regress-333594.js Tue Jan 28 10:48:19 2014
UTC
@@ -0,0 +1,42 @@
+// Copyright 2014 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.
+
+// Flags: --allow-natives-syntax
+
+var a = { x: 1.1 };
+a.x = 0;
+var G = a.x;
+var o = { x: {} };
+
+function func() {
+ return {x: G};
+}
+
+func();
+func();
+%OptimizeFunctionOnNextCall(func);
+assertEquals(0, func().x);
=======================================
--- /branches/3.23/src/hydrogen-instructions.cc Fri Jan 24 12:11:37 2014 UTC
+++ /branches/3.23/src/hydrogen-instructions.cc Tue Jan 28 10:48:19 2014 UTC
@@ -2523,6 +2523,7 @@
has_smi_value_ = has_int32_value_ && Smi::IsValid(int32_value_);
double_value_ = n;
has_double_value_ = true;
+ // TODO(titzer): if this heap number is new space, tenure a new one.
} else {
is_internalized_string_ = handle->IsInternalizedString();
}
@@ -2721,6 +2722,9 @@
} else {
handle(Isolate::Current())->ShortPrint(stream);
}
+ if (!is_not_in_new_space_) {
+ stream->Add("[new space] ");
+ }
}
=======================================
--- /branches/3.23/src/hydrogen-instructions.h Tue Dec 3 08:00:39 2013 UTC
+++ /branches/3.23/src/hydrogen-instructions.h Tue Jan 28 10:48:19 2014 UTC
@@ -1585,6 +1585,8 @@
DECLARE_INSTRUCTION_WITH_CONTEXT_FACTORY_P1(HReturn, HValue*);
virtual Representation RequiredInputRepresentation(int index)
V8_OVERRIDE {
+ // TODO(titzer): require an Int32 input for faster returns.
+ if (index == 2) return Representation::Smi();
return Representation::Tagged();
}
=======================================
--- /branches/3.23/src/version.cc Fri Jan 24 12:11:37 2014 UTC
+++ /branches/3.23/src/version.cc Tue Jan 28 10:48:19 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 23
#define BUILD_NUMBER 17
-#define PATCH_LEVEL 10
+#define PATCH_LEVEL 11
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
