From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp') diff --git a/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp b/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp index 5fec77198..80795c2fe 100644 --- a/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp +++ b/Source/JavaScriptCore/dfg/DFGMinifiedNode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. + * Copyright (C) 2012-2015 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,6 +29,7 @@ #if ENABLE(DFG_JIT) #include "DFGNode.h" +#include "JSCInlines.h" namespace JSC { namespace DFG { @@ -38,15 +39,11 @@ MinifiedNode MinifiedNode::fromNode(Node* node) MinifiedNode result; result.m_id = MinifiedID(node); result.m_op = node->op(); - if (hasChild(node->op())) - result.m_childOrInfo = MinifiedID(node->child1().node()).m_id; - else if (hasConstantNumber(node->op())) - result.m_childOrInfo = node->constantNumber(); - else if (hasWeakConstant(node->op())) - result.m_childOrInfo = bitwise_cast(node->weakConstant()); + if (hasConstant(node->op())) + result.m_info = JSValue::encode(node->asJSValue()); else { - ASSERT(node->op() == PhantomArguments); - result.m_childOrInfo = 0; + ASSERT(node->op() == PhantomDirectArguments || node->op() == PhantomClonedArguments); + result.m_info = bitwise_cast(node->origin.semantic.inlineCallFrame); } return result; } -- cgit v1.2.1