Mercurial > hg > truffle
diff agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java @ 3945:8ed53447f690
Merge
author | iveresov |
---|---|
date | Thu, 15 Sep 2011 12:44:09 -0700 |
parents | f6f3bb0ee072 |
children |
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java Tue Sep 13 20:28:00 2011 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java Thu Sep 15 12:44:09 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2011, 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 @@ -26,7 +26,6 @@ import java.util.*; import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.types.*; /** This class provides generalized "virtual constructor" @@ -39,7 +38,7 @@ type "DefNewGeneration" to class sun.jvm.hotspot.memory.DefNewGeneration has been set up. */ -public class VirtualConstructor { +public class VirtualConstructor extends InstanceConstructor<VMObject> { private TypeDataBase db; private Map map; // Map<String, Class> @@ -78,20 +77,6 @@ } } - String message = "No suitable match for type of address " + addr; - CDebugger cdbg = VM.getVM().getDebugger().getCDebugger(); - if (cdbg != null) { - // Most common case: V-table pointer is the first field - Address vtblPtr = addr.getAddressAt(0); - LoadObject lo = cdbg.loadObjectContainingPC(vtblPtr); - if (lo != null) { - ClosestSymbol symbol = lo.closestSymbolToPC(vtblPtr); - if (symbol != null) { - message += " (nearest symbol is " + symbol.getName() + ")"; - } - } - } - - throw new WrongTypeException(message); + throw newWrongTypeException(addr); } }