From c63403199e8dc329cb76b25d900690861650f570 Mon Sep 17 00:00:00 2001
From: Chris Vest <christianvest_hansen@apple.com>
Date: Fri, 7 Aug 2020 18:17:16 +0200
Subject: [PATCH] Fix compilation on updated JDK 16-ea

Motivation: The MemoryAccess API now takes MemorySegment instead of MemoryAddress.
Modification: Remove the MemoryAddress field and use MemorySegment everywhere.
Result: The code now compiles again.
---
 buffer/src/main/java/io/netty/buffer/b2/BBuf.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/buffer/src/main/java/io/netty/buffer/b2/BBuf.java b/buffer/src/main/java/io/netty/buffer/b2/BBuf.java
index 61d1dbc..fb43aeb 100644
--- a/buffer/src/main/java/io/netty/buffer/b2/BBuf.java
+++ b/buffer/src/main/java/io/netty/buffer/b2/BBuf.java
@@ -13,14 +13,12 @@ public class BBuf extends Rc<BBuf> {
     static final Drop<BBuf> NO_DROP = buf -> {};
     static final Drop<BBuf> SEGMENT_CLOSE = buf -> buf.segment.close();
     private final MemorySegment segment;
-    private final MemoryAddress address;
     private long read;
     private long write;
 
     BBuf(MemorySegment segment, Drop<BBuf> drop) {
         super(drop);
         this.segment = segment;
-        address = segment.address();
     }
 
     public BBuf readerIndex(long index) {
@@ -33,20 +31,20 @@ public class BBuf extends Rc<BBuf> {
     }
 
     public byte readByte() {
-        return MemoryAccess.getByteAtOffset(address, read++);
+        return MemoryAccess.getByteAtOffset(segment, read++);
     }
 
     public void writeByte(byte value) {
-        MemoryAccess.setByteAtOffset(address, write++, value);
+        MemoryAccess.setByteAtOffset(segment, write++, value);
     }
 
     public BBuf setLong(long offset, long value) {
-        MemoryAccess.setLongAtOffset(address, offset, value);
+        MemoryAccess.setLongAtOffset(segment, offset, value);
         return this;
     }
 
     public long getLong(long offset) {
-        return MemoryAccess.getLongAtOffset(address, offset);
+        return MemoryAccess.getLongAtOffset(segment, offset);
     }
 
     public void fill(byte value) {
@@ -66,7 +64,7 @@ public class BBuf extends Rc<BBuf> {
     }
 
     public byte[] debugAsByteArray() {
-        return address.segment().toByteArray();
+        return segment.toByteArray();
     }
 
     public ByteBuf view() {