Mercurial > hg > truffle

diff src/share/vm/oops/instanceKlassKlass.hpp @ 6000:08f8d00f2ae3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author bobv
date Tue, 10 Apr 2012 13:27:09 -0400
parents 49036505ab5f
children 8bafad97cd26
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlassKlass.hpp	Sat Apr 07 09:06:55 2012 -0700
+++ b/src/share/vm/oops/instanceKlassKlass.hpp	Tue Apr 10 13:27:09 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -46,6 +46,7 @@
                                    int itable_len,
                                    int static_field_size,
                                    unsigned int nonstatic_oop_map_count,
+                                   AccessFlags access_flags,
                                    ReferenceType rt,
                                    TRAPS);