Merge
authorcoleenp
Mon, 13 Jun 2016 14:00:26 +0000
changeset 39276 80426750d085
parent 39274 940f0e8e9ec2 (current diff)
parent 39275 c6cea32506a4 (diff)
child 39277 460f34bbd0c0
Merge
--- a/hotspot/src/share/vm/runtime/reflectionUtils.cpp	Mon Jun 13 11:48:11 2016 +0200
+++ b/hotspot/src/share/vm/runtime/reflectionUtils.cpp	Mon Jun 13 14:00:26 2016 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -73,10 +73,7 @@
 
 
 void FilteredFieldsMap::initialize() {
-  int offset;
-  offset = java_lang_Throwable::get_backtrace_offset();
-  _filtered_fields->append(new FilteredField(SystemDictionary::Throwable_klass(), offset));
-  offset = reflect_ConstantPool::oop_offset();
+  int offset = reflect_ConstantPool::oop_offset();
   _filtered_fields->append(new FilteredField(SystemDictionary::reflect_ConstantPool_klass(), offset));
   offset = reflect_UnsafeStaticFieldAccessorImpl::base_offset();
   _filtered_fields->append(new FilteredField(SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass(), offset));