Revision: 16185
Author: [email protected]
Date: Wed Aug 14 05:14:08 2013
Log: Fix Math.round/floor that had bogus Smi representation
BUG=chromium:272564
[email protected]
Review URL: https://codereview.chromium.org/23022005
http://code.google.com/p/v8/source/detail?r=16185
Added:
/branches/bleeding_edge/test/mjsunit/regress/regress-crbug-272564.js
Modified:
/branches/bleeding_edge/src/hydrogen-instructions.cc
/branches/bleeding_edge/src/hydrogen-instructions.h
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/regress/regress-crbug-272564.js
Wed Aug 14 05:14:08 2013
@@ -0,0 +1,49 @@
+// Copyright 2013 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
+
+function Bb(w) {
+ this.width = w;
+}
+
+function ce(a, b) {
+ "number" == typeof a && (a = (b ? Math.round(a) : a) + "px");
+ return a
+}
+
+function pe(a, b, c) {
+ if (b instanceof Bb) b = b.width;
+ a.width = ce(b, !0);
+}
+
+var a = new Bb(1);
+var b = new Bb(5);
+pe(a, b, 0);
+pe(a, b, 0);
+%OptimizeFunctionOnNextCall(pe);
+pe(a, b, 0);
=======================================
--- /branches/bleeding_edge/src/hydrogen-instructions.cc Wed Aug 14
01:54:27 2013
+++ /branches/bleeding_edge/src/hydrogen-instructions.cc Wed Aug 14
05:14:08 2013
@@ -3175,8 +3175,6 @@
Representation input_rep = value()->representation();
if (!input_rep.IsTagged()) {
rep = rep.generalize(input_rep);
- } else if (flexible_int()) {
- rep = Representation::Integer32();
}
return rep;
}
=======================================
--- /branches/bleeding_edge/src/hydrogen-instructions.h Wed Aug 14 01:54:27
2013
+++ /branches/bleeding_edge/src/hydrogen-instructions.h Wed Aug 14 05:14:08
2013
@@ -2432,21 +2432,6 @@
}
}
}
-
- virtual void UpdateRepresentation(Representation new_rep,
- HInferRepresentationPhase* h_infer,
- const char* reason) {
- if (flexible_int() && !new_rep.IsSmi()) {
- new_rep = Representation::Integer32();
- }
- HValue::UpdateRepresentation(new_rep, h_infer, reason);
- }
-
- virtual void RepresentationChanged(Representation new_rep) {
- if (flexible_int() && new_rep.IsInteger32()) {
- ClearFlag(kFlexibleRepresentation);
- }
- }
virtual Range* InferRange(Zone* zone);
@@ -2465,10 +2450,6 @@
}
private:
- bool flexible_int() {
- return op_ == kMathFloor || op_ == kMathRound;
- }
-
HUnaryMathOperation(HValue* context, HValue* value, BuiltinFunctionId op)
: HTemplateInstruction<2>(HType::TaggedNumber()), op_(op) {
SetOperandAt(0, context);
@@ -2476,8 +2457,7 @@
switch (op) {
case kMathFloor:
case kMathRound:
- set_representation(Representation::Smi());
- SetFlag(kFlexibleRepresentation);
+ set_representation(Representation::Integer32());
break;
case kMathAbs:
// Not setting representation here: it is None intentionally.
--
--
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.
