Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 1 deletions

diff --git a/third_party/rust/wasm-encoder/src/core/globals.rs b/third_party/rust/wasm-encoder/src/core/globals.rs
index 64fec982cd..291ca80472 100644
--- a/third_party/rust/wasm-encoder/src/core/globals.rs
+++ b/third_party/rust/wasm-encoder/src/core/globals.rs
@@ -14,6 +14,7 @@ use crate::{encode_section, ConstExpr, Encode, Section, SectionId, ValType};
 ///     GlobalType {
 ///         val_type: ValType::I32,
 ///         mutable: false,
+///         shared: false,
 ///     },
 ///     &ConstExpr::i32_const(42),
 /// );
@@ -80,12 +81,21 @@ pub struct GlobalType {
     pub val_type: ValType,
     /// Whether this global is mutable or not.
     pub mutable: bool,
+    /// Whether this global is shared or not.
+    pub shared: bool,
 }
 
 impl Encode for GlobalType {
     fn encode(&self, sink: &mut Vec<u8>) {
         self.val_type.encode(sink);
-        sink.push(self.mutable as u8);
+        let mut flag = 0;
+        if self.mutable {
+            flag |= 0b01;
+        }
+        if self.shared {
+            flag |= 0b10;
+        }
+        sink.push(flag);
     }
 }
 
@@ -96,6 +106,7 @@ impl TryFrom<wasmparser::GlobalType> for GlobalType {
         Ok(GlobalType {
             val_type: global_ty.content_type.try_into()?,
             mutable: global_ty.mutable,
+            shared: global_ty.shared,
         })
     }
 }