# HG changeset patch
# User iveresov
# Date 1441657721 25200
# Node ID 278a8361e6f90d10de614cb7e998fb59e5a02145
# Parent  ac873eaac8624a5df5e923c271ee07443de15d13# Parent  341ac0627cc0628ebafbe3dbbcc04eaef17499a8
Merge

diff -r 341ac0627cc0 -r 278a8361e6f9 jdk/src/java.base/share/classes/java/util/zip/Adler32.java
--- a/jdk/src/java.base/share/classes/java/util/zip/Adler32.java	Thu Sep 03 15:48:24 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/zip/Adler32.java	Mon Sep 07 13:28:41 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, 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
@@ -28,6 +28,8 @@
 import java.nio.ByteBuffer;
 import sun.nio.ch.DirectBuffer;
 
+import jdk.internal.HotSpotIntrinsicCandidate;
+
 /**
  * A class that can be used to compute the Adler-32 checksum of a data
  * stream. An Adler-32 checksum is almost as reliable as a CRC-32 but
@@ -126,8 +128,11 @@
     }
 
     private native static int update(int adler, int b);
+
+    @HotSpotIntrinsicCandidate
     private native static int updateBytes(int adler, byte[] b, int off,
                                           int len);
+    @HotSpotIntrinsicCandidate
     private native static int updateByteBuffer(int adler, long addr,
                                                int off, int len);
 }