Simplify align_section()

MasterDuke17 · Mar 31, 2020 · 68b1435 · 68b1435
1 parent b0813ce
commit 68b1435
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/vm/moar/QAST/QASTCompilerMAST.nqp b/src/vm/moar/QAST/QASTCompilerMAST.nqp
@@ -2333,7 +2333,6 @@ class MoarVM::StringHeap {
 
 sub align_section($size) {
     my uint32 $aligned := nqp::mul_n(nqp::ceil_n(nqp::div_n($size, 8.0)), 8.0);
-    $aligned
 }
 class MoarVM::BytecodeWriter {
     has $!mbc;
@@ -2378,24 +2377,24 @@ class MoarVM::BytecodeWriter {
         # 92 bytes
         my $hll := self.add-string($!compunit.hll || '');
 
-        my uint32 $header_size := +align_section(8 + 21 * 4);
+        my uint32 $header_size := align_section(8 + 21 * 4);
         my uint32 $frames := nqp::elems(@!frames);
         my uint32 $frames_size := 0;
         for @!frames {
             my uint32 $size := +$_.size;
             $frames_size := $frames_size + $size;
         }
-        $frames_size := +align_section($frames_size);
-        my uint32 $callsites_size := +align_section($!callsites.size);
-        my uint32 $string_heap_size := +align_section($!string-heap.size);
+        $frames_size := align_section($frames_size);
+        my uint32 $callsites_size := align_section($!callsites.size);
+        my uint32 $string_heap_size := align_section($!string-heap.size);
         my @sc_handles := nqp::getattr($!compunit, MAST::CompUnit, '@!sc_handles');
-        my uint32 $sc_deps_size := +align_section(nqp::elems(@sc_handles) * 4);
+        my uint32 $sc_deps_size := align_section(nqp::elems(@sc_handles) * 4);
         my $num_extops := nqp::elems(nqp::getattr($!compunit, MAST::CompUnit, '@!extop_names'));
-        my uint32 $extops_size := +align_section($num_extops * (4 + 8));
-        my uint32 $bytecode_size := +align_section(nqp::elems($!bytecode));
+        my uint32 $extops_size := align_section($num_extops * (4 + 8));
+        my uint32 $bytecode_size := align_section(nqp::elems($!bytecode));
         my uint32 $annotations_size := nqp::elems($!annotations);
         my $serialized := $!compunit.serialized;
-        my uint32 $serialized_size := +align_section(nqp::defined($serialized) ?? nqp::elems($serialized) !! 0);
+        my uint32 $serialized_size := align_section(nqp::defined($serialized) ?? nqp::elems($serialized) !! 0);
 
         my uint32 $offset := $header_size;
         $!mbc.write_s("MOARVM\r\n");