Automatic merge of master into galahad

Author: OracleLabsAutomation

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/MonitorSnippets.java

@@ -197,10 +197,8 @@
  * appropriately to comply with the layouts above.
  */
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L457-L617",
-          sha1 = "2d66e0ccf8dbf69f575be2633d5a17f77a20131d")
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L619-L780",
-          sha1 = "e88d7b8c4bb85358c6a810ee1d7d92fde5db42e6")
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/c2d76f9844aadf77a0b213a9169a7c5c8c8f1ffb/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L149-L578",
+          sha1 = "ee04c86e8b12a9f8331c5e79f95a17b27615c845")
 // @formatter:on
 public class MonitorSnippets implements Snippets {
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BitSwapOp.java

@@ -40,7 +40,7 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L6477-L6559",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L6275-L6357",
           sha1 = "34c6e1ee7916fc7190cbcbc237eaf2b510f7dd0e")
 // @formatter:on
 public final class AMD64BitSwapOp extends AMD64LIRInstruction {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CountPositivesOp.java

@@ -55,7 +55,7 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L4142-L4385",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L3940-L4183",
           sha1 = "1aa453c52215c1fc8d467460a93fa590f9edab15")
 // @formatter:on
 @Opcode("AMD64_COUNT_POSITIVES")

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VectorizedHashCodeOp.java

@@ -75,11 +75,11 @@
 import jdk.vm.ci.meta.Value;
 
 // @formatter:off
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L1887-L1996",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L1685-L1794",
           sha1 = "1cc5a10b19e7746105493d8f430f628cc7f89c51")
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L2185-L2231",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L1983-L2029",
           sha1 = "9cbba8bd6c4037427fa46f067abb722b15aca90c")
-@SyncPort(from = "https://github.com/openjdk/jdk/blob/83feb7a2388e33835b2071cfe0e51ba8b43e241f/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L3562-L3749",
+@SyncPort(from = "https://github.com/openjdk/jdk/blob/f3b34d32d6ea409f8c8f0382e8f01e746366f842/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L3360-L3547",
           sha1 = "a3fe941a49e0e3f8443b2e16e550d6c94b012b12")
 // @formatter:on
 @Opcode("VECTORIZED_HASHCODE")

docs/reference-manual/native-image/AutomaticMetadataCollection.md

@@ -9,7 +9,7 @@ redirect_from: /reference-manual/native-image/Agent/
 # Collect Metadata with the Tracing Agent
 
 The Native Image tool relies on the static analysis of an application's reachable code at runtime. 
-However, the analysis cannot always completely predict all usages of the Java Native Interface (JNI), Java Reflection, Dynamic Proxy objects, or class path resources. 
+However, the analysis cannot always completely predict all usages of the Java Native Interface (JNI), Foreign Function and Memory (FFM) API, Java Reflection, Dynamic Proxy objects, or class path resources. 
 Undetected usages of these dynamic features must be provided to the `native-image` tool in the form of [metadata](ReachabilityMetadata.md) (precomputed in code or as JSON configuration files).
 
 Here you will find information how to automatically collect metadata for an application and write JSON configuration files.
@@ -194,4 +194,5 @@ An arbitrary number of `--input-dir` arguments with sets of configuration files
 
 * [Build a Native Executable with Reflection](guides/build-with-reflection.md)
 * [Reachability Metadata](ReachabilityMetadata.md)
-* [Experimental Agent Options](ExperimentalAgentOptions.md)
+* [Experimental Agent Options](ExperimentalAgentOptions.md)
+* [Foreign Function and Memory API in Native Image](FFM-API.md)

docs/reference-manual/native-image/BuildOutput.md

@@ -36,6 +36,7 @@ GraalVM Native Image: Generating 'helloworld' (executable)...
     3,158 types,   3,625 fields, and  14,804 methods found reachable
     1,012 types,      36 fields, and     377 methods registered for reflection
        57 types,      57 fields, and      52 methods registered for JNI access
+        0 downcalls and 0 upcalls registered for foreign access
         4 native libraries: dl, pthread, rt, z
 [3/8] Building universe...                                       (0.8s @ 0.99GB)
 [4/8] Parsing methods...      [*]                                (0.6s @ 0.75GB)
@@ -171,8 +172,8 @@ Large numbers can cause significant reflection overheads, slow down the build pr
 #### <a name="glossary-jni-access-registrations"></a>JNI Access Registrations
 The number of types, fields, and methods that are registered for [JNI](JNI.md) access.
 
-#### <a name="glossary-foreign-downcall-and-upcall-registrations"></a>Foreign functions stubs
-The number of downcalls and upcalls registered for [foreign](ForeignInterface.md) function access.
+#### <a name="glossary-foreign-downcall-and-upcall-registrations"></a>Foreign Access Registrations
+The number of downcalls and upcalls registered for [foreign function access](FFM-API.md).
 
 #### <a name="glossary-runtime-methods"></a>Runtime Compiled Methods
 The number of methods marked for runtime compilation.

docs/reference-manual/native-image/DynamicFeatures.md

@@ -18,6 +18,7 @@ The reference information here explains how Native Image handles some dynamic fe
 - [Accessing Resources](ReachabilityMetadata.md#resources)
 - [Certificate Management](CertificateManagement.md)
 - [Java Native Interface (JNI)](ReachabilityMetadata.md#java-native-interface)
+* [Foreign Function and Memory API in Native Image](FFM-API.md)
 - [JCA Security Services](JCASecurityServices.md)
 - [Reflection](ReachabilityMetadata.md#reflection)
 - [URL Protocols](URLProtocols.md)