diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-31 13:48:10 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-31 13:48:10 +0200 |
commit | 6f2625e0e0e2818af6fdeb69528ada18556daef2 (patch) | |
tree | 4c4fe8c355c57c579d8ab5816c027a3ccd59360a /src/3rdparty/v8/src/ast.cc | |
parent | fb6c137d548bf0752d9e3740f96e6fa61addf3c0 (diff) | |
parent | 7d469e82e274d334c7d03d81b10d225c59d30798 (diff) | |
download | qtjsbackend-6f2625e0e0e2818af6fdeb69528ada18556daef2.tar.gz |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ic0daef1ae2cd8d9dc9e4e1597d730a42ad00c7b1
Diffstat (limited to 'src/3rdparty/v8/src/ast.cc')
-rw-r--r-- | src/3rdparty/v8/src/ast.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/v8/src/ast.cc b/src/3rdparty/v8/src/ast.cc index 3015b1e..5d7baf2 100644 --- a/src/3rdparty/v8/src/ast.cc +++ b/src/3rdparty/v8/src/ast.cc @@ -566,7 +566,7 @@ void Call::RecordTypeFeedback(TypeFeedbackOracle* oracle, Property* property = expression()->AsProperty(); if (property == NULL) { if (VariableProxy *proxy = expression()->AsVariableProxy()) { - if (proxy->var()->is_qml_global()) + if (proxy->var()->IsUnallocated() && proxy->var()->is_qml_global()) return; } |