File 1051-erts-Make-bs_get_tail-create-a-heapbin-if-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1051-erts-Make-bs_get_tail-create-a-heapbin-if-possible.patch of Package erlang (Revision 1c6d27e874ff4bb28c5c2e74b90a1fc8)

Currently displaying revision 1c6d27e874ff4bb28c5c2e74b90a1fc8 , Show latest

From 1550451b61d5aa4f86362ea040b9f2cb02c94555 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 30 Aug 2021 11:10:16 +0200
Subject: [PATCH] erts: Make bs_get_tail create a heapbin if possible

When getting the tail of a match context, we create
a heapbin instead of a subbin if the size of the
tail is smaller than the size of a subbin.

This is already done in the JIT.
---
 erts/emulator/beam/emu/bs_instrs.tab | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/erts/emulator/beam/emu/bs_instrs.tab b/erts/emulator/beam/emu/bs_instrs.tab
index c52367de2a..d1d7f5cdd8 100644
--- a/erts/emulator/beam/emu/bs_instrs.tab
+++ b/erts/emulator/beam/emu/bs_instrs.tab
@@ -1245,31 +1245,22 @@ bs_get_tail.fetch(Src) {
 
 bs_get_tail.execute(Dst, Live) {
     ErlBinMatchBuffer* mb;
-    Uint size, offs;
-    ErlSubBin* sb;
+    Eterm bin, *htop;
 
     ASSERT(header_is_bin_matchstate(*boxed_val(context)));
 
-    $GC_TEST_PRESERVE(ERL_SUB_BIN_SIZE, $Live, context);
-
-    mb = ms_matchbuffer(context);
+    $GC_TEST_PRESERVE(EXTRACT_SUB_BIN_HEAP_NEED, $Live, context);
 
-    offs = mb->offset;
-    size = mb->size - offs;
+    htop = HTOP;
 
-    sb = (ErlSubBin *) HTOP;
-    HTOP += ERL_SUB_BIN_SIZE;
+    mb = ms_matchbuffer(context);
 
-    sb->thing_word = HEADER_SUB_BIN;
-    sb->size = BYTE_OFFSET(size);
-    sb->bitsize = BIT_OFFSET(size);
-    sb->offs = BYTE_OFFSET(offs);
-    sb->bitoffs = BIT_OFFSET(offs);
-    sb->is_writable = 0;
-    sb->orig = mb->orig;
+    bin = erts_extract_sub_binary(&htop,mb->orig,mb->base,
+                                  mb->offset,mb->size - mb->offset);
+    HTOP = htop;
 
     $REFRESH_GEN_DEST();
-    $Dst = make_binary(sb);
+    $Dst = bin;
 }
 
 
-- 
2.31.1

Places

File 1051-erts-Make-bs_get_tail-create-a-heapbin-if-possible.patch of Package erlang (Revision 1c6d27e874ff4bb28c5c2e74b90a1fc8)

Places