Mercurial > hg > graal-jvmci-8
comparison src/share/vm/opto/parse3.cpp @ 17799:752ba2e5f6d0
Merge
author | kvn |
---|---|
date | Tue, 25 Feb 2014 15:11:18 -0800 |
parents | 3514ee402842 de95063c0e34 |
children | 3c3953fb3f2a 4ca6dc0799b6 c1c199dde5c9 |
comparison
equal
deleted
inserted
replaced
17798:f040cf9fc9c0 | 17799:752ba2e5f6d0 |
---|---|
359 // cases: | 359 // cases: |
360 // can_be_constant = (oop not scavengable || ScavengeRootsInCode != 0) | 360 // can_be_constant = (oop not scavengable || ScavengeRootsInCode != 0) |
361 // should_be_constant = (oop not scavengable || ScavengeRootsInCode >= 2) | 361 // should_be_constant = (oop not scavengable || ScavengeRootsInCode >= 2) |
362 // An oop is not scavengable if it is in the perm gen. | 362 // An oop is not scavengable if it is in the perm gen. |
363 if (stable_type != NULL && con_type != NULL && con_type->isa_oopptr()) | 363 if (stable_type != NULL && con_type != NULL && con_type->isa_oopptr()) |
364 con_type = con_type->join(stable_type); | 364 con_type = con_type->join_speculative(stable_type); |
365 break; | 365 break; |
366 | 366 |
367 case T_ILLEGAL: | 367 case T_ILLEGAL: |
368 // Invalid ciConstant returned due to OutOfMemoryError in the CI | 368 // Invalid ciConstant returned due to OutOfMemoryError in the CI |
369 assert(C->env()->failing(), "otherwise should not see this"); | 369 assert(C->env()->failing(), "otherwise should not see this"); |