From: Simon Hausmann <simon.hausmann@digia.com>
Date: Mon, 19 Aug 2013 09:57:03 +0000 (+0200)
Subject: Prospective MSVC build fix
X-Git-Tag: upstream/5.2.1~669^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73e42900403186df3ba64b57df4edbeac56e41a8;p=platform%2Fupstream%2Fqtdeclarative.git

Prospective MSVC build fix

It seems LoadString is somehow expanded as a macro, so call the instruction
LoadRuntimeString, which is closer to the meaning.

Change-Id: I16836b495d29db8cb1af5874762c8e66acb9c529
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---

diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index 5cdfa3f..ffcf794 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 #define FOR_EACH_MOTH_INSTR(F) \
     F(Ret, ret) \
     F(LoadValue, loadValue) \
-    F(LoadString, loadString) \
+    F(LoadRuntimeString, loadRuntimeString) \
     F(LoadRegExp, loadRegExp) \
     F(LoadClosure, loadClosure) \
     F(MoveTemp, moveTemp) \
@@ -220,7 +220,7 @@ union Instr
         Param value;
         Param result;
     };
-    struct instr_loadString {
+    struct instr_loadRuntimeString {
         MOTH_INSTR_HEADER
         int stringId;
         Param result;
@@ -549,7 +549,7 @@ union Instr
     instr_common common;
     instr_ret ret;
     instr_loadValue loadValue;
-    instr_loadString loadString;
+    instr_loadRuntimeString loadRuntimeString;
     instr_loadRegExp loadRegExp;
     instr_moveTemp moveTemp;
     instr_loadClosure loadClosure;
diff --git a/src/qml/compiler/qv4isel_moth.cpp b/src/qml/compiler/qv4isel_moth.cpp
index 9489bba..4c298d8 100644
--- a/src/qml/compiler/qv4isel_moth.cpp
+++ b/src/qml/compiler/qv4isel_moth.cpp
@@ -392,7 +392,7 @@ void InstructionSelection::loadConst(V4IR::Const *sourceConst, V4IR::Temp *targe
 
 void InstructionSelection::loadString(const QString &str, V4IR::Temp *targetTemp)
 {
-    Instruction::LoadString load;
+    Instruction::LoadRuntimeString load;
     load.stringId = registerString(str);
     load.result = getResultParam(targetTemp);
     addInstruction(load);
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index aea7bc6..b7bc2a8 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -260,10 +260,10 @@ QV4::Value VME::run(QV4::ExecutionContext *context, const uchar *&code,
         VALUE(instr.result) = VALUE(instr.value);
     MOTH_END_INSTR(LoadValue)
 
-    MOTH_BEGIN_INSTR(LoadString)
+    MOTH_BEGIN_INSTR(LoadRuntimeString)
 //        TRACE(value, "%s", instr.value.toString(context)->toQString().toUtf8().constData());
         VALUE(instr.result) = QV4::Value::fromString(runtimeStrings[instr.stringId]);
-    MOTH_END_INSTR(LoadString)
+    MOTH_END_INSTR(LoadRuntimeString)
 
     MOTH_BEGIN_INSTR(LoadRegExp)
 //        TRACE(value, "%s", instr.value.toString(context)->toQString().toUtf8().constData());