Mercurial > hg > graal-jvmci-8
comparison 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 |
comparison
equal
deleted
inserted
replaced
20805:379471b334cb | 20806:6ee9b878902b |
---|---|
247 | 247 |
248 private: | 248 private: |
249 // State for writing a new set of dependencies: | 249 // State for writing a new set of dependencies: |
250 GrowableArray<int>* _dep_seen; // (seen[h->ident] & (1<<dept)) | 250 GrowableArray<int>* _dep_seen; // (seen[h->ident] & (1<<dept)) |
251 GrowableArray<ciBaseObject*>* _deps[TYPE_LIMIT]; | 251 GrowableArray<ciBaseObject*>* _deps[TYPE_LIMIT]; |
252 #ifdef GRAAL | |
253 bool _using_dep_values; | |
254 GrowableArray<DepValue>* _dep_values[TYPE_LIMIT]; | |
255 #endif | |
252 | 256 |
253 static const char* _dep_name[TYPE_LIMIT]; | 257 static const char* _dep_name[TYPE_LIMIT]; |
254 static int _dep_args[TYPE_LIMIT]; | 258 static int _dep_args[TYPE_LIMIT]; |
255 | 259 |
256 static bool dept_in_mask(DepType dept, int mask) { | 260 static bool dept_in_mask(DepType dept, int mask) { |