infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-23 21:30:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2019-01-23 19:56:28 +01:00
commit c6e45ea87c
6 changed files with 81 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
View File

@ -1024,6 +1024,9 @@ void ShenandoahBarrierNode::verify(RootNode* root) {
"sha512_implCompressMB",
{ { TypeFunc::Parms, ShenandoahLoad }, { TypeFunc::Parms+1, ShenandoahStore }, { -1, ShenandoahNone },
{ -1, ShenandoahNone}, { -1, ShenandoahNone}, { -1, ShenandoahNone} },
"encodeBlock",
{ { TypeFunc::Parms, ShenandoahLoad }, { TypeFunc::Parms+3, ShenandoahStore }, { -1, ShenandoahNone },
{ -1, ShenandoahNone}, { -1, ShenandoahNone}, { -1, ShenandoahNone} },
};
if (call->is_call_to_arraycopystub()) {

5
src/hotspot/share/opto/library_call.cpp
View File

@ -6267,6 +6267,11 @@ bool LibraryCallKit::inline_base64_encodeBlock() {
Node* dp = argument(5);
Node* isURL = argument(6);
src = must_be_not_null(src, true);
src = access_resolve(src, ACCESS_READ);
dest = must_be_not_null(dest, true);
dest = access_resolve(dest, ACCESS_WRITE);
Node* src_start = array_element_address(src, intcon(0), T_BYTE);
assert(src_start, "source array is NULL");
Node* dest_start = array_element_address(dest, intcon(0), T_BYTE);

5
src/java.desktop/share/native/libfontmanager/freetypeScaler.c
View File

@ -754,7 +754,10 @@ Java_sun_font_FreetypeFontScaler_getGlyphImageNative(
/* generate bitmap if it is not done yet
e.g. if algorithmic styling is performed and style was added to outline */
if (ftglyph->format == FT_GLYPH_FORMAT_OUTLINE) {
FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
error = FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
if (error != 0) {
return ptr_to_jlong(getNullGlyphImage());
}
}
width = (UInt16) ftglyph->bitmap.width;

7
test/hotspot/jtreg/gc/TestAllocateHeapAtMultiple.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2019, 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
@ -53,9 +53,8 @@ public class TestAllocateHeapAtMultiple {
"-Xmx32m -Xms32m -XX:+UseCompressedOops", // 1. With compressedoops enabled.
"-Xmx32m -Xms32m -XX:-UseCompressedOops", // 2. With compressedoops disabled.
"-Xmx32m -Xms32m -XX:HeapBaseMinAddress=3g", // 3. With user specified HeapBaseMinAddress.
"-Xmx4g -Xms4g", // 4. With larger heap size (UnscaledNarrowOop not possible).
"-Xmx4g -Xms4g -XX:+UseLargePages", // 5. Set UseLargePages.
"-Xmx4g -Xms4g -XX:+UseNUMA" // 6. Set UseNUMA.
"-Xmx32m -Xms32m -XX:+UseLargePages", // 4. Set UseLargePages.
"-Xmx32m -Xms32m -XX:+UseNUMA" // 5. Set UseNUMA.
};
for(String extraOpts : extraOptsList) {

56
test/jdk/java/awt/FontClass/FontSize1Test.java Normal file
View File

@ -0,0 +1,56 @@
/*
* Copyright (c) 2019, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8216965
* @summary verify no crash when rendering size 1 fonts
*/
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.GraphicsEnvironment;
import java.awt.image.BufferedImage;
public class FontSize1Test {
static final String text = "abcdefghijklmnopqrstuvwxyz";
public static void main(String[] args) {
BufferedImage bi =
new BufferedImage(100, 20, BufferedImage.TYPE_INT_RGB);
Graphics2D g2d = bi.createGraphics();
Font af[] =
GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
for (Font f : af) {
System.out.println("Looking at font " + f);
g2d.setFont(f);
g2d.getFontMetrics().getWidths();
g2d.drawString(text, 50, 10);
}
g2d.dispose();
}
}

10
test/jdk/tools/launcher/Test7029048.java
View File

@ -155,12 +155,22 @@ public class Test7029048 extends TestHelper {
}
desc = "LD_LIBRARY_PATH should not be set (no libjvm.so)";
if (TestHelper.isAIX) {
System.out.println("Skipping test case \"" + desc +
"\" because the Aix launcher adds the paths in any case.");
continue;
}
break;
case NO_DIR:
if (dstLibDir.exists()) {
recursiveDelete(dstLibDir);
}
desc = "LD_LIBRARY_PATH should not be set (no directory)";
if (TestHelper.isAIX) {
System.out.println("Skipping test case \"" + desc +
"\" because the Aix launcher adds the paths in any case.");
continue;
}
break;
default:
throw new RuntimeException("unknown case");