From 38c9bc6b9f5f019f55896369c3b46c77fc29fb41 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 17 Feb 2017 11:18:35 +0100 Subject: Change getValueOrSetter to be write barrier friendly Don't return a naked pointer into the heap, as this makes it impossible to track where and when we're writing into it. Change-Id: I2b9b81779ef8e9fb7a643ddda82aa6af8af459a7 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4memberdata_p.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/qml/jsruntime/qv4memberdata_p.h') diff --git a/src/qml/jsruntime/qv4memberdata_p.h b/src/qml/jsruntime/qv4memberdata_p.h index e486895754..302553464e 100644 --- a/src/qml/jsruntime/qv4memberdata_p.h +++ b/src/qml/jsruntime/qv4memberdata_p.h @@ -73,6 +73,18 @@ struct MemberData : Managed { V4_MANAGED(MemberData, Managed) + struct Index { + Heap::MemberData *memberData; + uint index; + + void set(ExecutionEngine *e, Value newVal) { + memberData->values.set(e, index, newVal); + } + const Value *operator->() const { return &memberData->values[index]; } + const Value &operator*() const { return memberData->values[index]; } + bool isNull() const { return !memberData; } + }; + Value &operator[] (uint idx) { return d()->values[idx]; } const Value *data() const { return d()->values.v; } Value *data() { return d()->values.v; } -- cgit v1.2.3