Mercurial > hg > openjdk > jdk6 > hotspot
changeset 2433:4af580f32605 jdk6-b26
Merge
author | asaha |
---|---|
date | Tue, 12 Jun 2012 12:29:06 -0700 |
parents | ed8c8518c1a2 (current diff) 0a77c99d7d5b (diff) |
children | c972a1f3fcc0 |
files | |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/loopnode.cpp Thu Jun 07 10:55:37 2012 -0700 +++ b/src/share/vm/opto/loopnode.cpp Tue Jun 12 12:29:06 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -546,7 +546,7 @@ Node* CountedLoopNode::match_incr_with_optional_truncation( Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) { // Quick cutouts: - if (expr == NULL || expr->req() != 3) return false; + if (expr == NULL || expr->req() != 3) return NULL; Node *t1 = NULL; Node *t2 = NULL;