Reviewers: Jakob,
Description:
Fix initial comparison combined_type
[email protected]
BUG=
Please review this at https://codereview.chromium.org/27183002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+3, -4 lines):
M src/ast.h
M src/ast.cc
M src/bootstrapper.cc
Index: src/ast.cc
diff --git a/src/ast.cc b/src/ast.cc
index
8a2889917b8f6e46b99b479430a2ccee41628282..0d667cc168812d0b3f487bf422f1bcf096ac4d1c
100644
--- a/src/ast.cc
+++ b/src/ast.cc
@@ -441,8 +441,7 @@ void Property::RecordTypeFeedback(TypeFeedbackOracle*
oracle,
} else if (oracle->LoadIsBuiltin(this, Builtins::kKeyedLoadIC_String)) {
is_string_access_ = true;
} else if (is_monomorphic_) {
- receiver_types_.Add(oracle->LoadMonomorphicReceiverType(this),
- zone);
+ receiver_types_.Add(oracle->LoadMonomorphicReceiverType(this), zone);
} else if (oracle->LoadIsPolymorphic(this)) {
receiver_types_.Reserve(kMaxKeyedPolymorphism, zone);
oracle->CollectKeyedReceiverTypes(PropertyFeedbackId(),
&receiver_types_);
Index: src/ast.h
diff --git a/src/ast.h b/src/ast.h
index
44c256007deb0bfe0488494732a6b9312920fcdf..4b2010f07773f148a4f416bb5f71031a1e5b20d7
100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -2029,7 +2029,7 @@ class CompareOperation V8_FINAL : public Expression {
op_(op),
left_(left),
right_(right),
- combined_type_(Type::Null(), isolate) {
+ combined_type_(Type::None(), isolate) {
ASSERT(Token::IsCompareOp(op));
}
Index: src/bootstrapper.cc
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index
332131a7cab880df8d057137c0f5001419221f63..c48385ce11ccec616e5435ee198b8b0d55ba23a6
100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -824,7 +824,7 @@ void Genesis::HookUpInnerGlobal(Handle<GlobalObject>
inner_global) {
// work in the snapshot case is done in HookUpInnerGlobal.
void Genesis::InitializeGlobal(Handle<GlobalObject> inner_global,
Handle<JSFunction> empty_function) {
- // --- G l o b a l C o n t e x t ---
+ // --- N a t i v e C o n t e x t ---
// Use the empty function as closure (no scope info).
native_context()->set_closure(*empty_function);
native_context()->set_previous(NULL);
--
--
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.
