Disable jump command reordering of RPN tokens for OpenCL interpreter.

Change-Id: I03e1e8a8cda1ff88b1d65876ffc27605090f1f4d

3 files changed, 9 insertions, 11 deletions

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 0c2755bb132f..78c847e69aa1 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3678,6 +3678,8 @@ bool ScFormulaCell::InterpretFormulaGroup()
         return false;
     }
 
+    // The converted code does not have RPN tokens yet.  The interpreter will
+    // generate them.
     mxGroup->meCalcState = sc::GroupCalcRunning;
     if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, mxGroup->mpTopCell->aPos, mxGroup, aCode))
     {
diff --git a/sc/source/core/data/grouptokenconverter.cxx b/sc/source/core/data/grouptokenconverter.cxx
index 47585fd67619..a43efb05aa31 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -226,10 +226,6 @@ bool ScGroupTokenConverter::convert(ScTokenArray& rCode)
         }
     }
 
-    ScCompiler aComp(&mrDoc, mrPos, mrGroupTokens);
-    aComp.SetGrammar(mrDoc.GetGrammar());
-    aComp.CompileTokenArray(); // Regenerate RPN tokens.
-
     return true;
 }
 
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index d4873b64ef28..7066c4fc3ba8 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3433,20 +3433,20 @@ CompiledFormula* FormulaGroupInterpreterOpenCL::createCompiledFormula(ScDocument
                                                                       ScFormulaCellGroup& rGroup,
                                                                       ScTokenArray& rCode)
 {
-    ScTokenArray aConvertedCode;
-    ScGroupTokenConverter aConverter(aConvertedCode, rDoc, *rGroup.mpTopCell, rTopPos);
-    if (!aConverter.convert(rCode) || aConvertedCode.GetLen() == 0)
-        return NULL;
-
     SymbolTable::nR = rGroup.mnLength;
-
-    return DynamicKernel::create(rDoc, rTopPos, aConvertedCode);
+    return DynamicKernel::create(rDoc, rTopPos, rCode);
 }
 
 bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
     const ScAddress& rTopPos, ScFormulaCellGroupRef& xGroup,
     ScTokenArray& rCode )
 {
+    ScCompiler aComp(&rDoc, rTopPos, rCode);
+    aComp.SetGrammar(rDoc.GetGrammar());
+    // Disable special ordering for jump commands for the OpenCL interpreter.
+    aComp.EnableJumpCommandReorder(false);
+    aComp.CompileTokenArray(); // Regenerate RPN tokens.
+
     DynamicKernel *pKernel = NULL;
     boost::scoped_ptr<DynamicKernel> pLocalKernel;