Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/code-stubs.cc b/src/code-stubs.cc
index 1754288..4e5efcd 100644
--- a/src/code-stubs.cc
+++ b/src/code-stubs.cc
@@ -96,6 +96,12 @@
}
+Code::Flags CodeStub::GetCodeFlags() const {
+ return Code::ComputeFlags(GetCodeKind(), GetICState(), GetExtraICState(),
+ GetStubType());
+}
+
+
Handle<Code> CodeStub::GetCodeCopy(const Code::FindAndReplacePattern& pattern) {
Handle<Code> ic = GetCode();
ic = isolate()->factory()->CopyCode(ic);
@@ -270,7 +276,7 @@
void BinaryOpICStub::GenerateAheadOfTime(Isolate* isolate) {
// Generate the uninitialized versions of the stub.
for (int op = Token::BIT_OR; op <= Token::MOD; ++op) {
- BinaryOpICStub stub(isolate, static_cast<Token::Value>(op), Strength::WEAK);
+ BinaryOpICStub stub(isolate, static_cast<Token::Value>(op));
stub.GetCode();
}
@@ -453,9 +459,7 @@
state.Add(NULL_TYPE);
} else if (object->IsUndefined()) {
state.Add(UNDEFINED);
- } else if (object->IsUndetectableObject() ||
- object->IsOddball() ||
- !object->IsHeapObject()) {
+ } else if (object->IsUndetectableObject() || object->IsSmi()) {
state.RemoveAll();
state.Add(GENERIC);
} else if (IsMonomorphic()) {
@@ -474,7 +478,7 @@
Zone zone;
CallInterfaceDescriptor descriptor(GetCallInterfaceDescriptor());
compiler::CodeStubAssembler assembler(isolate(), &zone, descriptor,
- GetCodeKind(), name);
+ GetCodeFlags(), name);
GenerateAssembly(&assembler);
return assembler.GenerateCode();
}
@@ -549,18 +553,17 @@
Type* CompareNilICStub::GetType(Zone* zone, Handle<Map> map) {
State state = this->state();
- if (state.Contains(CompareNilICStub::GENERIC)) return Type::Any(zone);
+ if (state.Contains(CompareNilICStub::GENERIC)) return Type::Any();
- Type* result = Type::None(zone);
+ Type* result = Type::None();
if (state.Contains(CompareNilICStub::UNDEFINED)) {
- result = Type::Union(result, Type::Undefined(zone), zone);
+ result = Type::Union(result, Type::Undefined(), zone);
}
if (state.Contains(CompareNilICStub::NULL_TYPE)) {
- result = Type::Union(result, Type::Null(zone), zone);
+ result = Type::Union(result, Type::Null(), zone);
}
if (state.Contains(CompareNilICStub::MONOMORPHIC_MAP)) {
- Type* type =
- map.is_null() ? Type::Detectable(zone) : Type::Class(map, zone);
+ Type* type = map.is_null() ? Type::Detectable() : Type::Class(map, zone);
result = Type::Union(result, type, zone);
}
@@ -570,8 +573,7 @@
Type* CompareNilICStub::GetInputType(Zone* zone, Handle<Map> map) {
Type* output_type = GetType(zone, map);
- Type* nil_type =
- nil_value() == kNullValue ? Type::Null(zone) : Type::Undefined(zone);
+ Type* nil_type = nil_value() == kNullValue ? Type::Null() : Type::Undefined();
return Type::Union(output_type, nil_type, zone);
}
@@ -599,9 +601,7 @@
void KeyedLoadGenericStub::InitializeDescriptor(
CodeStubDescriptor* descriptor) {
descriptor->Initialize(
- Runtime::FunctionForId(is_strong(language_mode())
- ? Runtime::kKeyedGetPropertyStrong
- : Runtime::kKeyedGetProperty)->entry);
+ Runtime::FunctionForId(Runtime::kKeyedGetProperty)->entry);
}
@@ -798,28 +798,8 @@
void StoreElementStub::Generate(MacroAssembler* masm) {
- switch (elements_kind()) {
- case FAST_ELEMENTS:
- case FAST_HOLEY_ELEMENTS:
- case FAST_SMI_ELEMENTS:
- case FAST_HOLEY_SMI_ELEMENTS:
- case FAST_DOUBLE_ELEMENTS:
- case FAST_HOLEY_DOUBLE_ELEMENTS:
-#define TYPED_ARRAY_CASE(Type, type, TYPE, ctype, size) \
- case TYPE##_ELEMENTS:
-
- TYPED_ARRAYS(TYPED_ARRAY_CASE)
-#undef TYPED_ARRAY_CASE
- UNREACHABLE();
- break;
- case DICTIONARY_ELEMENTS:
- ElementHandlerCompiler::GenerateStoreSlow(masm);
- break;
- case FAST_SLOPPY_ARGUMENTS_ELEMENTS:
- case SLOW_SLOPPY_ARGUMENTS_ELEMENTS:
- UNREACHABLE();
- break;
- }
+ DCHECK_EQ(DICTIONARY_ELEMENTS, elements_kind());
+ ElementHandlerCompiler::GenerateStoreSlow(masm);
}
@@ -838,52 +818,6 @@
}
-void RestParamAccessStub::Generate(MacroAssembler* masm) { GenerateNew(masm); }
-
-
-void ArgumentsAccessStub::Generate(MacroAssembler* masm) {
- switch (type()) {
- case READ_ELEMENT:
- GenerateReadElement(masm);
- break;
- case NEW_SLOPPY_FAST:
- GenerateNewSloppyFast(masm);
- break;
- case NEW_SLOPPY_SLOW:
- GenerateNewSloppySlow(masm);
- break;
- case NEW_STRICT:
- GenerateNewStrict(masm);
- break;
- }
-}
-
-
-void ArgumentsAccessStub::PrintName(std::ostream& os) const { // NOLINT
- os << "ArgumentsAccessStub_";
- switch (type()) {
- case READ_ELEMENT:
- os << "ReadElement";
- break;
- case NEW_SLOPPY_FAST:
- os << "NewSloppyFast";
- break;
- case NEW_SLOPPY_SLOW:
- os << "NewSloppySlow";
- break;
- case NEW_STRICT:
- os << "NewStrict";
- break;
- }
- return;
-}
-
-
-void RestParamAccessStub::PrintName(std::ostream& os) const { // NOLINT
- os << "RestParamAccessStub_";
-}
-
-
void ArrayConstructorStub::PrintName(std::ostream& os) const { // NOLINT
os << "ArrayConstructorStub";
switch (argument_count()) {
@@ -964,9 +898,9 @@
Add(SPEC_OBJECT);
return !object->IsUndetectableObject();
} else if (object->IsString()) {
+ DCHECK(!object->IsUndetectableObject());
Add(STRING);
- return !object->IsUndetectableObject() &&
- String::cast(*object)->length() != 0;
+ return String::cast(*object)->length() != 0;
} else if (object->IsSymbol()) {
Add(SYMBOL);
return true;