From cfbe70e2231e591d8888d654f2148cac5168e147 Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Tue, 9 Jul 2013 15:56:59 +0200
Subject: [PATCH] 8020124: In the case of an eval switch, we might need
 explicit conversions of the tag store, as it was not known in the surrounding
 environment

Reviewed-by: sundar, jlaskey
---
 .../internal/codegen/CodeGenerator.java       |  2 ++
 nashorn/test/script/basic/JDK-8020124.js      | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 nashorn/test/script/basic/JDK-8020124.js

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 79936473fb9..250c44c1541 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -1869,6 +1869,8 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
                 method.store(tag);
                 method.conditionalJump(Condition.NE, true, defaultLabel);
             } else {
+                assert tag.getSymbolType().isObject();
+                method.convert(Type.OBJECT); //e.g. 1 literal pushed and tag is object
                 method.store(tag);
             }
 
diff --git a/nashorn/test/script/basic/JDK-8020124.js b/nashorn/test/script/basic/JDK-8020124.js
new file mode 100644
index 00000000000..f7735fc0f38
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8020124.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8020124: explicit conversion needed for switch tag
+ *
+ * @test
+ * @run
+ */
+
+x = {};
+Function("switch((a? x = 1 : 3)) { default: return; }")