Mercurial > hg > truffle
comparison src/share/vm/opto/type.cpp @ 17783:85b20fdf2d24
Merge
author | kvn |
---|---|
date | Tue, 25 Mar 2014 11:38:48 -0700 |
parents | 606acabe7b5c |
children | 62c54fcc0a35 |
comparison
equal
deleted
inserted
replaced
17779:794399f4f5d9 | 17783:85b20fdf2d24 |
---|---|
4372 case Null: | 4372 case Null: |
4373 if (ptr == Null) return TypePtr::make(AnyPtr, ptr, offset); | 4373 if (ptr == Null) return TypePtr::make(AnyPtr, ptr, offset); |
4374 // else fall through: | 4374 // else fall through: |
4375 case TopPTR: | 4375 case TopPTR: |
4376 case AnyNull: { | 4376 case AnyNull: { |
4377 return make(ptr, NULL, offset); | 4377 return make(ptr, _metadata, offset); |
4378 } | 4378 } |
4379 case BotPTR: | 4379 case BotPTR: |
4380 case NotNull: | 4380 case NotNull: |
4381 return TypePtr::make(AnyPtr, ptr, offset); | 4381 return TypePtr::make(AnyPtr, ptr, offset); |
4382 default: typerr(t); | 4382 default: typerr(t); |