hg: hsx/hotspot-main/hotspot: 5 new changesets

[vladimir.kozlov at oracle.com]

Changeset: f6b0eb4e44cf
Author:    twisti
Date:      2012-10-01 14:50 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/f6b0eb4e44cf

7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
Reviewed-by: jrose, kvn

! src/cpu/sparc/vm/templateTable_sparc.cpp
! src/cpu/x86/vm/templateTable_x86_32.cpp
! src/cpu/x86/vm/templateTable_x86_64.cpp
! src/share/vm/ci/ciClassList.hpp
+ src/share/vm/ci/ciMethodType.hpp
! src/share/vm/ci/ciObject.hpp
! src/share/vm/ci/ciObjectFactory.cpp
! src/share/vm/ci/ciSignature.cpp
! src/share/vm/ci/ciSignature.hpp
! src/share/vm/ci/ciStreams.cpp
! src/share/vm/ci/ciStreams.hpp
! src/share/vm/classfile/systemDictionary.cpp
! src/share/vm/classfile/systemDictionary.hpp
! src/share/vm/interpreter/interpreterRuntime.cpp
! src/share/vm/interpreter/linkResolver.cpp
! src/share/vm/interpreter/linkResolver.hpp
! src/share/vm/interpreter/rewriter.cpp
! src/share/vm/interpreter/rewriter.hpp
! src/share/vm/oops/constantPool.cpp
! src/share/vm/oops/constantPool.hpp
! src/share/vm/oops/cpCache.cpp
! src/share/vm/oops/cpCache.hpp

Changeset: 859c45fb8cea
Author:    kvn
Date:      2012-10-02 12:25 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/859c45fb8cea

7201026: add vector for shift count
Summary: Add generation of vectors for scalar shift count.
Reviewed-by: roland, twisti, dlong

! src/cpu/sparc/vm/sparc.ad
! src/cpu/x86/vm/x86.ad
! src/share/vm/adlc/formssel.cpp
! src/share/vm/opto/classes.hpp
! src/share/vm/opto/matcher.hpp
! src/share/vm/opto/superword.cpp
! src/share/vm/opto/vectornode.cpp
! src/share/vm/opto/vectornode.hpp
! test/compiler/7200264/Test7200264.sh

Changeset: f13867c41f73
Author:    kvn
Date:      2012-10-02 14:49 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/f13867c41f73

7199742: A lot of C2 OSR compilations of the same method's bci
Summary: Don't clone head of OSR loop.
Reviewed-by: jrose, twisti

! src/share/vm/ci/ciTypeFlow.cpp
! src/share/vm/opto/parse1.cpp
+ test/compiler/7199742/Test7199742.java

Changeset: bf2edd3c9b0f
Author:    neliasso
Date:      2012-10-04 06:31 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/bf2edd3c9b0f

8000102: Resolve include conflicts
Summary: Removing include of c1/c1_runtime.hpp and opto/runtime.hpp from all os-files.
Reviewed-by: kvn
Contributed-by: nils.eliasson at oracle.com

! src/os/bsd/vm/os_bsd.cpp
! src/os/linux/vm/os_linux.cpp
! src/os/solaris/vm/os_solaris.cpp
! src/os/windows/vm/os_windows.cpp
! src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
! src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
! src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
! src/os_cpu/linux_x86/vm/os_linux_x86.cpp
! src/os_cpu/linux_zero/vm/os_linux_zero.cpp
! src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
! src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
! src/os_cpu/windows_x86/vm/os_windows_x86.cpp

Changeset: 685457683e86
Author:    kvn
Date:      2012-10-05 10:03 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/685457683e86

Merge