changeset 47519:34f6dc2c254c condy-folding

Automatic merge with condy
author mcimadamore
date Wed, 25 Oct 2017 01:40:03 +0200
parents 297129af25ac 8f72b4d9479b
children 30bc2f453f0e
files test/langtools/tools/javac/lambda/ByteCodeTest.java
diffstat 1 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/langtools/tools/javac/lambda/ByteCodeTest.java	Wed Oct 25 01:34:53 2017 +0200
+++ b/test/langtools/tools/javac/lambda/ByteCodeTest.java	Wed Oct 25 01:40:03 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, 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
@@ -541,6 +541,22 @@
         }
 
         @Override
+        public String visitDynamicConstant(CONSTANT_Dynamic_info c, Integer p) {
+
+            String value = slist.get(p);
+            if (value == null) {
+                try {
+                    value = bsmMap.get(c.bootstrap_method_attr_index) + " "
+                            + visit(cfpool.get(c.name_and_type_index), c.name_and_type_index);
+                    slist.set(p, value);
+                } catch (ConstantPoolException ex) {
+                    ex.printStackTrace();
+                }
+            }
+            return value;
+        }
+
+        @Override
         public String visitLong(CONSTANT_Long_info c, Integer p) {
 
             String value = slist.get(p);