Compare commits

..

1452 Commits

Author SHA1 Message Date
Maxim Kartashev
4bb5c39710 JBR-8618 Wayland: GTK LaF does not change appearance when system theme changes 2025-04-16 17:29:37 +04:00
Maxim Kartashev
ec07347b4e JBR-8210 Exclude javax/swing/JPopupMenu/7156657/bug7156657.java for WLToolkit 2025-04-14 17:03:33 +04:00
Nikita Gubarkov
a7e46e016d JBR-8608 Vulkan: Cleanup capability checks 2025-04-14 02:02:51 +02:00
Maxim Kartashev
cd2a63eb06 JBR-7892 Generate a descriptive error message when awt cannot be loaded 2025-04-14 02:02:51 +02:00
Vladimir Lagunov
75f4ae540a JBR-8539 fix jdk/jfr/event/io/TestFileReadOnly.java: mimic errors in RandomAccessFile.write 2025-04-14 02:02:51 +02:00
Vladimir Lagunov
f048c4de30 JBR-8538 JBR-7700 Change handling of new File("")
A new behavior for java.io.File was introduced in commit 9477c705c0. For example, `new File("").exists()` returns true now, but it used to return false.
2025-04-14 02:02:51 +02:00
Vladimir Lagunov
456477f602 JBR-7700 Fix the behavior of setReadOnly(false) on Posix 2025-04-14 02:02:50 +02:00
Vladimir Lagunov
d5b46ce420 JBR-7700 Prepare for cases when getFileAttributeView returns null
It doesn't happen in any default implementation with default attribute classes, but some 3rd party implementations can do that.
2025-04-14 02:02:50 +02:00
Vladimir Lagunov
11aa691a7f JBR-7700 Fix the case with deletion of locked file on Windows 2025-04-14 02:02:50 +02:00
Maxim Kartashev
7aaea83d3c JBR-8551 Wayland: javax/swing/JSlider/TestJSliderRendering.java: The slider is not rendered properly 2025-04-14 02:02:50 +02:00
Nikita Gubarkov
5551faabf5 JBR-8602 Migrate JBR API backend to Classfile API 2025-04-14 02:02:50 +02:00
Nikita Gubarkov
5be2277763 JBR-8601 Vulkan: Decouple from Wayland 2025-04-14 02:02:50 +02:00
Vitaly Provodin
1b0dcac2e6 Update README.md 2025-04-14 02:02:50 +02:00
Maxim Kartashev
f28862b6ca JBR-3498 Windows: exception when trying to delete a directory with a trailing space
Allow Windows Path to have a trailing space despite Windows naming conventions
discouraging it. Many programs - including Explorer - successfully work
with such files or directories.

(cherry picked from commit 64a468280c)
2025-04-14 02:02:50 +02:00
Maxim Kartashev
be676bd09c JBR-8587 jb/build/ResolveSymbolsTest/ResolveSymbolsRealEnv.java fails on Alpine 2025-04-14 02:02:50 +02:00
Maxim Kartashev
40b21fd179 JBR-8572 Wayland: java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java: Wrong GTK library version: null 2025-04-14 02:02:50 +02:00
Vitaly Provodin
5b4021f98e JBR-8219 run "clean" separately before building (workaraound for JDK-8349665) 2025-04-14 02:02:50 +02:00
Vitaly Provodin
889aff4253 update exclude list on results of 3188 test runs 2025-04-14 02:02:50 +02:00
Nikita Tsarev
9de440f532 JBR-8533: Fix wrong keys and modifiers being reported for certain non-function key combinations [WLToolkit] 2025-04-14 02:02:50 +02:00
Maxim Kartashev
e33b4bb36c JBR-7896 Wayland: Deadlock in WLClipboard
Avoid performing blocking I/O while holding a lock
2025-04-14 02:02:49 +02:00
Nikita Gubarkov
c64c064e6a JBR-8555 Vulkan: Do not flush the surface on transform change 2025-04-14 02:02:49 +02:00
Nikita Gubarkov
a6d1a890b3 JBR-8553 Vulkan: Respect filtering hints in blits 2025-04-14 02:02:49 +02:00
Nikita Gubarkov
3cca9da11b <TEMP> 8353542: No native raster data for common pixel-interleaved BufferedImages
This duplicates my OpenJDK PR, wait till it's resolved in upstream.
2025-04-14 02:02:49 +02:00
Nikita Gubarkov
d117b5a91e JBR-8525 Vulkan: Fix offscreen surface scaling 2025-04-14 02:02:49 +02:00
Maxim Kartashev
e4dea5f72d JBR-8436 Describe various type of github releases 2025-04-14 02:02:49 +02:00
Maxim Kartashev
5e5ba3aee3 JBR-7087 Wayland: GtkFileDialogPeer implementation 2025-04-14 02:02:49 +02:00
Maxim Kartashev
4ca17953c7 JBR-7087 Wayland: Desktop support via GNOME 2025-04-14 02:02:49 +02:00
Maxim Kartashev
59a84fbb8e JBR-7087 Wayland: GTKLookAndFeel support 2025-04-14 02:02:49 +02:00
Vitaly Provodin
a7dd02ade1 update exclude list on results of 3184 test runs 2025-04-14 02:02:49 +02:00
Alexey Ushakov
6ccb35ee17 JBR-7725 Vulkan: low performance in SwingMark
Implemented intermediate buffer for loading raster data
Removed extra synchronization in blits
2025-04-14 02:02:49 +02:00
Nikita Gubarkov
936ca11b30 JBR-8485 Vulkan: Blit surface into itself 2025-04-14 02:02:49 +02:00
Alexey Ushakov
7f1740753e JBR-8479 Support Vulkan accelerated mode in perf scripts
Added the new option, minor refactoring
2025-04-14 02:02:49 +02:00
Nikita Gubarkov
da39ea9bba JBR-8478 Vulkan: Pull real supported formats from the device 2025-04-14 02:02:49 +02:00
Nikita Gubarkov
15cb64a8e2 JBR-8473 Vulkan: Support for various source blit formats via swizzling 2025-04-14 02:02:48 +02:00
Nikita Gubarkov
d626e7c95d JBR-8472 Vulkan: Respect source alpha type in blit routines 2025-04-14 02:02:48 +02:00
Nikita Gubarkov
5d8e45d730 JBR-8471 Vulkan: Reuse descriptor sets in blit routines 2025-04-14 02:02:48 +02:00
Nikita Tsarev
cd6fedb907 JBR-8422: A temporary workaround for crash in SystemHotkey setup on macOS 15.4 beta 2025-04-14 02:02:48 +02:00
Vitaly Provodin
b091370503 update exclude list on results of 3147 test runs 2025-04-14 02:02:48 +02:00
Nikita Gubarkov
8a79e0a105 JBR-8448 Vulkan: Cleanup & fix Sw->Surface blit 2025-04-14 02:02:48 +02:00
Nikita Gubarkov
02caf2eab5 JBR-8447 Vulkan: Implement multi-view images 2025-04-14 02:02:48 +02:00
bourgesl
9aecdfc9bd JBR-5497: change the default value for the system property "awt.mac.flushBuffers.invokeLater" to 'enabled' to avoid any potential freeze (safe) until a better solution 2025-04-14 02:02:48 +02:00
bourgesl
6d2c7d8769 JBR-5497: follow-up fix
- monitors sleep/wake-up notifications to define ThreadUtilities.isWithinPowerTransition()
- fixed CPlatformWindow.flushBuffers() to use this pwm flag to use invokeLater() when the system property '-Dawt.mac.flushBuffers.pwm=true'
- always use invokeLater() when display mirroring is enabled (i.e. '-Dawt.mac.flushBuffers.invokeLater'=[auto|default])
- always use the timeout=0.666s in CPlatformWindow.flushBuffer()
- always use the time limit=13.333s in LWCToolkit.doAWTRunLoop() to ensure avoiding any potential hangs / freezes on macOS
2025-04-14 02:02:48 +02:00
bourgesl
d91b8e18f6 JBR-8183: fixed cherry-pick (bad merge) 2025-04-14 02:02:48 +02:00
bourgesl
0ad31446e5 JBR-8183: get low resolution display modes (mac intel) and do not call anymore the DisplayConfiguration transaction on the main thread avoid main thread as it hangs for several seconds on macbook intel + macOS 15 2025-04-14 02:02:48 +02:00
Nikita Gubarkov
dec77348c0 <TEMP> 8352407: PixelInterleavedSampleModel with unused components throws RasterFormatException: Incorrect pixel stride
This duplicates my OpenJDK PR, wait till it's resolved in upstream.
2025-04-14 02:02:48 +02:00
Nikita Gubarkov
9f70c52a08 JBR-8442 Vulkan: Fix OPAQUE mode rendering 2025-04-14 02:02:48 +02:00
Nikita Gubarkov
412e022b30 JBR-8441 Vulkan: Update CArrayUtil.h 2025-04-14 02:02:48 +02:00
Nikita Gubarkov
7b92991215 JBR-8440 Vulkan: Pass the surface format to native code 2025-04-14 02:02:47 +02:00
Nikita Gubarkov
a47ce30176 JBR-8439 Vulkan: Cleanup Surface->Surface blit 2025-04-14 02:02:47 +02:00
Alexey Ushakov
91cc32e493 JBR-8418 Vulkan: RenderPerfTest Image test does not work properly
Added regression test and flush content of the destination surface
2025-04-14 02:02:47 +02:00
Alexey Ushakov
abb5151d77 JBR-8418 Vulkan: RenderPerfTest Image test does not work properly
Passed transform to VKRenderer code
2025-04-14 02:02:47 +02:00
Alexey Ushakov
556783ec66 JBR-8430 Vulkan: move RenderingContext into Renderer
Moved context to the VKRenderer
2025-04-14 02:02:47 +02:00
Vitaly Provodin
5534b00d1e update exclude list on results of 3113 test runs 2025-04-14 02:02:47 +02:00
Vitaly Provodin
e588b730c9 JBR-8417 specify XCODE_PATH for JBR building on macOS 2025-04-14 02:02:47 +02:00
Maxim Kartashev
4dc9fdca97 JBR-8419 sources/TestNoNULL.java: Test found 32 usages of 'NULL' in source files 2025-04-14 02:02:47 +02:00
Nikita Gubarkov
bb990aae20 JBR-8424 Vulkan: Format-aware Surface->Sw blit 2025-04-14 02:02:47 +02:00
Nikita Gubarkov
437e19fd6d JBR-8423 Vulkan: Expose VKFormat on Java side 2025-04-14 02:02:47 +02:00
Nikita Provotorov
aed58cfb4b JBR-7659 [macOS] SIGILL at [CoreFoundation+0x1d47c5] CFRunLoopRunSpecific.cold.1+0xe / sun.lwawt.macosx.CAccessibility.getChildrenAndRolesRecursive (2K frames).
Fixes crashes caused by multiple javax.accessibility.AccessibleState.EXPANDED/COLLAPSED changes by making sure AppKit has not more than one event of each type being processed or pending in its queue. The logic can be rolled back via a new system property -Dsun.lwawt.macosx.CAccessible.eventsCoalescingEnabled=false.

(cherry picked from commits 84012b5f39, a2707d4e95, fa8c4705e6, a23ab5a040, fe07d2731a)
2025-04-14 02:02:47 +02:00
vlad20012
c490987fc5 JBR-8303 Provide JBR API method to perform GC with more intensive heap shrinking 2025-04-14 02:02:47 +02:00
Vladimir Lagunov
1cce28c896 JBR-8396 JBR-7700 Fix FileTest.getCanonicalPath on macOS 2025-04-14 02:02:47 +02:00
Alexey Ushakov
8103aebfe3 JBR-8398 Vulkan: refactor shader code to use transforms
Replaced normalization logic with transform matrix
2025-04-14 02:02:46 +02:00
Nikita Gubarkov
c9a1b958f3 JBR-8413 Vulkan: Make surfaces VKGPU-aware 2025-04-14 02:02:46 +02:00
Nikita Gubarkov
99e938b3bc JBR-8412 Vulkan: Add generic offscreen GraphicsConfig implementation 2025-04-14 02:02:46 +02:00
Nikita Gubarkov
1f8fd8750c JBR-8411 Vulkan: Move generic VKGraphicsConfig implementation into shared code 2025-04-14 02:02:46 +02:00
Nikita Gubarkov
11c747e0d7 JBR-8410 Vulkan: Expose VKDevice on Java side 2025-04-14 02:02:46 +02:00
Nikita Gubarkov
b59d08624e JBR-8391 Vulkan: Split instance and device into separate files 2025-04-14 02:02:46 +02:00
Vladimir Lagunov
30ba000797 JBR-7700 Classes from package java.io. use java.nio.file inside
The option can be enabled/disabled by specifying `-Djbr.java.io.use.nio=true/false`
2025-04-14 02:02:46 +02:00
Vitaly Provodin
96f324025b update exclude list on results of 3097 test runs 2025-04-14 02:02:46 +02:00
Vitaly Provodin
cf73795a7f Update README.md 2025-04-14 02:02:46 +02:00
Nikita Gubarkov
f1fbec2621 JBR-8363 Vulkan: Organize usage of FlushRenderPass and FlushSurface 2025-04-14 02:02:46 +02:00
Nikita Gubarkov
27e971554a JBR-8359 Vulkan: Put VK_DRAW after VKRenderer_AllocateMaskFillBytes
As VKRenderer_AllocateMaskFillBytes can invalidate draw call state due to overflow, it (and future similar functions) must be called before VK_DRAW.
2025-04-14 02:02:46 +02:00
Nikita Gubarkov
b42e67e917 JBR-8358 Vulkan: Framebuffer destruction queue
Can be generalized to destroy arbitrary resources later.
2025-04-14 02:02:46 +02:00
Maxim Kartashev
35fea03f48 JBR-6979 Modernize more WaitForSingleObject on Windows
Use -XX:+UnlockExperimentalVMOptions -XX:-UseModernSynchAPI
to switch back to the original implementation
2025-04-14 02:02:46 +02:00
Nikita Gubarkov
a399cd7eae JBR-8350 Vulkan: Refactor pipeline cache & composites
This is needed for the implementation of painters (JBR-7646)
- Request pipelines one-by-one instead of a "pipeline sets"
- Split pipeline key into separate "shader" and "topology" (more items may need to be added later)
- Move management of composites into its own file
2025-04-14 02:02:46 +02:00
Alexey Ushakov
d09c80c88c JBR-8347 Download gtk-shell.xml if absent
Added downloading code
2025-04-14 02:02:45 +02:00
Vitaly Provodin
3aa1b16474 update exclude list on results of 3054 test runs 2025-04-14 02:02:45 +02:00
Vitaly Provodin
a5dbd3cec0 JBR-8196 fix calculating the number of attempts 2025-04-14 02:02:45 +02:00
Nikita Gubarkov
b0603cae7a JBR-8342 Vulkan: Skip validation setup if extension is unavailable 2025-04-14 02:02:45 +02:00
Nikita Tsarev
6e4956ea57 JBR-7994: Properly report non-base-level function keys [WLToolkit] 2025-04-14 02:02:45 +02:00
Artem Bochkarev
6a08fa7dc9 JBR-8138 Sign jcef binaries with separate entitlements
Revert to true the OSX entitlement "com.apple.security.cs.allow-dyld-environment-variables"
2025-04-14 02:02:45 +02:00
Vladimir Kharitonov
c12e157e50 JBR-8118 TextureWrapperImage for MTLTexture 2025-04-14 02:02:45 +02:00
Alexey Ushakov
0c667d5286 JBR-8297 Vulkan: Implement ISO_BLIT
Implemented general logic of the blit, removed extra logging
Corrected clipping logic, updated regression tests
Added some flush and init code for the surfaces
2025-04-14 02:02:45 +02:00
Dmitry Drobotov
1683ae72e3 JBR-8216 Implement setAccessibilityValue method for NavigableTextAccessibility
* This method allows for third-party tools to modify text component contents through the accessibility API on macOS;
* The setAccessibilityValue method is implemented similarly to NavigableTextAccessibility.setAccessibilitySelectedText. On the Java side, it calls AccessibleEditableText.setTextContents according to the comment in JavaTextAccessibility.accessibilitySetValueAttribute;
* The isAccessibilitySelectorAllowed method is implemented similarly to JavaTextAccessibility.accessibilityIsValueAttributeSettable: it checks if the text component implements AccessibleEditableText, is enabled, and additionally checks if the editable property is true, because some components could be enabled but not editable, and we shouldn't allow setting the value in this case.

(cherry picked from commit 61a501351a)
2025-04-14 02:02:45 +02:00
Vitaly Provodin
6711fdf8e1 Update README.md 2025-04-14 02:02:45 +02:00
Vitaly Provodin
c388b4252e JBR-8255 pass WLToolkit-related settings to subprocesses launched by tests 2025-04-14 02:02:45 +02:00
Vitaly Provodin
4dce20c356 JBR-8244 add logging stdout/stderr of subprocesses
(cherry picked from commit 41d655243f)
2025-04-14 02:02:45 +02:00
Vitaly Provodin
18a266f609 update exclude list on results of 3034 test runs 2025-04-14 02:02:45 +02:00
Alexey Ushakov
43aaa80ed2 JBR-8287 Vulkan: enable hw accelerated VolatileImage
Moved robot pixel grabber into windows surface data
Created offscreen surface data
Separated surfaces implementation into two files
Moved offscreen surface to the shared code

Fix
2025-04-14 02:02:45 +02:00
Nikita Gubarkov
51d10a5491 JBR-8288 Vulkan: Synchronous render queue flush.
RQ doesn't expose async flush operation. All RQ flushes wait for the queue to be drained, effectively serializing queue flusher and EDT execution while still making it prone to deadlocks.
The periodic flush feature of the queue flusher thread is of no use as well, as every observable effect of RQ operation is already immediately followed by a forced flush.
As Vulkan functions have no restriction on the calling thread, keep it simple - lock the monitor and drain the queue synchronously.
2025-04-14 02:02:44 +02:00
Maxim Kartashev
be10b49785 JBR-8264 java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java throws StackOverflowError at WLComponentPeer.getMinimumSize 2025-04-14 02:02:44 +02:00
Nikita Gubarkov
aaeb8502bf JBR-8284 Vulkan: fix $VULKAN_SDK autoconf check. 2025-04-14 02:02:44 +02:00
Nikita Gubarkov
13e98a75d5 JBR-8254 Buffer X11GraphicsEnvironment.rebuildDevices calls. 2025-04-14 02:02:44 +02:00
Maxim Kartashev
5cf9d3d2b2 JBR-8234 IDE cannot start on Wayland with large scale
Make sure the surface used for the cursor is marked as such prior to
being committed in order to receive an exception from enforcing the rule
about the buffer size having to be multiple of its scale.
2025-04-14 02:02:44 +02:00
Maxim Kartashev
faccd6d574 JBR-7897 Tool window resizes is not smooth 2025-04-14 02:02:44 +02:00
Vitaly Provodin
4490ca3ee0 Update README.md 2025-04-14 02:02:44 +02:00
Vitaly Provodin
d35f3c1c1f update exclude list on results of 3005 test runs 2025-04-14 02:02:44 +02:00
Vitaly Provodin
4bb0a777cd Update README.md 2025-04-14 02:02:44 +02:00
Maxim Kartashev
b2c5bd1d79 JBR-8209 javax/swing/JPopupMenu/NestedFocusablePopupTest.java: WLRobotPeer: wakefield extension not present in Wayland instance 2025-04-14 02:02:44 +02:00
Alexey Ushakov
69f838ea54 JBR-8201 Vulkan: crash in VKRenderer_MaskFill
Supported fully opaque mask
2025-04-14 02:02:44 +02:00
Vitaly Provodin
38ef35a9a5 Update README.md 2025-04-14 02:02:44 +02:00
Maxim Kartashev
a0f4095633 JBR-8197 Wayland: Robot fails if offset in monitor configuration exists 2025-04-14 02:02:44 +02:00
Roman Shevchenko
96480bb77b JBR-8198: substituting empty extension with the "Unix executable" type in the macOS file dialog (#479) 2025-04-14 02:02:44 +02:00
Maxim Kartashev
2040b5c53d JBR-8066 Wayland: clipboard size is limited to 65000 symbols 2025-04-14 02:02:43 +02:00
Maxim Kartashev
73649e31b9 JBR-8116 Wayland: support RounderCornersManager JBR API 2025-04-14 02:02:43 +02:00
Nikita Gubarkov
139734ea3a Added Clion project setup
(cherry picked from commit db962149ec)
2025-04-14 02:02:43 +02:00
Nikita Gubarkov
72792a90fa Updated IDEA project setup 2025-04-14 02:02:43 +02:00
Nikita Gubarkov
96761ab682 JBR-8112 Revert swing.bufferPerWindow back to false on Windows 2025-04-14 02:02:43 +02:00
Vitaly Provodin
75cfdb254b enabling dtrace-tests: added dtrace keyword
(cherry picked from commit 0b5119ca89)
(cherry picked from commit 1959e4a2a4)
2025-04-14 02:02:43 +02:00
bourgesl
c3ad6e5f02 JBR-8159: kill CVDisplayLink zombies (sleep / wake-up with multiple monitors in mirroring) + deal with display link thread shutdown (destroy threads at sleep) and restart when needed 2025-04-14 02:02:43 +02:00
Sergey Shelomentsev
dddc94c90f JBR-8046 repack java.base.jmod with correct module hashes after signing 2025-04-14 02:02:43 +02:00
Vitaly Provodin
0443cf10c4 JBR-8161 Move docker files under jbr-tools 2025-04-14 02:02:43 +02:00
Vitaly Provodin
dac434f7b6 update exclude list on results of 2963 test runs 2025-04-14 02:02:43 +02:00
Alexey Ushakov
2a778f937c JBR-8091 X: jb/java/wayland/RobotGet tests thorw java.awt.AWTException: headless environment
Do not run test logic in the headless environment
2025-04-14 02:02:43 +02:00
Maxim Kartashev
3a44c70cf4 JBR-7457 Provide JBR API method to explicitly call gc() 2025-04-14 02:02:43 +02:00
Roman Shevchenko
16fd34cef4 JBR-8156 restoring WSL visibility in the folder picker mode 2025-04-14 02:02:43 +02:00
Nikita Tsarev
b0f7f9833f JBR-5851: Fix 'DVORAK - QWERTY Cmd' layout 2025-04-14 02:02:43 +02:00
Vitaly Provodin
dbe690bbbb Update README.md 2025-04-14 02:02:42 +02:00
Maxim Kartashev
3b6d6d64b7 JBR-8133 Runtime crash after jfr drag and drop to IU 2025-04-14 02:02:42 +02:00
Alexey Ushakov
ab0cd78461 JBR-7990 Vulkan: Robot pixel grabbing for Vulkan surfaces
Implemented grabbing pixels via partly supported SurfaceToSwBlit, fixed multi-monitor scenario
2025-04-14 02:02:42 +02:00
Maxim Kartashev
07e9cbec0a JBR-3323 Exclude parts of VM code from sanitizer checks
Exclude VM error-reporting code that treats memory as a raw sequence of
bytes from address sanitizer checks. This is needed to only get true
reports when running tests against the --enable-asan build.

(cherry picked from commit 4c2085b5f7)
2025-04-14 02:02:42 +02:00
Vitaly Provodin
44814fa38b Update README.md 2025-04-14 02:02:42 +02:00
Nikita Tsarev
161d8579b2 JBR-8004: Support the context menu key on macOS 2025-04-14 02:02:42 +02:00
Maxim Kartashev
e2c80ff13d JBR-8123 NPE because FileSystems.getDefault() is null with -Djava.util.zip.use.nio.for.zip.file.access=true 2025-04-14 02:02:42 +02:00
Vitaly Provodin
f6087b7819 JBR-8104 OL8: enable premier support for docker images 2025-04-14 02:02:42 +02:00
Vitaly Provodin
8e58d6285d JBR-8072 move JBR docker images to registry.jetbrains.team 2025-04-14 02:02:42 +02:00
Vitaly Provodin
2224fb1c62 update exclude list on results of 2925 test runs 2025-04-14 02:02:42 +02:00
Maxim Kartashev
a65f30c1a2 JBR-6247 Update JBR-specific tests after JDK-8314823
(cherry picked from commit 791448a24d)
2025-04-14 02:02:42 +02:00
Maxim Kartashev
3571a75b31 JBR-1430 (8195129) Windows: use UTF16 version of Win32 API to load DLL
Also correct library name encoding in exception messages.

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 82a239a61d)
2025-04-14 02:02:42 +02:00
Vitaly Provodin
3bcbc1eba5 update exclude list on results of 2910 test runs 2025-04-14 02:02:42 +02:00
Vitaly Provodin
2cf7de431b JBR-7929 remove java/awt/event/KeyEvent/AcceleratorTes/AcceleratorTest.html
that clashes with another test due to revert of "8315701: [macos] Regression: KeyEvent has different keycode on different keyboard layouts" caused by JBR-6387
2025-04-14 02:02:42 +02:00
Vitaly Provodin
c195fe46fa update exclude list on results of 2898 test runs 2025-04-14 02:02:41 +02:00
Maxim Kartashev
ed6cb93641 JBR-7988 Wayland: WLPopupLocation test: incorrect size detected 2025-04-14 02:02:41 +02:00
bourgesl
ba79b1a63c JBR-8048: only log system property 'awt.mac.flushBuffers.invokeLater' if manually set 2025-04-14 02:02:41 +02:00
bourgesl
c1d143785a JBR-5497: improved system property (awt.mac.flushBuffers.invokeLater) handling to support false/auto/true modes and log used value at startup 2025-04-14 02:02:41 +02:00
bourgesl
7d9c44342c JBR-5497: simple fix to avoid deadlocks on macOS + mirroring displays:
- added more instrumentation on awt threads and AWTThreading.invokeAndWait() to detect and diagnose deadlocks
- enhanced awtLockListener to adopt nanotime for time accuracy + more advanced logging (caller, wait time) with histograms
- major ThreadUtilities performOnMainThread refactoring to observe thread coordination (state, callstacks) in order to avoid deadlocks while the appkit/main thread is waiting (performOnMainThreadWaiting:YES) in conflict with LWCToolkit.invokeLater() blocked in doAWTRunLoop (2nd)
- fixed CPlatformWindow.flushBuffers() to use LWCToolkit.invokeLater() to avoid deadlocks (EDT <-> main) if the the system property '-Dawt.mac.flushBuffers.invokeLater=true'
- use the new CGraphicsDevice.IsMirroring() to enable fix in CPlatformWindow.flushBuffers() too
- removed changes for JBR-5461 + cleanup + simplified awtLock() + keep few more invokeLater() when computer returns from sleep or displayChanged() to avoid deadlocks until solved definitely
- fixed review comments
2025-04-14 02:02:41 +02:00
bourgesl
0dff8a357d JBR-5497: revert JRSUIController changes (performOnMainThreadWaiting:YES) to avoid UI freeze but appkit violations must be fixed in follow-up fix 2025-04-14 02:02:41 +02:00
Vitaly Provodin
2516fb989e update exclude list on results of 2865 test runs 2025-04-14 02:02:41 +02:00
Maxim Kartashev
e013fdf525 JBR-7889 Wayland: java/awt/Focus/ComponentLostFocusTest.java: class sun.awt.NullComponentPeer cannot be cast to class java.awt.peer.TextFieldPeer 2025-04-14 02:02:41 +02:00
Maxim Kartashev
64ebeec59d JBR-7989 Wayland: WLPopupVisibility test is failing if launched with fractional sun.java2d.uiScale
Use ceil when scaling the size, use floor when scaling the location
2025-04-14 02:02:41 +02:00
Vitaly Provodin
1025e44bc4 JBR-8006 specify path to gcc-toolset-10 2025-04-14 02:02:41 +02:00
Maxim Kartashev
da72ad9a8c JBR-7993 Menus are not displayed directly underneath main menu if offset in monitor configuration exists 2025-04-14 02:02:41 +02:00
Vladimir Kharitonov
c20b198eeb JBR-7983 adapt the Dockerfile.oraclelinux to build jcef 2025-04-14 02:02:41 +02:00
Sergey Shelomentsev
228dea999f JBR-7919 add tests for Wayland popups 2025-04-14 02:02:41 +02:00
Maxim Kartashev
bc6bed61ee JBR-7972 Wayland: EXTREME lag when scrolling through any type of list in the settings when using WLToolkit
Avoid requesting the Wayland server to change the cursor when the change
is vacuous
2025-04-14 02:02:41 +02:00
Maxim Kartashev
29dee3db98 JBR-7969 Wayland: some popups misplaced when maximized with fractional scale 2025-04-14 02:02:40 +02:00
Maxim Kartashev
5207ef59cd JBR-7071 Wayland: cursor does not change when hovering over gutter icons 2025-04-14 02:02:40 +02:00
Maxim Kartashev
774cf9490b JBR-7879 Wayland: Self-moving quick-doc popup in nightly
- Position popups at the exact offset given; this is achieved by
  using the XDG_POSITIONER_ANCHOR_TOP_LEFT anchor
- Update of popups location is done in sync with all other updates
  that affect the size (like the surface size update)
- Maintain a popup's location relative to the popup's parent, not
  its toplevel window
2025-04-14 02:02:40 +02:00
Sergey Shelomentsev
0820047fd8 JBR-5318 add Github workflow usage for pull requests pre-commit testing
(cherry picked from commit f36aa7f9fa)
2025-04-14 02:02:40 +02:00
Vitaly Provodin
1ad76bcb5e update exclude list on results of 2827 test runs 2025-04-14 02:02:40 +02:00
Vitaly Provodin
72118b09e9 Update README.md 2025-04-14 02:02:40 +02:00
Sergey Shelomentsev
00b9553f3a JBR-7939 set max wait to 1 min for jetsign client 2025-04-14 02:02:40 +02:00
Nikita Gubarkov
fd96de3e6c JBR-7683 Revert "8185862: AWT Assertion Failure in ::GetDIBits(hBMDC, hBM, 0, 1, 0, gpBitmapInfo, 0) 'awt_Win32GraphicsDevice.cpp', at line 185"
This reverts commit 1ad3ebcf
2025-04-14 02:02:40 +02:00
Vitaly Provodin
847a9bb3b6 Update README.md 2025-04-14 02:02:40 +02:00
Vitaly Provodin
cafe3ba11f update exclude list on results of 2777 test runs 2025-04-14 02:02:40 +02:00
Sergey Shelomentsev
f94d77c578 JBR-7867 Notarization scripts: fail build if signing of separate files are failed 2025-04-14 02:02:40 +02:00
Maxim Kartashev
92d4a71e44 JBR-7916 Wayland: tests open-sourced in 2024.09 fail 2025-04-14 02:02:40 +02:00
Vitaly Provodin
c3f904af20 update exclude list on results of 2765 test runs 2025-04-14 02:02:40 +02:00
Dmitrii Morskii
556e3ea161 JBR-7040 implemented FPS counter on D3D 2025-04-14 02:02:40 +02:00
Dmitrii Morskii
6c73f043c2 JBR-7900 Improve logic of detecting toolkit inside registerShutdownHook 2025-04-14 02:02:39 +02:00
Dmitrii Morskii
f5e2964ab0 JBR-7051 Improved D3D Toolkit:
-Increased rendering performance
	-Improved text rendering quality
	-Accelerated repainting during window resizing
	-Removed unnecessary fallback to GDI rendering
	-Eliminated unnecessary hardware limitations
2025-04-14 02:02:39 +02:00
Maxim Kartashev
08158f8a16 JBR-5483 MacOSXWatchService assumes that the default file system is the UnixFileSystem, which might not be the case
(cherry picked from commit 0af640f048)
2025-04-14 02:02:39 +02:00
Maxim Kartashev
c76e1dc277 JBR-3862 Implement native WatchService on MacOS
The watch service is based on FSEvents API that notifies about file
system changes at a directory level. It is possible to go back to
using the old polling watch service with -Dwatch.service.polling=true.

Features include:
- support for FILE_TREE option (recursive directory watching),
- minimum necessary I/O (no filesystem access more than once
  unless needed),
- one thread ("run loop") per WatchService instance,
- changes are detected by comparing file modification times with
  millisecond precision,
- a directory tree snapshot is taken at the time of WatchKey creation
  and can take a long time (proportional to the number of files).

(cherry picked from commit f91ddf657a)
2025-04-14 02:02:39 +02:00
Maxim Kartashev
84f387d830 JBR-7859 Wayland: Unexpected focus owner set in a Window 2025-04-14 02:02:39 +02:00
Maxim Kartashev
e275fcb80b JBR-7851 Wayland: IDEA crashes if Esc is pressed to close Diff window 2025-04-14 02:02:39 +02:00
Maxim Kartashev
284ef74ffc JBR-3572 Wayland: java/awt/Window/WindowTitleVisibleTest/WindowTitleVisibleTestLinuxGnome.java: title bar shown and hidden are the same.
Exclude the test when running under XWayland that doesn't implement
screen capture necessary for the test to function.

(cherry picked from commit 4326028811)
2025-04-14 02:02:39 +02:00
Maxim Kartashev
c6fecd08c5 JBR-7760 Pure wayland: incorrect popup scale
(cherry picked from commit d16c50248d)
2025-04-14 02:02:39 +02:00
Sergey Shelomentsev
551a7ea4ae JBR-7856 use jmod from currently built JDK
(cherry picked from commit 5c90a8d4aa)
2025-04-14 02:02:39 +02:00
Sergey Shelomentsev
59c232d602 fixup! JBR-7800 Add jnativescan to signing
(cherry picked from commit 3ef8a52e0c)
2025-04-14 02:02:39 +02:00
Nikita Gubarkov
70bb29a5db JBR-7846 Vulkan: Fix compilation in Musl Docker container
(cherry picked from commit 79b9f5b71c)
2025-04-14 02:02:39 +02:00
sergey.shelomentsev
b80b97bfde JBR-7800 Fix notarization of jbrsdk (sign libs and execs inside jmod files)
(cherry picked from commit dbb42d10f5)
2025-04-14 02:02:39 +02:00
Vitaly Provodin
bd17465807 Update README.md
(cherry picked from commit ff4c5dc7b5)
2025-04-14 02:02:39 +02:00
Vitaly Provodin
b4fb59b3fb JBR-6144 enable building JBR with Vulkan
(cherry picked from commit 099698fa19)
2025-04-14 02:02:39 +02:00
Nikita Gubarkov
66700b052b JBR-7840 Vulkan: Fix compilation in Docker container
(cherry picked from commit f678372d66)
2025-04-14 02:02:38 +02:00
Dmitrii Morskii
cf302b3cf0 JBR-6754 setting nopixfmt in case of running on Remote Desktop
(cherry picked from commit de5d101cac)
2025-04-14 02:02:38 +02:00
Dmitry Batrak
12bbfa183a JBR-7833 Wayland: typeahead problem in a popup
(cherry picked from commit 6093b65936)
2025-04-14 02:02:38 +02:00
Maxim Kartashev
d90d4e7f14 JBR-7811 Wayland: IDE dialogs and popups flash black before opening
(cherry picked from commit 0703011d40)
2025-04-14 02:02:38 +02:00
Sergey Shelomentsev
bc3aced594 JBR-7734 add zip distribution for Windows
(cherry picked from commit da26c98b82)
2025-04-14 02:02:38 +02:00
Maxim Kartashev
b861f096bf JBR-7700 Route java.io file system operations via java.nio.file
Use -Djbr.java.io.use.nio=false to undo

(cherry picked from commit ef22b4cc55)
2025-04-14 02:02:38 +02:00
Konstantin Nisht
72b59b3e35 JBR-7466 Exception on VM startup with -Djava.util.zip.use.nio.for.zip.file.access=true
(cherry picked from commit 79f79bf137)
2025-04-14 02:02:38 +02:00
Konstantin Nisht
dcf3b51495 JBR-7392: Use NIO FS in ZipFile
(cherry picked from commit e21c67095b)
2025-04-14 02:02:38 +02:00
Vitaly Provodin
f1930d60cd Update README.md
(cherry picked from commit 0d66d2bf26)
2025-04-14 02:02:38 +02:00
Vitaly Provodin
107a0492d8 JBR-7797 build fastdebug without jcef
(cherry picked from commit cb322fe90d)
2025-04-14 02:02:38 +02:00
Maxim Kartashev
3cc026d07e JBR-6691 test/jdk/jdk/internal/misc/VM/RuntimeArguments.java fails on Linux
(cherry picked from commit a3ecac8a79)
2025-04-14 02:02:38 +02:00
Maxim Kartashev
41d0380cd7 JBR-7663 Wayland: make gtk-shell1 protocol support optional
(cherry picked from commit 30e6c720b6)
2025-04-14 02:02:38 +02:00
Maxim Kartashev
258f8e7ae2 BR-7663 Wayland: generate proxy code with wayland-scanner on the fly
(cherry picked from commit d599043b7d)
2025-04-14 02:02:38 +02:00
Maxim Kartashev
e313e94380 JBR-7663 Wayland: add wayland-protocols to the docker files
(cherry picked from commit 8d207ee7e7)
2025-04-14 02:02:38 +02:00
Maxim Kartashev
b95f0c0b09 JBR-7726 X11 toolkit: Dialog buttons rendering black rectangle after hovering
(cherry picked from commit 18e63514c5)
2025-04-14 02:02:37 +02:00
Dmitrii Morskii
c6670949d9 JBR-7302 added additional emptiness check in getGlyphOutlineBounds
(cherry picked from commit 60fd39e59d)
2025-04-14 02:02:37 +02:00
Nikita Gubarkov
fe8ebc1231 JBR-7766 Fix VKTexturePool OOM.
(cherry picked from commit 1a806f4f1b)
2025-04-14 02:02:37 +02:00
Nikita Tsarev
156207748d JBR-7764: Disable window decorations in test/jb/java/awt/Window/RestoreFromFullScreen.java, so that the test doesn't fail spuriously on some WMs
(cherry picked from commit 80c2a5969d)
2025-04-14 02:02:37 +02:00
Maxim Kartashev
62432b2ae6 JBR-7749 Settings popup invoked from the main toolbar appears misaligned if fractional scaling set
(cherry picked from commit d41d89e8b4)
2025-04-14 02:02:37 +02:00
Nikita Gubarkov
dcaa837dcc JBR-4725 File dialog modality
(cherry picked from commit 2a5b044c95)
2025-04-14 02:02:37 +02:00
Maxim Kartashev
cb25ab867a JBR-7544 Wayland: Cannot resize window to more that 3500px vertically
(cherry picked from commit ef3dfff3ae)
2025-04-14 02:02:37 +02:00
Vitaly Provodin
84c0074fb6 Update README.md
(cherry picked from commit 7b6bc93034)
2025-04-14 02:02:37 +02:00
Maxim Kartashev
5b7fadcae1 JBR-7748 java/awt/font/JNICheck/FreeTypeScalerJNICheck.java: JNI call made without checking exceptions when required to from CallVoidMethod
(cherry picked from commit ad45f6aec0)
2025-04-14 02:02:37 +02:00
Vitaly Provodin
46c3a3633b Update README.md
(cherry picked from commit dd41dbcb7b)
2025-04-14 02:02:37 +02:00
Maxim Kartashev
e065d16e6c JBR-7721 Copying from IntelliJ in pure Wayland on ChromeOS confuses UTF-8 and UTF-16
Avoid data flavor without an explicit charset

(cherry picked from commit 86acba5870)
2025-04-14 02:02:37 +02:00
Nikita Tsarev
a798909f08 JBR-6324: JBR API for System Shortcuts (macOS)
(cherry picked from commit 22d406a76b)
2025-04-14 02:02:37 +02:00
Nikita Tsarev
df4b7dbc21 JBR-5690: Reload next window shortcut when it changes
(cherry picked from commit be0d27983c)
2025-04-14 02:02:37 +02:00
Nikita Tsarev
0be6bc4d68 JBR-5726: Report 'Move focus to the previous window in application' system shortcut
(cherry picked from commit 5721bd6908)
2025-04-14 02:02:37 +02:00
Nikita Gubarkov
4491a1028c JBR-7653 Prepare Docker images for Vulkan builds
(cherry picked from commit 249c46bb6b)
2025-04-14 02:02:37 +02:00
Nikita Gubarkov
6f53981610 JBR-7673 Cleanup docker scripts
(cherry picked from commit 473686a92e)
2025-04-14 02:02:36 +02:00
Nikita Tsarev
cb5e8e08f1 JBR-5448: Return all shortcuts from readSystemHotkeys
(cherry picked from commit bb25ab3424)
2025-04-14 02:02:36 +02:00
Nikita Gubarkov
8da8595bb1 JBR-7579 Fix SurfaceManager.cacheMap retaining strong references.
(cherry picked from commit b8434796ae)
2025-04-14 02:02:36 +02:00
Alexey Ushakov
aae4436f38 JBR-7724 Add vulkan support to the performance scripts
Implemented -vulkan option

(cherry picked from commit 6f1ecb9b47)
2025-04-14 02:02:36 +02:00
Vitaly Provodin
5e67a97b22 Update README.md
(cherry picked from commit a51b24a7eb)
2025-04-14 02:02:36 +02:00
Nikita Gubarkov
c847013451 JBR-7565 Vulkan: Implement clip 2025-04-14 02:02:36 +02:00
Nikita Gubarkov
9f02a71666 JBR-7645 Vulkan: Implement hash table for pipeline sets 2025-04-14 02:02:36 +02:00
Nikita Gubarkov
78d551aec7 JBR-7563 Vulkan: Implement MASK_FILL
Mask bytes are copied to texel buffer to be used in shader.
Up to 256KiB (configurable) of mask can be rendered in a single draw call, with no limit on number of MASK_FILL operations in a single batch.

Also added dirty implementation of greyscale-AA DRAW_GLYPH_LIST and FILL_AAPARALLELOGRAM over MASK_FILL.

(cherry picked from commit 4651c3f096)
2025-04-14 02:02:36 +02:00
Nikita Gubarkov
d47eda4900 JBR-7564 Vulkan: Fix HIDPI and multi-monitor scenarios
(cherry picked from commit 7f0b10ad23)
2025-04-14 02:02:36 +02:00
Nikita Gubarkov
105bfb726f JBR-7575 Vulkan: Implement composites (blending and XOR mode)
- Implemented dynamic pipeline compilation.
- Added 64-bit per pixel format usage in debug mode for testing.
- Now passing colors from Java to Vulkan with straight alpha.

(cherry picked from commit 3d7baad687)
2025-04-14 02:02:36 +02:00
Nikita Gubarkov
4ccdf19429 JBR-7943 Vulkan: Provide utilities for inspecting image formats 2025-04-14 02:02:36 +02:00
Vitaly Provodin
211778f489 Update README.md
(cherry picked from commit 770c075320)
2025-04-14 02:02:36 +02:00
Nikita Gubarkov
db45f5fb13 JBR-7574 Vulkan: Implement memory allocator
(cherry picked from commit 0be149c84e)
2025-04-14 02:02:36 +02:00
Nikita Tsarev
b9e5ac80b1 JBR-7524: Workaround for showing window tiling actions when hovering over the maximize button on macOS
(cherry picked from commit 8fb519bec4)
2025-04-14 02:02:36 +02:00
Maxim Kartashev
7c34406900 JBR-7504 Use accurate event serial number with the clipboard
(cherry picked from commit d935bd156e)
2025-04-14 02:02:35 +02:00
Maxim Kartashev
a50cfd4ef1 JBR-7504 WLToolkit - Middle click paste doesn't work properly when pasting to other applications
(cherry picked from commit b553c722be)
2025-04-14 02:02:35 +02:00
Alexey Ushakov
c07cd32847 JBR-7677 Vulkan: Implement Graphics.drawImage()
Implemented:
 - raster loading and blit primitive
 - transform for VKBlitSwToTextureViaPooledTexture
Used texture pool to get temporary image

(cherry picked from commit bf04a71bce)
2025-04-14 02:02:35 +02:00
Egor Ushakov
a094eef108 JBR-1354 com/sun/tools/attach/PermissionTest.java: access denied ("java.util.PropertyPermission" "sun.tools.attach.tmp.only" "read")
(cherry picked from commit 3a09f6c1db)
(cherry picked from commit 3b2399fc35)
2025-04-14 02:02:35 +02:00
Egor Ushakov
084bd6f54f JBR-1061 .attach_pid files in the working dir - flag to put .attach file in tmp dir only
(cherry picked from commit 4bd3f7835e)
(cherry picked from commit b7a3a346e6)
2025-04-14 02:02:35 +02:00
Vitaly Provodin
3d5c57a4d1 Update README.md
(cherry picked from commit 64f5af4fda)
2025-04-14 02:02:35 +02:00
Nikita Tsarev
f715c9984b JBR-7672: Only abort key repeat when the key that is being repeated is released [WLToolkit]
(cherry picked from commit a500b52ecb)
2025-04-14 02:02:35 +02:00
Nikita Tsarev
6bb05f4060 JBR-7662: Fix key repeat manager sometimes not cancelling properly [WLToolkit]
(cherry picked from commit e1b1116bb9)
2025-04-14 02:02:35 +02:00
Vitaly Provodin
6c0f04e7c4 JBR-7511 migrate build platforms to OL8
- remove Vulcan part that causing builds to fail
- modify scripts for building images from Oracle Linux 8
- update jb/build/VerifyDependencies.java to check libraries have no dependency on symbols from glibc version higher than 2.28
- rename Ubuntu2004 docker files
- upgrade wayland up to wayland-devel-1.21.0-1

(cherry picked from commit 2092570840)
2025-04-14 02:02:35 +02:00
bourgesl
10112b9d64 JBR-7616: fixed type (str)
(cherry picked from commit a6569241db)
2025-04-14 02:02:35 +02:00
Nikita Tsarev
afe67f4001 JBR-7675: Respect disabling key repeat [WLToolkit]
(cherry picked from commit 723f45aca7)
2025-04-14 02:02:35 +02:00
Vitaly Provodin
cafafa163d JBR-7566 apply standard measurement scripts to Render
(cherry picked from commit be24b3e8ed)
2025-04-14 02:02:35 +02:00
Vitaly Provodin
eb7793a766 JBR-7567 apply standard measurement scripts to Dacapo
(cherry picked from commit 289121d0ea)
2025-04-14 02:02:35 +02:00
bourgesl
36a22a2727 JBR-7616: added ThreadUtilities.lwc_plog(env, formatMsg, ...) to use LWCToolkit's PlatformLogger instead of NSlog (only as fallback now) used by MTLRenderQueue, updated MTLUtils to share mtlDstTypeToStr(op)
(cherry picked from commit 8d240740ce)
2025-04-14 02:02:35 +02:00
Vitaly Provodin
b6143cb831 Update README.md
(cherry picked from commit f3fc7649fb)
2025-04-14 02:02:34 +02:00
Vitaly Provodin
24b4ed6021 Update README.md
(cherry picked from commit 12dd44c724)
2025-04-14 02:02:34 +02:00
Nikita Gubarkov
6f241223bf JBR-7572 Bring back VKBuffer functions
(cherry picked from commit 90e516f24c)
2025-04-14 02:02:34 +02:00
Nikita Gubarkov
00a46daa18 JBR-7644 Vulkan: Move barrier state tracking from surface into image
(cherry picked from commit 76dbad4387)
2025-04-14 02:02:34 +02:00
Nikita Gubarkov
4ef5961269 JBR-7572 Vulkan: Implement vertex buffer pool
Track and reuse vertex buffers, no need to allocate and bind a new buffer on each draw.

(cherry picked from commit e607e789c2)
2025-04-14 02:02:34 +02:00
Vitaly Provodin
5ea205d761 Update README.md
(cherry picked from commit 62d575dfe4)
2025-04-14 02:02:34 +02:00
Nikita Gubarkov
f419e96090 JBR-7556 Check negative glyphID in HBShaper
(cherry picked from commit 76852278f4)
2025-04-14 02:02:34 +02:00
bourgesl
fb093f7478 JBR-7616: improved MTLRenderQueue exception handling
(cherry picked from commit ea57bf75e7)
2025-04-14 02:02:34 +02:00
Maxim Kartashev
2c5c91a44f JBR-7600 Provide ability to add messages to fatal error log
Use JNU_LOG_EVENT(env, msg, ...) to save a message in the internal
JVM ring buffer that gets printed out to the Events section
of the fatal error log if JVM crashed.

(cherry picked from commit 7a6184d309)
2025-04-14 02:02:34 +02:00
Nikita Provotorov
20d211f095 JBR-5673: Wayland: support touch scrolling.
- Adding information to WLPointerEvent about wl_pointer::axis* events along the X axis;
- Introducing 'WLComponentPeer#convertPointerEventToMWEParameters' - a routine for converting WLPointerEvent parameters to parameters required for MouseWheelEvent s;
- Handling both X and Y axes within the WLPointerEvent dispatching routine.

(cherry picked from commit 6afbc34d4b)
(cherry picked from commit 8b091f52d1)
2025-04-14 02:02:34 +02:00
Nikita Provotorov
ccba20870e JBR-7459: Wayland: touchpad scrolling is too sensitive.
- Remaking the mapping of wl_pointer::axis events values to MouseWheelEvent rotations to eliminate the touchpad scrolling behavior "the more slowly the fingers move, the more pixels are scrolled";
- Accumulating the fraction parts of wl_pointer::axis events values to improve the accuracy of touchpad scrolling;
- Distinguishing between wheel scrolling and touchpad scrolling to fine-tune MouseWheelEvent parameters for each of these cases.

(cherry picked from commit 874d5698bc)
(cherry picked from commit cb41fa53f0)
2025-04-14 02:02:34 +02:00
Vitaly Provodin
44adb14402 Update README.md
(cherry picked from commit 29f3f9f229)
2025-04-14 02:02:34 +02:00
Sergei Tachenov
b0fde2d867 JBR-7586 Fix title click ungrab when an active user component is clicked
Swing requires that clicking frame decorations should cause the window
to be ungrabbed. However, if a custom title is used, and that title contains
user-provided components, then clicking such components should not
cause the window to be ungrabbed, otherwise a menu located in a custom
title behaves incorrectly.

Fix by using the same logic as for the native actions, such as moving the window.
If the native actions are allowed, then ungrabbing is allowed as well.
Otherwise, do not ungrab, let the component behave like it's located in the client area.

The fix is supplemented with a new regression test "test/jdk/jb/javax/swing/CustomTitleBar/JMenuClickToCloseTest.java".

(cherry picked from commit f82c018914)
2025-04-14 02:02:34 +02:00
Nikita Tsarev
5285acdeb0 JBR-7594 Check for LWCToolkit in JBR TextInput API
(cherry picked from commit 3c1fd1c3e6)
2025-04-14 02:02:34 +02:00
Sergei Tachenov
02a0b72d9e JBR-7484 Update the cursor on mouse entered/exited
AppKit resets the cursor on native mouse entered/exited events. Depending on the order of events, it may end up setting the wrong cursor. So update it forcibly on such events.

(cherry picked from commit 2de56405aa)
2025-04-14 02:02:33 +02:00
Sergei Tachenov
85595630a1 JBR-7481 Work around mouse entered/exited bug
To fix missing mouse entered/exited events when
using rounded corners, we keep track of mouse moved events. When a mouse moved event is detected, and the current peer under the cursor belongs to a different window, we send fake mouse entered/exit events to the old and new windows. We also filter late mouse exited events.

The workaround is enabled by default with the VM option "awt.mac.enableMouseEnteredExitedWorkaround" to disable it in case something breaks.

About the test:
Use the robot to find the points when the mouse
entered event is sent to the popup when the mouse
enters through a rounded corner, and the similar
point for entering the outer window when exiting
through such a corner.

Once the points are found, move the mouse back
and forth to that point, but not beyond.
The correct behavior is that when the mouse
enters the popup, a mouse exited event is sent
to the outer frame and vice versa.
Therefore, every mouse entered/exited event
should be received exactly once.

Use reflection to set the rounded corners,
as JBR API isn't available in tests.

(cherry picked from commit 0b5beaf2eb)
2025-04-14 02:02:33 +02:00
Vitaly Provodin
e0f4eff578 Update README.md
(cherry picked from commit 170a7cfa7f)
2025-04-14 02:02:33 +02:00
Alexey Ushakov
1b4d4e7701 JBR-7588 Metal: Reuse MTLContext for all GCs of the same GPU
Implemented reference counting for shared MTLContext objects. Supported multiple display links per MTLContext. Also, works for macOS version < 10.13

(cherry picked from commit c6aa7f18e5)
2025-04-14 02:02:33 +02:00
Nikita Gubarkov
0617ddc53c JBR-5973 Vulkan: Fix validation errors (#452)
- Added proper synchronization and image layout transitions.
- Refactored VKRenderer to hold per-device rendering context. Isolated surface rendering contexts.
- Implemented reusing of command buffers and semaphores
- Fixed surface resize, made surface initialization more robust.
- Added on-demand pipeline creation for actual surface formats.
- Added missing destruction logic.
- Added macros for easy checking of return codes, logging with source code location.
- Moved implementation details out of headers where possible. Stripped dead code.
- Implemented consistent OOM strategy from dynamic arrays and ring buffers.

(cherry picked from commit 91aafbe5d2)
2025-04-14 02:02:33 +02:00
Maxim Kartashev
2b7f2ea4db JBR-5615 added missing part for WLToolkit
(cherry picked from commit f407b957f2)
2025-04-14 02:02:33 +02:00
Dominik Matta
aa46915a0d JBR-6763 Wayland: application crashes when popup closed
Certain Wayland compositors (wlroots) invalidate xdg_surface after window with popup loses focus. Subsequent attempts to
commit the popup window fail with protocol error "xdg_surface has never been configured".

Handle popup_done event by hiding the popup window. Also emit WINDOW_CLOSING event as otherwise focus remains on the popup parent.

Co-authored-by: Maxim Kartashёv <maxim@kartashev.spb.ru>
(cherry picked from commit 873a085de4)
2025-04-14 02:02:33 +02:00
Maxim Kartashev
a1c7a8b882 JBR-6468 Wayland: java/awt/datatransfer/MimeFormatsTest.java fails by timeout
Excluded the test from jdk_awt_wayland as it can't be made to work
under Wayland.

(cherry picked from commit 7a3077ded9)
2025-04-14 02:02:33 +02:00
Maxim Kartashev
1dcc35e24c Added proper copyright headers
(cherry picked from commit 0d5aea938e)
2025-04-14 02:02:33 +02:00
Nikita Gubarkov
161c5fbba4 Fix WindowMoveService on Wayland
(cherry picked from commit 00f213d0ff)
2025-04-14 02:02:33 +02:00
Nikita Gubarkov
942a177aae JBR-7570 Implemented ring buffer. Added lazy implicit initialization for dynamic arrays. (#451)
(cherry picked from commit 7b89fe2311)
2025-04-14 02:02:33 +02:00
Nikita Gubarkov
73b62f827f JBR-7568 Vulkan: Refactor VKLogicalDevice into VKDevice (#449)
* Renamed VKLogicalDevice to VKDevice for conformance and convenience.
* Refactored device->device to device->handle for clarity.

(cherry picked from commit aba56fd3a9)
2025-04-14 02:02:33 +02:00
Nikita Gubarkov
0e05c513a9 JBR-7569 Removed VMA-Hpp (#450)
(cherry picked from commit 3867557192)
2025-04-14 02:02:33 +02:00
Dmitrii Morskii
3e60d6319f JBR-7126 add more possible names for cursor arrow icon
(cherry picked from commit 95e391166d)
2025-04-14 02:02:33 +02:00
Vitaly Provodin
86f25d4587 JBR-5989 Wayland: jdk_swing_wayland test group 2025-04-14 02:02:32 +02:00
Maxim Kartashёv
45cabe56e4 JBR-7016 IDEA 2024.2 Wayland: UI Crash when selecting Code and pressing Alt+Enter
(cherry picked from commit 35776b5975)
2025-04-14 02:02:32 +02:00
Maxim Kartashёv
af18c75c52 JBR-7493 Wayland: can't start in maximized state on WSL
(cherry picked from commit 18e39cafa0)
2025-04-14 02:02:32 +02:00
Maxim Kartashёv
b969c9d81c JBR-7516 Wayland: DamageList_AddList: Assertion `list != add' failed
(cherry picked from commit 674b7d1dac)
2025-04-14 02:02:32 +02:00
Maxim Kartashёv
cec2bce1b1 JBR-7501 Wayland: SurfaceData.flush() method is mis-used
(cherry picked from commit 1299f0f6c6)
2025-04-14 02:02:32 +02:00
Nikita Tsarev
597998a0b4 JBR-7478: Fix wrong timestamps on KEY_TYPED events [WLToolkit]
(cherry picked from commit c47edfa7c7)
2025-04-14 02:02:32 +02:00
lbourges
35f726d028 JBR-7461: Implement VKTexturePool for the linux vulkan pipeline:
- based on common AccelTexturePool
 - new VKTexturePool instance in VKLogicalDevice
 - fixed SIGSEGV in VKImage dispose
 - store device in TPI
 - indentation fixes
 - merged with latest changes for JBR-7460
 - use (ATexturePoolLock_init)(void)
 - fixed logs in lock implementations + fixed indentation
 - fixed MTLTexturePool to pre-processor conditions (not runtime) on USE_ACCEL_TEXTURE_POOL

(cherry picked from commit 5515b0fbfc)
2025-04-14 02:02:32 +02:00
Maxim Kartashёv
7564f2d40a JBR-7313 Wayland: error: xdg_surface buffer does not match the configured maximized state
(cherry picked from commit 4bb0306175)
2025-04-14 02:02:32 +02:00
Maxim Kartashev
e252933c24 JBR-7397 Wayland: make certain interfaces optional
(cherry picked from commit a1dcba231a)
2025-04-14 02:02:32 +02:00
Maxim Kartashev
3d75348dbd JBR-7397 CLion 2024.2-EAP/Wayland crashes on startup with Miriway
Check if all non-optional interfaces are supported before actually
starting to run

(cherry picked from commit 632a0ace4c)
2025-04-14 02:02:32 +02:00
Alexey Ushakov
1957bd30b3 JBR-7452 Vulkan: Reuse VkRenderPass for multiple renderers (#428)
Moved shared VkRenderPass to the logical device

(cherry picked from commit 3d782ed0f0)
2025-04-14 02:02:32 +02:00
Alexey Ushakov
6f0cd98c58 JBR-7420 Vulkan: Implement DRAW_PARALLELOGRAM primitive for flat color rendering (#426)
Refactored rendering code. Provided common implementation for fill and draw operations.

(cherry picked from commit 902f65c6ae)
2025-04-14 02:02:32 +02:00
Nikita Gubarkov
f715961d98 JBR-7419 Refactor Vulkan code
- Separate instance and device-specific function tables
- Avoid using device from global context when possible
- Set up debug logger

(cherry picked from commit af4eb8b758)
2025-04-14 02:02:32 +02:00
Maxim Kartashёv
b0ef5fcbb0 JBR-7390 Wayland: need better headless exception message
(cherry picked from commit b68c0ecc6f)
2025-04-14 02:02:32 +02:00
Maxim Kartashёv
88933b91df JBR-7259 Find Usages popup can't be resized under Wayland
Popup's positioner size has to be in sync with popup's buffer size

(cherry picked from commit 5d67a135e4)
2025-04-14 02:02:32 +02:00
Maxim Kartashёv
3c44f3b2ba JBR-7254 Impossible to copy/paste files in Project tree
(cherry picked from commit 762cd2b23e)
2025-04-14 02:02:31 +02:00
Maxim Kartashev
298fd61e9f JBR-7290 Wayland: window permanently looses focus after invoking Go To Line dialog
(cherry picked from commit c381634aff)
2025-04-14 02:02:31 +02:00
Alexey Ushakov
df408bb7c4 JBR-7308 Vulkan: Build failure in vulkan enabled builds
Added missing header (jni_util.h)

(cherry picked from commit 02fb3aee06)
2025-04-14 02:02:31 +02:00
Alexey Ushakov
e627ee6001 JBR-7305 Vulkan: Implement FILL_SPANS primitive for flat color rendering
Implemented flat color shape rendering

(cherry picked from commit 6f84d82d1d)
2025-04-14 02:02:31 +02:00
Nikita Gubarkov
242cffca70 JBR-7307 Add stub for VKInstance.initNative with disabled Vulkan.
(cherry picked from commit e834ce867f)
2025-04-14 02:02:31 +02:00
Nikita Gubarkov
0c2b1f95e0 JBR-7237 Fix cyclic dependency of Wayland and Vulkan initialization (#396)
(cherry picked from commit cde482c1fd)
2025-04-14 02:02:31 +02:00
Maxim Kartashёv
665408947e JBR-7072 Wayland: clicks on items of floating context menus are ignored (#405)
JBR-7072 Wayland: clicks on items of floating context menus are ignored

(cherry picked from commit 4083b43591)
2025-04-14 02:02:31 +02:00
Alexey Ushakov
fed3d33be8 JBR-7256 Vulkan: Implement FILL_PARALLELOGRAM primitive for flat color rendering
(cherry picked from commit 57dc1a9e23)
2025-04-14 02:02:31 +02:00
Maxim Kartashev
16fcc9168d JBR-7237 Separate display connect from WLToolkit initialization
(cherry picked from commit 768d46d049)
2025-04-14 02:02:31 +02:00
Maxim Kartashev
8ee718c584 JBR-7202 wayland: memory leak when resizing windows
(cherry picked from commit 64660b0c00)
2025-04-14 02:02:31 +02:00
Maxim Kartashev
3b1c6ca366 JBR-7206 Wayland: Stylepad demo flickers when resizing on KDE
(cherry picked from commit 996d4f7490)
2025-04-14 02:02:31 +02:00
Alexey Ushakov
9f259ef184 JBR-6543 Vulkan: migrate current code to pure c (#267)
JBR-6543 Vulkan: migrate current code to pure c

Replaced C++ vulkan rendering with C one

(cherry picked from commit 85e44bf973)
2025-04-14 02:02:31 +02:00
Maxim Kartashev
1360912cb2 JBR-7209 Wayland: modernize window decorations
(cherry picked from commit d3496bc966)
2025-04-14 02:02:31 +02:00
Maxim Kartashev
faecd348fe JBR-7201 Wayland: update copyright in files generated by wayland-scanner
(cherry picked from commit 33a7167108)
2025-04-14 02:02:31 +02:00
Maxim Kartashev
94b2b1e0d3 JBR-7198 Wayland: jvm crashes under KDE
Do not copy the buffer if the drawing buffer has not been resized yet as
the size will not match that of the show buffer.
Also, properly guard against the size change by another thread while
copying.

(cherry picked from commit 8ff1d3c6aa)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
ec1488847d JBR-7158 Wayland: scale with wp_viewport instead of buffer scale
(cherry picked from commit 8227e43343)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
6ced72e37a JBR-7028 Implement FPS counter on Linux
Use -Dawt.window.counters to enable.
To output counters per second to stdout/stderr,
use -Dawt.window.counters=stdout or =stderr.

A counter by the name swing.RepaintManager.updateWindows
is always available for Swing applications, but it does not
accurately correspond to frames per second.

Toolkit-dependent counters provide much better accuracy.
On Wayland with memory buffers as the backend two are available:
java2d.native.frames - frames delivered to the Wayland server
java2d.native.framesDropped - fully formed frames that were not
delivered to the Wayland server

(cherry picked from commit 639a7b4a5e)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
03de471753 JBR-7047 Deadlock on git fetch on Wayland
(cherry picked from commit eabaada5bc)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
a2647ae620 JBR-6576 Wayland: exception when double-clicking dialog title bar
(cherry picked from commit e42b74780b)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
19eb7e54c8 JBR-7058 Wayland: IDE hang on the popup appearance
Clean up the damage list when resizing a surface.
Additionally, clamp the damaged area before copying to its current
actual size in order to safeguard against invalid external input.

(cherry picked from commit 392a016333)
2025-04-14 02:02:30 +02:00
tsarn
e60e0463e5 JBR-7063: Make .getKeyChar() report chars in KEY_PRESSED/KEY_RELEASED events for compatibility [WLToolkit] (#371)
(cherry picked from commit bc5bdd2b9e)
2025-04-14 02:02:30 +02:00
tsarn
3f5c3a6add JBR-6848: Support extra mouse buttons for navigation [WLToolkit]
(cherry picked from commit 2fb530835d)
2025-04-14 02:02:30 +02:00
tsarn
88afb4914e JBR-6434: Fix pointer leave also resetting the keyboard modifiers [WLToolkit] (#370)
(cherry picked from commit bae7c40fa5)
2025-04-14 02:02:30 +02:00
tsarn
b241c77163 JBR-7044: Reset clickCount on mouse moves [WLToolkit]
(cherry picked from commit 0dc57e183c)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
1a1f5c719d JBR-7010 Wayland: Swing window resizing is not smooth enough
(cherry picked from commit 724bdfbabb)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
d13793cb94 JBR-6926 Wayland: fonts are aliased/grainy on first start
(cherry picked from commit 9ee13ff658)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
50e949b180 JBR-6920 Wayland: some IDEA popups positioned incorrectly
(cherry picked from commit e28d2bacc7)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
0c76414e32 JBR-6895 Wayland: cursor changes to resize at edges even when window is maximized
(cherry picked from commit a634a8b345)
2025-04-14 02:02:30 +02:00
Maxim Kartashev
234bd2521b JBR-6884 SIGSEGV in Java_sun_java2d_wl_WLSMSurfaceData_pixelsAt
(cherry picked from commit 5b883749de)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
0685e7bc52 JBR-6448 Wayland: IDEA window looks pixelated after monitors scale was changed
(cherry picked from commit 3318c2260b)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
0b7a64c7e2 JBR-6814 Wayland: support sun.java2d.uiScale property
(cherry picked from commit 2d420bfd59)
2025-04-14 02:02:29 +02:00
Alexey Ushakov
4779e6dd8d JBR-6787 WLToolkit/wsl: crash in WLComponentPeer.setCursor
Added check for unavailable cursor pData

(cherry picked from commit b24e4bce02)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
bada4cc438 JBR-6783 MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java: Found one Java-level deadlock
(cherry picked from commit 4e391051bd)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
2cdb2a0620 JBR-6504 Wayland: optional Robot capability to peek at current window's pixels
(cherry picked from commit 4e1bac1d8e)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
c98daf2412 JBR-6519 Linux: SIGSEGV at [libwayland] wl_proxy_get_version
Guard against passing NULL to libwayland

(cherry picked from commit 74ab4ac224)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
3dd58b5786 JBR-6736 libwakefield crashes weston
(cherry picked from commit 6777dcb2f7)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
c66c7b3baa JBR-6722 OutOfMemoryError: Failed to allocate Wayland surface buffer
(cherry picked from commit 8ccf0e158f)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
c1719a43ab JBR-6617 Wayland: java/awt/Frame/HugeFrame/HugeFrame.java crashes JVM
(cherry picked from commit 1d9a2193c9)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
8734f663d2 JBR-6598 Wayland: window gets un-maximized after switching
When the size of the buffer changes, cancel the frame callback
and make sure that the next surface commit happens with the new buffer.

(cherry picked from commit acb2a54349)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
f9ec946295 JBR-6469 Wayland: java/awt/image/ColorModel/DrawCustomColorModel.java throws UnsupportedOperationException
(cherry picked from commit 40da67b44e)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
be9e7652d5 JBR-6467 Wayland: java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java fails
(cherry picked from commit 14339b83cd)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
398bcec4ad JBR-6547 WLToolkit: no app icon in GNOME
Allow to associate the application's window with .desktop file with icon
and other info with -Dawt.app.id=... (DBus application name similar to
WM_CLASS in X

(cherry picked from commit 5901915afb)
2025-04-14 02:02:29 +02:00
Maxim Kartashev
f4874685cd JBR-6559 Wayland: popups may stop working after a while
Cancel the frame callback when hiding a window.

(cherry picked from commit fd4ba3f752)
2025-04-14 02:02:28 +02:00
Maxim Kartashev
7f4c06a1ec JBR-6452 Wayland: avoid copying entire surface buffers
(cherry picked from commit b13bcec55b)
2025-04-14 02:02:28 +02:00
Maxim Kartashev
c3d12dc4a7 JBR-6452 Wayland: measure and improve surface buffer management
Improved rendering performance by
* reducing memory copy and making it more efficient,
* tying the next frame display to the frame event from Wayland,
  which dramatically reduces load for very quick Swing apps,
* limiting the number of buffers to 2.

(cherry picked from commit e625eeca1e)
2025-04-14 02:02:28 +02:00
Dmitrii Morskii
461ef0de41 JBR-6372 Wayland:
-correctly positioning SplashScreen on multiple monitors;
-correctly correctly handles cases of SplashScreen with gif with transparent parts;
-refactoring;

(cherry picked from commit 7d750cfbcf)
2025-04-14 02:02:28 +02:00
Alexey Ushakov
8ca10dd10c JBR-6445 Prepare RepaintManager code for displaySync=false
Refactored AWTAccessor code

(cherry picked from commit acbd18f361)
2025-04-14 02:02:28 +02:00
Dmitry Batrak
1493192e53 JBR-5961 Wayland: can't switch between projects using menu
fix activation not working on Ubuntu 23 (mutter 45.2), after a mouse button has been pressed in the originally active window

(cherry picked from commit 07fa18103e)
2025-04-14 02:02:28 +02:00
Maxim Kartashev
86da9f3a89 JBR-6416 Wayland: IDEA maximize button out of sync sometimes
(cherry picked from commit 6122875478)
2025-04-14 02:02:28 +02:00
Maxim Kartashev
a09fa162b5 JBR-6391 Wayland: memory indicator tooltip flickers
(cherry picked from commit e84bddb1ba)
2025-04-14 02:02:28 +02:00
Dmitrii Morskii
0d030a1e9d JBR-6213 Wayland: removed blurring on cursor on multiple monitors with different scales
(cherry picked from commit fa7844da7c)
2025-04-14 02:02:28 +02:00
Maxim Kartashev
62f2766e62 JBR-6276 Wayland: WLToolkit logs too much
Changed the logging level for such messages to FINE

(cherry picked from commit e946179554)
2025-04-14 02:02:28 +02:00
Maxim Kartashev
fee1942f60 JBR-6316 Wayland: WLSMSurfaceData.getReplacement() throws UOE
Also fixed the keyboard repeat manager so that it does not prevent
application from shutting down.
Also improved fullscreen support.

(cherry picked from commit a36c9604b1)
2025-04-14 02:02:28 +02:00
Maxim Kartashev
0955b8d9d8 JBR-6321 Wayland: popup windows do not respect screen bounds
(cherry picked from commit b8b08a36aa)
2025-04-14 02:02:28 +02:00
Maxim Kartashev
4682ca2b2a JBR-6313 Wayland: pasting from clipboard doesn't always work
Also added a flush-to-server command following each Wayland request

(cherry picked from commit 58d2d421e0)
2025-04-14 02:02:28 +02:00
Maxim Kartashev
718c8b35c7 JBR-6276 Wayland: WLToolkit logs too much
(cherry picked from commit fee20da837)
2025-04-14 02:02:28 +02:00
Nikita Tsarev
2ada538c61 JBR-5678: Refactor Wayland keyboard support
(cherry picked from commit 070ec5bb8c)
2025-04-14 02:02:28 +02:00
Dmitrii Morskii
1de3f56f40 JBR-5965 Wayland: implement SplashScreen
(cherry picked from commit c0247eae4f)
2025-04-14 02:02:27 +02:00
Maxim Kartashev
ffb01a7a4c JBR-6253 Wayland: can't run in weston because of xdg_wm_base version 3
(cherry picked from commit 79ddf65b83)
2025-04-14 02:02:27 +02:00
Maxim Kartashev
3c03ed72b1 JBR-6212 Wayland: app does not terminate upon Wayland protocol error
(cherry picked from commit 5ad4f8a06d)
2025-04-14 02:02:27 +02:00
Maxim Kartashev
ec889982a3 JBR-6209 Wayland: popup windows cannot be moved
(cherry picked from commit 0aecd427d2)
2025-04-14 02:02:27 +02:00
Maxim Kartashev
a07eb01c67 JBR-5977 Wayland: make undecorated windows natively resizeable
(cherry picked from commit fc735db0dc)
2025-04-14 02:02:27 +02:00
Maxim Kartashev
0667de3484 JBR-6207 Wayland: many popup windows positioned incorrectly
When popup's parent is also its top-level window, use that instead of
null

(cherry picked from commit 47d484b60f)
2025-04-14 02:02:27 +02:00
Maxim Kartashev
4e72562d29 JBR-6183 Wayland: clipboard-related exception in headless environment
(cherry picked from commit e302f472f2)
2025-04-14 02:02:27 +02:00
Nikita Gubarkov
1b26b6b887 JBR-6144 Build JBR with Vulkan support
1. Update dockerfile to checkout Vulkan headers
2. Fix --with-vulkan-include configure option

(cherry picked from commit 67c8c4dc1a)
2025-04-14 02:02:27 +02:00
Alexey Ushakov
2f86848bf6 JBR-6158 Cannot build jbr21 with wayland toolkit on wsl2
Added --with-wayland-lib option to provide custom library path

(cherry picked from commit cdc2b1b7a0)
2025-04-14 02:02:27 +02:00
Maxim Kartashev
ce94f5ab42 JBR-5857 Wayland: implement clipboard support
(cherry picked from commit c155acb7f5)
2025-04-14 02:02:27 +02:00
Dmitry Batrak
78c185a063 JBR-6145 [Wayland toolkit] Popup windows aren't focusable
A partial solution. Cases not still covered:
* Alt+tab from the app and back should keep popup focused if it was focused initially
* Mouse clicks between popup and owner should transfer focus as expected

(cherry picked from commit 903231dc50)
2025-04-14 02:02:27 +02:00
Maxim Kartashev
14f3f3bfcf JBR-6138 Wayland: utilize gtk_shell1 protocol to mark dialogs as modal
(cherry picked from commit ba60bfa1f4)
2025-04-14 02:02:27 +02:00
Maxim Kartashev
a34f25c617 JBR-6117 Wayland: JVM shutdown hang
(cherry picked from commit 20b2eeb0cc)
2025-04-14 02:02:27 +02:00
Dmitry Batrak
f55aefda7c JBR-5961 Wayland: can't switch between projects using menu
prevent using a pointer to destroyed surface

(cherry picked from commit ba1b5cec5f)
2025-04-14 02:02:27 +02:00
Dmitry Batrak
ee9f5d7bc8 JBR-5961 Wayland: can't switch between projects using menu
fix typo

(cherry picked from commit 1ee3c83ef0)
2025-04-14 02:02:26 +02:00
Dmitry Batrak
c7734a3dab JBR-5961 Wayland: can't switch between projects using menu
support Window.toFront in Wayland toolkit

(cherry picked from commit b42043930f)
2025-04-14 02:02:26 +02:00
Maxim Kartashev
abd2520773 JBR-6071 Alpine Linux compilation: error: implicit declaration of function 'pthread_getname_np'
(cherry picked from commit 72722dac36)
2025-04-14 02:02:26 +02:00
Maxim Kartashev
76c9364030 JBR-5989 Wayland: jdk_awt_wayland test group
(cherry picked from commit 05ad0c35dd)
2025-04-14 02:02:26 +02:00
Maxim Kartashev
6113a47acb JBR-6025 Wayland: miscellaneous small improvements
(cherry picked from commit 9dfeaac204)
2025-04-14 02:02:26 +02:00
Alexey Ushakov
ceda34a1e0 JBR-6045 WLToolkit(Vulkan): Add options to select physical device
Changed access to _name field, minor corrections in verbose print

(cherry picked from commit 36407e978c)
2025-04-14 02:02:26 +02:00
Alexey Ushakov
1641fe03ba JBR-6045 WLToolkit(Vulkan): Add options to select physical device
Implemented -Dsun.java2d.vulkan=True and -Dsun.java2d.vulkan.deviceNumber=n VM options

(cherry picked from commit 7ea0f44a6f)
2025-04-14 02:02:26 +02:00
Maxim Kartashev
930f8ca21c JBR-6036 Wayland: Cannot invoke "java.awt.Component.getWidth()" because "popupParent" is null
Not all POPUP Window's have their parent set. And only those who do
shall be treated as popups in the Wayland's sense.

(cherry picked from commit 86080923bb)
2025-04-14 02:02:26 +02:00
Nikita Gubarkov
28dffa1cc0 JBR-5973 Implement rendering of no-AA shapes with Vulkan pipeline
Get rid of maxTextureSize in Vulkan code. This concept was introduced to fix macOS-specific bugs and don't map well to Vulkan implementation, as this value is tied to specific device and texture format, so get rid of it for now and see whether we need it at all.

Refactored native surface data hierarchy. There was a C-style "inheritance" model with VKSDOps having an SurfaceDataOps as its first member and conversions back and forth between them. And then also privOps - pointer to the platform-specific part (WLVK). This was refactored into plain inheritance: SurfaceDataOps -> VKSurfaceData -> VKSwapchainSurfaceData -> WLVKSurfaceData

State management, synchronization & layout transition. Now using dynamic rendering and synchronization2 extensions.
Each device has a single timeline semaphore (basically 64-bit counter), monotonically increasing as device executes our commands, allowing us to track the state of the submitted batches and reuse resources which are no longer in use.

Split command recording into primary and secondary command buffers.
This allows us to record commands "in the past", before current render pass started, which gives possibility for some heavy optimizations:
1. When we suddenly need some texture in the middle of the render pass - no need to stop render pass in order to insert necessary synchronization - we can do it as if we knew it beforehand.
2. When we draw something and then clear the surface - just erase all commands inside current render pass we recorded earlier, so the actual drawing will never happen.

Shaders are compiled with glslc or glslangValidator and bytecode is inlined directly into libawt_wlawt

Memory management via VMA, vertex buffer pool, shader push constants.

Other refactoring.

(cherry picked from commit 9ceaebbb60)
2025-04-14 02:02:26 +02:00
Alexey Ushakov
f974a78acc JBR-6032 WLToolkit: Uninitialized WLComponentPeer sends paint requests
Protected surfaceAssigned from MT access

(cherry picked from commit e5a3802293)
2025-04-14 02:02:26 +02:00
Alexey Ushakov
26d293f5c9 JBR-6032 WLToolkit: Uninitialized WLComponentPeer sends paint requests
Skip sending paint events for not configured peers

(cherry picked from commit 145d6405e4)
2025-04-14 02:02:26 +02:00
Maxim Kartashev
20001793d4 JBR-5968 Wayland: support PERPIXEL_TRANSLUCENT
(cherry picked from commit 35bb2d2489)
2025-04-14 02:02:26 +02:00
Nikita Tsarev
e960d2c9ce JBR-5963: Fix RobotKeyboard test and implement getLockingKeyState
(cherry picked from commit 8210596700)
2025-04-14 02:02:26 +02:00
Maxim Kartashev
62e2aabd4b JBR-5962 Wayland: fix the main event loop to allow for secondary queues
Return READ_RESULT_FINISHED_NO_EVENTS from WLToolkit.readEvents() in
case of poll returning with no new data (i.e. via timeout).

(cherry picked from commit 2b68207e79)
2025-04-14 02:02:25 +02:00
Nikita Tsarev
f156bda926 Regenerate wakefield-client-protocol using an older wayland-scanner to temporarily fix build problems
(cherry picked from commit 7310c73a94)
2025-04-14 02:02:25 +02:00
Nikita Tsarev
a759ed9997 JBR-5676: Support emulating input events in Wakefield
(cherry picked from commit 6544d9d976)
2025-04-14 02:02:25 +02:00
Nikita Tsarev
f236f03b71 JBR-5900: Fix deadlock when enabling the Wakefield extension
(cherry picked from commit f1712ababd)
2025-04-14 02:02:25 +02:00
Nikita Tsarev
dfc3fdff2d JBR-5896: Fix WLToolkit being instantiated twice
(cherry picked from commit 1bdfdc275d)
2025-04-14 02:02:25 +02:00
Maxim Kartashev
a2bcab52b8 JBR-5861 Wayland: minimum necessary stubs to run IDEA
(cherry picked from commit d8dbfd7249)
2025-04-14 02:02:25 +02:00
Alexey Ushakov
33eaa34c58 JBR-5645 Provide basic classes for Vulkan rendering pipeline
Implemented shared classes for cross-platform vulkan implementation and some support for wayland toolkit

(cherry picked from commit 9ea3d2d0b1)
2025-04-14 02:02:25 +02:00
Maxim Kartashev
f9ff4e707b JBR-5661 Wayland: implement heavy-weight popup windows
(cherry picked from commit abdfb7231b)
2025-04-14 02:02:25 +02:00
Maxim Kartashev
455cded6f9 JBR-5666 Wayland: WLToolkit doesn't work with weston
Multiple Wayland buffers support.

(cherry picked from commit 4541c118ff)
2025-04-14 02:02:25 +02:00
Maxim Kartashev
fb9fb7fe2a JBR-5658 Wayland: incorrect scaling of window content
The buffer scale is changed atomically with the size.
WLGraphicsConfig made immutable and is re-created when scaling changes.
WLGraphicsDevice is also re-created when its position changes.

(cherry picked from commit 2d0d950d5b)
2025-04-14 02:02:25 +02:00
Maxim Kartashev
2fcddf769f JBR-5657 Wayland: sometimes there's a deadlock at the start
Don't exit from toolkit initialization until all the necessary
information has been received from the Wayland server.

(cherry picked from commit 453aa66d79)
2025-04-14 02:02:25 +02:00
Maxim Kartashev
1fa68ec107 JBR-5655 java/awt/Toolkit/Wayland/WaylandToolkit.java: WLToolkit not found
WLToolkit made operational in headless mode

(cherry picked from commit 5679e134a7)
2025-04-14 02:02:25 +02:00
Maxim Kartashev
10dae1b97d Wayland: fix AWT initialization on macOS
(cherry picked from commit 382e6c6989)
2025-04-14 02:02:25 +02:00
Maxim Kartashev
50470f919c Wayland: fixed build errors on macOS
(cherry picked from commit 82fe989dd7)
2025-04-14 02:02:25 +02:00
Maxim Kartashev
35ff6790d8 Wayland: fixed build errors with older versions of Wayland
(cherry picked from commit d6150b8c8b)
2025-04-14 02:02:24 +02:00
Alexey Ushakov
38034883b1 Initial version of WLToolkit and Vulkan support
Co-authored-by: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Co-authored-by: Nikita Gubarkov <nikita.gubarkov@jetbrains.com>
Co-authored-by: Maxim Kartashev <maxim.kartashev@jetbrains.com>
(cherry picked from commit 2e26de3c45)
2025-04-14 02:02:24 +02:00
Vitaly Provodin
50a33363d6 Update README.md
(cherry picked from commit 49c5e7dd3a)
2025-04-14 02:02:24 +02:00
Vitaly Provodin
9a6de7b7b3 JBR-7532 upgrade alpine up to 3.14, specify versions of installing packages, and deploy the latest available jdk20 (same as in jbr21)
(cherry picked from commit 794eab0e1f)
2025-04-14 02:02:24 +02:00
Vitaly Provodin
660a98b3b6 JBR-7456 add regression test checking if implementations of all available the random number generator algorithms can be instantiated, including the default one
(cherry picked from commit 3950e80ba1)
2025-04-14 02:02:24 +02:00
Nikita Tsarev
e52f0fc38d JBR-7529: Explicitly check for press-and-hold in performKeyEquivalent
(cherry picked from commit 9fadadf039)
2025-04-14 02:02:24 +02:00
Vitaly Provodin
b49fc1abc0 JBR-7517 build JBR artefacts with CDS archives
(cherry picked from commit 0b5462b3ec)
2025-04-14 02:02:24 +02:00
Vitaly Provodin
375242beb4 Update README.md
(cherry picked from commit d27df085c7)
2025-04-14 02:02:24 +02:00
bourgesl
80bea71b50 JBR-7460: fixed (macos) MTLTexturePool GC implementation: minor syntax updates from JBR-7461
(cherry picked from commit 713162c6b5)
2025-04-14 02:02:24 +02:00
Nikita Tsarev
c39f918e96 JBR-7426: Fix cancelling press-and-hold causing some future key events being swallowed
(cherry picked from commit a07d5e4a60)
2025-04-14 02:02:24 +02:00
bourgesl
56c10752ce JBR-7460: fixed (macos) MTLTexturePool GC implementation to release texture memory more promptly (regular young GC freeing not reused textures since 15s) + unified API with new generic AccelTexturePool (C) to be shared with the coming vulkan pipeline (linux)
(cherry picked from commit ea12ccdf5e)
2025-04-14 02:02:24 +02:00
Dmitrii Morskii
10c4f7b7aa JBR-6772 handled case with adding new timers after VM was suspended
(cherry picked from commit 1dd81b186b)
2025-04-14 02:02:24 +02:00
Maxim Kartashёv
2d4989d79e JBR-5956 Provide more details on assertion failure
Use JNU_RUNTIME_ASSERT(env, cond, msg) defined in jni_util.h
to crash JVM when 'cond' is not true with the given message
and source location information in the fatal error log.

(cherry picked from commit fd9bf2c37a)
2025-04-14 02:02:24 +02:00
Sergey Shelomentsev
ff55ac3918 Update jbr-api version to 1.0.2
(cherry picked from commit 9c4a2ac50a)
2025-04-14 02:02:24 +02:00
Stanislav Dombrovsky
0288de647b Fix rendering of HTML list dots + better vertical align for them.
(cherry picked from commit fa4a404533ba1ef638fe523adc74391aee8a3ebf)

(cherry picked from commit 9f079c66e9)
(cherry picked from commit baf2f0b73f)
2025-04-14 02:02:23 +02:00
Nikita Tsarev
dfc6098033 JBR-6588: JBR API for inspecting certain properties of KeyEvents
(cherry picked from commit cf2abf34d7)
2025-04-14 02:02:23 +02:00
Nikita Tsarev
bdbaf1736a JBR-7449: Fix press-and-hold cancel keys not being swallowed by JBR
(cherry picked from commit a0dbdff2b0)
2025-04-14 02:02:23 +02:00
Alexey Ushakov
4411267cd2 JBR-6545 java/awt/Mixing/AWT_Mixing/JProgressPaneOverlapping.java fails by time out (sun.java2d.metal.MTLLayer.blitTexture)
Moved test frame by some offset to avoid interaction with mac menu bar

(cherry picked from commit 7d3688ab93)
2025-04-14 02:02:23 +02:00
Artem Bochkarev
d5561d2ab4 JBR-5405: supported BufImgSurfaceData
(cherry picked from commit 3c2d26f834)
2025-04-14 02:02:23 +02:00
Maxim Kartashev
05c04a172f JBR-6830 Poor performance with KDE Plasma 6 X11
Use -Dwatch.desktop.geometry=false as a workaround until the KWin issue
is fixed

(cherry picked from commit d90f0e524b)
2025-04-14 02:02:23 +02:00
Artem Bochkarev
275bf93d3b JBR-4430 Fixed execution permissions on Linux
(cherry picked from commit f3896017f0)
2025-04-14 02:02:23 +02:00
Vitaly Provodin
b2957b98b9 update exclude list on results of 21.0.3_b517.1 test runs
(cherry picked from commit 88a92ef655)
2025-04-14 02:02:23 +02:00
Vitaly Provodin
e1baad4644 Update README.md
(cherry picked from commit 4d2ddff1f8)
2025-04-14 02:02:23 +02:00
bourgesl
1f6268f458 JBR-4530: make opengl & metal handle colorMatching on non-SRGB profile consistently (controlled by the system property 'sun.java2d.osx.colorMatching') + updated MacOSLayerColorTest to test color matching setting on OpenGL & Metal pipelines
(cherry picked from commit 2db47e604e)
2025-04-14 02:02:23 +02:00
Vitaly Provodin
692155d577 Update README.md
(cherry picked from commit 2edeae7740)
2025-04-14 02:02:23 +02:00
Vitaly Provodin
9befb80ed2 JBR-6696: fix drawableId usage + revert PrinterJob changes (non-appkit thread)
(cherry picked from commit 5229c513e3)
2025-04-14 02:02:23 +02:00
Vitaly Provodin
79a7ce7fbb Update README.md
(cherry picked from commit c6583bd7fc)
2025-04-14 02:02:23 +02:00
Vitaly Provodin
e9f3ad66e7 Update README.md
(cherry picked from commit db562b31b0)
2025-04-14 02:02:23 +02:00
bourgesl
2772863815 JBR-6696: added MTLContext CVDisplayLink checks, improved MTLLayer drawable lifecycle, hardened appkit main thread usage with ThreadUtilities instrumentation to monitor all performOnMainThread usages and report high latency tasks in LWCToolkit platform logger (use system property 'sun.awt.mac.mainThreadLatency=xx' in milliseconds), fixed few MainThread violations (PrinterView init)
(cherry picked from commit 975b4b8cc9)
2025-04-14 02:02:23 +02:00
Alexey Ushakov
db5fbcc888 JBR-5063 macOS: SIGILL at [libsystem_kernel] __kill in java.lang.IllegalStateException: Error - unable to initialize Metal after recreation of graphics device. Cannot load metal library...
Add fallback to MTLCreateSystemDefaultDevice for main display

(cherry picked from commit e523e30250)
2025-04-14 02:02:22 +02:00
Nikita Tsarev
df3f0ed5d5 JBR-6764: Add null check on hostAdapterLocator
(cherry picked from commit 7396316337)
2025-04-14 02:02:22 +02:00
Sergey Shelomentsev
c5316152a6 JBR-4912 test moved from JBR repository
(cherry picked from commit 4732942427)
2025-04-14 02:02:22 +02:00
Nikita Provotorov
6c8832d26c JBR-7157: Alt+Shift+Enter sends KEY_TYPED Event.
JBR-7336 Any keyboard shortcut with Alt produces a Windows system sound.

* X11 Linux part: disable posting KEY_TYPED events for VK_ENTER if any modifier except { Shift, Control, Lock, Mode Switch (a.k.a. AltGr), NumLock } is being pressed.
* Windows part: begin ignoring WM_SYSCHAR messages as MSDN instructs.
* Add a regression test.

(cherry picked from commit d732718ef7)
2025-04-14 02:02:22 +02:00
Nikita Tsarev
efdd81b050 JBR-6764: Work around IMEs breaking on macOS due to macOS JavaRuntimeSupport not reporting the correct locale in IMEs once after application startup
(cherry picked from commit d982095f1c)
2025-04-14 02:02:22 +02:00
Vitaly Provodin
f111fd0dd8 Update README.md
(cherry picked from commit ca6ad3d091)
2025-04-14 02:02:22 +02:00
Artem Bochkarev
3d6979f6ba JBR-5405: implementation of direct raster loading for VolatileImage
(cherry picked from commit d963035445)
2025-04-14 02:02:22 +02:00
Vitaly Provodin
f15659f84f update exclude list on results of 21.0.3_b479 test runs
(cherry picked from commit 3c65d18f2e)
2025-04-14 02:02:22 +02:00
Vitaly Provodin
870a225c3f fixup! JBR-7263 introduce /othervm for the tests specifying -Djetbrains.runtime.api.extendRegistry=true
(cherry picked from commit b85f46318a)
2025-04-14 02:02:22 +02:00
bourgesl
10751114e1 JBR-7170: fixed NPE if peer is null
(cherry picked from commit a786741193)
2025-04-14 02:02:22 +02:00
Sergey Shelomentsev
0cf2f8436c Set jbr-api version to 1.0.0
(cherry picked from commit fa825aee1d)
2025-04-14 02:02:22 +02:00
Nikita Tsarev
34f0c31663 JBR-7133: JBR API for IME replacement range on macOS
(cherry picked from commit b807d0f946)
2025-04-14 02:02:22 +02:00
Vitaly Provodin
5e1405cec6 update exclude lists removing lines related to fixed issues
(cherry picked from commit 4526475115)
2025-04-14 02:02:22 +02:00
Vitaly Provodin
f31de24780 Update README.md
(cherry picked from commit 48e2248486)
2025-04-14 02:02:22 +02:00
Maxim Kartashev
4c32a1b059 JBR-5761 Make error printing more robust during early stages of VM initialization
(cherry picked from commit 84d95894e4)
2025-04-14 02:02:21 +02:00
bourgesl
a1dccebf76 JBR-7170: added explicit @available for addPresentedHandler()
(cherry picked from commit 7973a4cff4)
2025-04-14 02:02:21 +02:00
bourgesl
9e580fdd54 JBR-7170: implement FPS counters for metal using callbacks from MTLLayer presentHandler
(cherry picked from commit cf06dcc383)
2025-04-14 02:02:21 +02:00
Nikita Gubarkov
aa2700a5c3 JBR-5615 add sun.java2d.logDisplays VM option
It prints to stdout whenever display configuration is changed.

(cherry picked from commit 8eec3188c6)
2025-04-14 02:02:21 +02:00
Nikita Gubarkov
8f86c7d467 JBR-6357 JBR API v3
JBR API frontend is moved into a separate repository.
Rewritten proxy generation, bridges removed, invokedynamic is used instead.
Mapping is now specified using annotations.
Support for extension methods.
Support for arrays and generics.
Added JBR API implementation version.

JBR-7232 Refactor deriveFontWithFeatures & JBRFileDialog JBR API

(cherry picked from commit a4804efa96)
2025-04-14 02:02:21 +02:00
Roman Shevchenko
920c3a183d JBR-7194: extension-based filters in native file dialogs
(cherry picked from commit cf5d136b3e)
2025-04-14 02:02:21 +02:00
Nikita Tsarev
39cd82ede0 JBR-7134: Fix InputMethodTests on macOS
(cherry picked from commit 7a970238af)
2025-04-14 02:02:21 +02:00
Vitaly Provodin
74898827db Update README.md
(cherry picked from commit 6514818b3b)
2025-04-14 02:02:21 +02:00
Dmitrii Morskii
a6f5776572 JBR-7128 Use the correct WmSize event type for JFrame moved to another monitor
author: Sergei Tachenov
(cherry picked from commit 01f1c7e15d)
2025-04-14 02:02:21 +02:00
Vitaly Provodin
887beeb3de Update README.md
(cherry picked from commit 6242827cd1)
2025-04-14 02:02:21 +02:00
Vitaly Provodin
c5e0d8c701 update exclude list on results of 21.0.3_b453.2 test runs
(cherry picked from commit 1bc34d2a51)
2025-04-14 02:02:21 +02:00
Sergey Shelomentsev
893addcb9b JBR-7117 Set initial display mode after test execution
(cherry picked from commit e4530745c2)
2025-04-14 02:02:21 +02:00
Vitaly Provodin
75e3dc65c9 Update README.md
(cherry picked from commit 0e705dc638)
2025-04-14 02:02:21 +02:00
Maxim Kartashev
09246bab9b JBR-7028 Implement FPS counter on Linux
Use -Dawt.window.counters to enable.
To output counters per second to stdout/stderr,
use -Dawt.window.counters=stdout or =stderr.

A counter by the name swing.RepaintManager.updateWindows
is always available for Swing applications, but it does not
accurately correspond to frames per second.

Toolkit-dependent counters provide much better accuracy.
On Wayland with memory buffers as the backend two are available:
java2d.native.frames - frames delivered to the Wayland server
java2d.native.framesDropped - fully formed frames that were not
delivered to the Wayland server

(cherry picked from commit 872e73ed1e)
2025-04-14 02:02:21 +02:00
Vitaly Provodin
03132939c0 Update README.md
(cherry picked from commit 9ace20e1e1)
2025-04-14 02:02:20 +02:00
Dmitry Drobotov
88966a65f6 JBR-6808 Don't create AccessibleJTreeNode for the tree root if it's not visible
* This fixes an issue with AccessibleJTreeNode#getBounds, which adjusts the node's bounds according to the parent node. For nodes whose parent is the invisible root, getBounds was returning null, and it caused issues with assistive technology like macOS Accessibility Zoom.
* Additionally, NVDA will now report correct tree depth levels because the root node won't add to the levels count (JDK-8249806).

(cherry picked from commit f7c47bf3cf)
(cherry picked from commit e785e9e7c9)
2025-04-14 02:02:20 +02:00
Vitaly Provodin
77293aa713 Update README.md
(cherry picked from commit a66b19eb93)
2025-04-14 02:02:20 +02:00
Vitaly Provodin
ba2a1d5baa Update README.md
(cherry picked from commit 68a09733c8)
2025-04-14 02:02:20 +02:00
Vitaly Provodin
1d4684972b update exclude list on results of 21.0.3_b446.1 test runs
(cherry picked from commit a0edd1e725)
2025-04-14 02:02:20 +02:00
Nikita Provotorov
f4821c0351 JBR-6456 Sudden keyboard death on Linux using iBus.
Add a workaround for the iBus's bug which leads to the issue.

(cherry picked from commit b8e9dbf8c9)
(cherry picked from commit 7355948065)
2025-04-14 02:02:20 +02:00
Nikita Tsarev
288189427f JBR-7119: respect replacementRange in IME events on macOS
(cherry picked from commit 09c31a6242)
2025-04-14 02:02:20 +02:00
Dmitrii Morskii
3e2707d015 JBR-6376: implement detecting of OS theme on linux
(cherry picked from commit d8aaa3da47)
2025-04-14 02:02:20 +02:00
Dmitrii Morskii
913fdea344 Revert "JBR-6372: implement detecting of OS theme on linux"
This reverts commit a657e4e2cbce139f2c5b53c7fb5f30d81f99e311.

(cherry picked from commit c626c9f220)
2025-04-14 02:02:20 +02:00
Nikita Gubarkov
58221c38a4 JBR-7046 Tolerate subpixelResolution=0 in Metal and OGL
(cherry picked from commit 28d0f00899)
2025-04-14 02:02:20 +02:00
Maxim Kartashev
ae5d25da57 JBR-5611 Window header is visible but body not on Linux Ubuntu with external display
(cherry picked from commit 96494dd000)
2025-04-14 02:02:20 +02:00
Nikita Gubarkov
7f4d953a87 JBR-7020 Reorder LCD glyph cache freeing and validation
1. As we started committing the command buffer on glyph cache flush, this invalidates the current encoder. We need to `MTLTR_ValidateGlyphCache` after the flush, not before.
2. There's no reason to maintain separate glyph cache invalidation logic for this singe case (which is a no-op in reality), so just free the cache instead.

(cherry picked from commit 891a9c6c52)
2025-04-14 02:02:20 +02:00
Nikita Tsarev
7ba31506d6 Disable flappy KeyCodesTest assertions, see JBR-6888
(cherry picked from commit 7f5dd368e3)
2025-04-14 02:02:20 +02:00
Sergei Tachenov
ecbd85d05f JBR-6984 Fix BoxLayout/NPECheckRequests test
It was initially written and tested on Linux, but it turns out that
on other systems validate() can be called in between init() and start()
calls, which would break the test even though BoxLayout isn't broken.

(cherry picked from commit 6cc237583b)
2025-04-14 02:02:20 +02:00
Ajit Ghaisas
7791c78a20 update exclude list on results of main.2176 test runs
(cherry picked from commit 82a97445bd)
2025-04-14 02:02:19 +02:00
Vitaly Provodin
fbe4746683 introduce jbMuslProblemList.txt exclude list
(cherry picked from commit 17c6238051)
2025-04-14 02:02:19 +02:00
Vitaly Provodin
e8b2075bea update exclude list on results of 21.0.2_b427.6 test runs
(cherry picked from commit e768c854cf)
2025-04-14 02:02:19 +02:00
Sergei Tachenov
ed12d3121b JBR-6771 BoxLayout throws mysterious NPEs due to previous exceptions
The checkRequests method only does layout initialization
if it isn't initialized already. However, when an exception
is thrown during the initialization, the layout may end up
in a half-initialized state.

Fix this by using the field that is initialized the last to check
if the layout is initialized. If that field is null, it may mean
that the layout isn't initialized or that the last attempt
failed midway. Then we try again. This attempt can,
of course, break for the same reason as the previous one,
but in that case we'll at least get a stack trace pointing
to a real cause of the error and not some mysterious NPE
that seems to be impossible from the logic.

The bug is that if we add a component that throws an exception
in one of its methods called by BoxLayout, then the layout may
end up in a half-initialized state that would mistakenly be considered
fully initialized. Then it would try to access some fields
and throw NPE with a stack trace that tells exactly nothing
about what went wrong and where.

This test checks for the presence of this bug by adding a broken
component to a BoxLayout and then un-breaking this component
and checking that an exception is thrown even though the component
is no longer broken.

(cherry picked from commit 8f5eb72836)
2025-04-14 02:02:19 +02:00
Maxim Kartashev
57bf3e94cf JBR-6769 Make it possible to get info whether IDE is running in a virtual env
Added system property intellij.os.virtualization with possible values
"none", "Xen", "KVM", "VMWare", "HyperV"

(cherry picked from commit 92e4311f13)
2025-04-14 02:02:19 +02:00
Nikita Gubarkov
ec5c982e5c JBR-6927 Safe asynchronous destruction of Metal graphics config.
(cherry picked from commit eee433fe5e)
2025-04-14 02:02:19 +02:00
Nikita Gubarkov
3fd4b8611e Fix Windows AWT compilation errors
Frame, Window, FileDialog, CustomTitleBar

(cherry picked from commit 2ada4a575b)
2025-04-14 02:02:19 +02:00
Vitaly Provodin
662059f597 Update README.md
(cherry picked from commit 0ea55b1641)
2025-04-14 02:02:19 +02:00
Vitaly Provodin
72e1681998 JBR-6639 Docker images for JBR/JCEF testing
(cherry picked from commit 1342899218)
2025-04-14 02:02:19 +02:00
Vitaly Provodin
105a1c66e9 JBR-6915 add the option -w into mkimages scripts
(cherry picked from commit 56bb878275)
2025-04-14 02:02:19 +02:00
Alexey Ushakov
1056f60105 JBR-6911 IDE crashes (EXC_BAD_ACCESS) after disconnecting the secondary display if a markdown file is opened (macOS Sonoma 14.4.1)
Corrected invalid usage of dealloc method, fixed memory leaks.

(cherry picked from commit 8697cfb660)
2025-04-14 02:02:19 +02:00
Dmitrii Morskii
6fec6ca83f JBR-6171 removing deadlock related to calling getCurrentServerTime
(cherry picked from commit 5fa4617d38)
2025-04-14 02:02:19 +02:00
Maxim Kartashev
b2b4065a34 JBR-6847 Improve locking performance on Windows
Use -XX:+UnlockExperimentalVMOptions -XX:-UseCriticalSection
to revert to the old behavior

(cherry picked from commit 72ffacf34a)
2025-04-14 02:02:19 +02:00
Vitaly Provodin
d39e85a84d update exclude list on results of 21.0.2_b417.1 test runs
(cherry picked from commit b77ac8db98)
2025-04-14 02:02:19 +02:00
Dmitrii Morskii
12ac63e2bc JBR-6372: implement detecting of OS theme on linux
(cherry picked from commit 1d47383016)
2025-04-14 02:02:18 +02:00
Vitaly Provodin
6340075adb JBR-1668: minor fixes - temporary fix for compilation issue SystemHotkey.m:74:29: error: format string is not a string literal
(cherry picked from commit b6234f5aa7)
2025-04-14 02:02:18 +02:00
Nikita Gubarkov
fdb9181667 JBR-6723 Deal with integer overflow in DrawGlyphList with enabled subpixelResolution
(cherry picked from commit 8b34ae396c)
2025-04-14 02:02:18 +02:00
Vitaly Provodin
b59d8c16cb Update README.md
(cherry picked from commit bdae8e43fb)
2025-04-14 02:02:18 +02:00
Nikita Provotorov
87222a3701 JBR-3112 Linux: Last character issue with Korean.
- Ignores the IM text returned from XmbLookupString/XwcLookupString if the KeyPress event which XmbResetIC was called with was synthetic and the first after a call of XmbResetIC/XwcResetIC.
- Only for the new mode introduced in JBR-2460 (-Djb.awt.newXimClient.preferBelowTheSpot=true): cancel text composing on each mouse press, so that preedit text stops following the caret if it's moving in response to mouse clicks.

(cherry picked from commit 43a9a3a17a)
(cherry picked from commit 156e5d9b65)
(cherry picked from commit 59f0ca804f)
2025-04-14 02:02:18 +02:00
Dmitrii Morskii
2bef2cb107 JBR-6541 Added ability to get supported features and stylistic sets for font
(cherry picked from commit 170e743a13)
2025-04-14 02:02:18 +02:00
Nikita Tsarev
8f52257a08 increase delay in InputMethodTest
(cherry picked from commit 8048ea52f7)
2025-04-14 02:02:18 +02:00
Nikita Tsarev
d25e13a6a1 JBR-6704: Fix extra IME events when a ctrl shortcut causes window focus switch [macOS]
(cherry picked from commit 4d851790cd)
2025-04-14 02:02:18 +02:00
Nikita Tsarev
9338dd5895 JBR-6331: Fix some memory safety issues in macOS keyboards
(cherry picked from commit 0f9ba8771f)
2025-04-14 02:02:18 +02:00
Nikita Tsarev
099d0a6f37 JBR-6028: Check before attempting to switch to a layout that might not exist in KeyCodesTest
(cherry picked from commit 421dd1fa69)
2025-04-14 02:02:18 +02:00
Nikita Tsarev
d1795317cf InputMethodTest: fix certain IMEs not being added properly
(cherry picked from commit 621a5e37d6)
2025-04-14 02:02:18 +02:00
Nikita Tsarev
ec92b84def JBR-5379: Ignore input events only on permament focus loss
(cherry picked from commit ca8aebd211)
2025-04-14 02:02:18 +02:00
Nikita Tsarev
f3e4ef641a JBR-5630: vmoption to change dead key reporting behavior on macOS
(cherry picked from commit aeb6569d4c)
2025-04-14 02:02:18 +02:00
Nikita Tsarev
0dceab23b2 JBR-5469: Fix NextAppWinKey behavior with certain keys
(cherry picked from commit 9a1d6d1813)
2025-04-14 02:02:18 +02:00
Nikita Tsarev
57747b4de8 JBR-5558: macOS keyboard rewrite 2
(cherry picked from commit 81f3819f4e)
2025-04-14 02:02:17 +02:00
Nikita Tsarev
1dc8d4d395 JBR-5295: Fix wrong keycodes for non-letter keys that lack a corresponding VK_ constant on macOS
(cherry picked from commit 3c42e56d93)
2025-04-14 02:02:17 +02:00
Nikita Tsarev
052da5ca4b JBR-5254: Fix Caps Lock not working properly on certain Chinese IMs
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit be64a4f3d0)
2025-04-14 02:02:17 +02:00
Nikita Tsarev
4210c87853 Revert "8230926: [macosx] Two apostrophes are entered instead of one with "U.S. International - PC" layout"
This reverts commit 5049cad2b0.

After JBR-5173 this workaround is no longer necessary

(cherry picked from commit fbb7ba8c0b)
2025-04-14 02:02:17 +02:00
Nikita Tsarev
681bf62617 JBR-5233 Setup/teardown necessary keyboard layouts in macOS keyboard tests
(cherry picked from commit 1fa48463f2)
2025-04-14 02:02:17 +02:00
Nikita Tsarev
777825be70 JBR-5173 macOS keyboard support rewrite
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 88c281a243)
2025-04-14 02:02:17 +02:00
Nikita Tsarev
6f61e45ac1 Revert "macOS national keyboard support"
This reverts commit 21bffd06bc.

(cherry picked from commit 7806ef7ff3)
2025-04-14 02:02:17 +02:00
Nikita Provotorov
27cd9fdcfb JBR-5107, JBR-5114: SIGILL/OOM from Java_sun_lwawt_macosx_LWCToolkit_getKeyboardLayoutNativeId.
A theoretical fix, it should:
- Catch any NSException (as it was initially expected);
- Probably fix possible memory leaks (by moving the layoutId var inside autoreleasepool).

(cherry picked from commit ae9520ce4f)
2025-04-14 02:02:17 +02:00
Nikita Tsarev
330aa8dea3 JBR-4990: Undo changes to ExtendedKeyCodes
(cherry picked from commit 823086623e)
2025-04-14 02:02:17 +02:00
Nikita Tsarev
32c60b81b6 JBR-3860: Fix shortcut behavior when Shift is the only modifier
(cherry picked from commit e419730031)
2025-04-14 02:02:17 +02:00
Nikita Tsarev
ca4a761152 JBR-4990: Fix regression tests for national keyboard layouts on macOS
(cherry picked from commit 5835150f63)
2025-04-14 02:02:17 +02:00
Vitaly Provodin
b0eb3d9bb1 update exclude list on results of 21.0.2_b393.7 test runs
(cherry picked from commit a396e62035)
2025-04-14 02:02:17 +02:00
Nikita Gubarkov
130d7f415c JBR-6723 flush vertex cache and command buffer before freeing glyph cache. (#334)
(cherry picked from commit 1faccf3995)
2025-04-14 02:02:17 +02:00
Alexey Ushakov
2a0634a227 JBR-6785 wsl: update build scripts for linux target
Added explicit platform target

(cherry picked from commit 3b96e66202)
2025-04-14 02:02:17 +02:00
Vitaly Provodin
68e3febb13 Update README.md
(cherry picked from commit 74b00b6c2f)
2025-04-14 02:02:16 +02:00
Vitaly Provodin
248b4ef9f3 Update README.md
(cherry picked from commit 163ce4ecce)
2025-04-14 02:02:16 +02:00
Maxim Kartashev
0bfd171423 JBR-6742 Record resident set size in JVM fatal error log
(cherry picked from commit 5cc72b464b)
2025-04-14 02:02:16 +02:00
Alexey Ushakov
38bd30ab9c JBR-6522 macOS: SIGSEGV at [libawt_lwawt.dylib+0x8eaa8] MTLGC_DestroyMTLGraphicsConfig
Fix of MT access to shared data in MTLGraphicsConfigInfo

(cherry picked from commit ecc46c6004)
2025-04-14 02:02:16 +02:00
Dmitry Drobotov
b5a39c4199 JBR-6593 Fix UI freezes with JAWS announcements
* Execute AccessibleAnnouncer.nativeAnnounce on a background thread on Windows to fix UI freezes. IntelliJ calls this method from EDT, but it doesn't need to run on EDT because on Windows it simply calls screen readers API without interacting with UI components. Additionally, when using a background thread, the JAWS SayString method, which previously could have been running for multiple seconds, is now executed immediately as expected, but the root cause of previous delays is unclear.
* In JawsAnnouncer, initialize COM library with the multithreaded model to allow executing it from different threads. Now COM is initialized and uninitialized on every call of the method as required by the [documentation](https://learn.microsoft.com/en-us/windows/win32/learnwin32/initializing-the-com-library): "Each thread that uses a COM interface must make a separate call to this function. For every successful call to CoInitializeEx, you must call CoUninitialize before the thread exits". IJawsApi COM object is still static and reused by different threads, which is allowed with a multithreaded concurrency model. It shouldn't cause issues because it has no state and only forwards calls to JAWS.

(cherry picked from commit 8cc4cd5cfd)
(cherry picked from commit d7d8d9b8e4)
(cherry picked from commit 8bfd24f89f)
2025-04-14 02:02:16 +02:00
Vitaly Provodin
30528e00fe update exclude list linux-x86 failures
(cherry picked from commit 264bcf41f9)
2025-04-14 02:02:16 +02:00
Vitaly Provodin
b0b27b1832 update exclude list on results of 22_b2075 test runs
(cherry picked from commit 37a71238b2)
2025-04-14 02:02:16 +02:00
Vitaly Provodin
e76d29dcb3 update exclude list - remove failures no having tickets
(cherry picked from commit 4d11023858)
2025-04-14 02:02:16 +02:00
Nikita Provotorov
dc27570498 JBR-3697: Letter-based command mode actions are not triggered when using Chinese input method.
Fixes different platform-specific issues with disabling/enabling input methods support via java.awt.Component#enableInputMethods(boolean):
* Windows: disabling used to require to deactivate and then activate back the app window to be performed completely ;
* macOS: disabling used to leave the input method window visible (however, it wasn't affecting the input) ;
* Linux: with fcitx5 IMF (may not be reproduced with iBus) disabling and then enabling back the input method support used to reset the used input source (keyboard layout) to a default one. It's done via disabling the current XIM when the input method support is disabled instead of disposing it .

(cherry picked from commit 2933ea89f0)

The patch also contains the fix for "JBR-6711: java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java: JButton JPanel not collected."

It unsets its references to tracked components thus not preventing GC from collecting them.

(cherry picked from commit e9aab98a6c)
(cherry picked from commit 13284aa508)
2025-04-14 02:02:16 +02:00
Dmitry Drobotov
91154f492e JBR-6325 Implement keyboard focus tracking for macOS Accessibility Zoom
* Call UAZoomChangeFocus function when the keyboard focus is changed or when an accessible selection event is fired. Zoom viewport fill follow the accessible frame of the newly focused component, and if it has a selected child, its frame will be passed as part that needs to be highlighted.
* Fix an exception in ComboBoxAccessibility.accessibilitySelectedChildren when its selection is nil. This happens when a combo box doesn't have a selected item, and it this case Zoom wouldn't be able to follow the combo box location.
* Move the native handler of CAccessibility.focusChanged method from the legacy JavaComponentAccessibility to the new CommonComponentAccessibility class. It calls a class method (like a static method in Java), so there is no difference in which specific class it's located, but it allows to write the new code in the appropriate class.

(cherry picked from commit 75b06421ff)
(cherry picked from commit d0f47ced65)
2025-04-14 02:02:16 +02:00
Vitaly Provodin
df4f01543e Update README.md
(cherry picked from commit b93b6a39fc)
2025-04-14 02:02:16 +02:00
Dmitrii Morskii
715ffe53ca JBR-5500 Handled situation of processing WM_ENDSESSION in process of closing application
(cherry picked from commit c87b70ad46)
2025-04-14 02:02:16 +02:00
Vitaly Provodin
5bf3bd5dfe Update README.md
(cherry picked from commit 588d57f140)
2025-04-14 02:02:16 +02:00
Dmitry Drobotov
3d47f61136 JBR-6472 Add default value in CAccessibility.isComboBoxEditable to avoid NPE
(cherry picked from commit 93937603b3)
(cherry picked from commit 6a70aebb6b)
2025-04-14 02:02:16 +02:00
Alexey Ushakov
dfba1a620d JBR-6612 Provide standard scripts for performance measurements
run_rp.sh - additional checks

(cherry picked from commit e1cf099c09)
2025-04-14 02:02:15 +02:00
Maxim Kartashev
f7426aabfb JBR-6246 Do not overwrite CDS archives after created with jlink
(cherry picked from commit 457e760872)
2025-04-14 02:02:15 +02:00
Alexey Ushakov
424722d6cb JBR-6612 Provide standard scripts for performance measurements
Initial implementation for linux and macOS

(cherry picked from commit fe09bf671b)
2025-04-14 02:02:15 +02:00
Nikita Tsarev
514fe1be2e JBR-6297: Don't check for NSInputManager wantsToHandleMouseEvents in mouseDown by default
(cherry picked from commit c08268def6)
2025-04-14 02:02:15 +02:00
Maxim Kartashev
b929d187d0 Update README.md with up-to-date build instructions
(cherry picked from commit 695d0a0577)
2025-04-14 02:02:15 +02:00
Vitaly Provodin
4a1c46dd8d Update README.md
(cherry picked from commit 22f4dd6d4a)
2025-04-14 02:02:15 +02:00
Vitaly Provodin
bede70b227 Update README.md
(cherry picked from commit c6cc4d76c1)
2025-04-14 02:02:15 +02:00
Alexey Ushakov
50b418819c JBR-6522 macOS: SIGSEGV at [libawt_lwawt.dylib+0x8eaa8] MTLGC_DestroyMTLGraphicsConfig
Performing flush of pending rendering operation before destroying MTLGraphicsConfig

(cherry picked from commit b25bd3ac13)
2025-04-14 02:02:15 +02:00
Nikita Gubarkov
b2c1b6c9e2 JBR-4618 Force window size update after display reconfiguration
- Re-create all GraphicsDevices on displayChanged()

(cherry picked from commit a59d4903b2)
2025-04-14 02:02:15 +02:00
Dmitrii Morskii
8e156519f9 JBR-6671 added option 'freetype.font.rendering'
(cherry picked from commit a24c5bbcdb)
2025-04-14 02:02:15 +02:00
Dmitrii Morskii
a20d24decb Revert "JBR-6346 update Inter font version"
This reverts commit 7712e529330674b83e39c8e81701db32436d42dc.

(cherry picked from commit 1752433479)
2025-04-14 02:02:15 +02:00
bourgesl
d22c86b41a Revert "JBR-6522: ensure thread-safety in MTLGC_DestroyMTLGraphicsConfig (pthread_mutex_t)"
This reverts commit e7e3638c52.

(cherry picked from commit a2ee33a45a)
2025-04-14 02:02:15 +02:00
bourgesl
e3503468da JBR-6522: ensure thread-safety in MTLGC_DestroyMTLGraphicsConfig (pthread_mutex_t)
(cherry picked from commit 3ddc59a433)
2025-04-14 02:02:15 +02:00
Vitaly Provodin
14aa8c85ae JBR-6649 add synchronization for creating UI
(cherry picked from commit 9618df8e14)
2025-04-14 02:02:15 +02:00
Nikita Gubarkov
51d4133a80 JBR-6651 Exclude keycap emoji from EmojiVariation test.
(cherry picked from commit bb1926d974)
2025-04-14 02:02:14 +02:00
Vitaly Provodin
8adeec0209 update exclude list on results of 22_b2014 test runs
(cherry picked from commit 99eb375cfd)
2025-04-14 02:02:14 +02:00
Vitaly Provodin
02dd2c650a JBR-6620 restore displayMode to the state that was before running the test
(cherry picked from commit 285d3d3860)
2025-04-14 02:02:14 +02:00
Dmitrii Morskii
aabe9872e3 JBR-6346 update Inter font version
(cherry picked from commit 30820c33ba)
2025-04-14 02:02:14 +02:00
Vitaly Provodin
edd3fa0da1 Update README.md
(cherry picked from commit 4fef254b44)
2025-04-14 02:02:14 +02:00
Vitaly Provodin
ca0b02732e remove resolved issues from exclude list
(cherry picked from commit 1bdef4e67a)
2025-04-14 02:02:14 +02:00
Vitaly Provodin
3979c83178 Update README.md
(cherry picked from commit 888e8bda45)
2025-04-14 02:02:14 +02:00
Dmitrii Morskii
54f3a39d71 JBR-6604 supported case when fonts directory is missing
(cherry picked from commit a622888816)
2025-04-14 02:02:14 +02:00
Aleksey Shipilev
9f0dfb4dac update exclude list on results of main.2003 test runs
(cherry picked from commit 2f441c0a3b)
2025-04-14 02:02:14 +02:00
Vitaly Provodin
72d64e90f7 JBR-6591 specify values for the configure options --with-vendor-url and --with-vendor-bug-url
(cherry picked from commit b7f236be6b)
2025-04-14 02:02:14 +02:00
Dmitry Batrak
3bdc0fd003 JBR-6449 Introduce FontMetricsAccessor into JBR API
JBRE-MR-368

(cherry picked from commits f0d5a907ac, 5befaea6af, ea2c4bfc83, 04601189604827c115a5a3b36aa268ba5c39ef3dб 20468cf28b)

(cherry picked from commit bb67fc186a)
2025-04-14 02:02:14 +02:00
Vitaly Provodin
f1f72dbde2 JBR-6558 synchronize drawing and the test checking
(cherry picked from commit a8f38d8682)
2025-04-14 02:02:14 +02:00
Vitaly Provodin
a30f242724 JBR-6556 add saving screenshots for analysis of test failures
(cherry picked from commit 9330ab5416)
2025-04-14 02:02:14 +02:00
Vitaly Provodin
55c2c501d9 update exclude list on results of 21.0.1_b334 test runs
(cherry picked from commit f4c811c548)
2025-04-14 02:02:14 +02:00
Dmitrii
3f7196467c JBR-3098 move repaintPeer event from AppKit thread to EDT on macos
(cherry picked from commit 11d3e5414f)
2025-04-14 02:02:13 +02:00
Nikita Gubarkov
db31fc49e3 JBR-6264 Improved coordinate conversion in XWayland mode
(cherry picked from commit 9c96ecd2f7)
2025-04-14 02:02:13 +02:00
bourgesl
90b988ec09 JBR-6505: removed extra setNeedDisplay() in startRedrawIfNeeded() to restore JavaDraw performance (more frames rendered than real vsync FPS)
(cherry picked from commit d046741a56)
2025-04-14 02:02:13 +02:00
Vitaly Provodin
084713eb82 update exclude list on results of 21.0.1_b331.1 test runs
(cherry picked from commit 4d755ad656)
2025-04-14 02:02:13 +02:00
Vitaly Provodin
7adaf51250 JBR-5863 add verbose mode thata saves the captured image
(cherry picked from commit b83c0ddca7)
2025-04-14 02:02:13 +02:00
Vitaly Provodin
aae3f80660 JBR-6493 add jtreg test
(cherry picked from commit 96ee046fdc)
2025-04-14 02:02:13 +02:00
Vitaly Provodin
6dd5b5e94e update exclude list on results of 23_b1960 test runs
(cherry picked from commit f36606576d)
2025-04-14 02:02:13 +02:00
Dmitrii Morskii
342669cf99 Revert "JBR-6346 update Inter font version"
This reverts commit 9aa690a94e.

(cherry picked from commit c97c8eb5fd)
2025-04-14 02:02:13 +02:00
bourgesl
8b70f5234d JBR-6241: RenderPerf 23.12: remove older RenderPerfTest in src
(cherry picked from commit eeae9a1cb2)
2025-04-14 02:02:13 +02:00
Vitaly Provodin
64c8387063 JBR-6454 add synchronization at disposing windows
(cherry picked from commit 48bc9affc9)
2025-04-14 02:02:13 +02:00
bourgesl
f7cf3c329b JBR-6377: fixed MTLLayer.redrawCount = 1 to avoid extra redraws with multiple windows
(cherry picked from commit 52610b9bf2)
2025-04-14 02:02:13 +02:00
Maxim Kartashev
db97f0ba4e JBR-6340 Popups displayed shifted after moving IDE to another monitor via shortcut with auto-maximize enabled in Mutter
Windows no longer change their "native" size when moved between monitors
with different scale on Linux. Use -Dresize.with.scale=true to revert
that.

(cherry picked from commit 637d67cbfe)
2025-04-14 02:02:13 +02:00
Nikita Gubarkov
9fdd80d548 JBR-5837 retrieve up-to-date default screen device in FullscreenWindowProps test.
Calling setDisplayMode() or setFullScreenWindow() may cause display reconfiguration.

(cherry picked from commit 5e26eb9730)
2025-04-14 02:02:13 +02:00
Alexey Ushakov
fa7d0ee13a JBR-6433 Rounded corners of popups disappear after a while
Removed opacity from CAMetalLayer for layers with rounded corners

(cherry picked from commit e9bf36f41a)
2025-04-14 02:02:13 +02:00
Alexey Ushakov
f95a784e2d JBR-5621 Test failures with -Dsun.java2d.metal.displaySync=false
Created intermediate buffer in the MTLLayer
Implemented frame separation of window updates for AWT and Swing
Remove frame delays as they greatly affect throughput
Fixed test/jdk/sun/java2d/GdiRendering/ClipShapeRendering.java
Resolved crash on multi-GPU systems

(cherry picked from commit 20bf935c82)
2025-04-14 02:02:12 +02:00
Dmitrii Morskii
0df5b283cb JBR-6346 update Inter font version
(cherry picked from commit 37ac0f2c3d)
2025-04-14 02:02:12 +02:00
Nikita Provotorov
eb883eb01f JBR-4687: Japanese IME input window hides what is being typed.
Uses CFS_EXCLUDE instead of CFS_CANDIDATEPOS in the ::ImmSetCandidateWindow() native API, which is more powerful and allows to take into account the issue's case.

(cherry picked from commit 0afe6c37bb)
(cherry picked from commit fa3d03b373)
2025-04-14 02:02:12 +02:00
Vitaly Provodin
59d3c7ffa1 JBR-6404 synchronize drawing and the test checking
(cherry picked from commit e763bb96ea)
2025-04-14 02:02:12 +02:00
Vitaly Provodin
cced1ec57c JBR-3902 create jbr_all test group
(cherry picked from commit 104bd3086a)
2025-04-14 02:02:12 +02:00
Maxim Kartashev
c0c2cbceb7 JBR-6002 Linux: maximized window goes fullscreen after being moved between monitors
(cherry picked from commit 83c4c0364698f5bfb682d715bbe4ac70d50f11b3)
(cherry picked from commit 41dde53a30)
2025-04-14 02:02:12 +02:00
ngubarkov
55271e216e JBR-5605 ignore empty client area when syncing bounds in XDecoratedPeer.
(cherry picked from commit d2301edbd0de04747817a2d382f587056d954627)
(cherry picked from commit b694ce0e9a)
2025-04-14 02:02:12 +02:00
ngubarkov
cde2f003c0 JBR-5438 Fix window bounds in XWM#setShellResizable
(cherry picked from commit 0aee99ac703f3b360277293e6e7a2e1aadfaba33)
(cherry picked from commit 637e8e473e)
2025-04-14 02:02:12 +02:00
ngubarkov
a158fba0e4 JBR-5265 Workaround incorrect position of content window in queryXLocation.
(cherry picked from commit 26684fd4c761dcd2a4c93673d7732095a2050c9b)
(cherry picked from commit 4f44486d15)
2025-04-14 02:02:12 +02:00
ngubarkov
a309cd2289 JBR-5417 Fix flickering in multi-monitor setups on Linux.
(cherry picked from commit 9b813e21c361e9e4b97c52bdd8eccef0030a7763)
(cherry picked from commit d0fa8194dd)
2025-04-14 02:02:12 +02:00
Dmitry Batrak
9551d39b92 JBR-5095 Incorrect initial window's location under GNOME
(cherry picked from commit 6995ce47fd)

with fix for JBR-5189 Can't exit fullscreen mode on ubuntu 22.10

(cherry picked from commit b933660cf1)
(cherry picked from commit f4ea24e18d8e6f4cb0420e30344a5cd3f000c021)
(cherry picked from commit 0ee3854a3a)
2025-04-14 02:02:12 +02:00
Sergey Shelomentsev
e8a9b6fe97 JBR-6354 fix custom title bar tests to avoid failure in MacOS 14 fullscreen mode
- moved common logic to a separate part
- moved parts of tests to swing package

(cherry picked from commit 80b6e4ba8cad4c19b0f306ccd64dad9c085a8bab)
(cherry picked from commit 22d1e57928)
2025-04-14 02:02:12 +02:00
Nikita Provotorov
888601e85b JBR-6125: macOS14 java/awt/Window/Grab/GrabTest.java Frame can't be focused.
Fixes a data race in the test.

(cherry picked from commit ca5562225a)
(cherry picked from commit 1ba73c8aaf430ca4c6e8302d1bcee8681aa8584d)
(cherry picked from commit cfbb5e642e)
2025-04-14 02:02:12 +02:00
Vitaly Provodin
60d50cff7c update exclude list on results of 22_b1930 test runs
(cherry picked from commit def4d8ad64e4b1fea76ace0d9014c1a063e44891)
(cherry picked from commit 32327c3f64)
2025-04-14 02:02:12 +02:00
Vladimir Kharitonov
1033e33a9d RDCT-766 add libwayland-cursor.so to ResolveSymbolsTestMinEnv
(cherry picked from commit 9626cc17447b96e8b4a16908f349e682525e3090)
(cherry picked from commit 09d1ab6ca20b51a46dad120ac044346bb2a8d48e)
(cherry picked from commit b3d3fc5bc0)
2025-04-14 02:02:11 +02:00
Vladimir Kharitonov
38dbd7969a JBR-6272 add resolve symbols tests
(cherry picked from commit a4acdf005c53b1765ad356a740d4569db70e8b02)
(cherry picked from commit 9178b241d5d706c7628d5ebfac0fff8b54029b97)
(cherry picked from commit 262cccdd23)
2025-04-14 02:02:11 +02:00
Vitaly Provodin
fc4b7555ec JBR-6246 add (re)generating cds archives at jlink step
(cherry picked from commit 5f1b08c70d)
2025-04-14 02:02:11 +02:00
Nikita Gubarkov
addea24447 Emoji PR sync (experimental)
- Removed font fallback hacks.
- Changed composite font glyph code encoding scheme, refactored to use Font2D instead of PhysicalFont.
- New Emoji logical font type with 2 underlying physical fonts.
- Removed getGlyphVectorOutline - it's unused and broken.
- Got rid of charsToGlyphs[NS] boilerplate.
- Moved emoji tests to separate directory.

(cherry picked from commit 485bdd1d1a)
2025-04-14 02:02:11 +02:00
Sergey Shelomentsev
037e7f494b Don't trigger workflow on push
(cherry picked from commit d900720a03)
2025-04-14 02:02:11 +02:00
Dmitrii Morskii
05e6721ab8 JBR-5724: fixed serialization and backward compatibility of Font
(cherry picked from commit 120cac9145)
2025-04-14 02:02:11 +02:00
Alexander Lobas
0a891723a5 JBR-4834 JBR-5139 Rounded corners on Mac OS and Windows: support custom border color
(cherry picked from commit 936f47d811)
2025-04-14 02:02:11 +02:00
Dmitrii Morskii
f7caf9bd86 JBR-6044 handle absence of fontConfig library in setupRenderingFontHints
(cherry picked from commit 6d41e07ffa)
2025-04-14 02:02:11 +02:00
Dmitrii Morskii
5e5d371a96 JBR-6041 started using correct type inside FcPatternGetValueFuncType
(cherry picked from commit fc2b096811)
2025-04-14 02:02:11 +02:00
Dmitrii Morskii
75798800d6 JBR-6018 removed incorrect test testFeaturesZeroFrac
(cherry picked from commit e387761828)
2025-04-14 02:02:11 +02:00
Dmitrii
47799b7fbf JBR-5502: optimize stringWidth & charsWidth methods of FontDesignMetrics
(cherry picked from commit b9eb40284f)
2025-04-14 02:02:11 +02:00
Dmitrii Morskii
1725206d40 JBR-5844: fixed other part of issue. Added missing implementation of native methods in fontconfigmanager
(cherry picked from commit dbd70b4401)
2025-04-14 02:02:11 +02:00
Alexey Ushakov
98dfbeb727 8311917: MAP_FAILED definition seems to be obsolete in src/java.desktop/unix/native/common/awt/fontpath.c
Reviewed-by: prr
(cherry picked from commit f2b83e89a0)
2025-04-14 02:02:11 +02:00
Dmitrii Morskii
b92079edd0 JBR-5844: fix case with non-scalable face
(cherry picked from commit 490080a315)
2025-04-14 02:02:11 +02:00
Dmitrii Morskii
93c1935b39 JBR-5804: refactoring of freetypeScaler and moving fontconfig's logic in separate file
(cherry picked from commit 4700386a2e)
2025-04-14 02:02:10 +02:00
Dmitrii
b79b1f70fe JBR-5246 add OpenType's features support
(cherry picked from commit a2900b0bd9)
2025-04-14 02:02:10 +02:00
Dmitry Batrak
4029bace50 JBR-5751 java/awt/Focus/RowToleranceTransitivityTest.java: Focus got stuck while traversing.
(cherry picked from commit d56b4b045d)
2025-04-14 02:02:10 +02:00
Vitaly Provodin
485d8d6d00 JBR-5286 make windows-aarch64 building script identical to the same script in jbr17
(cherry picked from commit a451d19108)
2025-04-14 02:02:10 +02:00
Vitaly Provodin
2231f515b4 update jetbrains.api hash and API version
(cherry picked from commit 2a53bf894c)
2025-04-14 02:02:10 +02:00
Vitaly Provodin
9ce897b806 Revert "JBR-5724: fixed serialization and backward compatibility of Font"
This reverts commit c5cc5b4dedbdf73871f14db92afaac15fd985d86.

(cherry picked from commit 34ed77394f)
2025-04-14 02:02:10 +02:00
Vitaly Provodin
905932a042 JBR-6246 add default CDS archives into jbrsdk distributions
(cherry picked from commit f103a46a4d)
2025-04-14 02:02:10 +02:00
Dmitry Drobotov
c4a42c4d99 JBR-4479 Add text caret tracking for macOS Accessibility Zoom
(cherry picked from commit 0dfbf34b37)
(cherry picked from commit 29ce00912d)
2025-04-14 02:02:10 +02:00
Dmitry Drobotov
d1b77e8412 JBR-6194 Fix VoiceOver reading old JComboBox value after changing it
1. Remove `value == nil` check in ComboBoxAccessiblity.accessibilityValue to fix the issue with not updated value of combo box. With `value == nil` check, the value was not reassigned on every get request of `accessibilityValue`, but only on get `accessibilitySelectedChildren`. When changing focus by Tab, only get `accessibilityValue` is called, and because `value` is already not nil, an old value was returned.

2. Set combo box role to NSAccessibilityPopUpButtonRole if it's not editable. Setting role to popup button fixes the bug when combo box value was not updated when using VO cursor navigation. Native MacOS non-editable combo boxes and non-editable HTML <select> elements also have the "popup button" role instead of "combo box", so the role should become more clear. Popup button role additionally enables opening the combo box menu with VO+Space shortcut, and changes VO instructions to be more appropriate when combo box is focused.

3. Add test for VoiceOver-specific issues of JComboBox.

(cherry picked from commit 8982db51d7)
(cherry picked from commit aebfb1439e)
2025-04-14 02:02:10 +02:00
Vitaly Provodin
2ab5d8dafb Update README.md
(cherry picked from commit 053f3acae4)
2025-04-14 02:02:10 +02:00
Maxim Kartashev
19e41e3825 JBR-6220 javax/swing/GraphicsConfigNotifier/StalePreferredSize.java became failing by time out on Linux
(cherry picked from commit 3f78590707)
2025-04-14 02:02:10 +02:00
Maxim Kartashev
945467df0e JBR-6142 Impossible to move/resize IDE window after restart if several projects were initially opened on secondary monitor
Announce to Mutter that we are "client-decorated" when a Frame is
undecorated by setting _GTK_FRAME_EXTENTS to all zeroes.
This prevents Mutter from applying certain harmful heuristics.

(cherry picked from commit c5a34ea526)
2025-04-14 02:02:10 +02:00
Maxim Kartashev
7a00a01109 JBR-5971 Wayland: support WindowMove JBR API
Updated the XToolkit implementation to match API changes required for
WLToolkit

(cherry picked from commit 7492c11138)
2025-04-14 02:02:10 +02:00
Maxim Kartashev
1724ed8d2c JBR-5777 isWindowMoveSupported() doesn't work with non-default GraphicsEnvironment
Co-authored-by: Nikita Gubarkov <nikita.gubarkov@jetbrains.com>
(cherry picked from commit 4496757a35)
2025-04-14 02:02:10 +02:00
Maxim Kartashev
7c092dc23b JBR-5637 Linux: implement window position change with WM help
Introduced JBR.isWindowMoveSupported() and
JBR.getWindowMove().startMovingTogetherWithMouse()

(cherry picked from commit 747bc94e8f)
2025-04-14 02:02:09 +02:00
Maxim Kartashev
9e369636e1 JBR-5084 Add ability to log additional data to jstack output
The data can be provided via this JBR API call:
JBR.getJstack().includeInfoFrom(Supplier<String>)

(cherry picked from commit 5244ec31f9)
2025-04-14 02:02:09 +02:00
Alexander Lobas
a4020bb001 JBR-5546 Iterating open windows with cmd backtick on Mac forces minimized windows to un-minimize
(cherry picked from commit ffb74e32a0)
2025-04-14 02:02:09 +02:00
Alexander Lobas
815a0f11e2 JBR-5478 IDEA window doesn't fit the screen properly on turning off/on an external monitor
(cherry picked from commit 24930c2624)
2025-04-14 02:02:09 +02:00
Alexander Lobas
f0af39949f JBR-5384 New UI: window header is hard to resize on the top edge, top/right corner
(cherry picked from commit c4dd01c027)
2025-04-14 02:02:09 +02:00
Alexander Lobas
1344caa4e4 JBR-5174 Opening project as tabs in Mac OS (version2)
JBR-5023 Configure TabbingIdentifier during create native window
JBR-5256 IDEA window resizes to zero height when exit full-screen mode with new window controls enabled
JBR-5197 Window control buttons are not visible in full-screen mode in dark themes when IDE window is focused
JBR-5175 jb/java/awt/Window/FullScreenTwoFrames.java: -[AWTWindow resetWindowFullScreeControls]: unrecognized selector sent to instance 0x60000232d5f0
JBR-5499 Window control buttons bugfix
JBR-4462 BigSur: project tab does not gain focus when click it after focusing another app

(cherry picked from commit 4aa2061ab6)
2025-04-14 02:02:09 +02:00
Dmitry Batrak
5a0aef85f1 JBR-5300 Change source code and test files to use GPL license
fix copyright profile in generated IDE project

(cherry picked from commit 43ebbe3cd1)
(cherry picked from commit 39d49c5abe)
2025-04-14 02:02:09 +02:00
Nikita Gubarkov
ef74891163 JBR-5124 Rewrite custom decorations support
JBR API v0.0.8
Added new WindowDecorations API, deprecated old CustomWindowDecoration.

JBR-4641 JBR-4630 Fix client area calculation with custom decorations on Windows.

- Window insets are rounded up, which causes visible & unusable border in fullscreen on some scales, round down instead.

- Clipping in Swing components sometimes cuts what it shouldn't, fixed.

(cherry picked from commit 03d850e722)
2025-04-14 02:02:09 +02:00
Vitaly Provodin
a9aae6f545 update exclude list on results of 21.0.1_b293.1 test runs
(cherry picked from commit a247590ca0)
2025-04-14 02:02:09 +02:00
Nikita Provotorov
5b27ec34b5 JBR-6282: java/awt/TextArea/TextAreaEditing/TextAreaEditing.java intermittently fails due to deadlock.
Makes the test invoke any UI-operation on EDT only (since AWT doesn't guarantee thread-safety of UI operations, see more at https://mail.openjdk.org/pipermail/client-libs-dev/2023-November/016172.html).

(cherry picked from commit 8dbb889509)
(cherry picked from commit 559ec0c370)
2025-04-14 02:02:09 +02:00
Maxim Kartashev
b0fa71dbd4 JBR-6291 runtime/cds/appcds/dynamicArchive/TestDynamicDumpAtOom.java: Attempting to acquire lock OOMEStacks_lock/safepoint out of order
(cherry picked from commit c8c8881be4)
2025-04-14 02:02:09 +02:00
Alexander Lobas
e04752c97d JBR-5409 "No Print Service Found" Error when saving to PDF
(cherry picked from commit 9c9859ba1a)
2025-04-14 02:02:09 +02:00
Alexey Ushakov
4551d3c5d3 JBR-6281 Remove MTLEvent sync from Metal rendering code
Removed sync code

(cherry picked from commit 660d97005c)
2025-04-14 02:02:09 +02:00
Nikita Provotorov
74d6232d13 JBR-2460: Wrong position of input window and no input preview with fcitx and ubuntu 13.04.
This patch makes the fix of JBR-1573 (which caused JBR-4394) disabled by default, because it's incompatible with the native below-the-spot mode (a.k.a. over-the-spot in the X11's terminology).

(cherry picked from commit 3fe2a97aa0)
(cherry picked from commit fc3ce96788)
2025-04-14 02:02:08 +02:00
Nikita Provotorov
051e020270 JBR-2460: Wrong position of input window and no input preview with fcitx and ubuntu 13.04.
- introduces and integrates jbNewXimClient: a new implementation of XIC creation routine (it's mostly refactoring and generalizing of AWT's existed code). Enabled by default and can be disabled via a new system property -Djb.awt.newXimClient.enabled=false ;
- introduces support of the X11's native over-the-spot input method style (it's almost the same as AWT's below-the-spot mode, but the input method's windows are drawn externally, not by AWT). Enabled by default and can be disabled via a new system property -Djb.awt.newXimClient.enabled=false. Doesn't work if -Djb.awt.newXimClient.enabled=false is set ;
- introduces sun.awt.X11.XInputMethod.ClientComponentCaretPositionTracker class that tracks all kind of events for the current client component that can lead to the caret position changing ;
- makes the XInputMethod class to update the input window's position (whenever the ClientComponentCaretPositionTracker discovers that's necessary) by setting the X11's XNSpotLocation property .

Check out the branch nprovotorov/backups/JBR-2460_wrong-position-of-input-window-and-no-input-preview for more granular patches.

(cherry picked from commit c57030a2ef)
(cherry picked from commit 56d9759667)
2025-04-14 02:02:08 +02:00
Maxim Kartashev
cc36ffde09 JBR-6193 Impossible to resize snapped IDE when native header is turned off
Drop the maximized state right before the resize operation for
undecorated windows.

Also fixes setExtendedState() to work when changing snapped window's state
(MAXIMIZED_HORIZ or MAXIMIZED_VERT) to NORMAL.

(cherry picked from commit a9a227c5ab)
2025-04-14 02:02:08 +02:00
Nikita Provotorov
3481a143bc JBR-5980: Pasting from clipboard not working reliably in Windows.
(also contains the fix of JBR-6267 Image retreived from the Clipboard is not the same image that was set to the Clipboard)

- Adds a way to disable caching of the data placed into the clipboard. The behavior is controlled by the system property "awt.windows.clipboard.cache.disabled" (=false by default) ;
- Whenever the app gets focus additionally checks if another app has modified the clipboard. The behavior is controlled by the system property "awt.windows.clipboard.extraOwnershipChecksEnabled" (=true by default) .

(cherry picked from commit e6f4a25b1a)
2025-04-14 02:02:08 +02:00
Nikita Provotorov
a633c1208c JBR-5980: Pasting from clipboard not working reliably in Windows.
Marks the native flag AwtClipboard::isGettingOwnership as volatile and adds memory barriers around it to avoid inconsistencies of CPU caches.

(cherry picked from commit 51d2b31b28)
2025-04-14 02:02:08 +02:00
Vitaly Provodin
89c5d59131 JBR-6255 improve calculation JDK_BUILD_NUMBER
(cherry picked from commit 186d1c3229)
2025-04-14 02:02:08 +02:00
Nikita Gubarkov
75670f0d7f JBR-5274 recreate CGraphicsDevice if it was changed.
- AWT code heavily relies on reference comparison when updating graphics devices & configurations, so we need to actually re-create CGraphicsDevice if it was changed.

- Also do not rely on graphicsConfig.getDefaultTransform() when firing `graphicsContextScaleTransform` property change, as graphics devices are mutable and returned default transform may change over time, e.g. when device is invalidated.

(cherry picked from commit f9ad92a71c)
2025-04-14 02:02:08 +02:00
Alexey Ushakov
14b6540c5a JBR-5025 Reduce latency during display reconfiguration in Metal
Moved metal load library checks to CGraphicsEnvironment

(cherry picked from commit eeee663bb4)
2025-04-14 02:02:08 +02:00
Alexey Ushakov
7e0d18727c JBR-4666 java.lang.InternalError: Error - unable to initialize Metal after recreation of graphics device.
Reverted fix of the JRE-359 (CGraphicsEnvironment.getDefaultScreenDevice() returns null)
Logged exception after first attempt to create graphics device

(cherry picked from commit 345fd320c7)
2025-04-14 02:02:08 +02:00
Alexey Ushakov
383ae6a917 JBR-4588 macOS: SIGILL at [libsystem_kernel] __kill in CCE: class sun.java2d.opengl.CGLGraphicsConfig cannot be cast to class sun.java2d.metal.MTLGraphicsConfig
Prevent fall back to OpenGL if Metal has been used before
Added more diagnostics.

(cherry picked from commit 4002007cc2)
2025-04-14 02:02:08 +02:00
Vitaly Provodin
fc9569ed2f Update README.md
(cherry picked from commit 74f354be28)
2025-04-14 02:02:08 +02:00
Vladimir Kharitonov
1bde72b52e JBR-6239 sign frameworks in cef_server.app
(cherry picked from commit 8f6ae7a89c)
2025-04-14 02:02:08 +02:00
Maxim Kartashev
c5fb12ee7b JBR-4020 Test ObsoleteFlagErrorMessage fails after +IgnoreUnrecognizedVMOptions has become the default
(cherry picked from commit ae5963a094)
(cherry picked from commit 5b27cdbd14)
2025-04-14 02:02:08 +02:00
Maxim Kartashev
6fd238e490 JBR-5722 vmTestbase/vm/gc/compact/Compact_TwoFields_InternedStrings: SIGSEGV at Symbol::as_klass_external_name(char*, int)
Do not use print_native_stack() when recording OOME stacks as it is
designed to be used only in the context of a fatal error reporting where
induced crashes are tolerated.

(cherry picked from commit 6a87945cc5)
2025-04-14 02:02:08 +02:00
Alexey Ushakov
b6371f39e9 JBR-5741 broken build in main because of hotspot changes (JDK-8309613)
Added missing parameter

(cherry picked from commit c4c6d022f8)
2025-04-14 02:02:08 +02:00
Maxim Kartashev
f995762687 JBR-5480 Include more information in OOME crash reports
(cherry picked from commit 44f8dc85da)
2025-04-14 02:02:07 +02:00
Maxim Kartashev
84f61410d5 JBR-5466 jb/hotspot/JNIRefsInCrashLog.java: 'hs_err_42.txt' missing from stdout/stderr
(cherry picked from commit e511c26794)
2025-04-14 02:02:07 +02:00
Maxim Kartashev
886e726d3d JBR-5431 Include memory used by JNI references into crash reports
(cherry picked from commit 9a6eb0b730)
2025-04-14 02:02:07 +02:00
Vitaly Provodin
b6da8acc39 Update README.md
(cherry picked from commit 66c66543bb)
2025-04-14 02:02:07 +02:00
bourgesl
5e5bfd8aca JBR-5638: improved renderer performance for simple rectangular area (see BBoxAATileGenerator), added new statistics in Renderer
(cherry picked from commit dd4f818488)
2025-04-14 02:02:07 +02:00
Nikita Tsarev
ab8801208e JBR-6215: Override XToolkit's default nonintuitive behavior when translating F13-F24 keys
(cherry picked from commit 413b679eda)
2025-04-14 02:02:07 +02:00
Konstantin Bulenkov
d8d8abfa23 JBR-6214 [fwp jbr21] IDEA-299292 Use Inter semibold instead of Inter bold
Replaced Inter bold with semi-bold fonts

(cherry picked from commit 1ca726da46)
2025-04-14 02:02:07 +02:00
Nikita Gubarkov
183fdb0432 JBR-6208 Extended glyph cache for Metal
(cherry picked from commit 6878613df0)
2025-04-14 02:02:07 +02:00
Vitaly Provodin
e330f03477 JBR-6181 add Linux executables with bundled FreeType
(cherry picked from commit 12449b3de5)
2025-04-14 02:02:07 +02:00
Vitaly Provodin
7817a30866 Update README.md
(cherry picked from commit cff858e253)
2025-04-14 02:02:07 +02:00
Alexey Ushakov
37a3dedb58 JBR-4983 MacOS Ventura - External monitor lagging
Restored REDRAW_INC to 2. Enabled the fix by default only for M2 and spans displays property enabled (Displays have separate spaces OFF)

(cherry picked from commit 19728e911b)
2025-04-14 02:02:07 +02:00
Dmitrii Morskii
516883e5ba JBR-6135 removed dependence on process reading TTF in fixed size chunks
(cherry picked from commit 7c4721fa68)
2025-04-14 02:02:07 +02:00
Alexey Ushakov
3c11cdd394 JBR-6132 Crash in [MTLLayer blitTexture] when MTL_DEBUG_LAYER enabled
Blit operation should not be performed on textures with MTLTextureUsageRenderTarget only, so changing framebufferOnly to NO

(cherry picked from commit 5fb47ffc78)
2025-04-14 02:02:07 +02:00
Vitaly Provodin
4477ab0b42 Update README.md
(cherry picked from commit 7d1bcef8cd)
2025-04-14 02:02:07 +02:00
Nikita Provotorov
4dd99088db JBR-5984: IM's candidate window is placed under popup windows.
- Implements the optional method [NSTextInputClient windowLevel] to tell the macOS IM subsystem correct level of the window;
- Adds a regression test ImWindowIsPlacedUnderPopup5984.java.

(cherry picked from commit 5a91aae9c2)
(cherry picked from commit 2f310561ba)
2025-04-14 02:02:06 +02:00
Vitaly Provodin
a8186788c0 JBR-6130 add VK_TAB release action
(cherry picked from commit e16990eb93)
2025-04-14 02:02:06 +02:00
Alexey Ushakov
2ebb547b44 JBR-4983 MacOS Ventura - External monitor lagging
Added extra redraw request

(cherry picked from commit bd436709f5)
2025-04-14 02:02:06 +02:00
ghostflyby
20562dfd69 JBR-6124 Fix macOS services writing text back to textfield
(cherry picked from commit 51bde60b42)
2025-04-14 02:02:06 +02:00
Sergey Shelomentsev
207410dd25 exclude FocusTraversalOrderTest
(cherry picked from commit f7004afdb1)
2025-04-14 02:02:06 +02:00
Sergey Shelomentsev
c671c51fdf JBR-6060 add focus traversal order test
(cherry picked from commit 40dec50c3a)
2025-04-14 02:02:06 +02:00
Nikita Gubarkov
4ff78a21fe JBR-6016 doPrivileged for JBR API internal services.
(cherry picked from commit 06290bfd1e)
2025-04-14 02:02:06 +02:00
Vitaly Provodin
b8b6de9acb JBR-6008 Update JetBrains Mono fonts to v2.304
(cherry picked from commit 676a270ac1)
2025-04-14 02:02:06 +02:00
Vitaly Provodin
9bb16ee761 Update README.md
(cherry picked from commit 0400cd7f9b)
2025-04-14 02:02:06 +02:00
Dmitry Batrak
bf4398da95 JBR-3353 Sibling popup window is shown below dialog on macOS
(cherry picked from commit 4c6f3e4510)
(cherry picked from commit 73678a99d5)
2025-04-14 02:02:06 +02:00
Dmitry Batrak
f99230f8e7 JBR-5953 If hieroglyph typing isn't finalised, focusing another component inserts the composed text there
(cherry picked from commit 5dedf0e367)
2025-04-14 02:02:06 +02:00
Dmitry Batrak
83fb5174fd JBR-5946 Allow to disable painting of composed text in Swing text components using TextLayout.draw
(cherry picked from commit 3ac357417b)
2025-04-14 02:02:06 +02:00
Dmitry Batrak
f20d52d32a JBR-5823 IDEA crashes when '-Dmain.thread.as.edt=true' vmoption is set and VoiceOver is enabled
done as part of JBR-4993 Support using 'main' thread as EDT on macOS

(cherry picked from commit 55598693c3)
(cherry picked from commit c7b9f1aa68)
2025-04-14 02:02:06 +02:00
ngubarkov
f827354d35 JBR-5240 Fix XToolkit#getScreenInsets in Xinerama mode.
(cherry picked from commit 5df3fc666d)
2025-04-14 02:02:05 +02:00
ngubarkov
2225170193 JBR-5316 Fix fractional scaling HIDPI.
(cherry picked from commit acb62617d7)
2025-04-14 02:02:05 +02:00
Nikita Gubarkov
c3f6f8ccbf JBR-5186 Make MouseInfo.getPointerInfo more robust
Do not search for the containing monitor in MouseInfo.getPointerInfo, this must be handled by peers (yes, this goes against the spec of MouseInfoPeer.fillPointWithCoords).

JBR-5268 Fix coordinates conversion in XMouseInfoPeer.fillPointWithCoords

(cherry picked from commit ae135f2126)
2025-04-14 02:02:05 +02:00
Nikita Gubarkov
bf99d037ad IDEA-141456 Multimonitor HIDPI support for Linux
(cherry picked from commit 980c18ae92)
2025-04-14 02:02:05 +02:00
Dmitrii Morskii
c914a26459 JBR-5724: fixed serialization and backward compatibility of Font
(cherry picked from commit e3da733724)
2025-04-14 02:02:05 +02:00
Dmitrii Morskii
928fc75697 JBR-5259: fixed Canvas mispositioning after dragging JFrame to a monitor with different scale
(cherry picked from commit de62b80ef2)
2025-04-14 02:02:05 +02:00
Vitaly Provodin
78063d10c5 Update README.md
(cherry picked from commit b438d74f39)
2025-04-14 02:02:05 +02:00
Maxim Kartashev
d06bc29dd9 JBR-5815 javax/swing/AbstractButton/6711682/bug6711682.java: Row #2 checkbox is not selected
Fixed the test to use proper cell coordinates when clicking.

(cherry picked from commit ed01142e8b)
2025-04-14 02:02:05 +02:00
Alexey Ushakov
32d38b4184 JBR-5807 java/awt/Frame/FrameVisible/FrameContentAppearanceTest.java: Failed: OpenGL 26 image rendering failure(s)
Added synchronisation for rendering and appearance

(cherry picked from commit d02635f65b)
2025-04-14 02:02:05 +02:00
bourgesl
e5e06561ec JBR-5625: disable color-matching (colorspace = nil) in MTLLayer by default (see new system property 'sun.java2d.metal.colorMatching=true/false') + added new MetalLayerColorTest
Use CGColorSpaceCopyName() available since macOS 10.6 in MTLLayer

Use sun.java2d.metal.colorMatching=true by default (current metal behaviour)

(cherry picked from commit ec5c99bfb6)
2025-04-14 02:02:05 +02:00
Nikita Provotorov
60afdc533e JBR-5762 Sometimes naturally generated MOUSE_DRAGGED events don't contain the pressed button's modifier.
Enforce keeping the pressed button in the modifiers for MOUSE_DRAGGED events. This is under a (default enabled) system property "awt.mac.enforceMouseModifiersForMouseDragged".

(cherry picked from commit fb12990a98)
(cherry picked from commit 6a972e8ca7)
2025-04-14 02:02:05 +02:00
Dmitrii Morskii
ef744df28e JBR-5548 fix BadSerializationTest
(cherry picked from commit 90d867d08b)
2025-04-14 02:02:05 +02:00
Vitaly Provodin
54502af99a Update README.md
(cherry picked from commit 8efb8ded38)
2025-04-14 02:02:05 +02:00
Sergey Shelomentsev
940876e8cd JBR-5746 wait for menu visibility of fail the test
add mouse events logging

(cherry picked from commit 5a05bd2046)
2025-04-14 02:02:05 +02:00
Dmitry Batrak
6b54af915b JBR-5720 Wrong modifiers are reported for mouse middle and right buttons' release/clicked events
(cherry picked from commit afa0283f16)
2025-04-14 02:02:04 +02:00
Dmitry Batrak
fec3884b24 JBR-5684 Focus state is broken after closing of modal dialog in an inactive application
(cherry picked from commit 2f2fe7a11c)
2025-04-14 02:02:04 +02:00
Vitaly Provodin
0e75b0f97e update exclude list
(cherry picked from commit 36f380d4b4)
2025-04-14 02:02:04 +02:00
Vitaly Provodin
461b5da961 Update README.md
(cherry picked from commit b4071ba08d)
2025-04-14 02:02:04 +02:00
Alexey Ushakov
4ccb932a78 JBR-5151 Test failures caused by -Dsun.java2d.metal.displaySync=false
Removed display sync from window layer, provide layer content updates only when necessary

(cherry picked from commit 77cb9bcec0)
2025-04-14 02:02:04 +02:00
Dmitrii Morskii
36927083b5 JBR-1775: improved logic for choosing newer font between system and bundled ones
(cherry picked from commit 41cbdf720c)
2025-04-14 02:02:04 +02:00
Sergey Shelomentsev
c6908cd097 JBR-2870 add resression test for JPopupMenu
- verify that the popup menu is usable if overlaps WM's dock panel of the bottom of screen

(cherry picked from commit 962eb42ed2)
2025-04-14 02:02:04 +02:00
Vitaly Provodin
dc01ccdff7 Update README.md
(cherry picked from commit 15fdca4193)
2025-04-14 02:02:04 +02:00
Alexey Ushakov
6c5f612c06 JBR-5693 Debug build failure in main branch
Corrected printf format and muted unused-function option for keycode_cache.c

(cherry picked from commit 87a01c930d)
2025-04-14 02:02:04 +02:00
Alexey Ushakov
6b096a0a4f JBR-5704 displaySyncOFF: javax/swing/JDialog/Transparency/TransparencyTest.java: JDialog transparency lost upon iconify/deiconify sequence
Corrected startRedraw method to call setNeedsDisplay in displaySync=false mode

(cherry picked from commit 0ddd7e8301)
2025-04-14 02:02:04 +02:00
Sergey Shelomentsev
aa461fdf13 JBR-5670 restore initial display mode after test execution
restore original display mode

(cherry picked from commit d098ad1f77)
2025-04-14 02:02:04 +02:00
Sergey Shelomentsev
9ffc8aba4d JBR-4880 Fix DeadKeySystemAssertionDialog to avoid receiving key event out of the window
(cherry picked from commit 5467dea09b)
2025-04-14 02:02:04 +02:00
Vladislav Rassokhin
79b477c4ec JBR-5600 Reduce noise in signing scripts output
(cherry picked from commit bc145d39be)
2025-04-14 02:02:04 +02:00
Vladislav Rassokhin
d533b55936 JBR-5600 Sign frameworks as whole, verify framework signature before full app sign
(cherry picked from commit 2fecc58be2)
2025-04-14 02:02:04 +02:00
Nikita Provotorov
b6c1805a62 JBR-5668: The implementation of a11y announcing for macOS crashes with -Xcheck:jni.
- Create a global reference of the passed to EDT accessible object (the local reference) to use it in the AppKit thread ;
- Enable -Xcheck:jni in the tests ;
- Make the tests handle the problematic case .

(cherry picked from commit cba981df4b)
(cherry picked from commit f3a038c849)
2025-04-14 02:02:04 +02:00
Vladislav Rassokhin
c78e5dc330 tools/mac/scripts: minor improvements
* don't move into itself
* use `PKG_NAME` variable instead of `${APP_NAME}.pkg`
* cleanup sign.sh
* add `SCRIPT_VERBOSE` env variable to control `set -x`

(cherry picked from commit 28514c3d00)
2025-04-14 02:02:03 +02:00
Vladislav Rassokhin
8d8c50933a JBR-5600 Staple .pkg with signature
(cherry picked from commit 6555023fd3)
2025-04-14 02:02:03 +02:00
Vladislav Rassokhin
b6230aff32 JBR-5600 Notarize macOS binaries using notarytool
(cherry picked from commit 7916ed31b7)
2025-04-14 02:02:03 +02:00
Vladislav Rassokhin
027a205186 JBR-5600 Sign macOS binaries using jet-sign
(cherry picked from commit 95ef69df13)
2025-04-14 02:02:03 +02:00
Sergey Shelomentsev
28afe7e01e JBR-5579 Update mouse location checks, set window always on top for ActionListenerTest
(cherry picked from commit b867b1c395)
2025-04-14 02:02:03 +02:00
Sergey Shelomentsev
9e181aefa1 JBR-5551 update hit tests on custom title bar
- set windows always on top
- verify mouse location before clicking

(cherry picked from commit 005de74127)
2025-04-14 02:02:03 +02:00
Sergey Shelomentsev
b8ad6cc2ba JBR-5577 fix MouseEventsOnClientArea test
- add Swing/AWT specific Task runners
- split MouseEventsOnClientArea to separate AWT/Swing tests
- use CountDownLatch for tracking mouse events

(cherry picked from commit c6a43fe84f)
2025-04-14 02:02:03 +02:00
Sergey Shelomentsev
ade0fbf88a remove jb/java/awt/Window/ZOrderOnModalDialogActivation.java
(cherry picked from commit 9b6037dee3)
2025-04-14 02:02:03 +02:00
Sergey Shelomentsev
ade7f10d45 JBR-4494 pass ui scale options for child process
(cherry picked from commit e32e657c55)
2025-04-14 02:02:03 +02:00
Maxim Kartashev
c4d0d42e70 JBR-5656 Builds of JDK 21 are reproducible by default
(cherry picked from commit 0d663a139acf3d5cdb19b33494ab9f6273c4ebfa)
(cherry picked from commit f086917fa7)
2025-04-14 02:02:03 +02:00
bourgesl
510154e85a JBR-5651: Improved MTLVertexCache to merge consecutive full-tiles ie use 1 larger quad instead of many quads per row, full-tile is only using 1x1 pixel (full), applied to color, gradient & texture paints + fixed clang warnings
(cherry picked from commit 6de22f0db9)
2025-04-14 02:02:03 +02:00
Alexey Ushakov
32762ff819 JBR-5649 Flickering in multi-monitor configuration
Provided corrected initial value for currentDisplayID

(cherry picked from commit c0f779b7e6)
2025-04-14 02:02:03 +02:00
Vitaly Provodin
1c991c6989 JBR-5627 add regression test AsyncProfilerRunnerTest
(cherry picked from commit ce37138a4a)
2025-04-14 02:02:03 +02:00
Maxim Kartashev
f9c730491f JBR-5631 Refactor Dockerfile for x64 builds
(cherry picked from commit 3bb93255e9)
2025-04-14 02:02:03 +02:00
Vitaly Provodin
b65559197c JBR-5603 build aarch64 Linux from arm64v8/centos:7 and check glibc to be not higher 2.17
(cherry picked from commit f6be01d68c)
2025-04-14 02:02:02 +02:00
Alexey Ushakov
10bcdeb226 JBR-5580 J2DBench: ~15% drop performance  because of non optimal synchronization in metal (MBP 16'' x64)
Replaced NSMutableArray with NSMutableSet, removed unnecessary __block modifier.

(cherry picked from commit fd940831a2)
2025-04-14 02:02:02 +02:00
Sergey Shelomentsev
ec6800a588 update a11y exclude list
(cherry picked from commit 5641f7141f)
2025-04-14 02:02:02 +02:00
Alexey Ushakov
be4da1e5fd JBR-5580 J2DBench: ~15% drop performance because of non optimal synchronization in metal (MBP 16'' x64)
Removed NSLock and moved all operations to the AppKit thread

(cherry picked from commit e2fcfaf249)
2025-04-14 02:02:02 +02:00
bourgesl
65bbb1263b JBR-5170: improved color maskFill performance: using a new MaskColorBuffer and a specific shader (vert_txt_col)
fix crash in J2DDemo with advanced paints + artefacts with texture background

(cherry picked from commit 2fc32d6082)
2025-04-14 02:02:02 +02:00
Alexey Ushakov
d16fd0d556 JBR-5559 SwingMark performance drop after removing additional command queue
Added command queue and provided synchronization between the command queues

(cherry picked from commit 6b76f79eee)
2025-04-14 02:02:02 +02:00
Nikita Provotorov
b97c1e3d04 JBR-5536: Crash on macOS bad JNI lookup in Java_sun_swing_AccessibleAnnouncer_nativeAnnounce
Stop using the JNIEnv instance bound to EDT in the AppKit thread.

(cherry picked from commit 0f49341f4d)
(cherry picked from commit cdca8e74b7)
2025-04-14 02:02:02 +02:00
Alexey Ushakov
50f85340ac JBR-4883 macOS: SIGSEGV at MTLVertexCache_FlushGlyphVertexCache
Use separate glyph cache for each MTLContext instance. Refactored MTLGlyphCache

(cherry picked from commit 845a30560e)
2025-04-14 02:02:02 +02:00
Alexey Ushakov
30919b5cf7 JBR-5193 Do not use extra commandQueue in metal pipeline
Removed extra command queue

(cherry picked from commit a235903851)
2025-04-14 02:02:02 +02:00
Alexey Ushakov
1b380908f0 JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen
This includes displaySync changes as well as fixes for JBR-5157 and JBR-5321.

(cherry picked from commit e7df6f3745)
2025-04-14 02:02:02 +02:00
Vitaly Provodin
a953fcfd1f Update README.md
(cherry picked from commit aa1d64ca93)
2025-04-14 02:02:02 +02:00
Maxim Kartashev
d22966bd93 jb/branchdiff.py is a lot faster
(cherry picked from commit 5c3726555d)
2025-04-14 02:02:02 +02:00
Sergey Shelomentsev
ce71c0158b JBR-5505 update exclude list for a11y testing on Windows
(cherry picked from commit 12330ba916)
2025-04-14 02:02:02 +02:00
Sergey Shelomentsev
4368b8ae99 JBR-5397 update exclude list for a11y testing on MacOS
(cherry picked from commit 688b16a796)
2025-04-14 02:02:02 +02:00
Sergey Shelomentsev
3539bb8b01 JBR-5441 fix wait for idle
(cherry picked from commit 8b5945f834)
2025-04-14 02:02:02 +02:00
Maxim Kartashev
86467a7c73 jb/branchdiff.py to warn if it can't differentiate between commits
(cherry picked from commit 3504702f9c)
2025-04-14 02:02:01 +02:00
Sergey Shelomentsev
b1df061610 JBR-5440 fix calculations for double click location
(cherry picked from commit e468d39869)
2025-04-14 02:02:01 +02:00
Artem Bochkarev
f0f55440f9 JBR-5426 write JCEF version info inside release file
(cherry picked from commit 59701eefa3)
2025-04-14 02:02:01 +02:00
Maxim Kartashev
e9039e01f9 JBR-5445 JBRApiTest test fails on development builds
(cherry picked from commit d9d941f9c5)
2025-04-14 02:02:01 +02:00
Sergey Shelomentsev
df77c6e1c4 JBR-5433 add typing latency text for JTextArea
(cherry picked from commit c6706f1794)
2025-04-14 02:02:01 +02:00
Vitaly Provodin
d60c9f3dae JBR-5432 increase setAutoDelay for Robot
(cherry picked from commit 17b10df182)
2025-04-14 02:02:01 +02:00
Maxim Kartashev
cfeedf8e35 JBR-5230 Wanted: an ability to use Unix Domain sockets with overridden default NIO file system
(cherry picked from commit 946a7ca9ec)
2025-04-14 02:02:01 +02:00
Sergey Shelomentsev
3a5598eee6 fixup! JBR-4875 set proper OS to run ComboBoxTransparentTittleBarTest
(cherry picked from commit 611dcc6475)
2025-04-14 02:02:01 +02:00
Sergey Shelomentsev
5acb21144a fix controls width calculation
(cherry picked from commit b88d26c9dd)
2025-04-14 02:02:01 +02:00
Sergey Shelomentsev
2497a7cc02 split ActionListenerTest
(cherry picked from commit 36f13b0158)
2025-04-14 02:02:01 +02:00
Sergey Shelomentsev
05b6cc24d7 JBR-5345 native controls detection and scale fixes
(cherry picked from commit e191789794)
2025-04-14 02:02:01 +02:00
Maxim Kartashev
95422bf1e7 README.md: spelled out JBR distinctive features
(cherry picked from commit 51e9900c8b)
2025-04-14 02:02:01 +02:00
Vitaly Provodin
1f50d8a7e8 update exclude list on results of 21_b28.1 test runs
(cherry picked from commit 4619c5ed7f)
2025-04-14 02:02:01 +02:00
Alexey Ushakov
c52400c338 JBR-5330 Blank Welcome screen after moving to another display
Initialize currentDisplayID on AWTWindow creation

(cherry picked from commit c5ea4e48ac)
2025-04-14 02:02:01 +02:00
Nikita Tsarev
13e83f30e2 JBR-5369: Update failing tests list in response to macOS keyboard support rewrite
(cherry picked from commit a9313e2d06)
2025-04-14 02:02:01 +02:00
Vitaly Provodin
d0e86481e2 Update README.md
(cherry picked from commit ed3d57cf10)
2025-04-14 02:02:00 +02:00
Vitaly Provodin
0c88107733 update exclude list on results of 21_b24.2 test runs
(cherry picked from commit 3276006be9)
2025-04-14 02:02:00 +02:00
Vitaly Provodin
100cc3209c Update README.md
(cherry picked from commit 552fa7c32e)
2025-04-14 02:02:00 +02:00
Sergey Shelomentsev
3a1cbbbf15 JBR-5350 Separate test for Mac OS
(cherry picked from commit dc4a094f03)
2025-04-14 02:02:00 +02:00
Sergey Shelomentsev
bce9e1928c JBR-5346 run MaximizedCustomDecorationsTest on windows/mac only
(cherry picked from commit c47b6f4880)
2025-04-14 02:02:00 +02:00
Sergey Shelomentsev
9aff5b5d40 JBR-5350 fix FrameNativeControlTest checks on MacOS
(cherry picked from commit f8f1c8625e)
2025-04-14 02:02:00 +02:00
Sergey Shelomentsev
83c2e377d7 JBR-5344 fix incorrectly specified VM options
(cherry picked from commit 2f101dbf8a)
2025-04-14 02:02:00 +02:00
Vitaly Provodin
14f1ada06e Update README.md
(cherry picked from commit 952295b14d)
2025-04-14 02:02:00 +02:00
Vitaly Provodin
fa6a872e9a update exclude list on results of 17.0.6_b855.1 test runs
(cherry picked from commit b018988c02)
2025-04-14 02:02:00 +02:00
Sergey Shelomentsev
531e0c7a67 JBR-5313 fix broken custom decoration tests on Windows
(cherry picked from commit c6e21bdbad)
2025-04-14 02:02:00 +02:00
Sergey Shelomentsev
c3ae3c7cbe JBR-5253 Use new JBR API for custom decorations
(cherry picked from commit fdead3d90a)
2025-04-14 02:02:00 +02:00
Vitaly Provodin
dcf373973b JBR-5300 move jbr-api.jar into test artefact
(cherry picked from commit f199d6c98a)
2025-04-14 02:02:00 +02:00
Vitaly Provodin
6c8c815cfc update exclude list on results of 17.0.6_b837.3 test runs
(cherry picked from commit 415267181c)
2025-04-14 02:02:00 +02:00
Maxim Kartashev
d6450a1b12 JBR-4544 Enable OpenGL pipeline by default for Wayland sessions
The OpenGL pipeline is enabled only if all of the following is true:
- WAYLAND is detected,
- VMWare virtualization is detected,
- rendering pipeline is not a software one (llvmpipe).
As a side effect, a system property 'jbr.virtualization.information'
is set to the value of detected virtualization type. The value is the
same as provided by JFR.

(cherry picked from commit f6acd65d32)
2025-04-14 02:02:00 +02:00
Sergey Shelomentsev
3e7fa3ad0c set version for building jbr-api
(cherry picked from commit 6a0113fd07)
2025-04-14 02:01:59 +02:00
Sergey Shelomentsev
22a61396ea get rid of build-jbr-api scripts
(cherry picked from commit 1c8496e757)
2025-04-14 02:01:59 +02:00
Vitaly Provodin
86f6f5c410 clean up exclude lists
(cherry picked from commit de6d9f328f)
2025-04-14 02:01:59 +02:00
Sergey Shelomentsev
e662444a44 JBR-5194 add regressions tests for custom decorations support
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5fc82006c4)
2025-04-14 02:01:59 +02:00
Sergey Shelomentsev
005ffcc00c build jbr-api as a part of bundle build
(cherry picked from commit 45efe7fdd5)
2025-04-14 02:01:59 +02:00
Vitaly Provodin
dc51b9fe9c Update README.md
(cherry picked from commit dd24017389)
2025-04-14 02:01:59 +02:00
Vitaly Provodin
accee5d2d2 Update README.md
(cherry picked from commit 45d7501c9f)
2025-04-14 02:01:59 +02:00
Artem Semenov
5cf7271c6c JBR-5289 If the label has the role of a hyperlink, VO still pronounces it as plain text (#215)
(cherry picked from commit 675ca2f02e)
2025-04-14 02:01:59 +02:00
Alexey Ushakov
fbefc2b3c8 JBR-5279 restore saving jbr native symbols bin/server/jvm.pdb
(cherry picked from commit 887b9dbcac)
2025-04-14 02:01:59 +02:00
Sergey Shelomentsev
be25a25b73 JBR-4875 update test to use new JBR API window custom decorations
(cherry picked from commit df92d71389)
2025-04-14 02:01:59 +02:00
Vitaly Provodin
5f05bfd68b Update README.md
(cherry picked from commit 373482ffc4)
2025-04-14 02:01:59 +02:00
Artem Semenov
6b451f88e8 JBR-5269 Announcement priorities not set correctly (#214)
(cherry picked from commit c34aa6fc6f)
2025-04-14 02:01:59 +02:00
Vitaly Provodin
1a20f23fff Update README.md
(cherry picked from commit 3631c19265)
2025-04-14 02:01:59 +02:00
Artem Semenov
1cfbc8e675 JBR-5248 exception in accessible announcing
(cherry picked from commit a4e0f6018f)
2025-04-14 02:01:59 +02:00
Vitaly Provodin
5793dfc68e update exclude list on results of 21_b9 test runs
(cherry picked from commit 9f04c32c10)
2025-04-14 02:01:58 +02:00
Vitaly Provodin
ed35468552 JBR-5217 enable NVDA support in Windows builds
(cherry picked from commit afc5710f21)
2025-04-14 02:01:58 +02:00
Vitaly Provodin
dbacb83ce7 Update README.md
(cherry picked from commit df4fd03fba)
2025-04-14 02:01:58 +02:00
AMPivovarov
6f554f09b6 JBR-5213 JBR API v0.0.9 - add GraphicsUtils (#208)
* relax type constraints in BltBufferStrategy.getDrawGraphics

(cherry picked from commit 715b615d88)
2025-04-14 02:01:58 +02:00
Artem Semenov
0d44990093 JBR-5221 Add announcing to JBRAPI
(cherry picked from commit 7189d50b76)
2025-04-14 02:01:58 +02:00
Vitaly Provodin
74588a1daa update exclude list on results of 21_b8 test runs
(cherry picked from commit 17d5e3895b)
2025-04-14 02:01:58 +02:00
Artem Semenov
78eecc435c JBR-4170 Implement API for announcing
(cherry picked from commit d7f14bf793)
2025-04-14 02:01:58 +02:00
Vitaly Provodin
b46f852adf update exclude list on results of 21_b7 test runs
(cherry picked from commit e40cdc800e)
2025-04-14 02:01:58 +02:00
Vitaly Provodin
3e3bb7a243 update exclude list on results of stability checking runs due to 8253184
(cherry picked from commit 166924f5ed)
2025-04-14 02:01:58 +02:00
Artem Bochkarev
630446fe3a JBR-3575 use flag processEvents in LWCToolkit.invokeAndWait
(cherry picked from commit dcf9ff3315)
2025-04-14 02:01:58 +02:00
Vitaly Provodin
ffa051d18e exclude several tests from runs on machines with enabled VoiceOver
(cherry picked from commit 8040e574e4)
2025-04-14 02:01:58 +02:00
Anton Tarasov
6649b8be70 JBR-4355 javax/swing/GraphicsConfigNotifier/StalePreferredSize.java: # C [libobjc.A.dylib+0x90ff] objc_release+0x1f
(cherry picked from commit c0b2b59d4a)
(cherry picked from commit 0691a5230c)
2025-04-14 02:01:58 +02:00
Anton Tarasov
1a67142d00 JBR-4362 [mac] system menu opens with duplicated items
(cherry picked from commit e32defe49d)
(cherry picked from commit 2d1e14f01d)
2025-04-14 02:01:58 +02:00
Anton Tarasov
b33f2d3d29 JBR-4328 remove LWCToolkit.unsafeNonblockingExecute
(cherry picked from commit 9a3f31a6c4)
(cherry picked from commit f9a02266a0)
2025-04-14 02:01:58 +02:00
Anton Tarasov
958a44d32c JBR-4134 PyCharm is slow and unusable on MacBook Pro with M1
(cherry picked from commit 36190505f5)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit cebc6ed818)
2025-04-14 02:01:58 +02:00
Anton Tarasov
fc88152cc0 JBR-4284 Sub items of main menu options are not displayed
A regression of JBR-4208 LWCToolkit.invokeAndWait should not stuck on invocation loss

(cherry picked from commit c464e4748e)
(cherry picked from commit 42d07c4f0c)
2025-04-14 02:01:57 +02:00
Anton Tarasov
31e84190b5 JBR-4119 UI freezes at sun.lwawt.macosx.CAccessibility.getChildrenAndRoles
(cherry picked from commit 6ba79774d8)
(cherry picked from commit e1623dc301)
2025-04-14 02:01:57 +02:00
Anton Tarasov
cacc8514b8 JBR-4106 PyCharm hangs with 100% CPU usage on one core
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9deef18d46)
2025-04-14 02:01:57 +02:00
Anton Tarasov
0d4983ae47 JBR-4208 LWCToolkit.invokeAndWait should not stuck on invocation loss
including JBR-4543 (NPE: IdeEventQueue.lambda$getNextEvent$0)

(cherry picked from commit b16d847947)
2025-04-14 02:01:57 +02:00
Anton Tarasov
fe1a76378f JBR-3413 use timeout in CAccessibility.invokeAndWait
(cherry picked from commit e7009db076)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit bd9d4cf182)
2025-04-14 02:01:57 +02:00
Vitaly Provodin
db2aeee5aa update exclude list on results of 21_b1447 test runs
(cherry picked from commit 3502c53a16)
2025-04-14 02:01:57 +02:00
Vitaly Provodin
ae1e5b0948 Update README.md
(cherry picked from commit fcbfb32b13)
2025-04-14 02:01:57 +02:00
Vitaly Provodin
18e8bf3091 update exclude list on results of main.1441 test runs
(cherry picked from commit 7194b34979)
2025-04-14 02:01:57 +02:00
Alexey Ushakov
c370022d06 JBR-5112 Large bold square whitespaces after waking up the laptop / connecting display
Clear primary surface data of VolatileSurfaceManager on display change event

(cherry picked from commit de708896a6)
2025-04-14 02:01:57 +02:00
Artem Semenov
92710658bb JBR-5118 VoiceOver does not speak the label associated with the combobox (#194)
JBR-5118 VoiceOver does not speak the label associated with the combobox

(cherry picked from commit b6fc471cd0)
2025-04-14 02:01:57 +02:00
Artem Semenov
b39a0d86c1 JBR-4235 Context menu not readable after opening on Mac OS
(cherry picked from commit 83d6b20711)
2025-04-14 02:01:57 +02:00
Artem Semenov
d46cb3f4f0 JBR-4012 On Idea Vo often speeks selected element of tables, lists, and trees.
(cherry picked from commit 47783c1c85)
2025-04-14 02:01:57 +02:00
Artem Semenov
fec518d1fd JBR-3868 Combobox list is not voiced of VoiceOver
(cherry picked from commit 1f777d72ea)
2025-04-14 02:01:57 +02:00
Alexey Ushakov
4d44cb3e4e JBR-5041 macOS: SIGSEGV at [libawt_lwawt] getRenderEncoder:(dstOps == NULL)
Protected code from using NULL dstOps

(cherry picked from commit 44c76b8b99)
2025-04-14 02:01:57 +02:00
Alexey Ushakov
0dedb71bfe JBR-4856 macOS: SIGSEGV at [libawt_lwawt] MTLTR_DrawGlyphList
Clear glyph caches after switching contexts. Keep encoders in sync with graphics devices. Minor refactoring

(cherry picked from commit e2ed6bf8dd)
2025-04-14 02:01:56 +02:00
Dmitry Batrak
e4ae208c12 JBR-5109 New frame doesn't get focused sometimes if it's shown right after popup is closed
(cherry picked from commit 693d317c0c)
(cherry picked from commit 6a153c09a8)
2025-04-14 02:01:56 +02:00
Vitaly Provodin
c39842e773 Update README.md
(cherry picked from commit 0a469f5069)
2025-04-14 02:01:56 +02:00
Alexey Ushakov
d7ea31081d JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen
Do not fire deliverChangeBackingProperties notification for the view if there is no change between layer and window scales. Also, do not fire displayChanged for display profile only changes.

(cherry picked from commit 87c092d4ec)
2025-04-14 02:01:56 +02:00
Nikita Provotorov
de0f8f3521 JBR-5075: macOS: KEY_PRESSED event for "Cmd N" is not emitted if used as a JMenuItem accelerator and apple.laf.useScreenMenuBar=true.
- Improves the fix of JBR-3544 to allow "Cmd N" and "Ctrl N" to reach AWT if they're actually the ones which were pressed.
- Adds a regression test.

(cherry picked from commit 61a1b70d73)
(cherry picked from commit c3f068760d)
2025-04-14 02:01:56 +02:00
Victor Kropp
36ffd1e692 Update README.md
Mention Toolbox App in the list of applications built on JetBrains Runtime.

(cherry picked from commit cfa9789515)
(cherry picked from commit acc1a29a25)
2025-04-14 02:01:56 +02:00
Nikita Provotorov
a5903a76ce Update README.md
Replaced jbr-dev to main and other minor fixes.

(cherry picked from commit 91bea99984)
2025-04-14 02:01:56 +02:00
Vitaly Provodin
12d8a9c2ae update exclude list on results of 17.0.5_b721.3 test runs
(cherry picked from commit 652e397e29)
2025-04-14 02:01:56 +02:00
Alexey Ushakov
b5223bb12f JBR-5073 [Double-Monitor] java/awt/Window/LocationAtScreenCorner/LocationAtScreenCorner.java: Wrong location
Added check for nil displayID of the window

(cherry picked from commit 6a834fb5e7)
2025-04-14 02:01:56 +02:00
Vitaly Provodin
7fbca40d1f update exclude list on results of 17.0.5_b712.2 test runs
(cherry picked from commit ef68a82141)
2025-04-14 02:01:56 +02:00
Vitaly Provodin
107b067769 JBR-4956 reduce width of screenshot by one pixel to exclude caret
(cherry picked from commit dd36d60415)
2025-04-14 02:01:56 +02:00
ngubarkov
464bf65994 JBR-4840 cache screen resolution in XToolkit
(cherry picked from commit b0c0a6ff75)
2025-04-14 02:01:56 +02:00
Alexey Ushakov
0854930295 JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen
Moving NSWindowDidChangeScreenNotification handler to AWTWindow

fixup! JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen

(cherry picked from commit 3f5ad0610a)
2025-04-14 02:01:56 +02:00
Dmitry Batrak
aa36d725ec JBR-5045 Invisible component can break focus cycle
(cherry picked from commit 0f57a27879)
(cherry picked from commit 8309d820fd)
2025-04-14 02:01:56 +02:00
Vitaly Provodin
ffc13ffa29 Update README.md
(cherry picked from commit 1fb0b4f098)
2025-04-14 02:01:56 +02:00
Vitaly Provodin
68d1d9a716 Update README.md
(cherry picked from commit a8862ab989)
2025-04-14 02:01:55 +02:00
Vitaly Provodin
9312b272ab update exclude list on results of 17.0.5_b691.6 test runs
(cherry picked from commit 668a433320)
2025-04-14 02:01:55 +02:00
Vitaly Provodin
bfa69b329b Update README.md
(cherry picked from commit 2cdd0386c3)
2025-04-14 02:01:55 +02:00
Alexey Ushakov
4a8935c38f JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen
Replace multiple CHANGE_SCREEN notifications fired around the same time with just one

(cherry picked from commit cd6ca71ea8)
2025-04-14 02:01:55 +02:00
Dmitry Batrak
05e6c613e8 JBR-4988 Transient Z-order violations on macOS
(cherry picked from commit bcba97511c)
(cherry picked from commit 3ff06e954d)
2025-04-14 02:01:55 +02:00
Vitaly Provodin
fc2487cb26 JBR-4947 update alpine x64 image up to 3.14
(cherry picked from commit 88f2d7010f)
2025-04-14 02:01:55 +02:00
Vitaly Provodin
1b49fd95f6 update exclude list on results of 17.0.5_b469.67 test runs
(cherry picked from commit 5ab3a9bf5f)
2025-04-14 02:01:55 +02:00
Vitaly Provodin
be2174ba27 Update README.md
(cherry picked from commit 61d47b2fd3)
2025-04-14 02:01:55 +02:00
Alexey Ushakov
d7fd171338 JBR-4950 src\java.desktop\windows\native\libawt\windows\awt_FileDialog.cpp: warning C4267: '+=': conversion from 'size_t' to 'UINT', possible loss of data
Added casts to resolve warnings

(cherry picked from commit f5c1a03bf5)
2025-04-14 02:01:55 +02:00
Vitaly Provodin
0307caccc1 update Commit and Full testing exclude list on results of jbr17.668 test runs
(cherry picked from commit e7e823a0a3)
2025-04-14 02:01:55 +02:00
Maxim Kartashev
9ea007d2a1 JBR-4951 In function 'convert_to_java_array': error: comparison of integer expressions of different signedness
(cherry picked from commit 4293e2832c)
2025-04-14 02:01:55 +02:00
Vitaly Provodin
a86e419ade JBR-4089 add modules sun.awt sun.awt.image sun.java2d
(cherry picked from commit 2cae8fb09c)
2025-04-14 02:01:55 +02:00
Vitaly Provodin
a021e52f14 update exclude list for Commit testing
(cherry picked from commit c037eec3ac)
2025-04-14 02:01:55 +02:00
Vitaly Provodin
3acb1fc2c4 exclude tests failing because of JBR-4933, JBR-4934
(cherry picked from commit 6f78d1b02c)
2025-04-14 02:01:55 +02:00
Alexey Ushakov
d38158f7b3 JBR-4731 SIGILL caused by NPE Cannot invoke "java.awt.GraphicsConfiguration.getDevice()" because "config" is null
Handled null device in platform window

(cherry picked from commit 9e52c15ec7)
2025-04-14 02:01:55 +02:00
Maxim Kartashev
3bfb379d38 Move JBR README.md to .github/
(cherry picked from commit b69b12f489)
2025-04-14 02:01:54 +02:00
Svyatoslav Vlasov
bb90714b86 Add ProjectorUtils to jbr-api (#181)
* Add ProjectorUtils to jbr-api

Co-authored-by: Sviatoslav Vlasov <Sviatoslav.Vlasov@jetbrains.com>
(cherry picked from commit c8ccc83a6e)
2025-04-14 02:01:54 +02:00
Nikita Tsarev
aab07dc380 JBR-3941 Make apple.awt.captureNextAppWinKey default to false
(cherry picked from commit ea29fc8942)
2025-04-14 02:01:54 +02:00
Vitaly Provodin
d75ade3558 JBR-4912 jb/java/api/frontend/CustomTitleBarDoubleClick.java intermittently throws java.awt.AWTError
(cherry picked from commit ff7ca451fe)
2025-04-14 02:01:54 +02:00
Maxim Kartashev
97c2e33ebb exclude java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java due to JBR-4880 on windows
(cherry picked from commit 2d98733ab5)
2025-04-14 02:01:54 +02:00
Alexey Ushakov
1cb309b226 JBR-4710 macOS: SIGSEGV at sun.java2d.metal.MTLLayer.blitTexture
Added check for disposed texture in the MTLLayer

(cherry picked from commit c27d8a7c5e)
2025-04-14 02:01:54 +02:00
Nikita Gubarkov
7677cc76cc JBR-4890 Fix variation selectors font fallback on macOS
If font for a given variation selector not found, try without variation selector

(cherry picked from commit 7505b502d7)
2025-04-14 02:01:54 +02:00
Artem Bochkarev
9d9f74c0bb JBR-4907 remove custom view for osx system menu items
Just revert "JBR-3131: support custom view for system menu items"

(cherry picked from commit 548345c202)
2025-04-14 02:01:54 +02:00
Vitaly Provodin
7388cde5d7 exclude java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java due to JBR-4905 on windows&linux
(cherry picked from commit 8150b0e5e7)
2025-04-14 02:01:54 +02:00
Alexey Ushakov
6faac5c204 JBR-4897 Reconnecting multiscreen monitor displays blank IDE
Handled NSWindowDidChangeScreenNotification, resolved race condition in window peer displayChanged listener

(cherry picked from commit 1e697c8623)
2025-04-14 02:01:54 +02:00
Vitaly Provodin
0797b4d53a exclude jb/java/jcef/HandleJSQueryTest3314.sh due to JBR-4866 on linux
(cherry picked from commit d619e3320a)
2025-04-14 02:01:54 +02:00
Vitaly Provodin
450d6af8b1 exclude some tests due to JBR-4880 on windows
(cherry picked from commit 1a9fb2cfa2)
2025-04-14 02:01:54 +02:00
Vitaly Provodin
1d04da9aae exclude javax/swing/JInternalFrame/8020708/bug8020708.java due to JBR-4879 on windows
(cherry picked from commit 85ba459fae)
2025-04-14 02:01:54 +02:00
Vitaly Provodin
25e65602d5 exclude java/awt tests which do not close child processes/windows
(cherry picked from commit 3cf2b36323)
2025-04-14 02:01:54 +02:00
Vitaly Provodin
bb4729e46d exclude java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java and java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java due to 7188711 on linux-all
j

(cherry picked from commit 0b3f6caedd)
2025-04-14 02:01:53 +02:00
Maxim Kartashev
877a219020 JBR-4877 WARNING: JNI local refs: 33, exceeds capacity: 32
(cherry picked from commit a10770c49d)
2025-04-14 02:01:53 +02:00
Artem Bochkarev
bcbf007705 JBR-4876 remove test duplicates
Since next jcef tests were moved into junit suite (inside jcef repository):
 HandleJSQueryTest
 JCEFStartupTest
 LoadPageWithoutUI
 MouseEventAfterHideAndShowBrowserTest
 MouseEventScenario
 MouseEventTest

(cherry picked from commit bd1d06d0bc)
2025-04-14 02:01:53 +02:00
Vitaly Provodin
ed861ae1ba JBR-4875 jb/javax/swing/JComboBox/ComboBoxTransparentTittleBarTest.java checks dragging JFrame with Combobox
(cherry picked from commit 8d5472c900)
2025-04-14 02:01:53 +02:00
Dmitry Batrak
dda2c74bd9 JBR-4871 Closed project leaked via KeyboardFocusManager#newFocusOwner
(cherry picked from commit 50c0ce58d3)
(cherry picked from commit 46a0f0d75b)
2025-04-14 02:01:53 +02:00
Maxim Kartashev
9e03136071 JBR-4839 Report if wrong shared library is detected at run time
(cherry picked from commit e8c1913562)
2025-04-14 02:01:53 +02:00
Maxim Kartashev
3dc40b7667 JBR-4848 Cannot invoke "javax.swing.JTextField.getCaret()" because the return value of "java.lang.ref.WeakReference.get()" is null
(cherry picked from commit 7fae4cd2d1)
2025-04-14 02:01:53 +02:00
Alexey Ushakov
57676567cf JBR-4590 macOS: SIGSEGV at [libawt_lwawt] MTLTR_DrawGlyphList
Invalidate glyph cache cell info after switching MTLContext

(cherry picked from commit 664528713e)
2025-04-14 02:01:53 +02:00
Nikita Gubarkov
20772428f3 JBR-4815 force hinting for non-antialiased text
(cherry picked from commit 6c3517ae9d)
2025-04-14 02:01:53 +02:00
Maxim Kartashev
e27d59cba1 jb/branchdiff.py script to help with release branches
(cherry picked from commit a03f10e9b7)
2025-04-14 02:01:53 +02:00
Nikita Gubarkov
d2297ab9b8 JBR-3677 check AppleActionOnDoubleClick property for custom window decorations on macOS
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit d71c4b3950)
2025-04-14 02:01:53 +02:00
Alexander Lobas
a49d63554d JBR-4787 Rounded corners for native windows
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5b4dd9e1ce)
2025-04-14 02:01:53 +02:00
Vitaly Provodin
d7490ef5fb updated JTreg exclude list
(cherry picked from commit 03fba5ebf2)
2025-04-14 02:01:53 +02:00
Alexey Ushakov
a0b235c307 JBR-4696 macOS: NPE in -[AWTView viewDidChangeBackingProperties]
Added null pointer checks

(cherry picked from commit b0374bdccf)
2025-04-14 02:01:53 +02:00
MonoBot
bf5f3af01b JBR-4809 Update the bundled JetBrains Mono font version
Fonts release 2.242

(cherry picked from commit 641424a3e3)
(cherry picked from commit ab5066f90f)
2025-04-14 02:01:52 +02:00
Alexey Ushakov
1767c4b4c8 JBR-4680 idea window flickers while changing the screen brightness
Update insets in separate notification

(cherry picked from commit e7936d9958)
2025-04-14 02:01:52 +02:00
Maxim Kartashev
051b15c417 JBR-4562 JBR-4610 Generate hs_err file on SIGABRT
Supported on Linux and MacOS only.
Controlled by -Djbr.catch.SIGABRT=true option; off by default.

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 987ce225b9)
2025-04-14 02:01:52 +02:00
Maxim Kartashev
d7d5e03ea9 JBR-4626 MacOS aarch64: SIGSEGV at RenderCache.get / ScaledBlit.getFromCache
Avoid C2-compiled loop crashes by replacing the handcrafted MRU cache
with a more modern LinkedHashMap-based one.

(cherry picked from commit 2f63acf3eb)
2025-04-14 02:01:52 +02:00
Nikita Gubarkov
8c09ad56aa Allow registering multiple implementations for JBR API services
This greatly reduces boilerplate when dealing with platform-specific code, one can specify multiple target implementation classes, one per platform. First found will be used.

Also added JBRApi.ServiceNotAvailableException to give services ability to validate any custom condition they want.

(cherry picked from commit 02cf2548d5)
2025-04-14 02:01:52 +02:00
Denis Fokin
94a5482def JBR-4788 "Activate window by mouse hover" Windows option isn't supported by JBR 17
backport JBR-1991 (Focus problems in Windows with X-Mouse style focus) from JBR 11

(cherry picked from commit c8ad353f45)
(cherry picked from commit a52ed88377)
(cherry picked from commit 37c6d0b417)
2025-04-14 02:01:52 +02:00
Alexey Ushakov
f73a33ab50 JBR-4784 Extra allocations of MTLRenderPipelineDescriptor affects performance in metal pipeline
Remove extra allocations

(cherry picked from commit e1fe3a3807)
2025-04-14 02:01:52 +02:00
Alexey Ushakov
77dd49393c JBR-4774 macOS: SIGILL at [libsystem_kernel] __kill in NPE / VolatileSurfaceManager.displayChanged / __displaycb_handle_block_invoke
Guarded against multiple displayChanged() notifications

(cherry picked from commit 165c9aa3aa)
2025-04-14 02:01:52 +02:00
Dmitry Batrak
ab018b3a32 JBR-4782 Synergy keyboard/mouse input: window disabled after bringing IntelliJ into focus
(cherry picked from commit f863a14b19)
(cherry picked from commit 34ec3053ab)
2025-04-14 02:01:52 +02:00
Alexey Ushakov
089b086097 JBR-4363 Changes in fonts rendering between JBR11 and JBR17
Do not use hinting for generating outlines

(cherry picked from commit 7bb3a76942)
2025-04-14 02:01:52 +02:00
Alexey Ushakov
496840fa4a JBR-3100 Exception in NSApplicationAWT: java.lang.NullPointerException at java.desktop/sun.lwawt.LWComponentPeer.windowToLocal
Added null check

(cherry picked from commit 0c23ef45ba)
2025-04-14 02:01:52 +02:00
Alexey Ushakov
fa0fbe63d0 JBR-4774 macOS: SIGILL at [libsystem_kernel] __kill in NPE / VolatileSurfaceManager.displayChanged / __displaycb_handle_block_invoke
Added null check

(cherry picked from commit 73f025e9e5)
2025-04-14 02:01:52 +02:00
Alexey Ushakov
5a9bc96f38 JBR-3102 Exception in NSApplicationAWT: Invalid parameter not satisfying: !isnan(newOrigin.y)
Handled NAN values with some defaults

(cherry picked from commit f1aed3db71)
2025-04-14 02:01:52 +02:00
Vladislav Rassokhin
b4c6592dd3 JBR-4263 Improve check_jbr_size.sh
* Fix shellcheck inspections
* Don't silently fail if TOKEN is incorrect

(cherry picked from commit e0ab03ce52)
2025-04-14 02:01:52 +02:00
Maxim Kartashev
885cd781db JBR API v0.0.4
JBR-4746 Added jetbrains.api.verifyBytecode VM option for generated bytecode verification

JBR-4753 Added JBR API for custom desktop actions

Added jetbrains.api.verbose system property for easier JBR API troubleshooting

Also fixed dependency scanning optimization by allowing search in known proxy interfaces outside com.jetbrains

JBR-3511 Way to customize implementation of java.awt.Desktop.browse()

Provided Desktop.setDesktopActionsHandler() and DesktopActionsHandler
interface, which methods will be invoked instead of the standard actions
provided that DesktopActionsHandler.isSupported() is true for the
corresponding action.

(cherry picked from commit 92b84906df)
2025-04-14 02:01:52 +02:00
Maxim Kartashev
bda22eedf0 JBR-3101 Exception in NSApplicationAWT: java.lang.NullPointerException at java.desktop/sun.lwawt.macosx.CPlatformComponent.setBounds
After CPlatformComponent.setBounds() was changed to allow for platformWindow.getPeer() == null, a few exceptions appeared that suggest platformWindow can also be null. This commit safeguards against this situation as well.

It seems that this can only be the case if the instance is created from outside of JDK, so Objects.requireNonNull() may help to catch the perpetrator.

(cherry picked from commit 5da08dcd3a)
2025-04-14 02:01:51 +02:00
Dmitry Batrak
43fedf804b JBR-4720 Focus state is broken after certain operations when VoiceOver is enabled
(cherry picked from commit dc1b49b5a6)
(cherry picked from commit 51df5fbf67)
2025-04-14 02:01:51 +02:00
Dmitry Batrak
244fd84ceb JBR-4673 Focus moves to another application on file dialog closing
(cherry picked from commit 7468974488)
(cherry picked from commit 72a74312b7)
2025-04-14 02:01:51 +02:00
Dmitry Batrak
1ec855f4a3 JBR-4665 Focus 'jitter' on window showing in WSLg
(cherry picked from commit 9b32c2a577)
(cherry picked from commit 2952a2eeb4)
2025-04-14 02:01:51 +02:00
Nikita Gubarkov
d340aef141 JBR-2523 JBR-2917 Fix emoji, ZWJ and font fallback
Implement rendering of colored outlines and bitmap glyphs in OutlineTextRenderer
Add Segoe UI Emoji to font fallback on Windows
Require layout for some emoji-related unicodes
Fix variation selectors and ZWJ

(cherry picked from commit 53059331b1)
2025-04-14 02:01:51 +02:00
Alexey Ushakov
891a642d46 JBR-2210 IDEA fails to start (JVM crashes) when using the -Dfile.encoding=UTF-8in IDEA's vmoptions file
Returning devanagari subset back for ja.UTF-8 to get non-null font name from WFontConfiguration.getTextComponentFontName(). It is a regression from JDK-8208179.

(cherry picked from commit b51254a975)
(cherry picked from commit 0588b3a885)
2025-04-14 02:01:51 +02:00
Dmitry Batrak
003b23e0bc JBR-1987 Korean/Thai characters not printed properly in annotation tooltip (e.g. spellchecker)
This changes the fonts JDK uses for font fallback on Windows. These used to be DokChampa (for Thai) and Batang/Gulim/Gulim (for Korean).
Those fonts are not available by default on Windows 10, user needs to install supplementary font language packs to get them.
Now the following fonts will be used - Tahoma (for Thai) and Malgun Gothic (for Korean). They are available by default
on Windows 7, 8 and 10.

port from JBR 11 to JBR 15 (cherry picked from commit 850653192b)

cherry picked from commit 2bf43a57ab

Kept only Thai-related changes - Korean-related issues are now fixed in OpenJDK as per JDK-8190907

(cherry picked from commit 56139b5800)
2025-04-14 02:01:51 +02:00
artem.bochkarev
b551b3ce80 JBR-4581 JCEF tests fail due to compilation errors
The problem was in commit "JBR-4512 windows: include pdb-files into jbrsdk": rsync can replace file lib/modules.
rsync is replaced with cp

(cherry picked from commit 6cd310aaa8)
2025-04-14 02:01:51 +02:00
Vitaly Provodin
058814d8a8 exclude sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java on linux-all due to 8252812
(cherry picked from commit 336230c628)
2025-04-14 02:01:51 +02:00
Vitaly Provodin
6355eb69b9 exclude sanity/client/SwingSet/src/ColorChooserDemoTest.java on windows-all due to 8278582
(cherry picked from commit 07e8b19419)
2025-04-14 02:01:51 +02:00
Alexey Ushakov
afe892cfff JBR-4636 Some JWindow tests failed due to wrong scaling
Take into account custom scale via sun.java2d.uiScale

(cherry picked from commit 5a91de055f)
2025-04-14 02:01:51 +02:00
Nikita Gubarkov
cd51a367a4 8289189: Fix ./configure on WSL1
(cherry picked from commit 617ed45c5c)
2025-04-14 02:01:51 +02:00
Alexey Ushakov
2ee7255720 JBR-4619 Window content scale wrong after disconnecting external display / waking OS from sleep
Use viewDidChangeBackingProperties notification to adjust a window layer scale

(cherry picked from commit abb34d2295)
2025-04-14 02:01:51 +02:00
Vitaly Provodin
2d29cd9dc6 exclude vmTestbase/vm/jit/LongTransitions due to 8271615 on macOS
(cherry picked from commit 66e8a68de9)
2025-04-14 02:01:51 +02:00
Maxim Kartashev
e74c3d5f79 JBR-4602 Unexpected NoSuchFileException running Rider test
This reverts commits for JBR-3680, JBR-4118, and JBR-4485.

(cherry picked from commit 5a165aa533)
2025-04-14 02:01:50 +02:00
Nikita Gubarkov
167ecc30e9 JBR-4373 Add mapping for .NewYork-* and .SFArabic-* system fonts
(cherry picked from commit e34f1abedc)
2025-04-14 02:01:50 +02:00
Alexander Lobas
c207fc0ac2 JBR-4563 Rounded corners for native Window on Mac OS (#156)
* JBR-4563 Rounded corners for native Window on Mac OS

(cherry picked from commit 740a086a00)
2025-04-14 02:01:50 +02:00
Alexander Lobas
889a3f08de JBR-4563 Rounded corners for native Window on Mac OS
(cherry picked from commit 4aecaafa7c)
2025-04-14 02:01:50 +02:00
Alexander Lobas
e1ad90c289 JBR-4305 (#119)
* IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

* IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

* JBR-4305 IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

* JBR-4305 IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

(cherry picked from commit e91239081a)
2025-04-14 02:01:50 +02:00
Alexey Ushakov
58e95dfb90 JBR-4591 macOS: SIGILL at [libsystem_kernel] __kill in -[__NSMallocBlock__ removeFromSuperview]: unrecognized selector sent to instance
Verified if windowDragView is present

(cherry picked from commit c45d897c4b)
2025-04-14 02:01:50 +02:00
Artem Bochkarev
b331b820c7 JBR-4475: fixed browsers numeration in test
theoretically it can cause 2 requests with the same query_id: "cef_query_2" (when first browser finishes loading after the creation of second one)

(cherry picked from commit e95de19533)
2025-04-14 02:01:50 +02:00
Artem Bochkarev
fa0ab8c5e0 JBR-4456: fixed HandleJSQueryTest
first invocation of dispatch(WindowEvent.WINDOW_CLOSING) calls System.exit() internally (because of setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE))

(cherry picked from commit 0f9afa7fbc)
2025-04-14 02:01:50 +02:00
Vitaly Provodin
4b2f6c7996 exclude javax/swing/JToolBar/4529206/bug4529206.java due to 8288707 on linux
(cherry picked from commit 8bc1905696)
2025-04-14 02:01:50 +02:00
Maxim Kartashev
1275e14f42 JBR-3101 Exception in NSApplicationAWT: java.lang.NullPointerException at java.desktop/sun.lwawt.macosx.CPlatformComponent.setBounds
CWarningWindow doesn't have a peer, so accomodated for that in
CPlatformComponent.setBounds().

(cherry picked from commit f098902457)
2025-04-14 02:01:50 +02:00
Maxim Kartashev
261b9ee6c3 JBR-4485 Windows: EXCEPTION_ACCESS_VIOLATION at sun.nio.fs.WindowsDirectoryStream$WindowsDirectoryIterator.readNextEntry
As a precaution, range-check the offset returned by WinAPI before
using it to read raw memory with Unsafe.

(cherry picked from commit cfc743741a)
2025-04-14 02:01:50 +02:00
Vitaly Provodin
73597aa71e JBR-4570 improve synchronization and increase waiting time
(cherry picked from commit d7b11a1925)
2025-04-14 02:01:50 +02:00
Dmitry Batrak
3c12216336 JBR-4552 Windows revert back after initial move/resize in Cygwin/X
(cherry picked from commit 6dc194e089)
(cherry picked from commit 9c2eccb07c)
2025-04-14 02:01:50 +02:00
Manuel Unterhofer
5b47f07be2 FL-11598 Fix accidental reset of window configuration for custom decoration on macOS
This also aligns the handling of the style mask with how the other settings are applied: It uses a client property now. This property is now also applied directly on peer initialization so that there is no need to re-apply, and the window directly appears in the correct configuration.

(cherry picked from commit 4f254fac9d)
2025-04-14 02:01:50 +02:00
Nikita Provotorov
35b30ffda4 JBR-4394, IDEA-246833: refactoring and blocking the fix of JBR-1573 to recreate IMs and ICs during preediting.
(cherry picked from commits 7a36587db8d3d5a63c5691243cd5bf56733c06e6, 321a4a3f83)

(cherry picked from commit be5f54fc99)
2025-04-14 02:01:50 +02:00
Nikita Provotorov
bc4d8a73e9 JBR-4394, IDEA-246833: fixup of JBR-2444.
(cherry picked from commit ef262dc8bb)
(cherry picked from commit b026461771)
2025-04-14 02:01:49 +02:00
Dmitry Batrak
34764f9ee8 JBR-4537 Popup windows shown for a background window cause app icon to blink in taskbar on KDE
(cherry picked from commit 704ffcc0ee)
2025-04-14 02:01:49 +02:00
Dmitry Batrak
4c2d0f80fb JBR-4535 Popup windows disappear on mouse hover when 'Focus strictly under mouse' policy is used in KDE
(cherry picked from commit a70a83e7fe)
2025-04-14 02:01:49 +02:00
Alexey Ushakov
7aedf2f111 JBR-3828 restore details for Java exceptions in crash dumps handled by ObjC
Added exception.toString() to jbr_err_* log

(cherry picked from commit 478bd6cdd7)

Added java stack of the exception to jbr_err_* log

(cherry picked from commit e97f728e93)

Also return the static string "OutOfMemoryError" in case of that
exception has been thrown in order to avoid crashing while reporting an
exception in an out-of-memory situation.

(cherry picked from commit b64f2a86ad)
2025-04-14 02:01:49 +02:00
Vitaly Provodin
4de3b97ea3 exclude jb/java/awt/Window/ZOrderOnModalDialogActivation.java from S2 runs on Windows and Linux
(cherry picked from commit c1cb686198)
2025-04-14 02:01:49 +02:00
Vitaly Provodin
ff992d4c3f exclude javax/swing/plaf/nimbus/TestNimbusOverride.java on windows due to 8253184
(cherry picked from commit 5c6f2241db)
2025-04-14 02:01:49 +02:00
Vitaly Provodin
4a4031b352 exclude java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java on linux-aarch64 only due to 8266283
(cherry picked from commit cc5f59a5ed)
2025-04-14 02:01:49 +02:00
Artem Bochkarev
460bd55aeb JBR-4473: fixed native part of SystemHotkeyReader
(cherry picked from commit 4d96436851)
2025-04-14 02:01:49 +02:00
Dmitry Batrak
c18efe8ad6 JBR-1740 Menu remains open when application loses focus
(cherry picked from commit f987d22cd2)
(cherry picked from commit 4a7913c9e6)
2025-04-14 02:01:49 +02:00
Vitaly Provodin
5f13975c8f exclude Frame/RestoreToOppositeScreen/RestoreToOppositeScreen.java from S2 runs due to 8286840
(cherry picked from commit 811db62fec)
2025-04-14 02:01:49 +02:00
Vitaly Provodin
2639fc79ed exclude java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java due to 8282232
(cherry picked from commit 17d6d1047e)
2025-04-14 02:01:49 +02:00
Maxim Kartashev
5cf2c0bf41 JBR-4471 Linux: popup appears on wrong screen after desktop scale change
When screen scale changes, the cached screen bounds must be explicitly
updated. Call resetBoundsCache() whenever X11GraphicsDevice.scale has
changed.

(cherry picked from commit 1bb3b2fa32)
2025-04-14 02:01:49 +02:00
Manuel Unterhofer
207e333d73 Merge fullscreen handlers for transparent title bar into existing ones
(cherry picked from commit a992612585)
2025-04-14 02:01:49 +02:00
Manuel Unterhofer
b0a84daa35 FL-11420 Fix view hierarchy restoration for full-screen mode on macOS
(cherry picked from commit f708ad2c57)
2025-04-14 02:01:49 +02:00
Nikita Gubarkov
d0d1fa8351 JBR-4364 Port macOS native file dialog patches
IDEA-146669 Enable Mac native file dialogs
IDEA-159507 Mac native dialogs: multiple open dialogs are possible
JBR-1784 File dialogs aren't themed on macOS
JBR-1752 Floating windows overlap modal dialogs
JBR-2005: don't set appearance of file chooser if OSX version < 10.14
JBR-4546 Focus is not returned back to IDE after closing "Open" dialog

(cherry picked from commit e5646125e4)
2025-04-14 02:01:48 +02:00
Dmitry Batrak
8bc11c21cf JBR-4463 Activating app-modal dialog brings all app windows to front
(cherry picked from commit 2b05925276)

includes fix for JBR-4642 regression: "focus follows mouse" broken for modals, I need to click into them

(cherry picked from commits c55bf03680, ec748f84fb)

includes fix for JBR-4957 regression: "Modal dialog is hidden by sibling popup on Linux"

(cherry picked from commit ea8da3cbe5)

includes fix for JBR-4968: jb/java/awt/Window/ModalDialogAndPopup.java intermittently fails by TimeoutException

(cherry picked from commit 2e9ab0cb06)
(cherry picked from commit 72b9219964)
2025-04-14 02:01:48 +02:00
Maxim Kartashev
d1624c1ae9 JBR-4464 Error building latest jbr-dev after JDK-8285730
(cherry picked from commit 8b0ae02f8d)
2025-04-14 02:01:48 +02:00
Maxim Kartashev
20b864c78f JBR-4118 NIO methods fail on Google Drive's virtual volume
If NtQueryDirectoryFile() failed with STATUS_INVALID_PARAMETER,
try again asking for less information with the FileDirectoryInformation
option as "information class". This option works on a mounted
Google Drive, but it doesn't provide file ids, which speed
up file listing. So it is used only as a fall-back solution.

(cherry picked from commit 82693aa985)
(cherry picked from commit 732a5c9ad6)
2025-04-14 02:01:48 +02:00
Maxim Kartashev
5e34a7a393 JBR-3680 Cherry-pick Google's NIO patches to get faster file listing
Fix regression introduced by Google's NIO patches:
- do not attempt to get the next entry after the directory stream has
been closed already,
- fix FaultyFileSystem that is used in StreamTest.java to throw
the right exception even when getFileAttributeView() is used instead of
readAttributes(),
- removed unnecessary type cast that caused a compilation warning.

Added a test for walking a directory with a non-latin name.

(cherry picked from commit 152a4e886d)
(cherry picked from commit f5638a96b9)
2025-04-14 02:01:48 +02:00
Renaud Paquay
1ca6d9d5b1 JBR-3680 Improve performance of WindowsDirectoryStream
Use `NtQueryDirectoryInformation` instead of `FindFirst/FindNext` to
retrieve the list of entries of a directory.

`NtQueryDirectionInformation` has 2 main benefits over
`FindFist`/`FindNext`:

* Performance is about 40% faster

* Each retrieved entry retrieved contains a 64-bit `FileId` in addition
  to the usual attributes, ensuring that returned `java.nio.Path`
  instances hold onto a `BasicFileAttributes` instance that exposes a
  non-null `java.nio.file.attribute.BasicFileAttributes.fileKey()`.

This change also requires creating a new WindowsFileKey class, similar
to UnixFileKey class, so that
`java.nio.file.attribute.BasicFileAttributes.fileKey()` can return an
Object instance that can be used to compare files for equality.

With this change, the Windows implementation of Files.walkFileTree is
about 40% faster when the FOLLOW_LINKS option is not used, and about
2.5x faster when the FOLLOW_LINKS option is used.

When the FOLLOW_LINKS option is used, most calls to
`Files.isSameFile`, which is expensive as it requires 2 file I/O
operations, are avoided because the Path entries returned by the
new WindowsDirectoryStream implementation now contain a non-null
BasicFileAttributes.fileKey(). The remaining calls to
`Files.isSameFile` are performed when Files.walkFileTree need
to compare the initial directory with other entries.

Change-Id: Id79d89d477a6d5dcf151c63a9d6072c6f7ef43b2

(AKA JBR-3680 Cherry-pick Google's NIO patches to get faster file listing)

(cherry picked from commit 7c2d7541ba)
(cherry picked from commit 7a4078bf29)
2025-04-14 02:01:48 +02:00
Dmitry Batrak
d0109d4c1e JBR-1518 JBR 11 does not support chain of popups on Linux
(cherry picked from commit 849356ee01)
(cherry picked from commit b85be77543)
2025-04-14 02:01:48 +02:00
Dmitry Batrak
32a61b3c49 JBR-4306 Robot doesn't work as expected in some cases on macOS
(cherry picked from commits 7d69734465, 0f33031484, 3b5ded0d02)

(cherry picked from commit 4557795f2e)
2025-04-14 02:01:48 +02:00
Ryan Osial
ad40519d6f Cache results of font-config pattern search for reuse
(cherry picked from commit 432f637904)
(cherry picked from commit 17bc232f6f)
(cherry picked from commit ee3a5cdda9)
2025-04-14 02:01:48 +02:00
Maxim Kartashev
92741aa47c JBR-3948 Linux: SIGSEGV at [libawt_xawt] Java_sun_awt_X11_XInputMethod_createXICNative
The crashes begin with the call to getDefaultConfig() in
createStatusWindow() returning garbage. With 8280468 fixed, there aren't
many reasons left for it to do so; it must be that the argument to the
call (the screen number) is out of range.

This change eliminates the possibilities to get an absolutely incorrect
screen number by checking the return values of several Xlib functions,
which, when fail, will leave their outgoing arguments uninitialized.
This, in turn, can lead to reading some random memory resulting in
equally random screen number that is later being fed to
getDefaultConfig().

Although on modern systems with Xinerama there should really be no
screen other than zero, as the last resort, this number is also
range-checked in getDefaultConfig() itself.

(cherry picked from commit dec75d7601)
2025-04-14 02:01:48 +02:00
Anton Tarasov
27d708ae57 JBR-4389 [update_1] IDEA UI font becomes too large after disconnecting the external monitor / sleep
(cherry picked from commit 74c977e942)
2025-04-14 02:01:48 +02:00
Anton Tarasov
f10e393b3d JBR-4389 IDEA UI font becomes too large after disconnecting the external monitor / sleep
(cherry picked from commit 1288c65208)
2025-04-14 02:01:48 +02:00
Dmitry Batrak
d8de95315e remove duplicate bundled JetBrains Mono bold italic font
following JBR-4402

(cherry picked from commit b7e5d3cfcf)
(cherry picked from commit ac765d3d2c)
2025-04-14 02:01:48 +02:00
Dmitry Batrak
3da2511720 JBR-4402 The wrong text is rendered in editor
(cherry picked from commit 8c1de95991)
2025-04-14 02:01:48 +02:00
Vitaly Provodin
c259f3c1f6 JBR-4297 add a regression test
(cherry picked from commit 8e94fff6aa)
(cherry picked from commit 8eb5ce4b34)
2025-04-14 02:01:48 +02:00
Konstantin Bulenkov
d139741733 Update JetBrains Mono font to 2.225
(cherry picked from commit 84c7519c7e)
2025-04-14 02:01:47 +02:00
Alexey Ushakov
27b687e910 JBR-4363 Changes in fonts rendering between JBR11 and JBR17
Resolved merge artifact after applying IDEA-57233 fix

(cherry picked from commit 0e2c16e0f0)
2025-04-14 02:01:47 +02:00
Alexey Ushakov
3806fda073 JBR-3843 IDE text is misaligned vertically when using Consolas font
Use usWinAscent/usWinDescent for metrics on Windows

(cherry picked from commit 4aed6ab51d)
2025-04-14 02:01:47 +02:00
Alexey Ushakov
95ff17680f JBR-1110 [JDK11] java/awt/font/Outline/OutlineInvarianceTest.java: Failed for font java.awt.Font[family=Dialog,name=MS Gothic,style=bold,size=30]
Replaced FT_LOAD_NO_HINTING mode for non AA rendering with FT_LOAD_TARGET_LIGHT

(cherry picked from commit 3368768244)
(cherry picked from commit 62b8fd828f)
2025-04-14 02:01:47 +02:00
Alexey Ushakov
e89b739dcd JBR-2000 RM 2019.3.1 font rendering regression, normal text is heavier
Added -Djava2d.font.loadFontConfig=bundled to force loading bundled font.conf

(cherry picked from commit 788e078f64)
(cherry picked from commit 052b5d72a2)
2025-04-14 02:01:47 +02:00
Dmitry Batrak
dcf896bba8 JBR-4346 [Xfce] Windows are moved unexpectedly between workspaces when modal dialog is shown
(cherry picked from commits ad299f1e74, 800220af16)

(cherry picked from commit d0a2903730)
2025-04-14 02:01:47 +02:00
Alexey Ushakov
ed08c46e9f JBR-3827 SIGILL at [libsystem_kernel] __kill in Java Exception at -[CDragSource convertData:]
Added check for drag source

(cherry picked from commit a2b6100b57)
2025-04-14 02:01:47 +02:00
Alexey Ushakov
7f1f41b00f JBR-3366 SIGILL at [libsystem_kernel] __kill in NSWindowStyleMaskFullScreen cleared on a window outside of a full screen transition
Wrapped the native exception and added logging

JBR-4882 Unable to exit fullscreen mode after Presentation mode was entered (and exited) on macOS

(cherry picked from commit d57e8b631b)
(cherry picked from commit 5bfbdd28f2)
2025-04-14 02:01:47 +02:00
Alexey Ushakov
332c384746 JBR-3365 SIGILL at [libsystem_kernel] __kill in java.lang.RuntimeException: Failed to convert, no screen / primaryScreen
Wrapped the native exception and added logging

(cherry picked from commit 6b8308d149)
2025-04-14 02:01:47 +02:00
Dmitry Batrak
8b801f229f JBR-3751 Window content isn't rendered with some window managers on Linux
(cherry picked from commit 8d22e4dcb0)

includes fix for JBR-5046 Incorrect initial window's location in Xfce

(cherry picked from commits 234e705134, 02bc54f864)

includes fix for JBR-5458 Exception at dialog closing

(cherry picked from commit acde759572)
(cherry picked from commit c138965be0)
2025-04-14 02:01:47 +02:00
Vitaly Provodin
7c6a6c1338 JBR-4294 split desktop tests to more groups for Commit testing
(cherry picked from commit e2360b07b9)
2025-04-14 02:01:47 +02:00
Dmitry Batrak
976f6e5e70 JBR-4281 Window losing focus isn't detected in some cases on macOS
(cherry picked from commit 363650bbf4)

with JBR-4638 Regression: Unable to enter emoji in editor via Emoji & Symbols on macOS

(cherry picked from commit 8b9a00915d)

with JBR-4652 With multiple projects open non-fullscreen, right-click on Dock icon to select the project from the context menu doesn't switch to that project

(cherry picked from commit e34677587d)

with JBR-5134 Input methods can't be dynamically disabled on a focused JComponent

(cherry picked from commit 0a3f4b206d)
(cherry picked from commit 0307ccab3b)
2025-04-14 02:01:47 +02:00
greg
029c4200a0 macOS: add methods to setup transparent titlebar with custom height (#100)
* macOS: add methods to setup transparent titlebar with custom height

* make windowTransparentTitleBarHeight CPlatfromWindow property

* add windowTransparentTitleBarHeight test

* Prevent mouseUp events on the transparent header on macOS when the window is being dragged

Co-authored-by: Manuel Unterhofer <manuel.unterhofer@jetbrains.com>

Custom macOS window decorations via JBR API

JBR-4460 Fix window drag with custom decorations on macOS

JBR-4553 Add logging to setUpTransparentTitleBar and resetTitleBar

(cherry picked from commit f5552eed4d)
2025-04-14 02:01:47 +02:00
Denis Fokin
c5d98f42d1 JBR-4038 [JBR17] Force Touch events are not supported on macOS
Added missing files and handlers from JBR11

(cherry picked from commit 0a82277650)
2025-04-14 02:01:47 +02:00
Alexey Ushakov
14d942f517 JBR-3901 jbr-dev compile problem
Added transient keyword

(cherry picked from commit 8bd487eca9)
2025-04-14 02:01:46 +02:00
Alexander Lobas
b90f8b3bc6 JBR-2893 Big Sur: Add support of opening project as tabs IDEA-257932 Big Sur: IDEA hangs after closing a project tab after exiting and entering full screen
Converted JNF to JNIUtilites

(cherry picked from commit f02e31a440)
(cherry-picked from commit a84736ebcc)
(cherry picked from commit e33f506e48)
2025-04-14 02:01:46 +02:00
Dmitry Batrak
ca056b77d1 JBR-3676 WINDOW_ACTIVATED/DEACTIVATED events sent to a frame when child window closes on macOS
(cherry-picked from commit 824f9ebec3)

(cherry picked from commit 41b9f9cf1c)
2025-04-14 02:01:46 +02:00
Dmitry Batrak
d2d443fc1f JBR-3611, JBR-3633, JBR-3666, JBR-3663, JBR-3671, JBR-3673, JBR-4181, JBR-4186, JBR-4893 Interoperability with macOS desktop spaces
(cherry-picked from commits 43fdd6cd26, 75335543f2, a156c6b9bf, 9fdc75969b, 1dcc612a81, 93588d0738, 94a3885bbe, c040e05703, 67b6cd871f, 9040fd56cd, 6349b86b7f)

(cherry picked from commit 4fb4d51b89)
2025-04-14 02:01:46 +02:00
Dmitry Batrak
a41c5c4f07 refactor nativeCreateNSWindow call wrapping
as part of JBR-3017

(cherry picked from commit eeef67a335)
(cherry picked from commit 1bb0bf3f82)
2025-04-14 02:01:46 +02:00
Dmitry Batrak
d10f31480e remove excessive wrapping with AccessController (AWTThreading does it internally now)
as part of JBR-3017

(cherry picked from commit f1dd523ba8)
(cherry picked from commit f2449217c1)
2025-04-14 02:01:46 +02:00
Dmitry Batrak
b5d0b600bb JBR-2971 Log more information about window creation and property changes
(cherry picked from commit 9d86b4d235)
(cherry picked from commit e93eeba9c2)
2025-04-14 02:01:46 +02:00
Dmitry Batrak
3ecf93c733 JBR-2533 Popup is not focused on click when switching from another application on macOS
(cherry picked from commits d9ff151211, 67b174dc8c, 72b0add80c, 21af1eba85, 2f1d317d87, 6dd334f9f0, cd863bac0d, 010f6fc951, 25e087d269, parts of 7d5ac56b6c, cd6dd5c3cf, e8bbd8ffdd, abfc3e2e79, 50933cd23e)

with fix for JBR-3640 (java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java: window Open button lost focus when it should not) and JBR-3979 (Focus is not transferred to parent window)

with fix for JBR-5300 Change source code and test files to use GPL license

with fix for JBR-2651 jb/java/awt/Focus/PopupIncomingFocusTest.java intermittently fails by java.util.concurrent.TimeoutException

(cherry picked from commit 56795d5d06)
2025-04-14 02:01:46 +02:00
Nikita Provotorov
d173ce08a2 JBR-4271: JBR17 and dev built without --with-vendor-name parameter have invalid value of the java.vm.vendor property.
Changes the default JBR's vendor from "Oracle Corporation" to "JetBrains s.r.o.".

(cherry picked from commit 0cb7b4565c)
(cherry picked from commit 62b01f9f56)
2025-04-14 02:01:46 +02:00
Nikita Gubarkov
1cee626929 JBR API v0.0.3
JBR-4228 report HTMINBUTTON, HTMAXBUTTON, HTCLOSE, HTMENU, HTCAPTION targets via JBR API & handle corresponding non-client mouse events for windows with custom decoration

(cherry picked from commit cacbbdc041)
2025-04-14 02:01:46 +02:00
Alexey Ushakov
8e229e05c1 JBR-4224 java/awt/image/VolatileImage/GradientPaints.java: Number of mismatches (300000) exceeds limit (54000) with tolerance=5
Updated reg test to handle contentLost event

(cherry picked from commit e6dc0c5b8f)
2025-04-14 02:01:46 +02:00
Vitaly Provodin
0bd5d98374 exclude javax/swing/border/TestTitledBorderLeak.java on windows due to 8213531
(cherry picked from commit c32cf1fe07)
2025-04-14 02:01:46 +02:00
Ivan Lopatin
50554801c5 Scale2: exclude java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java due to 8279190 on macosx-all
(cherry picked from commit 58854d5467)
2025-04-14 02:01:46 +02:00
Nikita Provotorov
55e2bbf7f0 JBR-3299: The test /jb/sun/awt/macos/NationalLayoutTest/Layout_ABC.java fails on MacOS.
Fixes the Layout_*.java tests by giving them to know the <Ctrl + key> combinations can generate KEY_TYPED event.

(cherry picked from commit eae5198b20)
(cherry picked from commit 072ae64f96)
2025-04-14 02:01:46 +02:00
Vitaly Provodin
e36037ae0d exclude java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java on Wayland
sun/security/pkcs11/Signature/TestDSAKeyLength.java                                 8279941 linux-all

(cherry picked from commit ddd0a7409d)
2025-04-14 02:01:45 +02:00
Alexey Ushakov
7bda7080fb JBR-4112 macOS: SIGILL at [libsystem_kernel] __kill in OOME: Java heap space at java.awt.image.DataBufferInt.<init>
Reg test update: replace management api with jfr

(cherry picked from commit 5a0d365094)
2025-04-14 02:01:45 +02:00
Nikita Provotorov
0d2b84ee43 JBR-4207, IDEA-287559: IDEA incorrectly handles AltGr key modifier.
This commit reverts the fix of JDK-8041928 and disables its regression tests.

(cherry picked from commit ba5209ec06)
(cherry picked from commit 19b7745ce3)
2025-04-14 02:01:45 +02:00
Nikita Provotorov
ccbeee275f JBR-4207, IDEA-287559: IDEA incorrectly handles AltGr key modifier.
Renames the test AltGrMustGenerateAltGrModifierTest3838.java to AltGrMustGenerateAltGrModifierTest4207.java.

(cherry picked from commit ed60a9c2bd)
(cherry picked from commit cbacbf6d4e)
2025-04-14 02:01:45 +02:00
Vitaly Provodin
44e0380988 exclude sun/security/pkcs11/Signature/TestDSAKeyLength.java on Ubuntu 21.04 due to 8279941
(cherry picked from commit c3d8e648a6)
2025-04-14 02:01:45 +02:00
Anton Tarasov
4f96a4010c JBR-4204 provide an option to disable a11y support on macOS
(cherry picked from commit ee3c56abdc)
(cherry picked from commit e2419baf87)
2025-04-14 02:01:45 +02:00
Vitaly Provodin
4bc21e1cf5 exclude two swing tests on Windows due to JBR-4197
(cherry picked from commit 3a99f6b99d)
2025-04-14 02:01:45 +02:00
Alexey Ushakov
cc9e1882ed JBR-4112 macOS: SIGILL at [libsystem_kernel] __kill in OOME: Java heap space at java.awt.image.DataBufferInt.<init>
Removed double allocation of surface data

(cherry picked from commit 041285b65c)
2025-04-14 02:01:45 +02:00
Alexey Ushakov
0fbb6e4de5 JBR-4187 java/awt/GraphicsDevice/DisplayModes/UnknownRefrshRateTest.java.UnknownRefrshRateTest fails on mac
Constrained display modes count used by the test

(cherry picked from commit d757e23958)
2025-04-14 02:01:45 +02:00
Alexey Ushakov
b81429966d JBR-4177 libc++abi: terminating with uncaught exception of type NSException
Added check for AppContext

(cherry picked from commit 54c83d2ef6)
2025-04-14 02:01:45 +02:00
Alexey Ushakov
c92b66ae52 JBR-4174 java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java fails on mac aarch64
Hide cursor to fix OGL&Metal Robot issue (it reads cursor image). Added tolerance to fix Metal Robot inaccuracy.

(cherry picked from commit a66693cc92)
2025-04-14 02:01:45 +02:00
Artem Semenov
c489ac093f JBR-4167 [JCK] AccassibleJTree tests fail on Ubuntu
(cherry picked from commit 40e8687667)
2025-04-14 02:01:45 +02:00
Alexey Ushakov
9c87eb478a JBR-4164 IDEs cannot be launched via launch configuration
Moved execution of displayChanged() to EDT

(cherry picked from commit b6f91a9c10)
2025-04-14 02:01:45 +02:00
Vitaly Provodin
d269d8d8f0 JBR-4169 add jdk.javadoc into JBR
(cherry picked from commit 861742faf1)
2025-04-14 02:01:45 +02:00
Alexey Ushakov
53673270f0 JBR-4150 IDE regularly locks up at sun.lwawt.macosx.LWCToolkit.getScreenInsets
Restored caching screen insets. Added handling of dock resize.

(cherry picked from commit e3d7c52e93)
2025-04-14 02:01:45 +02:00
Vitaly Provodin
5d40dafe1d exclude java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java on Wayland configs due to 8279256
(cherry picked from commit 9d17b66630)
2025-04-14 02:01:44 +02:00
Vitaly Provodin
e1c11d6a51 exclude java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java on Scale2 configs due to 8279190
(cherry picked from commit 0949bd7a8a)
2025-04-14 02:01:44 +02:00
Vitaly Provodin
d988b1ccb1 exclude java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java due to 827361
(cherry picked from commit b98807e58f)
2025-04-14 02:01:44 +02:00
Vitaly Provodin
11b844e8dc add exclude list for Wayland failures
(cherry picked from commit 2b7bdfe3d5)
2025-04-14 02:01:44 +02:00
Vitaly Provodin
39d6f27d77 exclude javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation /JComboBoxPopupLocation.java on macOS due to 8194945
(cherry picked from commit 86f21becde)
2025-04-14 02:01:44 +02:00
Vitaly Provodin
622eddee0b exclude sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java on windows due to 8144029
(cherry picked from commit f3f6365d05)
2025-04-14 02:01:44 +02:00
Maxim Kartashev
fcd691293e JBR-3948 Linux: SIGSEGV at [libawt_xawt] Java_sun_awt_X11_XInputMethod_createXICNative
The problem: the crashes occur in createStatusWindow() when calls like
adata->AwtColorMatch() end up going to 0x0 pc or some random inaccessible
memory. The only reason for that seems to be the
getDefaultConfig(screen) returning either NULL or garbage. That, in turn, probably
happens because of the wrong screen number provided. Before JBR-3623 was
fixed, awt_numScreens could've changed between the time the screen
number was chosen and the getDefaultConfig() call. After JBR-3623 was
fixed, this change is protected with the AWT lock, which this code
holds.
The fix: obtain the screen number via the Xlib API rather than the
ad-hoc loop though the root windows and return NULL if
getDefaultConfig() doesn't return useable data.

(cherry picked from commit 3d23e8d6a5)
(cherry picked from commit 924f5bab8a)
2025-04-14 02:01:44 +02:00
Vitaly Provodin
0cc174577e add exclude list for Scale2 test runs
(cherry picked from commit 45ddfe3353)
2025-04-14 02:01:44 +02:00
Vitaly Provodin
1f7ff1fd76 exclude java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java due to 8134231
(cherry picked from commit defd9f66a7)
2025-04-14 02:01:44 +02:00
Alexey Ushakov
5449bb6e1f JBR-3773 M1 java/awt/Window/WindowAppearanceTest/WindowAppearanceTest.java: : Incorrect color java.awt.Color[r=75,g=74,b=72]at (140,5)
Added more variants of colors for unfocused and focused titles

(cherry picked from commit 93e508a98f)
2025-04-14 02:01:44 +02:00
Artem Semenov
d40ee049fd JBR-3775 Optimize the algorithm for obtaining tree elements
(cherry picked from commit 01dbe66b3e)
2025-04-14 02:01:44 +02:00
Nikita Gubarkov
432e275778 JBR API v0.0.2
Added file dialog customization via JBR API & fixed bugs in windows common item dialog

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 45c562e366)
2025-04-14 02:01:44 +02:00
Vitaly Provodin
5900f04660 JBR-3931 add the module jdk.unsupported.desktop into jbr
(cherry picked from commit 32def2fd42)
(cherry picked from commit d8fd2c9664)
2025-04-14 02:01:44 +02:00
Alexey Ushakov
d6c503323b JBR-4111 [JBR17] Make possible to select files and directories independently
Implemented apple.awt.fileDialogForFiles property

(cherry picked from commit 67ea24d06e)
2025-04-14 02:01:44 +02:00
Vitaly Provodin
bd9eec2249 enable fixed tests to regular runs
(cherry picked from commit ae87bdb09a)
2025-04-14 02:01:43 +02:00
Vitaly Provodin
4319dca9d7 exclude javax/swing tests on mac-aarch64 due to 8277816
(cherry picked from commit a39f9150c3)
2025-04-14 02:01:43 +02:00
Aleksandr Veselov
4e4b7ec392 JBR-4107 A11y: macOS - wrong frame position if window is not on primary screen
(cherry picked from commit 6006b52f33)
2025-04-14 02:01:43 +02:00
Alexey Ushakov
6bffe708bc JBR-4060 [JBR17+Metal] Flickering on button's shadow
Removed unnecessary global flag. Optimized mask cache texture clearing code.

(cherry picked from commit 4496acc610)
2025-04-14 02:01:43 +02:00
Alexey Ushakov
947e750e9a JBR-3954 Transparent text color rendering (needed for experimental UI)
Performed conversion from ARGB_PRE to ARGB in the grayscale text shader

(cherry picked from commit 8339ec581f)
2025-04-14 02:01:43 +02:00
Alexey Ushakov
ac11cc829f JBR-3872 [JBR17+Metal] Wrong color for scrollbars and inlay hints
Corrected typo in setTxtUniforms and fixed alpha blending in frag_gmc_text shader

(cherry picked from commit 3276a2f8ea)
2025-04-14 02:01:43 +02:00
Alexey Ushakov
7cb0e3e381 JBR-3820 Gamma correction for grayscale text in Metal rendering pipeline
Implemented gamma correction using the same approach that we did for OGL grayscale text rendering (OGLTextRenderer.c)
Optimized shader performance

(cherry picked from commit 5b290231ac)
2025-04-14 02:01:43 +02:00
Alexey Ushakov
d57c3c2aa4 JBR-4104 jbr-dev compilation failure
Corrected suppress warnings

(cherry picked from commit 3ff69f1653)
2025-04-14 02:01:43 +02:00
Dmitry Batrak
c1f838333a JBR-4084 Default font '. AppleSystemUIFont' does not have bold weight on Chinese characters
(cherry picked from commit 4fde082d53)
(cherry picked from commit dc1806aa60)
2025-04-14 02:01:43 +02:00
Maxim Kartashev
ade05b0b86 JBR-3899 SIGSEGV at [libjvm] _ZN23JfrNetworkInterfaceName11on_rotationEv
Prevent JfrNetworkInterfaceName::on_rotation() to dereference a
potentially NULL pointer.

(cherry picked from commit b2a9372d70)
(cherry picked from commit 23ca382acc)
2025-04-14 02:01:43 +02:00
Dmitry Batrak
3c8d3d0bd2 JBR-4021 Unexpected focus event order on window showing
(cherry picked from commit 2a398ebb24)

includes fix for JBR-4131 Popup doesn't get focus if created from context menu

(cherry picked from commit 685562aafc)
(cherry picked from commit bb25c734db)
2025-04-14 02:01:43 +02:00
Maxim Kartashev
0c7105c6da JBR-3923 Internal Error in c1_Instruction.cpp
Make C1 hotspot compiler bail out during CFG construction if there's a
cycle in the graph that isn't a natural loop and that has led to an
unexpected state of stack/locals like missing a phi function.

This is a temporary measure that lets hotspot continue working
even after encountering such bytecode patterns. The full solution
will probably involve more sophisticated CFG checks.

(cherry picked from commit aa0b61cb75)
(cherry picked from commit f7a8581991)
2025-04-14 02:01:43 +02:00
Vitaly Provodin
c3a9e53b7f exclude tests spontaneously creating windows during test execution
(cherry picked from commit 0dc17f51ed)
2025-04-14 02:01:43 +02:00
Maxim Kartashev
8849c4a34f JBR-2755 IDE UI became slow via remote X Server connection from Windows
When XGetImage() calls become slow in a remote X11 session, fake
XGetImage() with client-side XCreateImage() that is filled with some
background color. The color is chosen from several top left corner
pixels of the "slow" images obtained with XGetImage().

This feature activates in a remote X11 session only and is
controlled with -Dremote.x11.workaround={true|false|auto}.

(cherry picked from commit 99e8557c5b)
2025-04-14 02:01:42 +02:00
Alexey Ushakov
25875aee2f JBR-3924 CMD+Tilda does not switch app windows
Introduced vm property to disable capturing of next app window shortcut

(cherry picked from commit 15c52c44ee)
2025-04-14 02:01:42 +02:00
Nikita Gubarkov
6ddbc500f8 JBR-2917 Added emoji support for Windows
JBR-3951 Pass real glyph type from native code instead of guessing it by rowBytes & width

(cherry picked from commit 1a7a1db798)
2025-04-14 02:01:42 +02:00
Pavel
e9d8b69ff0 JBR-3926 make AwtComponent transparent for hit events by default
* JBR-3926 make AwtComponent transparent for hit events by default

* [WIP] pass hittest event to frame only if custom decoration is enabled and frame ready to handle it
(cherry picked from commit c0e26ff5d5)
(cherry picked from commit e7a31e309e)
2025-04-14 02:01:42 +02:00
Maxim Kartashev
a1fbe80b9b JBR-3896 Abysmally slow input and UI performance since upgrade to IU-213.4928.7 from previous 2021.3 EAP version
The slowness was the result of XWM.getInsetsFromExtents() repeated
attempts to acquire frame extents from a property that under Sway is
simply unavailable. Each attempt added at least 20ms to every re-draw.

Prior to (repeatedly) checking for NET_FRAME_EXTENTS property of a
window, check that the property is supported by the window manager.

(cherry picked from commit b40cc1c791)
(cherry picked from commit dc29a24175)
2025-04-14 02:01:42 +02:00
Dmitry Batrak
cc71a0ae93 log LWCToolkit invokeAndWait requests
as part of JBR-3017, to make investigation of similar issues simpler in the future

(cherry-picked from commit a7fd723e43)

(cherry picked from commit d8ca0763a5)
2025-04-14 02:01:42 +02:00
Alexey Ushakov
95ba156b39 JRE-202 Deadlock in CGLGraphicsConfig.getCGLConfigInfo
Added processing system events while waiting for OGLRenderQueue.lock
Moved getCGLConfigInfo logic execution to AppKit thread so, awt lock is
 taken on one thread

(cherry picked from commit d1c8bf03e1bd41cb075aa73cc39558103af7fe1a)
(cherry picked from commit 6bf9f31986be64acf3755b34568802f9960a66ec)
(cherry picked from commit 4e21d67e0369bffac45662c63699b39946218a7a)
(cherry picked from commit 62b62e33cf)
2025-04-14 02:01:42 +02:00
Alexey Ushakov
3202a4f6c0 JRE-193 UI freeze and 12/second thread dumps
Moved CStrikeDisposer dispose code to AppKit

(cherry picked from commit 28774d6878)
(cherry picked from commit 7cfc13be5c)
2025-04-14 02:01:42 +02:00
Alexander Lobas
8511b1458d JBR-3660 PhpStorm 2021.2 crashes on selecting iCloud Drive directory in Open dialog
(cherry picked from commit f5434bcaaf)
(cherry picked from commit 58f6991df8)
2025-04-14 02:01:42 +02:00
Alexander Lobas
17954cd896 JBR-3629 SIGILL at [libsystem_kernel] __kill NPE at com.intellij.openapi.options.SchemeImportUtil$1.isFileSelectable / -[CFileDialog askFilenameFilter:]
(cherry picked from commit 86c13ecaed)
(cherry picked from commit adf18476b9)
2025-04-14 02:01:42 +02:00
Alexander Lobas
d6fd1f5fbf JBR-3443 Native file dialog on OSX enable filename filter by VM option
(cherry-picked from commit f10e324538)

(cherry picked from commit 7ad92e4703)
2025-04-14 02:01:42 +02:00
Alexander Lobas
daf81b85f1 JBR-3442 Native file dialog on OSX (for open file) doesn't allow pasting path
(cherry-picked from commit 7d8cc524ca)

(cherry picked from commit 5aca0df07c)
2025-04-14 02:01:42 +02:00
Maxim Kartashev
958402cf79 Revert "JBR-2755 IDE UI became slow via remote X Server connection from Windows"
This reverts commit cd9138844da770ae60806fd7dbc1e85c773882a8.

(cherry picked from commit ec6f644c12)
2025-04-14 02:01:42 +02:00
Konstantin Aleev
7a40dfeb8a fix memory leaks in AccessibleJTree
(cherry picked from commit 561a7b8def)
(cherry picked from commit 6aa0951e7f)
2025-04-14 02:01:42 +02:00
Maxim Kartashev
848bb54393 JBR-3835 Cropped messages in all Message Dialogs in Idea on Ubuntu 18.04.5 LTS with swing alerts enabled
The _NET_FRAME_EXTENTS property that is used to obtain the initial
insets of a dialog window does not immediately get its value and may be
returned as 0 if queried too soon after the window creation.

In order to avoid (incorrect) guessing of dialog's insets, make 3
attempts at getting the insets with a small but increasing pause
in between them.

(cherry picked from commit 8134ec069d)
2025-04-14 02:01:41 +02:00
Maxim Kartashev
0715b47c63 Revert "JBR-3835 Cropped messages in all Message Dialogs in Idea on Ubuntu 18.04.5 LTS with swing alerts enabled"
This reverts commit 8e7aed70976ec0f90c736d86b9cd3e9cf09ff6d4.

(cherry picked from commit 502a08cafb)
2025-04-14 02:01:41 +02:00
Nikita Provotorov
1ae0d63e1b JBR-3838 AltGr on Polish keyboard triggers Ctrl+Alt shortcut.
Add regression test.

(cherry picked from commit 8df43eef4b)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 0763e18e1b)
2025-04-14 02:01:41 +02:00
Maxim Kartashev
e290bede13 JBR-3835 Cropped messages in all Message Dialogs in Idea on Ubuntu 18.04.5 LTS with swing alerts enabled
The _NET_FRAME_EXTENTS property that is used to obtain the initial
insets of a dialog window does not immediately get its value and may be
returned as 0 if queried too soon after the window creation.

In order to avoid (incorrect) guessing of dialog's insets, add an
artificial delay if getInsets() is called too soon.

(cherry picked from commit d358fcc774)
2025-04-14 02:01:41 +02:00
Alexey Ushakov
f768d06bb5 JBR-3820 Gamma correction for grayscale text in Metal rendering pipeline
Added regression test to compare OGL and Metal text rendering

(cherry picked from commit 1ef2bce278)
2025-04-14 02:01:41 +02:00
Artem Bochkarev
37258e4975 JBR-1762: request focus of immediate parent when dispose popup
because requesting focus for frame-parent causes to close whole popup chain

(cherry picked from commit 7a2ccfc521)

JBR-1762: fixed review comments

(cherry picked from commit 0efbe5d9b9)
(cherry picked from commit e539e4d29c)
2025-04-14 02:01:41 +02:00
Dmitry Batrak
ebe79975c7 JBR-2759 Typeahead issue on Linux
(cherry picked from commits 76bdaf1131, b20c56ff3e, c9609330f2, a170b4e4ae)

(cherry picked from commit 281e6abf47)
2025-04-14 02:01:41 +02:00
Artem Bochkarev
2f00a444e1 JBR-1762: request focus of immediate parent when dispose popup
because requesting focus for frame-parent causes to close whole popup chain

(cherry picked from commit 7a2ccfc521)

JBR-1762: fixed review comments

(cherry picked from commit 0efbe5d9b9)
(cherry picked from commit 614eea4fd3)
2025-04-14 02:01:41 +02:00
Renaud Paquay
113f046659 Add BasicWithKeyFileAttributeView interface
This new interface is similar to `BasicFileAttributeView` except it
gives implementations a hint that the fileKey() should be acquired
even at some performance cost.

`FileTreeWalker` uses this new interface to request a file key
in addition to regular file attributes so that file equality can
be efficiently performed when checking for loops during file
tree traversal.

This makes `FileTreeWalker` about 2x faster when traversing non
trivial file system trees with the FOLLOW_LINKS option.

Change-Id: I8de047c8fc241dbab9ad57c5e361118a3a94893d

(AKA JBR-3680 Cherry-pick Google's NIO patches to get faster file listing)

(cherry picked from commit 6d1c3f06c4)
(cherry picked from commit c5ac3d69ba)
2025-04-14 02:01:41 +02:00
Ivan Migalev
2d920955b9 JBR-3785: don't touch the active keyboard layout on input method activation / deactivation.
origin PR: github.com/JetBrains/JetBrainsRuntime/pull/78.

(cherry picked from commit 2f772fd1a2)
(cherry picked from commit c96000f501)
2025-04-14 02:01:41 +02:00
Dmitry Batrak
f90d8d2b91 JBR-3779 Unexpected Alt+Tab behaviour for Java frames on Cinnamon DE
(cherry picked from commit 0bf13985d5)
(cherry picked from commit 3853438e52)
2025-04-14 02:01:41 +02:00
Maxim Kartashev
d12237bda2 JBR-3772 java/beans/PropertyEditor/TestFontClass.java: access denied ("java.util.PropertyPermission" "sun.awt.x11.trace" "read")
Instead of using System.getProperty() directly, wrap the call into
GetPropertyAction and use AccessController to execute it.

(cherry picked from commit 4fefc6244b)
2025-04-14 02:01:41 +02:00
Dmitry Batrak
6f5242bedb JBR-3504 a11y focus is set on the wrong element when opening popups
(cherry-picked from commit a69e12e0d2)

(cherry picked from commit e06081f5ab)
2025-04-14 02:01:41 +02:00
Maxim Kartashev
7bc2db75fe JBR-3665 Typing is slow in remote X session
Only call XGetKeyboardMapping() once for all valid codes and cache the
resulting table. Use the cache on the subsequent calls to
keycodeToKeysym().

(cherry picked from commit 0ae3056c25)
2025-04-14 02:01:41 +02:00
Maxim Kartashev
a393a448f9 JBR-2273 JBR musl port
Detect if we're running on a musl-based system by checking for the presence
of the libgcompat.so glibc compatibility library in the process' map.
If so, java is re-started with LD_LIBRARY_PATH set to point to the right
directory with libjvm.so. This works around the problem with the musl
dynamic library loader.

(based on commit 13a904ddb5)

(cherry picked from commit 51b5fe1b0c)
2025-04-14 02:01:40 +02:00
Alexey Ushakov
2ae0782db0 Added support for otf into the build scripts. Updated prebuild maps.
Applied code from jbr-dev

(cherry picked from commit 9c23814897)
2025-04-14 02:01:40 +02:00
Konstantin Bulenkov
49ff86b811 bundle Inter font
(cherry picked from commit 9f54e5ce48)
2025-04-14 02:01:40 +02:00
Maxim Kartashev
7fe22e067e JBR-3664 Logging for communications with X server
Introduced logging controlled with -Dsun.awt.x11.trace.
Currently, only looks at the AWT lock and reports methods holding it
sorted by average hold time.

(based on commit 792a58ea0e)
(based on commit 770b4dc9c1)

(cherry picked from commit 1ec3990980)
2025-04-14 02:01:40 +02:00
Dmitry Batrak
cc72e82c70 JBR-3726 Modal windows 'disappear' on minimize in KDE
(cherry picked from commits d9baf2d9db, 9c2841028f, 5c4fd9ceaf, f0ed32fca4)

(cherry picked from commit 21a64a69e4)
2025-04-14 02:01:40 +02:00
Maxim Kartashev
276852034c JBR-3542 Fix -Xcheck:jni warnings
Fixes warnings coming from JBR-specific code in addition to those fixed
by 8269223.

(cherry picked from commit b2aa21b742)
2025-04-14 02:01:40 +02:00
Dmitry Batrak
765df8dacb JBR-3706 Toggling full screen mode for two frames doesn't work on macOS if invoked without delay
(cherry picked from commit 28cfc4815f)
(cherry picked from commit ec4f29297e)
2025-04-14 02:01:40 +02:00
Dmitry Batrak
e0ff384e0d JBR-3686 Background window steals focus when converted to full screen on macOS
(cherry-picked from commit 07a5b9672e)

with fix for JBR-6436 crash in jb/java/awt/Focus/FullScreenFocusStealing.java and jb/java/awt/Window/FullScreenTwoFrames.java

(cherry picked from commit 98b3ac5221)

with fix for JBR-6569 macOS: SIGILL at [libsystem_kernel] __kill in This decoder will only decode classes that adopt NSSecureCoding. Class 'AWTView' does not adopt it.

(cherry picked from commit 7af653070f)
(cherry picked from commit db11bf6776)
2025-04-14 02:01:40 +02:00
Dmitry Batrak
74bc323a8e JBR-3662, JBR-3672 Focus jumps to another project tab after closing modal dialog
(cherry picked from commit bfd01081c3, 2a71dc5981)
(cherry picked from commit 3fc47af69e)
2025-04-14 02:01:40 +02:00
Nikita Gubarkov
230741db52 JBR-3648 Replace CacheCellInfo usages with MTLCacheCellInfo in metal rendering code
(cherry picked from commit 7a94f7ea07)
2025-04-14 02:01:40 +02:00
Dmitry Batrak
2a104e6874 JBR-3642 java/awt/Window/8159168/SetShapeTest.java fails on macOS-x64 & macOS-aarch64
make sure jb/java/awt/Focus/Typeahead* tests still pass

includes fixes for JBR-3786 javax/swing/plaf/aqua/CustomComboBoxFocusTest.java fails on MacOS by timeout
(cherry picked from commit f5c5388fb5)

and JBR-4113 java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java fails by time out on macOS

(cherry picked from commit d8d4c55a61)
(cherry picked from commit 9f6fa55673)
2025-04-14 02:01:40 +02:00
Anton Tarasov
3eb3e8e3bb JBR-1834 [linux] runtime hidpi switch is broken
(cherry picked from commit eaa04303a7)
(cherry picked from commit 2df217d6fe)
2025-04-14 02:01:40 +02:00
Anton Tarasov
11f0dddd15 JBR-1429 Scale is huge due to GDK_SCALE
(cherry-picked from commit 1c3477df2e)

(cherry picked from commit 3ac8aeea3d)
2025-04-14 02:01:40 +02:00
Anton Tarasov
c9a9a3927f JBR-1365 force IDE-managed HiDPI on Linux for fractional scales
(cherry picked from commit f092ff3962)
(cherry picked from commit ae72b9e01d)
2025-04-14 02:01:40 +02:00
Anton Tarasov
76a2a647f1 Allow HiDPI mode on Linux
(cherry picked from commit e192da4f83)
2025-04-14 02:01:40 +02:00
Anton Tarasov
13d308afad JRE-489 -Dswing.bufferPerWindow is fractional scale unfriendly
(cherry picked from commit 67fb7a274c)
2025-04-14 02:01:39 +02:00
Anton Tarasov
9efc5d8d73 JRE-310 check for Windows8.1 when enabling ui scale
Was "don't fallback on fractional scale" in JBSDK9.

(cherry picked from commit 28dfae88e6)
2025-04-14 02:01:39 +02:00
Vitaly.Provodin
901845f05e add 32-sizes for native data types
(cherry picked from commit 3a79870da8)
(cherry picked from commit 15f6d3290b)
2025-04-14 02:01:39 +02:00
Nikita Gubarkov
05ffae6456 Added JBR-specific .idea project files
(cherry picked from commit 6b34834621)
2025-04-14 02:01:39 +02:00
Alexey Ushakov
ae37483208 JBR-3344 "Exit Full Screen" action doesn't work, the only way is mouse click on window's native "green" button.
Restored JBR-1931 fix partially reverted by JBR-1718

(cherry picked from commit c0be778e20)
(cherry picked from commit dbe6f4490f)
2025-04-14 02:01:39 +02:00
Anton Tarasov
c21d4ff2f0 JBR-3337 jb/java/jcef/HandleJSQueryTest3314.sh: fails on macOS-aarch64 with "JS Query was not handled in 2nd opened browser"
(cherry picked from commit 8678f41971)
(cherry picked from commit d2260dd67c)
2025-04-14 02:01:39 +02:00
Anton Tarasov
612378b33a JBR-3545 Window.setMinimumSize does not respect DPI scaling
(cherry picked from commit 9b4f72ad18)
(cherry picked from commit f3f87f5f27)
2025-04-14 02:01:39 +02:00
Denis Fokin
e82e782e01 JRE-408 JBR-3515 fix NullPointerException in MetalRootPaneUI.installWindowListeners
(cherry picked from commit 584d554af529cff445b0f09bc2d57be55e138b7a)
(cherry picked from commit 6a42bb54bd)
(cherry picked from commit 1bf4975a43)
2025-04-14 02:01:39 +02:00
Elena Sayapina
d0627c6734 JBR-2657 [TESTBUG] ChainOfPopupsFocusTest misbehaving on Windows
- changed open popup shortcut from Ctrl+N to Ctrl+M, so no new explorer windows appear if desktop gets focused by error
- added a click on the main test frame, so it gets focus when running from background cygwin process on Windows, otherwise it just flashes on the taskbar

(cherry picked from commit eda8e4d50e)
(cherry picked from commit 1c729008ce)
2025-04-14 02:01:39 +02:00
Denis Konoplev
1e3a73be05 EA-252361: Check window for null
(cherry picked from commit 23a7dbd486)
(cherry picked from commit aa4d6f14dc)
2025-04-14 02:01:39 +02:00
Artem Bochkarev
8042494f34 JBR-3131: support custom view for system menu items
(cherry picked from commit 78d509ac0f)
(cherry picked from commit ca05fefb28)
2025-04-14 02:01:39 +02:00
Artem Bochkarev
3661dbb4cd JBR-3127: set NSWindowAllowsImplicitFullScreen=NO
fixed JBR-3127 Modal dialogs invoked from modal or floating dialogs are opened in full screen

(cherry picked from commit 0b8ff1a7e6)

JBR-3127: add possibility to load NSJavaVirtualMachine

JavaVM framework is deprecated but this class is still checked by AppKit, see https://youtrack.jetbrains.com/issue/JBR-3127#focus=Comments-27-4684465.0-0

(cherry picked from commit be6a2c4f0c)
(cherry picked from commit d690d68315)
2025-04-14 02:01:39 +02:00
Nikita Gubarkov
fa8de0596f JBR-3376 Added check for -1 glyph info pointer in OGLTextRenderer.c
(cherry picked from commit 40ea728335)
2025-04-14 02:01:39 +02:00
Dmitry Batrak
f4bcaec890 JBR-3024 Popups are shown with 1x1 size sometimes
test case only

(cherry picked part of commit ee298f5287)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit b7d165e486)
2025-04-14 02:01:39 +02:00
Vitaly Provodin
c2616e3af5 JBR-3314 add regression test
(cherry picked from commit c81adfed61)
(cherry picked from commit e4c3db3a2c)
2025-04-14 02:01:38 +02:00
Ivan Migalev
9e682a926f JBR-3227 Reload type of required native file dialogs each time a file dialog is requested
(cherry picked from commit 26dd87ab7c)
(cherry picked from commit 847d757a76)
2025-04-14 02:01:38 +02:00
Ivan Migalev
2f30cb4369 JBR-3068 Update path selector behavior when sun.awt.windows.useCommonItemDialog is enabled
(cherry picked from commit 442bb7eecc)
(cherry picked from commit 6177142c3a)
2025-04-14 02:01:38 +02:00
Alexey Ushakov
bd2f19c7b2 JBR-2996 M1 warnings: CoreText note: Client requested name “.SFCompact-Black”, it will get Times-Roman rather than the intended font
Cached system fonts family names

(cherry picked from commit 56629e4c90)
(cherry picked from commit 998e7b685a)
2025-04-14 02:01:38 +02:00
Alexey Ushakov
b4c6945247 JBR-3023 Gray idea frame after project open with ide.mac.transparentTitleBarAppearance.
Initiate move/resize event on first appearance of window having FULL_WINDOW_CONTENT property set

(cherry picked from commit a6ea081ba2)
(cherry picked from commit dd6877af04)
2025-04-14 02:01:38 +02:00
Dmitry Batrak
95df8d8ac3 JBR-3017 Focus issue in presence of third-party accessibility tool
use the new invocation approach for 'makeKeyAndOrderFront' as well, as it can also cause synchronous back-calls to accessibility subsystem, and change the global call order unexpectedly

this commit fixes TypeaheadSetVisibleTest and TypeaheadToFrontTest, when they are run with AltTab active

Guard against possible deadlocks, if UI-related methods are invoked not on EDT.
Sample deadlock scenario:
* Application thread attempts to show the window, this involves calling CWrapper.NSWindow.makeKeyAndOrderFront under AWT tree lock, which blocks till 'makeKeyAndOrderFront' completes on AppKit thread
* AppKit thread, while executing 'makeKeyAndOrderFront' performs 'back-call' to CAccessibility.getFocusOwner, which waits for execution on EDT
* EDT performs some activity requiring AWT tree lock (e.g. processing of PaintEvent)

(cherry picked from commits e3aaff5db4, 09941119e1)

(cherry picked from commit 513767dce6)
2025-04-14 02:01:38 +02:00
Dmitry Batrak
ce233727f1 JBR-3072 Deadlock on nested dialog hiding
(cherry picked from commits 99242748ee, ad1595b5c2)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9eacb21298)
2025-04-14 02:01:38 +02:00
Dmitry Batrak
a3cee396cc fix occasional freezes of JBR-3017 reproducer after the fix
(cherry picked from commit 7e6db54f77)
(cherry picked from commit 2b7f78f50e)
2025-04-14 02:01:38 +02:00
Dmitry Batrak
6f1a92c66e JBR-2819 Create API to determine typographic family/subfamily for available fonts
(cherry picked from commit 89e519a4ef)
(cherry picked from commit 21129ca270)
2025-04-14 02:01:38 +02:00
Nikita Gubarkov
860450520e JBR-2924 Do not try to create native italic font when we're going to make it fake italic
(cherry picked from commit cf05cb1a19)
2025-04-14 02:01:38 +02:00
Nikita Gubarkov
c1347c80c7 JBR-3982 Fixed non-antialiased text rendering on macOS
JBR-3269 Disabled subpixel antialiasing for macOS Mojave and newer

(cherry picked from commit e10f69072e)
2025-04-14 02:01:38 +02:00
Dmitry Batrak
eb46fb8c17 JBR-3017 Focus issue in presence of third-party accessibility tool
(cherry picked from commit 88ead5d9e3)
(cherry picked from commit 97753f15b6)
2025-04-14 02:01:38 +02:00
Vitaly Provodin
5892d4b75d JBR-1718 add a regression test
(cherry picked from commit 84ff4eab21)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 6b02027600)
2025-04-14 02:01:38 +02:00
Elena Sayapina
a3ab57619b JBR-2890 [TESTUPDATE] Enable jcef tests on macOS aarch64 platform
(cherry picked from commit 1714d7b627)
(cherry picked from commit 54e74d75d0)
2025-04-14 02:01:38 +02:00
Nikita Gubarkov
b281d96ceb Added JBR API
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 2ce0a876c5)
2025-04-14 02:01:38 +02:00
Artem Bochkarev
e6ba790b26 JBR-2562: fixed invokation of parent method
(cherry picked from commit 93cbab2f2d)

JBR-2562: suppress exceptions from [NSWindow _changeJustMain]

temporary workaround to prevent crashes

(cherry picked from commit dd055b5970)
(cherry picked from commit 55eba1d802)
2025-04-14 02:01:37 +02:00
Mikhail Grishchenko
1f0dd97bf0 JBR-2890 Disable jcef tests on 32-bit and aarch64 platforms
(cherry picked from commit d34d6528fe)
(cherry picked from commit 793add3ff1)
2025-04-14 02:01:37 +02:00
Alexey Ushakov
d896a5ce5a JBR-2879 Big Sur: Opening project in new window results in opening project in another tab
Disabled Tabbing mode for all NSWindows

(cherry picked from commit 8cb0377a31)
(cherry picked from commit 545eddda9f)
2025-04-14 02:01:37 +02:00
Nikita Gubarkov
7e1914abcf JBR-2910 Implemented extended glyph cache for macOS
JBR-3976 Fixed text spacing & emoji scaling on macOS

JBR-3638 Adjust subpixel glyph positions for correct rounding in CStrike#getGlyphImageBounds

(cherry picked from commit 4590e49b61)
2025-04-14 02:01:37 +02:00
Alexey Ushakov
e9a5432151 JBR-2617 Text with opacity renders black
Implemented alpha blending in grayscale text rendering (UX-1320)
Corrected bright text thickness (smooth on), bright and dark text thickness (smooth off)
Added JVM properties for fine tuning

(cherry picked from commit c30306f779)
(cherry picked from commit c95adeb8f2)
(cherry picked from commit 269c9580fb)
(cherry picked from commit 55c7be5fe9)
(cherry picked from commit e28ff71e97)
(cherry picked from commit 6fb9aaf291)
2025-04-14 02:01:37 +02:00
Alexey Ushakov
1acfc6389e JBR-2521 Ugly font in all 2020.2 EAPs on macOS
Provide gamma correction for both light and dark text

(cherry picked from commit 5953202a7e)
(cherry picked from commit 1b426cc66c)
2025-04-14 02:01:37 +02:00
Alexey Ushakov
10aba62846 JBR-2591 Repainting is broken (was: Icons in tree list widgets became dark)
Save current blend mode before cached grayscale rendering

(cherry picked from commit 7beb75ccec)
(cherry picked from commit ed52fde57d)
(cherry picked from commit 1a46cd70af)
2025-04-14 02:01:37 +02:00
Alexey Ushakov
5ef58369e5 JBR-1986 Enabling fractional metrics causes visual artifacts in font rendering on macOS 10.14+
Disable subpixel positioning for macOS 10.13+ if legacy LCD rendering is disabled

(cherry picked from commit dbd24232e4)
(cherry picked from commit 9fbf990e83)
2025-04-14 02:01:37 +02:00
Vitaly Provodin
9481a3d9ec exclude bug7154030 on macosx-aarch64 due to 8268284
(cherry picked from commit 253f1246e5)
2025-04-14 02:01:37 +02:00
Vitaly Provodin
646852dbba exclude SharedMemoryPixmapsTest on macosx-all due to 8221451
(cherry picked from commit d929111f7a)
2025-04-14 02:01:37 +02:00
Vyacheslav Moklev
e4417d39ec JBR-2442 fix memory leak of fileBuffer
fix was suggested by Nikita Gubarkov

(cherry picked from commit a166fb65e1)
2025-04-14 02:01:37 +02:00
Sergey Malenkov
fd6a3a6c4a EA-235126 - CME: HighlightableComponent.getPreferredSize
(cherry picked from commit 523d80cafd)
(cherry picked from commit 31c4452397)
2025-04-14 02:01:37 +02:00
Kirill Kirichenko
5d979558f8 JBR-2667 Post review: rename win.darkTheme.on to win.lightTheme.on and reversed the logic
(cherry picked from commit eeab5252e6)
(cherry picked from commit b539e1d0de)
2025-04-14 02:01:37 +02:00
Kirill Kirichenko
0fd3d2c177 JBR-2667 Add new AWT desktop property for light/dark theme detection on Windows 10
(cherry picked from commit 0e4ad056dd)
(cherry picked from commit e5dfcc4417)
2025-04-14 02:01:37 +02:00
Alexey Ushakov
3a9e10b29c JBR-2593 Wide ligatures not rendered in Grayscale mode
Added missing flush of cached vertices

(cherry picked from commit ad409b4370)
(cherry picked from commit bf011ac521)
2025-04-14 02:01:36 +02:00
Nikita Gubarkov
d57fb97381 JBR-2910 Implemented extended glyph cache for Linux
(cherry picked from commit d488f716e7)
2025-04-14 02:01:36 +02:00
Nikita Gubarkov
85bb60970b JBR-2910 Implemented extended glyph cache for Windows
(cherry picked from commit 7f75d75933)
2025-04-14 02:01:36 +02:00
Nikita Gubarkov
348d42454c JBR-2614 Fixed LCD glyph width to include both left & right padding, so that rowBytes = width * 3
(cherry picked from commit afb52a160d)
2025-04-14 02:01:36 +02:00
Alexey Ushakov
1bde773ba5 JBR-2463 Font rendering problem on macOS Mojave
Use adjusted advances for glyphs

(cherry picked from commit 1af5dd4aae)
(cherry picked from commit bd6dae9ddf)
2025-04-14 02:01:36 +02:00
Denis Konoplev
5c5e70a9ae JBR-3544: Generate popup invoked instead of New in this directory.
- A fix
- A regression test (cherry picked from commit 7995574c09)

(cherry picked from commit 01915e4224)
2025-04-14 02:01:36 +02:00
Vitaly Provodin
d022c683b1 JBR-2545 Clean up the list of ignored Render tests
(cherry picked from commit f7b4c42e1d)
(cherry picked from commit 32b8d67527)
2025-04-14 02:01:36 +02:00
Jayathirth D V
59f74f1fb1 8241490: Add large text performance tests in RenderPerfTest
(cherry picked from commit 803ee2f2b5)
(cherry picked from commit bbe57208d2)
2025-04-14 02:01:36 +02:00
Alexey Ushakov
95247331cf 8230657: Create fine grained render perf test for metal pipeline
Converted gradle JUnit test to plain java for ant and gnumake

To run the tests:
cd src/demo/share/java2d/RenderPerfTest

ant run
or
java -jar dist/RenderPerfTest.jar
or
java -jar dist/RenderPerfTest.jar testWhiteTextBubblesGray

(cherry picked from commit 356121b18f)
(cherry picked from commit 8bd8d2d132)
(cherry picked from commit 448aad87bc)
2025-04-14 02:01:36 +02:00
Konstantin Bulenkov
2d8fa828e6 Update FiraCode to 5.2
(cherry picked from commit 71e2a8d8ad)
(cherry picked from commit 0582e90d58)
2025-04-14 02:01:36 +02:00
Alexey Ushakov
268b3ca4f8 JBR-1929 Improve rendering of San Francisco font of macOS Catalina
Reverting gamma correction because of rendering artifacts in the light theme

This reverts commit 5016db51

(cherry picked from commit c1d644a004)
(cherry picked from commit ade5b22a83)
2025-04-14 02:01:36 +02:00
Alexey Ushakov
e35f1fcc8c JBR-1929 Improve rendering of San Francisco font of macOS Catalina
Added gamma correction to match grayscale rendering with subpixel one

(cherry picked from commit 5016db518a)
(cherry picked from commit b15896e838)
2025-04-14 02:01:36 +02:00
Alexey Ushakov
130f441d42 JBR-2463 Font rendering problem on macOS Mojave
Use adjusted advances for glyphs

(cherry picked from commit 1af5dd4aae)
(cherry picked from commit df670fc276)
2025-04-14 02:01:36 +02:00
Anton Tarasov
a34dc08ccf revert: JBR-1434 "New file dialog" popup remains above all windows on switching application
java.awt.peer.WindowPeer.isLightweightDialog() method does not exist.

(cherry picked from commit 7d8aeaf7de)
(cherry picked from commit e233ff9b94)
2025-04-14 02:01:36 +02:00
Anton Tarasov
4cbf68e6ed JBR-2872 improve: JBR-2866 JCEF: Markdown editor steals focus from a different frame
(cherry picked from commit bad748e3d0)
(cherry picked from commit ef2a05eac1)
2025-04-14 02:01:36 +02:00
Anton Tarasov
7bd66675a7 JBR-2866 JCEF: Markdown editor steals focus from a different frame
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 6d852e3252)
2025-04-14 02:01:35 +02:00
Anton Tarasov
8ebe20e92f JBR-2645 enable CefBrowser.close(true) in jcef reg tests
(cherry picked from commit 492c217125)
(cherry picked from commit 8975bde92c)
2025-04-14 02:01:35 +02:00
Anton Tarasov
1c76153036 JBR-2259 WebSite isn't loaded with .loadUrl method if browser isn't shown in UI
(cherry picked from commit 57bbddf071)
(cherry picked from commit 94b56fdeb5)
2025-04-14 02:01:35 +02:00
Anton Tarasov
4ce7d94129 JBR-2557 use com.jetbrains.cef.JCefAppConfig in JCEF tests
(cherry picked from commit e30a309f92)
(cherry picked from commit 441ee96ec5)
2025-04-14 02:01:35 +02:00
Anton Tarasov
b069790efa JBR-2489 Git branch operations (switch to another branch, rebase) sometimes crash WebStorm 202.5428.27
(cherry picked from commit 81d2156fb1)
(cherry picked from commit 01299cb102)
2025-04-14 02:01:35 +02:00
Anton Tarasov
4874108867 JBR-2282 [jcef] update to JCEF/80.0.4+g74f7b0c+chromium-80.0.3987.122
(cherry picked from commit a5adc725df)
(cherry picked from commit fcf31daa22)
2025-04-14 02:01:35 +02:00
Anton Tarasov
5347b74ae6 JBR-2305 jcef: jb/java/jcef/JCEFStartupTest.java throws java.lang.ExceptionInInitializerError
(cherry picked from commit f0385f01ec)
(cherry picked from commit c7d407e0a6)
2025-04-14 02:01:35 +02:00
Anton Tarasov
cfb0264924 JBR-2306 jcef: jb/java/jcef/JCEFStartupTest.java unexpectedly exits with the exit code: 0
(cherry picked from commit ff7d7bd43c)
(cherry picked from commit d72901625f)
2025-04-14 02:01:35 +02:00
Anton Tarasov
a84e0b0755 JBR-2299 [mac] jcef requests for "chromium safe storage" keychain access
(cherry picked from commit dd1334a352)
(cherry picked from commit 2ebe5709c0)
2025-04-14 02:01:35 +02:00
Anton Tarasov
a76172de35 JBR-2222 Crash during closing IDE
(cherry picked from commit d0c367b31f)
(cherry picked from commit bf36d7873b)
2025-04-14 02:01:35 +02:00
Anton Tarasov
af1d8af590 JBR-2287 [jcef] add CefBrowser wrapper to jtreg tests
(cherry picked from commit fa961d1769)
(cherry picked from commit 74ccb86095)
2025-04-14 02:01:35 +02:00
Anton Tarasov
2c25c8cf64 JBR-2169 AWTThreading: remove tracked invocation event from completion listener
(cherry picked from commit a855f3b835)
(cherry picked from commit c54371231c)
2025-04-14 02:01:35 +02:00
Anton Tarasov
8bb2500e08 JBR-2159 Native crash in thread AWT-EventQueue-0 when trying to push commit
(cherry picked from commit bba297b4a4)
(cherry picked from commit 38b9cf19c0)
2025-04-14 02:01:35 +02:00
Anton Tarasov
889f6cf531 JBR-2148 JCEF: JBR bundle has invalid app structure
(cherry picked from commit f45f84d7ed)
(cherry picked from commit b610a7c4f9)
2025-04-14 02:01:35 +02:00
Anton Tarasov
ba2a3c00ed JBR-2146 improve InvokeOnToolkitHelper to cover more generic case
(cherry picked from commit 37db252ad7)
2025-04-14 02:01:34 +02:00
Anton Tarasov
ea47a71232 JBR-2139 Idea freeze on dynamic plugin unloading
(cherry picked from commit e57bae4f66)
(cherry picked from commit 647f198b17)
2025-04-14 02:01:34 +02:00
Anton Tarasov
15ad4328b8 JBR-2099 jb/java/jcef/JCEFStartupTest.java fails on Windows, Linux
(cherry picked from commit 3dfb0aa16a)
(cherry picked from commit 3750608e62)
2025-04-14 02:01:34 +02:00
Anton Tarasov
f8a9887bc1 JBR-2093 create reg test for JCEF startup
(cherry picked from commit e8c2761f5b)
(cherry picked from commit 17cfb8e0d8)
2025-04-14 02:01:34 +02:00
Anton Tarasov
3b5a510156 JBR-2082 Revealing taskbar does not work when "Automatically hide the taskbar"
(cherry picked from commit b31a41fb2f)
(cherry picked from commit d2d4e58c13)
2025-04-14 02:01:34 +02:00
Mikhail Grishchenko
7528ad7202 JBR-2639, JBR-2412 [jcef] Tests that checks mouse events
JBR-2412 [windows] mouse listener does not work for jcef

(cherry picked from commit 66ad6472ae)
(cherry picked from commit 04246aac57)
(cherry picked from commit b7cde4fd05)
(cherry picked from commit d325b98b54)
2025-04-14 02:01:34 +02:00
Mikhail Grishchenko
0a7c276c32 JBR-2639 [win] jcef does not recognize vertical mouse wheel events
added regression test

(cherry picked from commit e8e4741bb0)
(cherry picked from commit 8428d1c853)
2025-04-14 02:01:34 +02:00
Mikhail Grishchenko
d1b2d7c3bd JBR-2412 [windows] mouse listener does not work for jcef
added regression test

(cherry picked from commit d1479872f2)
(cherry picked from commit 9e5032e328)
2025-04-14 02:01:34 +02:00
Elena Sayapina
61f360eaf0 JBR-2630 Typing speed in IDE editor was dropped after switching to 11.0.8
Introduced sun.awt.osx.RobotSafeDelayMillis property to control macOS specific safe delay for Robot methods.
50 ms safe delay was initially hardcoded in 3862142d (JDK-8242174: [macos] The NestedModelessDialogTest test make the macOS unstable) which affected performance tests execution.

(cherry picked from commit 5f691bb788)
(cherry picked from commit cfc90ce2c5)
2025-04-14 02:01:34 +02:00
Mikhail Grishchenko
43e952041e JBR-2430 [jcef] Added Regression test
Checks that JS Query is handled in 2nd opened browser

(cherry picked from commit 404ff84565)

Refactoring + changed EDT awaiting method

(cherry picked from commit dc24658b31)
(cherry picked from commit f191726147)
2025-04-14 02:01:34 +02:00
Vitaly Provodin
ca1aebb2ee exclude the new printer test 8262731
(cherry picked from commit c5ff1e3025)
2025-04-14 02:01:34 +02:00
Alexey Ushakov
ba8b256387 JBR-2419 Improve performance of CStrike.getNativeGlyphOutlineBounds
Do not pass the result via java object. Use more straight api.

(cherry picked from commit 9f91fe91f5)
(cherry picked from commit c0fd2daf5c)
(cherry picked from commit 1bfd5ad21c)
2025-04-14 02:01:34 +02:00
Alexey Ushakov
5cd4f1d247 JBR-2382 Provide detailed stack trace in crash dumps for unhandled ObjC exceptions
Used user home dir for jbr_err files. Removed logging with reportException method

(cherry picked from commit 2c8cdb221b)

JBR-2382 Provide detailed stack trace in crash dumps for unhandled ObjC exceptions

Used process workdir for jbr_err files. Added one more logging to reportException method

(cherry picked from commit 95a47810d5)

JBR-2382 Provide detailed stack trace in crash dumps for unhandled ObjC exceptions

Generate jbr_err_pidXX.log file with detailed stack trace of the exception

(cherry picked from commit 4c42f75021)
(cherry picked from commit 9ed5cac63d)
2025-04-14 02:01:34 +02:00
Artem Bochkarev
2036b42274 JBR-2253: unset LD_PRELOAD just after VM loaded
workaround for JBR-2253 Preload libjsig.so to fix JNA crashes

(cherry picked from commit 127a2deddf)
(cherry picked from commit 915f700d26)
2025-04-14 02:01:34 +02:00
Kirill Kirichenko
b144cdf825 JBR-1874 Cursor not changing from 'default' to 'text'. Additional fix after reopening.
(cherry picked from commit 5a29d4ade9)
(cherry picked from commit da44860f22)
2025-04-14 02:01:34 +02:00
Elena Sayapina
d362ddc2e0 JBR-2585 [TESTBUG] TouchScreenEvent tests affect tests simulating mouse actions
- added workaround for JBR-2585
- added README.md about manual test run
- made an update to close LinuxTouchScreenDevice properly
- added an error exit from linux shell script if sudo password is empty or chown fails

(cherry picked from commit 4deb3bbe61)
(cherry picked from commit a13b014719)
2025-04-14 02:01:33 +02:00
Elena Sayapina
685c21500c IDEA-165950 [TESTUPDATE] National keyboard layouts support
Update regression test after the following commits:

02fad83c: Remove public constants from KeyEvent
f4227faf: Impossible to assign cmd+ß shortcuts
(cherry picked from commit 264802cf4b)
(cherry picked from commit 679b5d8cd3)
2025-04-14 02:01:33 +02:00
Elena Sayapina
a6145d2e29 JBR-2328 [TESTBUG] Regression test java/awt/keyboard/AllKeyCode/AllKeyCode.java is not correct
(cherry picked from commit 861f73c393)
(cherry picked from commit bfab6a9364)
(cherry picked from commit e9fa7a0882)
(cherry picked from commit a199826fae)
2025-04-14 02:01:33 +02:00
Mikhail Grishchenko
5794a9f7a8 JBR-2259 WebSite isn't loaded with .loadUrl method if browser isn't shown in UI
Added reproducer

(cherry picked from commit e875bf72c9)
(cherry picked from commit 9aa75b7679)
2025-04-14 02:01:33 +02:00
Denis Konoplev
ead77f8ba2 JBR-2490 Add option to work with Surface Pen
(cherry picked from commit 5acc7680a1)
(cherry picked from commit b604023cef)
2025-04-14 02:01:33 +02:00
Denis Konoplev
754e429055 JBR-2669: set unicode for both keyCode and extendedKeyCode
(cherry picked from commit ba3f14c83a)
(cherry picked from commit 544176fbce)
2025-04-14 02:01:33 +02:00
Denis Konoplev
8fd0f715d2 JBR-2554: Proper unicode values in KeyEvent.keyCode
(cherry picked from commit 703d77a927)
(cherry picked from commit 63bdac9bbf)
2025-04-14 02:01:33 +02:00
Denis Konoplev
dadb1b3ecb JBR-215: Remove SystemInfo
(cherry picked from commit 9adf77a512)
(cherry picked from commit 6a6761d365)
2025-04-14 02:01:33 +02:00
Denis Konoplev
558064609a JBR-215: Separate LatinNonAlphaNumKeycodes option
(cherry picked from commit caf366f6f3)
(cherry picked from commit ed143f6d73)
2025-04-14 02:01:33 +02:00
Denis Konoplev
0f5ae6beef JBR-215: Windows non-alphanumeric shortcuts
(cherry picked from commit 4f60efebe2)
(cherry picked from commit b5fd23e498)
2025-04-14 02:01:33 +02:00
Denis Konoplev
e8c2e3ecae JBR-2280: Fix regression. Mode compatible with old option.
(cherry picked from commit a3e3c23cb1)
(cherry picked from commit 8c15ab819c)
2025-04-14 02:01:33 +02:00
Denis Fokin
9cb9c09321 macOS national keyboard support
(cherry picked from commit 83356eb0bb)
(cherry picked from commit c8a36e1804)
2025-04-14 02:01:33 +02:00
Nikita Gubarkov
d4d4e87c36 JBR-6387 Revert "8315701: [macos] Regression: KeyEvent has different keycode on different keyboard layouts"
(cherry picked from commit efd4acd419)
2025-04-14 02:01:33 +02:00
Sergey Malenkov
9d68e7dfa4 JBR-1929 FractionalMetricsSupport
(cherry picked from commit bbdc159762)
(cherry picked from commit 9fad8b07f1)
2025-04-14 02:01:33 +02:00
Mikhail Grishchenko
9f34f0dcd9 JBR-2256 JEditorPane with test/html type and zero margins is not shown
Updated reproducer

(cherry picked from commit 529a188b8b)

JBR-2256 JEditorPane with test/html type and zero margins is not shown

Added reproducer

(cherry picked from commit 41578a40b5)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 775801a875)
2025-04-14 02:01:32 +02:00
Mikhail Grishchenko
0db7f5c985 JBR-2210 IDEA fails to start (JVM crashes) when using the -Dfile.encoding=UTF-8in IDEA's vmoptions file
Added regression test

(cherry picked from commit 4e1f5a43b3)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit f7cf514da2)
2025-04-14 02:01:32 +02:00
Mikhail Grishchenko
d76d784415 JBR-1414 [Test] downscale frames to run on low-dpi screens
(cherry picked from commit b46e74fe6f)
(cherry picked from commit 844b3e1d5f)
2025-04-14 02:01:32 +02:00
Elena Sayapina
24fb278f38 JBR-1905 [TESBUG] java/awt/TextArea/DisposeTest/TestDispose.java: frame is not disposed
- java/awt/TextArea/DisposeTest/TestDispose.java, java/awt/TextField/DisposeTest/TestDispose.java: fixed test frame disposal
- java/awt/Frame/DisposeStressTest/DisposeStressTest.java: decreased test timeout from 2h to 10 min, added minor diagnostic logging

(cherry picked from commit 7f025f4e16)
(cherry picked from commit dda7f3d871)
(cherry picked from commit bc09aadadb)
(cherry picked from commit 0905abecf5)
2025-04-14 02:01:32 +02:00
Alexey Ushakov
302668ad9f JBR-2135 Use CoreText api to select the font with the most recent version
Added a property to force loading bundled fonts: -Djava2d.font.noVersionCheck=true

(cherry picked from commit cbb148dff4)
(cherry picked from commit db7e53e67d)
2025-04-14 02:01:32 +02:00
Alexey Ushakov
ad49c023b7 JBR-2137 JetBrainsMono fonts update to v1.0.3
(cherry picked from commit a6e441828a)
(cherry picked from commit b25c90ba53)
2025-04-14 02:01:32 +02:00
Mikhail Grishchenko
5f0928cc3e JBR-1414: Added regression test for dnd with HiDPI scaling
(cherry picked from commit 1f4ab12fbb)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit ba00bacb9f)
2025-04-14 02:01:32 +02:00
Elena Sayapina
7c114b3903 JBR-2041 [TEST] Added new regression test (Touchscreen devices support)
(cherry picked from commit 2d587b3728)
(cherry picked from commit 92606f2c7f)
(cherry picked from commit 05af375909)
(cherry picked from commit 0f895bf1b2)
(cherry picked from commit 08aa0852b7)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9bd62fade9)
2025-04-14 02:01:32 +02:00
Konstantin Bulenkov
9999efcbdf Update JetBrains Mono to 1.0.2
(cherry picked from commit 6f4a13e46f)
(cherry picked from commit b14bfd3ac9)
2025-04-14 02:01:32 +02:00
Ivan Migalev
60d16067bd Extract the DWM colorization parameters from registry (JBR-2070)
(cherry picked from commit 0330cab60b)
(cherry picked from commit 6525a8b70d)
2025-04-14 02:01:32 +02:00
Ivan Migalev
e4293d333d Refresh desktop properties on WM_DWMCOLORIZATIONCOLORCHANGED (JBR-2070)
(cherry picked from commit 06086f4a7e)
(cherry picked from commit afd04d7c5b)
2025-04-14 02:01:32 +02:00
Ivan Migalev
75d9911b33 Fix a possible resource leak in ColorizationColorAffectsBorders
(cherry picked from commit 0c911b6ffe)
(cherry picked from commit ffbaf5e1d1)
2025-04-14 02:01:32 +02:00
Elena Sayapina
d3393a1e06 JBR-2086 JetBrainsMono fonts update to v1.0.1
(cherry picked from commit a4b373e631)
(cherry picked from commit 462fef3916)
2025-04-14 02:01:32 +02:00
Konstantin Bulenkov
f9d08a4421 JetBrains Mono 1.0
(cherry picked from commit d514f7a982)
(cherry picked from commit 56ee3ef459)
2025-04-14 02:01:32 +02:00
Denis Konoplev
f25503897b JBR-3444: Return NullSurfaceData when gc == null
(cherry picked from commit 01ad15e61c)
(cherry picked from commit 2a7a828ec8)
2025-04-14 02:01:32 +02:00
Denis Konoplev
4bed011905 JBR-1995: Last character issue with korean
Fix for JTextComponent

(cherry picked from commit a7c8b0b535)
(cherry picked from commit 48410e5865)
2025-04-14 02:01:31 +02:00
Denis Konoplev
7e924ee5af JBR-2891: Post PhaseEvents in the begin and end of Magnify and Rotate
(cherry picked from commit c811c295c2)
(cherry picked from commit fe18b612dc)
2025-04-14 02:01:31 +02:00
Denis Konoplev
dd291c9316 JBR-2444: Turn on IM workaround by default
(cherry picked from commit 15c4ce1d3e)
(cherry picked from commit fe0c4e5b9e)
2025-04-14 02:01:31 +02:00
Denis Konoplev
319581b72c Fix build: add import & fix jwhen
(cherry picked from commit 3551c2a4c0)
2025-04-14 02:01:31 +02:00
Denis Konoplev
b9a8ffc95f JBR-2795: Add explicit conversion
(cherry picked from commit bf3e1c0c31)
(cherry picked from commit 5f07df3034)
2025-04-14 02:01:31 +02:00
Denis Konoplev
03e2e6f99d IDEA-237231: Correct signarute mask
(cherry picked from commit 6974131eec)
(cherry picked from commit af2154f8b1)
2025-04-14 02:01:31 +02:00
Denis Konoplev
b1818a20af IDEA-237231: Possible fix for pen interraction
(cherry picked from commit 33a8c95d39)
(cherry picked from commit 58fbc3f800)
2025-04-14 02:01:31 +02:00
Denis Konoplev
1b25d8c542 JBR-2041: Project view tap fix, recovery? constants & logging
(cherry picked from commit 1e904db3b0)
(cherry picked from commit 5c62dbdbca)
2025-04-14 02:01:31 +02:00
Denis Konoplev
50370873b8 IDEA-229135: Fling animation stop on tap
(cherry picked from commit 7ce0f79561)
(cherry picked from commit 01f0f774b4)
2025-04-14 02:01:31 +02:00
Denis Konoplev
7c6d722660 Windows touch screen support
(cherry picked from commit cab3f28907)
(cherry picked from commit ce0e4aff62)
2025-04-14 02:01:31 +02:00
Denis Konoplev
3b61b49d8a Turn off multitouch
(cherry picked from commit a2576ffa9a)
(cherry picked from commit 41eaa75d27)
2025-04-14 02:01:31 +02:00
Denis Konoplev
58e934ca99 Check XInput extension && touch inertia
(cherry picked from commit cca7fb97f4)
(cherry picked from commit edcb7310d3)
2025-04-14 02:01:31 +02:00
Denis Konoplev
fe24d14bb0 Touch scroll handling
(cherry picked from commit 6dcec3dc31)
(cherry picked from commit c585901afe)
2025-04-14 02:01:31 +02:00
Denis Konoplev
e43747fd74 XI2 Constants
(cherry picked from commit 588cd6ee73)
(cherry picked from commit 2e4a8ba10b)
2025-04-14 02:01:31 +02:00
Denis Konoplev
ecf320b72d XLibWrapper XI2 functions
(cherry picked from commit d6bd1bfa2b)
(cherry picked from commit 7edf395b3b)
2025-04-14 02:01:30 +02:00
Denis Konoplev
8763d1f48b X11 native get put double
(cherry picked from commit f101bc1108)
(cherry picked from commit 344fe36ceb)
2025-04-14 02:01:30 +02:00
Denis Konoplev
f79a9768eb Native data types
(cherry picked from commit 9504574dbb)
(cherry picked from commit 5967b3f41b)
2025-04-14 02:01:30 +02:00
Denis Konoplev
c7b0b925b6 XI2 headers in xlib wrapper generator
(cherry picked from commit ef108067a1)
(cherry picked from commit 1397389026)
2025-04-14 02:01:30 +02:00
Denis Konoplev
0f084e8000 Revert "Turn off multitouch"
This reverts commit 90ea3bf57e4c687e9d9bf0a37f2f64c82a81f4eb.

(cherry picked from commit b154b46eb0)
2025-04-14 02:01:30 +02:00
Denis Konoplev
94e0c48561 Turn off multitouch
(cherry picked from commit a2576ffa9a)
(cherry picked from commit 960e154377)
2025-04-14 02:01:30 +02:00
Alexey Ushakov
44319eacfc JBR-1962 Allow to change font config
Replaced several privileged blocks with just one

(cherry picked from commit faa8d3d258)
(cherry picked from commit 2ffadb5f9a)
2025-04-14 02:01:30 +02:00
Vitaly Provodin
b8549b71d6 JBR-572: Regression test on the crash caused by the fix
(cherry picked from commit 6cc380ffb5)
(cherry picked from commit 958e25ed21)
(cherry picked from commit a7de601d5f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 32a3948437)
2025-04-14 02:01:30 +02:00
Dennis Ushakov
71ceac4ebe JBR-1863, JBR-1868 correct advances on Catalina
(cherry picked from commit bff05a1a97)
2025-04-14 02:01:30 +02:00
Dennis Ushakov
431206cb3a JBR-1850: on macOS fonts should be sorted by weight to ensure proper population of the families
(cherry picked from commit 59974ca04c)
2025-04-14 02:01:30 +02:00
Dennis Ushakov
5086342c9a faster font family loading & lazy font family population
1. NSFont.familyName is faster than loading allFamilyNames
2. Prebuilt list of system fonts
3. Cleanup San Francisco family loading
4. Avoid calling expensive native getWidth on font when creating font family, load styles only when they would be used.

(cherry picked from commit db44a8c70e)
2025-04-14 02:01:30 +02:00
Dennis Ushakov
96e1c0b0bb JBR-1756 use CoreText for all font rendering on Catalina
(cherry picked from commit a4f42cd091)
2025-04-14 02:01:30 +02:00
Nikita Gubarkov
d395929d1b JBR-410 Added emoji support for Linux
(cherry picked from commit a98fac2c53)
2025-04-14 02:01:30 +02:00
Alexey Ushakov
062b1b1054 JBR-1997 JetBrainsMono fonts update to v0.22
(cherry picked from commit 41f4fddd34)
(cherry picked from commit f5302a02f4)
(cherry picked from commit 5d7fd2e1e5)
(cherry picked from commit 6d27bc749b)
2025-04-14 02:01:30 +02:00
Anton Tarasov
ca6ee0907f JRE-729 [windows] unreasonable IME activity consumes CPU
(cherry picked from commit caf8462e09)
2025-04-14 02:01:29 +02:00
Dmitry Batrak
cc05740df8 JBR-3119 Application's panel in KDE taskbar blinks when popup window is shown
this re-fixes JBR-2934 in a different way

(cherry picked from commit 63134e091b)
(cherry picked from commit d805bf045f)
2025-04-14 02:01:29 +02:00
Dmitry Batrak
532e19b4e4 JBR-3038 Unexpected windows z-order change on workspace switch
(cherry picked from commit ddda860f42)
(cherry picked from commit f4b23f8be1)
2025-04-14 02:01:29 +02:00
Dmitry Batrak
57a803bc8b JBR-3035 The Confirm Exit pop-up window remains hidden behind a window of another application
(cherry picked from commit 470c3bd1b5)
(cherry picked from commit 64e4203555)
2025-04-14 02:01:29 +02:00
Dmitry Batrak
805cb1f93a JBR-2934 Serious usability issue with GoLand 2020.3 caused by JBR
(cherry picked from commit 95be4351d4)
(cherry picked from commit 79d0b926b2)
2025-04-14 02:01:29 +02:00
Dmitry Batrak
3e6388f86f JBR-2977 Opening a recent project in a new window doesn't bring this window to the front
(cherry picked from commit 2d9fb9e7b8)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 27f390cf9a)
2025-04-14 02:01:29 +02:00
Dmitry Batrak
e2c1b4b370 JBR-2698 setAutoRequestFocus(false) breaks focus logic under i3 window manager on Linux
(cherry picked from commit ebcdeb7d80)
(cherry picked from commit 6d26292983)
2025-04-14 02:01:29 +02:00
Dmitry Batrak
5b5494d4be JBR-2696 Log focus API invocations with stack traces
(cherry picked from commits 0f038754e5, a507cab6d3)

(cherry picked from commit a494c76a27)
2025-04-14 02:01:29 +02:00
Dmitry Batrak
aeb40f08e3 JBR-2496 Prevent JVM stealing focus from other applications on Linux (JBR-2497, JBR-2499, JBR-2503, JBR-2652)
(cherry picked from commits 87525d1d2a, 66381f0dec, 8a789e04e9, 665ebc5d47, 98a9219c23)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 42aad68ab4)
2025-04-14 02:01:29 +02:00
Alexey Ushakov
7e759a2af6 JBR-3509 Extend JDK-8267521 (Post JEP 411 refactoring: maximum covering > 50K) to JBR specific changes
Marked all the usages of SecurityManager related api

(cherry picked from commit a783b841ac)
2025-04-14 02:01:29 +02:00
Artem Bochkarev
d717cf4c1b JBR-1851: check NSArray length
and make more exception-safe
and minor optimization for logging (cache jobjects)

(cherry picked from commit 5839539379)
(cherry picked from commit 23a3321d6d)
2025-04-14 02:01:29 +02:00
Artem Bochkarev
22775fe87c JBR-1841: allow deferred disabling of InputMethods-support
(cherry picked from commit 969255904b)
(cherry picked from commit f8513bcad9)
2025-04-14 02:01:29 +02:00
Artem Bochkarev
b30c373e84 JBR-1668: add hardcoded default values for preferences node NSServicesStatus
(cherry picked from commit 8445f53d85)
(cherry picked from commit 2e3a5fe508)
2025-04-14 02:01:29 +02:00
Artem Bochkarev
9a6a5aded0 JBR-1515: obtain shortcut from OS to check inside AWTView.performKeyEquivalent
(cherry picked from commit 30d479fbd4)

JBR-4899 Activate Previous Window doesn't work sometimes

(cherry picked from commit 63cb726f3c)
(cherry picked from commit ddeeb4c813)
2025-04-14 02:01:29 +02:00
Artem Bochkarev
344b958631 JBR-1668: add hardcoded descriptions of system actions
and minor fixes

fix memory management

(cherry picked from commit 15f7368309)
(cherry picked from commit 5aec21a5cd)
2025-04-14 02:01:29 +02:00
Elena Sayapina
e5ce42e822 JBR-1417 [TEST] Added new regression test (JBR 11 does not support chain of popups)
(cherry picked from commit 41e89505be)
(cherry picked from commit 9fe5c778d9)
(cherry picked from commit 6ea9530d9f)
(cherry picked from commit d757108517)
(cherry picked from commit b99c1e7b5c)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9745d7d7dc)
2025-04-14 02:01:28 +02:00
Alexey Ushakov
0e6ddc8f42 JBR-1690 Bundle new fonts
Test correction
Restored RenderUtil.java
Removed obsolete golden images
(cherry picked from commits:
aa13c8b4ea
943b1472c7
cab6dd5087
7997c7a5ee
cab6dd5087
7997c7a5ee
d3731df79d)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit a9a049709c)
2025-04-14 02:01:28 +02:00
Dmitry Batrak
bd4091d63e IDEA-257525 Unable to show Chinese when using IDEA mac ARM version
The proposed solution is to use a 'normal' font as a base for 'San Francisco' font fallback.
Most of its fallback components/candidates (provided by the OS) are expected to be normal
fonts as well, and so the resulting coverage of Unicode character repertoire should be much better.

(cherry picked from commits 9b7113a6cf, 92b00d50b5, 53489fab27)

(cherry picked from commit 7b14db7f6b)
2025-04-14 02:01:28 +02:00
Dmitry Batrak
f1be28044e JRE-469 Console with emoji output becomes slow
The fix consists of two parts:
* Making CCharToGlyphMapper remember that a particular character cannot be displayed (isn't mapped to glyph with given font). Checking this repeatedly in native code is very slow.
* Make CCompositeGlyphMapper remember the results of char-to-glyph mapping, this was missing in previous implementation. This reuses caching code in CompositeGlyphMapper, extending the range of characters for which the results are cached to include Supplementary Multilingual Plane (most emoji characters belong to it).

port commit 4e0ccde2 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 394e055ae6)

cherry picked from commit 0db7e948af

(cherry picked from commit 7721393e5b)
2025-04-14 02:01:28 +02:00
Dmitry Batrak
4cbffe678a reimplement JDK-7162125 to fix JDK-8147002
port commit ba38e5c4 from JBR 9

port from JBR 11 to JBR 15(cherry picked from commit a949f9d220)

cherry-picked from commit f309844f75

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit f9942d50a8)
2025-04-14 02:01:28 +02:00
Artem Bochkarev
80a6d3db1f JBR-1771: fixed compilation errors (macosx-x86_64-normal-server-fastdebug)
(cherry picked from commit 1acada7cac)
(cherry picked from commit c1751ca98d)
2025-04-14 02:01:28 +02:00
Artem Bochkarev
2b6856a71e JBR-1668: minor fixes
fixed review comments

(cherry picked from commit 9dbcf194c9)
(cherry picked from commit 8276f81a13)
2025-04-14 02:01:28 +02:00
Vitaly Provodin
fc14fc1f8a JBR-1618: fixed misprint, added saving screenshots in case of failure
(cherry picked from commit e4a3889cf0)
(cherry picked from commit 3959ac1680)
2025-04-14 02:01:28 +02:00
Alexey Ushakov
4dd43a1bd9 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Corrected lookup for bold fonts

(cherry picked from commit 114b8af38f)
(cherry picked from commit fa0816c404)
2025-04-14 02:01:28 +02:00
Alexey Ushakov
59788d718b JBR-1399 Improve font discovery and loading by introducing font cache
Added unit test

(cherry picked from commit b4f5bf8bd3)
(cherry picked from commit a0eb49776a)
2025-04-14 02:01:28 +02:00
Elena Sayapina
171f6e074f IDEA-165950 [TEST] Added new regression test (National keyboard layouts support)
(cherry picked from commit 0900a705bc)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 0981cb572a)
2025-04-14 02:01:28 +02:00
Artem Bochkarev
d2c70b3f37 JBR-1668: read system keyboard shortcuts
initial support for OS X

(cherry picked from commit 6bbe7102e2)
(cherry picked from commit ccd8116bf3)
2025-04-14 02:01:28 +02:00
Artem Bochkarev
e821219661 JBR-1573: restore current input context after cleanup
(cherry picked from commit b7acd7f6f6)
(cherry picked from commit 9dbdd24cc3)
2025-04-14 02:01:28 +02:00
Alexey Ushakov
29cf5bbf88 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Restored old behaviour of registerFontsInDir as it does not affect idea bundled fonts

(cherry picked from commit cef29e8100)
(cherry picked from commit e3a1cdae23)
2025-04-14 02:01:28 +02:00
Alexey Ushakov
4ad9e4993e JBR-1874 Cursor not changing from 'default' to 'text'
Prevent OS from changing cursor

(cherry picked from commit 94a4eb7002)
(cherry picked from commit c640e06d25)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
f61c7caec8 JBR-1778 Font in editor incorrect (always italics)
Added -it pattern into italic detection code
Added some more patterns to bold and italic detection code
'Anka/Coder' font support

(cherry picked from commit 5119eeee12)
(cherry picked from commit ec241e4a0a)
(cherry picked from commit 251068294e)
(cherry picked from commit 08ae9ff034)
(cherry picked from commit b472b89fba)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
d34db3bd8b JBR-1699 Use platform font rendering for bundled fonts on MacOS
Use different family for specific font faces. Refactoring

JBR-3071 Remove naming workaround for Fira Code

(cherry picked from commits c423003bd4, aee4b48d20)

(cherry picked from commit 8838b708be)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
0b23cf8a29 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Lower priority for idea bundled fonts to pickup platform ones
(if installed)

(cherry picked from commit e838103a24)
(cherry picked from commit 181c757ebe)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
faf1ff3460 JBR-1885 JetBrainsMono fonts update to v0.19
Updated the fonts to v0.19. Bundled italic fonts

(cherry picked from commit 7f032e3fe7)
(cherry picked from commit a7b4c9449a)
(cherry picked from commit 9c9cea0871)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
5672a9d3f7 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Lower priority for idea bundled fonts to pickup platform ones
(if installed)

(cherry picked from commit e838103a24)
(cherry picked from commit 517bd6d449)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
af28134451 JBR-1699 Use platform font rendering for bundled fonts on MacOS
Used CFont instead of TrueTypeFont for bundled fonts on mac
Use different family for specific font faces. Refactoring

(cherry picked from commit 8c86ad3e96)
(cherry picked from commit c423003bd4)
(cherry picked from commit bcae402dc8)
(cherry picked from commit e53374aab3)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
fd27660376 JBR-1690 Bundle new fonts
Update family name for JetBrainsMono-Thin

(cherry picked from commit 0d2326ff34)
(cherry picked from commit 83843f9124)
(cherry picked from commit 2a2e1cfb36)
(cherry picked from commit 76abb69262)
(cherry picked from commit 1350ceb04b)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
5685d07077 JBR-1645 javax/swing/JTextArea/TestTabSize.java: Tab width calculation wrong
Corrected idea font filter

(cherry picked from commit 62f9d1f46a)
(cherry picked from commit 3dab43f987)
2025-04-14 02:01:27 +02:00
Artem Bochkarev
cfcb814b4e JBR-1573: workaround for 'Sudden keyboard death on Ubuntu 18'
recreate instance of system InputMethod when starts filter all events

(cherry picked from commit 3ad94911af)

(cherry picked from commit c8533a1219)
(cherry picked from commit 42c5f07276)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
ffa3d5224e JBR-1399 Improve font discovery and loading by introducing font cache
Bundle IDEA fonts to improve startup performance

(cherry picked from commit 350a3fdef3)
(cherry picked from commit 4ad45a0c84)
2025-04-14 02:01:27 +02:00
Artem Bochkarev
f85e9168cc JBR-1541: activate menu in completion handler of modal dialog
(cherry picked from commit e57384c1d6)
(cherry picked from commit b38f01f5e4)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
ddd39da5e7 JBR-1314 Font difference in pycharm 2019.1 on Ubuntu
Removed disabling hints on MAX_FCSIZE_LTL_DISABLED font size

(cherry picked from commit 2b99dfed40)
(cherry picked from commit 4cf33c4d27)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
2a51330529 JBR-1412 [fwp to JBR11] JBR-1393 RubyMine is hanging after log in (macOS)
Modified version of JBR8 fix

(cherry picked from commit 434166fe63)
(cherry picked from commit db7cdf1d90)
2025-04-14 02:01:27 +02:00
Alexey Ushakov
caf8efc8cb JBR-1394 JBR11 does not support LCD text on Mac
Enable LCD rendering for transparent destinations

(cherry picked from commit 207c6b92ff)
(cherry picked from commit 2254451953)
2025-04-14 02:01:26 +02:00
Elena Sayapina
fac953f5bc JBR-1372: [TESTBUG] JDialog1054.java, MoveFocusShortcutTest.java regression tests need update
(cherry picked from commit a5948894bf)
(cherry picked from commit dcc2be2a53)
2025-04-14 02:01:26 +02:00
Maxim Kartashev
ceb0b378cd JBR-2755 IDE UI became slow via remote X Server connection from Windows
When XGetImage() calls become slow in a remote X11 session, fake
XGetImage() with client-side XCreateImage() that is filled with some
background color. The color is chosen from several top left corner
pixels of the "slow" images obtained with XGetImage().

This feature activates in a remote X11 session only and is
controlled with -Dremote.x11.workaround={true|false|auto}.

(cherry picked from commit 76decaa4ef)
2025-04-14 02:01:26 +02:00
Vyacheslav Moklev
49a4fd5bda Fix const pointer after JDK-8225032 fix
(cherry picked from commit dc3ae1cafa)
2025-04-14 02:01:26 +02:00
Vyacheslav Moklev
c0995c3203 Fix compilation on windows platform: awt_ole.h must be included before awt.h
(cherry picked from commit 6fdcfedd0e)
2025-04-14 02:01:26 +02:00
Vyacheslav Moklev
f0fdb92701 JBR-1269 Common Item Dialog does not appear on Alt+Tab or click in windows toolbar
JBR-1270 Common Item Dialog does not have an icon

Select a proper window handle

(cherry picked from commit 92fb89e3e3)
2025-04-14 02:01:26 +02:00
Vyacheslav Moklev
72be756212 JBR-1271 Wrong parent of native windows dialogs
Set a proper parent to a dialog window

(cherry picked from commit 803ba97361)
2025-04-14 02:01:26 +02:00
Vyacheslav Moklev
13cd2a7f0a JBR-1273 Common Item Dialog does not open when wrong path to directory is passed
Handle set directory / set file properly

(cherry picked from commit b96492f7de)
2025-04-14 02:01:26 +02:00
Vyacheslav Moklev
5be49fe785 JBR-1274 Common Item Dialog sometimes crash the process
Prevent from freeing memory with CoTaskMemFree twice

(cherry picked from commit 8e5e04a798)
2025-04-14 02:01:26 +02:00
Vyacheslav Moklev
44fae19bbd JBR-1257 CommonItemDialog modal window has no owner
Fix modality for Common Item Dialog

squash! JBR-1257 CommonItemDialog modal window has no owner

JBR-2478 java/awt/Modal/FileDialog/FileDialogNonModal7Test.java: DummyButton on Dialog did not gain focus when clicked

revert part of JBR-1271, that's related to 'old' file dialogs

(cherry picked from commit 8bc4787c11)
2025-04-14 02:01:26 +02:00
Vyacheslav Moklev
0f679416f4 JBR-1258 CommonItemDialog ignores directory to open
Fix parsing of directory path / file path

(cherry picked from commit b09a8aace1)
2025-04-14 02:01:26 +02:00
Vyacheslav Moklev
e2433796d9 JRE-1216 Implement Windows native file dialogs with the new Common Item Dialog API
Add implementation of file dialogs with the new Common Items Dialog API

(cherry picked from commit e2fb4ced09)
2025-04-14 02:01:26 +02:00
Alexey Ushakov
fa725d2b23 JBR-1144 [JDK11] [macos] Held down key is not deleted when press backspace after accent menu popup (Mojave)
Handled both Delete and ForwardDelete keys

(cherry picked from commit e3ba0bd651)
(cherry picked from commit 64cabb0dc7)
2025-04-14 02:01:26 +02:00
Alexey Ushakov
d5049fdd0b JBR-1144 [JDK11] [macos] Held down key is not deleted when press backspace after accent menu popup (Mojave)
Handled backspace separately

(cherry picked from commit 81916a92af)
(cherry picked from commit 60ae63de08)
2025-04-14 02:01:26 +02:00
Elena Sayapina
9699533349 JBR-1102: [TESTBUG] java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java: 'paint' method of 60 components was not called
(cherry picked from commit dc7abebe17)
(cherry picked from commit c8d631a142)
(cherry picked from commit a133cd791e)
2025-04-14 02:01:26 +02:00
Elena Sayapina
be70c66219 JBR-998: [TEST] Added new regression test (Input freezes after MacOS key-selector on Mojave)
(cherry picked from commit 3d898a8024)
(cherry picked from commit f368f0f101)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 362b7d402d)
2025-04-14 02:01:25 +02:00
Elena Sayapina
62d75c932c JBR-318: [TEST] Added new regression test (Cmd+` doesn't work after update to JDK 152_*)
(cherry picked from commit 0be0a018b5)
(cherry picked from commit 5bb4c2a1d6)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 7fa8aa1568)
2025-04-14 02:01:25 +02:00
Elena Sayapina
f67da38baa JBR-1054: [TEST] Added new regression test (Weird non-modal dialog above modal dialog behaviour)
(cherry picked from commit b808be6a6a)
(cherry picked from commit 48b7dd874f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit a39264214b)
2025-04-14 02:01:25 +02:00
Vitaly Provodin
29803cf0f6 JRE-1117 J2DBench: introduced result reader for TC's charts (follow up)
separated printing values fo TC charts and values for comparisons

(cherry picked from commit bbdbe17e2a)
(cherry picked from commit 3e5dcf6aeb)
2025-04-14 02:01:25 +02:00
Vitaly Provodin
c7af034228 JRE-1117 J2DBench: introduced result reader for TC's charts
(cherry picked from commit 422fa59643)
(cherry picked from commit 43b5f7f8b0)
2025-04-14 02:01:25 +02:00
Alexey Ushakov
7ba047be42 JRE-60 Editor font is distorted on Kubuntu Linux 16.04 with HiDPI
Override FC_HINT_SLIGHT only for small font sizes

(cherry picked from commit 0e1d23c807)
(cherry picked from commit 56e10e7d27)
2025-04-14 02:01:25 +02:00
Alexey Ushakov
4ed490fc17 JRE-471 Crash on macOS Sierra after Sleep
Replaced [NSScreen screens] 'objectAtIndex' with 'firstObject' to get nil instead of NSRangeException. Added nil checks

(cherry picked from commit d6b98511262055c01522d9ec8024253af7e91564)
(cherry picked from commit cef970e1ba)
(cherry picked from commit 9f34bb4ee4)
2025-04-14 02:01:25 +02:00
Alexey Ushakov
1e445d6d61 JRE-608 J2DBench metrics: up to 20x degradation
Increased rendering queue buffer up to 6.4 MB

(cherry picked from commit 9ef00f00a7fb6e14835393f8d3944157c6800727)
(cherry picked from commit 2a61e9e997a880a60c5acb361849205170501b91)
(cherry picked from commit 68ca9f00ded004c970b94bd047a04b9f09237047)
(cherry picked from commit 2fe5289178)
(cherry picked from commit 560a65654e)
2025-04-14 02:01:25 +02:00
Alexey Ushakov
b516afa371 JRE-1028 fwport(9): JRE-1008 Do not use LCD shader on macOS 10.14+ in font rendering
Disable LCD text shader on macOS 10.14+ if LCD rendering is not explicitly specified

(cherry picked from commit dffea9d701)
(cherry picked from commit 1628d6120e)
2025-04-14 02:01:25 +02:00
Konstantin Bulenkov
fc6f38cfac update icons
(cherry picked from commit dfe387ff5037deda29d8d522cba6cc5370796ff4)
(cherry picked from commit de1e4a9d71)
(cherry picked from commit 0b33efa7d1)
2025-04-14 02:01:25 +02:00
Vitaly Provodin
60435af639 Update README.md
(cherry picked from commit eacef38934)
2025-04-14 02:01:25 +02:00
Vitaly Provodin
eda7d3861f Regression test on https://bugs.openjdk.java.net/browse/JDK-8139176
JBR-5008 remove extra file jb/java/awt/font/DrawTest.java from colliding group

(cherry picked from commit 6f1c0a6)
(cherry picked from commit 63130fd461)

add regression test on https://bugs.openjdk.java.net/browse/JDK-8139176

(cherry picked from commit 380c17456c)

(cherry picked from commit 6f1c0a6)
(cherry picked from commit 63130fd461)
(cherry picked from commit 33bbc7d54d)
2025-04-14 02:01:25 +02:00
Vitaly Provodin
d89044785d not for upstream: added disposing frames in order to provide the test with the chance on the second run
(cherry picked from commit 8170635)
(cherry picked from commit 7fc924f065)
(cherry picked from commit a2f9387697)
2025-04-14 02:01:25 +02:00
Vitaly Provodin
75ac45065a JRE-9: added regression test
(cherry picked from commit 4ffb665)
(cherry picked from commit 00a29ad129)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 05ad949ded)
2025-04-14 02:01:25 +02:00
Sergey Malenkov
3bf2e474de JRE-100 Scroll with inertia (Mac os) should only work in the initial component
(cherry picked from commit e79502c708)
(cherry picked from commit 223a74bfeb)
2025-04-14 02:01:24 +02:00
Sergey Malenkov
92f83c1696 IDEA-161965 ignore dragged event that does not change mouse location Sierra is more sensit
(cherry picked from commit ef490fa465)
(cherry picked from commit 3722edc9f2)
2025-04-14 02:01:24 +02:00
Dmitry Batrak
9ec721a3a2 JBR-3339 Window requests focus on horizontal scroll (on Linux)
(cherry picked from commit 8d74e8e30b)
(cherry picked from commit 88edabdd60)
2025-04-14 02:01:24 +02:00
Anton Tarasov
51b2ae3952 JRE-166 [macOS] deadlock with JFXPanel
(cherry picked from commit a9dbb6990fac0c659297487a261ba9170e5fb3ad)

(cherry picked from commit 8a44e1bb37)
(cherry picked from commit 9a280dc79e)
2025-04-14 02:01:24 +02:00
Alexey Ushakov
cec90132e7 8265445: Introduce the new client property for mac: apple.awt.windowAppearance
Implemented apple.awt.windowAppearance client property

(cherry picked from commit ba60f7bd8f)
2025-04-14 02:01:24 +02:00
Anton Tarasov
95730b7721 JBR-3306 jbr-dev warnings: incompatible pointer to integer conversion returning 'void *' from a function with result type 'jlong'
(cherry picked from commit 046409cd7f)
2025-04-14 02:01:24 +02:00
Dmitry Batrak
a3db1bd67a JBR-2498 Fix unexpected window raising under Mutter WM
re-implement the fix, so that ChildAlwaysOnTopTest isn't failing

(cherry picked from commit bf826251fa)
2025-04-14 02:01:24 +02:00
Alexey Ushakov
f32c6224ee JBR-3327 [jbr-dev] Adjust mac window appearance according to AppleInterfaceStyle property
Set window appearance according to AppleInterfaceStyle default

(cherry picked from commit ffe5b5a504)
2025-04-14 02:01:24 +02:00
Alexey Ushakov
f033f09711 JRE-238 [736] java.awt.AWTError: access denied ("java.lang.RuntimePermission" "canInvokeInSystemThreadGroup")
Moved task execution on AppKit to the privileged block. Minor refactoring

(cherry picked from commit 5dbb88471115c9e4a536ae37d0e6794de9e5ac9c)
(cherry picked from commit fd2f9a1166)
2025-04-14 02:01:24 +02:00
Alexey Ushakov
10d188984b JRE-359 CGraphicsEnvironment.getDefaultScreenDevice() returns null
Moved CG api calls to AppKit thread

(cherry picked from commit fd0210f035199e8612097a2c1d42b90cfd2111f8)
(cherry picked from commit 5e99e376d9dfe477401121878704630c3c13f9f7)

(cherry picked from commit 6d73b25130)
(cherry picked from commit 9519ac1e6e)
2025-04-14 02:01:24 +02:00
Dmitry Batrak
0b03e63cb8 JBR-2973 Copy/Move dialog not in the focus on drag-n-drop to Project Tool window from external application
(cherry picked from commit 20fe78b650)
(cherry picked from commit 9f6b9baaa8)
2025-04-14 02:01:24 +02:00
Alexey Ushakov
813f3b071f JRE-444 CPlatformWindow.nativeGetTopmostPlatformWindowUnderMouse is slow
Replaced number of CGWindowListCopyWindowInfo for each window layer with [NSWindow windowNumberAtPoint: belowWindowWithWindowNumber:]

(cherry picked from commit 2a143af4d62340acdfd9c94d876f684385febbc8)
(cherry picked from commit 6fc369e8bf)
(cherry picked from commit 91b0084667)
2025-04-14 02:01:24 +02:00
Alexey Ushakov
7e7fa82551 JRE-482 Java_sun_font_CStrike_getNativeGlyphOutline takes too much time in scrolling
Replaced glyph outlines with bounding boxes for glyph boundaries calculation for most common usages. Also, skipped unnecessary OGL flushes in OGL rendering queue

(cherry picked from commit c58dc052af48887338a38beb0c721eddca3af481)
(cherry picked from commit 7f6be7cfb907bbf1c3572b911df5690fa3039fde)
(cherry picked from commit c68913d82c0ba4b4c509179123f0a4bf7971f857)
(cherry picked from commit 9cfa04c93ad416a8177d9e7ca410850bd3ff880f)
(cherry picked from commit 0e930841704e4e98ecc0c888b144245e74218799)
(cherry picked from commit 8ffc190fbdb059d5a24842115c0bc3ade8b351b9)
(cherry picked from commit 0f7c26186a)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit e20819c77b)
2025-04-14 02:01:24 +02:00
Alexey Ushakov
19bafc1d3f JBR-3316 Reimplement CThreading functionality on top of OpenJDK17 sourcebase
Adopted CThreading related code to OpenJDK17 source base

(cherry picked from commit 5dfb30ae68b2c54d58c98a9195709c031f823581)
(cherry picked from commit 94163bd69f64616836523e81567aa1141480d841)
(cherry picked from commit baca50b430)
2025-04-14 02:01:24 +02:00
Alexey Ushakov
b78fd728ef JBR-3304 jbr-dev warnings: 'getPhysFontName' defined but not used [-Werror=unused-function]
Removed unused code

(cherry picked from commit 6781f2646f)
2025-04-14 02:01:24 +02:00
Vitaly Provodin
731416cf09 exclude javax/swing/JTabbedPane/4624207/bug4624207.java failing on windows due to 8197552
(cherry picked from commit 3f8f2e8928)
2025-04-14 02:01:23 +02:00
Alexey Ushakov
562cfe131e JRE-366 Add support for Awesome WM
Added detection of Awesome WM and handled similar to Sawfish WM

(cherry picked from commit 6742077ed198975949af567e8ef543f853397351)
(cherry picked from commit 2847be73c6)
(cherry picked from commit 916a2ab66f)
2025-04-14 02:01:23 +02:00
Alexey Ushakov
8c709b0564 JRE-353 Fedora 25 + XMonad rendering issues
Added support for Xmonad WM

(cherry picked from commit c690c3c7fdf1390e6b1a8d388ff752a09391ae3c)
(cherry picked from commit 6851dc3441)
(cherry picked from commit e290bf8a0c)
2025-04-14 02:01:23 +02:00
Denis Konoplev
96d29b9f6a 8264143: Change uint8_t to unsigned char
(cherry picked from commit 9d01b82f64)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
af333f81c1 JBR-3255 Applying 'incline' transform might change character's advance
(cherry picked from commit b37f7cfdb1)
(cherry picked from commit 2bd6c80390)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
4977acce90 JBR-3215 'deriveFont(float)' can return a different font (not just change the size)
(cherry picked from commit 8eafcaab24)
(cherry picked from commit 3f4065786d)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
3ce5886e41 JBR-3157 Maximized window with custom decorations isn't focused on showing
(cherry picked from commit 62b04983f2)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit e4f68d461c)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
7cc8e71896 JBR-1752 Floating windows overlap modal dialogs
(cherry picked from commit 0161050077)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 8b2f0315d1)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
4002ed6f95 JBR-3054 Focus is not returned to frame after closing of second-level popup on Windows
(cherry picked from commit 0c2b6e1c04)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 8c6ecf33f1)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
981a268cc4 JBR-2702 Tooltips display through other applications on hover
(cherry picked from commits 11732c2469, 0ed7deabaa)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit cc952f4053)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
874bbe7dfc added RobotSmokeTest
this test failing in jtreg launch most probably indicates either some problem with the environment (e.g. some windows left open from previously launched processes) or with java.awt.Robot implementation

(cherry picked from commit 1d525a2d2f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9c3043a557)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
3e4348ae63 JBR-2847 Always dispatch KEY_TYPED event to the same component as KEY_PRESSED event
also fixes JBR-2834, IDEA-254466, IDEA-254466
squashed with fixes for JBR-3291, JBR-3307, JBR-3598

(cherry picked from commits e94f6057a4, ba6b9c085e, 2ccf6b65a7, 3b0708af7d, 3674766d65)

(cherry picked from commit d7383ededb)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
a0c10ef687 JBR-2712 Typeahead mechanism doesn't work on Windows
(cherry picked from commits 1a9838082e, f5b6222835, acd7e3b2da, cd6dd5c3cf8556f97f3113cb7d615a92393b57bf(partially), e8bbd8ffdd90f57cd12d7d7e89188be97ee4be0b(partially), 37901295e1, cafb374afc, 12034dcf61)

includes fix for JBR-4974 jb/java/awt/Focus/ModalDialogFromMenuTest.java intermittently clicks at tittle bar

Pause before getting the coordinates of the component to be clicked on,
not right before the click itself.

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 7855e07658)
2025-04-14 02:01:23 +02:00
Denis Konoplev
7a2b3101ed 8264143: Lanai: RenderPerfTest.BgrSwBlitImage has artefacts on apple M1
Add stdint include to fix x64 build

(cherry picked from commit 0dc04385a3)
2025-04-14 02:01:23 +02:00
Dmitry Batrak
d299909de1 JBR-2498 Fix unexpected window raising under Mutter WM
(cherry picked from commit 73b45fb899)
(cherry picked from commit bc8dec8fc1)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
f2fe0aec8a JBR-2248 Support text wrapping in a <pre> tag in JEditorPane
port from JBR 11 to JBR 15 (cherry picked from commit ff2e915371)

cherry picked from commit 6a30c56138

(cherry picked from commit add6c7e2c9)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
45ae3650cc JBR-2234 Support CSS setting overflow-wrap:anywhere in JEditorPane
port from JBR 11 to JBR 15 (cherry picked from commits b6583d0a71, 6003abc15f)

cherry picked from commit 93ad4f06dd

also includes JBR-4006 [JCK] javax.swing.text.html.CSS$Attribute.OVERFLOW_WRAP field breaks public API
(cherry picked from commit f20a3d8679)
and JBR-4007 [JCK] javax.swing.text.GlyphView.calcBreakSpots method breaks public API
(cherry picked from commit 1002eff4f3)
(cherry picked from commit f603f9e837)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
ef8d920274 JBR-2050 Issue with keycap emojis
port from JBR 11 to JBR 15 (cherry picked from commit ae91e1d7f1)

cherry picked from commit d3018a1837

(cherry picked from commit 17afbc7882)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
9db4b766e3 JBR-1714 Italic text is displayed using incorrect glyphs on Windows
port from JBR 11 to JBR 15 (cherry picked from commits 46e4cdfcbd, 9cc5cbc99b)

cherry picked from commit 6769b27e53

(cherry picked from commit eccee72823)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
4f06fc280e JBR-1689 Incorrect painting of long strings on linux
port from JBR 11 to JBR 15 (cherry picked from commits e12c1d6f0d, 0429e74e9d)

cherry picked from commit e43cfd198f

(cherry picked from commit 0b3c19d1c4)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
8b6b62b1f5 JBR-1248 Exception caused by broken font
port from JBR 11 to JBR 15 (cherry picked from commit 4efa7eab3e)

cherry picked from commit 6e1c514c6c

(cherry picked from commit 452fbf01a5)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
8230a21767 JBR-1245 [JDK 11] There are different letter spacings in some controls
port from JBR 11 to JBR 15 (cherry picked from commit a26b70568a)

cherry picked from commit e2637199e9

(cherry picked from commit ca316d6bc0)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
aa972a484e JRE-927 Unexpected wrapping of bidirectional text in JEditorPane on HiDPI screens
port commit 11a5a4a2 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 65a5e450d5)

cherry picked from commit 47ff31ae82

(cherry picked from commit c4426e7ff2)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
9b94bbe765 JRE-774 Don't paste BOM from clipboard on Mac
port commit ea9b75b3 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit c6fed2cf58)

cherry picked from commit a5e25d1ef9

(cherry picked from commit a105a6e802)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
4fef9ca607 JRE-847 Box drawing characters have different widths with Monospaced font on Windows
port commit 778cef18 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 9caaac4a5a)

cherry picked from commit eea293f4a4

(cherry picked from commit 7b9b29493d)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
edfb49f5c3 JRE-748 Strange dots with fractional metrics turned on
port commit 82e7c82d from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit e9bd5f5dad)

cherry picked from commit e0475e9ba2

(cherry picked from commit 714ba79a84)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
937e0f8f3b JRE-593 Wrong italic font rendering for Source Code Pro
port commit 1f6bd200 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 32ce109355)

cherry picked from commit 087ff34c2e

(cherry picked from commit 86fa2a9c9b)
2025-04-14 02:01:22 +02:00
Dmitry Batrak
fc952c4328 JRE-430 Font fallback sometimes doesn't work in Swing text components
port commit fc8003ad from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 5b814d6b34)

cherry picked from commits b871188f44, 0a9f16dc90, 9cc82c39d9

(cherry picked from commit df8821d745)
2025-04-14 02:01:22 +02:00
Alexey Ushakov
be95d905dd JRE-303 2017.1.1 update breaks linux fonts
Corrected rendering hints for Non-AA text rendering

(cherry picked from commit b923aa7a0729a10ea47d3438622d659fbead44c9)
(cherry picked from commit b6bdd04e41)
(cherry picked from commit 8b12cf08ee)
2025-04-14 02:01:21 +02:00
Alexey Ushakov
64ee7b6ddf JRE-205 Font is wrong and without anti aliasing in 2017.1 EAP
Added property to disable bundled font config:
  java2d.font.loadFontConf=false
Do not load custom font.conf by default

Moved hints adjusting logic from code to bundled font.conf file
Applied correction only for regular fonts with platform sizes less than 12
Some fonts are not corrected at all: Consolas, Noto Sans Mono
Used family name instead of physical one in requests to Fontconfig
Removed redundant call to FcConfigBuildFonts
Added privileged access to the properties (JRE-235,JRE-235)

(cherry picked from commit 4d4c915047077ebd966b0e3be056566d56ba11a4)
(cherry picked from commit 9d6f325f72482405264852f3ee2636f5fedaeaf0)
(cherry picked from commit e7e3372bf8db539c0f6bc85db9f1093f8fa4c380)
(cherry picked from commit 3e724caed2f199be50d25d1ecb20b7819c86be2e)
(cherry picked from commit d372b35963c096a32331b05b257e26841ace5d94)
(cherry picked from commit 18a5f5de03eb107f89dca138a44b9aab2151235c)
(cherry picked from commit 9ba320efef0539f75aa93fd1b5dd80266c954d0a)
(cherry picked from commit b8c38f419972af61291953f7f452c1698f7a1624)
(cherry picked from commit debba0128e200be60adc9a339d5985590ef4e230)
(cherry picked from commit 2fa17b1bd7d6524e4b5fa4d0b3ce2bf02a8fcc78)
(cherry picked from commit 09b4f61db0d4f5beea0e16ce9136c99e2185c10b)
(cherry picked from commit 3b6782dd742f9c74a9535145db2f9f7ffaccf7c8)
(cherry picked from commit f1b68149528c13a22fa64468c130b1405bf3d081)
(cherry picked from commit db5cf5a2b9cb454630fb86783c2d58cd5446cba6)
(cherry picked from commit 32140948578bc3c2a0c5f8adb537660421efe5e7)
(cherry picked from commit b978e3d0b131ed642774c5a14a649e13f764c20b)

(cherry picked from commit c75c1ef8b2)

(cherry picked from commit a29f19e6a2)
(cherry picked from commit c38c46744f)
2025-04-14 02:01:21 +02:00
Dmitry Batrak
89130e464c an option to disable native rendering for rotated text (following JRE-19)
port commit ccc1ded6 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 72fb9ff7c4)

cherry picked from commit a5bd092449

(cherry picked from commit 52ebd26933)
2025-04-14 02:01:21 +02:00
Dmitry Batrak
c5d87e74be JRE-11 Support text rendering via DirectWrite API on Windows
(cherry picked from commit 6605d4a525)
2025-04-14 02:01:21 +02:00
Dmitry Batrak
50acdf911f IDEA-150876 OpenJDK fonts for toolwindow names look worse than Oracles's
don't apply FreeType-returned glyph advance for rotated glyphs rendered by GDI

This seems to produce a better looking text (more evenly spaced). Fractional metrics won't be respected by this code, but we can address this later if needed.

port commits c9debd5e, ed78cd00, 4c7e1619, 7aa0429c, 7bd6c17c from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commits d6b588bdab, dbc15fb84e)

cherry picked from commit 2c0d6150d0

(cherry picked from commit 12f2233f94)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
ed68029b55 JRE-186 added regression test (Modal dialogs (Messages) shouldn't popup IDEA when another application is active)
(cherry picked from commit 236bd38d1b)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 45b52492a9)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
c56533a5a3 JRE-269 added regression (JLabel doesn't scale <code>text</code> HTML fragments.)
(cherry picked from commit 1f4ad38d23)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit b2f584b10a)
2025-04-14 02:01:21 +02:00
Alexey Ushakov
808bfe6d36 JRE-307 Wrong dpi reported on Wayland
(cherry picked from commit 15693661cc)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit ae4c4c017d)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
4ef4d658bb JRE-392 added regression (Tip of the day is not hidden while another modal window is shown)
(cherry picked from commit c7b0ac686f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit e8e81b7509)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
57ee8c4ce9 JRE-394 added regression test (System getenv doesn't return env var set in JNI code)
(cherry picked from commit 3a7b3c67b0)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 7439fd115a)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
ecb1fc5a7e JRE-401 added regression test (AppCode freezes during autocomplete and other operations)
(cherry picked from commit cb4453b1d1)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit dde86b1e6c)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
d011565941 JRE-422 added new regression test (AWTView deliverJavaMouseEvent leaks jEvent)
(cherry picked from commit 37dc13c603)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit a5e094dd07)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
72a19a4699 JRE-430 added new regression test (Font fallback sometimes doesn't work in Swing text components)
(cherry picked from commit d04debc847)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5a47f2a66c)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
2d5e5edd6d JRE-457 added new regression test (OGLTR_DisableGlyphModeState is slow)
(cherry picked from commit 3a43f4557f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit f534b029e2)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
3acf740aa4 JRE-458 added new regression test (Insufficient and inconsistent permissions on some files in Linux build)
(cherry picked from commit 82adbe9c25)
(cherry picked from commit 15998f29c1)
2025-04-14 02:01:21 +02:00
Vitaly Provodin
02d25ec8c3 JRE-467 added new regression test (Wrong rendering of variation sequences)
(cherry picked from commit 0026095202)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 1d0be02755)
2025-04-14 02:01:20 +02:00
Vitaly Provodin
43740250d6 JRE-468 added new regression test (Idea freezes on project loading)
(cherry picked from commit 1ce8c3ce82)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 0200338c3c)
2025-04-14 02:01:20 +02:00
Vitaly Provodin
350c436f1a JRE-501 added new regression test (Live resize is jerky for heavy java applications on Mac)
(cherry picked from commit c4a1277c1b)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 39bd5023d4)
2025-04-14 02:01:20 +02:00
Vitaly Provodin
d3ac4faef3 JRE-638 added new regression test (enable unlimited cryptographic policy by default)
(cherry picked from commit 4a14c6f15a)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 4643b6a354)
2025-04-14 02:01:20 +02:00
Vitaly Provodin
7839dda46b JRE-705 added new regression test (Z-order of child windows is broken on Mac OS)
(cherry picked from commit 82cd480619)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 84c0444389)
2025-04-14 02:01:20 +02:00
Vitaly Provodin
c1138842d4 JRE-624 CThreading isAppKit() fails to detect main app thread if it was renamed
(cherry picked from commit c8f248a936)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9aa93e5907)
2025-04-14 02:01:20 +02:00
Alexey Ushakov
84e598b67d IDEA-166173 IntelliJ freezes when returning from sleep
Fixed deadlock by removing unnecessary getScreenResolution call

(cherry picked from commit cec93cf1fd)
(cherry picked from commit 0d37ce45c8)
2025-04-14 02:01:20 +02:00
Alexey Ushakov
2c7bdb8c90 Added missing fontconfig defines
(cherry picked from commit 2ac273a456)
(cherry picked from commit d922d7dfaf)
2025-04-14 02:01:20 +02:00
Alexey Ushakov
26eace7b6d JRE-43 Font.getFamily() does not work in headless mode
Removed unused code

(cherry picked from commit 5b523f049e)
(cherry picked from commit 3535055ecd)
2025-04-14 02:01:20 +02:00
Alexey Ushakov
763c9c2977 JRE-43 Font.getFamily() does not work in headless mode
Bundled Droid fonts to fallback in headless mode

(cherry picked from commit 5b523f049e)
(cherry picked from commit b65e0d7cb7)
2025-04-14 02:01:20 +02:00
Alexey Ushakov
f3f1add3d7 JRE-15 Greyscale text is too dark comparing with subpixel AA
Adjusted default value for greyscale text rendering in freetype

(cherry picked from commit f80497c4f0)
(cherry picked from commit 67e3b05916)
2025-04-14 02:01:20 +02:00
Alexey Ushakov
eedc1f9c64 IDEA-155347 On Ubuntu with High DPI tooltip font is too thick when the tooltip is fading in and out
Handled missing FC_RGBA_NONE value

(cherry picked from commit 44fcbdabf8)
(cherry picked from commit a9ca78b413)
2025-04-14 02:01:20 +02:00
Alexey Ushakov
7743b05b4a IDEA-149882 Issue with fonts in Ubuntu 12.04
Provided fallback to default font rendering settings if libfontconfig unable to
match font pattern

(cherry picked from commit d93a5f1598)
(cherry picked from commit ebaea7e146)
2025-04-14 02:01:20 +02:00
Alexey Ushakov
3bb78c8564 IDEA-151619 CLion EAP fails to start with missing symbol: FT_Library_setLcdFilter
Skip FT_Library_setLcdFilter call if the symbol is not there
Cache negative FT_Library_setLcdFilter symbol lookup result
Used RTLD_DEFAULT handler for process symbols lookup

(cherry picked from commit e6f0055704)
(cherry picked from commit dfbc7d7cc2)
2025-04-14 02:01:20 +02:00
Alexey Ushakov
b676879711 JRE-29 fontconfig lib crashes CLion on OSX
Disabled fontconfig usage on OSX

(cherry picked from commit 431e14429c)
(cherry picked from commit 534d184416)
2025-04-14 02:01:19 +02:00
Vitaly Provodin
96b229f032 exclude tests spontaneously creating windows during test execution
(cherry picked from commit bd278194b9)
2025-04-14 02:01:19 +02:00
Alexey Ushakov
8d4c098c36 JRE-48 built-in jre renders fonts abnormally heavier (normal text looks bold) than the oracle jre
Disable FT_LOAD_TARGET_LIGHT for fonts with FC_AUTOHINT=false (this target implicitly enables  FC_AUTOHINT)
Reused setupLoadRenderFlags for all rendering cases

(cherry picked from commit f3f2667a4c)
(cherry picked from commit e5a81a300f)
2025-04-14 02:01:19 +02:00
Alexey Ushakov
42cb84b6ea Added logging for freetypeScaler via env variable OPENJDK_LOG_FFS=yes
and for screen resolution in freetypeScaler

(cherry picked from commit 091d74a791)
(cherry picked from commit 7243173610)
2025-04-14 02:01:19 +02:00
Alexey Ushakov
dae3df9168 JRE-34 IDE Crashes During Startup
Added validation of dpi settings coming from xserver

(cherry picked from commit b1c49c3b27)
(cherry picked from commit 3e57837094)
2025-04-14 02:01:19 +02:00
Anton Tarasov
991d7be325 JBR-2031 [mac] jcef deadlocks with a11y on start
(cherry picked from commit 4f44b37f08)
(cherry picked from commit 8a4a781393)
2025-04-14 02:01:19 +02:00
Alexey Ushakov
012715e7d8 JRE-1083 [JDK11] Test com/sun/java/accessibility/util/8051626/Bug8051626.java fails on macOS on JB JDK11b
Wrapped SelectorPerformer invocation into privileged action

(cherry picked from commit 48e7b547ae)
(cherry picked from commit e420b10a4a)
2025-04-14 02:01:19 +02:00
Anton Tarasov
420bef21fe JBR-2019 provide getWindowHandle method for jcef
(cherry picked from commit 7ae706b629)
(cherry picked from commit d0b855df14)
2025-04-14 02:01:19 +02:00
Anton Tarasov
8fe391c0a8 JBR-1976 [jcef] need mouse-transparent window on Windows
(cherry picked from commit b60fac96b4)
(cherry picked from commit e68503823b)
2025-04-14 02:01:19 +02:00
Anton Tarasov
79a610af59 JBR-1824 export NSWindow::setIgnoresMouseEvents to java internal API
(cherry picked from commit 4399dc382c)
(cherry picked from commit 99d8964d90)
2025-04-14 02:01:19 +02:00
Anton Tarasov
ef3e5d5ea6 JBR-1802 com/sun/java/accessibility/util/8051626/Bug8051626.java: access denied ("java.lang.RuntimePermission" "getClassLoader")
(cherry picked from commit eae772aca9)
(cherry picked from commit d944e5907a)
2025-04-14 02:01:19 +02:00
Anton Tarasov
f706940118 JBR-1795 Project opened from Welcome screen goes to backgound after loading
(cherry picked from commit 322526458a)
(cherry picked from commit 2ee33311dd)
2025-04-14 02:01:19 +02:00
Anton Tarasov
03d63c608d JBR-1609 Jupyter Notebook eventually causes IDEA to become unresponsive on Mac OSX
(cherry picked from commit 8ae0be8eb6)
(cherry picked from commit 812158fb5b)
2025-04-14 02:01:19 +02:00
Anton Tarasov
2053818d3c JBR-1786 Weird white border for IDE window
(cherry picked from commit 4b09614a0e)
(cherry picked from commit 8366197c01)
2025-04-14 02:01:19 +02:00
Vyacheslav Moklev
c77c83bafa JBR-1552 Invalid screen bounds in full screen mode
Check is window is not in undecorated state

(cherry picked from commit 5547701e2c)
(cherry picked from commit d5fa62913e)
2025-04-14 02:01:18 +02:00
Vyacheslav Moklev
1d8c588c9c JBR-1509 Client area size is wrong in Borderless mode
Fix client area size

(cherry picked from commit 00d32e58dc)
(cherry picked from commit f78449b302)
2025-04-14 02:01:18 +02:00
Anton Tarasov
e0e4cb7bcb JBR-1770 [windows] frame does not open as maximized
(cherry picked from commit d9dfc3c6c5)
(cherry picked from commit 7525d41946)
2025-04-14 02:01:18 +02:00
Anton Tarasov
7a618c93ac JBR-1693 difficult to input Japanese text with "Fast" Key Repeat
(cherry picked from commit 12de3e287e)
(cherry picked from commit bfa95fd66e)
2025-04-14 02:01:18 +02:00
Anton Tarasov
65807e36fe JBR-1669 IDE-managed HiDPI mode is broken
(cherry picked from commit 461b0b5cd4)
(cherry picked from commit 3049d42f8c)
2025-04-14 02:01:18 +02:00
Anton Tarasov
e4194b7664 JBR-1650 propagate custom decoration title bar height to native
(cherry picked from commit f6fc65d014)
(cherry picked from commit 34032b2ced)
2025-04-14 02:01:18 +02:00
Anton Tarasov
731e5a944c JBR-1629 Maximized window cut at the right and bottom
(cherry picked from commit 9e768377db)
(cherry picked from commit 0532e6c2aa)
2025-04-14 02:01:18 +02:00
Anton Tarasov
86ee099e64 JBR-1492 Not able to start Intellij Idea 2017.2.5 with modified vmoptions
(cherry picked from commit e7ca6db66b)
(cherry picked from commit 88694a6148)
2025-04-14 02:01:18 +02:00
Anton Tarasov
2a4a33a3ec JBR-1427 pycharm jupyter preview stuck and no response when click on preview.
(cherry picked from commit 1746b04686)
(cherry picked from commit 3c3c2ffa90)
2025-04-14 02:01:18 +02:00
Anton Tarasov
cb77f2b8d1 IDEA-210154 Borderless UI: Top frame of IDEA window is blue
(cherry picked from commit 2dd4163bc4)
(cherry picked from commit 2f4e023df0)
2025-04-14 02:01:18 +02:00
Anton Tarasov
8f420d617d JBR-1351 Borderless UI: Bold frame around IDEA window appears on non-HiDPI display
(cherry picked from commit 06d35de069)
(cherry picked from commit 0bfcc28a7a)
2025-04-14 02:01:18 +02:00
Anton Tarasov
0d76a82244 JBR-1313 wrong insets for non-resizable custom-decorated frame
(cherry picked from commit 9179718cb6)
(cherry picked from commit 05f934ea20)
2025-04-14 02:01:18 +02:00
Anton Tarasov
33b215f023 JBR-1293 do not modify client bounds when custom-decorated frame is set undecorated
(cherry picked from commit cb188edaab)
(cherry picked from commit 2cecea407d)
2025-04-14 02:01:18 +02:00
Anton Tarasov
0f1f0fb238 JBR-1278 allow native border and shadow for custom decoration mode
(cherry picked from commit ec106a58a3)
2025-04-14 02:01:18 +02:00
Anton Tarasov
723f3db373 JRE-1232 forwardport: JRE-1228 support custom frame decoration
(cherry picked from commit d2820524a1)
(cherry picked from commit 1ebd6a000b)
2025-04-14 02:01:18 +02:00
Anton Tarasov
8ba822ac43 JRE-1162 [jdk11] support on-the-fly DPI change on linux
(cherry picked from commit c06c4c69d3)
(cherry picked from commit 5138201282)
2025-04-14 02:01:17 +02:00
Anton Tarasov
9d4e0aaef3 JRE-1142 [jdk11] hidpi is not detected since Ubuntu 18.04
(cherry picked from commit be4f8c0d9d)
(cherry picked from commit 96b07c6c65)
2025-04-14 02:01:17 +02:00
Anton Tarasov
74bda6c20d JRE-1111 [JDK11] java/beans/Beans/TypoInBeanDescription.java crashes at libawt_xawt.so+0x4a30d
(cherry picked from commit b89e6aed0b)
(cherry picked from commit 924b6a8bb7)
2025-04-14 02:01:17 +02:00
Anton Tarasov
08108daf71 fix JNI_OnUnload definition
(cherry picked from the commit  3571e39071)

(cherry picked from commit 1019d8f0f2)
(cherry picked from commit 4fae6cb785)
2025-04-14 02:01:17 +02:00
Anton Tarasov
247297f074 JRE-981 IM workaround does not work anymore
forward port of 2d7c29b in JetBrains/jdk8u_jdk

(cherry picked from commit f3ccc53e02)
(cherry picked from commit 362eaede04)
2025-04-14 02:01:17 +02:00
Anton Tarasov
9c493e006c JRE-938 [windows] Frame.setMaximizedBounds not hidpi-aware
(cherry picked from commit cc97899923320e1fa17f5e44975c4a0f0ba51014)
(cherry picked from commit ccfe65be7f)
(cherry picked from commit b86054beb6)
2025-04-14 02:01:17 +02:00
Anton Tarasov
6f2bd1144e JRE-907 macOS: add ability to check for scaled display mode
(cherry picked from commit e496262aa1)
(cherry picked from commit e07eaabe47)
2025-04-14 02:01:17 +02:00
Anton Tarasov
2f98205bdb JRE-934 Diff viewer errors are not visible on HiDPI Linux
(cherry picked from commit 641a09dd52)
(cherry picked from commit c37bfae963)
2025-04-14 02:01:17 +02:00
Anton Tarasov
ab88fb38a9 [jdk9] HiDPI scale is not detected on some linux desktops
(cherry picked from commit 9279d80110)
(cherry picked from commit 57f7da037b)
2025-04-14 02:01:17 +02:00
Anton Tarasov
1b70308ffe JRE-681 [windows] direct drawing into frame graphics may have wrong translate
(cherry picked from commit 6ea1d45fd1)
(cherry picked from commit 60bb53f919)
2025-04-14 02:01:17 +02:00
Anton Tarasov
ab1b04ce11 Read org.gnome.desktop.interface/scaling-factor
(cherry picked from commit 277357ae73)
(cherry picked from commit d4f290861b)
2025-04-14 02:01:17 +02:00
Anton Tarasov
b836b57a28 Revert "8239894: Xserver crashes when the wrong high refresh rate is used"
This code is needed for "Read org.gnome.desktop.interface/scaling-factor".
Keep it until "JDK-8260270 Implement the HiDPI scale factor reading" is fixed.

This reverts commit a7c2ebc7

(cherry picked from commit a249b989e1)
2025-04-14 02:01:17 +02:00
Anton Tarasov
e2228c8bbb Do not scale base font in HiDPI mode on Linux
(cherry picked from commit 6fb2c36529)
(cherry picked from commit b2e47f1be3)
2025-04-14 02:01:17 +02:00
Anton Tarasov
e646e8dee8 JRE-772 swing returns incorrect FRC when AA is off
(cherry picked from commit a161897d908aa10da6306c06452c5d6317fed2f0)
(cherry picked from commit 2bf5a7ca5c)
(cherry picked from commit 2caa4e3c14)
2025-04-14 02:01:17 +02:00
Anton Tarasov
5a4ae314e0 JRE-681 [windows] direct drawing into frame graphics may have wrong translate
(cherry picked from commit ab6dee4c1fc453ad3cb5adb69fc243e550d184ae)

(cherry picked from commit 6ea1d45fd1)
(cherry picked from commit 556d3c5905)
2025-04-14 02:01:17 +02:00
Anton Tarasov
afae2a8e4c JRE-665 Navigate Class/File/Symbol, Find in Path popup windows don't pick characters from input method
(cherry picked from commit 676f305b2b3b278e305bd4d9bde4269f27b3d676)
(cherry picked from commit 6ce31e0a32)
(cherry picked from commit b327688b89)
2025-04-14 02:01:16 +02:00
Anton Tarasov
3ba5d10496 JRE-616 [linux] notify when dpi correction factor is applied to fonts
(cherry picked from commit f57d41f3118bfd773c99ce32d58cfae16931be6a)
(cherry picked from commit 6246abc72f)
(cherry picked from commit 717349c595)
2025-04-14 02:01:16 +02:00
Anton Tarasov
3ffc3ff8aa JRE-612 [windows] icon in frame title is not dpi-aware
(cherry picked from commit dec04385177a2abb677add909d3b94f94c62a14e)

(cherry picked from commit 38466cbab0)
(cherry picked from commit 81662b38f5)
2025-04-14 02:01:16 +02:00
Anton Tarasov
64cc98bb0b JRE-604 [fps] frame's client area is one pixel beneath frame's borders
Adopted.

(cherry picked from commit ef2870ee38)
(cherry picked from commit 021c8d8b7b)
2025-04-14 02:01:16 +02:00
Anton Tarasov
8c6e0a7d85 JRE-596 [windows] popup positioning is broken with JRE-573
Adopted: moved to AwtWindow::Reshape

(cherry picked from commit c5cc28d85d)
(cherry picked from commit 496c7d90d2)
2025-04-14 02:01:16 +02:00
Anton Tarasov
379eccc4f9 JRE-577 Goland 18 displays out of memory
(cherry picked from commit 2daaf21e420d4af15d3b1bfeb3f896074bea1e61)

(cherry picked from commit 9ea2011948)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit b6b83ff41f)
2025-04-14 02:01:16 +02:00
Anton Tarasov
0c3fec5464 JRE-573 [windows] window client area bounds mismatch
Apply only WmEraseBkgnd

(cherry picked from commit afa68f7ad6440303c6417be3f675b1c4644b6014)

(cherry picked from commit 0651b45e13)
(cherry picked from commit cfeb8ba435)
2025-04-14 02:01:16 +02:00
Anton Tarasov
47d85ac726 JRE-382 Three AWT-tests become hanging starting since master-875
(cherry picked from commit 7d492101db8fcbb3d285fd8e9669f74b0e0fce8f)
(cherry picked from commit b965f85c1b)
(cherry picked from commit 5b61c2f72a)
2025-04-14 02:01:16 +02:00
Anton Tarasov
76f2630d18 JRE-373 [macos] nativeCreateNSWindow deadlocks with a11y
(cherry picked from commit 72c77a992bbf1b95b82ffc08cb2f4f3bc36b3657)

(cherry picked from commit aa09fa2c85)
(cherry picked from commit 9b32557ad4)
2025-04-14 02:01:16 +02:00
Anton Tarasov
2552a0946b IDEA-172422 Popup at the wrong place on the second monitor (new hidpi)
Adopted: moved to AwtWindow::Reshape

(cherry picked from commit 11a0911d65)
(cherry picked from commit 4c8e3a54b3)
2025-04-14 02:01:16 +02:00
Anton Tarasov
af60e869fd JRE-309 [windows] on-screen position of a component is not pixel-perfect in user space in JRE-HiDPI mode
Adopted: moved to AwtWindow::Reshape

(cherry picked from commit 985908cf10)
(cherry picked from commit f9ff12884e)
2025-04-14 02:01:16 +02:00
Anton Tarasov
8457df048f JRE-269 JLabel doesn't scale <code>text</code> HTML fragments.
(cherry picked from commit 9ef72b6c3a477e4225f9b98e30fa9190613520e4)
(cherry picked from commit c17bc728ee)
(cherry picked from commit 99735071ff)
2025-04-14 02:01:16 +02:00
Anton Tarasov
4f4b80f631 JRE-225 [macos] IDEA hangs on attempt to call getDefaultScreenDevice() from EDT
(cherry picked from commit 76aba25)

(cherry picked from commit df11dcc97bb5556ac5d0299b773a512b4f0bb5bb)
(cherry picked from commit aeea6c1ca3)
(cherry picked from commit 3fbb520b07)
2025-04-14 02:01:16 +02:00
Anton Tarasov
191c94268b JRE-210 JEditorPane may return wrong preferred size as it moves b/w monitors of different scale
(cherry picked from commit 6c3087e6bda32ae9b095e069d8bea614502f5c03)
(cherry picked from commit adb3a4be16)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5b987c7a94)
2025-04-14 02:01:16 +02:00
Anton Tarasov
0167764ea8 JRE-119 [suppress updateGC() for WFileDialogPeer/WPrintDialogPeer]
updateGC() is called from WWindowPeer.<init> though it's not applicable to the named dialogs
as they don't have native AwtWindow peer required for the method.

(cherry picked from commit 72ed9f653177e273b811cfe70c2dba102a8636e4)
(cherry picked from commit cec49aaa38)
(cherry picked from commit a279dd9e1c)
2025-04-14 02:01:15 +02:00
Anton Tarasov
f0f134e15c JRE-119 [use default "sun.java2d.dpiaware=true" to be dpi-aware on Window 7]
This lets awt_Win32GraphicsEnv.cpp SetProcessDPIAwareProperty() call Win7 specific ::SetProcessDPIAware() API func.

(cherry picked from commit 5e7a766090810d839f4352d06fc2812499d766f8)
(cherry picked from commit 7d1d43bfa1)
(cherry picked from commit 2351382562)
2025-04-14 02:01:15 +02:00
Anton Tarasov
0ac900720e JRE-119 [Dynamically set DPI-awareness level to enable backward compatible HiDPI behavior]
Adopted: rely on java.manifest

(cherry picked from commit d00cfa4dc62a14a4cf89df9d4c4899970c9fc9e8)

Adopted

(cherry picked from commit 60be76b725)
(cherry picked from commit 8ec82c766b)
2025-04-14 02:01:15 +02:00
Anton Tarasov
a4085596a9 JRE-119 [ask if ui scale is enabled natively]
(cherry picked from commit 801f45875fd8699edcbda5896210cec191062261)
(cherry picked from commit 20edebdefa)
(cherry picked from commit 9ac3479114)
2025-04-14 02:01:15 +02:00
Anton Tarasov
2383fc9b68 IDEA-153474 let JDK detect Xft.dpi value on non-GTK Linux DEs
Use the GTK method:

https://developer.gnome.org/gobject/stable/gobject-The-Base-Object-Type.html#g-object-get

to retrieve "gtk-xft-dpi" integer property of the X settings.

Add the property to JDK's GtkEngine & gtk2-interface.
Then read the property via GtkEngine from GTK LaF when "gnome.Xft/dpi" is undefined. It's assumed GTK LaF is forcedly installed.

(cherry picked from commit e05fc391ae0a3cc389e836441f882c0cf6ab3b99)
(cherry picked from commit fd615a5b45)
(cherry picked from commit adc80251ad)
2025-04-14 02:01:15 +02:00
Anton Tarasov
b8c208b791 IDEA-148854: AppCode crashes randomly every 15 mins or so
(cherry picked from commit 02f9a5fbb4924ff67c8a04c15e490acfcc750003)
(cherry picked from commit b8f4b4a9ed)
(cherry picked from commit b3961bee9d)
2025-04-14 02:01:15 +02:00
Vitaly Provodin
790757b769 updated JTreg exclude list
(cherry picked from commit 418fb32e7f)
2025-04-14 02:01:15 +02:00
Alexey Ushakov
4f595b42b6 IDEA-57233, IDEA-152816, IDEA-152454 Editor font antialising/appearance problems on Linux
Used desktop DPI instead of hard-coded 72
Compensated increased glyph bitmap size by adjusting font size
Added LCD filter for sub-pixel rendering
Use fontconfig library to provide right rendering options for fonts
Corrected sizes passed to fontconfig library and hinting disabling policy
Added logging and versioned fontconfig lib loading
Resolved font rendering problem in lenses
fix text rendering issues (text cutoff and incorrect rendering in editor fragment components)
FcMatchFont-type pattern substitutions shouldn't be invoked before specific font is selected - it can apply unrelated rules
port commit e21cd635 from JBR 9
partially rollback JBR-363 fix, to apply corresponding change from OpenJDK 12

(cherry picked from commit 5d704a963b)
(cherry picked from commit 3d7ac30072)
(cherry picked from commit 0456745afb)
(cherry picked from commit 3d7ac30072)
(cherry picked from commit 4c8351fecf)
(cherry picked from commit 5faebc73d5)
(cherry picked from commit d1ed8ab118)
(cherry picked from commit 20487c7515)
2025-04-14 02:01:15 +02:00
Vitaly Provodin
f156e0dd1a JBR-3398 remove the Experimental AOT and JIT Compiler (JEP 410)
(cherry picked from commit df63a5e6ad)
2025-04-14 02:01:15 +02:00
Alexey Ushakov
b9619d55bc JBR-2807: JDK15: update modules.list to resolve jbr build failure
removed nashorn modules

(cherry picked from commit c56a18eaf9)
2025-04-14 02:01:15 +02:00
Vitaly Provodin
c2082cb785 JBR-2130 remove module jdk.pack
(cherry picked from commit 9acab72161)
2025-04-14 02:01:15 +02:00
Vitaly Provodin
13da511baf JBR-4810 add VERSION_PATCH into version number string
(cherry picked from commit 401a12b6b9)
2025-04-14 02:01:15 +02:00
Vitaly Provodin
eed2b8e2da JBR-4754 make root directory with the same name as archive name
(cherry picked from commit 97a17c9a36)
2025-04-14 02:01:15 +02:00
Nikita Provotorov
91e3e39692 JBR-2074 Windows 10 AArch64 support: make the build scripts use custom build-jdk.
(cherry picked from commit 3d9869c702)
2025-04-14 02:01:15 +02:00
Nikita Provotorov
5b2ad06a41 JBR-2074 Windows 10 AArch64 support: build fixes.
(cherry picked from commit a873008261)
2025-04-14 02:01:15 +02:00
Vitaly Provodin
fa75303799 JBR-4567 replace comma with point in RenderPerf scores
(cherry picked from commit 5b91efd8c0)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
01c7d70f9c JBR-4520 set file permissions after signing
(cherry picked from commit 64259b866c)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
108b8fd4d0 JBR-4512 windows: include pdb-files into jbrsdk
(cherry picked from commit 606ad057d3)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
086ac54df0 JBR-4087 add version info into the name of root directory in JBR tar.gz-distributions
(cherry picked from commit 45eeae64ee)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
f0e2f5b1eb JBR-4511 remove --disable options from configure mac-aarch64 builds & unify configure for x64 and aarch64
(cherry picked from commit b387b2213e)
2025-04-14 02:01:14 +02:00
Maxim Kartashev
19955a4ef2 JBR-4064 Windows: update build scripts to produce more deterministic output
Passed the configure script options necessary to enable reproducible builds
on Windows. With this options, the resulting jars are reproducible, but
native executables and libraries aren't.

(cherry picked from commit c1da1fa0d6)
2025-04-14 02:01:14 +02:00
Vladislav Rassokhin
7dd1be7955 JBR-4451 Make bash scripts safer
(cherry picked from commit 4f048b9790)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
3c86b2a1c1 JBR-4487 enable Linux 32 builds
(cherry picked from commit 38dbda93d0)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
cccee28d4e JBR-4458 enable JBR17 windows 32 bit builds
(cherry picked from commit d3e65953e7)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
e7637db16a JBR-4272 generate and save debug symbols for JBR on macos/linux
(cherry picked from commit ef34e66dbf)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
55faf893da JBR-4053 integrate DCEVM patches as usual commits
(cherry picked from commit 45672abcad)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
f3d5e31993 JBR-4370 create a test checking all JBR artifacts exist - add exit code
(cherry picked from commit 4dce25a5db)
2025-04-14 02:01:14 +02:00
Nikita Provotorov
bad5e30112 JBR-2074 Windows 10 AArch64 support: add build and pack scripts.
(cherry picked from commit e33c77a615)
2025-04-14 02:01:14 +02:00
Vladimir Kempik
eaf684ca1a JBR-4452: Update crash report message with JBR youtrack link
instead of bugreport.java.com

(cherry picked from commit c52914a035)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
43a655d7b0 JBR-4437 add sources to JBRSDK distributions for Windows and Linux
(cherry picked from commit 0399594195)
2025-04-14 02:01:14 +02:00
Vitaly Provodin
f2daa94450 JBR-4437 add sources to JBRSDK distributions
(cherry picked from commit a13a015597)
2025-04-14 02:01:13 +02:00
Anton Tarasov
02ebe971b2 JBR-3906 JBR for Linux aarch64 with JCEF is missing, is there any support plan?
(cherry picked from commit d47bc61b0e)
2025-04-14 02:01:13 +02:00
Vitaly Provodin
12f408fc4c JBR-4188 add script comparing performance results
add exec permissions && fix misprint in checking if headers exist

move the script comparing performance results from jdk8u_test

(cherry picked from commit 924e7baadd)
2025-04-14 02:01:13 +02:00
Vladimir Kempik
e33ee36984 JBR-4283: Provide native JBR builds for alpine Linux-aarch64
(cherry picked from commit 925f02d3c5)
2025-04-14 02:01:13 +02:00
Vladimir Kempik
5e407495bd JBR-4242:Provide native JBR builds for alpine Linux
(cherry picked from commit c62e05e7ac)
2025-04-14 02:01:13 +02:00
Maxim Kartashev
b58e61304a JBR-3917 Problem using windows certificate store (trustStoreType=Windows-ROOT not recognized)
(cherry picked from commit 65abc7b029)
2025-04-14 02:01:13 +02:00
Maxim Kartashev
928633e5c8 JBR-4145 Make builds independent from build directory
Supplied the --disable-absolute-path-in-output option to the configure script
when building JBR.

(cherry picked from commit 5aa22bb901)
2025-04-14 02:01:13 +02:00
Vitaly Provodin
44966cd5ec JBR-4154 extract version info from sources & JBR-4099 make test-image on jbrsdk_jcef step
(cherry picked from commit f22a76949b)
2025-04-14 02:01:13 +02:00
Vitaly Provodin
6b984b930a JBR-4067 fix misprint with applying obsolete exclude_jcef_module.patch
(cherry picked from commit 106349f0fe)
2025-04-14 02:01:13 +02:00
Vitaly Provodin
587585db81 JBR-3756 remove JNF from mac-aarch64 binaries
(cherry picked from commit 011d461c99)
2025-04-14 02:01:13 +02:00
Vitaly Provodin
dfa8741398 JBR-4082 create JBR & JBRSDK installer packages
(cherry picked from commit a2e1fe0fa4)
2025-04-14 02:01:13 +02:00
Maxim Kartashev
d7b913ea8b JBR-4061 Specify build user for the build
(cherry picked from commit 66713adb61)
2025-04-14 02:01:13 +02:00
Maxim Kartashev
e129412850 JBR-4063 macOS: update build scripts to produce more deterministic output
Make mkimages.sh produce more deterministic .tar.gz archives on MacOS.
NB: build notarization is not in the scope of this change.

(cherry picked from commit e1a1b6814d)
(cherry picked from commit 43f7ebddec)
2025-04-14 02:01:13 +02:00
Maxim Kartashev
63d483ee08 JBR-4033 Linux: update build scripts to produce more deterministic output
This commits achieves almost the same build output with the same build
input on Linux. Exceptions are:
- class files timestamps differ in jrt-fs.jar (for all output),
- class files timestamps differ in all the jmod files (for
  jbrsdk...tar.gz).
NB: jbrsdk...test...tar.gz does not need to be deterministic.

This was achieved mainly by
- setting several environment variables (SOURCE_DATE_EPOCH, TZ),
- providing the necessary options to the configure script,
- setting the timestamp of all files that make up the resulting
  archive to SORUCE_DATE_EPOCH and normalizing the list of said
  files before archiving.

(cherry picked from commit ffded82734)
(cherry picked from commit 38ec30a58d)
2025-04-14 02:01:13 +02:00
Maxim Kartashev
c843f6c944 JBR-4059 Create Dockerfile for building on AArch64 Linux
(cherry picked from commit 249614a30b)
2025-04-14 02:01:13 +02:00
Vitaly Provodin
2f7730e7fc JBR-3905 add incremental JBR building
(cherry picked from commit 54f28cde44)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
3109d523f8 JBR-3904 fix the image directory name of macos builds
(cherry picked from commit cf13b7c46e)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
eb30cfd038 configure BOOT_JDK to use JDK 17
(cherry picked from commit d815b82649)
2025-04-14 02:01:12 +02:00
Anton Tarasov
0e3d7c1691 JBR-3655 jbr-dev build fails to find jcef modules on Windows
(cherry picked from commit f63fd1c8ec)
2025-04-14 02:01:12 +02:00
Maxim Kartashev
a560f4959c JBR-3645 Tool to support keeping JBR in sync with OpenJDK
(cherry picked from commit 21c43f48cf)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
ded8e889eb JBR-3639 add jbrsdk tarballs for dcevm, jcef builds
(cherry picked from commit 0117d49591)
2025-04-14 02:01:12 +02:00
Anton Tarasov
f881073d4e JBR-3627 include jmods in jbrsdk bundle for jbr-dev
(cherry picked from commit f54c836685)
2025-04-14 02:01:12 +02:00
Vitaly.Provodin
f865d803a2 add dockerfile for x86
(cherry picked from commit 8fb2341ea8)
(cherry picked from commit cfbafa6c73)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
a0a8a60eb8 JBR-1505 add jdk.jcmd module into JBR
(cherry picked from commit c40b9c8b9e)
(cherry picked from commit 5362ff99a2)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
bc905bd34e JBR-2957 notarize JBR and JBRSDK as APPL
(cherry picked from commit 0e7f9ce4ca)
(cherry picked from commit 3f4aee8c63)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
39f7bb84f7 JBR-667 add shenandoahgc feature
(cherry picked from commit e15dad04)
(cherry picked from commit 0845bb7308)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
75a14275c0 configure BOOT_JDK to use JDK 16
(cherry picked from commit 3e34330003)
2025-04-14 02:01:12 +02:00
Anton Tarasov
f1eca73664 Add build.gradle
(cherry picked from commit 9d01f893b6)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
1db4e9bee9 JBR-3401 enable macos-aarhc64 builds
(cherry picked from commit d2c40f66f8)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
ed0476b33b JBR-3305 remove the option --disable-warnings-as-errors from configure
(cherry picked from commit 301fcb2df1)
2025-04-14 02:01:12 +02:00
Vitaly Provodin
d308b9f508 JBR-2922 add JCEF to jbrsdk binaries
& fix a misprint in get_mods_list

JBR-2922 add JCEF to jbrsdk binaries

& fix a misprint in get_mods_list

(cherry picked from commit 6fa3e775ab)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
052b02ef17 JBR-2912 add JBR 15 builds with DCEVM
(cherry picked from commit 95416c501a)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
af6450e8da JBR-2864 initial commit of DCEVM patches reworked for 15
(cherry picked from commit a592f63537)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
e2a1dc1557 JBR-2812 remove --with-import-modules from configure for aarch64
(cherry picked from commit 49fa98391a)
2025-04-14 02:01:11 +02:00
Anton Tarasov
316e8f8df9 JBR-2812 bundle jcef in jmod format instead of modular-sdk
Build test-image with non-jcef build target

(cherry picked from commit 9edee0e476)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
6fa06591ce JBR-2787 fix copying jcef files into jbr/jbrsdk binaries
(cherry picked from commit a4269d0907)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
55ccc15806 JBR-2758 refactor building scripts to apply patches adding required modules instead of excluding
Add jogl and gluegen modules to support jcef osr mode

(cherry picked from commit e2cf692ec5)
2025-04-14 02:01:11 +02:00
Anton Tarasov
c7b8575fa0 JBR-2016 add jcef module and export packages to it
(cherry picked from commit cf997f71c6)
(cherry picked from commit cad125e01d)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
82dfa6b0bf JBR-2473 modify building scripts to add dcevm clauses, add git config to docker image
(cherry picked from commit 2620c62848)
(cherry picked from commit d9797240fc)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
35dbe897b5 JBR-2395 eliminate JavaFX from JBR
(cherry picked from commit cd7e539561)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
00e9dd3417 JBR-2409 fix prameters for configure
(cherry picked from commit f309357fba)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
e40ce04990 JDK14: exclude dependencies on jcef in x86, fastdebug builds
(cherry picked from commit 14e98eaf94)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
ee6a3a1f1f JBR-2396 fix CONF names
(cherry picked from commit 34cd854326)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
0b14801e02 JBR-2394 replace --disable-debug-symbols with --with-native-debug-symbols=none
(cherry picked from commit 79ff0cb7b3)
2025-04-14 02:01:11 +02:00
Vitaly Provodin
563398a162 add exec permitions to configure
(cherry picked from commit bf2e441e09)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
a848355cf3 split checkout before building JBR+JFX or JBR+JCEF on two separate commands
(cherry picked from commit b7030bae8e)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
e420eb6067 change BOOT_JDK, fix target names
(cherry picked from commit 6a778fa6ea)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
5ccc9735b1 JBR-2291 add vendor info into bundles
(cherry picked from commit 026fcaaf2b)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
9918d5c29f JBR-2324 address new layout in mac jcef 80.0.4+g74f7b0c+chromium-80.0.3987.122
(cherry picked from commit 6f45378ed9)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
dd098f40fb JBR-2320 add jdk.attach module into JBR
(cherry picked from commit a1884561bd)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
9156625357 JBR-2217 provide JCEF-only (no JavaFX) bundle for master/202 branches
(cherry picked from commit d5fef466f4)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
62a7c8dae4 JBR-2212 add scripts for linux_x86, linux_aarch64, linux_x64_fastdebug, osx_fastdebug, windows_x86
(cherry picked from commit 211b306949)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
e781e9d4eb JBR-1643 fix intermittent fialures of Windows builds at make/Init.gmk:304
combine images and test-image into one make invocation

(cherry picked from commit ad32f648b5)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
c3dd87a188 JBR-2181 create two separate JBR bundles with JFX and JFX+JCEF
(cherry picked from commit a26a1dcef0)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
6d6bf80801 JBR-2148 modify signapp&build scripts to match to the new layout
(cherry picked from commit 7cdd4cbf4a)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
8d8ccb60f1 JBR-2084 modify scripts to sign Contents/MacOS/libjli.dylib as a a normal file
(cherry picked from commit 47ac942dfb)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
708c01776a JBR-1821 notarize JBR bundles as a standalone app
(cherry picked from commit 96e733ed79)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
b2f2a50fa1 JBR-2162 move building scripts from TC to JBR repo
(cherry picked from commit 6f4774c0d4)
2025-04-14 02:01:10 +02:00
Anton Tarasov
3c48cb37a9 JBR-2016 add jcef module and export some sun.* packages to it
(cherry picked from commit 193da0eff7)
2025-04-14 02:01:10 +02:00
Vitaly Provodin
fe508a9a91 JBR-2014 add jdk.hotspot.agent module to jbr
(cherry picked from commit b352fa1b54)
2025-04-14 02:01:09 +02:00
Vitaly Provodin
6b8d24d117 JBR-1286 add jdk.compiler into JBR
(cherry picked from commit 245db892cd)
2025-04-14 02:01:09 +02:00
Vitaly Provodin
c49f47227a JBR-1199 add JBR modules list for jlink
(cherry picked from commit ff8dc6567f)
2025-04-14 02:01:09 +02:00
Vitaly Provodin
c6e4203a28 Update docker script to create jdk15 build env
(cherry picked from commit cd5b1b94e7)
2025-04-14 02:01:09 +02:00
Vitaly Provodin
50a8b90086 JBR-3045 add pressing ESC to close the dialog after test completion
(cherry picked from commit 44d8b28b0b)
(cherry picked from commit c98106b4b0)
2025-04-14 02:01:09 +02:00
Vitaly Provodin
3d9ae763d0 JBR-3040 press the button END at the beggining in order to avoid text selection
(cherry picked from commit 1c2bf33db2)
(cherry picked from commit aeab9ef42c)
2025-04-14 02:01:09 +02:00
Vitaly.Provodin
26eeed2db8 updated JTreg exclude list
(cherry picked from commit 6d1cee2181)
2025-04-14 02:01:09 +02:00
4540 changed files with 237801 additions and 175755 deletions

View File

@@ -1,14 +1,7 @@
root = true
[*]
charset = utf-8
[*.{cpp,hpp,c,h,java,cc,hh,m,mm,S,md,properties,gmk,m4,ac}]
trim_trailing_whitespace = true
[Makefile]
trim_trailing_whitespace = true
[src/hotspot/**.{cpp,hpp,h}]
indent_style = space
indent_size = 2

1
.gitattributes vendored
View File

@@ -1,5 +1,4 @@
* -text
* encoding=utf-8
*.java diff=java
*.c diff=cpp
*.h diff=cpp

7
.github/README.md vendored
View File

@@ -24,10 +24,9 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
| IDE Version | Latest JBR | Date Released |
|-------------|---------------------------------------------------------------------------------------------------------|---------------|
| 2025.2 | [21.0.7-b1020.35](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b1020.35)| 26-May-2025 |
| 2025.1 | [21.0.7-b895.130](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b895.130)| 15-May-2025 |
| 2024.3 | [21.0.6-b631.52](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b631.52) | 15-May-2025 |
| 2024.2 | [21.0.4-b509.40](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b509.40) | 15-May-2025 |
| 2025.1 | [21.0.6-b895.109](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.6b895.109)| 05-Apr-2025 |
| 2024.3 | [21.0.6-b631.39](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.6b631.39) | 10-Feb-2025 |
| 2024.2 | [21.0.4-b509.30](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.5b509.30) | 26-Nov-2024 |
| 2024.1 | [21.0.2-b346.3](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.2b346.3) | 30-Jan-2024 |
## Releases based on JDK 17

View File

@@ -32,16 +32,10 @@ inputs:
debug-suffix:
description: 'File name suffix denoting debug level, possibly empty'
required: false
static-suffix:
description: 'Static bundle file name suffix'
required: false
outputs:
jdk-path:
description: 'Path to the installed JDK bundle'
value: ${{ steps.path-name.outputs.jdk }}
static-jdk-path:
description: 'Path to the installed static JDK bundle'
value: ${{ steps.path-name.outputs.static_jdk }}
symbols-path:
description: 'Path to the installed symbols bundle'
value: ${{ steps.path-name.outputs.symbols }}
@@ -67,15 +61,6 @@ runs:
path: bundles
if: steps.download-bundles.outcome == 'failure'
- name: 'Download static bundles artifact'
id: download-static-bundles
uses: actions/download-artifact@v4
with:
name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}
path: bundles
continue-on-error: true
if: ${{ inputs.static-suffix == '-static' }}
- name: 'Unpack bundles'
run: |
if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip ]]; then
@@ -90,20 +75,6 @@ runs:
tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/jdk
fi
if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip ]]; then
echo 'Unpacking static jdk bundle...'
mkdir -p bundles/static-jdk
unzip -q bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip -d bundles/static-jdk
fi
if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz ]]; then
echo 'Unpacking static jdk bundle...'
mkdir -p bundles/static-jdk
tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz -C bundles/static-jdk
fi
fi
if [[ -e bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
echo 'Unpacking symbols bundle...'
mkdir -p bundles/symbols
@@ -135,12 +106,4 @@ runs:
echo "jdk=$jdk_dir" >> $GITHUB_OUTPUT
echo "symbols=$symbols_dir" >> $GITHUB_OUTPUT
echo "tests=$tests_dir" >> $GITHUB_OUTPUT
if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
static_jdk_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/static-jdk -name bin -type d))"
if [[ '${{ runner.os }}' == 'Windows' ]]; then
static_jdk_dir="$(cygpath $static_jdk_dir)"
fi
echo "static_jdk=$static_jdk_dir" >> $GITHUB_OUTPUT
fi
shell: bash

View File

@@ -35,9 +35,6 @@ inputs:
bundle-suffix:
description: 'Bundle name suffix, possibly empty'
required: false
static-suffix:
description: 'Static JDK bundle name suffix, possibly empty'
required: false
runs:
using: composite
@@ -49,8 +46,6 @@ runs:
# Rename bundles to consistent names
jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
static_jdk_bundle_zip="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
static_jdk_bundle_tar_gz="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
static_libs_bundle="$(ls build/*/bundles/jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
@@ -63,12 +58,6 @@ runs:
if [[ "$jdk_bundle_tar_gz" != "" ]]; then
mv "$jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
fi
if [[ "$static_jdk_bundle_zip" != "" ]]; then
mv "$static_jdk_bundle_zip" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip"
fi
if [[ "$static_jdk_bundle_tar_gz" != "" ]]; then
mv "$static_jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz"
fi
if [[ "$symbols_bundle" != "" ]]; then
mv "$symbols_bundle" "bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
fi
@@ -79,7 +68,7 @@ runs:
mv "$static_libs_bundle" "bundles/static-libs-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
fi
if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$static_jdk_bundle_zip$static_jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
echo 'bundles-found=true' >> $GITHUB_OUTPUT
else
echo 'bundles-found=false' >> $GITHUB_OUTPUT
@@ -89,7 +78,7 @@ runs:
- name: 'Upload bundles artifact'
uses: actions/upload-artifact@v4
with:
name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}${{ inputs.bundle-suffix }}
name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.bundle-suffix }}
path: bundles
retention-days: 1
if: steps.bundles.outputs.bundles-found == 'true'

View File

@@ -64,9 +64,6 @@ on:
bundle-suffix:
required: false
type: string
static-suffix:
required: false
type: string
jobs:
build-linux:
@@ -146,4 +143,3 @@ jobs:
platform: ${{ inputs.platform }}
debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
bundle-suffix: ${{ inputs.bundle-suffix }}
static-suffix: ${{ inputs.static-suffix }}

View File

@@ -232,14 +232,16 @@ jobs:
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x64
make-target: 'static-jdk-bundles'
make-target: 'static-jdk-image'
# There are issues with fastdebug static build in GHA due to space limit.
# Only do release build for now.
debug-levels: '[ "release" ]'
gcc-major-version: '10'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
static-suffix: "-static"
# It currently doesn't produce any bundles, but probably will do in
# the future.
bundle-suffix: "-static"
if: needs.prepare.outputs.linux-x64 == 'true'
build-linux-x64-static-libs:
@@ -360,19 +362,6 @@ jobs:
platform: linux-x64
bootjdk-platform: linux-x64
runs-on: ubuntu-22.04
debug-suffix: -debug
test-linux-x64-static:
name: linux-x64-static
needs:
- build-linux-x64
- build-linux-x64-static
uses: ./.github/workflows/test.yml
with:
platform: linux-x64
bootjdk-platform: linux-x64
runs-on: ubuntu-22.04
static-suffix: "-static"
test-macos-aarch64:
name: macos-aarch64
@@ -384,7 +373,6 @@ jobs:
bootjdk-platform: macos-aarch64
runs-on: macos-14
xcode-toolset-version: '15.4'
debug-suffix: -debug
test-windows-x64:
name: windows-x64
@@ -395,4 +383,3 @@ jobs:
platform: windows-x64
bootjdk-platform: windows-x64
runs-on: windows-2019
debug-suffix: -debug

View File

@@ -40,12 +40,6 @@ on:
xcode-toolset-version:
required: false
type: string
debug-suffix:
required: false
type: string
static-suffix:
required: false
type: string
env:
# These are needed to make the MSYS2 bash work properly
@@ -92,35 +86,35 @@ jobs:
- test-name: 'hs/tier1 common'
test-suite: 'test/hotspot/jtreg/:tier1_common'
debug-suffix: ${{ inputs.debug-suffix }}
debug-suffix: -debug
- test-name: 'hs/tier1 compiler part 1'
test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
debug-suffix: ${{ inputs.debug-suffix }}
debug-suffix: -debug
- test-name: 'hs/tier1 compiler part 2'
test-suite: 'test/hotspot/jtreg/:tier1_compiler_2'
debug-suffix: ${{ inputs.debug-suffix }}
debug-suffix: -debug
- test-name: 'hs/tier1 compiler part 3'
test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
debug-suffix: ${{ inputs.debug-suffix }}
debug-suffix: -debug
- test-name: 'hs/tier1 gc'
test-suite: 'test/hotspot/jtreg/:tier1_gc'
debug-suffix: ${{ inputs.debug-suffix }}
debug-suffix: -debug
- test-name: 'hs/tier1 runtime'
test-suite: 'test/hotspot/jtreg/:tier1_runtime'
debug-suffix: ${{ inputs.debug-suffix }}
debug-suffix: -debug
- test-name: 'hs/tier1 serviceability'
test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
debug-suffix: ${{ inputs.debug-suffix }}
debug-suffix: -debug
- test-name: 'lib-test/tier1'
test-suite: 'test/lib-test/:tier1'
debug-suffix: ${{ inputs.debug-suffix }}
debug-suffix: -debug
steps:
- name: 'Checkout the JDK source'
@@ -146,7 +140,6 @@ jobs:
with:
platform: ${{ inputs.platform }}
debug-suffix: ${{ matrix.debug-suffix }}
static-suffix: ${{ inputs.static-suffix }}
- name: 'Install dependencies'
run: |
@@ -167,21 +160,6 @@ jobs:
else
echo "value=$PATH" >> $GITHUB_OUTPUT
fi
if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
echo "static-hotspot-problemlist-path=`pwd`/test/hotspot/jtreg/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
echo "static-jdk-problemlist-path=`pwd`/test/jdk/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
echo "static-langtools-problemlist-path=`pwd`/test/langtools/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
echo "static-lib-test-problemlist-path=`pwd`/test/lib-test/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
fi
- name: 'Set Extra Options'
id: extra-options
run: |
if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
echo "test-jdk=JDK_UNDER_TEST=${{ steps.bundles.outputs.static-jdk-path }}" >> $GITHUB_OUTPUT
echo "compile-jdk=JDK_FOR_COMPILE=${{ steps.bundles.outputs.jdk-path }}" >> $GITHUB_OUTPUT
echo "extra-problem-lists=EXTRA_PROBLEM_LISTS=${{ steps.path.outputs.static-hotspot-problemlist-path }}%20${{ steps.path.outputs.static-jdk-problemlist-path }}%20${{ steps.path.outputs.static-langtools-problemlist-path }}%20${{ steps.path.outputs.static-lib-test-problemlist-path }}" >> $GITHUB_OUTPUT
fi
- name: 'Run tests'
id: run-tests
@@ -193,9 +171,7 @@ jobs:
JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
${{ steps.extra-options.outputs.test-jdk }}
${{ steps.extra-options.outputs.compile-jdk }}
JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful;${{ steps.extra-options.outputs.extra-problem-lists }}'
JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
&& bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
env:
PATH: ${{ steps.path.outputs.value }}
@@ -228,7 +204,7 @@ jobs:
echo '::warning ::Missing test-support directory'
fi
artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }}${{ inputs.static-suffix }} | tr '/ ' '__')"
artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }} | tr '/ ' '__')"
echo "artifact-name=$artifact_name" >> $GITHUB_OUTPUT
if: always()

2
.gitignore vendored
View File

@@ -23,6 +23,4 @@ NashornProfile.txt
/.gdbinit
/.lldbinit
**/core.[0-9]*
*.rej
*.orig
/jbr-api/

View File

@@ -282,34 +282,9 @@ possible, use an SSD. The build process is very disk intensive, and
having slow disk access will significantly increase build times. If you
need to use a network share for the source code, see below for
suggestions on how to keep the build artifacts on a local disk.</p></li>
<li><p>UTF-8 support is needed to compile the JDK. On Unix systems, this
typically means that the <code>C.UTF-8</code> or
<code>en_US.UTF-8</code> locale needs to be available. For Windows
users, please see the section on <a href="#locale-requirements">Locale
Requirements</a> below.</p></li>
<li><p>On Windows, extra care must be taken to have a smooth building
experience:</p>
<ul>
<li><p>Make sure that all relevant paths have short names. Short names
are used by the build system to create space-free alternative paths.
Short name creation is enabled per volume. The default setting can be
checked with the command: <code>fsutil 8dot3name query</code>. If short
name creation was turned off when a directory was created, it will not
have a short name. Whether a short name exists can be checked by running
<code>dir /X</code> in the containing directory (in cmd.exe). If a short
path is present you should see something like 'ASDF~1' being displayed
in one of the columns of the ouput. If a directory is missing a short
name, the safest way to get one is to enable short names for that
particular volume with
<code>fsutil 8dot3name set &lt;drive letter&gt;: 0</code> (note that
you need to run as administrator for this), and then re-create the
particular directory. A short name should be generated automatically
then. Another option is to manually assign a short name to the directory
using
<code>fsutil file setShortName &lt;path&gt; &lt;short name&gt;</code>.</p></li>
<li><p>If using <a href="#cygwin">Cygwin</a>, you must make sure the
file permissions and attributes between Windows and Cygwin are
consistent. It is recommended that you follow this procedure:</p>
<li><p>On Windows, if using <a href="#cygwin">Cygwin</a>, extra care
must be taken to make sure the environment is consistent. It is
recommended that you follow this procedure:</p>
<ul>
<li><p>Create the directory that is going to contain the top directory
of the JDK clone by using the <code>mkdir</code> command in the Cygwin
@@ -319,9 +294,6 @@ it's children will inherit those attributes.</p></li>
<li><p>Do not put the JDK clone in a path under your Cygwin home
directory. This is especially important if your user name contains
spaces and/or mixed upper and lower case letters.</p></li>
</ul>
<p>Failure to follow these procedures might result in hard-to-debug
build problems.</p></li>
<li><p>You need to install a git client. You have two choices, Cygwin
git or Git for Windows. Unfortunately there are pros and cons with each
choice.</p>
@@ -339,7 +311,9 @@ It does work well with the Skara CLI tooling, however. To alleviate the
line ending problems, make sure you set <code>core.autocrlf</code> to
<code>false</code> (this is asked during installation).</p></li>
</ul></li>
</ul></li>
</ul>
<p>Failure to follow this procedure might result in hard-to-debug build
problems.</p></li>
</ul>
<h2 id="build-hardware-requirements">Build Hardware Requirements</h2>
<p>The JDK is a massive project, and require machines ranging from
@@ -402,7 +376,7 @@ to date at the time of writing.</p>
</tr>
<tr class="odd">
<td>macOS</td>
<td>macOS 14.x</td>
<td>macOS 13.x (Ventura)</td>
</tr>
<tr class="even">
<td>Windows</td>
@@ -539,8 +513,8 @@ this makes it difficult for a project such as the JDK to keep pace with
a continuously updated machine running macOS. See the section on <a
href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
this.</p>
<p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
earlier versions may also work.</p>
<p>It is recommended that you use at least macOS 13 (Ventura) and Xcode
14, but earlier versions may also work.</p>
<p>The standard macOS environment contains the basic tooling needed to
build, but for external libraries a package manager is recommended. The
JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
@@ -612,15 +586,15 @@ to compile successfully without issues.</p>
<tbody>
<tr class="odd">
<td>Linux</td>
<td>gcc 14.2.0</td>
<td>gcc 13.2.0</td>
</tr>
<tr class="even">
<td>macOS</td>
<td>Apple Xcode 15.4 (using clang 15.0.0)</td>
<td>Apple Xcode 14.3.1 (using clang 14.0.3)</td>
</tr>
<tr class="odd">
<td>Windows</td>
<td>Microsoft Visual Studio 2022 version 17.13.2</td>
<td>Microsoft Visual Studio 2022 version 17.6.5</td>
</tr>
</tbody>
</table>
@@ -630,7 +604,7 @@ standard for C, and C++14 for C++.</p>
<p>The minimum accepted version of gcc is 10.0. Older versions will not
be accepted by <code>configure</code>.</p>
<p>The JDK is currently known to compile successfully with gcc version
14.2 or newer.</p>
13.2 or newer.</p>
<p>In general, any version between these two should be usable.</p>
<h3 id="clang">clang</h3>
<p>The minimum accepted version of clang is 13. Older versions will not
@@ -1748,20 +1722,6 @@ packages in the sysroot, configure the build with
--with-devkit=$DEVKIT \
--with-sysroot=$SYSROOT</code></pre>
<p>and run <code>make</code> normally.</p>
<h4 id="building-for-windows-aarch64">Building for Windows AArch64</h4>
<p>The Visual Studio Build Tools can be used for building the JDK
without a full Visual Studio installation. To set up the Visual Studio
2022 Build Tools on a Windows AArch64 machine for a native build, launch
the installer as follows in a Windows command prompt:</p>
<pre><code>vs_buildtools.exe --quiet --wait --norestart --nocache ^
--installPath &quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools&quot; ^
--add Microsoft.VisualStudio.Component.VC.CoreBuildTools ^
--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ^
--add Microsoft.VisualStudio.Component.Windows11SDK.22621</code></pre>
<p>To generate Windows AArch64 builds using Cygwin on a Windows x64
machine, you must set the proper target platform by adding
<code>--openjdk-target=aarch64-unknown-cygwin</code> to your configure
command line.</p>
<h2 id="build-performance">Build Performance</h2>
<p>Building the JDK requires a lot of horsepower. Some of the build
tools can be adjusted to utilize more or less of resources such as

View File

@@ -83,44 +83,19 @@ on where and how to check out the source code.
for the source code, see below for suggestions on how to keep the build
artifacts on a local disk.
* UTF-8 support is needed to compile the JDK. On Unix systems, this typically
means that the `C.UTF-8` or `en_US.UTF-8` locale needs to be available. For
Windows users, please see the section on [Locale
Requirements](#locale-requirements) below.
* On Windows, if using [Cygwin](#cygwin), extra care must be taken to make sure
the environment is consistent. It is recommended that you follow this
procedure:
* On Windows, extra care must be taken to have a smooth building experience:
* Create the directory that is going to contain the top directory of the JDK
clone by using the `mkdir` command in the Cygwin bash shell. That is, do
*not* create it using Windows Explorer. This will ensure that it will have
proper Cygwin attributes, and that it's children will inherit those
attributes.
* Make sure that all relevant paths have short names. Short names are used by
the build system to create space-free alternative paths. Short name
creation is enabled per volume. The default setting can be checked with the
command: `fsutil 8dot3name query`. If short name creation was turned off
when a directory was created, it will not have a short name. Whether a
short name exists can be checked by running `dir /X` in the containing
directory (in cmd.exe). If a short path is present you should see something
like 'ASDF~1' being displayed in one of the columns of the ouput. If a
directory is missing a short name, the safest way to get one is to enable
short names for that particular volume with `fsutil 8dot3name set <drive
letter>: 0` (note that you need to run as administrator for this), and then
re-create the particular directory. A short name should be generated
automatically then. Another option is to manually assign a short name to
the directory using `fsutil file setShortName <path> <short name>`.
* If using [Cygwin](#cygwin), you must make sure the file permissions and
attributes between Windows and Cygwin are consistent. It is recommended
that you follow this procedure:
* Create the directory that is going to contain the top directory of the
JDK clone by using the `mkdir` command in the Cygwin bash shell. That is,
do *not* create it using Windows Explorer. This will ensure that it will
have proper Cygwin attributes, and that it's children will inherit those
attributes.
* Do not put the JDK clone in a path under your Cygwin home directory. This
is especially important if your user name contains spaces and/or mixed
upper and lower case letters.
Failure to follow these procedures might result in hard-to-debug build
problems.
* Do not put the JDK clone in a path under your Cygwin home directory. This
is especially important if your user name contains spaces and/or mixed
upper and lower case letters.
* You need to install a git client. You have two choices, Cygwin git or Git
for Windows. Unfortunately there are pros and cons with each choice.
@@ -138,6 +113,9 @@ on where and how to check out the source code.
make sure you set `core.autocrlf` to `false` (this is asked during
installation).
Failure to follow this procedure might result in hard-to-debug build
problems.
## Build Hardware Requirements
The JDK is a massive project, and require machines ranging from decent to
@@ -197,7 +175,7 @@ time of writing.
| ----------------- | ---------------------------------- |
| Linux/x64 | Oracle Enterprise Linux 6.4 / 8.x |
| Linux/aarch64 | Oracle Enterprise Linux 7.6 / 8.x |
| macOS | macOS 14.x |
| macOS | macOS 13.x (Ventura) |
| Windows | Windows Server 2016 |
The double version numbers for Linux are due to the hybrid model used at
@@ -349,7 +327,7 @@ difficult for a project such as the JDK to keep pace with a continuously
updated machine running macOS. See the section on [Apple Xcode](#apple-xcode)
on some strategies to deal with this.
It is recommended that you use at least macOS 14 and Xcode 15.4, but
It is recommended that you use at least macOS 13 (Ventura) and Xcode 14, but
earlier versions may also work.
The standard macOS environment contains the basic tooling needed to build, but
@@ -412,11 +390,11 @@ possible to compile the JDK with both older and newer versions, but the closer
you stay to this list, the more likely you are to compile successfully without
issues.
| Operating system | Toolchain version |
| ------------------ | -------------------------------------------- |
| Linux | gcc 14.2.0 |
| macOS | Apple Xcode 15.4 (using clang 15.0.0) |
| Windows | Microsoft Visual Studio 2022 version 17.13.2 |
| Operating system | Toolchain version |
| ------------------ | ------------------------------------------- |
| Linux | gcc 13.2.0 |
| macOS | Apple Xcode 14.3.1 (using clang 14.0.3) |
| Windows | Microsoft Visual Studio 2022 version 17.6.5 |
All compilers are expected to be able to handle the C11 language standard for
C, and C++14 for C++.
@@ -426,7 +404,7 @@ C, and C++14 for C++.
The minimum accepted version of gcc is 10.0. Older versions will not be accepted
by `configure`.
The JDK is currently known to compile successfully with gcc version 14.2 or
The JDK is currently known to compile successfully with gcc version 13.2 or
newer.
In general, any version between these two should be usable.
@@ -1479,24 +1457,6 @@ sh ./configure --with-jvm-variants=server \
and run `make` normally.
#### Building for Windows AArch64
The Visual Studio Build Tools can be used for building the JDK without a full
Visual Studio installation. To set up the Visual Studio 2022 Build Tools on a
Windows AArch64 machine for a native build, launch the installer as follows
in a Windows command prompt:
```
vs_buildtools.exe --quiet --wait --norestart --nocache ^
--installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" ^
--add Microsoft.VisualStudio.Component.VC.CoreBuildTools ^
--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ^
--add Microsoft.VisualStudio.Component.Windows11SDK.22621
```
To generate Windows AArch64 builds using Cygwin on a Windows x64 machine,
you must set the proper target platform by adding
`--openjdk-target=aarch64-unknown-cygwin` to your configure command line.
## Build Performance
Building the JDK requires a lot of horsepower. Some of the build tools can be

View File

@@ -32,12 +32,11 @@
<ul>
<li><a href="#introduction" id="toc-introduction">Introduction</a>
<ul>
<li><a href="#changing-this-document"
id="toc-changing-this-document">Changing this Document</a></li>
<li><a href="#why-care-about-style" id="toc-why-care-about-style">Why
Care About Style?</a></li>
<li><a href="#counterexamples"
id="toc-counterexamples">Counterexamples</a></li>
<li><a href="#counterexamples-and-updates"
id="toc-counterexamples-and-updates">Counterexamples and
Updates</a></li>
</ul></li>
<li><a href="#structure-and-formatting"
id="toc-structure-and-formatting">Structure and Formatting</a>
@@ -100,21 +99,6 @@ writing HotSpot code. Following these will help new code fit in with
existing HotSpot code, making it easier to read and maintain. Failure to
follow these guidelines may lead to discussion during code reviews, if
not outright rejection of a change.</p>
<h3 id="changing-this-document">Changing this Document</h3>
<p>Proposed changes should be discussed on the <a
href="mailto:hotspot-dev@openjdk.org">HotSpot Developers</a> mailing
list. Changes are likely to be cautious and incremental, since HotSpot
coders have been using these guidelines for years.</p>
<p>Substantive changes are approved by <a
href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a>
of the <a href="https://openjdk.org/census#hotspot">HotSpot Group</a>
Members. The Group Lead determines whether consensus has been
reached.</p>
<p>Editorial changes (changes that only affect the description of
HotSpot style, not its substance) do not require the full consensus
gathering process. The normal HotSpot pull request process may be used
for editorial changes, with the additional requirement that the
requisite reviewers are also HotSpot Group Members.</p>
<h3 id="why-care-about-style">Why Care About Style?</h3>
<p>Some programmers seem to have lexers and even C preprocessors
installed directly behind their eyeballs. The rest of us require code
@@ -140,7 +124,7 @@ conforms locally to its own peculiar conventions, it is not worth
reformatting the whole thing. Also consider separating changes that make
extensive stylistic updates from those which make functional
changes.</p>
<h3 id="counterexamples">Counterexamples</h3>
<h3 id="counterexamples-and-updates">Counterexamples and Updates</h3>
<p>Many of the guidelines mentioned here have (sometimes widespread)
counterexamples in the HotSpot code base. Finding a counterexample is
not sufficient justification for new code to follow the counterexample
@@ -153,6 +137,20 @@ bring it up for discussion and possible change. The architectural rule,
of course, is "When in Rome do as the Romans". Sometimes in the suburbs
of Rome the rules are a little different; these differences can be
pointed out here.</p>
<p>Proposed changes should be discussed on the <a
href="mailto:hotspot-dev@openjdk.org">HotSpot Developers</a> mailing
list. Changes are likely to be cautious and incremental, since HotSpot
coders have been using these guidelines for years.</p>
<p>Substantive changes are approved by <a
href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a>
of the <a href="https://openjdk.org/census#hotspot">HotSpot Group</a>
Members. The Group Lead determines whether consensus has been
reached.</p>
<p>Editorial changes (changes that only affect the description of
HotSpot style, not its substance) do not require the full consensus
gathering process. The normal HotSpot pull request process may be used
for editorial changes, with the additional requirement that the
requisite reviewers are also HotSpot Group Members.</p>
<h2 id="structure-and-formatting">Structure and Formatting</h2>
<h3 id="factoring-and-class-design">Factoring and Class Design</h3>
<ul>

View File

@@ -8,24 +8,6 @@ HotSpot code, making it easier to read and maintain. Failure to
follow these guidelines may lead to discussion during code reviews, if
not outright rejection of a change.
### Changing this Document
Proposed changes should be discussed on the
[HotSpot Developers](mailto:hotspot-dev@openjdk.org) mailing
list. Changes are likely to be cautious and incremental, since HotSpot
coders have been using these guidelines for years.
Substantive changes are approved by
[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
the [HotSpot Group](https://openjdk.org/census#hotspot) Members.
The Group Lead determines whether consensus has been reached.
Editorial changes (changes that only affect the description of HotSpot
style, not its substance) do not require the full consensus gathering
process. The normal HotSpot pull request process may be used for
editorial changes, with the additional requirement that the requisite
reviewers are also HotSpot Group Members.
### Why Care About Style?
Some programmers seem to have lexers and even C preprocessors
@@ -56,7 +38,7 @@ reformatting the whole thing. Also consider separating changes that
make extensive stylistic updates from those which make functional
changes.
### Counterexamples
### Counterexamples and Updates
Many of the guidelines mentioned here have (sometimes widespread)
counterexamples in the HotSpot code base. Finding a counterexample is
@@ -72,6 +54,22 @@ rule, of course, is "When in Rome do as the Romans". Sometimes in the
suburbs of Rome the rules are a little different; these differences
can be pointed out here.
Proposed changes should be discussed on the
[HotSpot Developers](mailto:hotspot-dev@openjdk.org) mailing
list. Changes are likely to be cautious and incremental, since HotSpot
coders have been using these guidelines for years.
Substantive changes are approved by
[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
the [HotSpot Group](https://openjdk.org/census#hotspot) Members.
The Group Lead determines whether consensus has been reached.
Editorial changes (changes that only affect the description of HotSpot
style, not its substance) do not require the full consensus gathering
process. The normal HotSpot pull request process may be used for
editorial changes, with the additional requirement that the requisite
reviewers are also HotSpot Group Members.
## Structure and Formatting
### Factoring and Class Design

View File

@@ -189,7 +189,7 @@ wants to find) and design tests using those models.</p>
<p>Prefer having checks inside test code.</p>
<p>Not only does having test logic outside, e.g. verification method,
depending on asserts in product code contradict with several items above
but also decreases test's readability and stability. It is much easier
but also decreases tests readability and stability. It is much easier
to understand that a test is testing when all testing logic is located
inside a test or nearby in shared test libraries. As a rule of thumb,
the closer a check to a test, the better.</p>
@@ -198,7 +198,7 @@ the closer a check to a test, the better.</p>
<p>Prefer <code>EXPECT</code> over <code>ASSERT</code> if possible.</p>
<p>This is related to the <a href="#informativeness">informativeness</a>
property of tests, information for other checks can help to better
localize a defect's root-cause. One should use <code>ASSERT</code> if it
localize a defects root-cause. One should use <code>ASSERT</code> if it
is impossible to continue test execution or if it does not make much
sense. Later in the text, <code>EXPECT</code> forms will be used to
refer to both <code>ASSERT/EXPECT</code>.</p>
@@ -235,7 +235,7 @@ which checks that the absolute value of the difference between
<code>eps</code>.</p>
<h3 id="c-string-comparison">C string comparison</h3>
<p>Use string special macros for C strings comparisons.</p>
<p><code>EXPECT_EQ</code> just compares pointers' values, which is
<p><code>EXPECT_EQ</code> just compares pointers values, which is
hardly what one wants comparing C strings. GoogleTest provides
<code>EXPECT_STREQ</code> and <code>EXPECT_STRNE</code> macros to
compare C string contents. There are also case-insensitive versions
@@ -293,7 +293,7 @@ subsystem, etc.</p>
<p>This naming scheme helps to find tests, filter them and simplifies
test failure analysis. For example, class <code>Foo</code> - test group
<code>Foo</code>, compiler logging subsystem - test group
<code>CompilerLogging</code>, G1 GC - test group <code>G1GC</code>, and
<code>CompilerLogging</code>, G1 GC test group <code>G1GC</code>, and
so forth.</p>
<h3 id="filename">Filename</h3>
<p>A test file must have <code>test_</code> prefix and <code>.cpp</code>
@@ -345,7 +345,7 @@ name starts or ends with an underscore are enough to be safe.</p>
<h3 id="friend-classes">Friend classes</h3>
<p>All test purpose friends should have either <code>Test</code> or
<code>Testable</code> suffix.</p>
<p>It greatly simplifies understanding of friendship's purpose and
<p>It greatly simplifies understanding of friendships purpose and
allows statically check that private members are not exposed
unexpectedly. Having <code>FooTest</code> as a friend of
<code>Foo</code> without any comments will be understood as a necessary
@@ -435,7 +435,7 @@ inapplicable tests.</p>
<h3 id="flag-restoring">Flag restoring</h3>
<p>Restore changed flags.</p>
<p>It is quite common for tests to configure JVM in a certain way
changing flags' values. GoogleTest provides two ways to set up
changing flags values. GoogleTest provides two ways to set up
environment before a test and restore it afterward: using either
constructor and destructor or <code>SetUp</code> and
<code>TearDown</code> functions. Both ways require to use a test fixture
@@ -444,7 +444,7 @@ class, which sometimes is too wordy. The simpler facilities like
be used in such cases to restore/set values.</p>
<p>Caveats:</p>
<ul>
<li><p>Changing a flag's value could break the invariants between flags'
<li><p>Changing a flags value could break the invariants between flags'
values and hence could lead to unexpected/unsupported JVM
state.</p></li>
<li><p><code>FLAG_SET_*</code> macros can change more than one flag (in

View File

@@ -72,9 +72,6 @@ id="toc-notes-for-specific-tests">Notes for Specific Tests</a>
<li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
locale</a></li>
<li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
<li><a href="#testing-ahead-of-time-optimizations"
id="toc-testing-ahead-of-time-optimizations">Testing Ahead-of-time
Optimizations</a></li>
<li><a href="#testing-with-alternative-security-providers"
id="toc-testing-with-alternative-security-providers">Testing with
alternative security providers</a></li>
@@ -414,13 +411,6 @@ instrumentation
special target <code>jcov-test</code> instead of <code>test</code>, e.g.
<code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov
image is built, and that JCov reporting is enabled.</p>
<p>To include JCov coverage for just a subset of all modules, you can
use the <code>--with-jcov-modules</code> arguments to
<code>configure</code>, e.g.
<code>--with-jcov-modules=jdk.compiler,java.desktop</code>.</p>
<p>For more fine-grained control, you can pass arbitrary filters to JCov
using <code>--with-jcov-filters</code>, and you can specify a specific
JDK to instrument using <code>--with-jcov-input-jdk</code>.</p>
<p>The JCov report is stored in
<code>build/$BUILD/test-results/jcov-output/report</code>.</p>
<p>Please note that running with JCov reporting can be very memory
@@ -599,37 +589,6 @@ element of the appropriate <code>@Artifact</code> class. (See
JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
<p>For more notes about the PKCS11 tests, please refer to
test/jdk/sun/security/pkcs11/README.</p>
<h3 id="testing-ahead-of-time-optimizations">Testing Ahead-of-time
Optimizations</h3>
<p>One way to improve test coverage of ahead-of-time (AOT) optimizations
in the JDK is to run existing jtreg test cases in a special "AOT_JDK"
mode. Example:</p>
<pre><code>$ make test JTREG=&quot;AOT_JDK=onestep&quot; \
TEST=open/test/hotspot/jtreg/runtime/invokedynamic</code></pre>
<p>In this testing mode, we first perform an AOT training run (see
https://openjdk.org/jeps/483) of a special test program (<a
href="../test/setup_aot/TestSetupAOT.java">test/setup_aot/TestSetupAOT.java</a>)
that accesses about 5,0000 classes in the JDK core libraries.
Optimization artifacts for these classes (such as pre-linked lambda
expressions, execution profiles, and pre-generated native code) are
stored into an AOT cache file, which will be used by all the JVMs
launched by the selected jtreg test cases.</p>
<p>When the jtreg tests call into the core libraries classes that are in
the AOT cache, we will be able to test the AOT optimizations that were
used on those classes.</p>
<p>Please note that not all existing jtreg test cases can be executed
with the AOT_JDK mode. See <a
href="../test/hotspot/jtreg/ProblemList-AotJdk.txt">test/hotspot/jtreg/ProblemList-AotJdk.txt</a>
and <a
href="../test/jdk/ProblemList-AotJdk.txt">test/jdk/ProblemList-AotJdk.txt</a>.</p>
<p>Also, test cases that were written specifically to test AOT, such as
the tests under <a
href="../test/hotspot/jtreg/runtime/cds/">test/hotspot/jtreg/runtime/cds</a>,
cannot be executed with the AOT_JDK mode.</p>
<p>Valid values for <code>AOT_JDK</code> are <code>onestep</code> and
<code>twostep</code>. These control how the AOT cache is generated. See
https://openjdk.org/jeps/514 for details. All other values are
ignored.</p>
<h3 id="testing-with-alternative-security-providers">Testing with
alternative security providers</h3>
<p>Some security tests use a hardcoded provider for

View File

@@ -345,14 +345,6 @@ The simplest way to run tests with JCov coverage report is to use the special
target `jcov-test` instead of `test`, e.g. `make jcov-test TEST=jdk_lang`. This
will make sure the JCov image is built, and that JCov reporting is enabled.
To include JCov coverage for just a subset of all modules, you can use the
`--with-jcov-modules` arguments to `configure`, e.g.
`--with-jcov-modules=jdk.compiler,java.desktop`.
For more fine-grained control, you can pass arbitrary filters to JCov using
`--with-jcov-filters`, and you can specify a specific JDK to instrument
using `--with-jcov-input-jdk`.
The JCov report is stored in `build/$BUILD/test-results/jcov-output/report`.
Please note that running with JCov reporting can be very memory intensive.
@@ -611,43 +603,6 @@ $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
For more notes about the PKCS11 tests, please refer to
test/jdk/sun/security/pkcs11/README.
### Testing Ahead-of-time Optimizations
-------------------------------------------------------------------------------
One way to improve test coverage of ahead-of-time (AOT) optimizations in
the JDK is to run existing jtreg test cases in a special "AOT_JDK" mode.
Example:
```
$ make test JTREG="AOT_JDK=onestep" \
TEST=open/test/hotspot/jtreg/runtime/invokedynamic
```
In this testing mode, we first perform an AOT training run
(see https://openjdk.org/jeps/483) of a special test program
([test/setup_aot/TestSetupAOT.java](../test/setup_aot/TestSetupAOT.java))
that accesses about 5,0000 classes in the JDK core libraries.
Optimization artifacts for these classes (such as pre-linked
lambda expressions, execution profiles, and pre-generated native code)
are stored into an AOT cache file, which will be used by all the JVMs
launched by the selected jtreg test cases.
When the jtreg tests call into the core libraries classes that are in
the AOT cache, we will be able to test the AOT optimizations that were
used on those classes.
Please note that not all existing jtreg test cases can be executed with
the AOT_JDK mode. See
[test/hotspot/jtreg/ProblemList-AotJdk.txt](../test/hotspot/jtreg/ProblemList-AotJdk.txt)
and [test/jdk/ProblemList-AotJdk.txt](../test/jdk/ProblemList-AotJdk.txt).
Also, test cases that were written specifically to test AOT, such as the tests
under [test/hotspot/jtreg/runtime/cds](../test/hotspot/jtreg/runtime/cds/),
cannot be executed with the AOT_JDK mode.
Valid values for `AOT_JDK` are `onestep` and `twostep`. These control how
the AOT cache is generated. See https://openjdk.org/jeps/514 for details.
All other values are ignored.
### Testing with alternative security providers
Some security tests use a hardcoded provider for `KeyFactory`, `Cipher`,

View File

@@ -40,6 +40,7 @@ architecture=${3:-x64} # aarch64 or x64
check_bundle_type_maketest
tag_prefix="jdk-"
VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
@@ -47,9 +48,8 @@ VERSION_PATCH=$(getVersionProp "DEFAULT_VERSION_PATCH")
[[ $VERSION_UPDATE = 0 ]] && JBSDK_VERSION="$VERSION_FEATURE" || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}"
[[ $VERSION_PATCH = 0 ]] || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}.${VERSION_PATCH}"
echo "##teamcity[setParameter name='env.JBSDK_VERSION' value='${JBSDK_VERSION}']"
tag_prefix="jdk-"
OPENJDK_TAG=$(git tag -l | grep "$tag_prefix$JBSDK_VERSION" | grep -v ga | sort -t "-" -k 2 -V -f | tail -n 1)
JDK_BUILD_NUMBER=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')
OPENJDK_TAG=$(git tag -l | grep "$tag_prefix$JBSDK_VERSION" | grep -v ga | sort -t "-" -k 2 -g | tail -n 1)
JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')}
[ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
re='^[0-9]+$'
if ! [[ $JDK_BUILD_NUMBER =~ $re ]] ; then

View File

@@ -174,11 +174,9 @@ else
JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
STATIC_JDK_BUNDLE_SUBDIR := static-jdk-$(VERSION_NUMBER)
ifneq ($(DEBUG_LEVEL), release)
JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
STATIC_JDK_BUNDLE_SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
endif
# In certain situations, the JDK_IMAGE_DIR points to an image without the
# the symbols and demos. If so, the symobls and demos can be found in a
@@ -502,21 +500,6 @@ ifneq ($(filter static-libs-graal-bundles, $(MAKECMDGOALS)), )
STATIC_LIBS_GRAAL_TARGETS += $(BUILD_STATIC_LIBS_GRAAL_BUNDLE)
endif
#################################################################################
ifneq ($(filter static-jdk-bundles, $(MAKECMDGOALS)), )
STATIC_JDK_BUNDLE_FILES := $(call FindFiles, $(STATIC_JDK_IMAGE_DIR))
$(eval $(call SetupBundleFile, BUILD_STATIC_JDK_BUNDLE, \
BUNDLE_NAME := $(STATIC_JDK_BUNDLE_NAME), \
FILES := $(STATIC_JDK_BUNDLE_FILES), \
BASE_DIRS := $(STATIC_JDK_IMAGE_DIR), \
SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR), \
))
STATIC_JDK_TARGETS += $(BUILD_STATIC_JDK_BUNDLE)
endif
################################################################################
product-bundles: $(PRODUCT_TARGETS)
@@ -527,12 +510,11 @@ docs-javase-bundles: $(DOCS_JAVASE_TARGETS)
docs-reference-bundles: $(DOCS_REFERENCE_TARGETS)
static-libs-bundles: $(STATIC_LIBS_TARGETS)
static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
static-jdk-bundles: $(STATIC_JDK_TARGETS)
jcov-bundles: $(JCOV_TARGETS)
.PHONY: product-bundles test-bundles \
docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
static-libs-bundles static-libs-graal-bundles static-jdk-bundles jcov-bundles
static-libs-bundles static-libs-graal-bundles jcov-bundles
################################################################################

View File

@@ -95,16 +95,14 @@ define SetupInterimModule
SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
$$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
$(TOPDIR)/src/$1/share/classes, \
EXCLUDES := sun, \
EXCLUDES := sun javax/tools/snippet-files, \
EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
$(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
$(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
$(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.java \
$(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryContext.java \
$(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
$(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \
Standard.java, \
EXCLUDE_PATTERNS := -files, \
EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java \
$($1.interim_EXTRA_FILES), \
COPY := .gif .png .xml .css .svg .js .js.template .txt .woff .woff2 javax.tools.JavaCompilerTool, \

View File

@@ -114,7 +114,6 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
DISABLED_WARNINGS := $(DISABLED_WARNINGS_java), \
EXCLUDES := $(EXCLUDES), \
EXCLUDE_FILES := $(EXCLUDE_FILES), \
EXCLUDE_PATTERNS := -files, \
KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
JAVAC_FLAGS := \
$(DOCLINT) \

View File

@@ -34,28 +34,21 @@ else
JCOV_INPUT_IMAGE_DIR := $(JDK_IMAGE_DIR)
endif
JCOV_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/jcov
#moving instrumented jdk image in and out of jcov_temp because of CODETOOLS-7902299
JCOV_TEMP := $(JCOV_SUPPORT_DIR)/temp
ifneq ($(JCOV_MODULES), )
JCOV_MODULES_FILTER := $(foreach m, $(JCOV_MODULES), -include_module $m)
endif
JCOV_TEMP := $(SUPPORT_OUTPUTDIR)/jcov_temp
$(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release
$(call LogWarn, Creating instrumented jdk image with JCov)
$(call MakeDir, $(JCOV_TEMP) $(IMAGES_OUTPUTDIR))
$(RM) -r $(JCOV_IMAGE_DIR) $(JCOV_TEMP)/*
$(CP) -r $(JCOV_INPUT_IMAGE_DIR) $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
$(call ExecuteWithLog, $(JCOV_SUPPORT_DIR)/run-jcov, \
$(JAVA) -Xmx3g -jar $(JCOV_HOME)/lib/jcov.jar JREInstr \
$(JAVA) -Xmx3g -jar $(JCOV_HOME)/lib/jcov.jar JREInstr \
-t $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)/template.xml \
-rt $(JCOV_HOME)/lib/jcov_network_saver.jar \
-exclude 'java.lang.Object' \
-exclude jdk.test.Main -exclude '**\$Proxy*' \
$(JCOV_MODULES_FILTER) $(JCOV_FILTERS) \
$(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR))
$(JCOV_FILTERS) \
$(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
$(MV) $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR) $(JCOV_IMAGE_DIR)
$(RMDIR) $(JCOV_TEMP)

View File

@@ -79,6 +79,8 @@ JAVADOC_TAGS := \
-tag see \
-taglet build.tools.taglet.ExtLink \
-taglet build.tools.taglet.Incubating \
-taglet build.tools.taglet.PreviewNote \
--preview-note-tag previewNote \
-tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
$(CUSTOM_JAVADOC_TAGS) \
#
@@ -94,14 +96,14 @@ JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
# The initial set of options for javadoc
JAVADOC_OPTIONS := -use -keywords -notimestamp \
-serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
-serialwarn -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
-splitIndex --system none -javafx --expand-requires transitive \
--override-methods=summary
# The reference options must stay stable to allow for comparisons across the
# development cycle.
REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
-serialwarn -encoding utf-8 -breakiterator -splitIndex --system none \
-serialwarn -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
-html5 -javafx --expand-requires transitive
# Should we add DRAFT stamps to the generated javadoc?
@@ -260,7 +262,7 @@ define create_overview_file
$$($1_OVERVIEW): $$($1_OVERVIEW_VARDEPS_FILE)
$$(call LogInfo, Creating overview.html for $1)
$$(call MakeDir, $$(@D))
$$(PRINTF) "%s" '$$($1_OVERVIEW_TEXT)' > $$@
$$(ECHO) -n '$$($1_OVERVIEW_TEXT)' > $$@
endef
################################################################################
@@ -540,9 +542,7 @@ $(eval $(call SetupApiDocsGeneration, REFERENCE_API, \
# Format: space-delimited list of names, including at most one '%' as a
# wildcard. Spec source files match if their filename or any enclosing folder
# name matches one of the items in SPEC_FILTER.
ifeq ($(SPEC_FILTER), )
SPEC_FILTER := %
endif
SPEC_FILTER := %
ApplySpecFilter = \
$(strip $(foreach file, $(1), \

View File

@@ -76,14 +76,10 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
$(CLASSLIST_FILE_VM_OPTS) \
-Xlog:aot=off \
-Xlog:cds=off \
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
build.tools.classlist.HelloClasslist $(LOG_DEBUG)
$(GREP) -v HelloClasslist $@.raw > $@.interim
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -Xshare:dump \
-Xlog:aot=off \
-Xlog:cds=off \
-XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
-Xmx128M -Xms128M $(LOG_INFO)
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw.2 \
@@ -91,8 +87,6 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
-Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
$(CLASSLIST_FILE_VM_OPTS) \
--module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
-Xlog:aot=off \
-Xlog:cds=off \
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
build.tools.classlist.HelloClasslist \
2> $(LINK_OPT_DIR)/stderr > $(JLI_TRACE_FILE) \
@@ -106,8 +100,6 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
$(GREP) -v @cp $@.raw.3 > $@.raw.4
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
-Xlog:aot=off \
-Xlog:cds=off \
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
build.tools.classlist.SortClasslist $@.raw.4 > $@

View File

@@ -162,7 +162,7 @@ define CreateCDSArchive
endif
ifeq ($(DEBUG_CDS_ARCHIVE), true)
$1_$2_CDS_DUMP_FLAGS += -Xlog:aot+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE).cdsmap:none:filesize=0
$1_$2_CDS_DUMP_FLAGS += -Xlog:cds+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE).cdsmap:none:filesize=0
endif
$$(eval $$(call SetupExecute, $1_$2_gen_cds_archive_jdk, \

View File

@@ -37,6 +37,10 @@ include MakeFileStart.gmk
include $(TOPDIR)/make/InitSupport.gmk
include LogUtils.gmk
# Force early generation of module-deps.gmk
GENERATE_MODULE_DEPS_FILE := true
include Modules.gmk
# Inclusion of this pseudo-target will cause make to execute this file
# serially, regardless of -j.
.NOTPARALLEL:
@@ -140,14 +144,6 @@ main: $(INIT_TARGETS)
( cd $(TOPDIR) && \
$(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
$(SEQUENTIAL_TARGETS) )
# We might have cleaned away essential files, recreate them.
( cd $(TOPDIR) && \
$(MAKE) $(MAKE_ARGS) -j 1 -f make/GenerateFindTests.gmk \
$(USER_MAKE_VARS) )
( cd $(TOPDIR) && \
$(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
UPDATE_MODULE_DEPS=true NO_RECIPES=true \
create-main-targets-include )
endif
ifneq ($(PARALLEL_TARGETS), )
$(call PrepareFailureLogs)

View File

@@ -42,12 +42,6 @@ include MakeFileStart.gmk
include $(TOPDIR)/make/MainSupport.gmk
include FindTests.gmk
ifeq ($(UPDATE_MODULE_DEPS), true)
# Update module-deps.gmk if requested. This is read in Modules.gmk.
GENERATE_MODULE_DEPS_FILE := true
endif
include Modules.gmk
# Are we requested to ignore dependencies?
@@ -881,12 +875,6 @@ $(eval $(call SetupTarget, static-libs-graal-bundles, \
DEPS := static-libs-graal-image, \
))
$(eval $(call SetupTarget, static-jdk-bundles, \
MAKEFILE := Bundles, \
TARGET := static-jdk-bundles, \
DEPS := static-jdk-image, \
))
ifeq ($(JCOV_ENABLED), true)
$(eval $(call SetupTarget, jcov-bundles, \
MAKEFILE := Bundles, \

View File

@@ -57,7 +57,7 @@ define SetupTargetBody
endef
define CleanDocs
@$(PRINTF) "Cleaning docs ..."
@$(ECHO) -n "Cleaning docs ..."
@$(ECHO) "" $(LOG_DEBUG)
$(RM) -r $(SUPPORT_OUTPUTDIR)/docs
$(RM) -r $(SUPPORT_OUTPUTDIR)/javadoc
@@ -67,28 +67,28 @@ endef
# Cleans the dir given as $1
define CleanDir
@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
@$(ECHO) -n "Cleaning $(strip $1) build artifacts ..."
@$(ECHO) "" $(LOG_DEBUG)
($(CD) $(OUTPUTDIR) && $(RM) -r $1)
@$(ECHO) " done"
endef
define CleanSupportDir
@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
@$(ECHO) -n "Cleaning$(strip $1) build artifacts ..."
@$(ECHO) "" $(LOG_DEBUG)
$(RM) -r $(SUPPORT_OUTPUTDIR)/$(strip $1)
@$(ECHO) " done"
endef
define CleanMakeSupportDir
@$(PRINTF) "Cleaning %s make support artifacts ..." "$(strip $1)"
@$(ECHO) -n "Cleaning $(strip $1) make support artifacts ..."
@$(ECHO) "" $(LOG_DEBUG)
$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/$(strip $1)
@$(ECHO) " done"
endef
define CleanTest
@$(PRINTF) "Cleaning test %s ..." "$(strip $1)"
@$(ECHO) -n "Cleaning test $(strip $1) ..."
@$(ECHO) "" $(LOG_DEBUG)
$(RM) -r $(SUPPORT_OUTPUTDIR)/test/$(strip $(subst -,/,$1))
# Remove as much of the test directory structure as is empty
@@ -97,25 +97,25 @@ define CleanTest
endef
define Clean-gensrc
@$(PRINTF) "Cleaning gensrc %s..." "$(if $1,for $(strip $1) )"
@$(ECHO) -n "Cleaning gensrc $(if $1,for $(strip $1) )..."
@$(ECHO) "" $(LOG_DEBUG)
$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)
@$(ECHO) " done"
endef
define Clean-java
@$(PRINTF) "Cleaning java %s..." "$(if $1,for $(strip $1) )"
@$(ECHO) -n "Cleaning java $(if $1,for $(strip $1) )..."
@$(ECHO) "" $(LOG_DEBUG)
$(RM) -r $(JDK_OUTPUTDIR)/modules/$(strip $1)
$(RM) -r $(SUPPORT_OUTPUTDIR)/special_classes/$(strip $1)
$(ECHO) " done"
$(PRINTF) "Cleaning headers %s..." "$(if $1,for $(strip $1) )"
$(ECHO) -n "Cleaning headers $(if $1,for $(strip $1) )..."
$(RM) -r $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)
@$(ECHO) " done"
endef
define Clean-native
@$(PRINTF) "Cleaning native %s..." "$(if $1,for $(strip $1) )"
@$(ECHO) -n "Cleaning native $(if $1,for $(strip $1) )..."
@$(ECHO) "" $(LOG_DEBUG)
$(RM) -r $(SUPPORT_OUTPUTDIR)/native/$(strip $1)
$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
@@ -124,7 +124,7 @@ define Clean-native
endef
define Clean-include
@$(PRINTF) "Cleaning include %s..." "$(if $1,for $(strip $1) )"
@$(ECHO) -n "Cleaning include $(if $1,for $(strip $1) )..."
@$(ECHO) "" $(LOG_DEBUG)
$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_include/$(strip $1)
@$(ECHO) " done"

View File

@@ -161,19 +161,19 @@ ifneq ($(SKIP_SPEC), true)
( cd $(TOPDIR) && \
$(foreach spec, $(SPECS), \
$(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
$(MAKE_INIT_MAIN_TARGET_ARGS) main && \
SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
main && \
$(if $(and $(COMPARE_BUILD), $(PARALLEL_TARGETS)), \
$(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
SPEC=$(spec) \
COMPARE_BUILD="$(COMPARE_BUILD)" \
pre-compare-build && \
$(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
$(MAKE_INIT_MAIN_TARGET_ARGS) main && \
main && \
$(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
SPEC=$(spec) \
COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
post-compare-build && \
) \

View File

@@ -250,14 +250,13 @@ endef
# Param 1: FORCE = force generation of main-targets.gmk or LAZY = do not force.
# Param 2: The SPEC file to use.
define DefineMainTargets
SPEC_FILE := $(strip $2)
# We will start by making sure the main-targets.gmk file is removed, if
# make has not been restarted. By the -include, we will trigger the
# rule for generating the file (which is never there since we removed it),
# thus generating it fresh, and make will restart, incrementing the restart
# count.
main_targets_file := $$(dir $$(SPEC_FILE))make-support/main-targets.gmk
main_targets_file := $$(dir $(strip $2))make-support/main-targets.gmk
ifeq ($$(MAKE_RESTARTS), )
# Only do this if make has not been restarted, and if we do not force it.
@@ -268,12 +267,11 @@ define DefineMainTargets
$$(main_targets_file):
@( cd $$(TOPDIR) && \
$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
-I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR))
$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
-I $$(TOPDIR)/make/common SPEC=$(strip $2) )
@( cd $$(TOPDIR) && \
$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/Main.gmk \
-I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR) \
UPDATE_MODULE_DEPS=true NO_RECIPES=true \
$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/Main.gmk \
-I $$(TOPDIR)/make/common SPEC=$(strip $2) NO_RECIPES=true \
$$(MAKE_LOG_VARS) \
create-main-targets-include )

View File

@@ -115,7 +115,6 @@ JTREG_COV_OPTIONS :=
ifeq ($(TEST_OPTS_JCOV), true)
JCOV_OUTPUT_DIR := $(TEST_RESULTS_DIR)/jcov-output
JCOV_SUPPORT_DIR := $(TEST_SUPPORT_DIR)/jcov-support
JCOV_GRABBER_LOG := $(JCOV_OUTPUT_DIR)/grabber.log
JCOV_RESULT_FILE := $(JCOV_OUTPUT_DIR)/result.xml
JCOV_REPORT := $(JCOV_OUTPUT_DIR)/report
@@ -535,21 +534,22 @@ define SetupRunGtestTestBody
$$(eval $1_PASSED := $$(shell $$(AWK) '/\[ PASSED \] .* tests?./ \
{ print $$$$4 }' $$($1_RESULT_FILE))) \
$$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \
$$(eval $1_GTEST_DISABLED := $$(shell $$(AWK) '/YOU HAVE .* DISABLED TEST/ \
{ print $$$$3 }' $$($1_RESULT_FILE))) \
$$(if $$($1_GTEST_DISABLED), , $$(eval $1_GTEST_DISABLED := 0)) \
$$(eval $1_GTEST_SKIPPED := $$(shell $$(AWK) '/\[ SKIPPED \] .* tests?.*/ \
{ print $$$$4 }' $$($1_RESULT_FILE))) \
$$(if $$($1_GTEST_SKIPPED), , $$(eval $1_GTEST_SKIPPED := 0)) \
$$(eval $1_SKIPPED := $$(shell \
$$(EXPR) $$($1_GTEST_DISABLED) + $$($1_GTEST_SKIPPED))) \
$$(eval $1_SKIPPED := $$(shell $$(AWK) \
'/YOU HAVE [0-9]+ DISABLED TEST/ { \
if (match($$$$0, /[0-9]+/, arr)) { \
print arr[0]; \
found=1; \
} \
} \
END { if (!found) print 0; }' \
$$($1_RESULT_FILE))) \
$$(eval $1_FAILED := $$(shell $$(AWK) '/\[ FAILED \] .* tests?, \
listed below/ { print $$$$4 }' $$($1_RESULT_FILE))) \
$$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \
$$(eval $1_ERROR := $$(shell \
$$(EXPR) $$($1_RUN) - $$($1_PASSED) - $$($1_FAILED) - $$($1_GTEST_SKIPPED))) \
$$(EXPR) $$($1_RUN) - $$($1_PASSED) - $$($1_FAILED))) \
$$(eval $1_TOTAL := $$(shell \
$$(EXPR) $$($1_RUN) + $$($1_GTEST_DISABLED))) \
$$(EXPR) $$($1_RUN) + $$($1_SKIPPED))) \
, \
$$(eval $1_PASSED := 0) \
$$(eval $1_FAILED := 0) \
@@ -583,8 +583,6 @@ define SetMicroValue
else
ifneq ($3, )
$1_$2 := $3
else
$1_$2 :=
endif
endif
endef
@@ -711,8 +709,6 @@ define SetJtregValue
else
ifneq ($3, )
$1_$2 := $3
else
$1_$2 :=
endif
endif
endif
@@ -725,7 +721,6 @@ endef
# Parameter 1 is the name of the rule.
#
# Remaining parameters are named arguments.
# TRAINING The AOT training mode: onestep or twostep
# VM_OPTIONS List of JVM arguments to use when creating AOT cache
#
# After calling this, the following variables are defined
@@ -754,39 +749,23 @@ define SetupAOTBody
$$($1_AOT_JDK_CACHE): $$(JDK_IMAGE_DIR)/release
$$(call MakeDir, $$($1_AOT_JDK_OUTPUT_DIR))
ifeq ($$($1_TRAINING), onestep)
$$(call LogWarn, AOT: Create cache configuration) \
$$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
cd $$($1_AOT_JDK_OUTPUT_DIR); \
$(JAR) --extract --file $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar; \
$$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
-Xlog:class+load,cds,cds+class=debug:file=$$($1_AOT_JDK_CONF).log -Xlog:cds*=error \
-XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
))
$$(call LogWarn, AOT: Create AOT cache $$($1_AOT_JDK_CACHE) in one step with flags: $$($1_VM_OPTIONS)) \
$$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
cd $$($1_AOT_JDK_OUTPUT_DIR); \
$(JAR) --extract --file $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar; \
$$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
-Xlog:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error -Xlog:aot*=error \
-XX:AOTMode=record -XX:AOTCacheOutput=$$($1_AOT_JDK_CACHE) \
TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
))
else
$$(call LogWarn, AOT: Create cache configuration) \
$$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
cd $$($1_AOT_JDK_OUTPUT_DIR); \
$(JAR) --extract --file $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar; \
$$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
-Xlog:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CONF).log -Xlog:cds*=error -Xlog:aot*=error \
-XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
))
$$(call LogWarn, AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
$$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
$$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
$$($1_VM_OPTIONS) -Xlog:aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error -Xlog:aot*=error \
-XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
-XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
))
endif
$$(call LogWarn, AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
$$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
$$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
$$($1_VM_OPTIONS) -Xlog:cds,cds+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error \
-XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
-XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
))
$1_AOT_TARGETS += $$($1_AOT_JDK_CACHE)
@@ -852,7 +831,7 @@ define SetupRunJtregTestBody
JTREG_RETRY_COUNT ?= 0
JTREG_REPEAT_COUNT ?= 0
JTREG_REPORT ?= files
JTREG_AOT_JDK ?= none
JTREG_AOT_JDK ?= false
ifneq ($$(JTREG_RETRY_COUNT), 0)
ifneq ($$(JTREG_REPEAT_COUNT), 0)
@@ -862,12 +841,6 @@ define SetupRunJtregTestBody
endif
endif
ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
JTREG_PROBLEM_LIST_PREFIX := -match:
else
JTREG_PROBLEM_LIST_PREFIX := -exclude:
endif
ifneq ($$(JTREG_TEST_THREAD_FACTORY), )
$1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
$1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
@@ -896,7 +869,7 @@ define SetupRunJtregTestBody
# version of the JDK.
$1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
-verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
-concurrency:$$($1_JTREG_JOBS) \
-concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
-vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
-vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
-vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
@@ -929,6 +902,12 @@ define SetupRunJtregTestBody
$1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
endif
ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
JTREG_PROBLEM_LIST_PREFIX := -match:
else
JTREG_PROBLEM_LIST_PREFIX := -exclude:
endif
ifneq ($$($1_JTREG_PROBLEM_LIST), )
$1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
endif
@@ -951,11 +930,6 @@ define SetupRunJtregTestBody
JTREG_AUTO_PROBLEM_LISTS += ProblemList-shenandoah.txt
endif
ifneq ($$(findstring --enable-preview, $$(JTREG_ALL_OPTIONS)), )
JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.txt
endif
ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
# Accept both absolute paths as well as relative to the current test root.
$1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
@@ -992,12 +966,12 @@ define SetupRunJtregTestBody
endif
endif
ifneq ($$(filter $$(JTREG_AOT_JDK), onestep twostep), )
ifeq ($$(JTREG_AOT_JDK), true)
$$(call LogWarn, Add AOT target for $1)
$$(eval $$(call SetupAOT, $1, \
TRAINING := $$(JTREG_AOT_JDK), \
VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
$$(eval $$(call SetupAOT, $1, VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
$$(call LogWarn, AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
$1_JTREG_BASIC_OPTIONS += -vmoption:-XX:AOTCache="$$($1_AOT_JDK_CACHE)"
endif
@@ -1015,7 +989,6 @@ define SetupRunJtregTestBody
endif
JTREG_TIMEOUT_FACTOR ?= $$(JTREG_AUTO_TIMEOUT_FACTOR)
$1_JTREG_BASIC_OPTIONS += -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR)
clean-outputdirs-$1:
$$(call LogWarn, Clean up dirs for $1)
@@ -1366,14 +1339,12 @@ TARGETS += run-all-tests pre-run-test post-run-test run-test-report run-test
ifeq ($(TEST_OPTS_JCOV), true)
JCOV_VM_OPTS := -Xmx4g -Djdk.xml.totalEntitySizeLimit=0 -Djdk.xml.maxGeneralEntitySizeLimit=0
jcov-do-start-grabber:
$(call MakeDir, $(JCOV_OUTPUT_DIR))
if $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -status 1>/dev/null 2>&1 ; then \
$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 ; \
fi
$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
$(JCOV_IMAGE_DIR)/template.xml -o $(JCOV_RESULT_FILE) \
1>$(JCOV_GRABBER_LOG) 2>&1 &
@@ -1386,10 +1357,6 @@ ifeq ($(TEST_OPTS_JCOV), true)
$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600
JCOV_REPORT_TITLE := JDK code coverage report<br/>
ifneq ($(JCOV_MODULES), )
JCOV_MODULES_FILTER := $(foreach m, $(JCOV_MODULES), -include_module $m)
JCOV_REPORT_TITLE += Included modules: $(JCOV_MODULES)<br>
endif
ifneq ($(JCOV_FILTERS), )
JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br>
endif
@@ -1397,12 +1364,11 @@ ifeq ($(TEST_OPTS_JCOV), true)
jcov-gen-report: jcov-stop-grabber
$(call LogWarn, Generating JCov report ...)
$(call ExecuteWithLog, $(JCOV_SUPPORT_DIR)/run-jcov-repgen, \
$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
`$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \
$(JCOV_MODULES_FILTER) $(JCOV_FILTERS) \
$(JCOV_FILTERS) \
-mainReportTitle "$(JCOV_REPORT_TITLE)" \
-o $(JCOV_REPORT) $(JCOV_RESULT_FILE))
-o $(JCOV_REPORT) $(JCOV_RESULT_FILE)
TARGETS += jcov-do-start-grabber jcov-start-grabber jcov-stop-grabber \
jcov-gen-report
@@ -1422,7 +1388,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
jcov-gen-diffcoverage: jcov-stop-grabber
$(call LogWarn, Generating diff coverage with changeset $(TEST_OPTS_JCOV_DIFF_CHANGESET) ... )
$(DIFF_COMMAND)
$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar \
$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar \
DiffCoverage -replaceDiff "src/.*/classes/:" -all \
$(JCOV_RESULT_FILE) $(JCOV_SOURCE_DIFF) > \
$(JCOV_DIFF_COVERAGE_REPORT)

View File

@@ -217,9 +217,9 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
else ifeq ($(OPENJDK_TARGET_OS), windows)
NUM_CORES := $(NUMBER_OF_PROCESSORS)
MEMORY_SIZE := $(shell \
$(EXPR) `powershell -Command \
"(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" \
| $(SED) 's/\\r//g' ` / 1024 / 1024 \
$(EXPR) `wmic computersystem get totalphysicalmemory -value \
| $(GREP) = | $(SED) 's/\\r//g' \
| $(CUT) -d "=" -f 2-` / 1024 / 1024 \
)
endif
ifeq ($(NUM_CORES), )

View File

@@ -134,33 +134,17 @@ AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
)
AC_SUBST(BUILD_ENV)
AC_MSG_CHECKING([for locale to use])
if test "x$LOCALE" != x; then
# Check if we actually have C.UTF-8; if so, use it
if $LOCALE -a | $GREP -q -E "^C\.(utf8|UTF-8)$"; then
LOCALE_USED=C.UTF-8
AC_MSG_RESULT([C.UTF-8 (recommended)])
elif $LOCALE -a | $GREP -q -E "^en_US\.(utf8|UTF-8)$"; then
LOCALE_USED=en_US.UTF-8
AC_MSG_RESULT([en_US.UTF-8 (acceptable fallback)])
else
# As a fallback, check if users locale is UTF-8. USER_LOCALE was saved
# by the wrapper configure script before autconf messed up LC_ALL.
if $ECHO $USER_LOCALE | $GREP -q -E "\.(utf8|UTF-8)$"; then
LOCALE_USED=$USER_LOCALE
AC_MSG_RESULT([$USER_LOCALE (untested fallback)])
AC_MSG_WARN([Could not find C.UTF-8 or en_US.UTF-8 locale. This is not supported, and the build might fail unexpectedly.])
else
AC_MSG_RESULT([no UTF-8 locale found])
AC_MSG_WARN([No UTF-8 locale found. This is not supported. Proceeding with the C locale, but the build might fail unexpectedly.])
LOCALE_USED=C
fi
AC_MSG_NOTICE([The recommended locale is C.UTF-8, but en_US.UTF-8 is also accepted.])
AC_MSG_WARN([C.UTF-8 locale not found, using C locale])
LOCALE_USED=C
fi
else
LOCALE_USED=C.UTF-8
AC_MSG_RESULT([C.UTF-8 (default)])
AC_MSG_WARN([locale command not not found, using C.UTF-8 locale])
AC_MSG_WARN([locale command not not found, using C locale])
LOCALE_USED=C
fi
export LC_ALL=$LOCALE_USED
@@ -415,21 +399,11 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
[ CONF_NAME=${with_conf_name} ])
# Test from where we are running configure, in or outside of src root.
if test "x$OPENJDK_BUILD_OS" = xwindows || test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
# These systems have case insensitive paths, so convert them to lower case.
[ cmp_configure_start_dir=`$ECHO $CONFIGURE_START_DIR | $TR '[:upper:]' '[:lower:]'` ]
[ cmp_topdir=`$ECHO $TOPDIR | $TR '[:upper:]' '[:lower:]'` ]
[ cmp_custom_root=`$ECHO $CUSTOM_ROOT | $TR '[:upper:]' '[:lower:]'` ]
else
cmp_configure_start_dir="$CONFIGURE_START_DIR"
cmp_topdir="$TOPDIR"
cmp_custom_root="$CUSTOM_ROOT"
fi
AC_MSG_CHECKING([where to store configuration])
if test "x$cmp_configure_start_dir" = "x$cmp_topdir" \
|| test "x$cmp_configure_start_dir" = "x$cmp_custom_root" \
|| test "x$cmp_configure_start_dir" = "x$cmp_topdir/make/autoconf" \
|| test "x$cmp_configure_start_dir" = "x$cmp_topdir/make" ; then
if test "x$CONFIGURE_START_DIR" = "x$TOPDIR" \
|| test "x$CONFIGURE_START_DIR" = "x$CUSTOM_ROOT" \
|| test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make/autoconf" \
|| test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make" ; then
# We are running configure from the src root.
# Create a default ./build/target-variant-debuglevel output root.
if test "x${CONF_NAME}" = x; then
@@ -450,12 +424,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
# If configuration is situated in normal build directory, just use the build
# directory name as configuration name, otherwise use the complete path.
if test "x${CONF_NAME}" = x; then
[ if [[ "$cmp_configure_start_dir" =~ ^${cmp_topdir}/build/[^/]+$ ||
"$cmp_configure_start_dir" =~ ^${cmp_custom_root}/build/[^/]+$ ]]; then ]
CONF_NAME="${CONFIGURE_START_DIR##*/}"
else
CONF_NAME="$CONFIGURE_START_DIR"
fi
CONF_NAME=`$ECHO $CONFIGURE_START_DIR | $SED -e "s!^${TOPDIR}/build/!!"`
fi
OUTPUTDIR="$CONFIGURE_START_DIR"
AC_MSG_RESULT([in current directory])

View File

@@ -468,15 +468,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PANDOC],
AC_MSG_CHECKING([if the pandoc smart extension needs to be disabled for markdown])
if $PANDOC --list-extensions | $GREP -q '+smart'; then
AC_MSG_RESULT([yes])
PANDOC_MARKDOWN_FLAG="$PANDOC_MARKDOWN_FLAG-smart"
else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([if the pandoc tex_math_dollars extension needs to be disabled for markdown])
if $PANDOC --list-extensions | $GREP -q '+tex_math_dollars'; then
AC_MSG_RESULT([yes])
PANDOC_MARKDOWN_FLAG="$PANDOC_MARKDOWN_FLAG-tex_math_dollars"
PANDOC_MARKDOWN_FLAG="markdown-smart"
else
AC_MSG_RESULT([no])
fi

View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2022, 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
@@ -159,7 +159,7 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
else
WINENV_PREFIX_ARG="$WINENV_PREFIX"
fi
FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\} -t $WINENV_TEMP_DIR -c $CMD"
FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\} -t $WINENV_TEMP_DIR -c $CMD -q"
FIXPATH_BASE="$BASH $FIXPATH_DIR/fixpath.sh $FIXPATH_ARGS"
FIXPATH="$FIXPATH_BASE exec"
@@ -215,7 +215,7 @@ AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
if test "x$OPENJDK_BUILD_OS" = xwindows; then
FIXPATH_CMDLINE=". $TOPDIR/make/scripts/fixpath.sh -e $PATHTOOL \
-p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\} -t $WINENV_TEMP_DIR \
-c $CMD"
-c $CMD -q"
$ECHO > $OUTPUTDIR/fixpath '#!/bin/bash'
$ECHO >> $OUTPUTDIR/fixpath export PATH='"[$]PATH:'$PATH'"'
$ECHO >> $OUTPUTDIR/fixpath $FIXPATH_CMDLINE '"[$]@"'

View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2024, 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
@@ -180,13 +180,11 @@ AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
# Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
AC_DEFUN([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK],
[
UTIL_LOOKUP_PROGS(JAVAC_CHECK, javac)
UTIL_GET_EXECUTABLE(JAVAC_CHECK) # Will setup JAVAC_CHECK_EXECUTABLE
UTIL_LOOKUP_PROGS(JAVA_CHECK, java)
UTIL_GET_EXECUTABLE(JAVA_CHECK) # Will setup JAVA_CHECK_EXECUTABLE
BINARY="$JAVAC_CHECK_EXECUTABLE"
if test "x$JAVAC_CHECK_EXECUTABLE" = x; then
BINARY="$JAVA_CHECK_EXECUTABLE"
UTIL_LOOKUP_PROGS(JAVAC_CHECK, javac, , NOFIXPATH)
UTIL_LOOKUP_PROGS(JAVA_CHECK, java, , NOFIXPATH)
BINARY="$JAVAC_CHECK"
if test "x$JAVAC_CHECK" = x; then
BINARY="$JAVA_CHECK"
fi
if test "x$BINARY" != x; then
# So there is a java(c) binary, it might be part of a JDK.

View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2024, 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
@@ -75,8 +75,7 @@ AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
FOUND_MEM=yes
elif test "x$OPENJDK_BUILD_OS" = xwindows; then
# Windows, but without cygwin
MEMORY_SIZE=`powershell -Command \
"(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" | $SED 's/\\r//g' `
MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
FOUND_MEM=yes
fi

View File

@@ -49,9 +49,7 @@ fi
export CONFIG_SHELL=$BASH
export _as_can_reexec=no
# Save user's current locale, but make sure all future shell commands are
# executed with the C locale
export USER_LOCALE=$LC_ALL
# Make sure all shell commands are executed with the C locale
export LC_ALL=C
if test "x$CUSTOM_CONFIG_DIR" != x; then

View File

@@ -573,20 +573,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -fvisibility=hidden -fstack-protector"
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -MP"
TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -Zc:wchar_t-"
# The -utf-8 option sets source and execution character sets to UTF-8 to enable correct
# compilation of all source files regardless of the active code page on Windows.
TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -utf-8 -MP"
TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -utf-8 -Zc:wchar_t-"
fi
# Set character encoding in source
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
CHARSET_CFLAGS="-finput-charset=utf-8"
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
# The -utf-8 option sets both source and execution character sets
CHARSET_CFLAGS="-utf-8 -validate-charset"
fi
TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $CHARSET_CFLAGS"
TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK $CHARSET_CFLAGS"
# CFLAGS C language level for JDK sources (hotspot only uses C++)
if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
LANGSTD_CFLAGS="-std=c11"
@@ -729,10 +721,11 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
$1_CFLAGS_CPU="-fsigned-char -Wno-psabi $ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS -DJDK_ARCH_ABI_PROP_NAME='\"\$(JDK_ARCH_ABI_PROP_NAME)\"'"
$1_CFLAGS_CPU_JVM="-DARM"
elif test "x$FLAGS_CPU_ARCH" = xppc; then
$1_CFLAGS_CPU_JVM="-mno-multiple -mno-string"
$1_CFLAGS_CPU_JVM="-minsert-sched-nops=regroup_exact -mno-multiple -mno-string"
if test "x$FLAGS_CPU" = xppc64; then
# -mminimal-toc fixes `relocation truncated to fit' error for gcc 4.1.
$1_CFLAGS_CPU="-mcpu=power8 -mtune=power8"
# Use ppc64 instructions, but schedule for power5
$1_CFLAGS_CPU="-mcpu=powerpc64 -mtune=power5"
$1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -mminimal-toc"
elif test "x$FLAGS_CPU" = xppc64le; then
# Little endian machine uses ELFv2 ABI.

View File

@@ -292,12 +292,12 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
$ECHO "* Debug level: $DEBUG_LEVEL"
$ECHO "* HS debug level: $HOTSPOT_DEBUG_LEVEL"
$ECHO "* JVM variants: $JVM_VARIANTS"
$PRINTF "* JVM features: "
$ECHO -n "* JVM features: "
for variant in $JVM_VARIANTS; do
features_var_name=JVM_FEATURES_$variant
JVM_FEATURES_FOR_VARIANT=${!features_var_name}
$PRINTF "%s: \'%s\' " "$variant" "$JVM_FEATURES_FOR_VARIANT"
$ECHO -n "$variant: '$JVM_FEATURES_FOR_VARIANT' "
done
$ECHO ""

View File

@@ -430,19 +430,10 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE],
JCOV_FILTERS="$with_jcov_filters"
fi
fi
UTIL_ARG_WITH(NAME: jcov-modules, TYPE: string,
DEFAULT: [], RESULT: JCOV_MODULES_COMMMA_SEPARATED,
DESC: [which modules to include in jcov (comma-separated)],
OPTIONAL: true)
# Replace "," with " ".
JCOV_MODULES=${JCOV_MODULES_COMMMA_SEPARATED//,/ }
AC_SUBST(JCOV_ENABLED)
AC_SUBST(JCOV_HOME)
AC_SUBST(JCOV_INPUT_JDK)
AC_SUBST(JCOV_FILTERS)
AC_SUBST(JCOV_MODULES)
])
################################################################################
@@ -554,21 +545,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
# Silence them for now.
UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment \
$ADDITIONAL_UBSAN_CHECKS"
UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-array-bounds -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
if test "x$TOOLCHAIN_TYPE" = "xgcc"; then
UBSAN_CFLAGS="$UBSAN_CFLAGS -Wno-format-overflow -Wno-stringop-overflow -Wno-stringop-truncation"
fi
UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -Wno-array-bounds -Wno-stringop-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
UBSAN_LDFLAGS="$UBSAN_CHECKS"
# On AIX, the llvm_symbolizer is not found out of the box, so we have to provide the
# full qualified llvm_symbolizer path in the __ubsan_default_options() function in
# make/data/ubsan/ubsan_default_options.c. To get it there we compile our sources
# with an additional define LLVM_SYMBOLIZER, which we set here.
# To calculate the correct llvm_symbolizer path we can use the location of the compiler, because
# their relation is fixed.
if test "x$TOOLCHAIN_TYPE" = "xclang" && test "x$OPENJDK_TARGET_OS" = "xaix"; then
UBSAN_CFLAGS="$UBSAN_CFLAGS -fno-sanitize=function,vptr -DLLVM_SYMBOLIZER=$(dirname $(dirname $CC))/tools/ibm-llvm-symbolizer"
UBSAN_LDFLAGS="$UBSAN_LDFLAGS -fno-sanitize=function,vptr -Wl,-bbigtoc"
fi
UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,
DESC: [enable UndefinedBehaviorSanitizer],
CHECK_AVAILABLE: [

View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2024, 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
@@ -454,7 +454,6 @@ JCOV_ENABLED := @JCOV_ENABLED@
JCOV_HOME := @JCOV_HOME@
JCOV_INPUT_JDK := @JCOV_INPUT_JDK@
JCOV_FILTERS := @JCOV_FILTERS@
JCOV_MODULES := @JCOV_MODULES@
# AddressSanitizer
ASAN_ENABLED := @ASAN_ENABLED@
@@ -874,12 +873,10 @@ SVE_CFLAGS := @SVE_CFLAGS@
JDK_IMAGE_SUBDIR := jdk
JRE_IMAGE_SUBDIR := jre
JCOV_IMAGE_SUBDIR := jdk-jcov
STATIC_JDK_IMAGE_SUBDIR := static-jdk
# Colon left out to be able to override output dir for bootcycle-images
JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
JRE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
STATIC_JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(STATIC_JDK_IMAGE_SUBDIR)
JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR)
# Test image, as above
@@ -959,7 +956,6 @@ DOCS_JAVASE_BUNDLE_NAME := javase-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
DOCS_REFERENCE_BUNDLE_NAME := jdk-reference-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
STATIC_LIBS_GRAAL_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs-graal$(DEBUG_PART).tar.gz
STATIC_JDK_BUNDLE_NAME := static-jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
@@ -970,7 +966,6 @@ TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
DOCS_JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JDK_BUNDLE_NAME)
DOCS_JAVASE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JAVASE_BUNDLE_NAME)
DOCS_REFERENCE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_REFERENCE_BUNDLE_NAME)
STATIC_JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(STATIC_JDK_BUNDLE_NAME)
JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
# This macro is called to allow inclusion of closed source counterparts.

View File

@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2024, 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
@@ -58,32 +58,21 @@ AC_DEFUN([UTIL_PREPEND_TO_PATH],
# 2) The path will be absolute, and it will be in unix-style (on
# cygwin).
# $1: The name of the variable to fix
# $2: if NOFAIL, if the path cannot be resolved then errors will not be
# reported and an empty path will be set
# $2: if NOFAIL, errors will be silently ignored
AC_DEFUN([UTIL_FIXUP_PATH],
[
# Only process if variable expands to non-empty
path="[$]$1"
if test "x$path" != x; then
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
imported_path=`$FIXPATH_BASE -q import "$path"`
if test $? -ne 0 || test ! -e $imported_path; then
if test "x$2" != "xNOFAIL"; then
AC_MSG_NOTICE([The path of $1, which is given as "$path", can not be properly resolved.])
AC_MSG_NOTICE([Please see the section "Special Considerations" in building.md.])
AC_MSG_NOTICE([This is the error message given by fixpath:])
# Rerun fixpath without -q to get an error message
$FIXPATH_BASE import "$path"
AC_MSG_ERROR([Cannot continue])
else
imported_path=""
fi
if test "x$2" = "xNOFAIL"; then
quiet_option="-q"
fi
$FIXPATH_BASE -q verify "$imported_path"
imported_path=`$FIXPATH_BASE $quiet_option import "$path"`
$FIXPATH_BASE verify "$imported_path"
if test $? -ne 0; then
if test "x$2" != "xNOFAIL"; then
AC_MSG_ERROR([The path of $1, which resolves as "$path", could not be verified.])
AC_MSG_ERROR([The path of $1, which resolves as "$path", could not be imported.])
else
imported_path=""
fi
@@ -94,7 +83,7 @@ AC_DEFUN([UTIL_FIXUP_PATH],
if test "x$imported_path_lower" != "x$orig_path_lower"; then
$1="$imported_path"
fi
else # non-Windows
else
[ if [[ "$path" =~ " " ]]; then ]
if test "x$2" != "xNOFAIL"; then
AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
@@ -197,6 +186,7 @@ AC_DEFUN([UTIL_CHECK_WINENV_EXEC_TYPE],
# it need to be in the PATH.
# $1: The name of the variable to fix
# $2: Where to look for the command (replaces $PATH)
# $3: set to NOFIXPATH to skip prefixing FIXPATH, even if needed on platform
AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
[
input="[$]$1"
@@ -243,19 +233,15 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
# This is a path with slashes, don't look at $PATH
if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
# fixpath.sh import will do all heavy lifting for us
new_path=`$FIXPATH_BASE -q import "$path"`
new_path=`$FIXPATH_BASE import "$path"`
if test $? -ne 0 || test ! -e $new_path; then
if test ! -e $new_path; then
# It failed, but maybe spaces were part of the path and not separating
# the command and argument. Retry using that assumption.
new_path=`$FIXPATH_BASE -q import "$input"`
if test $? -ne 0 || test ! -e $new_path; then
AC_MSG_NOTICE([The command for $1, which is given as "$input", can not be properly resolved.])
AC_MSG_NOTICE([Please see the section "Special Considerations" in building.md.])
AC_MSG_NOTICE([This is the error message given by fixpath:])
# Rerun fixpath without -q to get an error message
$FIXPATH_BASE import "$input"
AC_MSG_ERROR([Cannot continue])
new_path=`$FIXPATH_BASE import "$input"`
if test ! -e $new_path; then
AC_MSG_NOTICE([The command for $1, which resolves as "$input", can not be found.])
AC_MSG_ERROR([Cannot locate $input])
fi
# It worked, clear all "arguments"
arguments=""
@@ -296,6 +282,10 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
fi
fi
if test "x$3" = xNOFIXPATH; then
fixpath_prefix=""
fi
# Now join together the path and the arguments once again
new_complete="$fixpath_prefix$new_path$arguments"
$1="$new_complete"
@@ -363,15 +353,7 @@ AC_DEFUN([UTIL_SETUP_TOOL],
else
# Otherwise we believe it is a complete path. Use it as it is.
if test ! -x "$tool_command" && test ! -x "${tool_command}.exe"; then
# Maybe the path had spaces in it; try again with the entire argument
if test ! -x "$tool_override" && test ! -x "${tool_override}.exe"; then
AC_MSG_ERROR([User supplied tool $1="$tool_override" does not exist or is not executable])
else
# We successfully located the executable assuming the spaces were part of the path.
# We can't combine using paths with spaces and arguments, so assume tool_args is empty.
tool_command="$tool_override"
tool_args=""
fi
AC_MSG_ERROR([User supplied tool $1="$tool_command" does not exist or is not executable])
fi
if test ! -x "$tool_command"; then
tool_command="${tool_command}.exe"
@@ -397,6 +379,7 @@ AC_DEFUN([UTIL_SETUP_TOOL],
# $1: variable to set
# $2: executable name (or list of names) to look for
# $3: [path]
# $4: set to NOFIXPATH to skip prefixing FIXPATH, even if needed on platform
AC_DEFUN([UTIL_LOOKUP_PROGS],
[
UTIL_SETUP_TOOL($1, [
@@ -438,8 +421,10 @@ AC_DEFUN([UTIL_LOOKUP_PROGS],
# If we have FIXPATH enabled, strip all instances of it and prepend
# a single one, to avoid double fixpath prefixing.
[ if [[ $FIXPATH != "" && $result =~ ^"$FIXPATH " ]]; then ]
result="\$FIXPATH ${result#"$FIXPATH "}"
if test "x$4" != xNOFIXPATH; then
[ if [[ $FIXPATH != "" && $result =~ ^"$FIXPATH " ]]; then ]
result="\$FIXPATH ${result#"$FIXPATH "}"
fi
fi
AC_MSG_RESULT([$result])
break 2;
@@ -530,24 +515,6 @@ AC_DEFUN([UTIL_ADD_FIXPATH],
fi
])
################################################################################
# Return a path to the executable binary from a command line, stripping away
# any FIXPATH prefix or arguments. The resulting value can be checked for
# existence using "test -e". The result is returned in a variable named
# "$1_EXECUTABLE".
#
# $1: variable describing the command to get the binary for
AC_DEFUN([UTIL_GET_EXECUTABLE],
[
# Strip the FIXPATH prefix, if any
fixpath_stripped="[$]$1"
[ if [[ $FIXPATH != "" && $fixpath_stripped =~ ^"$FIXPATH " ]]; then ]
fixpath_stripped="${fixpath_stripped#"$FIXPATH "}"
fi
# Remove any arguments following the binary
$1_EXECUTABLE="${fixpath_stripped%% *}"
])
################################################################################
AC_DEFUN([UTIL_REMOVE_SYMBOLIC_LINKS],
[

View File

@@ -59,14 +59,14 @@ ifeq ($(GENERATE_FIND_TESTS_FILE), true)
$(call MakeTargetDir)
( $(foreach root, $(JTREG_TESTROOTS), \
$(ECHO) ""; \
$(PRINTF) "\n%s_JTREG_TEST_GROUPS := " "$(root)"; \
$(ECHO) -n "$(root)_JTREG_TEST_GROUPS := "; \
$(SED) -n -e 's/^\#.*//g' -e 's/\([^ ]*\)\w*=.*/\1/gp' \
$($(root)_JTREG_GROUP_FILES) \
| $(SORT) -u | $(TR) '\n' ' ' ; \
) \
) > $@
$(ECHO) "" >> $@
$(PRINTF) "MAKE_TEST_TARGETS := " >> $@
$(ECHO) -n "MAKE_TEST_TARGETS := " >> $@
$(MAKE) -s --no-print-directory $(MAKE_ARGS) \
SPEC=$(SPEC) -f $(TOPDIR)/test/make/TestMake.gmk print-targets \
TARGETS_FILE=$@

View File

@@ -80,13 +80,15 @@ endef
#
# The sed expression does this:
# 1. Add a backslash before any :, = or ! that do not have a backslash already.
# 2. Delete all lines starting with #.
# 3. Delete empty lines.
# 4. Append lines ending with \ with the next line.
# 5. Remove leading and trailing white space. Note that tabs must be explicit
# 2. Apply the file unicode2x.sed which does a whole bunch of \u00XX to \xXX
# conversions.
# 3. Delete all lines starting with #.
# 4. Delete empty lines.
# 5. Append lines ending with \ with the next line.
# 6. Remove leading and trailing white space. Note that tabs must be explicit
# as sed on macosx does not understand '\t'.
# 6. Replace the first \= with just =.
# 7. Finally it's all sorted to create a stable output.
# 7. Replace the first \= with just =.
# 8. Finally it's all sorted to create a stable output.
#
# It is assumed that = is the character used for separating names and values.
define add_file_to_clean
@@ -106,6 +108,7 @@ define add_file_to_clean
( $(CAT) $$< && $(ECHO) "" ) \
| $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
-e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ ]*#.*/#/g' \
| $(SED) -f "$$(TOPDIR)/make/common/support/unicode2x.sed" \
| $(SED) -e '/^#/d' -e '/^$$$$/d' \
-e :a -e '/\\$$$$/N; s/\\\n//; ta' \
-e 's/^[ ]*//;s/[ ]*$$$$//' \
@@ -152,7 +155,6 @@ endef
# INCLUDE_FILES "com/sun/SolarisFoobar.java" means only compile this file!
# EXCLUDE_FILES "com/sun/SolarisFoobar.java" means do not compile this particular file!
# "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
# EXCLUDE_PATTERNS Exclude files matching any of these substrings
# EXTRA_FILES List of extra source files to include in compilation. Can be used to
# specify files that need to be generated by other rules first.
# HEADERS path to directory where all generated c-headers are written.
@@ -264,12 +266,10 @@ define SetupJavaCompilationBody
endif
# Tell javac to do exactly as told and no more
PARANOIA_FLAGS := -implicit:none -Xprefer:source -XDignore.symbol.file=true
PARANOIA_FLAGS := -implicit:none -Xprefer:source -XDignore.symbol.file=true -encoding ascii
$1_FLAGS += -g -Xlint:all $$($1_TARGET_RELEASE) $$(PARANOIA_FLAGS)
$1_FLAGS += $$($1_JAVAC_FLAGS)
# Set character encoding in source
$1_FLAGS += -encoding utf-8
ifeq ($$(JAVA_WARNINGS_AS_ERRORS), true)
$1_FLAGS += -Werror
@@ -343,20 +343,6 @@ define SetupJavaCompilationBody
$1_INCLUDE_PATTERN += $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$(addsuffix /%, $$($1_INCLUDES))))
endif
ifneq ($$($1_EXCLUDE_PATTERNS), )
# We must not match the exclude pattern against the src roots, so first
# strip the src prefixes from the absolute file paths in SRCS.
$1_SRCS_WITHOUT_ROOTS := $$(foreach i, $$($1_SRC), \
$$(patsubst $$i/%,%, $$(filter $$i/%, $$($1_SRCS))))
$1_EXCLUDE_PATTERNS_WITHOUT_ROOTS := $$(call containing, \
$$($1_EXCLUDE_PATTERNS), $$($1_SRCS_WITHOUT_ROOTS))
# The add back all possible src prefixes; this will generate more paths
# than really exists, but it does not matter since we will use this as
# input to filter-out.
$1_EXCLUDE_PATTERN += $$(foreach i, $$($1_SRC), $$(addprefix $$i/, \
$$($1_EXCLUDE_PATTERNS_WITHOUT_ROOTS)))
endif
# Apply include/exclude patterns to java sources
ifneq ($$($1_EXCLUDE_PATTERN), )
$1_SRCS := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_SRCS))

View File

@@ -227,8 +227,6 @@ endef
GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
# \xA9 is the copyright symbol in ANSI encoding (Windows-1252), which rc.exe
# assumes the resource file is in.
JDK_RCFLAGS=$(RCFLAGS) \
-D"JDK_VERSION_STRING=$(VERSION_STRING)" \
-D"JDK_COMPANY=$(JDK_RC_COMPANY_NAME)" \

View File

@@ -47,7 +47,7 @@ endif
# We need spec.gmk to get $(TOPDIR)
include $(SPEC)
THIS_MAKEFILE := $(patsubst make/%,%,$(patsubst $(TOPDIR_ALT)/make/%,%,$(patsubst $(TOPDIR)/%,%,$(THIS_MAKEFILE_PATH))))
THIS_MAKEFILE := $(patsubst make/%,%,$(patsubst $(TOPDIR)/%,%,$(THIS_MAKEFILE_PATH)))
ifeq ($(LOG_FLOW), true)
$(info :Enter $(THIS_MAKEFILE))

View File

@@ -29,7 +29,7 @@
# Get the next to last word (by prepending a padding element)
THIS_INCLUDE_PATH := $(word $(words ${MAKEFILE_LIST}),padding ${MAKEFILE_LIST})
THIS_INCLUDE := $(patsubst $(TOPDIR_ALT)/make/%,%,$(patsubst $(TOPDIR)/make/%,%,$(THIS_INCLUDE_PATH)))
THIS_INCLUDE := $(patsubst $(TOPDIR)/make/%,%,$(THIS_INCLUDE_PATH))
# Print an indented message, also counting the top-level makefile as a level
ifneq ($(INCLUDE_GUARD_$(THIS_INCLUDE)), true)

View File

@@ -180,7 +180,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
$(call MakeTargetDir)
$(RM) $@
$(foreach m, $(MODULE_INFOS), \
( $(PRINTF) "DEPS_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
( $(ECHO) -n "DEPS_$(call GetModuleNameFromModuleInfo, $m) := " && \
$(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
BEGIN { if (MODULE != "java.base") printf(" java.base"); } \
/^ *requires/ { sub(/;/, ""); \
@@ -194,7 +194,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
gsub(/\r/, ""); \
printf(" %s", $$0) } \
END { printf("\n") }' $m && \
$(PRINTF) "TRANSITIVE_MODULES_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
$(ECHO) -n "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) := " && \
$(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
BEGIN { if (MODULE != "java.base") printf(" java.base"); } \
/^ *requires *transitive/ { \

View File

@@ -128,9 +128,10 @@ define SetupSourceFiles
# Extract the C/C++ files.
ifneq ($$($1_EXCLUDE_PATTERNS), )
# We must not match the exclude pattern against the src root(s).
$1_SRCS_WITHOUT_ROOTS := $$(foreach i, $$($1_SRC), \
$$(patsubst $$i/%,%, $$(filter $$i/%, $$($1_SRCS))))
$1_ALL_EXCLUDE_FILES := $$(call containing, $$($1_EXCLUDE_PATTERNS), \
$1_SRCS_WITHOUT_ROOTS := $$($1_SRCS)
$$(foreach i, $$($1_SRC), $$(eval $1_SRCS_WITHOUT_ROOTS := $$(patsubst \
$$i/%,%, $$($1_SRCS_WITHOUT_ROOTS))))
$1_ALL_EXCLUDE_FILES := $$(call containing, $$($1_EXCLUDE_PATTERNS), \
$$($1_SRCS_WITHOUT_ROOTS))
endif
ifneq ($$($1_EXCLUDE_FILES), )

View File

@@ -0,0 +1,100 @@
s/\\u0020/\x20/g
s/\\u003A/\x3A/g
s/\\u006B/\x6B/g
s/\\u0075/\x75/g
s/\\u00A0/\xA0/g
s/\\u00A3/\xA3/g
s/\\u00B0/\xB0/g
s/\\u00B7/\xB7/g
s/\\u00BA/\xBA/g
s/\\u00BF/\xBF/g
s/\\u00C0/\xC0/g
s/\\u00C1/\xC1/g
s/\\u00C2/\xC2/g
s/\\u00C4/\xC4/g
s/\\u00C5/\xC5/g
s/\\u00C8/\xC8/g
s/\\u00C9/\xC9/g
s/\\u00CA/\xCA/g
s/\\u00CD/\xCD/g
s/\\u00CE/\xCE/g
s/\\u00D3/\xD3/g
s/\\u00D4/\xD4/g
s/\\u00D6/\xD6/g
s/\\u00DA/\xDA/g
s/\\u00DC/\xDC/g
s/\\u00DD/\xDD/g
s/\\u00DF/\xDF/g
s/\\u00E0/\xE0/g
s/\\u00E1/\xE1/g
s/\\u00E2/\xE2/g
s/\\u00E3/\xE3/g
s/\\u00E4/\xE4/g
s/\\u00E5/\xE5/g
s/\\u00E6/\xE6/g
s/\\u00E7/\xE7/g
s/\\u00E8/\xE8/g
s/\\u00E9/\xE9/g
s/\\u00EA/\xEA/g
s/\\u00EB/\xEB/g
s/\\u00EC/\xEC/g
s/\\u00ED/\xED/g
s/\\u00EE/\xEE/g
s/\\u00EF/\xEF/g
s/\\u00F1/\xF1/g
s/\\u00F2/\xF2/g
s/\\u00F3/\xF3/g
s/\\u00F4/\xF4/g
s/\\u00F5/\xF5/g
s/\\u00F6/\xF6/g
s/\\u00F9/\xF9/g
s/\\u00FA/\xFA/g
s/\\u00FC/\xFC/g
s/\\u0020/\x20/g
s/\\u003f/\x3f/g
s/\\u006f/\x6f/g
s/\\u0075/\x75/g
s/\\u00a0/\xa0/g
s/\\u00a3/\xa3/g
s/\\u00b0/\xb0/g
s/\\u00ba/\xba/g
s/\\u00bf/\xbf/g
s/\\u00c1/\xc1/g
s/\\u00c4/\xc4/g
s/\\u00c5/\xc5/g
s/\\u00c8/\xc8/g
s/\\u00c9/\xc9/g
s/\\u00ca/\xca/g
s/\\u00cd/\xcd/g
s/\\u00d6/\xd6/g
s/\\u00dc/\xdc/g
s/\\u00dd/\xdd/g
s/\\u00df/\xdf/g
s/\\u00e0/\xe0/g
s/\\u00e1/\xe1/g
s/\\u00e2/\xe2/g
s/\\u00e3/\xe3/g
s/\\u00e4/\xe4/g
s/\\u00e5/\xe5/g
s/\\u00e7/\xe7/g
s/\\u00e8/\xe8/g
s/\\u00e9/\xe9/g
s/\\u00ea/\xea/g
s/\\u00eb/\xeb/g
s/\\u00ec/\xec/g
s/\\u00ed/\xed/g
s/\\u00ee/\xee/g
s/\\u00ef/\xef/g
s/\\u00f0/\xf0/g
s/\\u00f1/\xf1/g
s/\\u00f2/\xf2/g
s/\\u00f3/\xf3/g
s/\\u00f4/\xf4/g
s/\\u00f5/\xf5/g
s/\\u00f6/\xf6/g
s/\\u00f7/\xf7/g
s/\\u00f8/\xf8/g
s/\\u00f9/\xf9/g
s/\\u00fa/\xfa/g
s/\\u00fc/\xfc/g
s/\\u00ff/\xff/g

View File

@@ -241,10 +241,10 @@ var getJibProfilesCommon = function (input, data) {
// List of the main profile names used for iteration
common.main_profile_names = [
"macosx-x64", "macosx-aarch64",
"linux-x64", "linux-x86", "macosx-x64", "macosx-aarch64",
"windows-x64", "windows-aarch64",
"linux-x64", "linux-aarch64",
"linux-arm32", "linux-ppc64le", "linux-s390x", "linux-riscv64"
"linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x",
"linux-riscv64"
];
// These are the base settings for all the main build profiles.
@@ -254,6 +254,7 @@ var getJibProfilesCommon = function (input, data) {
configure_args: concat(
"--with-exclude-translations=es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
"--disable-jvm-feature-shenandoahgc",
"--disable-cds-archive-coh",
versionArgs(input, common))
};
@@ -282,6 +283,9 @@ var getJibProfilesCommon = function (input, data) {
labels: "open"
};
common.configure_args_64bit = ["--with-target-bits=64"];
common.configure_args_32bit = ["--with-target-bits=32"];
/**
* Define common artifacts template for all main profiles
* @param o - Object containing data for artifacts
@@ -408,34 +412,58 @@ var getJibProfilesProfiles = function (input, common, data) {
// Main SE profiles
var profiles = {
"linux-x64": {
target_os: "linux",
target_cpu: "x64",
dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
configure_args: concat(
(input.build_cpu == "x64" ? common.configure_args_64bit
: "--openjdk-target=x86_64-linux-gnu"),
"--with-zlib=system", "--disable-dtrace",
(isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
"--build=x86_64-unknown-linux-gnu" ] : [])),
},
"linux-x86": {
target_os: "linux",
target_cpu: "x86",
build_cpu: "x64",
dependencies: ["devkit", "gtest", "libffi"],
configure_args: concat(common.configure_args_32bit, [
"--with-jvm-variants=minimal,server",
"--with-zlib=system",
"--with-libffi=" + input.get("libffi", "home_path"),
"--enable-libffi-bundling",
"--enable-fallback-linker"
])
},
"macosx-x64": {
target_os: "macosx",
target_cpu: "x64",
dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"],
configure_args: [
"--with-zlib=system",
configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
"--with-macosx-version-max=11.00.00",
"--enable-compatible-cds-alignment",
// Use system SetFile instead of the one in the devkit as the
// devkit one may not work on Catalina.
"SETFILE=/usr/bin/SetFile"
],
"SETFILE=/usr/bin/SetFile"),
},
"macosx-aarch64": {
target_os: "macosx",
target_cpu: "aarch64",
dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"],
configure_args: [
"--with-macosx-version-max=11.00.00"
],
configure_args: concat(common.configure_args_64bit,
"--with-macosx-version-max=11.00.00"),
},
"windows-x64": {
target_os: "windows",
target_cpu: "x64",
dependencies: ["devkit", "gtest", "pandoc"],
configure_args: [],
configure_args: concat(common.configure_args_64bit),
},
"windows-aarch64": {
@@ -447,19 +475,7 @@ var getJibProfilesProfiles = function (input, common, data) {
],
},
"linux-x64": {
target_os: "linux",
target_cpu: "x64",
dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
configure_args: concat(
"--with-zlib=system",
"--disable-dtrace",
(cross_compiling ? [ "--openjdk-target=x86_64-linux-gnu" ] : []),
(isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
"--build=x86_64-unknown-linux-gnu" ] : [])),
},
"linux-aarch64": {
"linux-aarch64": {
target_os: "linux",
target_cpu: "aarch64",
dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
@@ -476,10 +492,8 @@ var getJibProfilesProfiles = function (input, common, data) {
build_cpu: "x64",
dependencies: ["devkit", "gtest", "build_devkit"],
configure_args: [
"--openjdk-target=arm-linux-gnueabihf",
"--with-freetype=bundled",
"--with-abi-profile=arm-vfp-hflt",
"--disable-warnings-as-errors"
"--openjdk-target=arm-linux-gnueabihf", "--with-freetype=bundled",
"--with-abi-profile=arm-vfp-hflt", "--disable-warnings-as-errors"
],
},
@@ -489,8 +503,7 @@ var getJibProfilesProfiles = function (input, common, data) {
build_cpu: "x64",
dependencies: ["devkit", "gtest", "build_devkit"],
configure_args: [
"--openjdk-target=ppc64le-linux-gnu",
"--with-freetype=bundled",
"--openjdk-target=ppc64le-linux-gnu", "--with-freetype=bundled",
"--disable-warnings-as-errors"
],
},
@@ -501,8 +514,7 @@ var getJibProfilesProfiles = function (input, common, data) {
build_cpu: "x64",
dependencies: ["devkit", "gtest", "build_devkit"],
configure_args: [
"--openjdk-target=s390x-linux-gnu",
"--with-freetype=bundled",
"--openjdk-target=s390x-linux-gnu", "--with-freetype=bundled",
"--disable-warnings-as-errors"
],
},
@@ -513,8 +525,7 @@ var getJibProfilesProfiles = function (input, common, data) {
build_cpu: "x64",
dependencies: ["devkit", "gtest", "build_devkit"],
configure_args: [
"--openjdk-target=riscv64-linux-gnu",
"--with-freetype=bundled",
"--openjdk-target=riscv64-linux-gnu", "--with-freetype=bundled",
"--disable-warnings-as-errors"
],
},
@@ -575,24 +586,24 @@ var getJibProfilesProfiles = function (input, common, data) {
target_os: "linux",
target_cpu: "x64",
dependencies: ["devkit", "gtest", "libffi"],
configure_args: [
configure_args: concat(common.configure_args_64bit, [
"--with-zlib=system",
"--with-jvm-variants=zero",
"--with-libffi=" + input.get("libffi", "home_path"),
"--enable-libffi-bundling",
]
])
},
"linux-aarch64-zero": {
target_os: "linux",
target_cpu: "aarch64",
dependencies: ["devkit", "gtest", "libffi"],
configure_args: [
configure_args: concat(common.configure_args_64bit, [
"--with-zlib=system",
"--with-jvm-variants=zero",
"--with-libffi=" + input.get("libffi", "home_path"),
"--enable-libffi-bundling"
]
])
},
"linux-x86-zero": {
@@ -600,13 +611,12 @@ var getJibProfilesProfiles = function (input, common, data) {
target_cpu: "x86",
build_cpu: "x64",
dependencies: ["devkit", "gtest", "libffi"],
configure_args: [
"--with-target-bits=32",
configure_args: concat(common.configure_args_32bit, [
"--with-zlib=system",
"--with-jvm-variants=zero",
"--with-libffi=" + input.get("libffi", "home_path"),
"--enable-libffi-bundling"
]
])
}
}
profiles = concatObjects(profiles, zeroProfiles);
@@ -625,10 +635,8 @@ var getJibProfilesProfiles = function (input, common, data) {
target_os: "linux",
target_cpu: "x64",
dependencies: ["devkit", "gtest"],
configure_args: [
"--with-zlib=system",
"--disable-precompiled-headers"
],
configure_args: concat(common.configure_args_64bit,
"--with-zlib=system", "--disable-precompiled-headers"),
},
};
profiles = concatObjects(profiles, noPchProfiles);
@@ -685,6 +693,9 @@ var getJibProfilesProfiles = function (input, common, data) {
"linux-x64": {
platform: "linux-x64",
},
"linux-x86": {
platform: "linux-x86",
},
"macosx-x64": {
platform: "macos-x64",
jdk_subdir: "jdk-" + data.version + ".jdk/Contents/Home",
@@ -861,8 +872,7 @@ var getJibProfilesProfiles = function (input, common, data) {
profiles[cmpBaselineName].configure_args = concat(
profiles[cmpBaselineName].configure_args,
"--with-hotspot-build-time=n/a",
"--disable-precompiled-headers",
"--with-source-date=version");
"--disable-precompiled-headers");
// Do not inherit artifact definitions from base profile
delete profiles[cmpBaselineName].artifacts;
});
@@ -1078,14 +1088,14 @@ var getJibProfilesProfiles = function (input, common, data) {
var getJibProfilesDependencies = function (input, common) {
var devkit_platform_revisions = {
linux_x64: "gcc14.2.0-OL6.4+1.0",
macosx: "Xcode15.4+1.0",
windows_x64: "VS2022-17.13.2+1.0",
linux_aarch64: "gcc14.2.0-OL7.6+1.0",
linux_x64: "gcc13.2.0-OL6.4+1.0",
macosx: "Xcode14.3.1+1.0",
windows_x64: "VS2022-17.6.5+1.0",
linux_aarch64: "gcc13.2.0-OL7.6+1.0",
linux_arm: "gcc8.2.0-Fedora27+1.0",
linux_ppc64le: "gcc14.2.0-Fedora_41+1.0",
linux_s390x: "gcc14.2.0-Fedora_41+1.0",
linux_riscv64: "gcc14.2.0-Fedora_41+1.0"
linux_ppc64le: "gcc13.2.0-Fedora_41+1.0",
linux_s390x: "gcc13.2.0-Fedora_41+1.0",
linux_riscv64: "gcc13.2.0-Fedora_41+1.0"
};
var devkit_platform = (input.target_cpu == "x86"
@@ -1151,7 +1161,10 @@ var getJibProfilesDependencies = function (input, common) {
organization: common.organization,
ext: "tar.gz",
module: "devkit-" + devkit_cross_prefix + devkit_platform,
revision: devkit_platform_revisions[devkit_platform]
revision: devkit_platform_revisions[devkit_platform],
environment: {
"DEVKIT_HOME": input.get("devkit", "home_path"),
}
},
build_devkit: {

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2023, 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
@@ -43,18 +43,6 @@
#define ATTRIBUTE_USED
#endif
// On AIX, the llvm_symbolizer is not found out of the box, so we have to provide the
// full qualified llvm_symbolizer path in the __ubsan_default_options() function.
// To get it here we compile our sources with an additional define LLVM_SYMBOLIZER
// containing the path, which we set in make/autoconf/jdk-options.m4.
#ifdef LLVM_SYMBOLIZER
#define _LLVM_SYMBOLIZER(X) ",external_symbolizer_path=" X_LLVM_SYMBOLIZER(X)
#define X_LLVM_SYMBOLIZER(X) #X
#else
#define LLVM_SYMBOLIZER
#define _LLVM_SYMBOLIZER(X)
#endif
// Override weak symbol exposed by UBSan to override default options. This is called by UBSan
// extremely early during library loading, before main is called. We need to override the default
// options because by default UBSan only prints a warning for each occurrence. We want jtreg tests
@@ -62,5 +50,5 @@
// thread so it is easier to track down. You can override these options by setting the environment
// variable UBSAN_OPTIONS.
ATTRIBUTE_DEFAULT_VISIBILITY ATTRIBUTE_USED const char* __ubsan_default_options() {
return "halt_on_error=1,print_stacktrace=1" _LLVM_SYMBOLIZER(LLVM_SYMBOLIZER);
return "halt_on_error=1,print_stacktrace=1";
}

View File

@@ -39,8 +39,6 @@
# Fix this...
#
uppercase = $(shell echo $1 | tr a-z A-Z)
$(info TARGET=$(TARGET))
$(info HOST=$(HOST))
$(info BUILD=$(BUILD))
@@ -93,28 +91,89 @@ endif
################################################################################
# Define external dependencies
gcc_ver_only := 14.2.0
binutils_ver_only := 2.43
ccache_ver_only := 4.10.2
CCACHE_CMAKE_BASED := 1
mpfr_ver_only := 4.2.1
gmp_ver_only := 6.3.0
mpc_ver_only := 1.3.1
gdb_ver_only := 15.2
# Latest that could be made to work.
GCC_VER := 13.2.0
ifeq ($(GCC_VER), 13.2.0)
gcc_ver := gcc-13.2.0
binutils_ver := binutils-2.41
ccache_ver := ccache-3.7.12
mpfr_ver := mpfr-4.2.0
gmp_ver := gmp-6.3.0
mpc_ver := mpc-1.3.1
gdb_ver := gdb-13.2
REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
else ifeq ($(GCC_VER), 11.3.0)
gcc_ver := gcc-11.3.0
binutils_ver := binutils-2.39
ccache_ver := ccache-3.7.12
mpfr_ver := mpfr-4.1.1
gmp_ver := gmp-6.2.1
mpc_ver := mpc-1.2.1
gdb_ver := gdb-11.2
REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
else ifeq ($(GCC_VER), 11.2.0)
gcc_ver := gcc-11.2.0
binutils_ver := binutils-2.37
ccache_ver := ccache-3.7.12
mpfr_ver := mpfr-4.1.0
gmp_ver := gmp-6.2.1
mpc_ver := mpc-1.2.1
gdb_ver := gdb-11.1
REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
else ifeq ($(GCC_VER), 10.3.0)
gcc_ver := gcc-10.3.0
binutils_ver := binutils-2.36.1
ccache_ver := ccache-3.7.11
mpfr_ver := mpfr-4.1.0
gmp_ver := gmp-6.2.0
mpc_ver := mpc-1.1.0
gdb_ver := gdb-10.1
REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
else ifeq ($(GCC_VER), 10.2.0)
gcc_ver := gcc-10.2.0
binutils_ver := binutils-2.35
ccache_ver := ccache-3.7.11
mpfr_ver := mpfr-4.1.0
gmp_ver := gmp-6.2.0
mpc_ver := mpc-1.1.0
gdb_ver := gdb-9.2
REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
else ifeq ($(GCC_VER), 9.2.0)
gcc_ver := gcc-9.2.0
binutils_ver := binutils-2.34
ccache_ver := ccache-3.7.3
mpfr_ver := mpfr-3.1.5
gmp_ver := gmp-6.1.2
mpc_ver := mpc-1.0.3
gdb_ver := gdb-8.3
else ifeq ($(GCC_VER), 8.3.0)
gcc_ver := gcc-8.3.0
binutils_ver := binutils-2.32
ccache_ver := ccache-3.7.3
mpfr_ver := mpfr-3.1.5
gmp_ver := gmp-6.1.2
mpc_ver := mpc-1.0.3
gdb_ver := gdb-8.3
else ifeq ($(GCC_VER), 7.3.0)
gcc_ver := gcc-7.3.0
binutils_ver := binutils-2.30
ccache_ver := ccache-3.3.6
mpfr_ver := mpfr-3.1.5
gmp_ver := gmp-6.1.2
mpc_ver := mpc-1.0.3
gdb_ver := gdb-8.1
else ifeq ($(GCC_VER), 4.9.2)
gcc_ver := gcc-4.9.2
binutils_ver := binutils-2.25
ccache_ver := ccache-3.2.1
mpfr_ver := mpfr-3.0.1
gmp_ver := gmp-4.3.2
mpc_ver := mpc-1.0.1
gdb_ver := gdb-7.12.1
else
$(error Unsupported GCC version)
endif
dependencies := gcc binutils ccache mpfr gmp mpc gdb
$(foreach dep,$(dependencies),$(eval $(dep)_ver := $(dep)-$($(dep)_ver_only)))
GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.xz
BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.gz
CCACHE := https://github.com/ccache/ccache/releases/download/v$(ccache_ver_only)/$(ccache_ver).tar.xz
MPFR := https://www.mpfr.org/$(mpfr_ver)/$(mpfr_ver).tar.bz2
GMP := http://ftp.gnu.org/pub/gnu/gmp/$(gmp_ver).tar.bz2
MPC := http://ftp.gnu.org/pub/gnu/mpc/$(mpc_ver).tar.gz
GDB := http://ftp.gnu.org/gnu/gdb/$(gdb_ver).tar.xz
REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
ifneq ($(REQUIRED_MIN_MAKE_MAJOR_VERSION),)
MAKE_MAJOR_VERSION := $(word 1,$(subst ., ,$(MAKE_VERSION)))
SUPPORTED_MAKE_VERSION := $(shell [ $(MAKE_MAJOR_VERSION) -ge $(REQUIRED_MIN_MAKE_MAJOR_VERSION) ] && echo true)
@@ -123,6 +182,17 @@ ifneq ($(REQUIRED_MIN_MAKE_MAJOR_VERSION),)
endif
endif
ccache_ver_only := $(patsubst ccache-%,%,$(ccache_ver))
GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.xz
BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.gz
CCACHE := https://github.com/ccache/ccache/releases/download/v$(ccache_ver_only)/$(ccache_ver).tar.xz
MPFR := https://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
MPC := http://ftp.gnu.org/pub/gnu/mpc/${mpc_ver}.tar.gz
GDB := http://ftp.gnu.org/gnu/gdb/${gdb_ver}.tar.xz
# RPMs used by all BASE_OS
RPM_LIST := \
$(KERNEL_HEADERS_RPM) \
@@ -192,18 +262,10 @@ define Download
# Allow override
$(1)_DIRNAME ?= $(basename $(basename $(notdir $($(1)))))
$(1)_DIR = $(abspath $(SRCDIR)/$$($(1)_DIRNAME))
ifeq ($$($(1)_CMAKE_BASED),)
$(1)_CFG = $$($(1)_DIR)/configure
$(1)_SRC_MARKER = $$($(1)_DIR)/configure
$(1)_CONFIG = $(CONFIG)
else
$(1)_CFG = cmake
$(1)_SRC_MARKER = $$($(1)_DIR)/CMakeLists.txt
$(1)_CONFIG = $$(CMAKE_CONFIG) $$($(1)_DIR)
endif
$(1)_CFG = $$($(1)_DIR)/configure
$(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)))
$$($(1)_SRC_MARKER) : $$($(1)_FILE)
$$($(1)_CFG) : $$($(1)_FILE)
mkdir -p $$(SRCDIR)
tar -C $$(SRCDIR) -xf $$<
$$(foreach p,$$(abspath $$(wildcard patches/$$(ARCH)-$$(notdir $$($(1)_DIR)).patch)), \
@@ -217,7 +279,7 @@ define Download
endef
# Download and unpack all source packages
$(foreach dep,$(dependencies),$(eval $(call Download,$(call uppercase,$(dep)))))
$(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC GDB,$(eval $(call Download,$(p))))
################################################################################
# Unpack RPMS
@@ -294,7 +356,7 @@ endif
################################################################################
# Define marker files for each source package to be compiled
$(foreach dep,$(dependencies),$(eval $(dep) = $(TARGETDIR)/$($(dep)_ver).done))
$(foreach t,binutils mpfr gmp mpc gcc ccache gdb,$(eval $(t) = $(TARGETDIR)/$($(t)_ver).done))
################################################################################
@@ -303,8 +365,6 @@ CONFIG = --target=$(TARGET) \
--host=$(HOST) --build=$(BUILD) \
--prefix=$(PREFIX)
CMAKE_CONFIG = -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(PREFIX)
PATHEXT = $(PREFIX)/bin:
PATHPRE = PATH=$(PATHEXT)$(PATH)
@@ -516,8 +576,6 @@ ifeq ($(HOST), $(TARGET))
$(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" $(GDB_CFG) \
$(CONFIG) \
--with-sysroot=$(SYSROOT) \
--with-mpfr=$(PREFIX) \
--with-gmp=$(PREFIX) \
) > $(@D)/log.config 2>&1
@echo 'done'
@@ -533,13 +591,13 @@ endif
################################################################################
# very straightforward. just build a ccache. it is only for host.
$(BUILDDIR)/$(ccache_ver)/Makefile \
: $(CCACHE_SRC_MARKER)
: $(CCACHE_CFG)
$(info Configuring $@. Log in $(@D)/log.config)
@mkdir -p $(@D)
@( \
cd $(@D) ; \
$(PATHPRE) $(ENVS) $(CCACHE_CFG) \
$(CCACHE_CONFIG) \
$(CONFIG) \
) > $(@D)/log.config 2>&1
@echo 'done'
@@ -641,18 +699,10 @@ ifeq ($(TARGET), $(HOST))
ln -s $(TARGET)-$* $@
missing-links := $(addprefix $(PREFIX)/bin/, \
addr2line ar as c++ c++filt dwp elfedit g++ gcc gcc-$(gcc_ver_only) gprof ld ld.bfd \
addr2line ar as c++ c++filt dwp elfedit g++ gcc gcc-$(GCC_VER) gprof ld ld.bfd \
ld.gold nm objcopy objdump ranlib readelf size strings strip)
endif
# Add link to work around "plugin needed to handle lto object" (JDK-8344272)
$(PREFIX)/lib/bfd-plugins/liblto_plugin.so: $(PREFIX)/libexec/gcc/$(TARGET)/$(gcc_ver_only)/liblto_plugin.so
@echo 'Creating missing $(@F) soft link'
@mkdir -p $(@D)
ln -s $$(realpath -s --relative-to=$(@D) $<) $@
missing-links += $(PREFIX)/lib/bfd-plugins/liblto_plugin.so
################################################################################
bfdlib : $(bfdlib)

View File

@@ -1,6 +1,6 @@
#!/bin/bash -e
#
# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2018, 2024, 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
@@ -24,21 +24,10 @@
# questions.
#
# Create a bundle in OpenJDK build folder, containing what's needed to run
# Create a bundle in the current directory, containing what's needed to run
# the 'autoconf' program by the OpenJDK build. To override TARGET_PLATFORM
# just set the variable before running this script.
# This script fetches sources from network so make sure your proxy is setup appropriately.
# colored print to highlight some of the logs
function print_log()
{
Color_Cyan='\033[1;36m' # Cyan
Color_Off='\033[0m' # Reset color
printf "${Color_Cyan}> $1${Color_Off}\n"
}
# Autoconf depends on m4, so download and build that first.
AUTOCONF_VERSION=2.69
M4_VERSION=1.4.18
@@ -69,12 +58,11 @@ MODULE_NAME=autoconf-$TARGET_PLATFORM-$AUTOCONF_VERSION+$PACKAGE_VERSION
BUNDLE_NAME=$MODULE_NAME.tar.gz
SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
BASEDIR="$(cd "$SCRIPT_DIR/../.." > /dev/null && pwd)"
OUTPUT_ROOT="$BASEDIR/build/autoconf"
OUTPUT_ROOT="${SCRIPT_DIR}/../../build/autoconf"
cd $OUTPUT_ROOT
IMAGE_DIR=$OUTPUT_ROOT/$MODULE_NAME
mkdir -p $IMAGE_DIR/usr
cd $OUTPUT_ROOT
# Download and build m4
@@ -88,7 +76,7 @@ elif test "x$TARGET_PLATFORM" = xcygwin_x86; then
cp /usr/bin/m4 $IMAGE_DIR/usr/bin
elif test "x$TARGET_PLATFORM" = xlinux_x64; then
M4_VERSION=1.4.13-5
wget https://yum.oracle.com/repo/OracleLinux/OL6/latest/x86_64/getPackage/m4-$M4_VERSION.el6.x86_64.rpm
wget http://yum.oracle.com/repo/OracleLinux/OL6/latest/x86_64/getPackage/m4-$M4_VERSION.el6.x86_64.rpm
cd $IMAGE_DIR
rpm2cpio $OUTPUT_ROOT/m4-$M4_VERSION.el6.x86_64.rpm | cpio -d -i
elif test "x$TARGET_PLATFORM" = xlinux_x86; then
@@ -97,38 +85,27 @@ elif test "x$TARGET_PLATFORM" = xlinux_x86; then
cd $IMAGE_DIR
rpm2cpio $OUTPUT_ROOT/m4-$M4_VERSION.el6.i686.rpm | cpio -d -i
else
print_log "m4: download"
wget https://ftp.gnu.org/gnu/m4/m4-$M4_VERSION.tar.gz
tar -xzf m4-$M4_VERSION.tar.gz
tar xzf m4-$M4_VERSION.tar.gz
cd m4-$M4_VERSION
print_log "m4: configure"
./configure --prefix=$IMAGE_DIR/usr CFLAGS="-w -Wno-everything"
print_log "m4: make"
make
print_log "m4: make install"
make install
cd ..
fi
# Download and build autoconf
print_log "autoconf: download"
wget https://ftp.gnu.org/gnu/autoconf/autoconf-$AUTOCONF_VERSION.tar.gz
tar -xzf autoconf-$AUTOCONF_VERSION.tar.gz
tar xzf autoconf-$AUTOCONF_VERSION.tar.gz
cd autoconf-$AUTOCONF_VERSION
print_log "autoconf: configure"
./configure --prefix=$IMAGE_DIR/usr M4=$IMAGE_DIR/usr/bin/m4
print_log "autoconf: make"
make
print_log "autoconf: make install"
make install
cd ..
# The resulting scripts from installation folder use absolute paths to reference other files within installation folder
print_log "replace absolue paths from installation files with a relative ."
perl -pi -e "s!$IMAGE_DIR/!./!" $IMAGE_DIR/usr/bin/auto* $IMAGE_DIR/usr/share/autoconf/autom4te.cfg
print_log "creating $IMAGE_DIR/autoconf wrapper script"
cat > $IMAGE_DIR/autoconf << EOF
#!/bin/bash
# Get an absolute path to this script
@@ -146,9 +123,6 @@ PREPEND_INCLUDE="--prepend-include \$this_script_dir/usr/share/autoconf"
exec \$this_script_dir/usr/bin/autoconf \$PREPEND_INCLUDE "\$@"
EOF
chmod +x $IMAGE_DIR/autoconf
print_log "archiving $IMAGE_DIR directory as $OUTPUT_ROOT/$BUNDLE_NAME"
cd $IMAGE_DIR
tar -cvzf $OUTPUT_ROOT/$BUNDLE_NAME *

View File

@@ -56,22 +56,16 @@ BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
UNAME_SYSTEM=`uname -s`
UNAME_RELEASE=`uname -r`
UNAME_OS=`uname -o`
# Detect cygwin or WSL
IS_CYGWIN=`echo $UNAME_SYSTEM | grep -i CYGWIN`
IS_WSL=`echo $UNAME_RELEASE | grep Microsoft`
IS_MSYS=`echo $UNAME_OS | grep -i Msys`
MSYS2_ARG_CONV_EXCL="*" # make "cmd.exe /c" work for msys2
CMD_EXE="cmd.exe /c"
if test "x$IS_CYGWIN" != "x"; then
BUILD_ENV="cygwin"
elif test "x$IS_MSYS" != "x"; then
BUILD_ENV="cygwin"
elif test "x$IS_WSL" != "x"; then
BUILD_ENV="wsl"
else
echo "Unknown environment; only Cygwin/MSYS2/WSL are supported."
echo "Unknown environment; only Cygwin and WSL are supported."
exit 1
fi
@@ -82,7 +76,7 @@ elif test "x$BUILD_ENV" = "xwsl"; then
fi
# Work around the insanely named ProgramFiles(x86) env variable
PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(${CMD_EXE} set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
PROGRAMFILES="$($WINDOWS_PATH_TO_UNIX_PATH "$PROGRAMFILES")"
case $VS_VERSION in
@@ -105,15 +99,13 @@ esac
# Find Visual Studio installation dir
VSNNNCOMNTOOLS=`${CMD_EXE} echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
VSNNNCOMNTOOLS="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS")"
VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
if [ -d "$VSNNNCOMNTOOLS" ]; then
VS_INSTALL_DIR="$VSNNNCOMNTOOLS/../.."
VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
else
VS_INSTALL_DIR="${MSVC_PROGRAMFILES_DIR}/Microsoft Visual Studio/$VS_VERSION"
VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
fi
echo "VSNNNCOMNTOOLS: $VSNNNCOMNTOOLS"
echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
# Extract semantic version
@@ -188,11 +180,7 @@ cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
################################################################################
# Copy SDK files
SDK_INSTALL_DIR=`${CMD_EXE} echo %WindowsSdkDir% | tr -d '\r'`
SDK_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$SDK_INSTALL_DIR")"
if [ ! -d "$SDK_INSTALL_DIR" ]; then
SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
fi
SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
echo "SDK_INSTALL_DIR: $SDK_INSTALL_DIR"
SDK_FULL_VERSION="$(ls "$SDK_INSTALL_DIR/bin" | sort -r -n | head -n1)"

View File

@@ -125,11 +125,9 @@ endif
ifneq ($(call check-jvm-feature, cds), true)
JVM_CFLAGS_FEATURES += -DINCLUDE_CDS=0
JVM_EXCLUDE_FILES += \
aotCodeCache.cpp \
classLoaderDataShared.cpp \
classLoaderExt.cpp \
systemDictionaryShared.cpp \
trainingData.cpp
systemDictionaryShared.cpp
JVM_EXCLUDE_PATTERNS += cds/
endif

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2024, 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
@@ -59,7 +59,6 @@ public class HelloClasslist {
private static final Logger LOGGER = Logger.getLogger("Hello");
@SuppressWarnings("restricted")
public static void main(String ... args) throws Throwable {
FileSystems.getDefault();
@@ -142,7 +141,6 @@ public class HelloClasslist {
HelloClasslist.class.getMethod("staticMethod_V").invoke(null);
var obj = HelloClasslist.class.getMethod("staticMethod_L_L", Object.class).invoke(null, instance);
HelloClasslist.class.getField("field").get(instance);
MethodHandles.Lookup.ClassOption.class.getEnumConstants();
// A selection of trivial and relatively common MH operations
invoke(MethodHandles.identity(double.class), 1.0);
@@ -162,9 +160,6 @@ public class HelloClasslist {
case B b -> b.b;
default -> 17;
};
// record run-time methods
o.equals(new B(5));
o.hashCode();
LOGGER.log(Level.FINE, "Value: " + value);
// The Striped64$Cell is loaded rarely only when there's a contention among

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2023, 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
@@ -1190,7 +1190,7 @@ OUTER: for (int i = 0; i < n; i += m) {
if (Csyntax)
result.append(" static ");
else
result.append(" @Stable static final ");
result.append(" static final ");
result.append(atype);
result.append(" ").append(name).append("[");
if (Csyntax)
@@ -1347,7 +1347,7 @@ OUTER: for (int i = 0; i < n; i += m) {
}
static void genCaseMapTableDeclaration(StringBuffer result) {
result.append(" @Stable static final char[][][] charMap;\n");
result.append(" static final char[][][] charMap;\n");
}
static void genCaseMapTable(StringBuffer result, SpecialCaseMap[] specialCaseMaps){

View File

@@ -1,26 +1,3 @@
/*
* Copyright (c) 2020, 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.
*/
package build.tools.pandocfilter;
import build.tools.pandocfilter.json.JSON;

View File

@@ -0,0 +1,127 @@
/*
* Copyright (c) 2025, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package build.tools.taglet;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import javax.lang.model.element.Element;
import javax.tools.Diagnostic;
import com.sun.source.doctree.DocTree;
import com.sun.source.doctree.UnknownInlineTagTree;
import jdk.javadoc.doclet.Doclet;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.doclet.Reporter;
import jdk.javadoc.doclet.StandardDoclet;
import jdk.javadoc.doclet.Taglet;
import static com.sun.source.doctree.DocTree.Kind.UNKNOWN_INLINE_TAG;
/**
* An inline tag to insert a note formatted as preview note.
* The tag can be used as follows:
*
* <pre>
* {&commat;previewNote jep-number [Preview note heading]}
* Preview note content
* {&commat;previewNote}
* </pre>
*
*/
public class PreviewNote implements Taglet {
static final String TAG_NAME = "previewNote";
Reporter reporter = null;
@Override
public void init(DocletEnvironment env, Doclet doclet) {
if (doclet instanceof StandardDoclet stdoclet) {
reporter = stdoclet.getReporter();
}
}
/**
* Returns the set of locations in which the tag may be used.
*/
@Override
public Set<Location> getAllowedLocations() {
return EnumSet.allOf(Taglet.Location.class);
}
@Override
public boolean isInlineTag() {
return true;
}
@Override
public String getName() {
return TAG_NAME;
}
@Override
public String toString(List<? extends DocTree> tags, Element elem) {
for (DocTree tag : tags) {
if (tag.getKind() == UNKNOWN_INLINE_TAG) {
UnknownInlineTagTree inlineTag = (UnknownInlineTagTree) tag;
String[] content = inlineTag.getContent().toString().trim().split("\\s+", 2);
if (!content[0].isBlank()) {
StringBuilder sb = new StringBuilder("""
<div class="preview-block" style="margin-top:10px; display:block; max-width:max-content;">
""");
if (content.length == 2) {
sb.append("""
<div class="preview-label">
""")
.append(content[1])
.append("""
</div>
""");
}
sb.append("""
<div class="preview-comment">
""");
return sb.toString();
} else {
return """
</div>
</div>
""";
}
}
}
if (reporter == null) {
throw new IllegalArgumentException("@" + TAG_NAME + " taglet content must be begin or end");
}
reporter.print(Diagnostic.Kind.ERROR, "@" + TAG_NAME + " taglet content must be begin or end");
return "";
}
}

View File

@@ -46,8 +46,6 @@ import java.io.OutputStream;
import java.io.StringWriter;
import java.io.Writer;
import java.lang.classfile.*;
import java.lang.classfile.TypeAnnotation.TargetInfo;
import java.lang.classfile.TypeAnnotation.TypePathComponent;
import java.lang.classfile.attribute.*;
import java.lang.classfile.constantpool.ClassEntry;
import java.lang.classfile.constantpool.ConstantPoolBuilder;
@@ -66,9 +64,6 @@ import java.nio.file.FileVisitor;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.BasicFileAttributes;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.stream.Stream;
import java.util.ArrayList;
import java.util.Arrays;
@@ -106,7 +101,10 @@ import javax.tools.StandardLocation;
import com.sun.source.util.JavacTask;
import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.jvm.Target;
import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Pair;
import java.nio.file.DirectoryStream;
import java.util.Optional;
import java.util.function.Consumer;
@@ -306,18 +304,13 @@ public class CreateSymbols {
"Ljdk/internal/ValueBased;";
private static final String VALUE_BASED_ANNOTATION_INTERNAL =
"Ljdk/internal/ValueBased+Annotation;";
private static final String REQUIRES_IDENTITY_ANNOTATION =
"Ljdk/internal/RequiresIdentity;";
private static final String REQUIRES_IDENTITY_ANNOTATION_INTERNAL =
"Ljdk/internal/RequiresIdentity+Annotation;";
public static final Set<String> HARDCODED_ANNOTATIONS = new HashSet<>(
List.of("Ljdk/Profile+Annotation;",
"Lsun/Proprietary+Annotation;",
PREVIEW_FEATURE_ANNOTATION_OLD,
PREVIEW_FEATURE_ANNOTATION_NEW,
VALUE_BASED_ANNOTATION,
RESTRICTED_ANNOTATION,
REQUIRES_IDENTITY_ANNOTATION));
RESTRICTED_ANNOTATION));
private void stripNonExistentAnnotations(LoadDescriptions data) {
Set<String> allClasses = data.classes.name2Class.keySet();
@@ -346,10 +339,10 @@ public class CreateSymbols {
!allClasses.contains(ann.annotationType.substring(1, ann.annotationType.length() - 1)));
}
private ZipEntry createZipEntry(String name, long timeMillisSinceEpoch) {
Instant time = Instant.ofEpochMilli(timeMillisSinceEpoch);
private ZipEntry createZipEntry(String name, long timestamp) {
ZipEntry ze = new ZipEntry(name);
ze.setTimeLocal(LocalDateTime.ofInstant(time, ZoneOffset.UTC));
ze.setTime(timestamp);
return ze;
}
@@ -993,12 +986,6 @@ public class CreateSymbols {
if (desc.runtimeAnnotations != null && !desc.runtimeAnnotations.isEmpty()) {
builder.accept(RuntimeVisibleAnnotationsAttribute.of(createAnnotations(desc.runtimeAnnotations)));
}
if (desc.classTypeAnnotations != null && !desc.classTypeAnnotations.isEmpty()) {
builder.accept(RuntimeInvisibleTypeAnnotationsAttribute.of(createTypeAnnotations(desc.classTypeAnnotations)));
}
if (desc.runtimeTypeAnnotations != null && !desc.runtimeTypeAnnotations.isEmpty()) {
builder.accept(RuntimeVisibleTypeAnnotationsAttribute.of(createTypeAnnotations(desc.runtimeTypeAnnotations)));
}
}
private List<Annotation> createAnnotations(List<AnnotationDescription> desc) {
@@ -1034,12 +1021,6 @@ public class CreateSymbols {
annotationType = VALUE_BASED_ANNOTATION_INTERNAL;
}
if (REQUIRES_IDENTITY_ANNOTATION.equals(annotationType)) {
//the non-public RequiresIdentity annotation will not be available in ct.sym,
//replace with purely synthetic javac-internal annotation:
annotationType = REQUIRES_IDENTITY_ANNOTATION_INTERNAL;
}
if (RESTRICTED_ANNOTATION.equals(annotationType)) {
//the non-public Restricted annotation will not be available in ct.sym,
//replace with purely synthetic javac-internal annotation:
@@ -1074,44 +1055,6 @@ public class CreateSymbols {
default -> throw new IllegalArgumentException(value.getClass().getName());
};
}
private List<TypeAnnotation> createTypeAnnotations(List<TypeAnnotationDescription> desc) {
return desc.stream().map(this::createTypeAnnotation).collect(Collectors.toList());
}
private TypeAnnotation createTypeAnnotation(TypeAnnotationDescription desc) {
Annotation baseAnn = createAnnotation(desc.annotation);
TargetInfo targetInfo = switch ((String) desc.targetInfo.get("targetType")) {
case "CLASS_TYPE_PARAMETER" -> //TODO: test!
TargetInfo.ofClassTypeParameter((int) desc.targetInfo.get("typeParameterIndex"));
case "METHOD_TYPE_PARAMETER" ->
TargetInfo.ofMethodTypeParameter((int) desc.targetInfo.get("typeParameterIndex"));
case "CLASS_EXTENDS" ->
TargetInfo.ofClassExtends((int) desc.targetInfo.get("supertypeIndex"));
case "CLASS_TYPE_PARAMETER_BOUND" ->
TargetInfo.ofClassTypeParameterBound((int) desc.targetInfo.get("typeParameterIndex"),
(int) desc.targetInfo.get("boundIndex"));
case "METHOD_TYPE_PARAMETER_BOUND" ->
TargetInfo.ofMethodTypeParameterBound((int) desc.targetInfo.get("typeParameterIndex"),
(int) desc.targetInfo.get("boundIndex"));
case "METHOD_RETURN" ->
TargetInfo.ofMethodReturn();
case "METHOD_RECEIVER" ->
TargetInfo.ofMethodReceiver();
case "METHOD_FORMAL_PARAMETER" ->
TargetInfo.ofMethodFormalParameter((int) desc.targetInfo.get("formalParameterIndex"));
case "THROWS" ->
TargetInfo.ofThrows((int) desc.targetInfo.get("throwsTargetIndex"));
case "FIELD" ->
TargetInfo.ofField();
case String targetType ->
throw new IllegalStateException("Unsupported targetType: " + targetType);
};
List<TypePathComponent> typePath = desc.typePath.stream().map(d -> TypePathComponent.of(TypePathComponent.Kind.valueOf(d.tag()), d.index())).toList();
return TypeAnnotation.of(targetInfo, typePath, baseAnn);
}
//</editor-fold>
//</editor-fold>
@@ -2259,10 +2202,6 @@ public class CreateSymbols {
chd.permittedSubclasses = a.permittedSubclasses().stream().map(ClassEntry::asInternalName).collect(Collectors.toList());
}
case ModuleMainClassAttribute a -> ((ModuleHeaderDescription) feature).moduleMainClass = a.mainClass().asInternalName();
case RuntimeInvisibleTypeAnnotationsAttribute a ->
feature.classTypeAnnotations = typeAnnotations2Descriptions(a.annotations());
case RuntimeVisibleTypeAnnotationsAttribute a ->
feature.runtimeTypeAnnotations = typeAnnotations2Descriptions(a.annotations());
default -> throw new IllegalArgumentException("Unhandled attribute: " + attr.attributeName()); // Do nothing
}
@@ -2319,31 +2258,6 @@ public class CreateSymbols {
return new AnnotationDescription(annotationType, values);
}
private List<TypeAnnotationDescription> typeAnnotations2Descriptions(List<TypeAnnotation> annos) {
return annos.stream().map(ta -> {
TypeAnnotationDescription desc = new TypeAnnotationDescription();
desc.annotation = annotation2Description(ta.annotation());
desc.targetInfo = new HashMap<>();
desc.targetInfo.put("targetType", ta.targetInfo().targetType().name());
switch (ta.targetInfo()) {
case TypeAnnotation.TypeParameterTarget tpt -> desc.targetInfo.put("typeParameterIndex", tpt.typeParameterIndex());
case TypeAnnotation.SupertypeTarget st -> desc.targetInfo.put("supertypeIndex", st.supertypeIndex());
case TypeAnnotation.TypeParameterBoundTarget tpbt -> {
desc.targetInfo.put("typeParameterIndex", tpbt.typeParameterIndex());
desc.targetInfo.put("boundIndex", tpbt.boundIndex());
}
case TypeAnnotation.EmptyTarget _ -> {
// nothing to write
}
case TypeAnnotation.FormalParameterTarget fpt -> desc.targetInfo.put("formalParameterIndex", fpt.formalParameterIndex());
case TypeAnnotation.ThrowsTarget tt -> desc.targetInfo.put("throwsTargetIndex", tt.throwsTargetIndex());
default -> throw new IllegalStateException(ta.targetInfo().targetType().name());
}
desc.typePath = ta.targetPath().stream().map(tpc -> new TypeAnnotationDescription.TypePathComponentDesc(tpc.typePathKind().name(), tpc.typeArgumentIndex())).toList();
return desc;
}).toList();
}
//</editor-fold>
protected boolean includeEffectiveAccess(ClassList classes, ClassDescription clazz) {
@@ -2465,8 +2379,6 @@ public class CreateSymbols {
String versions = "";
List<AnnotationDescription> classAnnotations;
List<AnnotationDescription> runtimeAnnotations;
List<TypeAnnotationDescription> classTypeAnnotations;
List<TypeAnnotationDescription> runtimeTypeAnnotations;
protected void writeAttributes(Appendable output) throws IOException {
if (flags != 0)
@@ -2489,18 +2401,6 @@ public class CreateSymbols {
output.append(quote(a.toString(), false));
}
}
if (classTypeAnnotations != null && !classTypeAnnotations.isEmpty()) {
output.append(" classTypeAnnotations ");
for (TypeAnnotationDescription a : classTypeAnnotations) {
output.append(quote(a.toString(), false));
}
}
if (runtimeTypeAnnotations != null && !runtimeTypeAnnotations.isEmpty()) {
output.append(" runtimeTypeAnnotations ");
for (TypeAnnotationDescription a : runtimeTypeAnnotations) {
output.append(quote(a.toString(), false));
}
}
}
protected boolean shouldIgnore(String baselineVersion, String version) {
@@ -2530,14 +2430,6 @@ public class CreateSymbols {
if (inRuntimeAnnotations != null) {
runtimeAnnotations = parseAnnotations(inRuntimeAnnotations, new int[1]);
}
String inClassTypeAnnotations = reader.attributes.get("classTypeAnnotations");
if (inClassTypeAnnotations != null) {
classTypeAnnotations = parseTypeAnnotations(inClassTypeAnnotations, new int[1]);
}
String inRuntimeTypeAnnotations = reader.attributes.get("runtimeTypeAnnotations");
if (inRuntimeTypeAnnotations != null) {
runtimeTypeAnnotations = parseTypeAnnotations(inRuntimeTypeAnnotations, new int[1]);
}
}
public abstract boolean read(LineBasedReader reader) throws IOException;
@@ -2550,8 +2442,6 @@ public class CreateSymbols {
hash = 89 * hash + Objects.hashCode(this.signature);
hash = 89 * hash + listHashCode(this.classAnnotations);
hash = 89 * hash + listHashCode(this.runtimeAnnotations);
hash = 89 * hash + listHashCode(this.classTypeAnnotations);
hash = 89 * hash + listHashCode(this.runtimeTypeAnnotations);
return hash;
}
@@ -2579,12 +2469,6 @@ public class CreateSymbols {
if (!listEquals(this.runtimeAnnotations, other.runtimeAnnotations)) {
return false;
}
if (!listEquals(this.classTypeAnnotations, other.classTypeAnnotations)) {
return false;
}
if (!listEquals(this.runtimeTypeAnnotations, other.runtimeTypeAnnotations)) {
return false;
}
return true;
}
@@ -3389,8 +3273,6 @@ public class CreateSymbols {
hash = 59 * hash + Objects.hashCode(this.descriptor);
hash = 59 * hash + Objects.hashCode(this.thrownTypes);
hash = 59 * hash + Objects.hashCode(this.annotationDefaultValue);
hash = 59 * hash + Objects.hashCode(this.classParameterAnnotations);
hash = 59 * hash + Objects.hashCode(this.runtimeParameterAnnotations);
return hash;
}
@@ -3415,12 +3297,6 @@ public class CreateSymbols {
if (!Objects.equals(this.annotationDefaultValue, other.annotationDefaultValue)) {
return false;
}
if (!Objects.equals(this.classParameterAnnotations, other.classParameterAnnotations)) {
return false;
}
if (!Objects.equals(this.runtimeParameterAnnotations, other.runtimeParameterAnnotations)) {
return false;
}
return true;
}
@@ -3748,40 +3624,6 @@ public class CreateSymbols {
}
}
static final class TypeAnnotationDescription {
AnnotationDescription annotation;
Map<String, Object> targetInfo;
List<TypePathComponentDesc> typePath;
public TypeAnnotationDescription() {
}
public TypeAnnotationDescription(AnnotationDescription annotation, Map<String, Object> targetInfo, List<TypePathComponentDesc> typePath) {
this.annotation = annotation;
this.targetInfo = targetInfo;
this.typePath = typePath;
}
@Override
public String toString() {
return annotation.toString() + "{" + targetInfo.entrySet().stream().map(e -> e.getKey() + "=" + quote(printValue(e.getValue()), false)).collect(Collectors.joining(",")) + "}" +
(!typePath.isEmpty() ? "[" + typePath.stream().map(desc -> desc.tag + ":" + desc.index).collect(Collectors.joining(",")) + "]" : "");
}
private String printValue(Object obj) {
if (obj instanceof String s) {
return "\"" + s + "\"";
} else if (obj instanceof Integer i) {
return "I" + String.valueOf(i);
} else {
throw new IllegalStateException("Unsupported value: " + obj.getClass());
}
}
//TODO: path
record TypePathComponentDesc(String tag, int index) {}
}
static final class EnumConstant {
String type;
String constant;
@@ -4121,69 +3963,23 @@ public class CreateSymbols {
private static AnnotationDescription parseAnnotation(String value, int[] valuePointer) {
String className = className(value, valuePointer);
Map<String, Object> attribute2Value = Map.of();
if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '(') {
attribute2Value = parseMap(value, valuePointer, ')');
}
return new AnnotationDescription(className, attribute2Value);
}
private static Map<String, Object> parseMap(String value, int[] valuePointer, char endBracket) {
Map<String, Object> attribute2Value = new HashMap<>();
while (value.charAt(valuePointer[0]) != endBracket) {
int nameStart = ++valuePointer[0];
while (value.charAt(valuePointer[0]++) != '=');
String name = value.substring(nameStart, valuePointer[0] - 1);
attribute2Value.put(name, parseAnnotationValue(value, valuePointer));
}
valuePointer[0]++;
return attribute2Value;
}
public static List<TypeAnnotationDescription> parseTypeAnnotations(String encoded, int[] pointer) {
List<TypeAnnotationDescription> result = new ArrayList<>();
while (pointer[0] < encoded.length() && encoded.charAt(pointer[0]) == '@') {
pointer[0]++;
result.add(parseTypeAnnotation(encoded, pointer));
}
return result;
}
private static TypeAnnotationDescription parseTypeAnnotation(String value, int[] valuePointer) {
AnnotationDescription ann = parseAnnotation(value, valuePointer);
Map<String, Object> targetInfo = Map.of();
if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '{') {
targetInfo = parseMap(value, valuePointer, '}');
}
List<TypeAnnotationDescription.TypePathComponentDesc> typePath = new ArrayList<>();
if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '[') {
while (value.charAt(valuePointer[0]) != ']') {
if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '(') {
while (value.charAt(valuePointer[0]) != ')') {
int nameStart = ++valuePointer[0];
while (value.charAt(valuePointer[0]++) != ':');
while (value.charAt(valuePointer[0]++) != '=');
String name = value.substring(nameStart, valuePointer[0] - 1);
typePath.add(new TypeAnnotationDescription.TypePathComponentDesc(name, Integer.parseInt(readDigits(value, valuePointer))));
attribute2Value.put(name, parseAnnotationValue(value, valuePointer));
}
valuePointer[0]++;
}
return new TypeAnnotationDescription(ann, targetInfo, typePath);
return new AnnotationDescription(className, attribute2Value);
}
//</editor-fold>

View File

@@ -41,6 +41,11 @@ CLEAN += intrinsic.properties
EXCLUDE_FILES += \
$(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
EXCLUDES += java/lang/doc-files \
java/lang/classfile/snippet-files \
java/lang/classfile/components/snippet-files \
java/lang/foreign/snippet-files
# Exclude BreakIterator classes that are just used in compile process to generate
# data files and shouldn't go in the product
EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java

View File

@@ -158,7 +158,6 @@ endif
$(eval $(call SetupJdkLibrary, BUILD_LIBSYSLOOKUP, \
NAME := syslookup, \
EXTRA_HEADER_DIRS := java.base:libjava, \
LD_SET_ORIGIN := false, \
LDFLAGS_linux := -Wl$(COMMA)--no-as-needed, \
LDFLAGS_aix := -brtl -bexpfull, \

View File

@@ -32,4 +32,6 @@
DOCLINT += -Xdoclint:all/protected \
'-Xdoclint/package:java.*,javax.*'
EXCLUDES += javax/tools/snippet-files
################################################################################

View File

@@ -31,6 +31,15 @@ DOCLINT += -Xdoclint:all/protected \
COPY += .gif .png .wav .txt .xml .css .pf
CLEAN += iio-plugin.properties cursors.properties
EXCLUDES += \
java/awt/doc-files \
javax/swing/doc-files \
javax/swing/text/doc-files \
javax/swing/plaf/synth/doc-files \
javax/swing/undo/doc-files \
sun/awt/X11/doc-files \
#
EXCLUDE_FILES += \
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \

View File

@@ -150,9 +150,6 @@ ifeq ($(VULKAN_ENABLED), true)
LIBAWT_EXTRA_HEADER_DIRS += common/font common/java2d/vulkan common/java2d
LIBAWT_CFLAGS += $(VULKAN_FLAGS)
LIBAWT_EXTRA_FILES += $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/AccelTexturePool.c
VULKAN_EXCLUDES := vulkan
else
VULKAN_EXCLUDES := vulkan java2d/vulkan
endif
# -fgcse-after-reload improves performance of MaskFill in Java2D by 20% for
@@ -283,7 +280,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
NAME := awt_headless, \
EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
EXCLUDES := medialib wl $(VULKAN_EXCLUDES), \
EXCLUDES := medialib wl vulkan, \
ONLY_EXPORTED := $(LIBAWT_HEADLESS_ONLY_EXPORTED), \
OPTIMIZATION := LOW, \
CFLAGS := -DHEADLESS=true $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) \
@@ -364,7 +361,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
NAME := awt_xawt, \
EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
EXCLUDES := medialib debug wl $(VULKAN_EXCLUDES), \
EXCLUDES := medialib debug wl vulkan, \
OPTIMIZATION := LOW, \
CFLAGS := -DXAWT -DXAWT_HACK $(LIBAWT_XAWT_CFLAGS) $(DBUS_CFLAGS) \
$(FONTCONFIG_CFLAGS) $(CUPS_CFLAGS) $(X_CFLAGS), \
@@ -386,6 +383,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
DISABLED_WARNINGS_gcc_X11TextRenderer_md.c := unused-but-set-variable, \
DISABLED_WARNINGS_gcc_XlibWrapper.c := type-limits pointer-to-int-cast, \
DISABLED_WARNINGS_gcc_XRBackendNative.c := maybe-uninitialized, \
DISABLED_WARNINGS_gcc_XToolkit.c := unused-result, \
DISABLED_WARNINGS_gcc_XWindow.c := unused-function, \
DISABLED_WARNINGS_gcc_awt_InputMethod.c := unused-label, \
DISABLED_WARNINGS_clang_awt_Taskbar.c := parentheses, \
@@ -427,7 +425,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
$(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/wayland \
#
LIBAWT_WLAWT_EXCLUDES := medialib debug opengl x11 $(VULKAN_EXCLUDES)
LIBAWT_WLAWT_EXCLUDES := medialib debug opengl vulkan x11
LIBAWT_WLAWT_EXCLUDE_FILES := common/awt/X11Color.c common/awt/awt_Font.c
LIBAWT_WLAWT_EXTRA_HEADER_DIRS := \
@@ -531,7 +529,7 @@ ifeq ($(call isTargetOs, macosx), true)
#
LIBAWT_LWAWT_EXCLUDE_FILES := fontpath.c awt_Font.c X11Color.c
LIBAWT_LWAWT_EXCLUDES := $(VULKAN_EXCLUDES) \
LIBAWT_LWAWT_EXCLUDES := vulkan \
$(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib \
#

View File

@@ -87,7 +87,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
libawt/java2d \
java.base:libjvm, \
HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
DISABLED_WARNINGS_gcc := format-nonliteral stringop-truncation \
DISABLED_WARNINGS_gcc := format-nonliteral stringop-truncation type-limits \
unused-variable, \
DISABLED_WARNINGS_clang := format-nonliteral, \
JDK_LIBS := libawt java.base:libjava, \

View File

@@ -31,6 +31,7 @@ EXCLUDES += \
com/sun/tools/example/debug/bdi \
com/sun/tools/example/debug/event \
com/sun/tools/example/debug/gui \
com/sun/jdi/doc-files \
#
EXCLUDE_FILES += jdi-overview.html

View File

@@ -68,7 +68,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
DISABLED_WARNINGS_clang_threadControl.c := unused-but-set-variable \
unused-variable, \
DISABLED_WARNINGS_clang_utf_util.c := unused-but-set-variable, \
DISABLED_WARNINGS_microsoft_debugInit.c := 5287, \
LDFLAGS := $(ICONV_LDFLAGS), \
EXTRA_HEADER_DIRS := \
include \

View File

@@ -1,32 +0,0 @@
#
# Copyright (c) 2025, 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
################################################################################
# Instruct SetupJavaCompilation for the jdk.jlink module to include
# upgrade_files_<module-name>.conf files
COPY += .conf
################################################################################

View File

@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2020, 2023, 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
@@ -157,21 +157,11 @@ function import_path() {
if [[ $? -eq 0 && -e "$unixpath" ]]; then
if [[ ! "$winpath" =~ ^"$ENVROOT"\\.*$ ]] ; then
# If it is not in envroot, it's a generic windows path
if [[ ! $winpath =~ ^[-_.:~+\\a-zA-Z0-9]*$ ]] ; then
if [[ ! $winpath =~ ^[-_.:\\a-zA-Z0-9]*$ ]] ; then
# Path has forbidden characters, rewrite as short name
# This monster of a command uses the %~s support from cmd.exe to
# reliably convert to short paths on all winenvs.
shortpath="$($CMD /q /c for %I in \( "$winpath" \) do echo %~sI 2>/dev/null | tr -d \\n\\r)"
if [[ ! $shortpath =~ ^[-_.:~+\\a-zA-Z0-9]*$ ]] ; then
if [[ $QUIET != true ]]; then
echo fixpath: failure: Path "'"$path"'" could not be converted to short path >&2
fi
if [[ $IGNOREFAILURES != true ]]; then
exit 1
else
shortpath=""
fi
fi
unixpath="$($PATHTOOL -u "$shortpath")"
# unixpath is based on short name
fi

View File

@@ -1,7 +1,7 @@
#!/bin/bash -f
#
# Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2010, 2024, 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
@@ -41,6 +41,10 @@ set -e
# To allow total changes counting
shopt -s lastpipe
# Get an absolute path to this script, since that determines the top-level directory.
this_script_dir=`dirname $0`
this_script_dir=`cd $this_script_dir > /dev/null && pwd`
# Temp area
tmp=/tmp/`basename $0`.${USER}.$$
rm -f -r ${tmp}
@@ -94,16 +98,10 @@ while getopts "c:fhy:" option; do
done
# VCS check
git_installed=false
which git > /dev/null && git_installed=true
if [ "$git_installed" != "true" ]; then
echo "Error: This script requires git. Please install it."
exit 1
fi
git_found=false
git status &> /dev/null && git_found=true
[ -d "${this_script_dir}/../../.git" ] && git_found=true
if [ "$git_found" != "true" ]; then
echo "Error: Please execute script from within a JDK git repository."
echo "Error: Please execute script from within make/scripts."
exit 1
else
echo "Using Git version control system"

View File

@@ -119,6 +119,7 @@ $(JMH_UNPACKED_JARS_DONE): $(JMH_RUNTIME_JARS)
$(foreach jar, $(JMH_RUNTIME_JARS), \
$$($(UNZIP) -oq $(jar) -d $(JMH_UNPACKED_DIR)))
$(RM) -r $(JMH_UNPACKED_DIR)/META-INF
$(RM) $(JMH_UNPACKED_DIR)/*.xml
$(TOUCH) $@
# Copy dependency files for inclusion in the benchmark JARs

View File

@@ -2,7 +2,7 @@
<html>
<head>
<title>README - CodePointIM</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
</head>
<body>
<h1>Code Point Input Method</h1>

View File

@@ -1,6 +1,6 @@
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
<META NAME="GENERATOR" CONTENT="Mozilla/4.02 [en] (X11; U; SunOS 5.6 sun4u) [Netscape]">
<TITLE>Java L&amp;F</TITLE>
</HEAD>
@@ -39,7 +39,7 @@ icons used by the L&amp;F.</P>
<P>The theme mechanism is designed to allow developers to create
their own themes. For an example of this, see the themes
which are included with Metalworks. Note, like all of the L&amp;F packages,
the metal package is not yet frozen and the theme mechanism may change as
the metal package is not yet frozen and the theme mechanism may change as
we get developer feedback on how to improve it.</P>
<H1>
@@ -53,7 +53,7 @@ is an example:</P>
<PRE>
JSlider slider = new JSlider();<BR>
slider.putClientProperty("JSlider.isFilled",
slider.putClientProperty("JSlider.isFilled",
Boolean.TRUE);<BR> <BR>
</PRE>
@@ -64,7 +64,7 @@ to a different L&amp;F.</P>
<H1>
ToolBars</H1>
<P>Many popular applications support "roll-over" effects on buttons in toolbars.
<P>Many popular applications support "roll-over" effects on buttons in toolbars.
The Java L&amp;F provides an easy way to do this. Here is a code snippit:</P>
<PRE>
@@ -72,7 +72,7 @@ JToolBar toolbar = new JToolBar();<BR>
// add your buttons here<BR>
toolbar.putClientProperty("JToolBar.isRollover",
toolbar.putClientProperty("JToolBar.isRollover",
Boolean.TRUE);<BR>
</PRE>
@@ -98,7 +98,7 @@ myTree.putClientProperty("JTree.lineStyle",
// This will provide lines separating root notes
// it is the default setting
myTree.putClientProperty("JTree.lineStyle",
"Horizontal");
"Horizontal");
</PRE>
<P><A HREF="toc.html"><IMG alt="Back" SRC="back.gif" BORDER=0 HEIGHT=22 WIDTH=42 ALIGN=BOTTOM>Back</A>

View File

@@ -1,6 +1,6 @@
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
<META NAME="GENERATOR" CONTENT="Mozilla/4.02 [en] (X11; U; SunOS 5.6 sun4u) [Netscape]">
<TITLE>Metalworks</TITLE>
</HEAD>

View File

@@ -1,7 +1,7 @@
<html>
<head>
<title>Untitled Document</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF">
@@ -10,106 +10,106 @@
</h1>
<p align="center"><img src="images/Octavo/ant.jpg" width="481" height="325"></p>
<p align="center">&nbsp;</p>
<blockquote>
<blockquote>
<blockquote>
<p><font size="4">This was a creature, more troublesom to be drawn, then any
of the rest, for I could not, for a good while, think of a way to make it
<p><font size="4">This was a creature, more troublesom to be drawn, then any
of the rest, for I could not, for a good while, think of a way to make it
suffer its body to ly quiet in a natural posture; but whil'st it was alive,
if its feet were fetter'd in Wax or Glew, it would so twist and wind its body,
that I could not any wayes get a good view of it; and if I killed it, its
body was so little, that I did often spoile the shape of it, before I could
throughly view it: for this is the nature of these minute Bodies, that as
soon, almost, as ever their life is destroy'd, their parts immediately shrivel,
and lose their beauty; and so is it also with small Plants, as I instanced
if its feet were fetter'd in Wax or Glew, it would so twist and wind its body,
that I could not any wayes get a good view of it; and if I killed it, its
body was so little, that I did often spoile the shape of it, before I could
throughly view it: for this is the nature of these minute Bodies, that as
soon, almost, as ever their life is destroy'd, their parts immediately shrivel,
and lose their beauty; and so is it also with small Plants, as I instanced
before, in the description of Moss. </font></p>
<p><font size="4">And thence also is the reason of the variations in the beards
of wild Oats, and in those of Muskgrass seed, that their bodies, being exceeding
small, those small variations which are made in the surfaces of all bodies,
almost upon every change of Air, especially if the body be porous, do here
become sensible, where the whole body is so small, that it is almost nothing
but surface; for as in vegetable substances, I see no great reason to think,
that the moisture of the Aire (that, sticking to a wreath'd beard, does make
it untwist) should evaporate, or exhale away, any faster then the moisture
of other bodies, but rather that the avolation from, or access of moisture
to, the surfaces of bodies being much the same, those bodies become most
sensible of it, which have the least proportion of body to their surface.
<p><font size="4">And thence also is the reason of the variations in the beards
of wild Oats, and in those of Muskgrass seed, that their bodies, being exceeding
small, those small variations which are made in the surfaces of all bodies,
almost upon every change of Air, especially if the body be porous, do here
become sensible, where the whole body is so small, that it is almost nothing
but surface; for as in vegetable substances, I see no great reason to think,
that the moisture of the Aire (that, sticking to a wreath'd beard, does make
it untwist) should evaporate, or exhale away, any faster then the moisture
of other bodies, but rather that the avolation from, or access of moisture
to, the surfaces of bodies being much the same, those bodies become most
sensible of it, which have the least proportion of body to their surface.
</font></p>
<p><font size="4">So is it also with Animal substances; the dead body of an
Ant, or such little creature, does almost instantly shrivel and dry, and
your object shall be quite another thing, before you can half delineate
it, which proceeds not from the extraordinary exhalation, but from the small
proportion of body and juices, to the usual drying of bodies in the Air,
<p><font size="4">So is it also with Animal substances; the dead body of an
Ant, or such little creature, does almost instantly shrivel and dry, and
your object shall be quite another thing, before you can half delineate
it, which proceeds not from the extraordinary exhalation, but from the small
proportion of body and juices, to the usual drying of bodies in the Air,
especially if warm. </font></p>
<p><font size="4">For which inconvenience, where I could not otherwise remove
it, I thought of this expedient. I took the creature, I had design'd to delineate,
and put it into a drop of very well rectified spirit of Wine, this I found
would presently dispatch, as it were, the Animal, and being taken out of
it, and lay'd on a paper,the spirit of Wine would immediately fly away,
and leave the Animal dry, in its natural posture, or at least, in a constitution,
that it might easily with a pin be plac'd, in what posture you desired to
draw it, and the limbs would so remain, without either moving, or shriveling.
<p><font size="4">For which inconvenience, where I could not otherwise remove
it, I thought of this expedient. I took the creature, I had design'd to delineate,
and put it into a drop of very well rectified spirit of Wine, this I found
would presently dispatch, as it were, the Animal, and being taken out of
it, and lay'd on a paper,the spirit of Wine would immediately fly away,
and leave the Animal dry, in its natural posture, or at least, in a constitution,
that it might easily with a pin be plac'd, in what posture you desired to
draw it, and the limbs would so remain, without either moving, or shriveling.
</font></p>
<p><font size="4">And thus I dealt with this Ant, which I have here delineated,
which was one of many, of a very large kind, that inhabited under the Roots
of a Tree, from whence they would sally out in great parties, and make most
grievous havock of the Flowers and Fruits, in the ambient Garden, and return back
<p><font size="4">And thus I dealt with this Ant, which I have here delineated,
which was one of many, of a very large kind, that inhabited under the Roots
of a Tree, from whence they would sally out in great parties, and make most
grievous havock of the Flowers and Fruits, in the ambient Garden, and return back
again very expertly, by the same wayes and paths they went. </font></p>
<p><font size="4">It was more then half the bigness of an Earwig, of a dark
brown, or reddish colour, with long legs, on the hinder of which it would
stand up, and raise its head as high as it could above the ground, that it
might stare the further about it, just after the same manner as I have also
observ'd a hunting Spider to do: and putting my finger towards them, they
have at first all run towards it, till almost at it; and then they would stand
round about it, at a certain distance, and smell, as it were, and consider
whether they should any of them venture any further, till one more bold then
the rest venturing to climb it, all the rest, if I would have suffered them,
would have immediately followed : much such other seemingly rational actions
I have observ'd in this little Vermine with much pleasure, which would be
too long to be here related; those that desire more of them may satisfie
<p><font size="4">It was more then half the bigness of an Earwig, of a dark
brown, or reddish colour, with long legs, on the hinder of which it would
stand up, and raise its head as high as it could above the ground, that it
might stare the further about it, just after the same manner as I have also
observ'd a hunting Spider to do: and putting my finger towards them, they
have at first all run towards it, till almost at it; and then they would stand
round about it, at a certain distance, and smell, as it were, and consider
whether they should any of them venture any further, till one more bold then
the rest venturing to climb it, all the rest, if I would have suffered them,
would have immediately followed : much such other seemingly rational actions
I have observ'd in this little Vermine with much pleasure, which would be
too long to be here related; those that desire more of them may satisfie
their curiosity in Ligons History of the Barbadoes. </font></p>
<p><font size="4">Having insnar'd several of these into a small Box, I made
choice of the tallest grown among them, and separating it from the rest,
I gave it a Gill of Brandy, or Spirit of Wine, which after a while e'en knock'd
him down dead drunk, so that he became moveless, though at first putting
in he struggled for a pretty while very much, till at last, certain bubbles
issuing out of his mouth, it ceased to move; this (because I had before found
them quickly to recover again, if they were taken out presently) I suffered
to lye above an hour in the Spirit; and after I had taken it out, and put
its body and legs into a natural posture, remained moveless about an hour;
but then, upon a sudden, as if it had been awaken out of a drunken sleep,
it suddenly reviv'd and ran away; being caught, and serv'd as before, he
for a while continued struggling and striving, till at last there issued
several bubbles out of its mouth, and then, tanquam animam expirasset, he
remained moveless for a good while ; but at length again recovering, it was
again redipt, and suffered to lye some hours in the Spirit; notwithstanding
which, after it had layen dry some three or four hours, it again recovered
life and motion: Which kind of Experiments, if prosecuted, which they highly
deserve, seem to me of no inconsiderable use towards the invention of the
Latent Scheme, (as the Noble Ve rulam calls it) or the hidden, unknown Texture
<p><font size="4">Having insnar'd several of these into a small Box, I made
choice of the tallest grown among them, and separating it from the rest,
I gave it a Gill of Brandy, or Spirit of Wine, which after a while e'en knock'd
him down dead drunk, so that he became moveless, though at first putting
in he struggled for a pretty while very much, till at last, certain bubbles
issuing out of his mouth, it ceased to move; this (because I had before found
them quickly to recover again, if they were taken out presently) I suffered
to lye above an hour in the Spirit; and after I had taken it out, and put
its body and legs into a natural posture, remained moveless about an hour;
but then, upon a sudden, as if it had been awaken out of a drunken sleep,
it suddenly reviv'd and ran away; being caught, and serv'd as before, he
for a while continued struggling and striving, till at last there issued
several bubbles out of its mouth, and then, tanquam animam expirasset, he
remained moveless for a good while ; but at length again recovering, it was
again redipt, and suffered to lye some hours in the Spirit; notwithstanding
which, after it had layen dry some three or four hours, it again recovered
life and motion: Which kind of Experiments, if prosecuted, which they highly
deserve, seem to me of no inconsiderable use towards the invention of the
Latent Scheme, (as the Noble Ve rulam calls it) or the hidden, unknown Texture
of Bodies. </font></p>
<p><font size="4">Of what Figure this Creature appear'd through the Microscope,
the 32. Scheme (though not so carefully graven as it ought) will represent
to the eye, namely, That it had a large head A A, at the upper end of which
were two protuberant eyes, pearl'd like those of a Fly, but smaller B B;
of the Nose, or foremost part, issued two horns C C, of a shape sufficiently
differing from those of a blew Fly, though indeed they seem to be both the
same kind of Organ, and to serve for a kind of smelling; beyond these were
two indented jaws D D, which he open'd sideways, and was able to gape them
asunder very wide; and the ends of them being armed with teeth, which meeting
went between each other, it was able to grasp and hold a heavy body, three
or four times the bulk and weight of its own body: It had only six legs,
shap'd like those of a Fly, which, as I shewed before, is an Argument that
it is a winged Insect, and though I could not perceive any sign of them in
the middle part of its body (which seem'd to consist of three joints or pieces
E F G, out of which sprung two legs, yet 'tis known that there are of them
<p><font size="4">Of what Figure this Creature appear'd through the Microscope,
the 32. Scheme (though not so carefully graven as it ought) will represent
to the eye, namely, That it had a large head A A, at the upper end of which
were two protuberant eyes, pearl'd like those of a Fly, but smaller B B;
of the Nose, or foremost part, issued two horns C C, of a shape sufficiently
differing from those of a blew Fly, though indeed they seem to be both the
same kind of Organ, and to serve for a kind of smelling; beyond these were
two indented jaws D D, which he open'd sideways, and was able to gape them
asunder very wide; and the ends of them being armed with teeth, which meeting
went between each other, it was able to grasp and hold a heavy body, three
or four times the bulk and weight of its own body: It had only six legs,
shap'd like those of a Fly, which, as I shewed before, is an Argument that
it is a winged Insect, and though I could not perceive any sign of them in
the middle part of its body (which seem'd to consist of three joints or pieces
E F G, out of which sprung two legs, yet 'tis known that there are of them
that have long wings, and fly up and down in the air. </font></p>
<p><font size="4">The third and last part of its body I I I was bigger and
larger then the other two, unto which it was joyn'd by a very small middle,
and had a kind of loose shell, or another distinct part of its body H, which
seem'd to be interpos'd, and to keep the thorax and belly from touching.
The whole body was cas'd over with a very strong armour, and the belly I
I I was covered likewise with multitudes of small white shining brisles;
the legs, horns, head, and middle parts of its body were bestruck with hairs
<p><font size="4">The third and last part of its body I I I was bigger and
larger then the other two, unto which it was joyn'd by a very small middle,
and had a kind of loose shell, or another distinct part of its body H, which
seem'd to be interpos'd, and to keep the thorax and belly from touching.
The whole body was cas'd over with a very strong armour, and the belly I
I I was covered likewise with multitudes of small white shining brisles;
the legs, horns, head, and middle parts of its body were bestruck with hairs
also, but smaller and darker. </font></p>
</blockquote>
<p>&nbsp;</p>

View File

@@ -1,7 +1,7 @@
<html>
<head>
<title>Untitled Document</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF">
@@ -10,113 +10,113 @@
</h1>
<p align="center"><img src="images/Octavo/bug.jpg" width="516" height="445"></p>
<p align="center">&nbsp;</p>
<blockquote>
<blockquote>
<p><font size="4">This is a Creature so officious, that 'twill be known to
every one at one time or other, so busie, and so impudent, that it will
be intruding it self in every ones company, and so proud and aspiring withall,
that it fears not to trample on the best, and affects nothing so much as
a Crown; feeds and lives very high, and that makes it so saucy, as to pull
any one by the ears that comes in its way, and will never be quiet till
it has drawn blood: it is troubled at nothing so much as at a man that scratches
his head, as knowing that man is plotting and contriving some mischief against
it, and that makes it oftentime sculk into some meaner and lower place, and
run behind a mans back, though it go very much against the hair; which ill
conditions of it having made it better known then trusted, would exempt me
from making any further description of it, did not my faithful Mercury, my
<blockquote>
<blockquote>
<p><font size="4">This is a Creature so officious, that 'twill be known to
every one at one time or other, so busie, and so impudent, that it will
be intruding it self in every ones company, and so proud and aspiring withall,
that it fears not to trample on the best, and affects nothing so much as
a Crown; feeds and lives very high, and that makes it so saucy, as to pull
any one by the ears that comes in its way, and will never be quiet till
it has drawn blood: it is troubled at nothing so much as at a man that scratches
his head, as knowing that man is plotting and contriving some mischief against
it, and that makes it oftentime sculk into some meaner and lower place, and
run behind a mans back, though it go very much against the hair; which ill
conditions of it having made it better known then trusted, would exempt me
from making any further description of it, did not my faithful Mercury, my
Microscope, bring me other information of it. </font></p>
<p><font size="4">For this has discovered to me, by means of a very bright light
cast on it, that it is a Creature of a very odd shape ; it has a head shap'd
like that exprest in 35. Scheme marked with A, which seems almost Conical,
but is a little flatted on the upper and under sides, at the biggest part
of which, on either side behind the head (as it were, being the place where
other Creatures ears stand) are placed its two black shining goggle eyes
B B, looking backwards, and fenced round with several small cilia or hairs
that incompass it, so that it seems this Creature has no very good foresight:
It does not seem to have any eyelids, and therefore perhaps its eyes were
so placed, that it might the better cleanse them with its forelegs; and perhaps
this may be the reason, why they so much avoid and run from the light behind
them, for being made to live in the shady and dark recesses of the hair,
and thence probably their eye having a great aperture, the open and clear
light, especially that of the Sun, must needs very much offend them; to secure
these eyes from receiving any injury from the hairs through which it passes,
it has two horns that grow before it, in the place where one would have thought
the eyes should be; each of these C C have four joynts, which are fringed,
as 'twere, with small brisles, from which to the tip of its snout D, the
head seems very round and tapering, ending in a very sharp nose D, which
seems to have a small hole, and to be the passage through which he sucks
<p><font size="4">For this has discovered to me, by means of a very bright light
cast on it, that it is a Creature of a very odd shape ; it has a head shap'd
like that exprest in 35. Scheme marked with A, which seems almost Conical,
but is a little flatted on the upper and under sides, at the biggest part
of which, on either side behind the head (as it were, being the place where
other Creatures ears stand) are placed its two black shining goggle eyes
B B, looking backwards, and fenced round with several small cilia or hairs
that incompass it, so that it seems this Creature has no very good foresight:
It does not seem to have any eyelids, and therefore perhaps its eyes were
so placed, that it might the better cleanse them with its forelegs; and perhaps
this may be the reason, why they so much avoid and run from the light behind
them, for being made to live in the shady and dark recesses of the hair,
and thence probably their eye having a great aperture, the open and clear
light, especially that of the Sun, must needs very much offend them; to secure
these eyes from receiving any injury from the hairs through which it passes,
it has two horns that grow before it, in the place where one would have thought
the eyes should be; each of these C C have four joynts, which are fringed,
as 'twere, with small brisles, from which to the tip of its snout D, the
head seems very round and tapering, ending in a very sharp nose D, which
seems to have a small hole, and to be the passage through which he sucks
the blood. </font></p>
<p>&nbsp;</p>
<p><img src="images/Octavo/bug2.jpg" width="537" height="348"></p>
<p><font size="4">Now whereas it if be plac'd on its back, with its belly
upwards, as it is in the 35. Scheme, it seems in several Positions to have
a resemblance of chaps, or jaws, as is represented in the Figure by E E,
yet in other postures those dark strokes disappear; and having kept several
of them in a box for two or three dayes, so that for all that time they had
nothing to feed on, I found, upon letting onecreep on my hand, that it immediately
fell to sucking, and did neither seem to thrust its nose very deep into the
skin, nor to open any kind of mouth, but I could plainly perceive a small
current of blood, which came directly from its snout, and past into its belly;
and about A there seem'd a contrivance, somewhat resembling a Pump, pair
of Bellows, or Heart, for by a very swift systole and diastole the blood
<p><font size="4">Now whereas it if be plac'd on its back, with its belly
upwards, as it is in the 35. Scheme, it seems in several Positions to have
a resemblance of chaps, or jaws, as is represented in the Figure by E E,
yet in other postures those dark strokes disappear; and having kept several
of them in a box for two or three dayes, so that for all that time they had
nothing to feed on, I found, upon letting onecreep on my hand, that it immediately
fell to sucking, and did neither seem to thrust its nose very deep into the
skin, nor to open any kind of mouth, but I could plainly perceive a small
current of blood, which came directly from its snout, and past into its belly;
and about A there seem'd a contrivance, somewhat resembling a Pump, pair
of Bellows, or Heart, for by a very swift systole and diastole the blood
seem'd drawn from the nose, and forced into the body. </font></p>
<p><font size="4">It did not seem at all, though I viewed it a good while as
it was sucking, to thrust more of its nose into the skin then the very snout
D, nor did it cause the least discernable pain, and yet the blood seem'd
to run through its head very quick and freely, so that it seems there is
no part of the skin but the blood is dispers'd into, nay, even into the
cuticula; for had it thrust its whole nose in from D to C C, it would not
have amounted to the supposed thickness of that tegument, the length of
<p><font size="4">It did not seem at all, though I viewed it a good while as
it was sucking, to thrust more of its nose into the skin then the very snout
D, nor did it cause the least discernable pain, and yet the blood seem'd
to run through its head very quick and freely, so that it seems there is
no part of the skin but the blood is dispers'd into, nay, even into the
cuticula; for had it thrust its whole nose in from D to C C, it would not
have amounted to the supposed thickness of that tegument, the length of
the nose being not more then a three hundredth part of an inch. </font></p>
<p><font size="4">It has six legs, covered with a very transparent shell,
and joynted exactly like a Crab's, or Lobster's; each leg is divided into
six parts by these joynts, and those have here and there several small hairs;
and at the end of each leg it has two claws, very properly adapted for its
peculiar use, being thereby inabled to walk very securely both on the skin
and hair; and indeed this contrivance of the feet is very curious, and could
not be made more commodiously and compendiously, for performing both these
requisite motions, of walking and climbing up the hair of a mans head, then
it is : for, by having the lesser claw (a) set so much short of the bigger
(b) when it walks on the skin the shorter touches not, and then the feet
are the same with those of a Mite, and several other small Insects, but by
means of the small joynts of the longer claw it can bend it round, and so
with both claws take hold of a hair, in the manner represented in the Figure,
<p><font size="4">It has six legs, covered with a very transparent shell,
and joynted exactly like a Crab's, or Lobster's; each leg is divided into
six parts by these joynts, and those have here and there several small hairs;
and at the end of each leg it has two claws, very properly adapted for its
peculiar use, being thereby inabled to walk very securely both on the skin
and hair; and indeed this contrivance of the feet is very curious, and could
not be made more commodiously and compendiously, for performing both these
requisite motions, of walking and climbing up the hair of a mans head, then
it is : for, by having the lesser claw (a) set so much short of the bigger
(b) when it walks on the skin the shorter touches not, and then the feet
are the same with those of a Mite, and several other small Insects, but by
means of the small joynts of the longer claw it can bend it round, and so
with both claws take hold of a hair, in the manner represented in the Figure,
the long transparent Cylinder F F F, being a Man's hair held by it. </font></p>
<p><font size="4">The Thorax seem'd cas'd with another kind of substance then
the belly, namely, with a thin transparent horny substance, which upon the fasting
of the Creature did not grow flaccid; through this I could plainly see the
blood, suck'd from my hand, to be variously distributed, and mov'd to and
fro; and about G there seem'd a pretty big white substance, which seem'd
to be moved within its thorax; besides, there appear'd very many small milk-white
vessels, which crost over the breast between the legs, out of which, on
either side, are many small branchings, these seem'd to be the veins and
arteries, for that which is analogus to blood in all Insects is milk-white.
<p><font size="4">The Thorax seem'd cas'd with another kind of substance then
the belly, namely, with a thin transparent horny substance, which upon the fasting
of the Creature did not grow flaccid; through this I could plainly see the
blood, suck'd from my hand, to be variously distributed, and mov'd to and
fro; and about G there seem'd a pretty big white substance, which seem'd
to be moved within its thorax; besides, there appear'd very many small milk-white
vessels, which crost over the breast between the legs, out of which, on
either side, are many small branchings, these seem'd to be the veins and
arteries, for that which is analogus to blood in all Insects is milk-white.
</font></p>
<p><font size="4">The belly is covered with a transparent substance likewise,
but more resembling a skin then a shell, for 'tis grain'd all over the belly
just like the skin in the palms of a man's hand, and when the belly is empty,
grows very flaccid and wrinkled ; at the upper end of this is placed the
stomach H H, and perhaps also the white spot I I may be the liver, or pancreas,
which by the peristaltick motion of the guts, is a little mov'd to and fro,
not with a systole and diastole, but rather with a thronging or justling
<p><font size="4">The belly is covered with a transparent substance likewise,
but more resembling a skin then a shell, for 'tis grain'd all over the belly
just like the skin in the palms of a man's hand, and when the belly is empty,
grows very flaccid and wrinkled ; at the upper end of this is placed the
stomach H H, and perhaps also the white spot I I may be the liver, or pancreas,
which by the peristaltick motion of the guts, is a little mov'd to and fro,
not with a systole and diastole, but rather with a thronging or justling
motion. </font></p>
<p><font size="4">Viewing one of these Creatures, after it had fasted two
dayes, all the hinder part was lank and flaccid, and the white spot I I
hardly mov'd, most of the white branchings disappear'd, and most also of
the redness or sucked blood in the guts, the peristaltick motion of which
was scarce discernable; but upon the suffering it to suck, it presently
fill'd the skin of the belly, and of the six scolop'd embosments on either side,
as full as it could be stuft ; the stomach and guts were as full as they
could hold; the peristaltick motion of the gut grew quick, and the justling
motion of I I accordingly ; multitudes of milk-white vessels seem'd quickly
filled, and turgid, which were perhaps the veins and arteries, and the Creature
was so greedy, that though it could not contain more, yet it continued sucking
as fast as ever, and as fast emptying it self behind : the digestion of this
Creature must needs be very quick, for though I perceiv'd the blood thicker
and blacker when suck'd, yet, when in the guts, it was of a very lovely
ruby colour, and that part of it, which was digested into the veins, seemed
white; whence it appears, that a further digestion of blood may make it
milk, at least of a resembling colour : What is else observable in the figure
<p><font size="4">Viewing one of these Creatures, after it had fasted two
dayes, all the hinder part was lank and flaccid, and the white spot I I
hardly mov'd, most of the white branchings disappear'd, and most also of
the redness or sucked blood in the guts, the peristaltick motion of which
was scarce discernable; but upon the suffering it to suck, it presently
fill'd the skin of the belly, and of the six scolop'd embosments on either side,
as full as it could be stuft ; the stomach and guts were as full as they
could hold; the peristaltick motion of the gut grew quick, and the justling
motion of I I accordingly ; multitudes of milk-white vessels seem'd quickly
filled, and turgid, which were perhaps the veins and arteries, and the Creature
was so greedy, that though it could not contain more, yet it continued sucking
as fast as ever, and as fast emptying it self behind : the digestion of this
Creature must needs be very quick, for though I perceiv'd the blood thicker
and blacker when suck'd, yet, when in the guts, it was of a very lovely
ruby colour, and that part of it, which was digested into the veins, seemed
white; whence it appears, that a further digestion of blood may make it
milk, at least of a resembling colour : What is else observable in the figure
of this Creature, maybe seen by the 35. Scheme.</font></p>
</blockquote>
<p>&nbsp;</p>

View File

@@ -1,7 +1,7 @@
<html>
<head>
<title>Untitled Document</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF">
@@ -20,21 +20,21 @@
<br>
<br>
</h3>
<p><font color="#990000" size="4">Images and text used by permission of Octavo
<p><font color="#990000" size="4">Images and text used by permission of Octavo
Corporation (www.octavo.com),<br>
</font><font color="#990000" size="4">(c) 1999 Octavo Corporation. All
</font><font color="#990000" size="4">(c) 1999 Octavo Corporation. All
rights reserved.</font> <br>
<br>
<br>
<font size="2">Octavo Corporation is a publisher of rare
books and manuscripts with digital tools and formats through partnerships
with libraries, museums, and individuals. Using high-resolution digital imaging
technology, Octavo releases digital rare books on CD-ROM as Adobe PDF files
which can be viewed on and printed from almost any computing platform. You
can view each page and the binding on your computer screen, zoom in to view
detail up to 800% in some cases, and search, copy and paste the "live" text
placed invisibly behind the page images which is available for selected Editions.
Also included in each edition is the work's collation and provenance, as well
<font size="2">Octavo Corporation is a publisher of rare
books and manuscripts with digital tools and formats through partnerships
with libraries, museums, and individuals. Using high-resolution digital imaging
technology, Octavo releases digital rare books on CD-ROM as Adobe PDF files
which can be viewed on and printed from almost any computing platform. You
can view each page and the binding on your computer screen, zoom in to view
detail up to 800% in some cases, and search, copy and paste the "live" text
placed invisibly behind the page images which is available for selected Editions.
Also included in each edition is the work's collation and provenance, as well
as commentary by a noted expert in its field. </font></p>
</blockquote>
<p>&nbsp;</p>

View File

@@ -1,34 +1,34 @@
<html>
<head>
<title>Untitled Document</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF">
<p align="center"><font size="5"><img src="images/Octavo/king.jpg" width="420" height="290">
<p align="center"><font size="5"><img src="images/Octavo/king.jpg" width="420" height="290">
</font></p>
<p align="center">&nbsp;</p>
<blockquote> <font size="4">Do here most humbly lay this small Present at Your
Majesties Royal feet. And though it comes accompany'd with two disadvantages,
the meanness of the Author, and of the Subject; yet in both I am incouraged
<blockquote> <font size="4">Do here most humbly lay this small Present at Your
Majesties Royal feet. And though it comes accompany'd with two disadvantages,
the meanness of the Author, and of the Subject; yet in both I am incouraged
by the greatness of your Mercy and your Knowledge. </font>
<p><font size="4">By the one I am taught , that you can forgive the most presumptuous
Offendors: And by the other, that you will not esteem the least work of Nature,
<p><font size="4">By the one I am taught , that you can forgive the most presumptuous
Offendors: And by the other, that you will not esteem the least work of Nature,
or Art, unworthy your Observation. </font></p>
<p><font size="4">Amidst the many felicities that have accompani'd your Majesties
happy Restauration and Government, it is none of the least considerable, that
<p><font size="4">Amidst the many felicities that have accompani'd your Majesties
happy Restauration and Government, it is none of the least considerable, that
Philosophy and Experimental Learning have prosper'd under your Royal Patronage.</font></p>
<p><font size="4">And as the calm prosperity of your Reign has given us the
leisure to follow these Studies of quiet and retirement, so it is just, that
the Fruits of them should, by way of acknowledgement, be return'd to your
Majesty. There are, Sir, several other of your Subjects, of your Royal Society,
now busie about Nobler matters: The Improvement of Manufactures and Agriculture,
the Increase of Commerce, the Advantage of Navigation: In all which they are
<p><font size="4">And as the calm prosperity of your Reign has given us the
leisure to follow these Studies of quiet and retirement, so it is just, that
the Fruits of them should, by way of acknowledgement, be return'd to your
Majesty. There are, Sir, several other of your Subjects, of your Royal Society,
now busie about Nobler matters: The Improvement of Manufactures and Agriculture,
the Increase of Commerce, the Advantage of Navigation: In all which they are
assisted by your Majesties Incouragement and Example. </font></p>
<p><font size="4">Amidst all those greater Designs, I here presume to bring
in that which is more proportionable to the smalness of my Abilities, and
to offer some of the least of all visible things, to that Mighty King, that
has establisht an Empire over the best of all Invisible things of this World,
<p><font size="4">Amidst all those greater Designs, I here presume to bring
in that which is more proportionable to the smalness of my Abilities, and
to offer some of the least of all visible things, to that Mighty King, that
has establisht an Empire over the best of all Invisible things of this World,
the Minds o f Men.</font></p>
<blockquote>
<p align="right">&nbsp;</p>

View File

@@ -1,7 +1,7 @@
<html>
<head>
<title>Untitled Document</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF">
@@ -9,101 +9,101 @@
<p>&nbsp;</p>
<h1 align="center">THE PREFACE</h1>
<img src="images/Octavo/micro.jpg" width="381" height="384"> </div>
<div align="right">
<div align="right">
<p align="left">&nbsp;</p>
<p>&nbsp;</p>
</div>
<blockquote>
<blockquote>
<div align="left">
<p><font size="5"> <font size="4">It is the great prerogative of Mankind above
other Creatures, that we are not only able to behold the works of Nature,
or barely to sustein our lives by them, but we have also the power of considering,
<p><font size="5"> <font size="4">It is the great prerogative of Mankind above
other Creatures, that we are not only able to behold the works of Nature,
or barely to sustein our lives by them, but we have also the power of considering,
comparing, altering, assisting, and improving them to various uses. </font></font></p>
<p><font size="4">And as this is the peculiar priviledge of humane Nature
in general, so is it capable of being so far advanced by the helps of Art,
and Experience, as to make some Men excel others in their Observations,
<p><font size="4">And as this is the peculiar priviledge of humane Nature
in general, so is it capable of being so far advanced by the helps of Art,
and Experience, as to make some Men excel others in their Observations,
and Deductions, almost as much as they do Beasts. </font></p>
<p><font size="4">By the addition of such artificial Instruments and methods,
there may be, in some manner, a reparation made for the mischiefs, and imperfection,
mankind has drawn upon itself, by negligence, and intemperance, and a wilful
and superstitious deserting the Prescripts and Rules of Nature, whereby
every man, both from a deriv'd corruption, innate and born with him, and
from his breeding and converse with men, is very subject to slip into all
<p><font size="4">By the addition of such artificial Instruments and methods,
there may be, in some manner, a reparation made for the mischiefs, and imperfection,
mankind has drawn upon itself, by negligence, and intemperance, and a wilful
and superstitious deserting the Prescripts and Rules of Nature, whereby
every man, both from a deriv'd corruption, innate and born with him, and
from his breeding and converse with men, is very subject to slip into all
sorts of errors. </font></p>
<p><font size="4">The only way which now remains for us to recover some degree
of those former perfections, seems to be, by rectifying the operations of
the Sense, the Memory, and Reason, since upon the evidence, the strength,
the integrity, and the right correspondence of all these, all the light,
by which our actions are to be guided, is to be renewed, and all our command
<p><font size="4">The only way which now remains for us to recover some degree
of those former perfections, seems to be, by rectifying the operations of
the Sense, the Memory, and Reason, since upon the evidence, the strength,
the integrity, and the right correspondence of all these, all the light,
by which our actions are to be guided, is to be renewed, and all our command
over things is to be establisht.</font></p>
<p><font size="4"> It is therefore most worthy of our consideration, to recollect
their several defects, that so we may the better understand how to supply
them, and by what assistances we may inlarge their power, and secure them
<p><font size="4"> It is therefore most worthy of our consideration, to recollect
their several defects, that so we may the better understand how to supply
them, and by what assistances we may inlarge their power, and secure them
in performing their particular duties.</font></p>
<p><font size="4">As for the actions of our Senses, we cannot but observe
them to be in many particulars much outdone by those of other Creatures,
and when at best, to be far short of the perfection they seem capable of
: And these infirmities of the Senses arise from a double cause, either
from the disproportion of the Object to the Organ, whereby an infinite number
of things can never enter into them, or else from error in the Perception,
that many things, which come within their reach, are not received in a right
<p><font size="4">As for the actions of our Senses, we cannot but observe
them to be in many particulars much outdone by those of other Creatures,
and when at best, to be far short of the perfection they seem capable of
: And these infirmities of the Senses arise from a double cause, either
from the disproportion of the Object to the Organ, whereby an infinite number
of things can never enter into them, or else from error in the Perception,
that many things, which come within their reach, are not received in a right
manner. </font></p>
<p><font size="4">The like frailties are to be found in the Memory; we often
let many things slip away from us, which deserve to be retain'd; and of
those which we treasure up, a great part is either frivolous or false ;
and if good, and substantial, either in tract of time obliterated, or at
best so overwhelmed and buried under more frothy notions, that when there
<p><font size="4">The like frailties are to be found in the Memory; we often
let many things slip away from us, which deserve to be retain'd; and of
those which we treasure up, a great part is either frivolous or false ;
and if good, and substantial, either in tract of time obliterated, or at
best so overwhelmed and buried under more frothy notions, that when there
is need of them, they are in vain sought for. </font></p>
<p><font size="4">The two main foundations being so deceivable, it is no wonder,
that all the succeeding works which we build upon them, of arguing, concluding,
defining, judging, and all the other degrees of Reason, are lyable to the
same imperfection, being, at best, either vain, or uncertain: So that the
errors of the understanding are answerable to the two other, being defective
both in the quantity and goodness of its knowledge; for the limits, to which
our thoughts are confind, are small in respect of the vast extent of Nature
it self; some parts of it are too large to be comprehended, and some too
<p><font size="4">The two main foundations being so deceivable, it is no wonder,
that all the succeeding works which we build upon them, of arguing, concluding,
defining, judging, and all the other degrees of Reason, are lyable to the
same imperfection, being, at best, either vain, or uncertain: So that the
errors of the understanding are answerable to the two other, being defective
both in the quantity and goodness of its knowledge; for the limits, to which
our thoughts are confind, are small in respect of the vast extent of Nature
it self; some parts of it are too large to be comprehended, and some too
little to be perceived. </font></p>
<p><font size="4">And from thence it must follow, that not having a full sensation
of the Object, we must be very lame and imperfect in our conceptions about
it, and in all the propositions which we build upon it; hence we often take
the shadow of things for the substance, small appearances for good similitudes,
similitudes for definitions; and even many of those, which we think to be
the most solid definitions, are rather expressions of our own misguided
<p><font size="4">And from thence it must follow, that not having a full sensation
of the Object, we must be very lame and imperfect in our conceptions about
it, and in all the propositions which we build upon it; hence we often take
the shadow of things for the substance, small appearances for good similitudes,
similitudes for definitions; and even many of those, which we think to be
the most solid definitions, are rather expressions of our own misguided
apprehensions then of the true nature of the things themselves. </font></p>
<p><font size="4">The effects of these imperfections are manifested in different
ways, according to the temper and disposition of the several minds of men,
some they incline to gross ignorance and stupidity, and others to a presumptuous
imposing on other mens Opinions, and a confident dogmatizing on matters,
<p><font size="4">The effects of these imperfections are manifested in different
ways, according to the temper and disposition of the several minds of men,
some they incline to gross ignorance and stupidity, and others to a presumptuous
imposing on other mens Opinions, and a confident dogmatizing on matters,
whereof there is no assurance to be given. </font></p>
<p><font size="4">Thus all the uncertainty, and mistakes of humane actions,
proceed either from the narrowness and wandring of our Senses, from the
slipperiness or delusion of our Memory, from the confinement or rashness
of our Understanding, so that 'tis no wonder, that our power over natural
causes and effects is so slowly improvd, seeing we are not only to contend
with the obscurity and difficulty of the things whereon we work and think,
<p><font size="4">Thus all the uncertainty, and mistakes of humane actions,
proceed either from the narrowness and wandring of our Senses, from the
slipperiness or delusion of our Memory, from the confinement or rashness
of our Understanding, so that 'tis no wonder, that our power over natural
causes and effects is so slowly improvd, seeing we are not only to contend
with the obscurity and difficulty of the things whereon we work and think,
but even the forces of our own minds conspire to betray us. </font></p>
<p><font size="4">These being the dangers in the process of humane Reason,
the remedies of them all can only proceed from the real, the mechanical,
the experimental Philosophy, which has this advantage over the Philosophy
of discourse and disputation, that whereas that chiefly aims at the subtilty
of its Deductions and Conclusions, without much regard to the first groundwork,
which ought to be well laid on the Sense and Memory ; so this intends the
right ordering of them all, and the making them serviceable to each other.
<p><font size="4">These being the dangers in the process of humane Reason,
the remedies of them all can only proceed from the real, the mechanical,
the experimental Philosophy, which has this advantage over the Philosophy
of discourse and disputation, that whereas that chiefly aims at the subtilty
of its Deductions and Conclusions, without much regard to the first groundwork,
which ought to be well laid on the Sense and Memory ; so this intends the
right ordering of them all, and the making them serviceable to each other.
</font></p>
<p><font size="4">The first thing to be undertaken in this weighty work, is
a watchfulness over the failings and an inlargement of the dominion, of
the Senses. To which end it is requisite, first, That there should be a
scrupulous choice, and a strict examination, of the reality, constancy,
and certainty of the Particulars that we admit: This is the first rise whereon
truth is to begin, and here the most severe, and most impartial diligence,
must be imployed ; the storing up of all, without any regard to evidence
<p><font size="4">The first thing to be undertaken in this weighty work, is
a watchfulness over the failings and an inlargement of the dominion, of
the Senses. To which end it is requisite, first, That there should be a
scrupulous choice, and a strict examination, of the reality, constancy,
and certainty of the Particulars that we admit: This is the first rise whereon
truth is to begin, and here the most severe, and most impartial diligence,
must be imployed ; the storing up of all, without any regard to evidence
or use, will only tend to darkness and confusion. </font></p>
<p><font size="4">We must not therefore esteem the riches of our Philosophical
treasure by the number only, but chiefly by the weight; the most vulgar
Instances are not to be neglected, but above all, the most instructive are
to be entertain'd: the footsteps of Nature are to be trac'd, not only in
her ordinary course,but when she seems to be put to her shifts, to make
many doublings and turnings, and to use some kind of art in indeavouring
<p><font size="4">We must not therefore esteem the riches of our Philosophical
treasure by the number only, but chiefly by the weight; the most vulgar
Instances are not to be neglected, but above all, the most instructive are
to be entertain'd: the footsteps of Nature are to be trac'd, not only in
her ordinary course,but when she seems to be put to her shifts, to make
many doublings and turnings, and to use some kind of art in indeavouring
to avoid our discovery. </font></p>
<p>&nbsp;</p>
<p><a href="king.html"><img src="images/htmldemo/back.jpg" width="146" height="40" align="left" border="0"></a><a href="seaweed.html"><img src="images/htmldemo/forward.jpg" width="196" height="40" align="right" border="0"></a></p>

View File

@@ -1,7 +1,7 @@
<html>
<head>
<title>Untitled Document</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF">
@@ -11,47 +11,47 @@
<p align="center"><img src="images/Octavo/seaweed.jpg" width="316" height="498"></p>
<p align="center">&nbsp;</p>
<blockquote>
<p><font size="4">For curiosity and beauty, I have not among all the Plants
or Vegetables I have yet observ'd, seen any one comparable to this Sea-weed
I have here describ'd, of which I am able to say very little more then what
is represented by the second Figure of the ninth Scheme: Namely, that it is
a Plant which grows upon the Rocks under the water, and increases and spreads
it self into a great tuft, which is not onely handsomely branch'd into several
leaves, but the whole surface of the Plant is cover'd over with a most curious
kind of carv'd work, which consists of a texture much resembling a Honeycomb;
for the whole surface on both sides is cover'd over with a multitude of very
small holes, being no bigger then so many holes made with the point of a small
Pinn, and rang'd in the neatest and most delicate order imaginable, they being
plac'd in the manner of a Quincunx, or very much like the rows of the eyes
of a Fly, the rows or orders being very regular, which way soever they are
observ'd: what the texture was, as it appear'd through a pretty bigg Magnifying
Microscope, I have here adjoin'd in the first Figure of the 14. Scheme. which
round Area A B C D represents a part of the surface about one eighth part
of an Inch in Diameter: Those little holes, which to the eye look'd round,
like so many little spots, here appear'd very regularly shap'd holes, representing
almost the shape of the sole of a round toed shoe, the hinder part of which,
is, as it were, trod on or cover'd by the toe of that next below it; these
holes seem'd wall'd about with a very thin and transparent substance, looking
of a pale straw-colour; from the edge of which, against the middle of each
hole, were sprouted out four small transparent straw-colour'd Thorns, which
seem'd to protect and cover those cavities, from either side two; neer the
root of this Plant, were sprouted out several small branches of a kind of
<p><font size="4">For curiosity and beauty, I have not among all the Plants
or Vegetables I have yet observ'd, seen any one comparable to this Sea-weed
I have here describ'd, of which I am able to say very little more then what
is represented by the second Figure of the ninth Scheme: Namely, that it is
a Plant which grows upon the Rocks under the water, and increases and spreads
it self into a great tuft, which is not onely handsomely branch'd into several
leaves, but the whole surface of the Plant is cover'd over with a most curious
kind of carv'd work, which consists of a texture much resembling a Honeycomb;
for the whole surface on both sides is cover'd over with a multitude of very
small holes, being no bigger then so many holes made with the point of a small
Pinn, and rang'd in the neatest and most delicate order imaginable, they being
plac'd in the manner of a Quincunx, or very much like the rows of the eyes
of a Fly, the rows or orders being very regular, which way soever they are
observ'd: what the texture was, as it appear'd through a pretty bigg Magnifying
Microscope, I have here adjoin'd in the first Figure of the 14. Scheme. which
round Area A B C D represents a part of the surface about one eighth part
of an Inch in Diameter: Those little holes, which to the eye look'd round,
like so many little spots, here appear'd very regularly shap'd holes, representing
almost the shape of the sole of a round toed shoe, the hinder part of which,
is, as it were, trod on or cover'd by the toe of that next below it; these
holes seem'd wall'd about with a very thin and transparent substance, looking
of a pale straw-colour; from the edge of which, against the middle of each
hole, were sprouted out four small transparent straw-colour'd Thorns, which
seem'd to protect and cover those cavities, from either side two; neer the
root of this Plant, were sprouted out several small branches of a kind of
bastard Coralline, curiously branch'd, though small. </font></p>
<p><font size="4">And to confirm this, having lately the opportunity of viewing
the large Plant (if I may so call it) of a Sponge petrify'd, of which I made
mention in the last Observation, I found, that each of the Branches or Figures
of it, did, by the range of its pores, exhibit just such a texture, the rows
of pores crossing one another, much after the manner as the rows of eyes do
which are describ'd in the 26. Scheme : Coralline also, and several sorts of
white Coral, I have with a Microscope observ'd very curiously shap'd. And
I doubt not, but that he that shall observe these several kinds of Plants that
grow upon Rocks, which the Sea sometimes overflows, and those heaps of others
which are vomited out of it upon the shore, may find multitudes of little
Plants, and other bodies, which like this will afford very beautifull objects
for the Microscope ; and this Specimen here is adjoin'd onely to excite their
curiosities who have opportunity of observing to examine and collect what
they find worthy their notice; for the Sea, among terrestrial bodies, is also
a prolifick mother, and affords as many Instances of spontaneous generations
<p><font size="4">And to confirm this, having lately the opportunity of viewing
the large Plant (if I may so call it) of a Sponge petrify'd, of which I made
mention in the last Observation, I found, that each of the Branches or Figures
of it, did, by the range of its pores, exhibit just such a texture, the rows
of pores crossing one another, much after the manner as the rows of eyes do
which are describ'd in the 26. Scheme : Coralline also, and several sorts of
white Coral, I have with a Microscope observ'd very curiously shap'd. And
I doubt not, but that he that shall observe these several kinds of Plants that
grow upon Rocks, which the Sea sometimes overflows, and those heaps of others
which are vomited out of it upon the shore, may find multitudes of little
Plants, and other bodies, which like this will afford very beautifull objects
for the Microscope ; and this Specimen here is adjoin'd onely to excite their
curiosities who have opportunity of observing to examine and collect what
they find worthy their notice; for the Sea, among terrestrial bodies, is also
a prolifick mother, and affords as many Instances of spontaneous generations
as either the Air or Earth.</font></p>
<p>&nbsp;</p>
<p><a href="preface.html"><img src="images/htmldemo/back.jpg" width="146" height="40" align="left" border="0"></a><a href="ant.html"><img src="images/htmldemo/forward.jpg" width="196" height="40" align="right" border="0"></a></p>

View File

@@ -1,7 +1,7 @@
<html>
<head>
<title>Untitled Document</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body bgcolor="#FFFFFF">
@@ -14,18 +14,18 @@
<p align="center"> <b>MADE BY </b></p>
<p align="center"><font size="5" color="#9F1040">MAGNIFYING GLASSES. </font></p>
<p align="center"><b>WITH </b></p>
<p align="center"><b><font color="#990033">OBSERVATIONS</font></b> and <b><font color="#9F1040">INQUIRIES</font></b>
<p align="center"><b><font color="#990033">OBSERVATIONS</font></b> and <b><font color="#9F1040">INQUIRIES</font></b>
thereupon.</p>
<p align="center"> By <font color="#990033"><i><b>R. HOOKE</b></i></font><b><i>
<p align="center"> By <font color="#990033"><i><b>R. HOOKE</b></i></font><b><i>
,</i></b> Fellow of the <font color="#990033">ROYAL SOCIETY</font> .</p>
<p align="center"><img src="images/Octavo/crest.jpg" width="320" height="342"></p>
<blockquote>
<blockquote>
<blockquote>
<p align="center"><i>LONDON</i>, Printed by <font color="#990033"><i>Jo.
Martyn</i>,</font> and <font color="#990033"><i>Ja. Allestry,</i></font>
Printers to the <font color="#990033">ROYAL SOCIETY </font>, and are to
be sold at their Shop at the Bell in S. Paul's Church-yard. <font color="#990000">M
<blockquote>
<blockquote>
<blockquote>
<p align="center"><i>LONDON</i>, Printed by <font color="#990033"><i>Jo.
Martyn</i>,</font> and <font color="#990033"><i>Ja. Allestry,</i></font>
Printers to the <font color="#990033">ROYAL SOCIETY </font>, and are to
be sold at their Shop at the Bell in S. Paul's Church-yard. <font color="#990000">M
D C L X V.</font></p>
<p align="center"><font color="#990000"><br>
</font></p>

View File

@@ -0,0 +1,3 @@
[*.{cpp,hpp,c,h}]
indent_style = space
indent_size = 2

View File

@@ -1,5 +1,5 @@
//
// Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2014, 2024, Red Hat, Inc. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
@@ -2296,26 +2296,6 @@ bool Matcher::match_rule_supported(int opcode) {
return false;
}
break;
case Op_FmaHF:
// UseFMA flag also needs to be checked along with FEAT_FP16
if (!UseFMA || !is_feat_fp16_supported()) {
return false;
}
break;
case Op_AddHF:
case Op_SubHF:
case Op_MulHF:
case Op_DivHF:
case Op_MinHF:
case Op_MaxHF:
case Op_SqrtHF:
// Half-precision floating point scalar operations require FEAT_FP16
// to be available. FEAT_FP16 is enabled if both "fphp" and "asimdhp"
// features are supported.
if (!is_feat_fp16_supported()) {
return false;
}
break;
}
return true; // Per default match rules are supported.
@@ -2326,11 +2306,11 @@ const RegMask* Matcher::predicate_reg_mask(void) {
}
bool Matcher::supports_vector_calling_convention(void) {
return EnableVectorSupport;
return EnableVectorSupport && UseVectorStubs;
}
OptoRegPair Matcher::vector_return_value(uint ideal_reg) {
assert(EnableVectorSupport, "sanity");
assert(EnableVectorSupport && UseVectorStubs, "sanity");
int lo = V0_num;
int hi = V0_H_num;
if (ideal_reg == Op_VecX || ideal_reg == Op_VecA) {
@@ -4619,15 +4599,6 @@ operand immF0()
interface(CONST_INTER);
%}
// Half Float (FP16) Immediate
operand immH()
%{
match(ConH);
op_cost(0);
format %{ %}
interface(CONST_INTER);
%}
//
operand immFPacked()
%{
@@ -6971,21 +6942,6 @@ instruct loadConD(vRegD dst, immD con) %{
ins_pipe(fp_load_constant_d);
%}
// Load Half Float Constant
// The "ldr" instruction loads a 32-bit word from the constant pool into a
// 32-bit register but only the bottom half will be populated and the top
// 16 bits are zero.
instruct loadConH(vRegF dst, immH con) %{
match(Set dst con);
format %{
"ldrs $dst, [$constantaddress]\t# load from constant table: half float=$con\n\t"
%}
ins_encode %{
__ ldrs(as_FloatRegister($dst$$reg), $constantaddress($con));
%}
ins_pipe(fp_load_constant_s);
%}
// Store Instructions
// Store Byte
@@ -8188,7 +8144,6 @@ instruct castPP(iRegPNoSp dst)
instruct castII(iRegI dst)
%{
predicate(VerifyConstraintCasts == 0);
match(Set dst (CastII dst));
size(0);
@@ -8198,22 +8153,8 @@ instruct castII(iRegI dst)
ins_pipe(pipe_class_empty);
%}
instruct castII_checked(iRegI dst, rFlagsReg cr)
%{
predicate(VerifyConstraintCasts > 0);
match(Set dst (CastII dst));
effect(KILL cr);
format %{ "# castII_checked of $dst" %}
ins_encode %{
__ verify_int_in_range(_idx, bottom_type()->is_int(), $dst$$Register, rscratch1);
%}
ins_pipe(pipe_slow);
%}
instruct castLL(iRegL dst)
%{
predicate(VerifyConstraintCasts == 0);
match(Set dst (CastLL dst));
size(0);
@@ -8223,29 +8164,6 @@ instruct castLL(iRegL dst)
ins_pipe(pipe_class_empty);
%}
instruct castLL_checked(iRegL dst, rFlagsReg cr)
%{
predicate(VerifyConstraintCasts > 0);
match(Set dst (CastLL dst));
effect(KILL cr);
format %{ "# castLL_checked of $dst" %}
ins_encode %{
__ verify_long_in_range(_idx, bottom_type()->is_long(), $dst$$Register, rscratch1);
%}
ins_pipe(pipe_slow);
%}
instruct castHH(vRegF dst)
%{
match(Set dst (CastHH dst));
size(0);
format %{ "# castHH of $dst" %}
ins_encode(/* empty encoding */);
ins_cost(0);
ins_pipe(pipe_class_empty);
%}
instruct castFF(vRegF dst)
%{
match(Set dst (CastFF dst));
@@ -13688,17 +13606,6 @@ instruct bits_reverse_L(iRegLNoSp dst, iRegL src)
// ============================================================================
// Floating Point Arithmetic Instructions
instruct addHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (AddHF src1 src2));
format %{ "faddh $dst, $src1, $src2" %}
ins_encode %{
__ faddh($dst$$FloatRegister,
$src1$$FloatRegister,
$src2$$FloatRegister);
%}
ins_pipe(fp_dop_reg_reg_s);
%}
instruct addF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (AddF src1 src2));
@@ -13729,17 +13636,6 @@ instruct addD_reg_reg(vRegD dst, vRegD src1, vRegD src2) %{
ins_pipe(fp_dop_reg_reg_d);
%}
instruct subHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (SubHF src1 src2));
format %{ "fsubh $dst, $src1, $src2" %}
ins_encode %{
__ fsubh($dst$$FloatRegister,
$src1$$FloatRegister,
$src2$$FloatRegister);
%}
ins_pipe(fp_dop_reg_reg_s);
%}
instruct subF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (SubF src1 src2));
@@ -13770,17 +13666,6 @@ instruct subD_reg_reg(vRegD dst, vRegD src1, vRegD src2) %{
ins_pipe(fp_dop_reg_reg_d);
%}
instruct mulHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (MulHF src1 src2));
format %{ "fmulh $dst, $src1, $src2" %}
ins_encode %{
__ fmulh($dst$$FloatRegister,
$src1$$FloatRegister,
$src2$$FloatRegister);
%}
ins_pipe(fp_dop_reg_reg_s);
%}
instruct mulF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (MulF src1 src2));
@@ -13811,20 +13696,6 @@ instruct mulD_reg_reg(vRegD dst, vRegD src1, vRegD src2) %{
ins_pipe(fp_dop_reg_reg_d);
%}
// src1 * src2 + src3 (half-precision float)
instruct maddHF_reg_reg(vRegF dst, vRegF src1, vRegF src2, vRegF src3) %{
match(Set dst (FmaHF src3 (Binary src1 src2)));
format %{ "fmaddh $dst, $src1, $src2, $src3" %}
ins_encode %{
assert(UseFMA, "Needs FMA instructions support.");
__ fmaddh($dst$$FloatRegister,
$src1$$FloatRegister,
$src2$$FloatRegister,
$src3$$FloatRegister);
%}
ins_pipe(pipe_class_default);
%}
// src1 * src2 + src3
instruct maddF_reg_reg(vRegF dst, vRegF src1, vRegF src2, vRegF src3) %{
match(Set dst (FmaF src3 (Binary src1 src2)));
@@ -13966,29 +13837,6 @@ instruct mnsubD_reg_reg(vRegD dst, vRegD src1, vRegD src2, vRegD src3, immD0 zer
ins_pipe(pipe_class_default);
%}
// Math.max(HH)H (half-precision float)
instruct maxHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (MaxHF src1 src2));
format %{ "fmaxh $dst, $src1, $src2" %}
ins_encode %{
__ fmaxh($dst$$FloatRegister,
$src1$$FloatRegister,
$src2$$FloatRegister);
%}
ins_pipe(fp_dop_reg_reg_s);
%}
// Math.min(HH)H (half-precision float)
instruct minHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (MinHF src1 src2));
format %{ "fminh $dst, $src1, $src2" %}
ins_encode %{
__ fminh($dst$$FloatRegister,
$src1$$FloatRegister,
$src2$$FloatRegister);
%}
ins_pipe(fp_dop_reg_reg_s);
%}
// Math.max(FF)F
instruct maxF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
@@ -14046,16 +13894,6 @@ instruct minD_reg_reg(vRegD dst, vRegD src1, vRegD src2) %{
ins_pipe(fp_dop_reg_reg_d);
%}
instruct divHF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (DivHF src1 src2));
format %{ "fdivh $dst, $src1, $src2" %}
ins_encode %{
__ fdivh($dst$$FloatRegister,
$src1$$FloatRegister,
$src2$$FloatRegister);
%}
ins_pipe(fp_div_s);
%}
instruct divF_reg_reg(vRegF dst, vRegF src1, vRegF src2) %{
match(Set dst (DivF src1 src2));
@@ -14229,16 +14067,6 @@ instruct sqrtF_reg(vRegF dst, vRegF src) %{
ins_pipe(fp_div_d);
%}
instruct sqrtHF_reg(vRegF dst, vRegF src) %{
match(Set dst (SqrtHF src));
format %{ "fsqrth $dst, $src" %}
ins_encode %{
__ fsqrth($dst$$FloatRegister,
$src$$FloatRegister);
%}
ins_pipe(fp_div_s);
%}
// Math.rint, floor, ceil
instruct roundD_reg(vRegD dst, vRegD src, immI rmode) %{
match(Set dst (RoundDoubleMode src rmode));
@@ -17288,64 +17116,6 @@ instruct expandBitsL_memcon(iRegINoSp dst, memory8 mem, immL mask,
ins_pipe(pipe_slow);
%}
//----------------------------- Reinterpret ----------------------------------
// Reinterpret a half-precision float value in a floating point register to a general purpose register
instruct reinterpretHF2S(iRegINoSp dst, vRegF src) %{
match(Set dst (ReinterpretHF2S src));
format %{ "reinterpretHF2S $dst, $src" %}
ins_encode %{
__ smov($dst$$Register, $src$$FloatRegister, __ H, 0);
%}
ins_pipe(pipe_slow);
%}
// Reinterpret a half-precision float value in a general purpose register to a floating point register
instruct reinterpretS2HF(vRegF dst, iRegINoSp src) %{
match(Set dst (ReinterpretS2HF src));
format %{ "reinterpretS2HF $dst, $src" %}
ins_encode %{
__ mov($dst$$FloatRegister, __ H, 0, $src$$Register);
%}
ins_pipe(pipe_slow);
%}
// Without this optimization, ReinterpretS2HF (ConvF2HF src) would result in the following
// instructions (the first two are for ConvF2HF and the last instruction is for ReinterpretS2HF) -
// fcvt $tmp1_fpr, $src_fpr // Convert float to half-precision float
// mov $tmp2_gpr, $tmp1_fpr // Move half-precision float in FPR to a GPR
// mov $dst_fpr, $tmp2_gpr // Move the result from a GPR to an FPR
// The move from FPR to GPR in ConvF2HF and the move from GPR to FPR in ReinterpretS2HF
// can be omitted in this pattern, resulting in -
// fcvt $dst, $src // Convert float to half-precision float
instruct convF2HFAndS2HF(vRegF dst, vRegF src)
%{
match(Set dst (ReinterpretS2HF (ConvF2HF src)));
format %{ "convF2HFAndS2HF $dst, $src" %}
ins_encode %{
__ fcvtsh($dst$$FloatRegister, $src$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}
// Without this optimization, ConvHF2F (ReinterpretHF2S src) would result in the following
// instructions (the first one is for ReinterpretHF2S and the last two are for ConvHF2F) -
// mov $tmp1_gpr, $src_fpr // Move the half-precision float from an FPR to a GPR
// mov $tmp2_fpr, $tmp1_gpr // Move the same value from GPR to an FPR
// fcvt $dst_fpr, $tmp2_fpr // Convert the half-precision float to 32-bit float
// The move from FPR to GPR in ReinterpretHF2S and the move from GPR to FPR in ConvHF2F
// can be omitted as the input (src) is already in an FPR required for the fcvths instruction
// resulting in -
// fcvt $dst, $src // Convert half-precision float to a 32-bit float
instruct convHF2SAndHF2F(vRegF dst, vRegF src)
%{
match(Set dst (ConvHF2F (ReinterpretHF2S src)));
format %{ "convHF2SAndHF2F $dst, $src" %}
ins_encode %{
__ fcvths($dst$$FloatRegister, $src$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}
// ============================================================================
// This name is KNOWN by the ADLC and cannot be changed.
// The ADLC forces a 'TypeRawPtr::BOTTOM' output type

View File

@@ -1,6 +1,6 @@
//
// Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2020, 2025, Arm Limited. All rights reserved.
// Copyright (c) 2020, 2024, Arm Limited. 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
@@ -225,26 +225,6 @@ source %{
return false;
}
break;
case Op_AddVHF:
case Op_SubVHF:
case Op_MulVHF:
case Op_DivVHF:
case Op_MinVHF:
case Op_MaxVHF:
case Op_SqrtVHF:
// FEAT_FP16 is enabled if both "fphp" and "asimdhp" features are supported.
// Only the Neon instructions need this check. SVE supports half-precision floats
// by default.
if (UseSVE == 0 && !is_feat_fp16_supported()) {
return false;
}
break;
case Op_FmaVHF:
// UseFMA flag needs to be checked along with FEAT_FP16
if (!UseFMA || (UseSVE == 0 && !is_feat_fp16_supported())) {
return false;
}
break;
default:
break;
}
@@ -290,19 +270,6 @@ source %{
case Op_StoreVectorScatter:
opcode = Op_StoreVectorScatterMasked;
break;
// Currently, the masked versions of the following 8 Float16 operations are disabled.
// When the support for Float16 vector classes is added in VectorAPI and the masked
// Float16 IR can be generated, these masked operations will be enabled and relevant
// backend support added.
case Op_AddVHF:
case Op_SubVHF:
case Op_MulVHF:
case Op_DivVHF:
case Op_MaxVHF:
case Op_MinVHF:
case Op_SqrtVHF:
case Op_FmaVHF:
return false;
default:
break;
}
@@ -616,22 +583,6 @@ instruct vaddL(vReg dst, vReg src1, vReg src2) %{
ins_pipe(pipe_slow);
%}
instruct vaddHF(vReg dst, vReg src1, vReg src2) %{
match(Set dst (AddVHF src1 src2));
format %{ "vaddHF $dst, $src1, $src2" %}
ins_encode %{
uint length_in_bytes = Matcher::vector_length_in_bytes(this);
if (VM_Version::use_neon_for_vector(length_in_bytes)) {
__ fadd($dst$$FloatRegister, get_arrangement(this),
$src1$$FloatRegister, $src2$$FloatRegister);
} else {
assert(UseSVE > 0, "must be sve");
__ sve_fadd($dst$$FloatRegister, __ H, $src1$$FloatRegister, $src2$$FloatRegister);
}
%}
ins_pipe(pipe_slow);
%}
instruct vaddF(vReg dst, vReg src1, vReg src2) %{
match(Set dst (AddVF src1 src2));
format %{ "vaddF $dst, $src1, $src2" %}
@@ -856,22 +807,6 @@ instruct vsubL(vReg dst, vReg src1, vReg src2) %{
ins_pipe(pipe_slow);
%}
instruct vsubHF(vReg dst, vReg src1, vReg src2) %{
match(Set dst (SubVHF src1 src2));
format %{ "vsubHF $dst, $src1, $src2" %}
ins_encode %{
uint length_in_bytes = Matcher::vector_length_in_bytes(this);
if (VM_Version::use_neon_for_vector(length_in_bytes)) {
__ fsub($dst$$FloatRegister, get_arrangement(this),
$src1$$FloatRegister, $src2$$FloatRegister);
} else {
assert(UseSVE > 0, "must be sve");
__ sve_fsub($dst$$FloatRegister, __ H, $src1$$FloatRegister, $src2$$FloatRegister);
}
%}
ins_pipe(pipe_slow);
%}
instruct vsubF(vReg dst, vReg src1, vReg src2) %{
match(Set dst (SubVF src1 src2));
format %{ "vsubF $dst, $src1, $src2" %}
@@ -1069,22 +1004,6 @@ instruct vmulL_sve(vReg dst_src1, vReg src2) %{
// vector mul - floating-point
instruct vmulHF(vReg dst, vReg src1, vReg src2) %{
match(Set dst (MulVHF src1 src2));
format %{ "vmulHF $dst, $src1, $src2" %}
ins_encode %{
uint length_in_bytes = Matcher::vector_length_in_bytes(this);
if (VM_Version::use_neon_for_vector(length_in_bytes)) {
__ fmul($dst$$FloatRegister, get_arrangement(this),
$src1$$FloatRegister, $src2$$FloatRegister);
} else {
assert(UseSVE > 0, "must be sve");
__ sve_fmul($dst$$FloatRegister, __ H, $src1$$FloatRegister, $src2$$FloatRegister);
}
%}
ins_pipe(pipe_slow);
%}
instruct vmulF(vReg dst, vReg src1, vReg src2) %{
match(Set dst (MulVF src1 src2));
format %{ "vmulF $dst, $src1, $src2" %}
@@ -1183,28 +1102,6 @@ instruct vmulD_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
// vector float div
instruct vdivHF_neon(vReg dst, vReg src1, vReg src2) %{
predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
match(Set dst (DivVHF src1 src2));
format %{ "vdivHF_neon $dst, $src1, $src2" %}
ins_encode %{
__ fdiv($dst$$FloatRegister, get_arrangement(this),
$src1$$FloatRegister, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}
instruct vdivHF_sve(vReg dst_src1, vReg src2) %{
predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
match(Set dst_src1 (DivVHF dst_src1 src2));
format %{ "vdivHF_sve $dst_src1, $dst_src1, $src2" %}
ins_encode %{
assert(UseSVE > 0, "must be sve");
__ sve_fdiv($dst_src1$$FloatRegister, __ H, ptrue, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}
instruct vdivF_neon(vReg dst, vReg src1, vReg src2) %{
predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
match(Set dst (DivVF src1 src2));
@@ -2094,21 +1991,6 @@ instruct vnegD_masked(vReg dst_src, pRegGov pg) %{
// vector sqrt
instruct vsqrtHF(vReg dst, vReg src) %{
match(Set dst (SqrtVHF src));
format %{ "vsqrtHF $dst, $src" %}
ins_encode %{
uint length_in_bytes = Matcher::vector_length_in_bytes(this);
if (VM_Version::use_neon_for_vector(length_in_bytes)) {
__ fsqrt($dst$$FloatRegister, get_arrangement(this), $src$$FloatRegister);
} else {
assert(UseSVE > 0, "must be sve");
__ sve_fsqrt($dst$$FloatRegister, __ H, ptrue, $src$$FloatRegister);
}
%}
ins_pipe(pipe_slow);
%}
instruct vsqrtF(vReg dst, vReg src) %{
match(Set dst (SqrtVF src));
format %{ "vsqrtF $dst, $src" %}
@@ -2187,7 +2069,7 @@ instruct vminL_sve(vReg dst_src1, vReg src2) %{
ins_pipe(pipe_slow);
%}
// vector min - B/S/I/HF/F/D
// vector min - B/S/I/F/D
instruct vmin_neon(vReg dst, vReg src1, vReg src2) %{
predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
@@ -2228,29 +2110,6 @@ instruct vmin_sve(vReg dst_src1, vReg src2) %{
ins_pipe(pipe_slow);
%}
instruct vmin_HF_neon(vReg dst, vReg src1, vReg src2) %{
predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
match(Set dst (MinVHF src1 src2));
format %{ "vmin_HF_neon $dst, $src1, $src2\t# Half float" %}
ins_encode %{
__ fmin($dst$$FloatRegister, get_arrangement(this),
$src1$$FloatRegister, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}
instruct vmin_HF_sve(vReg dst_src1, vReg src2) %{
predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
match(Set dst_src1 (MinVHF dst_src1 src2));
format %{ "vmin_HF_sve $dst_src1, $dst_src1, $src2\t# Half float" %}
ins_encode %{
assert(UseSVE > 0, "must be sve");
__ sve_fmin($dst_src1$$FloatRegister, __ H,
ptrue, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}
// vector min - predicated
instruct vmin_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
@@ -2367,7 +2226,7 @@ instruct vmaxL_sve(vReg dst_src1, vReg src2) %{
ins_pipe(pipe_slow);
%}
// vector max - B/S/I/HF/F/D
// vector max - B/S/I/F/D
instruct vmax_neon(vReg dst, vReg src1, vReg src2) %{
predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
@@ -2408,29 +2267,6 @@ instruct vmax_sve(vReg dst_src1, vReg src2) %{
ins_pipe(pipe_slow);
%}
instruct vmax_HF_neon(vReg dst, vReg src1, vReg src2) %{
predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
match(Set dst (MaxVHF src1 src2));
format %{ "vmax_HF_neon $dst, $src1, $src2\t# Half float" %}
ins_encode %{
__ fmax($dst$$FloatRegister, get_arrangement(this),
$src1$$FloatRegister, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}
instruct vmax_HF_sve(vReg dst_src1, vReg src2) %{
predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
match(Set dst_src1 (MaxVHF dst_src1 src2));
format %{ "vmax_HF_sve $dst_src1, $dst_src1, $src2\t# Half float" %}
ins_encode %{
assert(UseSVE > 0, "must be sve");
__ sve_fmax($dst_src1$$FloatRegister, __ H,
ptrue, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}
// vector max - predicated
instruct vmax_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
@@ -2577,9 +2413,8 @@ instruct vmla_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
// dst_src1 = src2 * src3 + dst_src1
instruct vfmla(vReg dst_src1, vReg src2, vReg src3) %{
match(Set dst_src1 (FmaVHF dst_src1 (Binary src2 src3)));
match(Set dst_src1 (FmaVF dst_src1 (Binary src2 src3)));
match(Set dst_src1 (FmaVD dst_src1 (Binary src2 src3)));
match(Set dst_src1 (FmaVF dst_src1 (Binary src2 src3)));
match(Set dst_src1 (FmaVD dst_src1 (Binary src2 src3)));
format %{ "vfmla $dst_src1, $src2, $src3" %}
ins_encode %{
assert(UseFMA, "Needs FMA instructions support.");
@@ -4778,23 +4613,6 @@ instruct replicateD(vReg dst, vRegD src) %{
ins_pipe(pipe_slow);
%}
// Replicate a half-precision float value held in a floating point register
instruct replicateHF(vReg dst, vRegF src) %{
predicate(Matcher::vector_element_basic_type(n) == T_SHORT);
match(Set dst (Replicate src));
format %{ "replicateHF $dst, $src\t# replicate half-precision float" %}
ins_encode %{
uint length_in_bytes = Matcher::vector_length_in_bytes(this);
if (VM_Version::use_neon_for_vector(length_in_bytes)) {
__ dup($dst$$FloatRegister, get_arrangement(this), $src$$FloatRegister);
} else { // length_in_bytes must be > 16 and SVE should be enabled
assert(UseSVE > 0, "must be sve");
__ sve_cpy($dst$$FloatRegister, __ H, ptrue, $src$$FloatRegister);
}
%}
ins_pipe(pipe_slow);
%}
// replicate from imm
instruct replicateI_imm_le128b(vReg dst, immI con) %{
@@ -4863,23 +4681,6 @@ instruct replicateL_imm8_gt128b(vReg dst, immL8_shift8 con) %{
ins_pipe(pipe_slow);
%}
// Replicate a 16-bit half precision float value
instruct replicateHF_imm(vReg dst, immH con) %{
match(Set dst (Replicate con));
format %{ "replicateHF_imm $dst, $con\t# replicate immediate half-precision float" %}
ins_encode %{
uint length_in_bytes = Matcher::vector_length_in_bytes(this);
int imm = (int)($con$$constant) & 0xffff;
if (VM_Version::use_neon_for_vector(length_in_bytes)) {
__ mov($dst$$FloatRegister, get_arrangement(this), imm);
} else { // length_in_bytes must be > 16 and SVE should be enabled
assert(UseSVE > 0, "must be sve");
__ sve_dup($dst$$FloatRegister, __ H, imm);
}
%}
ins_pipe(pipe_slow);
%}
// ------------------------------ Vector insert --------------------------------
// BYTE, SHORT, INT

View File

@@ -1,6 +1,6 @@
//
// Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2020, 2025, Arm Limited. All rights reserved.
// Copyright (c) 2020, 2024, Arm Limited. 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
@@ -215,26 +215,6 @@ source %{
return false;
}
break;
case Op_AddVHF:
case Op_SubVHF:
case Op_MulVHF:
case Op_DivVHF:
case Op_MinVHF:
case Op_MaxVHF:
case Op_SqrtVHF:
// FEAT_FP16 is enabled if both "fphp" and "asimdhp" features are supported.
// Only the Neon instructions need this check. SVE supports half-precision floats
// by default.
if (UseSVE == 0 && !is_feat_fp16_supported()) {
return false;
}
break;
case Op_FmaVHF:
// UseFMA flag needs to be checked along with FEAT_FP16
if (!UseFMA || (UseSVE == 0 && !is_feat_fp16_supported())) {
return false;
}
break;
default:
break;
}
@@ -280,19 +260,6 @@ source %{
case Op_StoreVectorScatter:
opcode = Op_StoreVectorScatterMasked;
break;
// Currently, the masked versions of the following 8 Float16 operations are disabled.
// When the support for Float16 vector classes is added in VectorAPI and the masked
// Float16 IR can be generated, these masked operations will be enabled and relevant
// backend support added.
case Op_AddVHF:
case Op_SubVHF:
case Op_MulVHF:
case Op_DivVHF:
case Op_MaxVHF:
case Op_MinVHF:
case Op_SqrtVHF:
case Op_FmaVHF:
return false;
default:
break;
}
@@ -541,13 +508,12 @@ dnl
// ------------------------------ Vector add -----------------------------------
// vector add
BINARY_OP(vaddB, AddVB, addv, sve_add, B)
BINARY_OP(vaddS, AddVS, addv, sve_add, H)
BINARY_OP(vaddI, AddVI, addv, sve_add, S)
BINARY_OP(vaddL, AddVL, addv, sve_add, D)
BINARY_OP(vaddHF, AddVHF, fadd, sve_fadd, H)
BINARY_OP(vaddF, AddVF, fadd, sve_fadd, S)
BINARY_OP(vaddD, AddVD, fadd, sve_fadd, D)
BINARY_OP(vaddB, AddVB, addv, sve_add, B)
BINARY_OP(vaddS, AddVS, addv, sve_add, H)
BINARY_OP(vaddI, AddVI, addv, sve_add, S)
BINARY_OP(vaddL, AddVL, addv, sve_add, D)
BINARY_OP(vaddF, AddVF, fadd, sve_fadd, S)
BINARY_OP(vaddD, AddVD, fadd, sve_fadd, D)
// vector add - predicated
BINARY_OP_PREDICATE(vaddB, AddVB, sve_add, B)
@@ -566,13 +532,12 @@ VADD_IMM(L, immLAddSubV, D)
// ------------------------------ Vector sub -----------------------------------
// vector sub
BINARY_OP(vsubB, SubVB, subv, sve_sub, B)
BINARY_OP(vsubS, SubVS, subv, sve_sub, H)
BINARY_OP(vsubI, SubVI, subv, sve_sub, S)
BINARY_OP(vsubL, SubVL, subv, sve_sub, D)
BINARY_OP(vsubHF, SubVHF, fsub, sve_fsub, H)
BINARY_OP(vsubF, SubVF, fsub, sve_fsub, S)
BINARY_OP(vsubD, SubVD, fsub, sve_fsub, D)
BINARY_OP(vsubB, SubVB, subv, sve_sub, B)
BINARY_OP(vsubS, SubVS, subv, sve_sub, H)
BINARY_OP(vsubI, SubVI, subv, sve_sub, S)
BINARY_OP(vsubL, SubVL, subv, sve_sub, D)
BINARY_OP(vsubF, SubVF, fsub, sve_fsub, S)
BINARY_OP(vsubD, SubVD, fsub, sve_fsub, D)
// vector sub - predicated
BINARY_OP_PREDICATE(vsubB, SubVB, sve_sub, B)
@@ -647,9 +612,8 @@ instruct vmulL_sve(vReg dst_src1, vReg src2) %{
%}
// vector mul - floating-point
BINARY_OP(vmulHF, MulVHF, fmul, sve_fmul, H)
BINARY_OP(vmulF, MulVF, fmul, sve_fmul, S)
BINARY_OP(vmulD, MulVD, fmul, sve_fmul, D)
BINARY_OP(vmulF, MulVF, fmul, sve_fmul, S)
BINARY_OP(vmulD, MulVD, fmul, sve_fmul, D)
// vector mul - predicated
BINARY_OP_PREDICATE(vmulB, MulVB, sve_mul, B)
@@ -662,9 +626,8 @@ BINARY_OP_PREDICATE(vmulD, MulVD, sve_fmul, D)
// ------------------------------ Vector float div -----------------------------
// vector float div
BINARY_OP_NEON_SVE_PAIRWISE(vdivHF, DivVHF, fdiv, sve_fdiv, H)
BINARY_OP_NEON_SVE_PAIRWISE(vdivF, DivVF, fdiv, sve_fdiv, S)
BINARY_OP_NEON_SVE_PAIRWISE(vdivD, DivVD, fdiv, sve_fdiv, D)
BINARY_OP_NEON_SVE_PAIRWISE(vdivF, DivVF, fdiv, sve_fdiv, S)
BINARY_OP_NEON_SVE_PAIRWISE(vdivD, DivVD, fdiv, sve_fdiv, D)
// vector float div - predicated
BINARY_OP_PREDICATE(vdivF, DivVF, sve_fdiv, S)
@@ -1053,9 +1016,8 @@ UNARY_OP_PREDICATE_WITH_SIZE(vnegD, NegVD, sve_fneg, D)
// ------------------------------ Vector sqrt ----------------------------------
// vector sqrt
UNARY_OP(vsqrtHF, SqrtVHF, fsqrt, sve_fsqrt, H)
UNARY_OP(vsqrtF, SqrtVF, fsqrt, sve_fsqrt, S)
UNARY_OP(vsqrtD, SqrtVD, fsqrt, sve_fsqrt, D)
UNARY_OP(vsqrtF, SqrtVF, fsqrt, sve_fsqrt, S)
UNARY_OP(vsqrtD, SqrtVD, fsqrt, sve_fsqrt, D)
// vector sqrt - predicated
UNARY_OP_PREDICATE_WITH_SIZE(vsqrtF, SqrtVF, sve_fsqrt, S)
@@ -1112,20 +1074,6 @@ instruct v$1_neon(vReg dst, vReg src1, vReg src2) %{
ins_pipe(pipe_slow);
%}')dnl
dnl
dnl VMINMAX_HF_NEON($1, $2, $3 )
dnl VMINMAX_HF_NEON(type, op_name, insn_fp)
define(`VMINMAX_HF_NEON', `
instruct v$1_HF_neon(vReg dst, vReg src1, vReg src2) %{
predicate(VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
match(Set dst ($2 src1 src2));
format %{ "v$1_HF_neon $dst, $src1, $src2\t# Half float" %}
ins_encode %{
__ $3($dst$$FloatRegister, get_arrangement(this),
$src1$$FloatRegister, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}')dnl
dnl
dnl VMINMAX_SVE($1, $2, $3, $4 )
dnl VMINMAX_SVE(type, op_name, insn_fp, insn_integral)
define(`VMINMAX_SVE', `
@@ -1149,21 +1097,6 @@ instruct v$1_sve(vReg dst_src1, vReg src2) %{
ins_pipe(pipe_slow);
%}')dnl
dnl
dnl VMINMAX_HF_SVE($1, $2, $3 )
dnl VMINMAX_HF_SVE(type, op_name, insn_fp)
define(`VMINMAX_HF_SVE', `
instruct v$1_HF_sve(vReg dst_src1, vReg src2) %{
predicate(!VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
match(Set dst_src1 ($2 dst_src1 src2));
format %{ "v$1_HF_sve $dst_src1, $dst_src1, $src2\t# Half float" %}
ins_encode %{
assert(UseSVE > 0, "must be sve");
__ $3($dst_src1$$FloatRegister, __ H,
ptrue, $src2$$FloatRegister);
%}
ins_pipe(pipe_slow);
%}')dnl
dnl
dnl VMINMAX_PREDICATE($1, $2, $3, $4 )
dnl VMINMAX_PREDICATE(type, op_name, insn_fp, insn_integral)
define(`VMINMAX_PREDICATE', `
@@ -1242,11 +1175,9 @@ dnl
VMINMAX_L_NEON(min, MinV)
VMINMAX_L_SVE(min, MinV, sve_smin)
// vector min - B/S/I/HF/F/D
// vector min - B/S/I/F/D
VMINMAX_NEON(min, MinV, fmin, minv)
VMINMAX_SVE(min, MinV, sve_fmin, sve_smin)
VMINMAX_HF_NEON(min, MinVHF, fmin)
VMINMAX_HF_SVE(min, MinVHF, sve_fmin)
// vector min - predicated
VMINMAX_PREDICATE(min, MinV, sve_fmin, sve_smin)
@@ -1268,11 +1199,9 @@ VUMINMAX_PREDICATE(umin, UMinV, sve_umin)
VMINMAX_L_NEON(max, MaxV)
VMINMAX_L_SVE(max, MaxV, sve_smax)
// vector max - B/S/I/HF/F/D
// vector max - B/S/I/F/D
VMINMAX_NEON(max, MaxV, fmax, maxv)
VMINMAX_SVE(max, MaxV, sve_fmax, sve_smax)
VMINMAX_HF_NEON(max, MaxVHF, fmax)
VMINMAX_HF_SVE(max, MaxVHF, sve_fmax)
// vector max - predicated
VMINMAX_PREDICATE(max, MaxV, sve_fmax, sve_smax)
@@ -1344,9 +1273,8 @@ instruct vmla_masked(vReg dst_src1, vReg src2, vReg src3, pRegGov pg) %{
// dst_src1 = src2 * src3 + dst_src1
instruct vfmla(vReg dst_src1, vReg src2, vReg src3) %{
match(Set dst_src1 (FmaVHF dst_src1 (Binary src2 src3)));
match(Set dst_src1 (FmaVF dst_src1 (Binary src2 src3)));
match(Set dst_src1 (FmaVD dst_src1 (Binary src2 src3)));
match(Set dst_src1 (FmaVF dst_src1 (Binary src2 src3)));
match(Set dst_src1 (FmaVD dst_src1 (Binary src2 src3)));
format %{ "vfmla $dst_src1, $src2, $src3" %}
ins_encode %{
assert(UseFMA, "Needs FMA instructions support.");
@@ -3010,23 +2938,6 @@ REPLICATE_INT(L, iRegL)
REPLICATE_FP(F, S, T_FLOAT )
REPLICATE_FP(D, D, T_DOUBLE)
// Replicate a half-precision float value held in a floating point register
instruct replicateHF(vReg dst, vRegF src) %{
predicate(Matcher::vector_element_basic_type(n) == T_SHORT);
match(Set dst (Replicate src));
format %{ "replicateHF $dst, $src\t# replicate half-precision float" %}
ins_encode %{
uint length_in_bytes = Matcher::vector_length_in_bytes(this);
if (VM_Version::use_neon_for_vector(length_in_bytes)) {
__ dup($dst$$FloatRegister, get_arrangement(this), $src$$FloatRegister);
} else { // length_in_bytes must be > 16 and SVE should be enabled
assert(UseSVE > 0, "must be sve");
__ sve_cpy($dst$$FloatRegister, __ H, ptrue, $src$$FloatRegister);
}
%}
ins_pipe(pipe_slow);
%}
// replicate from imm
instruct replicateI_imm_le128b(vReg dst, immI con) %{
@@ -3095,23 +3006,6 @@ instruct replicateL_imm8_gt128b(vReg dst, immL8_shift8 con) %{
ins_pipe(pipe_slow);
%}
// Replicate a 16-bit half precision float value
instruct replicateHF_imm(vReg dst, immH con) %{
match(Set dst (Replicate con));
format %{ "replicateHF_imm $dst, $con\t# replicate immediate half-precision float" %}
ins_encode %{
uint length_in_bytes = Matcher::vector_length_in_bytes(this);
int imm = (int)($con$$constant) & 0xffff;
if (VM_Version::use_neon_for_vector(length_in_bytes)) {
__ mov($dst$$FloatRegister, get_arrangement(this), imm);
} else { // length_in_bytes must be > 16 and SVE should be enabled
assert(UseSVE > 0, "must be sve");
__ sve_dup($dst$$FloatRegister, __ H, imm);
}
%}
ins_pipe(pipe_slow);
%}
// ------------------------------ Vector insert --------------------------------
// BYTE, SHORT, INT

View File

@@ -240,19 +240,6 @@ void Assembler::add_sub_immediate(Instruction_aarch64 &current_insn,
srf(Rn, 5);
}
// This method is used to generate Advanced SIMD data processing instructions
void Assembler::adv_simd_three_same(Instruction_aarch64 &current_insn, FloatRegister Vd,
SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm,
int op1, int op2, int op3) {
assert(T == T4H || T == T8H || T == T2S || T == T4S || T == T2D, "invalid arrangement");
int op22 = (T == T2S || T == T4S) ? 0b0 : 0b1;
int op21 = (T == T4H || T == T8H) ? 0b0 : 0b1;
int op14 = (T == T4H || T == T8H) ? 0b00 : 0b11;
f(0, 31), f((int)T & 1, 30), f(op1, 29), f(0b01110, 28, 24), f(op2, 23);
f(op22, 22); f(op21, 21), rf(Vm, 16), f(op14, 15, 14), f(op3, 13, 10),
rf(Vn, 5), rf(Vd, 0);
}
#undef f
#undef sf
#undef rf
@@ -469,7 +456,7 @@ void Assembler::bang_stack_with_offset(int offset) { Unimplemented(); }
bool asm_util::operand_valid_for_immediate_bits(int64_t imm, unsigned nbits) {
guarantee(nbits == 8 || nbits == 12, "invalid nbits value");
uint64_t uimm = (uint64_t)g_uabs((jlong)imm);
uint64_t uimm = (uint64_t)uabs((jlong)imm);
if (uimm < (UCONST64(1) << nbits))
return true;
if (uimm < (UCONST64(1) << (2 * nbits))

View File

@@ -932,7 +932,7 @@ public:
static const uint64_t branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M);
static bool reachable_from_branch_at(address branch, address target) {
return g_uabs(target - branch) < branch_range;
return uabs(target - branch) < branch_range;
}
// Unconditional branch (immediate)
@@ -2032,8 +2032,6 @@ void mvnw(Register Rd, Register Rm,
INSN(fsqrtd, 0b01, 0b000011);
INSN(fcvtd, 0b01, 0b000100); // Double-precision to single-precision
INSN(fsqrth, 0b11, 0b000011); // Half-precision sqrt
private:
void _fcvt_narrow_extend(FloatRegister Vd, SIMD_Arrangement Ta,
FloatRegister Vn, SIMD_Arrangement Tb, bool do_extend) {
@@ -2061,68 +2059,37 @@ public:
#undef INSN
// Floating-point data-processing (2 source)
void data_processing(unsigned op31, unsigned type, unsigned opcode, unsigned op21,
void data_processing(unsigned op31, unsigned type, unsigned opcode,
FloatRegister Vd, FloatRegister Vn, FloatRegister Vm) {
starti;
f(op31, 31, 29);
f(0b11110, 28, 24);
f(type, 23, 22), f(op21, 21), f(opcode, 15, 10);
f(type, 23, 22), f(1, 21), f(opcode, 15, 10);
rf(Vm, 16), rf(Vn, 5), rf(Vd, 0);
}
#define INSN(NAME, op31, type, opcode, op21) \
#define INSN(NAME, op31, type, opcode) \
void NAME(FloatRegister Vd, FloatRegister Vn, FloatRegister Vm) { \
data_processing(op31, type, opcode, op21, Vd, Vn, Vm); \
data_processing(op31, type, opcode, Vd, Vn, Vm); \
}
INSN(fmuls, 0b000, 0b00, 0b000010, 0b1);
INSN(fdivs, 0b000, 0b00, 0b000110, 0b1);
INSN(fadds, 0b000, 0b00, 0b001010, 0b1);
INSN(fsubs, 0b000, 0b00, 0b001110, 0b1);
INSN(fmaxs, 0b000, 0b00, 0b010010, 0b1);
INSN(fmins, 0b000, 0b00, 0b010110, 0b1);
INSN(fnmuls, 0b000, 0b00, 0b100010, 0b1);
INSN(fabds, 0b011, 0b10, 0b110101);
INSN(fmuls, 0b000, 0b00, 0b000010);
INSN(fdivs, 0b000, 0b00, 0b000110);
INSN(fadds, 0b000, 0b00, 0b001010);
INSN(fsubs, 0b000, 0b00, 0b001110);
INSN(fmaxs, 0b000, 0b00, 0b010010);
INSN(fmins, 0b000, 0b00, 0b010110);
INSN(fnmuls, 0b000, 0b00, 0b100010);
INSN(fmuld, 0b000, 0b01, 0b000010, 0b1);
INSN(fdivd, 0b000, 0b01, 0b000110, 0b1);
INSN(faddd, 0b000, 0b01, 0b001010, 0b1);
INSN(fsubd, 0b000, 0b01, 0b001110, 0b1);
INSN(fmaxd, 0b000, 0b01, 0b010010, 0b1);
INSN(fmind, 0b000, 0b01, 0b010110, 0b1);
INSN(fnmuld, 0b000, 0b01, 0b100010, 0b1);
// Half-precision floating-point instructions
INSN(fmulh, 0b000, 0b11, 0b000010, 0b1);
INSN(fdivh, 0b000, 0b11, 0b000110, 0b1);
INSN(faddh, 0b000, 0b11, 0b001010, 0b1);
INSN(fsubh, 0b000, 0b11, 0b001110, 0b1);
INSN(fmaxh, 0b000, 0b11, 0b010010, 0b1);
INSN(fminh, 0b000, 0b11, 0b010110, 0b1);
INSN(fnmulh, 0b000, 0b11, 0b100010, 0b1);
#undef INSN
// Advanced SIMD scalar three same
#define INSN(NAME, U, size, opcode) \
void NAME(FloatRegister Vd, FloatRegister Vn, FloatRegister Vm) { \
starti; \
f(0b01, 31, 30), f(U, 29), f(0b11110, 28, 24), f(size, 23, 22), f(1, 21); \
rf(Vm, 16), f(opcode, 15, 11), f(1, 10), rf(Vn, 5), rf(Vd, 0); \
}
INSN(fabds, 0b1, 0b10, 0b11010); // Floating-point Absolute Difference (single-precision)
INSN(fabdd, 0b1, 0b11, 0b11010); // Floating-point Absolute Difference (double-precision)
#undef INSN
// Advanced SIMD scalar three same FP16
#define INSN(NAME, U, a, opcode) \
void NAME(FloatRegister Vd, FloatRegister Vn, FloatRegister Vm) { \
starti; \
f(0b01, 31, 30), f(U, 29), f(0b11110, 28, 24), f(a, 23), f(0b10, 22, 21); \
rf(Vm, 16), f(0b00, 15, 14), f(opcode, 13, 11), f(1, 10), rf(Vn, 5), rf(Vd, 0); \
}
INSN(fabdh, 0b1, 0b1, 0b010); // Floating-point Absolute Difference (half-precision float)
INSN(fabdd, 0b011, 0b11, 0b110101);
INSN(fmuld, 0b000, 0b01, 0b000010);
INSN(fdivd, 0b000, 0b01, 0b000110);
INSN(faddd, 0b000, 0b01, 0b001010);
INSN(fsubd, 0b000, 0b01, 0b001110);
INSN(fmaxd, 0b000, 0b01, 0b010010);
INSN(fmind, 0b000, 0b01, 0b010110);
INSN(fnmuld, 0b000, 0b01, 0b100010);
#undef INSN
@@ -2153,7 +2120,6 @@ public:
INSN(fnmaddd, 0b000, 0b01, 1, 0);
INSN(fnmsub, 0b000, 0b01, 1, 1);
INSN(fmaddh, 0b000, 0b11, 0, 0); // half-precision fused multiply-add (scalar)
#undef INSN
// Floating-point conditional select
@@ -2743,26 +2709,26 @@ template<typename R, typename... Rx>
#undef INSN
// Advanced SIMD three same
void adv_simd_three_same(Instruction_aarch64 &current_insn, FloatRegister Vd,
SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm,
int op1, int op2, int op3);
#define INSN(NAME, op1, op2, op3) \
void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm) { \
starti; \
adv_simd_three_same(current_insn, Vd, T, Vn, Vm, op1, op2, op3); \
// Advanced SIMD three same
#define INSN(NAME, op1, op2, op3) \
void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm) { \
starti; \
assert(T == T2S || T == T4S || T == T2D, "invalid arrangement"); \
f(0, 31), f((int)T & 1, 30), f(op1, 29), f(0b01110, 28, 24), f(op2, 23); \
f(T==T2D ? 1:0, 22); f(1, 21), rf(Vm, 16), f(op3, 15, 10), rf(Vn, 5), rf(Vd, 0); \
}
INSN(fabd, 1, 1, 0b0101);
INSN(fadd, 0, 0, 0b0101);
INSN(fdiv, 1, 0, 0b1111);
INSN(faddp, 1, 0, 0b0101);
INSN(fmul, 1, 0, 0b0111);
INSN(fsub, 0, 1, 0b0101);
INSN(fmla, 0, 0, 0b0011);
INSN(fmls, 0, 1, 0b0011);
INSN(fmax, 0, 0, 0b1101);
INSN(fmin, 0, 1, 0b1101);
INSN(facgt, 1, 1, 0b1011);
INSN(fabd, 1, 1, 0b110101);
INSN(fadd, 0, 0, 0b110101);
INSN(fdiv, 1, 0, 0b111111);
INSN(faddp, 1, 0, 0b110101);
INSN(fmul, 1, 0, 0b110111);
INSN(fsub, 0, 1, 0b110101);
INSN(fmla, 0, 0, 0b110011);
INSN(fmls, 0, 1, 0b110011);
INSN(fmax, 0, 0, 0b111101);
INSN(fmin, 0, 1, 0b111101);
INSN(facgt, 1, 1, 0b111011);
#undef INSN
@@ -3262,24 +3228,18 @@ public:
// parameter "tmask" is a 2-bit mask used to indicate which bits in the size
// field are determined by the SIMD_Arrangement. The bit of "tmask" should be
// set to 1 if corresponding bit marked as "x" in the ArmARM.
#define INSN(NAME, U, size, tmask, opcode) \
void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) { \
starti; \
assert((ASSERTION), MSG); \
int op22 = (int)(T >> 1) & tmask; \
int op19 = 0b00; \
if (tmask == 0b01 && (T == T4H || T == T8H)) { \
op22 = 0b1; \
op19 = 0b11; \
} \
f(0, 31), f((int)T & 1, 30), f(U, 29), f(0b01110, 28, 24); \
f(size | op22, 23, 22), f(1, 21), f(op19, 20, 19), f(0b00, 18, 17); \
f(opcode, 16, 12), f(0b10, 11, 10), rf(Vn, 5), rf(Vd, 0); \
#define INSN(NAME, U, size, tmask, opcode) \
void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) { \
starti; \
assert((ASSERTION), MSG); \
f(0, 31), f((int)T & 1, 30), f(U, 29), f(0b01110, 28, 24); \
f(size | ((int)(T >> 1) & tmask), 23, 22), f(0b10000, 21, 17); \
f(opcode, 16, 12), f(0b10, 11, 10), rf(Vn, 5), rf(Vd, 0); \
}
#define MSG "invalid arrangement"
#define ASSERTION (T == T4H || T == T8H || T == T2S || T == T4S || T == T2D)
#define ASSERTION (T == T2S || T == T4S || T == T2D)
INSN(fsqrt, 1, 0b10, 0b01, 0b11111);
INSN(fabs, 0, 0b10, 0b01, 0b01111);
INSN(fneg, 1, 0b10, 0b01, 0b01111);
@@ -3406,7 +3366,7 @@ public:
#define INSN(NAME, opcode) \
void NAME(FloatRegister Zd, SIMD_RegVariant T, FloatRegister Zn, FloatRegister Zm) { \
starti; \
assert(T == H || T == S || T == D, "invalid register variant"); \
assert(T == S || T == D, "invalid register variant"); \
f(0b01100101, 31, 24), f(T, 23, 22), f(0, 21), \
rf(Zm, 16), f(0, 15, 13), f(opcode, 12, 10), rf(Zn, 5), rf(Zd, 0); \
}
@@ -3491,7 +3451,7 @@ public:
// SVE floating-point arithmetic - predicate
#define INSN(NAME, op1, op2) \
void NAME(FloatRegister Zd_or_Zdn_or_Vd, SIMD_RegVariant T, PRegister Pg, FloatRegister Zn_or_Zm) { \
assert(T == H || T == S || T == D, "invalid register variant"); \
assert(T == S || T == D, "invalid register variant"); \
sve_predicate_reg_insn(op1, op2, Zd_or_Zdn_or_Vd, T, Pg, Zn_or_Zm); \
}

View File

@@ -69,7 +69,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
__ far_call(RuntimeAddress(a));
ce->add_call_info_here(_info);
ce->verify_oop_map(_info);
DEBUG_ONLY(__ should_not_reach_here());
debug_only(__ should_not_reach_here());
return;
}
@@ -90,7 +90,7 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
__ blr(lr);
ce->add_call_info_here(_info);
ce->verify_oop_map(_info);
DEBUG_ONLY(__ should_not_reach_here());
debug_only(__ should_not_reach_here());
}
PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
@@ -103,7 +103,7 @@ void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
__ far_call(RuntimeAddress(a));
ce->add_call_info_here(_info);
ce->verify_oop_map(_info);
DEBUG_ONLY(__ should_not_reach_here());
debug_only(__ should_not_reach_here());
}
void DivByZeroStub::emit_code(LIR_Assembler* ce) {
@@ -274,7 +274,7 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
__ far_call(RuntimeAddress(a));
ce->add_call_info_here(_info);
ce->verify_oop_map(_info);
DEBUG_ONLY(__ should_not_reach_here());
debug_only(__ should_not_reach_here());
}
@@ -289,7 +289,7 @@ void SimpleExceptionStub::emit_code(LIR_Assembler* ce) {
}
__ far_call(RuntimeAddress(Runtime1::entry_for(_stub)), rscratch2);
ce->add_call_info_here(_info);
DEBUG_ONLY(__ should_not_reach_here());
debug_only(__ should_not_reach_here());
}

View File

@@ -72,17 +72,16 @@ int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr
null_check_offset = offset();
if (DiagnoseSyncOnValueBasedClasses != 0) {
load_klass(hdr, obj);
ldrb(hdr, Address(hdr, Klass::misc_flags_offset()));
tst(hdr, KlassFlags::_misc_is_value_based_class);
br(Assembler::NE, slow_case);
}
if (LockingMode == LM_LIGHTWEIGHT) {
lightweight_lock(disp_hdr, obj, hdr, temp, rscratch2, slow_case);
} else if (LockingMode == LM_LEGACY) {
if (DiagnoseSyncOnValueBasedClasses != 0) {
load_klass(hdr, obj);
ldrb(hdr, Address(hdr, Klass::misc_flags_offset()));
tst(hdr, KlassFlags::_misc_is_value_based_class);
br(Assembler::NE, slow_case);
}
Label done;
// Load object header
ldr(hdr, Address(obj, hdr_offset));

View File

@@ -91,10 +91,10 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result, addre
// exception pending => remove activation and forward to exception handler
// make sure that the vm_results are cleared
if (oop_result1->is_valid()) {
str(zr, Address(rthread, JavaThread::vm_result_oop_offset()));
str(zr, Address(rthread, JavaThread::vm_result_offset()));
}
if (metadata_result->is_valid()) {
str(zr, Address(rthread, JavaThread::vm_result_metadata_offset()));
str(zr, Address(rthread, JavaThread::vm_result_2_offset()));
}
if (frame_size() == no_frame_size) {
leave();
@@ -108,10 +108,10 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result, addre
}
// get oop results if there are any and reset the values in the thread
if (oop_result1->is_valid()) {
get_vm_result_oop(oop_result1, rthread);
get_vm_result(oop_result1, rthread);
}
if (metadata_result->is_valid()) {
get_vm_result_metadata(metadata_result, rthread);
get_vm_result_2(metadata_result, rthread);
}
return call_offset;
}
@@ -406,8 +406,8 @@ OopMapSet* Runtime1::generate_handle_exception(C1StubId id, StubAssembler *sasm)
__ authenticate_return_address(exception_pc);
// make sure that the vm_results are cleared (may be unnecessary)
__ str(zr, Address(rthread, JavaThread::vm_result_oop_offset()));
__ str(zr, Address(rthread, JavaThread::vm_result_metadata_offset()));
__ str(zr, Address(rthread, JavaThread::vm_result_offset()));
__ str(zr, Address(rthread, JavaThread::vm_result_2_offset()));
break;
case C1StubId::handle_exception_nofpu_id:
case C1StubId::handle_exception_id:

View File

@@ -107,8 +107,7 @@ address C2_MacroAssembler::arrays_hashcode(Register ary, Register cnt, Register
assert(is_power_of_2(unroll_factor), "can't use this value to calculate the jump target PC");
andr(tmp2, cnt, unroll_factor - 1);
adr(tmp1, BR_BASE);
// For Cortex-A53 offset is 4 because 2 nops are generated.
sub(tmp1, tmp1, tmp2, ext::sxtw, VM_Version::supports_a53mac() ? 4 : 3);
sub(tmp1, tmp1, tmp2, ext::sxtw, 3);
movw(tmp2, 0x1f);
br(tmp1);
@@ -116,11 +115,6 @@ address C2_MacroAssembler::arrays_hashcode(Register ary, Register cnt, Register
for (size_t i = 0; i < unroll_factor; ++i) {
load(tmp1, Address(post(ary, type2aelembytes(eltype))), eltype);
maddw(result, result, tmp2, tmp1);
// maddw generates an extra nop for Cortex-A53 (see maddw definition in macroAssembler).
// Generate 2nd nop to have 4 instructions per iteration.
if (VM_Version::supports_a53mac()) {
nop();
}
}
bind(BR_BASE);
subsw(cnt, cnt, unroll_factor);
@@ -366,7 +360,7 @@ void C2_MacroAssembler::fast_lock_lightweight(Register obj, Register box, Regist
Label slow_path;
if (UseObjectMonitorTable) {
// Clear cache in case fast locking succeeds or we need to take the slow-path.
// Clear cache in case fast locking succeeds.
str(zr, Address(box, BasicLock::object_monitor_cache_offset_in_bytes()));
}
@@ -2749,107 +2743,3 @@ bool C2_MacroAssembler::in_scratch_emit_size() {
}
return MacroAssembler::in_scratch_emit_size();
}
static void abort_verify_int_in_range(uint idx, jint val, jint lo, jint hi) {
fatal("Invalid CastII, idx: %u, val: %d, lo: %d, hi: %d", idx, val, lo, hi);
}
void C2_MacroAssembler::verify_int_in_range(uint idx, const TypeInt* t, Register rval, Register rtmp) {
assert(!t->empty() && !t->singleton(), "%s", Type::str(t));
if (t == TypeInt::INT) {
return;
}
BLOCK_COMMENT("verify_int_in_range {");
Label L_success, L_failure;
jint lo = t->_lo;
jint hi = t->_hi;
if (lo != min_jint && hi != max_jint) {
subsw(rtmp, rval, lo);
br(Assembler::LT, L_failure);
subsw(rtmp, rval, hi);
br(Assembler::LE, L_success);
} else if (lo != min_jint) {
subsw(rtmp, rval, lo);
br(Assembler::GE, L_success);
} else if (hi != max_jint) {
subsw(rtmp, rval, hi);
br(Assembler::LE, L_success);
} else {
ShouldNotReachHere();
}
bind(L_failure);
movw(c_rarg0, idx);
mov(c_rarg1, rval);
movw(c_rarg2, lo);
movw(c_rarg3, hi);
reconstruct_frame_pointer(rtmp);
rt_call(CAST_FROM_FN_PTR(address, abort_verify_int_in_range), rtmp);
hlt(0);
bind(L_success);
BLOCK_COMMENT("} verify_int_in_range");
}
static void abort_verify_long_in_range(uint idx, jlong val, jlong lo, jlong hi) {
fatal("Invalid CastLL, idx: %u, val: " JLONG_FORMAT ", lo: " JLONG_FORMAT ", hi: " JLONG_FORMAT, idx, val, lo, hi);
}
void C2_MacroAssembler::verify_long_in_range(uint idx, const TypeLong* t, Register rval, Register rtmp) {
assert(!t->empty() && !t->singleton(), "%s", Type::str(t));
if (t == TypeLong::LONG) {
return;
}
BLOCK_COMMENT("verify_long_in_range {");
Label L_success, L_failure;
jlong lo = t->_lo;
jlong hi = t->_hi;
if (lo != min_jlong && hi != max_jlong) {
subs(rtmp, rval, lo);
br(Assembler::LT, L_failure);
subs(rtmp, rval, hi);
br(Assembler::LE, L_success);
} else if (lo != min_jlong) {
subs(rtmp, rval, lo);
br(Assembler::GE, L_success);
} else if (hi != max_jlong) {
subs(rtmp, rval, hi);
br(Assembler::LE, L_success);
} else {
ShouldNotReachHere();
}
bind(L_failure);
movw(c_rarg0, idx);
mov(c_rarg1, rval);
mov(c_rarg2, lo);
mov(c_rarg3, hi);
reconstruct_frame_pointer(rtmp);
rt_call(CAST_FROM_FN_PTR(address, abort_verify_long_in_range), rtmp);
hlt(0);
bind(L_success);
BLOCK_COMMENT("} verify_long_in_range");
}
void C2_MacroAssembler::reconstruct_frame_pointer(Register rtmp) {
const int framesize = Compile::current()->output()->frame_size_in_bytes();
if (PreserveFramePointer) {
// frame pointer is valid
#ifdef ASSERT
// Verify frame pointer value in rfp.
add(rtmp, sp, framesize - 2 * wordSize);
Label L_success;
cmp(rfp, rtmp);
br(Assembler::EQ, L_success);
stop("frame pointer mismatch");
bind(L_success);
#endif // ASSERT
} else {
add(rfp, sp, framesize - 2 * wordSize);
}
}

View File

@@ -188,9 +188,4 @@
void vector_signum_sve(FloatRegister dst, FloatRegister src, FloatRegister zero,
FloatRegister one, FloatRegister vtmp, PRegister pgtmp, SIMD_RegVariant T);
void verify_int_in_range(uint idx, const TypeInt* t, Register val, Register tmp);
void verify_long_in_range(uint idx, const TypeLong* t, Register val, Register tmp);
void reconstruct_frame_pointer(Register rtmp);
#endif // CPU_AARCH64_C2_MACROASSEMBLER_AARCH64_HPP

View File

@@ -70,7 +70,7 @@ static char* reserve_at_eor_compatible_address(size_t size, bool aslr) {
const uint64_t immediate = ((uint64_t)immediates[index]) << 32;
assert(immediate > 0 && Assembler::operand_valid_for_logical_immediate(/*is32*/false, immediate),
"Invalid immediate %d " UINT64_FORMAT, index, immediate);
result = os::attempt_reserve_memory_at((char*)immediate, size, mtNone);
result = os::attempt_reserve_memory_at((char*)immediate, size, false);
if (result == nullptr) {
log_trace(metaspace, map)("Failed to attach at " UINT64_FORMAT_X, immediate);
}
@@ -114,7 +114,7 @@ char* CompressedKlassPointers::reserve_address_space_for_compressed_classes(size
if (result == nullptr) {
constexpr size_t alignment = nth_bit(32);
log_debug(metaspace, map)("Trying to reserve at a 32-bit-aligned address");
result = os::reserve_memory_aligned(size, alignment, mtNone);
result = os::reserve_memory_aligned(size, alignment, false);
}
return result;

View File

@@ -828,6 +828,7 @@ void JavaFrameAnchor::make_walkable() {
// already walkable?
if (walkable()) return;
vmassert(last_Java_sp() != nullptr, "not called from Java code?");
vmassert(last_Java_pc() == nullptr, "already walkable");
_last_Java_pc = (address)_last_Java_sp[-1];
vmassert(walkable(), "something went wrong");
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -35,53 +35,6 @@
// Inline functions for AArch64 frames:
#if INCLUDE_JFR
// Static helper routines
inline address frame::interpreter_bcp(const intptr_t* fp) {
assert(fp != nullptr, "invariant");
return reinterpret_cast<address>(fp[frame::interpreter_frame_bcp_offset]);
}
inline address frame::interpreter_return_address(const intptr_t* fp) {
assert(fp != nullptr, "invariant");
return reinterpret_cast<address>(fp[frame::return_addr_offset]);
}
inline intptr_t* frame::interpreter_sender_sp(const intptr_t* fp) {
assert(fp != nullptr, "invariant");
return reinterpret_cast<intptr_t*>(fp[frame::interpreter_frame_sender_sp_offset]);
}
inline bool frame::is_interpreter_frame_setup_at(const intptr_t* fp, const void* sp) {
assert(fp != nullptr, "invariant");
assert(sp != nullptr, "invariant");
return sp <= fp + frame::interpreter_frame_initial_sp_offset;
}
inline intptr_t* frame::sender_sp(intptr_t* fp) {
assert(fp != nullptr, "invariant");
return fp + frame::sender_sp_offset;
}
inline intptr_t* frame::link(const intptr_t* fp) {
assert(fp != nullptr, "invariant");
return reinterpret_cast<intptr_t*>(fp[frame::link_offset]);
}
inline address frame::return_address(const intptr_t* sp) {
assert(sp != nullptr, "invariant");
return reinterpret_cast<address>(sp[-1]);
}
inline intptr_t* frame::fp(const intptr_t* sp) {
assert(sp != nullptr, "invariant");
return reinterpret_cast<intptr_t*>(sp[-2]);
}
#endif // INCLUDE_JFR
// Constructors:
inline frame::frame() {

View File

@@ -27,9 +27,9 @@
#include "c1/c1_MacroAssembler.hpp"
#include "compiler/compilerDefinitions.inline.hpp"
#include "gc/shared/gc_globals.hpp"
#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
#include "gc/shenandoah/shenandoahBarrierSet.hpp"
#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
#include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
#define __ masm->masm()->

View File

@@ -23,8 +23,6 @@
*
*/
#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
#include "gc/shenandoah/mode/shenandoahMode.hpp"
#include "gc/shenandoah/shenandoahBarrierSet.hpp"
#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
#include "gc/shenandoah/shenandoahForwarding.hpp"
@@ -32,8 +30,10 @@
#include "gc/shenandoah/shenandoahHeapRegion.hpp"
#include "gc/shenandoah/shenandoahRuntime.hpp"
#include "gc/shenandoah/shenandoahThreadLocalData.hpp"
#include "interpreter/interp_masm.hpp"
#include "gc/shenandoah/heuristics/shenandoahHeuristics.hpp"
#include "gc/shenandoah/mode/shenandoahMode.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/interp_masm.hpp"
#include "runtime/javaThread.hpp"
#include "runtime/sharedRuntime.hpp"
#ifdef COMPILER1

View File

@@ -21,8 +21,8 @@
* questions.
*/
#include "gc/shared/gc_globals.hpp"
#include "gc/shared/gcLogPrecious.hpp"
#include "gc/shared/gc_globals.hpp"
#include "gc/z/zAddress.hpp"
#include "gc/z/zBarrierSetAssembler.hpp"
#include "gc/z/zGlobals.hpp"

Some files were not shown because too many files have changed in this diff Show More