Mercurial > hg > graal-jvmci-8

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 25 Mar 2015 11:31:54 -0700
parents 02e2c04a3289 fdde6a70ea85
children dd9cc155639c 32b682649973
comparison
equal deleted inserted replaced
22951:8f07afdc1cd1 22952:8cd2e2834c8f
1 /* 1 /*
2 * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
1094 } 1094 }
1095 ++new_idx; 1095 ++new_idx;
1096 } 1096 }
1097 // update idnum for new location 1097 // update idnum for new location
1098 merged_methods->at(i)->set_method_idnum(i); 1098 merged_methods->at(i)->set_method_idnum(i);
1099 merged_methods->at(i)->set_orig_method_idnum(i);
1099 } 1100 }
1100 1101
1101 // Verify correct order 1102 // Verify correct order
1102 #ifdef ASSERT 1103 #ifdef ASSERT
1103 uintptr_t prev = 0; 1104 uintptr_t prev = 0;