# HG changeset patch
# User dcubed
# Date 1541612451 18000
# Node ID 2090b60c5e26e13b8ca035f506ee3b70cd653ad0
# Parent  eac000022f618aff26c12f82e6bdb21e55d21eaa
8213487: [BACKOUT] 8213414 Fix incorrect copy constructors in hotspot
Reviewed-by: roland, rkennke, thartmann

diff -r eac000022f61 -r 2090b60c5e26 src/hotspot/share/classfile/stackMapFrame.hpp
--- a/src/hotspot/share/classfile/stackMapFrame.hpp	Wed Nov 07 15:13:12 2018 +0100
+++ b/src/hotspot/share/classfile/stackMapFrame.hpp	Wed Nov 07 12:40:51 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -62,7 +62,7 @@
 
   ClassVerifier* _verifier;  // the verifier verifying this method
 
-  StackMapFrame(const StackMapFrame& cp) : ResourceObj(cp),
+  StackMapFrame(const StackMapFrame& cp) :
       _offset(cp._offset), _locals_size(cp._locals_size),
       _stack_size(cp._stack_size), _stack_mark(cp._stack_mark),
       _max_locals(cp._max_locals), _max_stack(cp._max_stack),
diff -r eac000022f61 -r 2090b60c5e26 src/hotspot/share/libadt/dict.cpp
--- a/src/hotspot/share/libadt/dict.cpp	Wed Nov 07 15:13:12 2018 +0100
+++ b/src/hotspot/share/libadt/dict.cpp	Wed Nov 07 12:40:51 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -161,7 +161,7 @@
 
 //------------------------------Dict-----------------------------------------
 // Deep copy a dictionary.
-Dict::Dict( const Dict &d ) : ResourceObj(d), _arena(d._arena), _size(d._size), _cnt(d._cnt), _hash(d._hash), _cmp(d._cmp) {
+Dict::Dict( const Dict &d ) : _arena(d._arena), _size(d._size), _cnt(d._cnt), _hash(d._hash), _cmp(d._cmp) {
   _bin = (bucket*)_arena->Amalloc_4(sizeof(bucket)*_size);
   memcpy( (void*)_bin, (void*)d._bin, sizeof(bucket)*_size );
   for( uint i=0; i<_size; i++ ) {
diff -r eac000022f61 -r 2090b60c5e26 src/hotspot/share/libadt/set.hpp
--- a/src/hotspot/share/libadt/set.hpp	Wed Nov 07 15:13:12 2018 +0100
+++ b/src/hotspot/share/libadt/set.hpp	Wed Nov 07 12:40:51 2018 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2010, 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
@@ -120,7 +120,7 @@
 
   // Creates a new set from an existing set
   // DO NOT CONSTRUCT A Set.  THIS IS AN ABSTRACT CLASS, FOR INHERITENCE ONLY
-  Set(const Set &s) : ResourceObj(s) {};
+  Set(const Set &) {};
 
   // Set assignment; deep-copy guts
   virtual Set &operator =(const Set &s)=0;