From 41b3e5345dfeeece4b93f3cba64b7ab90e5f4974 Mon Sep 17 00:00:00 2001
From: "igor%mir2.org" <igor%mir2.org>
Date: Fri, 14 Feb 2003 23:53:32 +0000
Subject: [PATCH] Fixing http://bugzilla.mozilla.org/show_bug.cgi?id=192288 :

The bug was caused by a double call to Codegen.addNumberConstant, the first
time correctly from Codegen.visitLiteral and the second time wrongfully from
the loop in emitConstantDudeInitializers where loop index should be used
instead of calling addNumberConstant. As addNumberConstant would return the
same index for same numbers, the bug surfaces only with NaN as
addNumberConstant does not recognizes already added NaN. The bug also visible
only with optimization set to 1 or higher since only then constant folding can
produce NaN literal.

The fix removes the second call to addNumberConstant and uses
ScriptRuntime.NaNobj for NaNs.
---
 .../mozilla/javascript/optimizer/Codegen.java | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java b/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
index f736882d6c0..646eaee737a 100644
--- a/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
+++ b/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
@@ -3004,11 +3004,18 @@ public class Codegen extends Interpreter {
                 pushAsWrapperObject(num);
             }
             else {
-                String constantName = "jsK_" + addNumberConstant(num);
-                String constantType = getStaticConstantWrapperType(num);
-                classFile.add(ByteCode.GETSTATIC,
-                              classFile.fullyQualifiedForm(this.name),
-                              constantName, constantType);
+                if (num != num) {
+                    // Add NaN object
+                    classFile.add(ByteCode.GETSTATIC,
+                                  "org/mozilla/javascript/ScriptRuntime",
+                                  "NaNobj", "Ljava/lang/Double;");
+                } else {
+                    String constantName = "jsK_" + addNumberConstant(num);
+                    String constantType = getStaticConstantWrapperType(num);
+                    classFile.add(ByteCode.GETSTATIC,
+                                  classFile.fullyQualifiedForm(this.name),
+                                  constantName, constantType);
+                }
             }
         }
     }
@@ -3040,6 +3047,8 @@ public class Codegen extends Interpreter {
     }
 
     private int addNumberConstant(double num) {
+        // NaN is provided via ScriptRuntime.NaNobj
+        if (num != num) Context.codeBug();
         int N = itsConstantListSize;
         if (N == 0) {
             itsConstantList = new double[128];
@@ -3071,7 +3080,7 @@ public class Codegen extends Interpreter {
         double[] array = itsConstantList;
         for (int i = 0; i != N; ++i) {
             double num = array[i];
-            String constantName = "jsK_" + addNumberConstant(num);
+            String constantName = "jsK_" + i;
             String constantType = getStaticConstantWrapperType(num);
             classFile.addField(constantName, constantType,
                                ClassFileWriter.ACC_STATIC);