YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing ecma_op_get_value, ecma_op_put_value: correctly distinguishing whether the base is object or lexical environment.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-07-21 17:51:11 +04:00
parent 57629912e4
commit 5e503ced32
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libecmaoperations/ecma-get-put-value.c
+7 -3
View File
@@ -45,7 +45,9 @@ ecma_op_get_value( ecma_Reference_t *ref_p) /**< ECMA-reference */
const bool has_primitive_base = ( ecma_IsValueBoolean( base) const bool has_primitive_base = ( ecma_IsValueBoolean( base)
|| base.m_ValueType == ECMA_TYPE_NUMBER || base.m_ValueType == ECMA_TYPE_NUMBER
|| base.m_ValueType == ECMA_TYPE_STRING ); || base.m_ValueType == ECMA_TYPE_STRING );
const bool is_property_reference = has_primitive_base || ( base.m_ValueType == ECMA_TYPE_OBJECT ); const bool has_object_base = ( base.m_ValueType == ECMA_TYPE_OBJECT
&& !((ecma_Object_t*)ecma_GetPointer(base.m_Value))->m_IsLexicalEnvironment );
const bool is_property_reference = has_primitive_base || has_object_base;
// GetValue_3 // GetValue_3
if ( is_unresolvable_reference ) if ( is_unresolvable_reference )
@@ -73,7 +75,7 @@ ecma_op_get_value( ecma_Reference_t *ref_p) /**< ECMA-reference */
if ( property->m_Type == ECMA_PROPERTY_NAMEDDATA ) if ( property->m_Type == ECMA_PROPERTY_NAMEDDATA )
{ {
return ecma_MakeCompletionValue( ECMA_COMPLETION_TYPE_NORMAL, return ecma_MakeCompletionValue( ECMA_COMPLETION_TYPE_NORMAL,
property->u.m_NamedDataProperty.m_Value, ecma_CopyValue( property->u.m_NamedDataProperty.m_Value),
ECMA_TARGET_ID_RESERVED); ECMA_TARGET_ID_RESERVED);
} else } else
{ {
@@ -122,7 +124,9 @@ ecma_op_put_value(ecma_Reference_t *ref_p, /**< ECMA-reference */
const bool has_primitive_base = ( ecma_IsValueBoolean( base) const bool has_primitive_base = ( ecma_IsValueBoolean( base)
|| base.m_ValueType == ECMA_TYPE_NUMBER || base.m_ValueType == ECMA_TYPE_NUMBER
|| base.m_ValueType == ECMA_TYPE_STRING ); || base.m_ValueType == ECMA_TYPE_STRING );
const bool is_property_reference = has_primitive_base || ( base.m_ValueType == ECMA_TYPE_OBJECT ); const bool has_object_base = ( base.m_ValueType == ECMA_TYPE_OBJECT
&& !((ecma_Object_t*)ecma_GetPointer(base.m_Value))->m_IsLexicalEnvironment );
const bool is_property_reference = has_primitive_base || has_object_base;
if ( is_unresolvable_reference ) // PutValue_3 if ( is_unresolvable_reference ) // PutValue_3
{ {