projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
v8
/
src
/
lithium-codegen.cc
diff --git
a/src/v8/src/lithium-codegen.cc
b/src/v8/src/lithium-codegen.cc
index
f49887d
..
8b6444d
100644
(file)
--- a/
src/v8/src/lithium-codegen.cc
+++ b/
src/v8/src/lithium-codegen.cc
@@
-7,23
+7,26
@@
#include "src/lithium-codegen.h"
#if V8_TARGET_ARCH_IA32
#include "src/lithium-codegen.h"
#if V8_TARGET_ARCH_IA32
-#include "src/ia32/lithium-ia32.h"
-#include "src/ia32/lithium-codegen-ia32.h"
+#include "src/ia32/lithium-ia32.h"
// NOLINT
+#include "src/ia32/lithium-codegen-ia32.h"
// NOLINT
#elif V8_TARGET_ARCH_X64
#elif V8_TARGET_ARCH_X64
-#include "src/x64/lithium-x64.h"
-#include "src/x64/lithium-codegen-x64.h"
+#include "src/x64/lithium-x64.h"
// NOLINT
+#include "src/x64/lithium-codegen-x64.h"
// NOLINT
#elif V8_TARGET_ARCH_ARM
#elif V8_TARGET_ARCH_ARM
-#include "src/arm/lithium-arm.h"
-#include "src/arm/lithium-codegen-arm.h"
+#include "src/arm/lithium-arm.h"
// NOLINT
+#include "src/arm/lithium-codegen-arm.h"
// NOLINT
#elif V8_TARGET_ARCH_ARM64
#elif V8_TARGET_ARCH_ARM64
-#include "src/arm64/lithium-arm64.h"
-#include "src/arm64/lithium-codegen-arm64.h"
+#include "src/arm64/lithium-arm64.h"
// NOLINT
+#include "src/arm64/lithium-codegen-arm64.h"
// NOLINT
#elif V8_TARGET_ARCH_MIPS
#elif V8_TARGET_ARCH_MIPS
-#include "src/mips/lithium-mips.h"
-#include "src/mips/lithium-codegen-mips.h"
+#include "src/mips/lithium-mips.h" // NOLINT
+#include "src/mips/lithium-codegen-mips.h" // NOLINT
+#elif V8_TARGET_ARCH_MIPS64
+#include "src/mips64/lithium-mips64.h" // NOLINT
+#include "src/mips64/lithium-codegen-mips64.h" // NOLINT
#elif V8_TARGET_ARCH_X87
#elif V8_TARGET_ARCH_X87
-#include "src/x87/lithium-x87.h"
-#include "src/x87/lithium-codegen-x87.h"
+#include "src/x87/lithium-x87.h"
// NOLINT
+#include "src/x87/lithium-codegen-x87.h"
// NOLINT
#else
#error Unsupported target architecture.
#endif
#else
#error Unsupported target architecture.
#endif
@@
-53,7
+56,7
@@
LCodeGenBase::LCodeGenBase(LChunk* chunk,
bool LCodeGenBase::GenerateBody() {
bool LCodeGenBase::GenerateBody() {
-
ASSERT
(is_generating());
+
DCHECK
(is_generating());
bool emit_instructions = true;
LCodeGen* codegen = static_cast<LCodeGen*>(this);
for (current_instruction_ = 0;
bool emit_instructions = true;
LCodeGen* codegen = static_cast<LCodeGen*>(this);
for (current_instruction_ = 0;
@@
-113,12
+116,12
@@
void LCodeGenBase::CheckEnvironmentUsage() {
HInstruction* hinstr = HInstruction::cast(hval);
if (!hinstr->CanDeoptimize() && instr->HasEnvironment()) {
HInstruction* hinstr = HInstruction::cast(hval);
if (!hinstr->CanDeoptimize() && instr->HasEnvironment()) {
- V8_Fatal(__FILE__, __LINE__, "CanDeoptimize is wrong for %s (%s)
\n
",
+ V8_Fatal(__FILE__, __LINE__, "CanDeoptimize is wrong for %s (%s)",
hinstr->Mnemonic(), instr->Mnemonic());
}
if (instr->HasEnvironment() && !instr->environment()->has_been_used()) {
hinstr->Mnemonic(), instr->Mnemonic());
}
if (instr->HasEnvironment() && !instr->environment()->has_been_used()) {
- V8_Fatal(__FILE__, __LINE__, "unused environment for %s (%s)
\n
",
+ V8_Fatal(__FILE__, __LINE__, "unused environment for %s (%s)",
hinstr->Mnemonic(), instr->Mnemonic());
}
}
hinstr->Mnemonic(), instr->Mnemonic());
}
}
@@
-165,7
+168,7
@@
static void AddWeakObjectToCodeDependency(Isolate* isolate,
void LCodeGenBase::RegisterWeakObjectsInOptimizedCode(Handle<Code> code) {
void LCodeGenBase::RegisterWeakObjectsInOptimizedCode(Handle<Code> code) {
-
ASSERT
(code->is_optimized_code());
+
DCHECK
(code->is_optimized_code());
ZoneList<Handle<Map> > maps(1, zone());
ZoneList<Handle<JSObject> > objects(1, zone());
ZoneList<Handle<Cell> > cells(1, zone());
ZoneList<Handle<Map> > maps(1, zone());
ZoneList<Handle<JSObject> > objects(1, zone());
ZoneList<Handle<Cell> > cells(1, zone());