# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1436968013 -7200
# Node ID b34312ac04a80d2d262c5bb1cd05b7ea7cb1cd1f
# Parent  6c8b4f164b4ed06f283386beb32758608fd3f7d8
Make static type of virtualObjectMapping as narrow as possible.

diff -r 6c8b4f164b4e -r b34312ac04a8 jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/DebugInfo.java
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/DebugInfo.java	Wed Jul 15 15:01:41 2015 +0200
+++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/DebugInfo.java	Wed Jul 15 15:46:53 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, 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
@@ -24,8 +24,6 @@
 
 import java.util.*;
 
-import jdk.internal.jvmci.meta.*;
-
 /**
  * Represents the debugging information for a particular point of execution. This information
  * includes:
@@ -42,7 +40,7 @@
 
     private final BytecodePosition bytecodePosition;
     private final ReferenceMap referenceMap;
-    @SuppressWarnings("unused") private final Value[] virtualObjectMapping;
+    @SuppressWarnings("unused") private final VirtualObject[] virtualObjectMapping;
     private RegisterSaveLayout calleeSaveInfo;
 
     /**
@@ -53,7 +51,7 @@
      * @param referenceMap the reference map
      * @param virtualObjectMapping the mapping of {@link VirtualObject}s to their real values
      */
-    public DebugInfo(BytecodePosition codePos, ReferenceMap referenceMap, Value[] virtualObjectMapping) {
+    public DebugInfo(BytecodePosition codePos, ReferenceMap referenceMap, VirtualObject[] virtualObjectMapping) {
         this.bytecodePosition = codePos;
         this.referenceMap = referenceMap;
         this.virtualObjectMapping = virtualObjectMapping;
diff -r 6c8b4f164b4e -r b34312ac04a8 src/share/vm/jvmci/jvmciJavaAccess.hpp
--- a/src/share/vm/jvmci/jvmciJavaAccess.hpp	Wed Jul 15 15:01:41 2015 +0200
+++ b/src/share/vm/jvmci/jvmciJavaAccess.hpp	Wed Jul 15 15:46:53 2015 +0200
@@ -155,7 +155,7 @@
     oop_field(DebugInfo, bytecodePosition, "Ljdk/internal/jvmci/code/BytecodePosition;")                                                                         \
     oop_field(DebugInfo, referenceMap, "Ljdk/internal/jvmci/code/ReferenceMap;")                                                                                 \
     oop_field(DebugInfo, calleeSaveInfo, "Ljdk/internal/jvmci/code/RegisterSaveLayout;")                                                                         \
-    objArrayOop_field(DebugInfo, virtualObjectMapping, "[Ljdk/internal/jvmci/meta/Value;")                                                                       \
+    objArrayOop_field(DebugInfo, virtualObjectMapping, "[Ljdk/internal/jvmci/code/VirtualObject;")                                                               \
   end_class                                                                                                                                                    \
   start_class(HotSpotReferenceMap)                                                                                                                             \
     objArrayOop_field(HotSpotReferenceMap, objects, "[Ljdk/internal/jvmci/code/Location;")                                                                       \