Reviewers: titzer,
Description:
Extend ToBooleanStub to be able to return oddballs.
[email protected]
Please review this at https://codereview.chromium.org/450273002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+45, -33 lines):
M src/code-stubs.h
M src/code-stubs-hydrogen.cc
M src/compiler/js-generic-lowering.cc
Index: src/code-stubs-hydrogen.cc
diff --git a/src/code-stubs-hydrogen.cc b/src/code-stubs-hydrogen.cc
index
c8dd9bf0f198af82064d9487852e24ba8733d596..775916adc52b7c28250c2c2eae085b134d6dc3a3
100644
--- a/src/code-stubs-hydrogen.cc
+++ b/src/code-stubs-hydrogen.cc
@@ -1065,14 +1065,31 @@ Handle<Code> StringAddStub::GenerateCode() {
template <>
HValue* CodeStubGraphBuilder<ToBooleanStub>::BuildCodeInitializedStub() {
ToBooleanStub* stub = casted_stub();
+ HValue* true_value = NULL;
+ HValue* false_value = NULL;
+
+ switch (stub->GetMode()) {
+ case ToBooleanStub::RESULT_AS_SMI:
+ true_value = graph()->GetConstant1();
+ false_value = graph()->GetConstant0();
+ break;
+ case ToBooleanStub::RESULT_AS_ODDBALL:
+ true_value = graph()->GetConstantTrue();
+ false_value = graph()->GetConstantFalse();
+ break;
+ case ToBooleanStub::RESULT_AS_INVERSE_ODDBALL:
+ true_value = graph()->GetConstantFalse();
+ false_value = graph()->GetConstantTrue();
+ break;
+ }
IfBuilder if_true(this);
if_true.If<HBranch>(GetParameter(0), stub->GetTypes());
if_true.Then();
- if_true.Return(graph()->GetConstant1());
+ if_true.Return(true_value);
if_true.Else();
if_true.End();
- return graph()->GetConstant0();
+ return false_value;
}
Index: src/code-stubs.h
diff --git a/src/code-stubs.h b/src/code-stubs.h
index
1e1d3ccc34bc936c501aa704f3b0aa11a81c7de0..e9b4573b54f7a5f5a145eb7836836879626628e3
100644
--- a/src/code-stubs.h
+++ b/src/code-stubs.h
@@ -2315,6 +2315,12 @@ class ToBooleanStub: public HydrogenCodeStub {
NUMBER_OF_TYPES
};
+ enum ResultMode {
+ RESULT_AS_SMI, // For Smi(1) on truthy value, Smi(0)
otherwise.
+ RESULT_AS_ODDBALL, // For {true} on truthy value, {false}
otherwise.
+ RESULT_AS_INVERSE_ODDBALL // For {false} on truthy value, {true}
otherwise.
+ };
+
// At most 8 different types can be distinguished, because the Code
object
// only has room for a single byte to hold a set of these types. :-P
STATIC_ASSERT(NUMBER_OF_TYPES <= 8);
@@ -2333,13 +2339,16 @@ class ToBooleanStub: public HydrogenCodeStub {
static Types Generic() { return Types((1 << NUMBER_OF_TYPES) - 1); }
};
- ToBooleanStub(Isolate* isolate, Types types = Types())
- : HydrogenCodeStub(isolate), types_(types) { }
+ ToBooleanStub(Isolate* isolate, ResultMode mode, Types types = Types())
+ : HydrogenCodeStub(isolate), types_(types), mode_(mode) {}
ToBooleanStub(Isolate* isolate, ExtraICState state)
- : HydrogenCodeStub(isolate), types_(static_cast<byte>(state)) { }
+ : HydrogenCodeStub(isolate),
+ types_(static_cast<byte>(state)),
+ mode_(RESULT_AS_SMI) {}
bool UpdateStatus(Handle<Object> object);
Types GetTypes() { return types_; }
+ ResultMode GetMode() { return mode_; }
virtual Handle<Code> GenerateCode() V8_OVERRIDE;
virtual void InitializeInterfaceDescriptor(
@@ -2351,7 +2360,7 @@ class ToBooleanStub: public HydrogenCodeStub {
virtual bool SometimesSetsUpAFrame() { return false; }
static void InstallDescriptors(Isolate* isolate) {
- ToBooleanStub stub(isolate);
+ ToBooleanStub stub(isolate, RESULT_AS_SMI);
stub.InitializeInterfaceDescriptor(
isolate->code_stub_interface_descriptor(CodeStub::ToBoolean));
}
@@ -2371,13 +2380,19 @@ class ToBooleanStub: public HydrogenCodeStub {
}
private:
+ class TypesBits : public BitField<byte, 0, NUMBER_OF_TYPES> {};
+ class ResultModeBits : public BitField<ResultMode, NUMBER_OF_TYPES, 2>
{};
+
Major MajorKey() const { return ToBoolean; }
- int NotMissMinorKey() const { return GetExtraICState(); }
+ int NotMissMinorKey() const {
+ return TypesBits::encode(types_.ToByte()) |
ResultModeBits::encode(mode_);
+ }
- ToBooleanStub(Isolate* isolate, InitializationState init_state) :
- HydrogenCodeStub(isolate, init_state) {}
+ ToBooleanStub(Isolate* isolate, InitializationState init_state)
+ : HydrogenCodeStub(isolate, init_state), mode_(RESULT_AS_SMI) {}
Types types_;
+ ResultMode mode_;
};
Index: src/compiler/js-generic-lowering.cc
diff --git a/src/compiler/js-generic-lowering.cc
b/src/compiler/js-generic-lowering.cc
index
fe4fe652760b071f6bcc1d949abfa35ae0ed1e2b..699f7dd60569f8f6abe14767b1ca9325849ace9b
100644
--- a/src/compiler/js-generic-lowering.cc
+++ b/src/compiler/js-generic-lowering.cc
@@ -382,35 +382,15 @@ Node* JSGenericLowering::LowerBranch(Node* node) {
Node* JSGenericLowering::LowerJSUnaryNot(Node* node) {
- ToBooleanStub stub(isolate());
- CodeStubInterfaceDescriptor* d = stub.GetInterfaceDescriptor();
- CallDescriptor* desc = linkage()->GetStubCallDescriptor(d);
- Node* to_bool =
- graph()->NewNode(common()->Call(desc), CodeConstant(stub.GetCode()),
- NodeProperties::GetValueInput(node, 0),
- NodeProperties::GetContextInput(node),
- NodeProperties::GetEffectInput(node),
- NodeProperties::GetControlInput(node));
- node->ReplaceInput(0, to_bool);
- PatchInsertInput(node, 1, SmiConstant(Token::EQ));
- ReplaceWithRuntimeCall(node, Runtime::kBooleanize);
+ ToBooleanStub stub(isolate(), ToBooleanStub::RESULT_AS_INVERSE_ODDBALL);
+ ReplaceWithICStubCall(node, &stub);
return node;
}
Node* JSGenericLowering::LowerJSToBoolean(Node* node) {
- ToBooleanStub stub(isolate());
- CodeStubInterfaceDescriptor* d = stub.GetInterfaceDescriptor();
- CallDescriptor* desc = linkage()->GetStubCallDescriptor(d);
- Node* to_bool =
- graph()->NewNode(common()->Call(desc), CodeConstant(stub.GetCode()),
- NodeProperties::GetValueInput(node, 0),
- NodeProperties::GetContextInput(node),
- NodeProperties::GetEffectInput(node),
- NodeProperties::GetControlInput(node));
- node->ReplaceInput(0, to_bool);
- PatchInsertInput(node, 1, SmiConstant(Token::NE));
- ReplaceWithRuntimeCall(node, Runtime::kBooleanize);
+ ToBooleanStub stub(isolate(), ToBooleanStub::RESULT_AS_ODDBALL);
+ ReplaceWithICStubCall(node, &stub);
return node;
}
--
--
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/d/optout.
