diff src/share/vm/classfile/defaultMethods.cpp @ 22952:8cd2e2834c8f

Merge
author asaha
date Wed, 25 Mar 2015 11:31:54 -0700
parents 02e2c04a3289 fdde6a70ea85
children dd9cc155639c 32b682649973
line wrap: on
line diff
--- a/src/share/vm/classfile/defaultMethods.cpp	Wed Mar 18 18:13:49 2015 -0700
+++ b/src/share/vm/classfile/defaultMethods.cpp	Wed Mar 25 11:31:54 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -1096,6 +1096,7 @@
     }
     // update idnum for new location
     merged_methods->at(i)->set_method_idnum(i);
+    merged_methods->at(i)->set_orig_method_idnum(i);
   }
 
   // Verify correct order