Mercurial > hg > truffle
diff src/share/vm/code/dependencies.hpp @ 20806:6ee9b878902b
Fix merge mess-ups
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Tue, 07 Apr 2015 18:57:02 +0200 |
| parents | 7848fc12602b |
| children | be896a1983c0 |
line wrap: on
line diff
--- a/src/share/vm/code/dependencies.hpp Tue Apr 07 15:00:39 2015 +0200 +++ b/src/share/vm/code/dependencies.hpp Tue Apr 07 18:57:02 2015 +0200 @@ -249,6 +249,10 @@ // State for writing a new set of dependencies: GrowableArray<int>* _dep_seen; // (seen[h->ident] & (1<<dept)) GrowableArray<ciBaseObject*>* _deps[TYPE_LIMIT]; +#ifdef GRAAL + bool _using_dep_values; + GrowableArray<DepValue>* _dep_values[TYPE_LIMIT]; +#endif static const char* _dep_name[TYPE_LIMIT]; static int _dep_args[TYPE_LIMIT];