Mercurial > hg > truffle

diff src/share/vm/oops/generateOopMap.cpp @ 8104:f16e75e0cf11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8000797: NPG: is_pseudo_string_at() doesn't work Summary: Zero Symbol* for constant pool strings to indicate pseudo_strings (objects that aren't strings). Clean up JVM_CONSTANT_Object and unused flags. Reviewed-by: sspitsyn, jrose
author coleenp
date Fri, 22 Feb 2013 08:36:42 -0500
parents da91efe96a93
children 2eef6d34833b
line wrap: on
line diff
--- a/src/share/vm/oops/generateOopMap.cpp	Fri Feb 22 10:03:02 2013 +0100
+++ b/src/share/vm/oops/generateOopMap.cpp	Fri Feb 22 08:36:42 2013 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -1853,7 +1853,6 @@
   if (tag.is_klass() ||
       tag.is_unresolved_klass() ||
       tag.is_string() ||
-      tag.is_object() ||
       tag.is_method_handle() ||
       tag.is_method_type()) {
     assert(bt == T_OBJECT, "Guard is incorrect");