From 41386e9cb918eed93b3f13648cbef387e371e451 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 20 May 2015 09:56:07 +0000 Subject: webkitgtk-2.4.9 --- Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp') diff --git a/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp b/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp index 80795c2fe..802cb2984 100644 --- a/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp +++ b/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2015 Apple Inc. All rights reserved. + * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,7 +29,6 @@ #if ENABLE(DFG_JIT) #include "DFGNode.h" -#include "JSCInlines.h" namespace JSC { namespace DFG { @@ -39,11 +38,13 @@ MinifiedNode MinifiedNode::fromNode(Node* node) MinifiedNode result; result.m_id = MinifiedID(node); result.m_op = node->op(); - if (hasConstant(node->op())) - result.m_info = JSValue::encode(node->asJSValue()); + if (hasConstantNumber(node->op())) + result.m_info = node->constantNumber(); + else if (hasWeakConstant(node->op())) + result.m_info = bitwise_cast(node->weakConstant()); else { - ASSERT(node->op() == PhantomDirectArguments || node->op() == PhantomClonedArguments); - result.m_info = bitwise_cast(node->origin.semantic.inlineCallFrame); + ASSERT(node->op() == PhantomArguments); + result.m_info = 0; } return result; } -- cgit v1.2.1