474 files changed, 112083 insertions, 21894 deletions

diff --git a/src/3rdparty/python/bin/dmgbuild b/src/3rdparty/python/bin/dmgbuild
deleted file mode 100755
index 74fc367c8..000000000
--- a/src/3rdparty/python/bin/dmgbuild
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-from __future__ import print_function
-
-import dmgbuild
-import sys
-import argparse
-
-parser = argparse.ArgumentParser(description='Construct a disk image file.')
-parser.add_argument('volume_name', metavar='volume-name',
-                    help='The name to give to the volume (this will appear in the title bar when the user mounts the disk image).')
-parser.add_argument('filename', metavar='output.dmg',
-                    help='The filename of the disk image to create.')
-parser.add_argument('-s', '--settings',
-                    help='The path of the settings file.')
-parser.add_argument('-D', dest='defines', action='append', default=[],
-                    help='Define a value for the settings file (e.g. -Dfoo=bar).')
-parser.add_argument('--no-hidpi', dest='lookForHiDPI', action='store_false', default=True,
-                    help='Do not search for HiDPI versions of the background image (if specified)')
-
-
-args = parser.parse_args()
-
-defines = {}
-for d in args.defines:
-    k,v = d.split('=', 1)
-    k = k.strip()
-    v = v.strip()
-    if (v.startswith("'") and v.endswith("'")) \
-      or (v.startswith('"') and v.endswith('"')):
-        v = v[1:-1]
-    defines[k] = v
-
-dmgbuild.build_dmg(args.filename, args.volume_name, args.settings, defines=defines, lookForHiDPI=args.lookForHiDPI)
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/biplist/LICENSE b/src/3rdparty/python/lib/python2.7/site-packages/biplist/LICENSE
deleted file mode 100644
index 1c7ba6cc1..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/biplist/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2010, Andrew Wooster
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of biplist nor the names of its contributors may be
-      used to endorse or promote products derived from this software without 
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/biplist/__init__.py b/src/3rdparty/python/lib/python2.7/site-packages/biplist/__init__.py
deleted file mode 100644
index f9d5836dd..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/biplist/__init__.py
+++ /dev/null
@@ -1,977 +0,0 @@
-"""biplist -- a library for reading and writing binary property list files.
-
-Binary Property List (plist) files provide a faster and smaller serialization
-format for property lists on OS X. This is a library for generating binary
-plists which can be read by OS X, iOS, or other clients.
-
-The API models the plistlib API, and will call through to plistlib when
-XML serialization or deserialization is required.
-
-To generate plists with UID values, wrap the values with the Uid object. The
-value must be an int.
-
-To generate plists with NSData/CFData values, wrap the values with the
-Data object. The value must be a string.
-
-Date values can only be datetime.datetime objects.
-
-The exceptions InvalidPlistException and NotBinaryPlistException may be 
-thrown to indicate that the data cannot be serialized or deserialized as
-a binary plist.
-
-Plist generation example:
-    
-    from biplist import *
-    from datetime import datetime
-    plist = {'aKey':'aValue',
-             '0':1.322,
-             'now':datetime.now(),
-             'list':[1,2,3],
-             'tuple':('a','b','c')
-             }
-    try:
-        writePlist(plist, "example.plist")
-    except (InvalidPlistException, NotBinaryPlistException), e:
-        print "Something bad happened:", e
-
-Plist parsing example:
-
-    from biplist import *
-    try:
-        plist = readPlist("example.plist")
-        print plist
-    except (InvalidPlistException, NotBinaryPlistException), e:
-        print "Not a plist:", e
-"""
-
-from collections import namedtuple
-import datetime
-import io
-import math
-import plistlib
-from struct import pack, unpack, unpack_from
-from struct import error as struct_error
-import sys
-import time
-
-try:
-    unicode
-    unicodeEmpty = r''
-except NameError:
-    unicode = str
-    unicodeEmpty = ''
-try:
-    long
-except NameError:
-    long = int
-try:
-    {}.iteritems
-    iteritems = lambda x: x.iteritems()
-except AttributeError:
-    iteritems = lambda x: x.items()
-
-__all__ = [
-    'Uid', 'Data', 'readPlist', 'writePlist', 'readPlistFromString',
-    'writePlistToString', 'InvalidPlistException', 'NotBinaryPlistException'
-]
-
-# Apple uses Jan 1, 2001 as a base for all plist date/times.
-apple_reference_date = datetime.datetime.utcfromtimestamp(978307200)
-
-class Uid(object):
-    """Wrapper around integers for representing UID values. This
-       is used in keyed archiving."""
-    integer = 0
-    def __init__(self, integer):
-        self.integer = integer
-    
-    def __repr__(self):
-        return "Uid(%d)" % self.integer
-    
-    def __eq__(self, other):
-        if isinstance(self, Uid) and isinstance(other, Uid):
-            return self.integer == other.integer
-        return False
-    
-    def __cmp__(self, other):
-        return self.integer - other.integer
-    
-    def __lt__(self, other):
-        return self.integer < other.integer
-    
-    def __hash__(self):
-        return self.integer
-    
-    def __int__(self):
-        return int(self.integer)
-
-class Data(bytes):
-    """Wrapper around bytes to distinguish Data values."""
-
-class InvalidPlistException(Exception):
-    """Raised when the plist is incorrectly formatted."""
-
-class NotBinaryPlistException(Exception):
-    """Raised when a binary plist was expected but not encountered."""
-
-def readPlist(pathOrFile):
-    """Raises NotBinaryPlistException, InvalidPlistException"""
-    didOpen = False
-    result = None
-    if isinstance(pathOrFile, (bytes, unicode)):
-        pathOrFile = open(pathOrFile, 'rb')
-        didOpen = True
-    try:
-        reader = PlistReader(pathOrFile)
-        result = reader.parse()
-    except NotBinaryPlistException as e:
-        try:
-            pathOrFile.seek(0)
-            result = None
-            if hasattr(plistlib, 'loads'):
-                contents = None
-                if isinstance(pathOrFile, (bytes, unicode)):
-                    with open(pathOrFile, 'rb') as f:
-                        contents = f.read()
-                else:
-                    contents = pathOrFile.read()
-                result = plistlib.loads(contents)
-            else:
-                result = plistlib.readPlist(pathOrFile)
-            result = wrapDataObject(result, for_binary=True)
-        except Exception as e:
-            raise InvalidPlistException(e)
-    finally:
-        if didOpen:
-            pathOrFile.close()
-    return result
-
-def wrapDataObject(o, for_binary=False):
-    if isinstance(o, Data) and not for_binary:
-        v = sys.version_info
-        if not (v[0] >= 3 and v[1] >= 4):
-            o = plistlib.Data(o)
-    elif isinstance(o, (bytes, plistlib.Data)) and for_binary:
-        if hasattr(o, 'data'):
-            o = Data(o.data)
-    elif isinstance(o, tuple):
-        o = wrapDataObject(list(o), for_binary)
-        o = tuple(o)
-    elif isinstance(o, list):
-        for i in range(len(o)):
-            o[i] = wrapDataObject(o[i], for_binary)
-    elif isinstance(o, dict):
-        for k in o:
-            o[k] = wrapDataObject(o[k], for_binary)
-    return o
-
-def writePlist(rootObject, pathOrFile, binary=True):
-    if not binary:
-        rootObject = wrapDataObject(rootObject, binary)
-        if hasattr(plistlib, "dump"):
-            if isinstance(pathOrFile, (bytes, unicode)):
-                with open(pathOrFile, 'wb') as f:
-                    return plistlib.dump(rootObject, f)
-            else:
-                return plistlib.dump(rootObject, pathOrFile)
-        else:
-            return plistlib.writePlist(rootObject, pathOrFile)
-    else:
-        didOpen = False
-        if isinstance(pathOrFile, (bytes, unicode)):
-            pathOrFile = open(pathOrFile, 'wb')
-            didOpen = True
-        writer = PlistWriter(pathOrFile)
-        result = writer.writeRoot(rootObject)
-        if didOpen:
-            pathOrFile.close()
-        return result
-
-def readPlistFromString(data):
-    return readPlist(io.BytesIO(data))
-
-def writePlistToString(rootObject, binary=True):
-    if not binary:
-        rootObject = wrapDataObject(rootObject, binary)
-        if hasattr(plistlib, "dumps"):
-            return plistlib.dumps(rootObject)
-        elif hasattr(plistlib, "writePlistToBytes"):
-            return plistlib.writePlistToBytes(rootObject)
-        else:
-            return plistlib.writePlistToString(rootObject)
-    else:
-        ioObject = io.BytesIO()
-        writer = PlistWriter(ioObject)
-        writer.writeRoot(rootObject)
-        return ioObject.getvalue()
-
-def is_stream_binary_plist(stream):
-    stream.seek(0)
-    header = stream.read(7)
-    if header == b'bplist0':
-        return True
-    else:
-        return False
-
-PlistTrailer = namedtuple('PlistTrailer', 'offsetSize, objectRefSize, offsetCount, topLevelObjectNumber, offsetTableOffset')
-PlistByteCounts = namedtuple('PlistByteCounts', 'nullBytes, boolBytes, intBytes, realBytes, dateBytes, dataBytes, stringBytes, uidBytes, arrayBytes, setBytes, dictBytes')
-
-class PlistReader(object):
-    file = None
-    contents = ''
-    offsets = None
-    trailer = None
-    currentOffset = 0
-    # Used to detect recursive object references.
-    offsetsStack = []
-    
-    def __init__(self, fileOrStream):
-        """Raises NotBinaryPlistException."""
-        self.reset()
-        self.file = fileOrStream
-    
-    def parse(self):
-        return self.readRoot()
-    
-    def reset(self):
-        self.trailer = None
-        self.contents = ''
-        self.offsets = []
-        self.currentOffset = 0
-        self.offsetsStack = []
-    
-    def readRoot(self):
-        result = None
-        self.reset()
-        # Get the header, make sure it's a valid file.
-        if not is_stream_binary_plist(self.file):
-            raise NotBinaryPlistException()
-        self.file.seek(0)
-        self.contents = self.file.read()
-        if len(self.contents) < 32:
-            raise InvalidPlistException("File is too short.")
-        trailerContents = self.contents[-32:]
-        try:
-            self.trailer = PlistTrailer._make(unpack("!xxxxxxBBQQQ", trailerContents))
-            
-            if pow(2, self.trailer.offsetSize*8) < self.trailer.offsetTableOffset:
-                raise InvalidPlistException("Offset size insufficient to reference all objects.")
-            
-            if pow(2, self.trailer.objectRefSize*8) < self.trailer.offsetCount:
-                raise InvalidPlistException("Too many offsets to represent in size of object reference representation.")
-            
-            offset_size = self.trailer.offsetSize * self.trailer.offsetCount
-            offset = self.trailer.offsetTableOffset
-            
-            if offset + offset_size > pow(2, 64):
-                raise InvalidPlistException("Offset table is excessively long.")
-            
-            if self.trailer.offsetSize > 16:
-                raise InvalidPlistException("Offset size is greater than maximum integer size.")
-            
-            if self.trailer.objectRefSize == 0:
-                raise InvalidPlistException("Object reference size is zero.")
-            
-            if offset >= len(self.contents) - 32:
-                raise InvalidPlistException("Offset table offset is too large.")
-            
-            if offset < len("bplist00x"):
-                raise InvalidPlistException("Offset table offset is too small.")
-            
-            if self.trailer.topLevelObjectNumber >= self.trailer.offsetCount:
-                raise InvalidPlistException("Top level object number is larger than the number of objects.")
-            
-            offset_contents = self.contents[offset:offset+offset_size]
-            offset_i = 0
-            offset_table_length = len(offset_contents)
-            
-            while offset_i < self.trailer.offsetCount:
-                begin = self.trailer.offsetSize*offset_i
-                end = begin+self.trailer.offsetSize
-                if end > offset_table_length:
-                    raise InvalidPlistException("End of object is at invalid offset %d in offset table of length %d" % (end, offset_table_length))
-                tmp_contents = offset_contents[begin:end]
-                tmp_sized = self.getSizedInteger(tmp_contents, self.trailer.offsetSize)
-                self.offsets.append(tmp_sized)
-                offset_i += 1
-            self.setCurrentOffsetToObjectNumber(self.trailer.topLevelObjectNumber)
-            result = self.readObject()
-        except TypeError as e:
-            raise InvalidPlistException(e)
-        return result
-    
-    def setCurrentOffsetToObjectNumber(self, objectNumber):
-        if objectNumber > len(self.offsets) - 1:
-            raise InvalidPlistException("Invalid offset number: %d" % objectNumber)
-        self.currentOffset = self.offsets[objectNumber]
-        if self.currentOffset in self.offsetsStack:
-            raise InvalidPlistException("Recursive data structure detected in object: %d" % objectNumber)
-    
-    def beginOffsetProtection(self):
-        self.offsetsStack.append(self.currentOffset)
-        return self.currentOffset
-    
-    def endOffsetProtection(self, offset):
-        try:
-            index = self.offsetsStack.index(offset)
-            self.offsetsStack = self.offsetsStack[:index]
-        except ValueError as e:
-            pass
-    
-    def readObject(self):
-        protection = self.beginOffsetProtection()
-        result = None
-        tmp_byte = self.contents[self.currentOffset:self.currentOffset+1]
-        if len(tmp_byte) != 1:
-            raise InvalidPlistException("No object found at offset: %d" % self.currentOffset)
-        marker_byte = unpack("!B", tmp_byte)[0]
-        format = (marker_byte >> 4) & 0x0f
-        extra = marker_byte & 0x0f
-        self.currentOffset += 1
-        
-        def proc_extra(extra):
-            if extra == 0b1111:
-                extra = self.readObject()
-            return extra
-        
-        # bool, null, or fill byte
-        if format == 0b0000:
-            if extra == 0b0000:
-                result = None
-            elif extra == 0b1000:
-                result = False
-            elif extra == 0b1001:
-                result = True
-            elif extra == 0b1111:
-                pass # fill byte
-            else:
-                raise InvalidPlistException("Invalid object found at offset: %d" % (self.currentOffset - 1))
-        # int
-        elif format == 0b0001:
-            result = self.readInteger(pow(2, extra))
-        # real
-        elif format == 0b0010:
-            result = self.readReal(extra)
-        # date
-        elif format == 0b0011 and extra == 0b0011:
-            result = self.readDate()
-        # data
-        elif format == 0b0100:
-            extra = proc_extra(extra)
-            result = self.readData(extra)
-        # ascii string
-        elif format == 0b0101:
-            extra = proc_extra(extra)
-            result = self.readAsciiString(extra)
-        # Unicode string
-        elif format == 0b0110:
-            extra = proc_extra(extra)
-            result = self.readUnicode(extra)
-        # uid
-        elif format == 0b1000:
-            result = self.readUid(extra)
-        # array
-        elif format == 0b1010:
-            extra = proc_extra(extra)
-            result = self.readArray(extra)
-        # set
-        elif format == 0b1100:
-            extra = proc_extra(extra)
-            result = set(self.readArray(extra))
-        # dict
-        elif format == 0b1101:
-            extra = proc_extra(extra)
-            result = self.readDict(extra)
-        else:    
-            raise InvalidPlistException("Invalid object found: {format: %s, extra: %s}" % (bin(format), bin(extra)))
-        self.endOffsetProtection(protection)
-        return result
-    
-    def readContents(self, length, description="Object contents"):
-        end = self.currentOffset + length
-        if end >= len(self.contents) - 32:
-            raise InvalidPlistException("%s extends into trailer" % description)
-        elif length < 0:
-            raise InvalidPlistException("%s length is less than zero" % length)
-        data = self.contents[self.currentOffset:end]
-        return data
-    
-    def readInteger(self, byteSize):
-        data = self.readContents(byteSize, "Integer")
-        self.currentOffset = self.currentOffset + byteSize
-        return self.getSizedInteger(data, byteSize, as_number=True)
-    
-    def readReal(self, length):
-        to_read = pow(2, length)
-        data = self.readContents(to_read, "Real")
-        if length == 2: # 4 bytes
-            result = unpack('>f', data)[0]
-        elif length == 3: # 8 bytes
-            result = unpack('>d', data)[0]
-        else:
-            raise InvalidPlistException("Unknown Real of length %d bytes" % to_read)
-        return result
-    
-    def readRefs(self, count):    
-        refs = []
-        i = 0
-        while i < count:
-            fragment = self.readContents(self.trailer.objectRefSize, "Object reference")
-            ref = self.getSizedInteger(fragment, len(fragment))
-            refs.append(ref)
-            self.currentOffset += self.trailer.objectRefSize
-            i += 1
-        return refs
-    
-    def readArray(self, count):
-        if not isinstance(count, (int, long)):
-            raise InvalidPlistException("Count of entries in dict isn't of integer type.")
-        result = []
-        values = self.readRefs(count)
-        i = 0
-        while i < len(values):
-            self.setCurrentOffsetToObjectNumber(values[i])
-            value = self.readObject()
-            result.append(value)
-            i += 1
-        return result
-    
-    def readDict(self, count):
-        if not isinstance(count, (int, long)):
-            raise InvalidPlistException("Count of keys/values in dict isn't of integer type.")
-        result = {}
-        keys = self.readRefs(count)
-        values = self.readRefs(count)
-        i = 0
-        while i < len(keys):
-            self.setCurrentOffsetToObjectNumber(keys[i])
-            key = self.readObject()
-            self.setCurrentOffsetToObjectNumber(values[i])
-            value = self.readObject()
-            result[key] = value
-            i += 1
-        return result
-    
-    def readAsciiString(self, length):
-        if not isinstance(length, (int, long)):
-            raise InvalidPlistException("Length of ASCII string isn't of integer type.")
-        data = self.readContents(length, "ASCII string")
-        result = unpack("!%ds" % length, data)[0]
-        self.currentOffset += length
-        return str(result.decode('ascii'))
-    
-    def readUnicode(self, length):
-        if not isinstance(length, (int, long)):
-            raise InvalidPlistException("Length of Unicode string isn't of integer type.")
-        actual_length = length*2
-        data = self.readContents(actual_length, "Unicode string")
-        self.currentOffset += actual_length
-        return data.decode('utf_16_be')
-    
-    def readDate(self):
-        data = self.readContents(8, "Date")
-        x = unpack(">d", data)[0]
-        if math.isnan(x):
-            raise InvalidPlistException("Date is NaN")
-        # Use timedelta to workaround time_t size limitation on 32-bit python.
-        try:
-            result = datetime.timedelta(seconds=x) + apple_reference_date
-        except OverflowError:
-            if x > 0:
-                result = datetime.datetime.max
-            else:
-                result = datetime.datetime.min
-        self.currentOffset += 8
-        return result
-    
-    def readData(self, length):
-        if not isinstance(length, (int, long)):
-            raise InvalidPlistException("Length of data isn't of integer type.")
-        result = self.readContents(length, "Data")
-        self.currentOffset += length
-        return Data(result)
-    
-    def readUid(self, length):
-        if not isinstance(length, (int, long)):
-            raise InvalidPlistException("Uid length isn't of integer type.")
-        return Uid(self.readInteger(length+1))
-    
-    def getSizedInteger(self, data, byteSize, as_number=False):
-        """Numbers of 8 bytes are signed integers when they refer to numbers, but unsigned otherwise."""
-        result = 0
-        if byteSize == 0:
-            raise InvalidPlistException("Encountered integer with byte size of 0.")
-        # 1, 2, and 4 byte integers are unsigned
-        elif byteSize == 1:
-            result = unpack('>B', data)[0]
-        elif byteSize == 2:
-            result = unpack('>H', data)[0]
-        elif byteSize == 4:
-            result = unpack('>L', data)[0]
-        elif byteSize == 8:
-            if as_number:
-                result = unpack('>q', data)[0]
-            else:
-                result = unpack('>Q', data)[0]
-        elif byteSize <= 16:
-            # Handle odd-sized or integers larger than 8 bytes
-            # Don't naively go over 16 bytes, in order to prevent infinite loops.
-            result = 0
-            if hasattr(int, 'from_bytes'):
-                result = int.from_bytes(data, 'big')
-            else:
-                for byte in data:
-                    if not isinstance(byte, int): # Python3.0-3.1.x return ints, 2.x return str
-                        byte = unpack_from('>B', byte)[0]
-                    result = (result << 8) | byte
-        else:
-            raise InvalidPlistException("Encountered integer longer than 16 bytes.")
-        return result
-
-class HashableWrapper(object):
-    def __init__(self, value):
-        self.value = value
-    def __repr__(self):
-        return "<HashableWrapper: %s>" % [self.value]
-
-class BoolWrapper(object):
-    def __init__(self, value):
-        self.value = value
-    def __repr__(self):
-        return "<BoolWrapper: %s>" % self.value
-
-class FloatWrapper(object):
-    _instances = {}
-    def __new__(klass, value):
-        # Ensure FloatWrapper(x) for a given float x is always the same object
-        wrapper = klass._instances.get(value)
-        if wrapper is None:
-            wrapper = object.__new__(klass)
-            wrapper.value = value
-            klass._instances[value] = wrapper
-        return wrapper
-    def __repr__(self):
-        return "<FloatWrapper: %s>" % self.value
-
-class StringWrapper(object):
-    __instances = {}
-    
-    encodedValue = None
-    encoding = None
-    
-    def __new__(cls, value):
-        '''Ensure we only have a only one instance for any string,
-         and that we encode ascii as 1-byte-per character when possible'''
-        
-        encodedValue = None
-        
-        for encoding in ('ascii', 'utf_16_be'):
-            try:
-               encodedValue = value.encode(encoding)
-            except: pass
-            if encodedValue is not None:
-                if encodedValue not in cls.__instances:
-                    cls.__instances[encodedValue] = super(StringWrapper, cls).__new__(cls)
-                    cls.__instances[encodedValue].encodedValue = encodedValue
-                    cls.__instances[encodedValue].encoding = encoding
-                return cls.__instances[encodedValue]
-        
-        raise ValueError('Unable to get ascii or utf_16_be encoding for %s' % repr(value))
-    
-    def __len__(self):
-        '''Return roughly the number of characters in this string (half the byte length)'''
-        if self.encoding == 'ascii':
-            return len(self.encodedValue)
-        else:
-            return len(self.encodedValue)//2
-    
-    def __lt__(self, other):
-        return self.encodedValue < other.encodedValue
-    
-    @property
-    def encodingMarker(self):
-        if self.encoding == 'ascii':
-            return 0b0101
-        else:
-            return 0b0110
-    
-    def __repr__(self):
-        return '<StringWrapper (%s): %s>' % (self.encoding, self.encodedValue)
-
-class PlistWriter(object):
-    header = b'bplist00bybiplist1.0'
-    file = None
-    byteCounts = None
-    trailer = None
-    computedUniques = None
-    writtenReferences = None
-    referencePositions = None
-    wrappedTrue = None
-    wrappedFalse = None
-    # Used to detect recursive object references.
-    objectsStack = []
-    
-    def __init__(self, file):
-        self.reset()
-        self.file = file
-        self.wrappedTrue = BoolWrapper(True)
-        self.wrappedFalse = BoolWrapper(False)
-
-    def reset(self):
-        self.byteCounts = PlistByteCounts(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-        self.trailer = PlistTrailer(0, 0, 0, 0, 0)
-        
-        # A set of all the uniques which have been computed.
-        self.computedUniques = set()
-        # A list of all the uniques which have been written.
-        self.writtenReferences = {}
-        # A dict of the positions of the written uniques.
-        self.referencePositions = {}
-        
-        self.objectsStack = []
-        
-    def positionOfObjectReference(self, obj):
-        """If the given object has been written already, return its
-           position in the offset table. Otherwise, return None."""
-        return self.writtenReferences.get(obj)
-        
-    def writeRoot(self, root):
-        """
-        Strategy is:
-        - write header
-        - wrap root object so everything is hashable
-        - compute size of objects which will be written
-          - need to do this in order to know how large the object refs
-            will be in the list/dict/set reference lists
-        - write objects
-          - keep objects in writtenReferences
-          - keep positions of object references in referencePositions
-          - write object references with the length computed previously
-        - computer object reference length
-        - write object reference positions
-        - write trailer
-        """
-        output = self.header
-        wrapped_root = self.wrapRoot(root)
-        self.computeOffsets(wrapped_root, asReference=True, isRoot=True)
-        self.trailer = self.trailer._replace(**{'objectRefSize':self.intSize(len(self.computedUniques))})
-        self.writeObjectReference(wrapped_root, output)
-        output = self.writeObject(wrapped_root, output, setReferencePosition=True)
-        
-        # output size at this point is an upper bound on how big the
-        # object reference offsets need to be.
-        self.trailer = self.trailer._replace(**{
-            'offsetSize':self.intSize(len(output)),
-            'offsetCount':len(self.computedUniques),
-            'offsetTableOffset':len(output),
-            'topLevelObjectNumber':0
-            })
-        
-        output = self.writeOffsetTable(output)
-        output += pack('!xxxxxxBBQQQ', *self.trailer)
-        self.file.write(output)
-    
-    def beginRecursionProtection(self, obj):
-        if not isinstance(obj, (set, dict, list, tuple)):
-            return
-        if id(obj) in self.objectsStack:
-            raise InvalidPlistException("Recursive containers are not allowed in plists.")
-        self.objectsStack.append(id(obj))
-    
-    def endRecursionProtection(self, obj):
-        if not isinstance(obj, (set, dict, list, tuple)):
-            return
-        try:
-            index = self.objectsStack.index(id(obj))
-            self.objectsStack = self.objectsStack[:index]
-        except ValueError as e:
-            pass
-
-    def wrapRoot(self, root):
-        result = None
-        self.beginRecursionProtection(root)
-        
-        if isinstance(root, bool):
-            if root is True:
-                result = self.wrappedTrue
-            else:
-                result = self.wrappedFalse
-        elif isinstance(root, float):
-            result = FloatWrapper(root)
-        elif isinstance(root, set):
-            n = set()
-            for value in root:
-                n.add(self.wrapRoot(value))
-            result = HashableWrapper(n)
-        elif isinstance(root, dict):
-            n = {}
-            for key, value in iteritems(root):
-                n[self.wrapRoot(key)] = self.wrapRoot(value)
-            result = HashableWrapper(n)
-        elif isinstance(root, list):
-            n = []
-            for value in root:
-                n.append(self.wrapRoot(value))
-            result = HashableWrapper(n)
-        elif isinstance(root, tuple):
-            n = tuple([self.wrapRoot(value) for value in root])
-            result = HashableWrapper(n)
-        elif isinstance(root, (str, unicode)) and not isinstance(root, Data):
-            result =  StringWrapper(root)
-        elif isinstance(root, bytes):
-            result = Data(root)
-        else:
-            result = root
-        
-        self.endRecursionProtection(root)
-        return result
-
-    def incrementByteCount(self, field, incr=1):
-        self.byteCounts = self.byteCounts._replace(**{field:self.byteCounts.__getattribute__(field) + incr})
-
-    def computeOffsets(self, obj, asReference=False, isRoot=False):
-        def check_key(key):
-            if key is None:
-                raise InvalidPlistException('Dictionary keys cannot be null in plists.')
-            elif isinstance(key, Data):
-                raise InvalidPlistException('Data cannot be dictionary keys in plists.')
-            elif not isinstance(key, StringWrapper):
-                raise InvalidPlistException('Keys must be strings.')
-        
-        def proc_size(size):
-            if size > 0b1110:
-                size += self.intSize(size)
-            return size
-        # If this should be a reference, then we keep a record of it in the
-        # uniques table.
-        if asReference:
-            if obj in self.computedUniques:
-                return
-            else:
-                self.computedUniques.add(obj)
-        
-        if obj is None:
-            self.incrementByteCount('nullBytes')
-        elif isinstance(obj, BoolWrapper):
-            self.incrementByteCount('boolBytes')
-        elif isinstance(obj, Uid):
-            size = self.intSize(obj.integer)
-            self.incrementByteCount('uidBytes', incr=1+size)
-        elif isinstance(obj, (int, long)):
-            size = self.intSize(obj)
-            self.incrementByteCount('intBytes', incr=1+size)
-        elif isinstance(obj, FloatWrapper):
-            size = self.realSize(obj)
-            self.incrementByteCount('realBytes', incr=1+size)
-        elif isinstance(obj, datetime.datetime):    
-            self.incrementByteCount('dateBytes', incr=2)
-        elif isinstance(obj, Data):
-            size = proc_size(len(obj))
-            self.incrementByteCount('dataBytes', incr=1+size)
-        elif isinstance(obj, StringWrapper):
-            size = proc_size(len(obj))
-            self.incrementByteCount('stringBytes', incr=1+size)
-        elif isinstance(obj, HashableWrapper):
-            obj = obj.value
-            if isinstance(obj, set):
-                size = proc_size(len(obj))
-                self.incrementByteCount('setBytes', incr=1+size)
-                for value in obj:
-                    self.computeOffsets(value, asReference=True)
-            elif isinstance(obj, (list, tuple)):
-                size = proc_size(len(obj))
-                self.incrementByteCount('arrayBytes', incr=1+size)
-                for value in obj:
-                    asRef = True
-                    self.computeOffsets(value, asReference=True)
-            elif isinstance(obj, dict):
-                size = proc_size(len(obj))
-                self.incrementByteCount('dictBytes', incr=1+size)
-                for key, value in iteritems(obj):
-                    check_key(key)
-                    self.computeOffsets(key, asReference=True)
-                    self.computeOffsets(value, asReference=True)
-        else:
-            raise InvalidPlistException("Unknown object type: %s (%s)" % (type(obj).__name__, repr(obj)))
-
-    def writeObjectReference(self, obj, output):
-        """Tries to write an object reference, adding it to the references
-           table. Does not write the actual object bytes or set the reference
-           position. Returns a tuple of whether the object was a new reference
-           (True if it was, False if it already was in the reference table)
-           and the new output.
-        """
-        position = self.positionOfObjectReference(obj)
-        if position is None:
-            self.writtenReferences[obj] = len(self.writtenReferences)
-            output += self.binaryInt(len(self.writtenReferences) - 1, byteSize=self.trailer.objectRefSize)
-            return (True, output)
-        else:
-            output += self.binaryInt(position, byteSize=self.trailer.objectRefSize)
-            return (False, output)
-
-    def writeObject(self, obj, output, setReferencePosition=False):
-        """Serializes the given object to the output. Returns output.
-           If setReferencePosition is True, will set the position the
-           object was written.
-        """
-        def proc_variable_length(format, length):
-            result = b''
-            if length > 0b1110:
-                result += pack('!B', (format << 4) | 0b1111)
-                result = self.writeObject(length, result)
-            else:
-                result += pack('!B', (format << 4) | length)
-            return result
-        
-        def timedelta_total_seconds(td):
-            # Shim for Python 2.6 compatibility, which doesn't have total_seconds.
-            # Make one argument a float to ensure the right calculation.
-            return (td.microseconds + (td.seconds + td.days * 24 * 3600) * 10.0**6) / 10.0**6
-       
-        if setReferencePosition:
-            self.referencePositions[obj] = len(output)
-        
-        if obj is None:
-            output += pack('!B', 0b00000000)
-        elif isinstance(obj, BoolWrapper):
-            if obj.value is False:
-                output += pack('!B', 0b00001000)
-            else:
-                output += pack('!B', 0b00001001)
-        elif isinstance(obj, Uid):
-            size = self.intSize(obj.integer)
-            output += pack('!B', (0b1000 << 4) | size - 1)
-            output += self.binaryInt(obj.integer)
-        elif isinstance(obj, (int, long)):
-            byteSize = self.intSize(obj)
-            root = math.log(byteSize, 2)
-            output += pack('!B', (0b0001 << 4) | int(root))
-            output += self.binaryInt(obj, as_number=True)
-        elif isinstance(obj, FloatWrapper):
-            # just use doubles
-            output += pack('!B', (0b0010 << 4) | 3)
-            output += self.binaryReal(obj)
-        elif isinstance(obj, datetime.datetime):
-            try:
-                timestamp = (obj - apple_reference_date).total_seconds()
-            except AttributeError:
-                timestamp = timedelta_total_seconds(obj - apple_reference_date)
-            output += pack('!B', 0b00110011)
-            output += pack('!d', float(timestamp))
-        elif isinstance(obj, Data):
-            output += proc_variable_length(0b0100, len(obj))
-            output += obj
-        elif isinstance(obj, StringWrapper):
-            output += proc_variable_length(obj.encodingMarker, len(obj))
-            output += obj.encodedValue
-        elif isinstance(obj, bytes):
-            output += proc_variable_length(0b0101, len(obj))
-            output += obj
-        elif isinstance(obj, HashableWrapper):
-            obj = obj.value
-            if isinstance(obj, (set, list, tuple)):
-                if isinstance(obj, set):
-                    output += proc_variable_length(0b1100, len(obj))
-                else:
-                    output += proc_variable_length(0b1010, len(obj))
-            
-                objectsToWrite = []
-                for objRef in sorted(obj) if isinstance(obj, set) else obj:
-                    (isNew, output) = self.writeObjectReference(objRef, output)
-                    if isNew:
-                        objectsToWrite.append(objRef)
-                for objRef in objectsToWrite:
-                    output = self.writeObject(objRef, output, setReferencePosition=True)
-            elif isinstance(obj, dict):
-                output += proc_variable_length(0b1101, len(obj))
-                keys = []
-                values = []
-                objectsToWrite = []
-                for key, value in sorted(iteritems(obj)):
-                    keys.append(key)
-                    values.append(value)
-                for key in keys:
-                    (isNew, output) = self.writeObjectReference(key, output)
-                    if isNew:
-                        objectsToWrite.append(key)
-                for value in values:
-                    (isNew, output) = self.writeObjectReference(value, output)
-                    if isNew:
-                        objectsToWrite.append(value)
-                for objRef in objectsToWrite:
-                    output = self.writeObject(objRef, output, setReferencePosition=True)
-        return output
-    
-    def writeOffsetTable(self, output):
-        """Writes all of the object reference offsets."""
-        all_positions = []
-        writtenReferences = list(self.writtenReferences.items())
-        writtenReferences.sort(key=lambda x: x[1])
-        for obj,order in writtenReferences:
-            # Porting note: Elsewhere we deliberately replace empty unicdoe strings
-            # with empty binary strings, but the empty unicode string
-            # goes into writtenReferences.  This isn't an issue in Py2
-            # because u'' and b'' have the same hash; but it is in
-            # Py3, where they don't.
-            if bytes != str and obj == unicodeEmpty:
-                obj = b''
-            position = self.referencePositions.get(obj)
-            if position is None:
-                raise InvalidPlistException("Error while writing offsets table. Object not found. %s" % obj)
-            output += self.binaryInt(position, self.trailer.offsetSize)
-            all_positions.append(position)
-        return output
-    
-    def binaryReal(self, obj):
-        # just use doubles
-        result = pack('>d', obj.value)
-        return result
-    
-    def binaryInt(self, obj, byteSize=None, as_number=False):
-        result = b''
-        if byteSize is None:
-            byteSize = self.intSize(obj)
-        if byteSize == 1:
-            result += pack('>B', obj)
-        elif byteSize == 2:
-            result += pack('>H', obj)
-        elif byteSize == 4:
-            result += pack('>L', obj)
-        elif byteSize == 8:
-            if as_number:
-                result += pack('>q', obj)
-            else:
-                result += pack('>Q', obj)
-        elif byteSize <= 16:
-            try:
-                result = pack('>Q', 0) + pack('>Q', obj)
-            except struct_error as e:
-                raise InvalidPlistException("Unable to pack integer %d: %s" % (obj, e))
-        else:
-            raise InvalidPlistException("Core Foundation can't handle integers with size greater than 16 bytes.")
-        return result
-    
-    def intSize(self, obj):
-        """Returns the number of bytes necessary to store the given integer."""
-        # SIGNED
-        if obj < 0: # Signed integer, always 8 bytes
-            return 8
-        # UNSIGNED
-        elif obj <= 0xFF: # 1 byte
-            return 1
-        elif obj <= 0xFFFF: # 2 bytes
-            return 2
-        elif obj <= 0xFFFFFFFF: # 4 bytes
-            return 4
-        # SIGNED
-        # 0x7FFFFFFFFFFFFFFF is the max.
-        elif obj <= 0x7FFFFFFFFFFFFFFF: # 8 bytes signed
-            return 8
-        elif obj <= 0xffffffffffffffff: # 8 bytes unsigned
-            return 16
-        else:
-            raise InvalidPlistException("Core Foundation can't handle integers with size greater than 8 bytes.")
-    
-    def realSize(self, obj):
-        return 8
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/biplist/qt_attribution.json b/src/3rdparty/python/lib/python2.7/site-packages/biplist/qt_attribution.json
deleted file mode 100644
index 266e9dd89..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/biplist/qt_attribution.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "Id": "biplist",
-    "Name": "biplist",
-    "QDocModule": "qbs",
-    "QtUsage": "Used in the qbs dmg module for building Apple disk images.",
-    "Description": "biplist is a library for reading/writing binary plists.",
-    "Homepage": "https://bitbucket.org/wooster/biplist",
-    "Version": "1.0.2",
-    "License": "BSD 3-clause \"New\" or \"Revised\" License",
-    "LicenseId": "BSD-3-Clause",
-    "LicenseFile": "LICENSE",
-    "Copyright": "Copyright (c) 2010, Andrew Wooster"
-}
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/__init__.py b/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/__init__.py
deleted file mode 100644
index e7f985c32..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from .core import build_dmg
-
-__all__ = ['dmgbuild']
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/badge.py b/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/badge.py
deleted file mode 100644
index 159a53708..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/badge.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from Quartz import *
-import math
-
-_REMOVABLE_DISK_PATH = '/System/Library/Extensions/IOStorageFamily.kext/Contents/Resources/Removable.icns'
-
-def badge_disk_icon(badge_file, output_file):
-    # Load the Removable disk icon
-    url = CFURLCreateWithFileSystemPath(None, _REMOVABLE_DISK_PATH,
-                                        kCFURLPOSIXPathStyle, False)
-    backdrop = CGImageSourceCreateWithURL(url, None)
-    backdropCount = CGImageSourceGetCount(backdrop)
-    
-    # Load the badge
-    url = CFURLCreateWithFileSystemPath(None, badge_file,
-                                        kCFURLPOSIXPathStyle, False)
-    badge = CGImageSourceCreateWithURL(url, None)
-    assert badge is not None, 'Unable to process image file: %s' % badge_file
-    badgeCount = CGImageSourceGetCount(badge)
-    
-    # Set up a destination for our target
-    url = CFURLCreateWithFileSystemPath(None, output_file,
-                                        kCFURLPOSIXPathStyle, False)
-    target = CGImageDestinationCreateWithURL(url, 'com.apple.icns',
-                                             backdropCount, None)
-
-    # Get the RGB colorspace
-    rgbColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB)
-
-    # Scale
-    scale = 1.0
-    
-    # Perspective transform
-    corners = ((0.2, 0.95), (0.8, 0.95), (0.85, 0.35), (0.15, 0.35))
-
-    # Translation
-    position = (0.5, 0.5)
-
-    for n in range(backdropCount):
-        props = CGImageSourceCopyPropertiesAtIndex(backdrop, n, None)
-        width = props['PixelWidth']
-        height = props['PixelHeight']
-        dpi = props['DPIWidth']
-        depth = props['Depth']
-        
-        # Choose the best sized badge image
-        bestWidth = None
-        bestHeight = None
-        bestBadge = None
-        bestDepth = None
-        bestDPI = None
-        for m in range(badgeCount):
-            badgeProps = CGImageSourceCopyPropertiesAtIndex(badge, m, None)
-            badgeWidth = badgeProps['PixelWidth']
-            badgeHeight = badgeProps['PixelHeight']
-            badgeDPI = badgeProps['DPIWidth']
-            badgeDepth = badgeProps['Depth']
-            
-            if bestBadge is None or (badgeWidth <= width
-                                    and (bestWidth > width
-                                        or badgeWidth > bestWidth
-                                        or (badgeWidth == bestWidth
-                                            and badgeDPI == dpi
-                                            and badgeDepth <= depth
-                                            and (bestDepth is None
-                                                 or badgeDepth > bestDepth)))):
-                bestBadge = m
-                bestWidth = badgeWidth
-                bestHeight = badgeHeight
-                bestDPI = badgeDPI
-                bestDepth = badgeDepth
-
-        badgeImage = CGImageSourceCreateImageAtIndex(badge, bestBadge, None)
-        badgeCI = CIImage.imageWithCGImage_(badgeImage)
-    
-        backgroundImage = CGImageSourceCreateImageAtIndex(backdrop, n, None)
-        backgroundCI = CIImage.imageWithCGImage_(backgroundImage)
-    
-        compositor = CIFilter.filterWithName_('CISourceOverCompositing')
-        lanczos = CIFilter.filterWithName_('CILanczosScaleTransform')
-        perspective = CIFilter.filterWithName_('CIPerspectiveTransform')
-        transform = CIFilter.filterWithName_('CIAffineTransform')
-    
-        lanczos.setValue_forKey_(badgeCI, kCIInputImageKey)
-        lanczos.setValue_forKey_(scale * float(width)/bestWidth, kCIInputScaleKey)
-        lanczos.setValue_forKey_(1.0, kCIInputAspectRatioKey)
-
-        topLeft = (width * scale * corners[0][0],
-                   width * scale * corners[0][1])
-        topRight = (width * scale * corners[1][0],
-                    width * scale * corners[1][1])
-        bottomRight = (width * scale * corners[2][0],
-                       width * scale * corners[2][1])
-        bottomLeft = (width * scale * corners[3][0],
-                      width * scale * corners[3][1])
-
-        out = lanczos.valueForKey_(kCIOutputImageKey)
-        if width >= 16:
-            perspective.setValue_forKey_(out, kCIInputImageKey)
-            perspective.setValue_forKey_(CIVector.vectorWithX_Y_(*topLeft),
-                                         'inputTopLeft')
-            perspective.setValue_forKey_(CIVector.vectorWithX_Y_(*topRight),
-                                         'inputTopRight')
-            perspective.setValue_forKey_(CIVector.vectorWithX_Y_(*bottomRight),
-                                         'inputBottomRight')
-            perspective.setValue_forKey_(CIVector.vectorWithX_Y_(*bottomLeft),
-                                         'inputBottomLeft')
-            out = perspective.valueForKey_(kCIOutputImageKey)
-
-        tfm = NSAffineTransform.transform()
-        tfm.translateXBy_yBy_(math.floor((position[0] - 0.5 * scale) * width),
-                              math.floor((position[1] - 0.5 * scale) * height))
-
-        transform.setValue_forKey_(out, kCIInputImageKey)
-        transform.setValue_forKey_(tfm, 'inputTransform')
-        out = transform.valueForKey_(kCIOutputImageKey)
-    
-        compositor.setValue_forKey_(out, kCIInputImageKey)
-        compositor.setValue_forKey_(backgroundCI, kCIInputBackgroundImageKey)
-
-        result = compositor.valueForKey_(kCIOutputImageKey)
-
-        cgContext = CGBitmapContextCreate(None,
-                                        width,
-                                        height,
-                                        8,
-                                        0,
-                                        rgbColorSpace,
-                                        kCGImageAlphaPremultipliedLast)
-        context = CIContext.contextWithCGContext_options_(cgContext, None)
-
-        context.drawImage_inRect_fromRect_(result,
-                                           ((0, 0), (width, height)),
-                                           ((0, 0), (width, height)))
-
-        image = CGBitmapContextCreateImage(cgContext)
-
-        CGImageDestinationAddImage(target, image, props)
-
-    CGImageDestinationFinalize(target)
-    
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/colors.py b/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/colors.py
deleted file mode 100644
index 891e5d536..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/colors.py
+++ /dev/null
@@ -1,498 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import re
-import math
-
-class Color (object):
-    def to_rgb(self):
-        raise Exception('Must implement to_rgb() in subclasses')
-
-class RGB (Color):
-    def __init__(self, r, g, b):
-        self.r = r
-        self.g = g
-        self.b = b
-
-    def to_rgb(self):
-        return self
-    
-class HSL (Color):
-    def __init__(self, h, s, l):
-        self.h = h
-        self.s = s
-        self.l = l
-
-    @staticmethod
-    def _hue_to_rgb(t1, t2, hue):
-        if hue < 0:
-            hue += 6
-        elif hue >= 6:
-            hue -= 6
-
-        if hue < 1:
-            return (t2 - t1) * hue + t1
-        elif hue < 3:
-            return t2
-        elif hue < 4:
-            return (t2 - t1) * (4 - hue) + t1
-        else:
-            return t1
-        
-    def to_rgb(self):
-        hue = self.h / 60.0
-        if self.l <= 0.5:
-            t2 = self.l * (self.s + 1)
-        else:
-            t2 = self.l + self.s - (self.l * self.s)
-        t1 = self.l * 2 - t2
-        r = self._hue_to_rgb(t1, t2, hue + 2)
-        g = self._hue_to_rgb(t1, t2, hue)
-        b = self._hue_to_rgb(t1, t2, hue - 2)
-        return RGB(r, g, b)
-    
-class HWB (Color):
-    def __init__(self, h, w, b):
-        self.h = h
-        self.w = w
-        self.b = b
-
-    @staticmethod
-    def _hue_to_rgb(hue):
-        if hue < 0:
-            hue += 6
-        elif hue >= 6:
-            hue -= 6
-
-        if hue < 1:
-            return hue
-        elif hue < 3:
-            return 1
-        elif hue < 4:
-            return (4 - hue)
-        else:
-            return 0
- 
-    def to_rgb(self):
-        hue = self.h / 60.0
-        t1 = 1 - self.w - self.b
-        r = self._hue_to_rgb(hue + 2) * t1 + self.w
-        g = self._hue_to_rgb(hue) * t1 + self.w
-        b = self._hue_to_rgb(hue - 2) * t1 + self.w
-        return RGB(r, g, b)
-    
-class CMYK (Color):
-    def __init__(self, c, m, y, k):
-        self.c = c
-        self.m = m
-        self.y = y
-        self.k = k
-
-    def to_rgb(self):
-        r = 1.0 - min(1.0, self.c + self.k)
-        g = 1.0 - min(1.0, self.m + self.k)
-        b = 1.0 - min(1.0, self.y + self.k)
-        return RGB(r, g, b)
-    
-class Gray (Color):
-    def __init__(self, g):
-        self.g = g
-
-    def to_rgb(self):
-        return RGB(g, g, g)
-    
-_x11_colors = {
-	'aliceblue': (240, 248, 255),
-    'antiquewhite': (250, 235, 215),
-    'aqua':	( 0, 255, 255),
-    'aquamarine': (127, 255, 212),
-    'azure': (240, 255, 255),
-    'beige': (245, 245, 220),
-    'bisque': (255, 228, 196),
-    'black': ( 0, 0, 0),
-    'blanchedalmond': (255, 235, 205),
-    'blue': ( 0, 0, 255),
-    'blueviolet': (138, 43, 226),
-    'brown': (165, 42, 42),
-    'burlywood': (222, 184, 135),
-    'cadetblue': ( 95, 158, 160),
-    'chartreuse': (127, 255, 0),
-    'chocolate': (210, 105, 30),
-    'coral': (255, 127, 80),
-    'cornflowerblue': (100, 149, 237),
-    'cornsilk': (255, 248, 220),
-    'crimson': (220, 20, 60),
-    'cyan': ( 0, 255, 255),
-    'darkblue': ( 0, 0, 139),
-    'darkcyan': ( 0, 139, 139),
-    'darkgoldenrod': (184, 134, 11),
-    'darkgray': (169, 169, 169),
-    'darkgreen': ( 0, 100, 0),
-    'darkgrey': (169, 169, 169),
-    'darkkhaki': (189, 183, 107),
-    'darkmagenta': (139, 0, 139),
-    'darkolivegreen': ( 85, 107, 47),
-    'darkorange': (255, 140, 0),
-    'darkorchid': (153, 50, 204),
-    'darkred': (139, 0, 0),
-    'darksalmon': (233, 150, 122),
-    'darkseagreen': (143, 188, 143),
-    'darkslateblue': ( 72, 61, 139),
-    'darkslategray': ( 47, 79, 79),
-    'darkslategrey': ( 47, 79, 79),
-    'darkturquoise': ( 0, 206, 209),
-    'darkviolet': (148, 0, 211),
-    'deeppink': (255, 20, 147),
-    'deepskyblue': ( 0, 191, 255),
-    'dimgray': (105, 105, 105),
-    'dimgrey': (105, 105, 105),
-    'dodgerblue': ( 30, 144, 255),
-    'firebrick': (178, 34, 34),
-    'floralwhite': (255, 250, 240),
-    'forestgreen': ( 34, 139, 34),
-    'fuchsia': (255, 0, 255),
-    'gainsboro': (220, 220, 220),
-    'ghostwhite': (248, 248, 255),
-    'gold': (255, 215, 0),
-    'goldenrod': (218, 165, 32),
-    'gray': (128, 128, 128),
-    'grey': (128, 128, 128),
-    'green': ( 0, 128, 0),
-    'greenyellow': (173, 255, 47),
-    'honeydew': (240, 255, 240),
-    'hotpink': (255, 105, 180),
-    'indianred': (205, 92, 92),
-    'indigo': ( 75, 0, 130),
-    'ivory': (255, 255, 240),
-    'khaki': (240, 230, 140),
-    'lavender': (230, 230, 250),
-    'lavenderblush': (255, 240, 245),
-    'lawngreen': (124, 252, 0),
-    'lemonchiffon': (255, 250, 205),
-    'lightblue': (173, 216, 230),
-    'lightcoral': (240, 128, 128),
-    'lightcyan': (224, 255, 255),
-    'lightgoldenrodyellow': (250, 250, 210),
-    'lightgray': (211, 211, 211),
-    'lightgreen': (144, 238, 144),
-    'lightgrey': (211, 211, 211),
-    'lightpink': (255, 182, 193),
-    'lightsalmon': (255, 160, 122),
-    'lightseagreen': ( 32, 178, 170),
-    'lightskyblue': (135, 206, 250),
-    'lightslategray': (119, 136, 153),
-    'lightslategrey': (119, 136, 153),
-    'lightsteelblue': (176, 196, 222),
-    'lightyellow': (255, 255, 224),
-    'lime': ( 0, 255, 0),
-    'limegreen': ( 50, 205, 50),
-    'linen': (250, 240, 230),
-    'magenta': (255, 0, 255),
-    'maroon': (128, 0, 0),
-    'mediumaquamarine': (102, 205, 170),
-    'mediumblue': ( 0, 0, 205),
-    'mediumorchid': (186, 85, 211),
-    'mediumpurple': (147, 112, 219),
-    'mediumseagreen': ( 60, 179, 113),
-    'mediumslateblue': (123, 104, 238),
-    'mediumspringgreen': ( 0, 250, 154),
-    'mediumturquoise': ( 72, 209, 204),
-    'mediumvioletred': (199, 21, 133),
-    'midnightblue': ( 25, 25, 112),
-    'mintcream': (245, 255, 250),
-    'mistyrose': (255, 228, 225),
-    'moccasin': (255, 228, 181),
-    'navajowhite': (255, 222, 173),
-    'navy': ( 0, 0, 128),
-    'oldlace': (253, 245, 230),
-    'olive': (128, 128, 0),
-    'olivedrab': (107, 142, 35),
-    'orange': (255, 165, 0),
-    'orangered': (255, 69, 0),
-    'orchid': (218, 112, 214),
-    'palegoldenrod': (238, 232, 170),
-    'palegreen': (152, 251, 152),
-    'paleturquoise': (175, 238, 238),
-    'palevioletred': (219, 112, 147),
-    'papayawhip': (255, 239, 213),
-    'peachpuff': (255, 218, 185),
-    'peru': (205, 133, 63),
-    'pink': (255, 192, 203),
-    'plum': (221, 160, 221),
-    'powderblue': (176, 224, 230),
-    'purple': (128, 0, 128),
-    'red': (255, 0, 0),
-    'rosybrown': (188, 143, 143),
-    'royalblue': ( 65, 105, 225),
-    'saddlebrown': (139, 69, 19),
-    'salmon': (250, 128, 114),
-    'sandybrown': (244, 164, 96),
-    'seagreen': ( 46, 139, 87),
-    'seashell': (255, 245, 238),
-    'sienna': (160, 82, 45),
-    'silver': (192, 192, 192),
-    'skyblue': (135, 206, 235),
-    'slateblue': (106, 90, 205),
-    'slategray': (112, 128, 144),
-    'slategrey': (112, 128, 144),
-    'snow': (255, 250, 250),
-    'springgreen': ( 0, 255, 127),
-    'steelblue': ( 70, 130, 180),
-    'tan': (210, 180, 140),
-    'teal': ( 0, 128, 128),
-    'thistle': (216, 191, 216),
-    'tomato': (255, 99, 71),
-    'turquoise': ( 64, 224, 208),
-    'violet': (238, 130, 238),
-    'wheat': (245, 222, 179),
-    'white': (255, 255, 255),
-    'whitesmoke': (245, 245, 245),
-    'yellow': (255, 255, 0),
-    'yellowgreen': (154, 205, 50)
-    }
-    
-_ws_re = re.compile(r'\s+')
-_token_re = re.compile(r'[A-Za-z_][A-Za-z0-9_]*')
-_hex_re = re.compile(r'#([0-9a-f]{3}(?:[0-9a-f]{3})?)$')
-_number_re = re.compile(r'[0-9]*(\.[0-9]*)')
-
-
-class ColorParser (object):
-    def __init__(self, s):
-        self._string = s
-        self._pos = 0
-
-    def skipws(self):
-        m = _ws_re.match(self._string, self._pos)
-        if m:
-            self._pos = m.end(0)
-        
-    def expect(self, s, context=''):
-        if len(self._string) - self._pos < len(s) \
-          or self._string[self._pos:self._pos + len(s)] != s:
-            raise ValueError('bad color "%s" - expected "%s"%s'
-                            % (self._string, s, context))
-        self._pos += len(s)
-
-    def expectEnd(self):
-        if self._pos != len(self._string):
-            raise ValueError('junk at end of color "%s"' % self._string)
-
-    def getToken(self):
-        m = _token_re.match(self._string, self._pos)
-        if m:
-            token = m.group(0)
-
-            self._pos = m.end(0)
-            return token
-        return None
-        
-    def parseNumber(self, context=''):
-        m = _number_re.match(self._string, self._pos)
-        if m:
-            self._pos = m.end(0)
-            return float(m.group(0))
-        raise ValueError('bad color "%s" - expected a number%s'
-                         % (self._string, context))
-    
-    def parseColor(self):
-        self.skipws()
-
-        token = self.getToken()
-        if token:
-            if token == 'rgb':
-                return self.parseRGB()
-            elif token == 'hsl':
-                return self.parseHSL()
-            elif token == 'hwb':
-                return self.parseHWB()
-            elif token == 'cmyk':
-                return self.parseCMYK()
-            elif token == 'gray' or token == 'grey':
-                return self.parseGray()
-
-            try:
-                r, g, b = _x11_colors[token]
-            except KeyError:
-                raise ValueError('unknown color name "%s"' % token)
-
-            self.expectEnd()
-
-            return RGB(r / 255.0, g / 255.0, b / 255.0)
-        
-        m = _hex_re.match(self._string, self._pos)
-        if m:
-            hrgb = m.group(1)
-
-            if len(hrgb) == 3:
-                r = int('0x' + 2 * hrgb[0], 16)
-                g = int('0x' + 2 * hrgb[1], 16)
-                b = int('0x' + 2 * hrgb[2], 16)
-            else:
-                r = int('0x' + hrgb[0:2], 16)
-                g = int('0x' + hrgb[2:4], 16)
-                b = int('0x' + hrgb[4:6], 16)
-
-            self._pos = m.end(0)
-            self.skipws()
-
-            self.expectEnd()
-
-            return RGB(r / 255.0, g / 255.0, b / 255.0)
-
-        raise ValueError('bad color syntax "%s"' % self._string)
-
-    def parseRGB(self):
-        self.expect('(', 'after "rgb"')
-        self.skipws()
-
-        r = self.parseValue()
-
-        self.skipws()
-        self.expect(',', 'in "rgb"')
-        self.skipws()
-
-        g = self.parseValue()
-
-        self.skipws()
-        self.expect(',', 'in "rgb"')
-        self.skipws()
-
-        b = self.parseValue()
-
-        self.skipws()
-        self.expect(')', 'at end of "rgb"')
-
-        self.skipws()
-        self.expectEnd()
-
-        return RGB(r, g, b)
-        
-    def parseHSL(self):
-        self.expect('(', 'after "hsl"')
-        self.skipws()
-
-        h = self.parseAngle()
-
-        self.skipws()
-        self.expect(',', 'in "hsl"')
-        self.skipws()
-
-        s = self.parseValue()
-
-        self.skipws()
-        self.expect(',', 'in "hsl"')
-        self.skipws()
-
-        l = self.parseValue()
-
-        self.skipws()
-        self.expect(')', 'at end of "hsl"')
-
-        self.skipws()
-        self.expectEnd()
-
-        return HSL(h, s, l)
-
-    def parseHWB(self):
-        self.expect('(', 'after "hwb"')
-        self.skipws()
-
-        h = self.parseAngle()
-
-        self.skipws()
-        self.expect(',', 'in "hwb"')
-        self.skipws()
-
-        w = self.parseValue()
-
-        self.skipws()
-        self.expect(',', 'in "hwb"')
-        self.skipws()
-
-        b = self.parseValue()
-
-        self.skipws()
-        self.expect(')', 'at end of "hwb"')
-
-        self.skipws()
-        self.expectEnd()
-
-        return HWB(h, w, b)
-
-    def parseCMYK(self):
-        self.expect('(', 'after "cmyk"')
-        self.skipws()
-
-        c = self.parseValue()
-
-        self.skipws()
-        self.expect(',', 'in "cmyk"')
-        self.skipws()
-
-        m = self.parseValue()
-
-        self.skipws()
-        self.expect(',', 'in "cmyk"')
-        self.skipws()
-
-        y = self.parseValue()
-
-        self.skipws()
-        self.expect(',', 'in "cmyk"')
-        self.skipws()
-
-        k = self.parseValue()
-
-        self.skipws()
-        self.expect(')', 'at end of "cmyk"')
-
-        self.skipws()
-        self.expectEnd()
-
-        return CMYK(c, m, y, k)
-
-    def parseGray(self):
-        self.expect('(', 'after "gray"')
-        self.skipws()
-
-        g = self.parseValue()
-
-        self.skipws()
-        self.expect(')', 'at end of "gray')
-
-        self.skipws()
-        self.expectEnd()
-
-        return Gray(g)
-
-    def parseValue(self):
-        n = self.parseNumber()
-        self.skipws()
-        if self._string[self._pos] == '%':
-            n = n / 100.0
-            self.pos += 1
-        return n
-    
-    def parseAngle(self):
-        n = self.parseNumber()
-        self.skipws()
-        tok = self.getToken()
-        if tok == 'rad':
-            n = n * 180.0 / math.pi
-        elif tok == 'grad' or tok == 'gon':
-            n = n * 0.9
-        elif tok != 'deg':
-            raise ValueError('bad angle unit "%s"' % tok)
-        return n
-
-_color_re = re.compile(r'\s*(#|rgb|hsl|hwb|cmyk|gray|grey|%s)'
-                       % '|'.join(_x11_colors.keys()))
-
-
-def isAColor(s):
-    return _color_re.match(s)
-
-
-def parseColor(s):
-    return ColorParser(s).parseColor()
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/core.py b/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/core.py
deleted file mode 100644
index d94a06c1f..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/core.py
+++ /dev/null
@@ -1,655 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import os
-import pkg_resources
-import platform
-import re
-import shutil
-import stat
-import subprocess
-import sys
-import tempfile
-import tokenize
-import json
-import time
-
-try:
-    {}.iteritems
-    iteritems = lambda x: x.iteritems()
-    iterkeys = lambda x: x.iterkeys()
-except AttributeError:
-    iteritems = lambda x: x.items()
-    iterkeys = lambda x: x.keys()
-try:
-    unicode
-except NameError:
-    unicode = str
-
-if sys.version_info < (3, 4):
-    import biplist
-    def plist_from_bytes(data):
-        return biplist.readPlistFromString(data)
-    def plist_bytes(data):
-        return biplist.Data(data)
-else:
-    import plistlib
-    def plist_from_bytes(data):
-        return plistlib.loads(data)
-    def plist_bytes(data):
-        return data
-
-from mac_alias import *
-from ds_store import *
-
-from . import colors
-from . import licensing
-
-try:
-    from . import badge
-except ImportError:
-    badge = None
-
-_hexcolor_re = re.compile(r'#[0-9a-f]{3}(?:[0-9a-f]{3})?')
-
-# The first element in the platform.mac_ver() tuple is a string containing the
-# macOS version (e.g., '10.15.6'). Parse into an integer tuple.
-MACOS_VERSION = tuple(int(v) for v in platform.mac_ver()[0].split('.'))
-
-class DMGError(Exception):
-    pass
-
-def hdiutil(cmd, *args, **kwargs):
-    plist = kwargs.get('plist', True)
-    all_args = ['/usr/bin/hdiutil', cmd]
-    all_args.extend(args)
-    if plist:
-        all_args.append('-plist')
-    p = subprocess.Popen(all_args, stdout=subprocess.PIPE, close_fds=True)
-    output, errors = p.communicate()
-    if plist:
-        results = plist_from_bytes(output)
-    else:
-        results = output
-    retcode = p.wait()
-    return retcode, results
-
-# On Python 2 we can just execfile() it, but Python 3 deprecated that
-def load_settings(filename, settings):
-    if sys.version_info[0] == 2:
-        execfile(filename, settings, settings)
-    else:
-        encoding = 'utf-8'
-        with open(filename, 'rb') as fp:
-            try:
-                encoding = tokenize.detect_encoding(fp.readline)[0]
-            except SyntaxError:
-                pass
-
-        with open(filename, 'r', encoding=encoding) as fp:
-            exec(compile(fp.read(), filename, 'exec'), settings, settings)
-
-def load_json(filename, settings):
-    """Read an appdmg .json spec.  Uses the defaults for appdmg, rather than
-       the usual defaults for dmgbuild. """
-
-    with open(filename, 'r') as fp:
-        json_data = json.load(fp)
-
-    if 'title' not in json_data:
-        raise ValueError('missing \'title\' in JSON settings file')
-    if 'contents' not in json_data:
-        raise ValueError('missing \'contents\' in JSON settings file')
-
-    settings['volume_name'] = json_data['title']
-    settings['icon'] = json_data.get('icon', None)
-    settings['badge_icon'] = json_data.get('badge-icon', None)
-    bk = json_data.get('background', None)
-    if bk is None:
-        bk = json_data.get('background-color', None)
-    if bk is not None:
-        settings['background'] = bk
-    settings['icon_size'] = json_data.get('icon-size', 80)
-    wnd = json_data.get('window', { 'position': (100, 100),
-                                    'size': (640, 480) })
-    pos = wnd.get('position', { 'x': 100, 'y': 100 })
-    siz = wnd.get('size', { 'width': 640, 'height': 480 })
-    settings['window_rect'] = ((pos.get('x', 100), pos.get('y', 100)),
-                               (siz.get('width', 640), siz.get('height', 480)))
-    settings['format'] = json_data.get('format', 'UDZO')
-    settings['compression_level'] = json_data.get('compression-level', None)
-    settings['license'] = json_data.get('license', None)
-    files = []
-    hide = []
-    hide_extensions = []
-    symlinks = {}
-    icon_locations = {}
-    for fileinfo in json_data.get('contents', []):
-        if 'path' not in fileinfo:
-            raise ValueError('missing \'path\' in contents in JSON settings file')
-        if 'x' not in fileinfo:
-            raise ValueError('missing \'x\' in contents in JSON settings file')
-        if 'y' not in fileinfo:
-            raise ValueError('missing \'y\' in contents in JSON settings file')
-
-        kind = fileinfo.get('type', 'file')
-        path = fileinfo['path']
-        name = fileinfo.get('name', os.path.basename(path.rstrip('/')))
-        if kind == 'file':
-            files.append((path, name))
-        elif kind == 'link':
-            symlinks[name] = path
-        elif kind == 'position':
-            pass
-        icon_locations[name] = (fileinfo['x'], fileinfo['y'])
-        hide_ext = fileinfo.get('hide_extension', False)
-        if hide_ext:
-            hide_extensions.append(name)
-        hidden = fileinfo.get('hidden', False)
-        if hidden:
-            hide.append(name)
-
-    settings['files'] = files
-    settings['hide_extensions'] = hide_extensions
-    settings['hide'] = hide
-    settings['symlinks'] = symlinks
-    settings['icon_locations'] = icon_locations
-
-def build_dmg(filename, volume_name, settings_file=None, settings={},
-              defines={}, lookForHiDPI=True, detach_retries=5):
-    options = {
-        # Default settings
-        'filename': filename,
-        'volume_name': volume_name,
-        'format': 'UDBZ',
-        'compression_level': None,
-        'size': None,
-        'files': [],
-        'symlinks': {},
-        'hide': [],
-        'hide_extensions': [],
-        'icon': None,
-        'badge_icon': None,
-        'background': None,
-        'show_status_bar': False,
-        'show_tab_view': False,
-        'show_toolbar': False,
-        'show_pathbar': False,
-        'show_sidebar': False,
-        'sidebar_width': 180,
-        'arrange_by': None,
-        'grid_offset': (0, 0),
-        'grid_spacing': 100.0,
-        'scroll_position': (0.0, 0.0),
-        'show_icon_preview': False,
-        'show_item_info': False,
-        'label_pos': 'bottom',
-        'text_size': 16.0,
-        'icon_size': 128.0,
-        'include_icon_view_settings': 'auto',
-        'include_list_view_settings': 'auto',
-        'list_icon_size': 16.0,
-        'list_text_size': 12.0,
-        'list_scroll_position': (0, 0),
-        'list_sort_by': 'name',
-        'list_use_relative_dates': True,
-        'list_calculate_all_sizes': False,
-        'list_columns': ('name', 'date-modified', 'size', 'kind', 'date-added'),
-        'list_column_widths': {
-            'name': 300,
-            'date-modified': 181,
-            'date-created': 181,
-            'date-added': 181,
-            'date-last-opened': 181,
-            'size': 97,
-            'kind': 115,
-            'label': 100,
-            'version': 75,
-            'comments': 300,
-            },
-        'list_column_sort_directions': {
-            'name': 'ascending',
-            'date-modified': 'descending',
-            'date-created': 'descending',
-            'date-added': 'descending',
-            'date-last-opened': 'descending',
-            'size': 'descending',
-            'kind': 'ascending',
-            'label': 'ascending',
-            'version': 'ascending',
-            'comments': 'ascending',
-            },
-        'window_rect': ((100, 100), (640, 280)),
-        'default_view': 'icon-view',
-        'icon_locations': {},
-        'license': None,
-        'defines': defines
-        }
-
-    # Execute the settings file
-    if settings_file:
-        # We now support JSON settings files using appdmg's format
-        if settings_file.endswith('.json'):
-            load_json(settings_file, options)
-        else:
-            load_settings(settings_file, options)
-
-    # Add any overrides
-    options.update(settings)
-
-    # Set up the finder data
-    bounds = options['window_rect']
-
-    bounds_string = '{{%s, %s}, {%s, %s}}' % (bounds[0][0],
-                                              bounds[0][1],
-                                              bounds[1][0],
-                                              bounds[1][1])
-    bwsp = {
-        'ShowStatusBar': options['show_status_bar'],
-        'WindowBounds': bounds_string,
-        'ContainerShowSidebar': False,
-        'PreviewPaneVisibility': False,
-        'SidebarWidth': options['sidebar_width'],
-        'ShowTabView': options['show_tab_view'],
-        'ShowToolbar': options['show_toolbar'],
-        'ShowPathbar': options['show_pathbar'],
-        'ShowSidebar': options['show_sidebar']
-        }
-
-    arrange_options = {
-        'name': 'name',
-        'date-modified': 'dateModified',
-        'date-created': 'dateCreated',
-        'date-added': 'dateAdded',
-        'date-last-opened': 'dateLastOpened',
-        'size': 'size',
-        'kind': 'kind',
-        'label': 'label',
-        }
-
-    icvp = {
-        'viewOptionsVersion': 1,
-        'backgroundType': 0,
-        'backgroundColorRed': 1.0,
-        'backgroundColorGreen': 1.0,
-        'backgroundColorBlue': 1.0,
-        'gridOffsetX': float(options['grid_offset'][0]),
-        'gridOffsetY': float(options['grid_offset'][1]),
-        'gridSpacing': float(options['grid_spacing']),
-        'arrangeBy': str(arrange_options.get(options['arrange_by'], 'none')),
-        'showIconPreview': options['show_icon_preview'] == True,
-        'showItemInfo': options['show_item_info'] == True,
-        'labelOnBottom': options['label_pos'] == 'bottom',
-        'textSize': float(options['text_size']),
-        'iconSize': float(options['icon_size']),
-        'scrollPositionX': float(options['scroll_position'][0]),
-        'scrollPositionY': float(options['scroll_position'][1])
-        }
-
-    background = options['background']
-
-    columns = {
-        'name': 'name',
-        'date-modified': 'dateModified',
-        'date-created': 'dateCreated',
-        'date-added': 'dateAdded',
-        'date-last-opened': 'dateLastOpened',
-        'size': 'size',
-        'kind': 'kind',
-        'label': 'label',
-        'version': 'version',
-        'comments': 'comments'
-        }
-
-    default_widths = {
-        'name': 300,
-        'date-modified': 181,
-        'date-created': 181,
-        'date-added': 181,
-        'date-last-opened': 181,
-        'size': 97,
-        'kind': 115,
-        'label': 100,
-        'version': 75,
-        'comments': 300,
-        }
-
-    default_sort_directions = {
-        'name': 'ascending',
-        'date-modified': 'descending',
-        'date-created': 'descending',
-        'date-added': 'descending',
-        'date-last-opened': 'descending',
-        'size': 'descending',
-        'kind': 'ascending',
-        'label': 'ascending',
-        'version': 'ascending',
-        'comments': 'ascending',
-        }
-
-    lsvp = {
-        'viewOptionsVersion': 1,
-        'sortColumn': columns.get(options['list_sort_by'], 'name'),
-        'textSize': float(options['list_text_size']),
-        'iconSize': float(options['list_icon_size']),
-        'showIconPreview': options['show_icon_preview'],
-        'scrollPositionX': options['list_scroll_position'][0],
-        'scrollPositionY': options['list_scroll_position'][1],
-        'useRelativeDates': options['list_use_relative_dates'],
-        'calculateAllSizes': options['list_calculate_all_sizes'],
-        }
-
-    lsvp['columns'] = {}
-    cndx = {}
-
-    for n, column in enumerate(options['list_columns']):
-        cndx[column] = n
-        width = options['list_column_widths'].get(column,
-                                                   default_widths[column])
-        asc = 'ascending' == options['list_column_sort_directions'].get(column,
-                    default_sort_directions[column])
-
-        lsvp['columns'][columns[column]] = {
-            'index': n,
-            'width': width,
-            'identifier': columns[column],
-            'visible': True,
-            'ascending': asc
-            }
-
-    n = len(options['list_columns'])
-    for k in iterkeys(columns):
-        if cndx.get(k, None) is None:
-            cndx[k] = n
-            width = default_widths[k]
-            asc = 'ascending' == default_sort_directions[k]
-
-        lsvp['columns'][columns[column]] = {
-            'index': n,
-            'width': width,
-            'identifier': columns[column],
-            'visible': False,
-            'ascending': asc
-            }
-
-        n += 1
-
-    default_view = options['default_view']
-    views = {
-        'icon-view': b'icnv',
-        'column-view': b'clmv',
-        'list-view': b'Nlsv',
-        'coverflow': b'Flwv'
-        }
-
-    icvl = (b'type', views.get(default_view, 'icnv'))
-
-    include_icon_view_settings = default_view == 'icon-view' \
-        or options['include_icon_view_settings'] not in \
-        ('auto', 'no', 0, False, None)
-    include_list_view_settings = default_view in ('list-view', 'coverflow') \
-        or options['include_list_view_settings'] not in \
-        ('auto', 'no', 0, False, None)
-
-    filename = options['filename']
-    volume_name = options['volume_name']
-
-    # Construct a writeable image to start with
-    dirname, basename = os.path.split(os.path.realpath(filename))
-    if not basename.endswith('.dmg'):
-        basename += '.dmg'
-    writableFile = tempfile.NamedTemporaryFile(dir=dirname, prefix='.temp',
-                                               suffix=basename)
-
-    total_size = options['size']
-    if total_size == None:
-        # Start with a size of 128MB - this way we don't need to calculate the
-        # size of the background image, volume icon, and .DS_Store file (and
-        # 128 MB should be well sufficient for even the most outlandish image
-        # sizes, like an uncompressed 5K multi-resolution TIFF)
-        total_size = 128 * 1024 * 1024
-
-        def roundup(x, n):
-            return x if x % n == 0 else x + n - x % n
-
-        for path in options['files']:
-            if isinstance(path, tuple):
-                path = path[0]
-
-            if not os.path.islink(path) and os.path.isdir(path):
-                for dirpath, dirnames, filenames in os.walk(path):
-                    for f in filenames:
-                        fp = os.path.join(dirpath, f)
-                        total_size += roundup(os.lstat(fp).st_size, 4096)
-            else:
-                total_size += roundup(os.lstat(path).st_size, 4096)
-
-        for name,target in iteritems(options['symlinks']):
-            total_size += 4096
-
-        total_size = str(max(total_size / 1000, 1024)) + 'K'
-
-    ret, output = hdiutil('create',
-                          '-ov',
-                          '-volname', volume_name,
-                          '-fs', 'HFS+',
-                          '-fsargs', '-c c=64,a=16,e=16',
-                          '-size', total_size,
-                          writableFile.name)
-
-    if ret:
-        raise DMGError('Unable to create disk image')
-
-    # IDME was deprecated in macOS 10.15/Catalina; as a result, use of -noidme
-    # started raising a warning.
-    if MACOS_VERSION >= (10, 15):
-        ret, output = hdiutil('attach',
-                              '-nobrowse',
-                              '-owners', 'off',
-                              writableFile.name)
-    else:
-        ret, output = hdiutil('attach',
-                              '-nobrowse',
-                              '-owners', 'off',
-                              '-noidme',
-                              writableFile.name)
-
-    if ret:
-        raise DMGError('Unable to attach disk image')
-
-    try:
-        for info in output['system-entities']:
-            if info.get('mount-point', None):
-                device = info['dev-entry']
-                mount_point = info['mount-point']
-
-        icon = options['icon']
-        if badge:
-            badge_icon = options['badge_icon']
-        else:
-            badge_icon = None
-        icon_target_path = os.path.join(mount_point, '.VolumeIcon.icns')
-        if icon:
-            shutil.copyfile(icon, icon_target_path)
-        elif badge_icon:
-            badge.badge_disk_icon(badge_icon, icon_target_path)
-
-        if icon or badge_icon:
-            subprocess.call(['/usr/bin/SetFile', '-a', 'C', mount_point])
-
-        background_bmk = None
-
-        if not isinstance(background, (str, unicode)):
-            pass
-        elif colors.isAColor(background):
-            c = colors.parseColor(background).to_rgb()
-
-            icvp['backgroundType'] = 1
-            icvp['backgroundColorRed'] = float(c.r)
-            icvp['backgroundColorGreen'] = float(c.g)
-            icvp['backgroundColorBlue'] = float(c.b)
-        else:
-            if os.path.isfile(background):
-                # look to see if there are HiDPI resources available
-
-                if lookForHiDPI is True:
-                    name, extension = os.path.splitext(os.path.basename(background))
-                    orderedImages = [background]
-                    imageDirectory = os.path.dirname(background)
-                    if imageDirectory == '':
-                        imageDirectory = '.'
-                    for candidateName in os.listdir(imageDirectory):
-                        hasScale = re.match(
-                            r'^(?P<name>.+)@(?P<scale>\d+)x(?P<extension>\.\w+)$',
-                            candidateName)
-                        if hasScale and name == hasScale.group('name') and \
-                            extension == hasScale.group('extension'):
-                                scale = int(hasScale.group('scale'))
-                                if len(orderedImages) < scale:
-                                    orderedImages += [None] * (scale - len(orderedImages))
-                                orderedImages[scale - 1] = os.path.join(imageDirectory, candidateName)
-
-                    if len(orderedImages) > 1:
-                        # compile the grouped tiff
-                        backgroundFile = tempfile.NamedTemporaryFile(suffix='.tiff')
-                        background = backgroundFile.name
-                        output = tempfile.TemporaryFile(mode='w+')
-                        try:
-                            subprocess.check_call(
-                                ['/usr/bin/tiffutil', '-cathidpicheck'] +
-                                list(filter(None, orderedImages)) +
-                                ['-out', background], stdout=output, stderr=output)
-                        except Exception as e:
-                            output.seek(0)
-                            raise ValueError(
-                                'unable to compile combined HiDPI file "%s" got error: %s\noutput: %s'
-                                % (background, str(e), output.read()))
-
-                _, kind = os.path.splitext(background)
-                path_in_image = os.path.join(mount_point, '.background' + kind)
-                shutil.copyfile(background, path_in_image)
-            elif pkg_resources.resource_exists('dmgbuild', 'resources/' + background + '.tiff'):
-                tiffdata = pkg_resources.resource_string(
-                    'dmgbuild',
-                    'resources/' + background + '.tiff')
-                path_in_image = os.path.join(mount_point, '.background.tiff')
-
-                with open(path_in_image, 'wb') as f:
-                    f.write(tiffdata)
-            else:
-                raise ValueError('background file "%s" not found' % background)
-
-            alias = Alias.for_file(path_in_image)
-            background_bmk = Bookmark.for_file(path_in_image)
-
-            icvp['backgroundType'] = 2
-            icvp['backgroundImageAlias'] = plist_bytes(alias.to_bytes())
-
-        for f in options['files']:
-            if isinstance(f, tuple):
-                f_in_image = os.path.join(mount_point, f[1])
-                f = f[0]
-            else:
-                basename = os.path.basename(f.rstrip('/'))
-                f_in_image = os.path.join(mount_point, basename)
-
-            # use system ditto command to preserve code signing, etc.
-            subprocess.call(['/usr/bin/ditto', f, f_in_image])
-
-        for name,target in iteritems(options['symlinks']):
-            name_in_image = os.path.join(mount_point, name)
-            os.symlink(target, name_in_image)
-
-        to_hide = []
-        for name in options['hide_extensions']:
-            name_in_image = os.path.join(mount_point, name)
-            to_hide.append(name_in_image)
-
-        if to_hide:
-            subprocess.call(['/usr/bin/SetFile', '-a', 'E'] + to_hide)
-
-        to_hide = []
-        for name in options['hide']:
-            name_in_image = os.path.join(mount_point, name)
-            to_hide.append(name_in_image)
-
-        if to_hide:
-            subprocess.call(['/usr/bin/SetFile', '-a', 'V'] + to_hide)
-
-        userfn = options.get('create_hook', None)
-        if callable(userfn):
-            userfn(mount_point, options)
-
-        image_dsstore = os.path.join(mount_point, '.DS_Store')
-
-        with DSStore.open(image_dsstore, 'w+') as d:
-            d['.']['vSrn'] = ('long', 1)
-            d['.']['bwsp'] = bwsp
-            if include_icon_view_settings:
-                d['.']['icvp'] = icvp
-                if background_bmk:
-                    d['.']['pBBk'] = background_bmk
-            if include_list_view_settings:
-                d['.']['lsvp'] = lsvp
-            d['.']['icvl'] = icvl
-
-            for k,v in iteritems(options['icon_locations']):
-                d[k]['Iloc'] = v
-
-        # Delete .Trashes, if it gets created
-        shutil.rmtree(os.path.join(mount_point, '.Trashes'), True)
-    except:
-        # Always try to detach
-        hdiutil('detach', '-force', device, plist=False)
-        raise
-
-    for tries in range(detach_retries):
-        ret, output = hdiutil('detach', device, plist=False)
-        if not ret:
-            break
-        time.sleep(1)
-
-    if ret:
-        hdiutil('detach', '-force', device, plist=False)
-        raise DMGError('Unable to detach device cleanly')
-
-    # Shrink the output to the minimum possible size
-    ret, output = hdiutil('resize',
-                          '-quiet',
-                          '-sectors', 'min',
-                          writableFile.name,
-                          plist=False)
-
-    if ret:
-        raise DMGError('Unable to shrink')
-
-    key_prefix = {'UDZO': 'zlib', 'UDBZ': 'bzip2', 'ULFO': 'lzfse'}
-    compression_level = options['compression_level']
-    if options['format'] in key_prefix and compression_level:
-        compression_args = [
-            '-imagekey',
-            key_prefix[options['format']] + '-level=' + str(compression_level)
-        ]
-    else:
-        compression_args = []
-
-    ret, output = hdiutil('convert', writableFile.name,
-                          '-format', options['format'],
-                          '-ov',
-                          '-o', filename, *compression_args)
-
-    if ret:
-        raise DMGError('Unable to convert')
-
-    if options['license']:
-        ret, output = hdiutil('unflatten', '-quiet', filename, plist=False)
-
-        if ret:
-            raise DMGError('Unable to unflatten to add license')
-
-        licensing.add_license(filename, options['license'])
-
-        ret, output = hdiutil('flatten', '-quiet', filename, plist=False)
-
-        if ret:
-            raise DMGError('Unable to flatten after adding license')
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/licensing.py b/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/licensing.py
deleted file mode 100644
index 871104040..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/licensing.py
+++ /dev/null
@@ -1,461 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import os
-import struct
-
-from .resources import *
-
-# ISO language and country codes to Macintosh Region codes (from Script.h)
-# <key> == CFLocaleCreateCanonicalLocaleIdentifierFromScriptManagerCodes(NULL,
-#                                                                        kTextLanguageDontCare,
-#                                                                        <value>)
-region_codes = {
-    "en_US":             0,
-    "fr_FR":             1,
-    "en_GB":             2,
-    "de_DE":             3,
-    "it_IT":             4,
-    "nl_NL":             5,
-    "nl_BE":             6,
-    "sv_SE":             7,
-    "es_ES":             8,
-    "da_DK":             9,
-    "pt_PT":             10,
-    "fr_CA":             11,
-    "nb_NO":             12,
-    "he_IL":             13,
-    "ja_JP":             14,
-    "en_AU":             15,
-    "ar":                16,
-    "fi_FI":             17,
-    "fr_CH":             18,
-    "de_CH":             19,
-    "el_GR":             20,
-    "is_IS":             21,
-    "mt_MT":             22,
-    "el_CY":             23,
-    "tr_TR":             24,
-    "hi_IN":             33,
-    "ur_PK":             34,
-    "it_CH":             36,
-    "ro_RO":             39,
-    "grc":               40,
-    "lt_LT":             41,
-    "pl_PL":             42,
-    "hu_HU":             43,
-    "et_EE":             44,
-    "lv_LV":             45,
-    "se":                46,
-    "fo_FO":             47,
-    "fa_IR":             48,
-    "ru_RU":             49,
-    "ga_IE":             50,
-    "ko_KR":             51,
-    "zh_CN":             52,
-    "zh_TW":             53,
-    "th_TH":             54,
-    "cs_CZ":             56,
-    "sk_SK":             57,
-    "bn":                60,
-    "be_BY":             61,
-    "uk_UA":             62,
-    "sr_RS":             65,
-    "sl_SI":             66,
-    "mk_MK":             67,
-    "hr_HR":             68,
-    "pt_BR":             71,
-    "bg_BG":             72,
-    "ca_ES":             73,
-    "gd":                75,
-    "gv":                76,
-    "br":                77,
-    "iu_CA":             78,
-    "cy":                79,
-    "ga-Latg_IE":        81,
-    "en_CA":             82,
-    "dz_BT":             83,
-    "hy_AM":             84,
-    "ka_GE":             85,
-    "es_419":            86,
-    "to_TO":             88,
-    "fr_001":            91,
-    "de_AT":             92,
-    "gu_IN":             94,
-    "pa":                95,
-    "ur_IN":             96,
-    "vi_VN":             97,
-    "fr_BE":             98,
-    "uz_UZ":             99,
-    "en_SG":             100,
-    "nn_NO":             101,
-    "af_ZA":             102,
-    "eo":                103,
-    "mr_IN":             104,
-    "bo":                105,
-    "ne_NP":             106,
-    "kl":                107,
-    "en_IE":             108
-}
-
-# Map of region constants to script constants (from Script.h)
-# TextEncoding textEncoding;
-# GetTextEncodingFromScriptInfo(kTextScriptDontCare, kTextLanguageDontCare, <key>, &textEncoding);
-# <value> == GetTextEncodingBase(textEncoding);
-script_codes = {
-    0:   0,
-    1:   0,
-    2:   0,
-    3:   0,
-    4:   0,
-    5:   0,
-    6:   0,
-    7:   0,
-    8:   0,
-    9:   0,
-    10:  0,
-    11:  0,
-    12:  0,
-    13:  5,
-    14:  1,
-    15:  0,
-    16:  4,
-    17:  0,
-    18:  0,
-    19:  0,
-    20:  6,
-    21:  37,
-    22:  0,
-    23:  6,
-    24:  35,
-    25:  36,
-    26:  0,
-    27:  0,
-    30:  0,
-    31:  0,
-    32:  0,
-    33:  9,
-    34:  4,
-    35:  35,
-    36:  0,
-    37:  0,
-    39:  38,
-    40:  6,
-    41:  29,
-    42:  29,
-    43:  29,
-    44:  29,
-    45:  29,
-    46:  0,
-    47:  37,
-    48:  140,
-    49:  7,
-    50:  39,
-    51:  3,
-    52:  25,
-    53:  2,
-    54:  21,
-    56:  29,
-    57:  29,
-    59:  29,
-    60:  13,
-    61:  7,
-    62:  7,
-    64:  6,
-    65:  7,
-    66:  36,
-    67:  7,
-    68:  36,
-    70:  0,
-    71:  0,
-    72:  7,
-    73:  0,
-    75:  39,
-    76:  39,
-    77:  39,
-    78:  236,
-    79:  39,
-    81:  40,
-    82:  0,
-    83:  26,
-    84:  24,
-    85:  23,
-    86:  0,
-    88:  0,
-    91:  0,
-    92:  0,
-    94:  11,
-    95:  10,
-    96:  4,
-    97:  30,
-    98:  0,
-    99:  7,
-    100: 0,
-    101: 0,
-    102: 0,
-    103: 0,
-    104: 9,
-    105: 26,
-    106: 9,
-    107: 0,
-    108: 0
-}
-
-# Map of TextEncodingBase constants to Python encoder names (from TextCommon.h)
-encodings_map = {
-    0:   'mac_roman',       # kTextEncodingMacRoman
-    1:   'shift_jis',       # kTextEncodingMacJapanese
-    2:   'big5',            # kTextEncodingMacChineseTrad
-    3:   'euc_kr',          # kTextEncodingMacKorean
-    4:   'mac_arabic',      # kTextEncodingMacArabic
-    6:   'mac_greek',       # kTextEncodingMacGreek
-    7:   'mac_cyrillic',    # kTextEncodingMacCyrillic
-    21:  'iso8859_11',      # kTextEncodingMacThai
-    25:  'euc-cn',          # kTextEncodingMacChineseSimp
-    29:  'mac_centeuro',    # kTextEncodingMacCentralEurRoman
-    35:  'mac_turkish',     # kTextEncodingMacTurkish
-    36:  'mac_croatian',    # kTextEncodingMacCroatian
-    37:  'mac_iceland',     # kTextEncodingMacIcelandic
-    38:  'mac_romanian',    # kTextEncodingMacRomanian
-    140: 'mac_farsi'        # kTextEncodingMacFarsi
-}
-
-# Standard fonts
-fonts = {
-    'New York':      2,
-    'Geneva':        3,
-    'Monaco':        4,
-    'Venice':        5,
-    'London':        6,
-    'Athens':        7,
-    'San Francisco': 8,
-    'Toronto':       9,
-    'Cairo':         11,
-    'Los Angeles':   12,
-    'Times':         20,
-    'Helvetica':     21,
-    'Courier':       22,
-    'Symbol':        23,
-    'Mobile':        24
-}
-
-# Buttons (these come from the SLAResources file which you can find in the SLA
-#          SDK on developer.apple.com)
-default_buttons = {
-    0: (
-        b'English',
-        b'Agree',
-        b'Disagree',
-        b'Print',
-        b'Save',
-        b'If you agree with the terms of this license, press "Agree" to '
-        b'install the software.  If you do not agree, press "Disagree".'
-    ),
-
-    3: (
-        b'Deutsch',
-        b'Akzeptieren',
-        b'Ablehnen',
-        b'Drucken',
-        b'Sichern...',
-        b'Klicken Sie in \xd2Akzeptieren\xd3, wenn Sie mit den Bestimmungen des Software-Lizenzvertrags einverstanden sind. Falls nicht, bitte \xd2Ablehnen\xd3 anklicken. Sie k\x9annen die Software nur installieren, wenn Sie \xd2Akzeptieren\xd3 angeklickt haben.'
-    ),
-
-    8: (
-        b'Espa\x96ol',
-        b'Aceptar',
-        b'No aceptar',
-        b'Imprimir',
-        b'Guardar...',
-        b'Si est\x87 de acuerdo con los t\x8erminos de esta licencia, pulse "Aceptar" para instalar el software. En el supuesto de que no est\x8e de acuerdo con los t\x8erminos de esta licencia, pulse "No aceptar."'
-    ),
-
-    1: (
-        b'Fran\x8dais',
-        b'Accepter',
-        b'Refuser',
-        b'Imprimer',
-        b'Enregistrer...',
-        b'Si vous acceptez les termes de la pr\x8esente licence, cliquez sur "Accepter" afin d\'installer le logiciel. Si vous n\'\x90tes pas d\'accord avec les termes de la licence, cliquez sur "Refuser".'
-    ),
-
-    4: (
-        b'Italiano',
-        b'Accetto',
-        b'Rifiuto',
-        b'Stampa',
-        b'Registra...',
-        b'Se accetti le condizioni di questa licenza, fai clic su "Accetto" per installare il software. Altrimenti fai clic su "Rifiuto".'
-    ),
-
-    14: (
-        b'Japanese',
-        b'\x93\xaf\x88\xd3\x82\xb5\x82\xdc\x82\xb7',
-        b'\x93\xaf\x88\xd3\x82\xb5\x82\xdc\x82\xb9\x82\xf1',
-        b'\x88\xf3\x8d\xfc\x82\xb7\x82\xe9',
-        b'\x95\xdb\x91\xb6...',
-        b'\x96{\x83\\\x83t\x83g\x83E\x83G\x83A\x8eg\x97p\x8b\x96\x91\xf8\x8c_\x96\xf1\x82\xcc\x8f\xf0\x8c\x8f\x82\xc9\x93\xaf\x88\xd3\x82\xb3\x82\xea\x82\xe9\x8f\xea\x8d\x87\x82\xc9\x82\xcd\x81A\x83\\\x83t\x83g\x83E\x83G\x83A\x82\xf0\x83C\x83\x93\x83X\x83g\x81[\x83\x8b\x82\xb7\x82\xe9\x82\xbd\x82\xdf\x82\xc9\x81u\x93\xaf\x88\xd3\x82\xb5\x82\xdc\x82\xb7\x81v\x82\xf0\x89\x9f\x82\xb5\x82\xc4\x82\xad\x82\xbe\x82\xb3\x82\xa2\x81B\x81@\x93\xaf\x88\xd3\x82\xb3\x82\xea\x82\xc8\x82\xa2\x8f\xea\x8d\x87\x82\xc9\x82\xcd\x81A\x81u\x93\xaf\x88\xd3\x82\xb5\x82\xdc\x82\xb9\x82\xf1\x81v\x82\xf0\x89\x9f\x82\xb5\x82\xc4\x82\xad\x82\xbe\x82\xb3\x82\xa2\x81B'
-    ),
-
-    5: (
-        b'Nederlands',
-        b'Ja',
-        b'Nee',
-        b'Print',
-        b'Bewaar...',
-        b'Indien u akkoord gaat met de voorwaarden van deze licentie, kunt u op \'Ja\' klikken om de programmatuur te installeren. Indien u niet akkoord gaat, klikt u op \'Nee\'.'
-    ),
-
-    7: (
-        b'Svensk',
-        b'Godk\x8anns',
-        b'Avb\x9ajs',
-        b'Skriv ut',
-        b'Spara...',
-        b'Om Du godk\x8anner licensvillkoren klicka p\x8c "Godk\x8anns" f\x9ar att installera programprodukten. Om Du inte godk\x8anner licensvillkoren, klicka p\x8c "Avb\x9ajs".'
-    ),
-
-    71: (
-        b'Portugu\x90s',
-        b'Concordar',
-        b'Discordar',
-        b'Imprimir',
-        b'Salvar...',
-        b'Se est\x87 de acordo com os termos desta licen\x8da, pressione "Concordar" para instalar o software. Se n\x8bo est\x87 de acordo, pressione "Discordar".'
-    ),
-
-    52: (
-        b'Simplified Chinese',
-        b'\xcd\xac\xd2\xe2',
-        b'\xb2\xbb\xcd\xac\xd2\xe2',
-        b'\xb4\xf2\xd3\xa1',
-        b'\xb4\xe6\xb4\xa2\xa1\xad',
-        b'\xc8\xe7\xb9\xfb\xc4\xfa\xcd\xac\xd2\xe2\xb1\xbe\xd0\xed\xbf\xc9\xd0\xad\xd2\xe9\xb5\xc4\xcc\xf5\xbf\xee\xa3\xac\xc7\xeb\xb0\xb4\xa1\xb0\xcd\xac\xd2\xe2\xa1\xb1\xc0\xb4\xb0\xb2\xd7\xb0\xb4\xcb\xc8\xed\xbc\xfe\xa1\xa3\xc8\xe7\xb9\xfb\xc4\xfa\xb2\xbb\xcd\xac\xd2\xe2\xa3\xac\xc7\xeb\xb0\xb4\xa1\xb0\xb2\xbb\xcd\xac\xd2\xe2\xa1\xb1\xa1\xa3'
-    ),
-
-    53: (
-        b'Traditional Chinese',
-        b'\xa6P\xb7N',
-        b'\xa4\xa3\xa6P\xb7N',
-        b'\xa6C\xa6L',
-        b'\xc0x\xa6s\xa1K',
-        b'\xa6p\xaaG\xb1z\xa6P\xb7N\xa5\xbb\xb3\\\xa5i\xc3\xd2\xb8\xcc\xaa\xba\xb1\xf8\xb4\xda\xa1A\xbd\xd0\xab\xf6\xa1\xa7\xa6P\xb7N\xa1\xa8\xa5H\xa6w\xb8\xcb\xb3n\xc5\xe9\xa1C\xa6p\xaaG\xa4\xa3\xa6P\xb7N\xa1A\xbd\xd0\xab\xf6\xa1\xa7\xa4\xa3\xa6P\xb7N\xa1\xa8\xa1C'
-    ),
-
-    9: (
-        b'Dansk',
-        b'Enig',
-        b'Uenig',
-        b'Udskriv',
-        b'Arkiver...',
-        b'Hvis du accepterer betingelserne i licensaftalen, skal du klikke p\x8c \xd2Enig\xd3 for at installere softwaren. Klik p\x8c \xd2Uenig\xd3 for at annullere installeringen.'
-    ),
-
-    17: (
-        b'Suomi',
-        b'Hyv\x8aksyn',
-        b'En hyv\x8aksy',
-        b'Tulosta',
-        b'Tallenna\xc9',
-        b'Hyv\x8aksy lisenssisopimuksen ehdot osoittamalla \xd5Hyv\x8aksy\xd5. Jos et hyv\x8aksy sopimuksen ehtoja, osoita \xd5En hyv\x8aksy\xd5.'
-    ),
-
-    51: (
-        b'Korean',
-        b'\xb5\xbf\xc0\xc7',
-        b'\xb5\xbf\xc0\xc7 \xbe\xc8\xc7\xd4',
-        b'\xc7\xc1\xb8\xb0\xc6\xae',
-        b'\xc0\xfa\xc0\xe5...',
-        b'\xbb\xe7\xbf\xeb \xb0\xe8\xbe\xe0\xbc\xad\xc0\xc7 \xb3\xbb\xbf\xeb\xbf\xa1 \xb5\xbf\xc0\xc7\xc7\xcf\xb8\xe9, "\xb5\xbf\xc0\xc7" \xb4\xdc\xc3\xdf\xb8\xa6 \xb4\xad\xb7\xaf \xbc\xd2\xc7\xc1\xc6\xae\xbf\xfe\xbe\xee\xb8\xa6 \xbc\xb3\xc4\xa1\xc7\xcf\xbd\xca\xbd\xc3\xbf\xc0. \xb5\xbf\xc0\xc7\xc7\xcf\xc1\xf6 \xbe\xca\xb4\xc2\xb4\xd9\xb8\xe9, "\xb5\xbf\xc0\xc7 \xbe\xc8\xc7\xd4" \xb4\xdc\xc3\xdf\xb8\xa6 \xb4\xa9\xb8\xa3\xbd\xca\xbd\xc3\xbf\xc0.'
-    ),
-
-    12: (
-        b'Norsk',
-        b'Enig',
-        b'Ikke enig',
-        b'Skriv ut',
-        b'Arkiver...',
-        b'Hvis De er enig i bestemmelsene i denne lisensavtalen, klikker De p\x8c "Enig"-knappen for \x8c installere programvaren. Hvis De ikke er enig, klikker De p\x8c "Ikke enig".'
-    ),
-}
-
-class LPicResource (Resource):
-    def __init__(self, res_id, res_name, default_lang, lpic, res_attrs=0):
-        data = []
-        data.append(struct.pack(b'>HH', default_lang, len(lpic)))
-        for lang,rid,two_byte in lpic:
-            data.append(struct.pack(b'>HHH', lang, rid, int(two_byte)))
-        super(LPicResource, self).__init__(b'LPic', res_id, res_name,
-                                           b''.join(data), res_attrs)
-
-def get_encoder_name(locale):
-    if locale not in region_codes:
-        raise Exception("Cannot determine region code for locale '%s'" % locale)
-    region_code = region_codes[locale]
-
-    if region_code not in script_codes:
-        raise Exception("Cannot determine script code for locale '%s'" % locale)
-    script_code = script_codes[region_code]
-
-    if script_code not in encodings_map:
-        raise Exception("Cannot determine Python encoder name for locale '%s' - "
-                        "encode the string data manually as a byte array instead" % locale)
-    return encodings_map[script_code]
-
-def maybe_encode(s, encoding):
-    if isinstance(s, bytes):
-        return s
-    return s.encode(encoding)
-
-def add_license(filename, license_info):
-    """Add a license agreement to the specified disk image file, which should
-    have been unflattened first."""
-
-    fork = ResourceFork.from_file(filename)
-
-    default_lang = license_info.get('default-language', 'en_US')
-    default_lang_id = region_codes.get(default_lang, 0)
-
-    lpic = []
-    ndx = 1
-    for language,license_data in license_info['licenses'].items():
-        if language not in region_codes:
-            raise Exception("Unknown language '" + language + "'. Valid languages are: " +
-                            ", ".join(sorted(region_codes.keys())))
-        encoding_name = get_encoder_name(language)
-        lang_id = region_codes[language]
-
-        is_two_byte = lang_id in (14, 51, 52, 53) # Japanese, Korean, SimpChinese, TradChinese
-
-        if os.path.isfile(license_data):
-            mode = 'rb' if license_data.endswith('.rtf') else 'r'
-            with open(license_data, mode=mode) as f:
-                license_data = f.read()
-
-        if type(license_data) == bytes and license_data.startswith(b'{\\rtf1'):
-            fork.add(Resource(b'RTF ', 5000 + ndx, (language + ' SLA').encode(),
-                              license_data))
-        else:
-            fork.add(TextResource(5000 + ndx, (language + ' SLA').encode(),
-                                  maybe_encode(license_data, encoding_name)))
-            fork.add(StyleResource(5000 + ndx, (language + ' SLA').encode(),
-                                   [Style(0, 12, 9, Style.Helvetica,
-                                          0, 0, (0, 0, 0))]))
-
-        buttons = license_info.get('buttons', {}).get(language, None)
-        if buttons is None:
-            buttons = default_buttons.get(lang_id, None)
-            if buttons is None:
-                buttons = default_buttons[0]
-
-        buttons = [maybe_encode(b, encoding_name) for b in buttons]
-
-        fork.add(StringListResource(5000 + ndx, (language + ' Buttons').encode(), buttons))
-
-        lpic.append((lang_id, ndx, is_two_byte))
-
-        ndx += 1
-
-    fork.add(LPicResource(5000, None, default_lang_id, lpic))
-
-    fork.write_to_file(filename)
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/resources.py b/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/resources.py
deleted file mode 100644
index 03e2a43f3..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/resources.py
+++ /dev/null
@@ -1,359 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-import struct
-
-class Resource (object):
-    def __init__(self, res_type, res_id, res_name, data=None, res_attrs=0):
-        self.res_type = res_type
-        self.res_id = res_id
-        self.res_name = res_name
-        self.res_attrs = res_attrs
-        if data is None:
-            self.data = None
-        self.data = data
-
-        self.data_offset = None
-        self.name_offset = None
-
-    def __repr__(self):
-        return 'Resource(%r, %r, %r, data=%r, res_attrs=%r)' % (self.res_type,
-                                                                self.res_id,
-                                                                self.res_name,
-                                                                self.data,
-                                                                self.res_attrs)
-
-class TMPLResource (Resource):
-    def __init__(self, res_id, res_name, tmpl, res_attrs=0):
-        data = []
-        for name,typecode in tmpl:
-            data.append(struct.pack(b'B', len(name)))
-            data.append(name)
-            data.append(typecode)
-        super(TMPLResource, self).__init__(b'TMPL', res_id, res_name,
-                                           b''.join(data), res_attrs)
-
-class StringListResource (Resource):
-    def __init__(self, res_id, res_name, strings, res_attrs=0):
-        data = []
-        data.append(struct.pack(b'>H', len(strings)))
-        for s in strings:
-            data.append(struct.pack(b'B', len(s)))
-            data.append(s)
-
-        super(StringListResource, self).__init__(b'STR#', res_id, res_name,
-                                                 b''.join(data), res_attrs)
-
-class TextResource (Resource):
-    def __init__(self, res_id, res_name, string, res_attrs=0):
-        super(TextResource, self).__init__(b'TEXT', res_id, res_name,
-                                           string, res_attrs)
-
-class Style (object):
-    # Fonts
-    NewYork      = 2
-    Geneva       = 3
-    Monaco       = 4
-    Venice       = 5
-    London       = 6
-    Athens       = 7
-    SanFrancisco = 8
-    Toronto      = 9
-    Cairo        = 11
-    LosAngeles   = 12
-    Times        = 20
-    Helvetica    = 21
-    Courier      = 22
-    Symbol       = 23
-    Mobile       = 24
-
-    # Styles
-    Bold       = 0x0100
-    Italic     = 0x0200
-    Underline  = 0x0400
-    Outline    = 0x0800
-    Shadow     = 0x1000
-    Condense   = 0x2000
-    Expand     = 0x4000
-
-    def __init__(self, start_character, height, ascent, font_id, face,
-                 size, color):
-        self.start_character = start_character
-        self.height = height
-        self.ascent = ascent
-        self.font_id = font_id
-        self.face = face
-        self.size = size
-        self.color = color
-
-    def __repr__(self):
-        styles = []
-        if self.face & Style.Bold:
-            styles.append('Style.Bold')
-        if self.face & Style.Italic:
-            styles.append('Style.Italic')
-        if self.face & Style.Underline:
-            styles.append('Style.Underline')
-        if self.face & Style.Outline:
-            styles.append('Style.Outline')
-        if self.face & Style.Shadow:
-            styles.append('Style.Shadow')
-        if self.face & Style.Condense:
-            styles.append('Style.Condense')
-        if self.face & Style.Expand:
-            styles.append('Style.Expand')
-        if self.face & ~0x4f00:
-            styles.append('%#06x' % (self.face & ~0x4f00))
-        if styles:
-            styles = '|'.join(styles)
-        else:
-            styles = '0'
-
-        font_revmap = {
-             2: 'Style.NewYork',
-             3: 'Style.Geneva',
-             4: 'Style.Monaco',
-             5: 'Style.Venice',
-             6: 'Style.London',
-             7: 'Style.Athens',
-             8: 'Style.SanFrancisco',
-             9: 'Style.Toronto',
-            11: 'Style.Cairo',
-            12: 'Style.LosAngeles',
-            20: 'Style.Times',
-            21: 'Style.Helvetica',
-            22: 'Style.Courier',
-            23: 'Style.Symbol',
-            24: 'Style.Mobile'
-        }
-
-        font = font_revmap.get(self.font_id, '%s' % self.font_id)
-
-        return 'Style(%r, %r, %r, %s, %s, %r, %r)' % (
-            self.start_character,
-            self.height,
-            self.ascent,
-            font,
-            styles,
-            self.size,
-            self.color)
-
-class StyleResource (Resource):
-    def __init__(self, res_id, res_name, styles, res_attrs=0):
-        data = []
-        data.append(struct.pack(b'>H', len(styles)))
-        for style in styles:
-            data.append(struct.pack(b'>LHHHHHHHH',
-                                    style.start_character,
-                                    style.height,
-                                    style.ascent,
-                                    style.font_id,
-                                    style.face,
-                                    style.size,
-                                    style.color[0],
-                                    style.color[1],
-                                    style.color[2]))
-        super(StyleResource, self).__init__(b'styl', res_id, res_name,
-                                            b''.join(data), res_attrs)
-
-class ResourceFork (object):
-    def __init__(self, resources=None):
-        self.types = {}
-        self.attrs = 0
-        if resources is not None:
-            for res in resources:
-                self.add(res)
-
-    @classmethod
-    def from_data(clss, data):
-        if len(data) < 16:
-            raise ValueError('Bad resource data - data too short')
-
-        # Read the header
-        data_start, map_start, data_len, map_len = struct.unpack(b'>LLLL',
-                                                                 data[0:16])
-
-        if data_start + data_len > len(data):
-            raise ValueError('Bad resource data - data out of range')
-        if map_start + map_len > len(data):
-            raise ValueError('Bad resource data - map out of range')
-        if map_len < 30:
-            raise ValueError('Bad resource data - map too short')
-
-        # Read the map header
-        fork_attrs, type_offset, name_offset, max_type_ndx \
-            = struct.unpack(b'>HHHH', data[map_start + 22:map_start + 30])
-        num_types = max_type_ndx + 1
-
-        if type_offset + 8 * num_types > map_len:
-            raise ValueError('Bad resource data - type data outside map')
-
-        if name_offset > map_len:
-            raise ValueError('Bad resource data - names outside map')
-
-        type_offset += map_start
-        name_offset += map_start
-
-        result = ResourceFork()
-
-        # Now read the type list
-        for ntype in range(0, num_types):
-            type_pos = 2 + type_offset + 8 * ntype
-            res_type, max_item_ndx, ref_offset \
-                = struct.unpack(b'>4sHH', data[type_pos:type_pos+8])
-            num_items = max_item_ndx + 1
-
-            result.types[res_type] = []
-
-            ref_list_offset = type_offset + ref_offset
-            if ref_list_offset + 12 * num_items > map_start + map_len:
-                raise ValueError('Bad resource data - ref list outside map')
-
-            for nitem in range(0, num_items):
-                ref_elt = ref_list_offset + 12 * nitem
-                res_id, res_name_offset, data_offset \
-                    = struct.unpack(b'>hHL', data[ref_elt:ref_elt+8])
-
-                res_attrs = data_offset >> 24
-                data_offset &= 0xffffff
-
-                if data_offset >= data_len:
-                    raise ValueError('Bad resource data - item data out of range')
-
-                data_offset += data_start
-                res_len = struct.unpack(b'>L', data[data_offset:data_offset+4])[0]
-                if data_offset + res_len >= data_start + data_len:
-                    raise ValueError('Bad resource data - item data too large')
-
-                res_data = data[data_offset + 4:data_offset + res_len + 4]
-
-                if res_name_offset == 0xffff:
-                    res_name = None
-                else:
-                    res_name_offset += name_offset
-                    if res_name_offset >= map_start + map_len:
-                        raise ValueError('Bad resource data - name out of range')
-                    try:
-                        # python2
-                        res_name_len = struct.unpack(b'B', data[res_name_offset])[0]
-                    except:
-                        # python3
-                        res_name_len = data[res_name_offset]
-
-                    res_name = data[res_name_offset + 1:res_name_offset + res_name_len + 1]
-
-                result.types[res_type].append(Resource(res_type, res_id,
-                                                       res_name,
-                                                       res_data, res_attrs))
-
-        return result
-
-    @classmethod
-    def from_file(clss, filename):
-        with open(filename + '/..namedfork/rsrc', 'rb') as f:
-            data = f.read()
-        return clss.from_data(data)
-
-    def to_data(self):
-        data = []
-        data_len = 0
-        names = []
-        names_len = 0
-        types_len = len(self.types) * 8
-        types_data = []
-        reflist_data = []
-        reflist_len = 0
-
-        for res_type, items in self.types.items():
-            types_data.append(struct.pack(b'>4sHH',
-                                          res_type,
-                                          len(items) - 1,
-                                          2 + types_len + reflist_len))
-            for item in items:
-                data_offset = data_len
-
-                if item.res_name is None:
-                    name_offset = 65535
-                else:
-                    name_offset = names_len
-                    n = item.res_name
-                    names.append(struct.pack(b'B', len(n)) + n)
-                    names_len += 1 + len(n)
-
-                if item.data is None:
-                    data_len += 4
-                else:
-                    data_len += 4 + (len(item.data) + 3) & ~3
-
-                reflist_len += 12
-                reflist_data.append(struct.pack(b'>hHLL',
-                                                item.res_id,
-                                                name_offset,
-                                                (item.res_attrs << 24) \
-                                                | data_offset,
-                                                0))
-
-        # Header
-        data.append(struct.pack(b'>LLLL240s', 256, 256 + data_len, data_len,
-                                30 + types_len + reflist_len + names_len,
-                                b''))
-
-        # Resource data
-        for res_type, items in self.types.items():
-            for item in items:
-                if item.data is None:
-                    dlen = 0
-                else:
-                    dlen = len(item.data)
-                plen = (dlen + 3) & ~3
-                data.append(struct.pack(b'>L', dlen))
-                if item.data is not None:
-                    data.append(item.data)
-                if plen != dlen:
-                    data.append(b'\0' * (plen - dlen))
-
-        # Resource map header
-        data.append(struct.pack(b'>16sLHHHHH',
-                                b'', 0, 0,
-                                self.attrs, 28, 30 + types_len + reflist_len,
-                                len(self.types) - 1))
-
-        # Type list
-        data.append(b''.join(types_data))
-
-        # Reference lists
-        data.append(b''.join(reflist_data))
-
-        # Name list
-        data.append(b''.join(names))
-
-        return b''.join(data)
-
-    def write_to_file(self, filename):
-        with open(filename + '/..namedfork/rsrc', 'wb') as f:
-            f.write(self.to_data())
-
-    def __len__(self):
-        return len(self.types)
-
-    def __getitem__(self, key):
-        return self.types[key]
-
-    def __iter__(self):
-        for res_type, items in self.types.items():
-            for item in items:
-                yield item
-
-    def __repr__(self):
-        output = []
-        for item in self:
-            output.append(repr(item))
-        return 'ResourceFork([%s])' % ', '.join(output)
-
-    def add(self, res):
-        if res.res_type in self.types:
-            self.types[res.res_type].append(res)
-        else:
-            self.types[res.res_type] = [res]
-
-    def remove(self, res):
-        self.types[res.res_type].remove(res)
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/__init__.py b/src/3rdparty/python/lib/python2.7/site-packages/ds_store/__init__.py
deleted file mode 100644
index a6b812104..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from .store import DSStore, DSStoreEntry
-
-__all__ = ['DSStore', 'DSStoreEntry']
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/__init__.py b/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/__init__.py
deleted file mode 100644
index 7eb314107..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from .alias import *
-from .bookmark import *
-
-__all__ = [ 'ALIAS_KIND_FILE', 'ALIAS_KIND_FOLDER',
-            'ALIAS_HFS_VOLUME_SIGNATURE',
-            'ALIAS_FIXED_DISK', 'ALIAS_NETWORK_DISK', 'ALIAS_400KB_FLOPPY_DISK',
-            'ALIAS_800KB_FLOPPY_DISK', 'ALIAS_1_44MB_FLOPPY_DISK',
-            'ALIAS_EJECTABLE_DISK',
-            'ALIAS_NO_CNID',
-            'kBookmarkPath', 'kBookmarkCNIDPath', 'kBookmarkFileProperties',
-            'kBookmarkFileName', 'kBookmarkFileID', 'kBookmarkFileCreationDate',
-            'kBookmarkTOCPath', 'kBookmarkVolumePath',
-            'kBookmarkVolumeURL', 'kBookmarkVolumeName', 'kBookmarkVolumeUUID',
-            'kBookmarkVolumeSize', 'kBookmarkVolumeCreationDate',
-            'kBookmarkVolumeProperties', 'kBookmarkContainingFolder',
-            'kBookmarkUserName', 'kBookmarkUID', 'kBookmarkWasFileReference',
-            'kBookmarkCreationOptions', 'kBookmarkURLLengths',
-            'kBookmarkSecurityExtension',
-            'AppleShareInfo',
-            'VolumeInfo',
-            'TargetInfo',
-            'Alias',
-            'Bookmark',
-            'Data',
-            'URL' ]
-
-
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/bookmark.py b/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/bookmark.py
deleted file mode 100644
index 0de6b9404..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/bookmark.py
+++ /dev/null
@@ -1,665 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#  This file implements the Apple "bookmark" format, which is the replacement
-#  for the old-fashioned alias format.  The details of this format were
-#  reverse engineered; some things are still not entirely clear.
-#
-from __future__ import unicode_literals, print_function
-
-import struct
-import uuid
-import datetime
-import os
-import sys
-import pprint
-
-try:
-    from urlparse import urljoin
-except ImportError:
-    from urllib.parse import urljoin
-
-if sys.platform == 'darwin':
-    from . import osx
-
-def iteritems(x):
-    return x.iteritems()
-
-try:
-    unicode
-except NameError:
-    unicode = str
-    long = int
-    xrange = range
-    def iteritems(x):
-        return x.items()
-
-from .utils import *
-
-BMK_DATA_TYPE_MASK    = 0xffffff00
-BMK_DATA_SUBTYPE_MASK = 0x000000ff
-
-BMK_STRING  = 0x0100
-BMK_DATA    = 0x0200
-BMK_NUMBER  = 0x0300
-BMK_DATE    = 0x0400
-BMK_BOOLEAN = 0x0500
-BMK_ARRAY   = 0x0600
-BMK_DICT    = 0x0700
-BMK_UUID    = 0x0800
-BMK_URL     = 0x0900
-BMK_NULL    = 0x0a00
-
-BMK_ST_ZERO = 0x0000
-BMK_ST_ONE  = 0x0001
-
-BMK_BOOLEAN_ST_FALSE = 0x0000
-BMK_BOOLEAN_ST_TRUE  = 0x0001
-
-# Subtypes for BMK_NUMBER are really CFNumberType values
-kCFNumberSInt8Type = 1
-kCFNumberSInt16Type = 2
-kCFNumberSInt32Type = 3
-kCFNumberSInt64Type = 4
-kCFNumberFloat32Type = 5
-kCFNumberFloat64Type = 6
-kCFNumberCharType = 7
-kCFNumberShortType = 8
-kCFNumberIntType = 9
-kCFNumberLongType = 10
-kCFNumberLongLongType = 11
-kCFNumberFloatType = 12
-kCFNumberDoubleType = 13
-kCFNumberCFIndexType = 14
-kCFNumberNSIntegerType = 15
-kCFNumberCGFloatType = 16
-
-# Resource property flags (from CFURLPriv.h)
-kCFURLResourceIsRegularFile      = 0x00000001
-kCFURLResourceIsDirectory        = 0x00000002
-kCFURLResourceIsSymbolicLink     = 0x00000004
-kCFURLResourceIsVolume           = 0x00000008
-kCFURLResourceIsPackage          = 0x00000010
-kCFURLResourceIsSystemImmutable  = 0x00000020
-kCFURLResourceIsUserImmutable    = 0x00000040
-kCFURLResourceIsHidden           = 0x00000080
-kCFURLResourceHasHiddenExtension = 0x00000100
-kCFURLResourceIsApplication      = 0x00000200
-kCFURLResourceIsCompressed       = 0x00000400
-kCFURLResourceIsSystemCompressed = 0x00000400
-kCFURLCanSetHiddenExtension      = 0x00000800
-kCFURLResourceIsReadable         = 0x00001000
-kCFURLResourceIsWriteable        = 0x00002000
-kCFURLResourceIsExecutable       = 0x00004000
-kCFURLIsAliasFile                = 0x00008000
-kCFURLIsMountTrigger             = 0x00010000
-
-# Volume property flags (from CFURLPriv.h)
-kCFURLVolumeIsLocal                         =                0x1 #
-kCFURLVolumeIsAutomount                     =                0x2 #
-kCFURLVolumeDontBrowse                      =                0x4 #
-kCFURLVolumeIsReadOnly                      =                0x8 #
-kCFURLVolumeIsQuarantined                   =               0x10
-kCFURLVolumeIsEjectable                     =               0x20 #
-kCFURLVolumeIsRemovable                     =               0x40 #
-kCFURLVolumeIsInternal                      =               0x80 #
-kCFURLVolumeIsExternal                      =              0x100 #
-kCFURLVolumeIsDiskImage                     =              0x200 #
-kCFURLVolumeIsFileVault                     =              0x400
-kCFURLVolumeIsLocaliDiskMirror              =              0x800
-kCFURLVolumeIsiPod                          =             0x1000 #
-kCFURLVolumeIsiDisk                         =             0x2000
-kCFURLVolumeIsCD                            =             0x4000
-kCFURLVolumeIsDVD                           =             0x8000
-kCFURLVolumeIsDeviceFileSystem              =            0x10000
-kCFURLVolumeSupportsPersistentIDs           =        0x100000000
-kCFURLVolumeSupportsSearchFS                =        0x200000000
-kCFURLVolumeSupportsExchange                =        0x400000000
-# reserved                                           0x800000000
-kCFURLVolumeSupportsSymbolicLinks           =       0x1000000000
-kCFURLVolumeSupportsDenyModes               =       0x2000000000
-kCFURLVolumeSupportsCopyFile                =       0x4000000000
-kCFURLVolumeSupportsReadDirAttr             =       0x8000000000
-kCFURLVolumeSupportsJournaling              =      0x10000000000
-kCFURLVolumeSupportsRename                  =      0x20000000000
-kCFURLVolumeSupportsFastStatFS              =      0x40000000000
-kCFURLVolumeSupportsCaseSensitiveNames      =      0x80000000000
-kCFURLVolumeSupportsCasePreservedNames      =     0x100000000000
-kCFURLVolumeSupportsFLock                   =     0x200000000000
-kCFURLVolumeHasNoRootDirectoryTimes         =     0x400000000000
-kCFURLVolumeSupportsExtendedSecurity        =     0x800000000000
-kCFURLVolumeSupports2TBFileSize             =    0x1000000000000
-kCFURLVolumeSupportsHardLinks               =    0x2000000000000
-kCFURLVolumeSupportsMandatoryByteRangeLocks =    0x4000000000000
-kCFURLVolumeSupportsPathFromID              =    0x8000000000000
-# reserved                                      0x10000000000000
-kCFURLVolumeIsJournaling                    =   0x20000000000000
-kCFURLVolumeSupportsSparseFiles             =   0x40000000000000
-kCFURLVolumeSupportsZeroRuns                =   0x80000000000000
-kCFURLVolumeSupportsVolumeSizes             =  0x100000000000000
-kCFURLVolumeSupportsRemoteEvents            =  0x200000000000000
-kCFURLVolumeSupportsHiddenFiles             =  0x400000000000000
-kCFURLVolumeSupportsDecmpFSCompression      =  0x800000000000000
-kCFURLVolumeHas64BitObjectIDs               = 0x1000000000000000
-kCFURLVolumePropertyFlagsAll                = 0xffffffffffffffff
-
-BMK_URL_ST_ABSOLUTE = 0x0001
-BMK_URL_ST_RELATIVE = 0x0002
-
-# Bookmark keys
-#                           = 0x1003
-kBookmarkPath               = 0x1004   # Array of path components
-kBookmarkCNIDPath           = 0x1005   # Array of CNIDs
-kBookmarkFileProperties     = 0x1010   # (CFURL rp flags,
-                                       #  CFURL rp flags asked for,
-                                       #  8 bytes NULL)
-kBookmarkFileName           = 0x1020
-kBookmarkFileID             = 0x1030
-kBookmarkFileCreationDate   = 0x1040
-#                           = 0x1054   # ?
-#                           = 0x1055   # ?
-#                           = 0x1056   # ?
-#                           = 0x1101   # ?
-#                           = 0x1102   # ?
-kBookmarkTOCPath            = 0x2000   # A list of (TOC id, ?) pairs
-kBookmarkVolumePath         = 0x2002
-kBookmarkVolumeURL          = 0x2005
-kBookmarkVolumeName         = 0x2010
-kBookmarkVolumeUUID         = 0x2011   # Stored (perversely) as a string
-kBookmarkVolumeSize         = 0x2012
-kBookmarkVolumeCreationDate = 0x2013
-kBookmarkVolumeProperties   = 0x2020   # (CFURL vp flags,
-                                       #  CFURL vp flags asked for,
-                                       #  8 bytes NULL)
-kBookmarkVolumeIsRoot       = 0x2030   # True if volume is FS root
-kBookmarkVolumeBookmark     = 0x2040   # Embedded bookmark for disk image (TOC id)
-kBookmarkVolumeMountPoint   = 0x2050   # A URL
-#                           = 0x2070
-kBookmarkContainingFolder   = 0xc001   # Index of containing folder in path
-kBookmarkUserName           = 0xc011   # User that created bookmark
-kBookmarkUID                = 0xc012   # UID that created bookmark
-kBookmarkWasFileReference   = 0xd001   # True if the URL was a file reference
-kBookmarkCreationOptions    = 0xd010
-kBookmarkURLLengths         = 0xe003   # See below
-#                           = 0xf017   # Localized name?
-#                           = 0xf022
-kBookmarkSecurityExtension  = 0xf080
-#                           = 0xf081
-
-# kBookmarkURLLengths is an array that is set if the URL encoded by the
-# bookmark had a base URL; in that case, each entry is the length of the
-# base URL in question.  Thus a URL
-#
-#     file:///foo/bar/baz    blam/blat.html
-#
-# will result in [3, 2], while the URL
-#
-#     file:///foo    bar/baz    blam    blat.html
-#
-# would result in [1, 2, 1, 1]
-
-
-class Data (object):
-    def __init__(self, bytedata=None):
-        #: The bytes, stored as a byte string
-        self.bytes = bytes(bytedata)
-
-    def __repr__(self):
-        return 'Data(%r)' % self.bytes
-
-class URL (object):
-    def __init__(self, base, rel=None):
-        if rel is not None:
-            #: The base URL, if any (a :class:`URL`)
-            self.base = base
-            #: The rest of the URL (a string)
-            self.relative = rel
-        else:
-            self.base = None
-            self.relative = base
-
-    @property
-    def absolute(self):
-        """Return an absolute URL."""
-        if self.base is None:
-            return self.relative
-        else:
-            base_abs = self.base.absolute
-            return urljoin(self.base.absolute, self.relative)
-
-    def __repr__(self):
-        return 'URL(%r)' % self.absolute
-
-class Bookmark (object):
-    def __init__(self, tocs=None):
-        if tocs is None:
-            #: The TOCs for this Bookmark
-            self.tocs = []
-        else:
-            self.tocs = tocs
-
-    @classmethod
-    def _get_item(cls, data, hdrsize, offset):
-        offset += hdrsize
-        if offset > len(data) - 8:
-            raise ValueError('Offset out of range')
-
-        length,typecode = struct.unpack(b'<II', data[offset:offset+8])
-
-        if len(data) - offset < 8 + length:
-            raise ValueError('Data item truncated')
-
-        databytes = data[offset+8:offset+8+length]
-
-        dsubtype = typecode & BMK_DATA_SUBTYPE_MASK
-        dtype = typecode & BMK_DATA_TYPE_MASK
-
-        if dtype == BMK_STRING:
-            return databytes.decode('utf-8')
-        elif dtype == BMK_DATA:
-            return Data(databytes)
-        elif dtype == BMK_NUMBER:
-            if dsubtype == kCFNumberSInt8Type:
-                return ord(databytes[0])
-            elif dsubtype == kCFNumberSInt16Type:
-                return struct.unpack(b'<h', databytes)[0]
-            elif dsubtype == kCFNumberSInt32Type:
-                return struct.unpack(b'<i', databytes)[0]
-            elif dsubtype == kCFNumberSInt64Type:
-                return struct.unpack(b'<q', databytes)[0]
-            elif dsubtype == kCFNumberFloat32Type:
-                return struct.unpack(b'<f', databytes)[0]
-            elif dsubtype == kCFNumberFloat64Type:
-                return struct.unpack(b'<d', databytes)[0]
-        elif dtype == BMK_DATE:
-            # Yes, dates really are stored as *BIG-endian* doubles; everything
-            # else is little-endian
-            secs = datetime.timedelta(seconds=struct.unpack(b'>d', databytes)[0])
-            return osx_epoch + secs
-        elif dtype == BMK_BOOLEAN:
-            if dsubtype == BMK_BOOLEAN_ST_TRUE:
-                return True
-            elif dsubtype == BMK_BOOLEAN_ST_FALSE:
-                return False
-        elif dtype == BMK_UUID:
-            return uuid.UUID(bytes=databytes)
-        elif dtype == BMK_URL:
-            if dsubtype == BMK_URL_ST_ABSOLUTE:
-                return URL(databytes.decode('utf-8'))
-            elif dsubtype == BMK_URL_ST_RELATIVE:
-                baseoff,reloff = struct.unpack(b'<II', databytes)
-                base = cls._get_item(data, hdrsize, baseoff)
-                rel = cls._get_item(data, hdrsize, reloff)
-                return URL(base, rel)
-        elif dtype == BMK_ARRAY:
-            result = []
-            for aoff in xrange(offset+8,offset+8+length,4):
-                eltoff, = struct.unpack(b'<I', data[aoff:aoff+4])
-                result.append(cls._get_item(data, hdrsize, eltoff))
-            return result
-        elif dtype == BMK_DICT:
-            result = {}
-            for eoff in xrange(offset+8,offset+8+length,8):
-                keyoff,valoff = struct.unpack(b'<II', data[eoff:eoff+8])
-                key = cls._get_item(data, hdrsize, keyoff)
-                val = cls._get_item(data, hdrsize, valoff)
-                result[key] = val
-            return result
-        elif dtype == BMK_NULL:
-            return None
-
-        print('Unknown data type %08x' % typecode)
-        return (typecode, databytes)
-
-    @classmethod
-    def from_bytes(cls, data):
-        """Create a :class:`Bookmark` given byte data."""
-
-        if len(data) < 16:
-            raise ValueError('Not a bookmark file (too short)')
-
-        if isinstance(data, bytearray):
-            data = bytes(data)
-
-        magic,size,dummy,hdrsize = struct.unpack(b'<4sIII', data[0:16])
-
-        if magic != b'book':
-            raise ValueError('Not a bookmark file (bad magic) %r' % magic)
-
-        if hdrsize < 16:
-            raise ValueError('Not a bookmark file (header size too short)')
-
-        if hdrsize > size:
-            raise ValueError('Not a bookmark file (header size too large)')
-
-        if size != len(data):
-            raise ValueError('Not a bookmark file (truncated)')
-
-        tocoffset, = struct.unpack(b'<I', data[hdrsize:hdrsize+4])
-
-        tocs = []
-
-        while tocoffset != 0:
-            tocbase = hdrsize + tocoffset
-            if tocoffset > size - hdrsize \
-              or size - tocbase < 20:
-                raise ValueError('TOC offset out of range')
-
-            tocsize,tocmagic,tocid,nexttoc,toccount \
-                = struct.unpack(b'<IIIII',
-                                data[tocbase:tocbase+20])
-
-            if tocmagic != 0xfffffffe:
-                break
-
-            tocsize += 8
-
-            if size - tocbase < tocsize:
-                raise ValueError('TOC truncated')
-
-            if tocsize < 12 * toccount:
-                raise ValueError('TOC entries overrun TOC size')
-
-            toc = {}
-            for n in xrange(0,toccount):
-                ebase = tocbase + 20 + 12 * n
-                eid,eoffset,edummy = struct.unpack(b'<III',
-                                                   data[ebase:ebase+12])
-
-                if eid & 0x80000000:
-                    eid = cls._get_item(data, hdrsize, eid & 0x7fffffff)
-
-                toc[eid] = cls._get_item(data, hdrsize, eoffset)
-
-            tocs.append((tocid, toc))
-
-            tocoffset = nexttoc
-
-        return cls(tocs)
-
-    def __getitem__(self, key):
-        for tid,toc in self.tocs:
-            if key in toc:
-                return toc[key]
-        raise KeyError('Key not found')
-
-    def __setitem__(self, key, value):
-        if len(self.tocs) == 0:
-            self.tocs = [(1, {})]
-        self.tocs[0][1][key] = value
-
-    def get(self, key, default=None):
-        """Lookup the value for a given key, returning a default if not
-        present."""
-        for tid,toc in self.tocs:
-            if key in toc:
-                return toc[key]
-        return default
-
-    @classmethod
-    def _encode_item(cls, item, offset):
-        if item is True:
-            result = struct.pack(b'<II', 0, BMK_BOOLEAN | BMK_BOOLEAN_ST_TRUE)
-        elif item is False:
-            result = struct.pack(b'<II', 0, BMK_BOOLEAN | BMK_BOOLEAN_ST_FALSE)
-        elif isinstance(item, unicode):
-            encoded = item.encode('utf-8')
-            result = (struct.pack(b'<II', len(encoded), BMK_STRING | BMK_ST_ONE)
-                      + encoded)
-        elif isinstance(item, bytes):
-            result = (struct.pack(b'<II', len(item), BMK_STRING | BMK_ST_ONE)
-                      + item)
-        elif isinstance(item, Data):
-            result = (struct.pack(b'<II', len(item.bytes),
-                                  BMK_DATA | BMK_ST_ONE)
-                      + bytes(item.bytes))
-        elif isinstance(item, bytearray):
-            result = (struct.pack(b'<II', len(item),
-                                  BMK_DATA | BMK_ST_ONE)
-                      + bytes(item))
-        elif isinstance(item, int) or isinstance(item, long):
-            if item > -0x80000000 and item < 0x7fffffff:
-                result = struct.pack(b'<IIi', 4,
-                                     BMK_NUMBER | kCFNumberSInt32Type, item)
-            else:
-                result = struct.pack(b'<IIq', 8,
-                                     BMK_NUMBER | kCFNumberSInt64Type, item)
-        elif isinstance(item, float):
-            result = struct.pack(b'<IId', 8,
-                                 BMK_NUMBER | kCFNumberFloat64Type, item)
-        elif isinstance(item, datetime.datetime):
-            secs = item - osx_epoch
-            result = struct.pack(b'<II', 8, BMK_DATE | BMK_ST_ZERO) \
-                     + struct.pack(b'>d', float(secs.total_seconds()))
-        elif isinstance(item, uuid.UUID):
-            result = struct.pack(b'<II', 16, BMK_UUID | BMK_ST_ONE) \
-                     + item.bytes
-        elif isinstance(item, URL):
-            if item.base:
-                baseoff = offset + 16
-                reloff, baseenc = cls._encode_item(item.base, baseoff)
-                xoffset, relenc = cls._encode_item(item.relative, reloff)
-                result = b''.join([
-                    struct.pack(b'<IIII', 8, BMK_URL | BMK_URL_ST_RELATIVE,
-                                baseoff, reloff),
-                    baseenc,
-                    relenc])
-            else:
-                encoded = item.relative.encode('utf-8')
-                result = struct.pack(b'<II', len(encoded),
-                                     BMK_URL | BMK_URL_ST_ABSOLUTE) + encoded
-        elif isinstance(item, list):
-            ioffset = offset + 8 + len(item) * 4
-            result = [struct.pack(b'<II', len(item) * 4, BMK_ARRAY | BMK_ST_ONE)]
-            enc = []
-            for elt in item:
-                result.append(struct.pack(b'<I', ioffset))
-                ioffset, ienc = cls._encode_item(elt, ioffset)
-                enc.append(ienc)
-            result = b''.join(result + enc)
-        elif isinstance(item, dict):
-            ioffset = offset + 8 + len(item) * 8
-            result = [struct.pack(b'<II', len(item) * 8, BMK_DICT | BMK_ST_ONE)]
-            enc = []
-            for k,v in iteritems(item):
-                result.append(struct.pack(b'<I', ioffset))
-                ioffset, ienc = cls._encode_item(k, ioffset)
-                enc.append(ienc)
-                result.append(struct.pack(b'<I', ioffset))
-                ioffset, ienc = cls._encode_item(v, ioffset)
-                enc.append(ienc)
-            result = b''.join(result + enc)
-        elif item is None:
-            result = struct.pack(b'<II', 0, BMK_NULL | BMK_ST_ONE)
-        else:
-            raise ValueError('Unknown item type when encoding: %s' % item)
-
-        offset += len(result)
-
-        # Pad to a multiple of 4 bytes
-        if offset & 3:
-            extra = 4 - (offset & 3)
-            result += b'\0' * extra
-            offset += extra
-
-        return (offset, result)
-
-    def to_bytes(self):
-        """Convert this :class:`Bookmark` to a byte representation."""
-
-        result = []
-        tocs = []
-        offset = 4  # For the offset to the first TOC
-
-        # Generate the data and build the TOCs
-        for tid,toc in self.tocs:
-            entries = []
-
-            for k,v in iteritems(toc):
-                if isinstance(k, (str, unicode)):
-                    noffset = offset
-                    voffset, enc = self._encode_item(k, offset)
-                    result.append(enc)
-                    offset, enc = self._encode_item(v, voffset)
-                    result.append(enc)
-                    entries.append((noffset | 0x80000000, voffset))
-                else:
-                    entries.append((k, offset))
-                    offset, enc = self._encode_item(v, offset)
-                    result.append(enc)
-
-            # TOC entries must be sorted - CoreServicesInternal does a
-            # binary search to find data
-            entries.sort()
-
-            tocs.append((tid, b''.join([struct.pack(b'<III',k,o,0)
-                                        for k,o in entries])))
-
-        first_toc_offset = offset
-
-        # Now generate the TOC headers
-        for ndx,toc in enumerate(tocs):
-            tid, data = toc
-            if ndx == len(tocs) - 1:
-                next_offset = 0
-            else:
-                next_offset = offset + 20 + len(data)
-
-            result.append(struct.pack(b'<IIIII', len(data) - 8,
-                                      0xfffffffe,
-                                      tid,
-                                      next_offset,
-                                      len(data) // 12))
-            result.append(data)
-
-            offset += 20 + len(data)
-
-        # Finally, add the header (and the first TOC offset, which isn't part
-        # of the header, but goes just after it)
-        header = struct.pack(b'<4sIIIQQQQI', b'book',
-                             offset + 48,
-                             0x10040000,
-                             48,
-                             0, 0, 0, 0, first_toc_offset)
-
-        result.insert(0, header)
-
-        return b''.join(result)
-
-    @classmethod
-    def for_file(cls, path):
-        """Construct a :class:`Bookmark` for a given file."""
-
-        # Find the filesystem
-        st = osx.statfs(path)
-        vol_path = st.f_mntonname.decode('utf-8')
-
-        # Grab its attributes
-        attrs = [osx.ATTR_CMN_CRTIME,
-                 osx.ATTR_VOL_SIZE
-                 | osx.ATTR_VOL_NAME
-                 | osx.ATTR_VOL_UUID,
-                 0, 0, 0]
-        volinfo = osx.getattrlist(vol_path, attrs, 0)
-
-        vol_crtime = volinfo[0]
-        vol_size = volinfo[1]
-        vol_name = volinfo[2]
-        vol_uuid = volinfo[3]
-
-        # Also grab various attributes of the file
-        attrs = [(osx.ATTR_CMN_OBJTYPE
-                  | osx.ATTR_CMN_CRTIME
-                  | osx.ATTR_CMN_FILEID), 0, 0, 0, 0]
-        info = osx.getattrlist(path, attrs, osx.FSOPT_NOFOLLOW)
-
-        cnid = info[2]
-        crtime = info[1]
-
-        if info[0] == osx.VREG:
-            flags = kCFURLResourceIsRegularFile
-        elif info[0] == osx.VDIR:
-            flags = kCFURLResourceIsDirectory
-        elif info[0] == osx.VLNK:
-            flags = kCFURLResourceIsSymbolicLink
-        else:
-            flags = kCFURLResourceIsRegularFile
-
-        dirname, filename = os.path.split(path)
-
-        relcount = 0
-        if not os.path.isabs(dirname):
-            curdir = os.getcwd()
-            head, tail = os.path.split(curdir)
-            relcount = 0
-            while head and tail:
-                relcount += 1
-                head, tail = os.path.split(head)
-            dirname = os.path.join(curdir, dirname)
-
-        foldername = os.path.basename(dirname)
-
-        rel_path = os.path.relpath(path, vol_path)
-
-        # Build the path arrays
-        name_path = []
-        cnid_path = []
-        head, tail = os.path.split(rel_path)
-        if not tail:
-            head, tail = os.path.split(head)
-        while head or tail:
-            if head:
-                attrs = [osx.ATTR_CMN_FILEID, 0, 0, 0, 0]
-                info = osx.getattrlist(os.path.join(vol_path, head), attrs, 0)
-                cnid_path.insert(0, info[0])
-                head, tail = os.path.split(head)
-                name_path.insert(0, tail)
-            else:
-                head, tail = os.path.split(head)
-        name_path.append(filename)
-        cnid_path.append(cnid)
-
-        url_lengths = [relcount, len(name_path) - relcount]
-
-        fileprops = Data(struct.pack(b'<QQQ', flags, 0x0f, 0))
-        volprops = Data(struct.pack(b'<QQQ', 0x81 | kCFURLVolumeSupportsPersistentIDs,
-                                    0x13ef | kCFURLVolumeSupportsPersistentIDs, 0))
-
-        toc = {
-            kBookmarkPath: name_path,
-            kBookmarkCNIDPath: cnid_path,
-            kBookmarkFileCreationDate: crtime,
-            kBookmarkFileProperties: fileprops,
-            kBookmarkContainingFolder: len(name_path) - 2,
-            kBookmarkVolumePath: vol_path,
-            kBookmarkVolumeIsRoot: vol_path == '/',
-            kBookmarkVolumeURL: URL('file://' + vol_path),
-            kBookmarkVolumeName: vol_name,
-            kBookmarkVolumeSize: vol_size,
-            kBookmarkVolumeCreationDate: vol_crtime,
-            kBookmarkVolumeUUID: str(vol_uuid).upper(),
-            kBookmarkVolumeProperties: volprops,
-            kBookmarkCreationOptions: 512,
-            kBookmarkWasFileReference: True,
-            kBookmarkUserName: 'unknown',
-            kBookmarkUID: 99,
-        }
-
-        if relcount:
-            toc[kBookmarkURLLengths] = url_lengths
-
-        return Bookmark([(1, toc)])
-
-    def __repr__(self):
-        result = ['Bookmark([']
-        for tid,toc in self.tocs:
-            result.append('(0x%x, {\n' % tid)
-            for k,v in iteritems(toc):
-                if isinstance(k, (str, unicode)):
-                    kf = repr(k)
-                else:
-                    kf = '0x%04x' % k
-                result.append('  %s: %r\n' % (kf, v))
-            result.append('}),\n')
-        result.append('])')
-
-        return ''.join(result)
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/utils.py b/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/utils.py
deleted file mode 100644
index 6a7d0a121..000000000
--- a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/utils.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import datetime
-
-ZERO = datetime.timedelta(0)
-class UTC (datetime.tzinfo):
-    def utcoffset(self, dt):
-        return ZERO
-    def dst(self, dt):
-        return ZERO
-    def tzname(self, dt):
-        return 'UTC'
-
-utc = UTC()
-mac_epoch = datetime.datetime(1904,1,1,0,0,0,0,utc)
-unix_epoch = datetime.datetime(1970,1,1,0,0,0,0,utc)
-osx_epoch = datetime.datetime(2001,1,1,0,0,0,0,utc)
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/LICENSE b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/LICENSE
index e91f4eb38..e91f4eb38 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/LICENSE
+++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/LICENSE
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__init__.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__init__.py
new file mode 100644
index 000000000..5fba876a7
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__init__.py
@@ -0,0 +1,5 @@
+from .core import build_dmg
+
+__version__ = "1.6.0"
+
+__all__ = ["__version__", "build_dmg"]
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__main__.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__main__.py
new file mode 100644
index 000000000..ca712a183
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__main__.py
@@ -0,0 +1,58 @@
+#! /usr/bin/env python
+import argparse
+
+from .core import build_dmg
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Construct a disk image file.")
+    parser.add_argument(
+        "volume_name",
+        metavar="volume-name",
+        help="The name to give to the volume (this will appear in the title bar when the user mounts the disk image).",
+    )
+    parser.add_argument(
+        "filename",
+        metavar="output.dmg",
+        help="The filename of the disk image to create.",
+    )
+    parser.add_argument("-s", "--settings", help="The path of the settings file.")
+    parser.add_argument(
+        "-D",
+        dest="defines",
+        action="append",
+        default=[],
+        help="Define a value for the settings file (e.g. -Dfoo=bar).",
+    )
+    parser.add_argument(
+        "--no-hidpi",
+        dest="lookForHiDPI",
+        action="store_false",
+        default=True,
+        help="Do not search for HiDPI versions of the background image (if specified)",
+    )
+
+    args = parser.parse_args()
+
+    defines = {}
+    for d in args.defines:
+        k, v = d.split("=", 1)
+        k = k.strip()
+        v = v.strip()
+        if (v.startswith("'") and v.endswith("'")) or (
+            v.startswith('"') and v.endswith('"')
+        ):
+            v = v[1:-1]
+        defines[k] = v
+
+    build_dmg(
+        args.filename,
+        args.volume_name,
+        args.settings,
+        defines=defines,
+        lookForHiDPI=args.lookForHiDPI,
+    )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/badge.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/badge.py
new file mode 100644
index 000000000..f9764da01
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/badge.py
@@ -0,0 +1,169 @@
+import math
+
+from Quartz import (
+    CFURLCreateWithFileSystemPath,
+    CGBitmapContextCreate,
+    CGBitmapContextCreateImage,
+    CGColorSpaceCreateWithName,
+    CGImageDestinationAddImage,
+    CGImageDestinationCreateWithURL,
+    CGImageDestinationFinalize,
+    CGImageSourceCopyPropertiesAtIndex,
+    CGImageSourceCreateImageAtIndex,
+    CGImageSourceCreateWithURL,
+    CGImageSourceGetCount,
+    CIContext,
+    CIFilter,
+    CIImage,
+    CIVector,
+    NSAffineTransform,
+    kCFURLPOSIXPathStyle,
+    kCGColorSpaceGenericRGB,
+    kCGImageAlphaPremultipliedLast,
+    kCIInputAspectRatioKey,
+    kCIInputBackgroundImageKey,
+    kCIInputImageKey,
+    kCIInputScaleKey,
+    kCIOutputImageKey,
+)
+
+_REMOVABLE_DISK_PATH = (
+    "/System/Library/Extensions/IOStorageFamily.kext/Contents/Resources/Removable.icns"
+)
+
+
+def badge_disk_icon(badge_file, output_file):
+    # Load the Removable disk icon
+    url = CFURLCreateWithFileSystemPath(
+        None, _REMOVABLE_DISK_PATH, kCFURLPOSIXPathStyle, False
+    )
+    backdrop = CGImageSourceCreateWithURL(url, None)
+    backdropCount = CGImageSourceGetCount(backdrop)
+
+    # Load the badge
+    url = CFURLCreateWithFileSystemPath(None, badge_file, kCFURLPOSIXPathStyle, False)
+    badge = CGImageSourceCreateWithURL(url, None)
+    assert badge is not None, "Unable to process image file: %s" % badge_file
+    badgeCount = CGImageSourceGetCount(badge)
+
+    # Set up a destination for our target
+    url = CFURLCreateWithFileSystemPath(None, output_file, kCFURLPOSIXPathStyle, False)
+    target = CGImageDestinationCreateWithURL(url, "com.apple.icns", backdropCount, None)
+
+    # Get the RGB colorspace
+    rgbColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB)
+
+    # Scale
+    scale = 1.0
+
+    # Perspective transform
+    corners = ((0.2, 0.95), (0.8, 0.95), (0.85, 0.35), (0.15, 0.35))
+
+    # Translation
+    position = (0.5, 0.5)
+
+    for n in range(backdropCount):
+        props = CGImageSourceCopyPropertiesAtIndex(backdrop, n, None)
+        width = props["PixelWidth"]
+        height = props["PixelHeight"]
+        dpi = props["DPIWidth"]
+        depth = props["Depth"]
+
+        # Choose the best sized badge image
+        bestWidth = None
+        # ?? bestHeight = None
+        bestBadge = None
+        bestDepth = None
+        # ?? bestDPI = None
+        for m in range(badgeCount):
+            badgeProps = CGImageSourceCopyPropertiesAtIndex(badge, m, None)
+            badgeWidth = badgeProps["PixelWidth"]
+            # ?? badgeHeight = badgeProps['PixelHeight']
+            badgeDPI = badgeProps["DPIWidth"]
+            badgeDepth = badgeProps["Depth"]
+
+            if bestBadge is None or (
+                badgeWidth <= width
+                and (
+                    bestWidth > width
+                    or badgeWidth > bestWidth
+                    or (
+                        badgeWidth == bestWidth
+                        and badgeDPI == dpi
+                        and badgeDepth <= depth
+                        and (bestDepth is None or badgeDepth > bestDepth)
+                    )
+                )
+            ):
+                bestBadge = m
+                bestWidth = badgeWidth
+                # ?? bestHeight = badgeHeight
+                # ?? bestDPI = badgeDPI
+                bestDepth = badgeDepth
+
+        badgeImage = CGImageSourceCreateImageAtIndex(badge, bestBadge, None)
+        badgeCI = CIImage.imageWithCGImage_(badgeImage)
+
+        backgroundImage = CGImageSourceCreateImageAtIndex(backdrop, n, None)
+        backgroundCI = CIImage.imageWithCGImage_(backgroundImage)
+
+        compositor = CIFilter.filterWithName_("CISourceOverCompositing")
+        lanczos = CIFilter.filterWithName_("CILanczosScaleTransform")
+        perspective = CIFilter.filterWithName_("CIPerspectiveTransform")
+        transform = CIFilter.filterWithName_("CIAffineTransform")
+
+        lanczos.setValue_forKey_(badgeCI, kCIInputImageKey)
+        lanczos.setValue_forKey_(scale * float(width) / bestWidth, kCIInputScaleKey)
+        lanczos.setValue_forKey_(1.0, kCIInputAspectRatioKey)
+
+        topLeft = (width * scale * corners[0][0], width * scale * corners[0][1])
+        topRight = (width * scale * corners[1][0], width * scale * corners[1][1])
+        bottomRight = (width * scale * corners[2][0], width * scale * corners[2][1])
+        bottomLeft = (width * scale * corners[3][0], width * scale * corners[3][1])
+
+        out = lanczos.valueForKey_(kCIOutputImageKey)
+        if width >= 16:
+            perspective.setValue_forKey_(out, kCIInputImageKey)
+            perspective.setValue_forKey_(
+                CIVector.vectorWithX_Y_(*topLeft), "inputTopLeft"
+            )
+            perspective.setValue_forKey_(
+                CIVector.vectorWithX_Y_(*topRight), "inputTopRight"
+            )
+            perspective.setValue_forKey_(
+                CIVector.vectorWithX_Y_(*bottomRight), "inputBottomRight"
+            )
+            perspective.setValue_forKey_(
+                CIVector.vectorWithX_Y_(*bottomLeft), "inputBottomLeft"
+            )
+            out = perspective.valueForKey_(kCIOutputImageKey)
+
+        tfm = NSAffineTransform.transform()
+        tfm.translateXBy_yBy_(
+            math.floor((position[0] - 0.5 * scale) * width),
+            math.floor((position[1] - 0.5 * scale) * height),
+        )
+
+        transform.setValue_forKey_(out, kCIInputImageKey)
+        transform.setValue_forKey_(tfm, "inputTransform")
+        out = transform.valueForKey_(kCIOutputImageKey)
+
+        compositor.setValue_forKey_(out, kCIInputImageKey)
+        compositor.setValue_forKey_(backgroundCI, kCIInputBackgroundImageKey)
+
+        result = compositor.valueForKey_(kCIOutputImageKey)
+
+        cgContext = CGBitmapContextCreate(
+            None, width, height, 8, 0, rgbColorSpace, kCGImageAlphaPremultipliedLast
+        )
+        context = CIContext.contextWithCGContext_options_(cgContext, None)
+
+        context.drawImage_inRect_fromRect_(
+            result, ((0, 0), (width, height)), ((0, 0), (width, height))
+        )
+
+        image = CGBitmapContextCreateImage(cgContext)
+
+        CGImageDestinationAddImage(target, image, props)
+
+    CGImageDestinationFinalize(target)
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/colors.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/colors.py
new file mode 100644
index 000000000..8cab342a7
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/colors.py
@@ -0,0 +1,504 @@
+import math
+import re
+
+
+class Color:
+    def to_rgb(self):
+        raise Exception("Must implement to_rgb() in subclasses")
+
+
+class RGB:
+    def __init__(self, r, g, b):
+        self.r = r
+        self.g = g
+        self.b = b
+
+    def to_rgb(self):
+        return self
+
+
+class HSL(Color):
+    def __init__(self, h, s, l):  # noqa; E741
+        self.h = h
+        self.s = s
+        self.l = l  # noqa; E741
+
+    @staticmethod
+    def _hue_to_rgb(t1, t2, hue):
+        if hue < 0:
+            hue += 6
+        elif hue >= 6:
+            hue -= 6
+
+        if hue < 1:
+            return (t2 - t1) * hue + t1
+        elif hue < 3:
+            return t2
+        elif hue < 4:
+            return (t2 - t1) * (4 - hue) + t1
+        else:
+            return t1
+
+    def to_rgb(self):
+        hue = self.h / 60.0
+        if self.l <= 0.5:  # noqa; E741
+            t2 = self.l * (self.s + 1)
+        else:
+            t2 = self.l + self.s - (self.l * self.s)
+        t1 = self.l * 2 - t2
+        r = self._hue_to_rgb(t1, t2, hue + 2)
+        g = self._hue_to_rgb(t1, t2, hue)
+        b = self._hue_to_rgb(t1, t2, hue - 2)
+        return RGB(r, g, b)
+
+
+class HWB(Color):
+    def __init__(self, h, w, b):
+        self.h = h
+        self.w = w
+        self.b = b
+
+    @staticmethod
+    def _hue_to_rgb(hue):
+        if hue < 0:
+            hue += 6
+        elif hue >= 6:
+            hue -= 6
+
+        if hue < 1:
+            return hue
+        elif hue < 3:
+            return 1
+        elif hue < 4:
+            return 4 - hue
+        else:
+            return 0
+
+    def to_rgb(self):
+        hue = self.h / 60.0
+        t1 = 1 - self.w - self.b
+        r = self._hue_to_rgb(hue + 2) * t1 + self.w
+        g = self._hue_to_rgb(hue) * t1 + self.w
+        b = self._hue_to_rgb(hue - 2) * t1 + self.w
+        return RGB(r, g, b)
+
+
+class CMYK(Color):
+    def __init__(self, c, m, y, k):
+        self.c = c
+        self.m = m
+        self.y = y
+        self.k = k
+
+    def to_rgb(self):
+        r = 1.0 - min(1.0, self.c + self.k)
+        g = 1.0 - min(1.0, self.m + self.k)
+        b = 1.0 - min(1.0, self.y + self.k)
+        return RGB(r, g, b)
+
+
+class Gray(Color):
+    def __init__(self, g):
+        self.g = g
+
+    def to_rgb(self):
+        return RGB(self.g, self.g, self.g)
+
+
+_x11_colors = {
+    "aliceblue": (240, 248, 255),
+    "antiquewhite": (250, 235, 215),
+    "aqua": (0, 255, 255),
+    "aquamarine": (127, 255, 212),
+    "azure": (240, 255, 255),
+    "beige": (245, 245, 220),
+    "bisque": (255, 228, 196),
+    "black": (0, 0, 0),
+    "blanchedalmond": (255, 235, 205),
+    "blue": (0, 0, 255),
+    "blueviolet": (138, 43, 226),
+    "brown": (165, 42, 42),
+    "burlywood": (222, 184, 135),
+    "cadetblue": (95, 158, 160),
+    "chartreuse": (127, 255, 0),
+    "chocolate": (210, 105, 30),
+    "coral": (255, 127, 80),
+    "cornflowerblue": (100, 149, 237),
+    "cornsilk": (255, 248, 220),
+    "crimson": (220, 20, 60),
+    "cyan": (0, 255, 255),
+    "darkblue": (0, 0, 139),
+    "darkcyan": (0, 139, 139),
+    "darkgoldenrod": (184, 134, 11),
+    "darkgray": (169, 169, 169),
+    "darkgreen": (0, 100, 0),
+    "darkgrey": (169, 169, 169),
+    "darkkhaki": (189, 183, 107),
+    "darkmagenta": (139, 0, 139),
+    "darkolivegreen": (85, 107, 47),
+    "darkorange": (255, 140, 0),
+    "darkorchid": (153, 50, 204),
+    "darkred": (139, 0, 0),
+    "darksalmon": (233, 150, 122),
+    "darkseagreen": (143, 188, 143),
+    "darkslateblue": (72, 61, 139),
+    "darkslategray": (47, 79, 79),
+    "darkslategrey": (47, 79, 79),
+    "darkturquoise": (0, 206, 209),
+    "darkviolet": (148, 0, 211),
+    "deeppink": (255, 20, 147),
+    "deepskyblue": (0, 191, 255),
+    "dimgray": (105, 105, 105),
+    "dimgrey": (105, 105, 105),
+    "dodgerblue": (30, 144, 255),
+    "firebrick": (178, 34, 34),
+    "floralwhite": (255, 250, 240),
+    "forestgreen": (34, 139, 34),
+    "fuchsia": (255, 0, 255),
+    "gainsboro": (220, 220, 220),
+    "ghostwhite": (248, 248, 255),
+    "gold": (255, 215, 0),
+    "goldenrod": (218, 165, 32),
+    "gray": (128, 128, 128),
+    "grey": (128, 128, 128),
+    "green": (0, 128, 0),
+    "greenyellow": (173, 255, 47),
+    "honeydew": (240, 255, 240),
+    "hotpink": (255, 105, 180),
+    "indianred": (205, 92, 92),
+    "indigo": (75, 0, 130),
+    "ivory": (255, 255, 240),
+    "khaki": (240, 230, 140),
+    "lavender": (230, 230, 250),
+    "lavenderblush": (255, 240, 245),
+    "lawngreen": (124, 252, 0),
+    "lemonchiffon": (255, 250, 205),
+    "lightblue": (173, 216, 230),
+    "lightcoral": (240, 128, 128),
+    "lightcyan": (224, 255, 255),
+    "lightgoldenrodyellow": (250, 250, 210),
+    "lightgray": (211, 211, 211),
+    "lightgreen": (144, 238, 144),
+    "lightgrey": (211, 211, 211),
+    "lightpink": (255, 182, 193),
+    "lightsalmon": (255, 160, 122),
+    "lightseagreen": (32, 178, 170),
+    "lightskyblue": (135, 206, 250),
+    "lightslategray": (119, 136, 153),
+    "lightslategrey": (119, 136, 153),
+    "lightsteelblue": (176, 196, 222),
+    "lightyellow": (255, 255, 224),
+    "lime": (0, 255, 0),
+    "limegreen": (50, 205, 50),
+    "linen": (250, 240, 230),
+    "magenta": (255, 0, 255),
+    "maroon": (128, 0, 0),
+    "mediumaquamarine": (102, 205, 170),
+    "mediumblue": (0, 0, 205),
+    "mediumorchid": (186, 85, 211),
+    "mediumpurple": (147, 112, 219),
+    "mediumseagreen": (60, 179, 113),
+    "mediumslateblue": (123, 104, 238),
+    "mediumspringgreen": (0, 250, 154),
+    "mediumturquoise": (72, 209, 204),
+    "mediumvioletred": (199, 21, 133),
+    "midnightblue": (25, 25, 112),
+    "mintcream": (245, 255, 250),
+    "mistyrose": (255, 228, 225),
+    "moccasin": (255, 228, 181),
+    "navajowhite": (255, 222, 173),
+    "navy": (0, 0, 128),
+    "oldlace": (253, 245, 230),
+    "olive": (128, 128, 0),
+    "olivedrab": (107, 142, 35),
+    "orange": (255, 165, 0),
+    "orangered": (255, 69, 0),
+    "orchid": (218, 112, 214),
+    "palegoldenrod": (238, 232, 170),
+    "palegreen": (152, 251, 152),
+    "paleturquoise": (175, 238, 238),
+    "palevioletred": (219, 112, 147),
+    "papayawhip": (255, 239, 213),
+    "peachpuff": (255, 218, 185),
+    "peru": (205, 133, 63),
+    "pink": (255, 192, 203),
+    "plum": (221, 160, 221),
+    "powderblue": (176, 224, 230),
+    "purple": (128, 0, 128),
+    "red": (255, 0, 0),
+    "rosybrown": (188, 143, 143),
+    "royalblue": (65, 105, 225),
+    "saddlebrown": (139, 69, 19),
+    "salmon": (250, 128, 114),
+    "sandybrown": (244, 164, 96),
+    "seagreen": (46, 139, 87),
+    "seashell": (255, 245, 238),
+    "sienna": (160, 82, 45),
+    "silver": (192, 192, 192),
+    "skyblue": (135, 206, 235),
+    "slateblue": (106, 90, 205),
+    "slategray": (112, 128, 144),
+    "slategrey": (112, 128, 144),
+    "snow": (255, 250, 250),
+    "springgreen": (0, 255, 127),
+    "steelblue": (70, 130, 180),
+    "tan": (210, 180, 140),
+    "teal": (0, 128, 128),
+    "thistle": (216, 191, 216),
+    "tomato": (255, 99, 71),
+    "turquoise": (64, 224, 208),
+    "violet": (238, 130, 238),
+    "wheat": (245, 222, 179),
+    "white": (255, 255, 255),
+    "whitesmoke": (245, 245, 245),
+    "yellow": (255, 255, 0),
+    "yellowgreen": (154, 205, 50),
+}
+
+_ws_re = re.compile(r"\s+")
+_token_re = re.compile(r"[A-Za-z_][A-Za-z0-9_]*")
+_hex_re = re.compile(r"#([0-9a-f]{3}(?:[0-9a-f]{3})?)$")
+_number_re = re.compile(r"[0-9]*(\.[0-9]*)")
+
+
+class ColorParser:
+    def __init__(self, s):
+        self._string = s
+        self._pos = 0
+
+    def skipws(self):
+        m = _ws_re.match(self._string, self._pos)
+        if m:
+            self._pos = m.end(0)
+
+    def expect(self, s, context=""):
+        if (
+            len(self._string) - self._pos < len(s)
+            or self._string[self._pos : self._pos + len(s)] != s
+        ):
+            raise ValueError(f'bad color "{self._string}" - expected "{s}"{context}')
+        self._pos += len(s)
+
+    def expectEnd(self):
+        if self._pos != len(self._string):
+            raise ValueError('junk at end of color "%s"' % self._string)
+
+    def getToken(self):
+        m = _token_re.match(self._string, self._pos)
+        if m:
+            token = m.group(0)
+
+            self._pos = m.end(0)
+            return token
+        return None
+
+    def parseNumber(self, context=""):
+        m = _number_re.match(self._string, self._pos)
+        if m:
+            self._pos = m.end(0)
+            return float(m.group(0))
+        raise ValueError(f'bad color "{self._string}" - expected a number{context}')
+
+    def parseColor(self):
+        self.skipws()
+
+        token = self.getToken()
+        if token:
+            if token == "rgb":
+                return self.parseRGB()
+            elif token == "hsl":
+                return self.parseHSL()
+            elif token == "hwb":
+                return self.parseHWB()
+            elif token == "cmyk":
+                return self.parseCMYK()
+            elif token == "gray" or token == "grey":
+                return self.parseGray()
+
+            try:
+                r, g, b = _x11_colors[token]
+            except KeyError:
+                raise ValueError('unknown color name "%s"' % token)
+
+            self.expectEnd()
+
+            return RGB(r / 255.0, g / 255.0, b / 255.0)
+
+        m = _hex_re.match(self._string, self._pos)
+        if m:
+            hrgb = m.group(1)
+
+            if len(hrgb) == 3:
+                r = int("0x" + 2 * hrgb[0], 16)
+                g = int("0x" + 2 * hrgb[1], 16)
+                b = int("0x" + 2 * hrgb[2], 16)
+            else:
+                r = int("0x" + hrgb[0:2], 16)
+                g = int("0x" + hrgb[2:4], 16)
+                b = int("0x" + hrgb[4:6], 16)
+
+            self._pos = m.end(0)
+            self.skipws()
+
+            self.expectEnd()
+
+            return RGB(r / 255.0, g / 255.0, b / 255.0)
+
+        raise ValueError('bad color syntax "%s"' % self._string)
+
+    def parseRGB(self):
+        self.expect("(", 'after "rgb"')
+        self.skipws()
+
+        r = self.parseValue()
+
+        self.skipws()
+        self.expect(",", 'in "rgb"')
+        self.skipws()
+
+        g = self.parseValue()
+
+        self.skipws()
+        self.expect(",", 'in "rgb"')
+        self.skipws()
+
+        b = self.parseValue()
+
+        self.skipws()
+        self.expect(")", 'at end of "rgb"')
+
+        self.skipws()
+        self.expectEnd()
+
+        return RGB(r, g, b)
+
+    def parseHSL(self):
+        self.expect("(", 'after "hsl"')
+        self.skipws()
+
+        h = self.parseAngle()
+
+        self.skipws()
+        self.expect(",", 'in "hsl"')
+        self.skipws()
+
+        s = self.parseValue()
+
+        self.skipws()
+        self.expect(",", 'in "hsl"')
+        self.skipws()
+
+        l = self.parseValue()  # noqa; E741
+
+        self.skipws()
+        self.expect(")", 'at end of "hsl"')
+
+        self.skipws()
+        self.expectEnd()
+
+        return HSL(h, s, l)
+
+    def parseHWB(self):
+        self.expect("(", 'after "hwb"')
+        self.skipws()
+
+        h = self.parseAngle()
+
+        self.skipws()
+        self.expect(",", 'in "hwb"')
+        self.skipws()
+
+        w = self.parseValue()
+
+        self.skipws()
+        self.expect(",", 'in "hwb"')
+        self.skipws()
+
+        b = self.parseValue()
+
+        self.skipws()
+        self.expect(")", 'at end of "hwb"')
+
+        self.skipws()
+        self.expectEnd()
+
+        return HWB(h, w, b)
+
+    def parseCMYK(self):
+        self.expect("(", 'after "cmyk"')
+        self.skipws()
+
+        c = self.parseValue()
+
+        self.skipws()
+        self.expect(",", 'in "cmyk"')
+        self.skipws()
+
+        m = self.parseValue()
+
+        self.skipws()
+        self.expect(",", 'in "cmyk"')
+        self.skipws()
+
+        y = self.parseValue()
+
+        self.skipws()
+        self.expect(",", 'in "cmyk"')
+        self.skipws()
+
+        k = self.parseValue()
+
+        self.skipws()
+        self.expect(")", 'at end of "cmyk"')
+
+        self.skipws()
+        self.expectEnd()
+
+        return CMYK(c, m, y, k)
+
+    def parseGray(self):
+        self.expect("(", 'after "gray"')
+        self.skipws()
+
+        g = self.parseValue()
+
+        self.skipws()
+        self.expect(")", 'at end of "gray')
+
+        self.skipws()
+        self.expectEnd()
+
+        return Gray(g)
+
+    def parseValue(self):
+        n = self.parseNumber()
+        self.skipws()
+        if self._string[self._pos] == "%":
+            n = n / 100.0
+            self.pos += 1
+        return n
+
+    def parseAngle(self):
+        n = self.parseNumber()
+        self.skipws()
+        tok = self.getToken()
+        if tok == "rad":
+            n = n * 180.0 / math.pi
+        elif tok == "grad" or tok == "gon":
+            n = n * 0.9
+        elif tok != "deg":
+            raise ValueError('bad angle unit "%s"' % tok)
+        return n
+
+
+_color_re = re.compile(
+    r"\s*(#|rgb|hsl|hwb|cmyk|gray|grey|%s)" % "|".join(_x11_colors.keys())
+)
+
+
+def isAColor(s):
+    return _color_re.match(s)
+
+
+def parseColor(s):
+    return ColorParser(s).parseColor()
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/core.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/core.py
new file mode 100644
index 000000000..b514f77e9
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/core.py
@@ -0,0 +1,943 @@
+import json
+import os
+import platform
+import plistlib
+import re
+import shutil
+import subprocess
+import tempfile
+import time
+import tokenize
+
+try:
+    import importlib_resources as resources
+except ImportError:
+    from importlib import resources
+
+from ds_store import DSStore
+from mac_alias import Alias, Bookmark
+
+from . import colors, licensing
+
+try:
+    from . import badge
+except ImportError:
+    badge = None
+
+
+_hexcolor_re = re.compile(r"#[0-9a-f]{3}(?:[0-9a-f]{3})?")
+
+# The first element in the platform.mac_ver() tuple is a string containing the
+# macOS version (e.g., '10.15.6'). Parse into an integer tuple.
+MACOS_VERSION = tuple(int(v) for v in platform.mac_ver()[0].split("."))
+
+
+class DMGError(Exception):
+    def __init__(self, callback, message):
+        self.message = message
+        callback({"type": "error::fatal", "message": message})
+
+    def __str__(self):
+        return str(self.message)
+
+
+def quiet_callback(info):
+    pass
+
+
+def hdiutil(cmd, *args, **kwargs):
+    plist = kwargs.get("plist", True)
+    all_args = ["/usr/bin/hdiutil", cmd]
+    all_args.extend(args)
+    if plist:
+        all_args.append("-plist")
+    p = subprocess.Popen(all_args, stdout=subprocess.PIPE, close_fds=True)
+    output, errors = p.communicate()
+    if plist:
+        results = plistlib.loads(output)
+    else:
+        results = output
+    retcode = p.wait()
+    return retcode, results
+
+
+def load_settings(filename, settings):
+    encoding = "utf-8"
+    with open(filename, "rb") as fp:
+        try:
+            encoding = tokenize.detect_encoding(fp.readline)[0]
+        except SyntaxError:
+            pass
+
+    with open(filename, encoding=encoding) as fp:
+        exec(compile(fp.read(), filename, "exec"), settings, settings)
+
+
+def load_json(filename, settings):
+    """Read an appdmg .json spec.
+
+    Uses the defaults for appdmg, rather than the usual defaults for
+    dmgbuild.
+    """
+
+    with open(filename) as fp:
+        json_data = json.load(fp)
+
+    if "title" not in json_data:
+        raise ValueError("missing 'title' in JSON settings file")
+    if "contents" not in json_data:
+        raise ValueError("missing 'contents' in JSON settings file")
+
+    settings["volume_name"] = json_data["title"]
+    settings["icon"] = json_data.get("icon", None)
+    settings["badge_icon"] = json_data.get("badge-icon", None)
+    bk = json_data.get("background", None)
+    if bk is None:
+        bk = json_data.get("background-color", None)
+    if bk is not None:
+        settings["background"] = bk
+    settings["icon_size"] = json_data.get("icon-size", 80)
+    wnd = json_data.get("window", {"position": (100, 100), "size": (640, 480)})
+    pos = wnd.get("position", {"x": 100, "y": 100})
+    siz = wnd.get("size", {"width": 640, "height": 480})
+    settings["window_rect"] = (
+        (pos.get("x", 100), pos.get("y", 100)),
+        (siz.get("width", 640), siz.get("height", 480)),
+    )
+    settings["format"] = json_data.get("format", "UDZO")
+    settings["filesystem"] = json_data.get("filesystem", "HFS+")
+    settings["compression_level"] = json_data.get("compression-level", None)
+    settings["license"] = json_data.get("license", None)
+    files = []
+    hide = []
+    hide_extensions = []
+    symlinks = {}
+    icon_locations = {}
+    for fileinfo in json_data.get("contents", []):
+        if "path" not in fileinfo:
+            raise ValueError("missing 'path' in contents in JSON settings file")
+        if "x" not in fileinfo:
+            raise ValueError("missing 'x' in contents in JSON settings file")
+        if "y" not in fileinfo:
+            raise ValueError("missing 'y' in contents in JSON settings file")
+
+        kind = fileinfo.get("type", "file")
+        path = fileinfo["path"]
+        name = fileinfo.get("name", os.path.basename(path.rstrip("/")))
+        if kind == "file":
+            files.append((path, name))
+        elif kind == "link":
+            symlinks[name] = path
+        elif kind == "position":
+            pass
+        icon_locations[name] = (fileinfo["x"], fileinfo["y"])
+        hide_ext = fileinfo.get("hide_extension", False)
+        if hide_ext:
+            hide_extensions.append(name)
+        hidden = fileinfo.get("hidden", False)
+        if hidden:
+            hide.append(name)
+
+    settings["files"] = files
+    settings["hide_extensions"] = hide_extensions
+    settings["hide"] = hide
+    settings["symlinks"] = symlinks
+    settings["icon_locations"] = icon_locations
+
+
+def build_dmg(  # noqa; C901
+    filename,
+    volume_name,
+    settings_file=None,
+    settings={},
+    defines={},
+    lookForHiDPI=True,
+    detach_retries=5,
+    callback=quiet_callback,
+):
+    options = {
+        # Default settings
+        "filename": filename,
+        "volume_name": volume_name,
+        "format": "UDBZ",
+        "filesystem": "HFS+",
+        "compression_level": None,
+        "size": None,
+        "files": [],
+        "symlinks": {},
+        "hide": [],
+        "hide_extensions": [],
+        "icon": None,
+        "badge_icon": None,
+        "background": None,
+        "show_status_bar": False,
+        "show_tab_view": False,
+        "show_toolbar": False,
+        "show_pathbar": False,
+        "show_sidebar": False,
+        "sidebar_width": 180,
+        "arrange_by": None,
+        "grid_offset": (0, 0),
+        "grid_spacing": 100.0,
+        "scroll_position": (0.0, 0.0),
+        "show_icon_preview": False,
+        "show_item_info": False,
+        "label_pos": "bottom",
+        "text_size": 16.0,
+        "icon_size": 128.0,
+        "include_icon_view_settings": "auto",
+        "include_list_view_settings": "auto",
+        "list_icon_size": 16.0,
+        "list_text_size": 12.0,
+        "list_scroll_position": (0, 0),
+        "list_sort_by": "name",
+        "list_use_relative_dates": True,
+        "list_calculate_all_sizes": False,
+        "list_columns": ("name", "date-modified", "size", "kind", "date-added"),
+        "list_column_widths": {
+            "name": 300,
+            "date-modified": 181,
+            "date-created": 181,
+            "date-added": 181,
+            "date-last-opened": 181,
+            "size": 97,
+            "kind": 115,
+            "label": 100,
+            "version": 75,
+            "comments": 300,
+        },
+        "list_column_sort_directions": {
+            "name": "ascending",
+            "date-modified": "descending",
+            "date-created": "descending",
+            "date-added": "descending",
+            "date-last-opened": "descending",
+            "size": "descending",
+            "kind": "ascending",
+            "label": "ascending",
+            "version": "ascending",
+            "comments": "ascending",
+        },
+        "window_rect": ((100, 100), (640, 280)),
+        "default_view": "icon-view",
+        "icon_locations": {},
+        "license": None,
+        "defines": defines,
+    }
+
+    callback({"type": "build::started"})
+
+    # Execute the settings file
+    if settings_file:
+        callback(
+            {
+                "type": "operation::start",
+                "operation": "settings::load",
+            }
+        )
+
+        # We now support JSON settings files using appdmg's format
+        if settings_file.endswith(".json"):
+            load_json(settings_file, options)
+        else:
+            load_settings(settings_file, options)
+
+        callback(
+            {
+                "type": "operation::finished",
+                "operation": "settings::load",
+            }
+        )
+
+    # Add any overrides
+    options.update(settings)
+
+    # Set up the finder data
+    bounds = options["window_rect"]
+
+    bounds_string = "{{{{{}, {}}}, {{{}, {}}}}}".format(
+        bounds[0][0], bounds[0][1], bounds[1][0], bounds[1][1]
+    )
+    bwsp = {
+        "ShowStatusBar": options["show_status_bar"],
+        "WindowBounds": bounds_string,
+        "ContainerShowSidebar": False,
+        "PreviewPaneVisibility": False,
+        "SidebarWidth": options["sidebar_width"],
+        "ShowTabView": options["show_tab_view"],
+        "ShowToolbar": options["show_toolbar"],
+        "ShowPathbar": options["show_pathbar"],
+        "ShowSidebar": options["show_sidebar"],
+    }
+
+    arrange_options = {
+        "name": "name",
+        "date-modified": "dateModified",
+        "date-created": "dateCreated",
+        "date-added": "dateAdded",
+        "date-last-opened": "dateLastOpened",
+        "size": "size",
+        "kind": "kind",
+        "label": "label",
+    }
+
+    icvp = {
+        "viewOptionsVersion": 1,
+        "backgroundType": 0,
+        "backgroundColorRed": 1.0,
+        "backgroundColorGreen": 1.0,
+        "backgroundColorBlue": 1.0,
+        "gridOffsetX": float(options["grid_offset"][0]),
+        "gridOffsetY": float(options["grid_offset"][1]),
+        "gridSpacing": float(options["grid_spacing"]),
+        "arrangeBy": str(arrange_options.get(options["arrange_by"], "none")),
+        "showIconPreview": bool(options["show_icon_preview"]),
+        "showItemInfo": bool(options["show_item_info"]),
+        "labelOnBottom": options["label_pos"] == "bottom",
+        "textSize": float(options["text_size"]),
+        "iconSize": float(options["icon_size"]),
+        "scrollPositionX": float(options["scroll_position"][0]),
+        "scrollPositionY": float(options["scroll_position"][1]),
+    }
+
+    background = options["background"]
+
+    columns = {
+        "name": "name",
+        "date-modified": "dateModified",
+        "date-created": "dateCreated",
+        "date-added": "dateAdded",
+        "date-last-opened": "dateLastOpened",
+        "size": "size",
+        "kind": "kind",
+        "label": "label",
+        "version": "version",
+        "comments": "comments",
+    }
+
+    default_widths = {
+        "name": 300,
+        "date-modified": 181,
+        "date-created": 181,
+        "date-added": 181,
+        "date-last-opened": 181,
+        "size": 97,
+        "kind": 115,
+        "label": 100,
+        "version": 75,
+        "comments": 300,
+    }
+
+    default_sort_directions = {
+        "name": "ascending",
+        "date-modified": "descending",
+        "date-created": "descending",
+        "date-added": "descending",
+        "date-last-opened": "descending",
+        "size": "descending",
+        "kind": "ascending",
+        "label": "ascending",
+        "version": "ascending",
+        "comments": "ascending",
+    }
+
+    lsvp = {
+        "viewOptionsVersion": 1,
+        "sortColumn": columns.get(options["list_sort_by"], "name"),
+        "textSize": float(options["list_text_size"]),
+        "iconSize": float(options["list_icon_size"]),
+        "showIconPreview": options["show_icon_preview"],
+        "scrollPositionX": options["list_scroll_position"][0],
+        "scrollPositionY": options["list_scroll_position"][1],
+        "useRelativeDates": options["list_use_relative_dates"],
+        "calculateAllSizes": options["list_calculate_all_sizes"],
+    }
+
+    lsvp["columns"] = {}
+    cndx = {}
+
+    for n, column in enumerate(options["list_columns"]):
+        cndx[column] = n
+        width = options["list_column_widths"].get(column, default_widths[column])
+        asc = "ascending" == options["list_column_sort_directions"].get(
+            column, default_sort_directions[column]
+        )
+
+        lsvp["columns"][columns[column]] = {
+            "index": n,
+            "width": width,
+            "identifier": columns[column],
+            "visible": True,
+            "ascending": asc,
+        }
+
+    n = len(options["list_columns"])
+    for k in columns:
+        if cndx.get(k, None) is None:
+            cndx[k] = n
+            width = default_widths[k]
+            asc = "ascending" == default_sort_directions[k]
+
+        lsvp["columns"][columns[column]] = {
+            "index": n,
+            "width": width,
+            "identifier": columns[column],
+            "visible": False,
+            "ascending": asc,
+        }
+
+        n += 1
+
+    default_view = options["default_view"]
+    views = {
+        "icon-view": b"icnv",
+        "column-view": b"clmv",
+        "list-view": b"Nlsv",
+        "coverflow": b"Flwv",
+    }
+
+    icvl = (b"type", views.get(default_view, "icnv"))
+
+    include_icon_view_settings = default_view == "icon-view" or options[
+        "include_icon_view_settings"
+    ] not in ("auto", "no", 0, False, None)
+    include_list_view_settings = default_view in ("list-view", "coverflow") or options[
+        "include_list_view_settings"
+    ] not in ("auto", "no", 0, False, None)
+
+    filename = options["filename"]
+    volume_name = options["volume_name"]
+
+    # Construct a writeable image to start with
+    dirname, basename = os.path.split(os.path.realpath(filename))
+    if not basename.endswith(".dmg"):
+        basename += ".dmg"
+    writableFile = tempfile.NamedTemporaryFile(
+        dir=dirname, prefix=".temp", suffix=basename
+    )
+
+    callback(
+        {
+            "type": "operation::start",
+            "operation": "size::calculate",
+        }
+    )
+
+    total_size = options["size"]
+    if total_size is None:
+        # Start with a size of 128MB - this way we don't need to calculate the
+        # size of the background image, volume icon, and .DS_Store file (and
+        # 128 MB should be well sufficient for even the most outlandish image
+        # sizes, like an uncompressed 5K multi-resolution TIFF)
+        total_size = 128 * 1024 * 1024
+
+        def roundup(x, n):
+            return x if x % n == 0 else x + n - x % n
+
+        for path in options["files"]:
+            if isinstance(path, tuple):
+                path = path[0]
+
+            if not os.path.islink(path) and os.path.isdir(path):
+                for dirpath, dirnames, filenames in os.walk(path):
+                    for f in filenames:
+                        fp = os.path.join(dirpath, f)
+                        total_size += roundup(os.lstat(fp).st_size, 4096)
+            else:
+                total_size += roundup(os.lstat(path).st_size, 4096)
+
+        for name, target in options["symlinks"].items():
+            total_size += 4096
+
+        total_size = str(max(total_size / 1000, 1024)) + "K"
+
+    callback(
+        {
+            "type": "operation::finished",
+            "operation": "size::calculate",
+            "size": total_size,
+        }
+    )
+
+    callback(
+        {
+            "type": "command::start",
+            "command": "hdiutil::create",
+        }
+    )
+
+    filesystem = options["filesystem"].upper()
+    fs_args = "-c c=64,a=16,e=16" if filesystem != "APFS" else ""
+
+    ret, output = hdiutil(
+        "create",
+        "-ov",
+        "-volname",
+        volume_name,
+        "-fs",
+        filesystem,
+        "-fsargs",
+        fs_args,
+        "-size",
+        total_size,
+        writableFile.name,
+    )
+
+    callback(
+        {
+            "type": "command::finished",
+            "command": "hdiutil::create",
+            "ret": ret,
+            "output": output,
+        }
+    )
+
+    if ret:
+        raise DMGError(callback, "Unable to create disk image")
+
+    callback(
+        {
+            "type": "command::start",
+            "command": "hdiutil::attach",
+        }
+    )
+
+    # IDME was deprecated in macOS 10.15/Catalina; as a result, use of -noidme
+    # started raising a warning.
+    if MACOS_VERSION >= (10, 15):
+        ret, output = hdiutil(
+            "attach", "-nobrowse", "-owners", "off", writableFile.name
+        )
+    else:
+        ret, output = hdiutil(
+            "attach", "-nobrowse", "-owners", "off", "-noidme", writableFile.name
+        )
+
+    callback(
+        {
+            "type": "command::finished",
+            "command": "hdiutil::attach",
+            "ret": ret,
+            "output": output,
+        }
+    )
+
+    if ret:
+        raise DMGError(callback, "Unable to attach disk image")
+
+    callback(
+        {
+            "type": "operation::start",
+            "operation": "dmg::create",
+        }
+    )
+
+    try:
+        for info in output["system-entities"]:
+            if info.get("mount-point", None):
+                device = info["dev-entry"]
+                mount_point = info["mount-point"]
+
+        icon = options["icon"]
+        if badge:
+            badge_icon = options["badge_icon"]
+        else:
+            badge_icon = None
+        icon_target_path = os.path.join(mount_point, ".VolumeIcon.icns")
+        if icon:
+            shutil.copyfile(icon, icon_target_path)
+        elif badge_icon:
+            badge.badge_disk_icon(badge_icon, icon_target_path)
+
+        if icon or badge_icon:
+            subprocess.call(["/usr/bin/SetFile", "-a", "C", mount_point])
+
+        background_bmk = None
+
+        callback(
+            {
+                "type": "operation::start",
+                "operation": "background::create",
+            }
+        )
+
+        if not isinstance(background, str):
+            pass
+        elif colors.isAColor(background):
+            c = colors.parseColor(background).to_rgb()
+
+            icvp["backgroundType"] = 1
+            icvp["backgroundColorRed"] = float(c.r)
+            icvp["backgroundColorGreen"] = float(c.g)
+            icvp["backgroundColorBlue"] = float(c.b)
+        else:
+            if os.path.isfile(background):
+                # look to see if there are HiDPI resources available
+
+                if lookForHiDPI is True:
+                    name, extension = os.path.splitext(os.path.basename(background))
+                    orderedImages = [background]
+                    imageDirectory = os.path.dirname(background)
+                    if imageDirectory == "":
+                        imageDirectory = "."
+                    for candidateName in os.listdir(imageDirectory):
+                        hasScale = re.match(
+                            r"^(?P<name>.+)@(?P<scale>\d+)x(?P<extension>\.\w+)$",
+                            candidateName,
+                        )
+                        if (
+                            hasScale
+                            and name == hasScale.group("name")
+                            and extension == hasScale.group("extension")
+                        ):
+                            scale = int(hasScale.group("scale"))
+                            if len(orderedImages) < scale:
+                                orderedImages += [None] * (scale - len(orderedImages))
+                            orderedImages[scale - 1] = os.path.join(
+                                imageDirectory, candidateName
+                            )
+
+                    if len(orderedImages) > 1:
+                        # compile the grouped tiff
+                        backgroundFile = tempfile.NamedTemporaryFile(suffix=".tiff")
+                        background = backgroundFile.name
+                        output = tempfile.TemporaryFile(mode="w+")
+                        try:
+                            subprocess.check_call(
+                                ["/usr/bin/tiffutil", "-cathidpicheck"]
+                                + list(filter(None, orderedImages))
+                                + ["-out", background],
+                                stdout=output,
+                                stderr=output,
+                            )
+                        except Exception as e:
+                            output.seek(0)
+                            raise ValueError(
+                                'unable to compile combined HiDPI file "%s" got error: %s\noutput: %s'
+                                % (background, str(e), output.read())
+                            )
+
+                _, kind = os.path.splitext(background)
+                path_in_image = os.path.join(mount_point, ".background" + kind)
+                shutil.copyfile(background, path_in_image)
+            else:
+                dmg_resources = resources.files("dmgbuild")
+                bg_resource = dmg_resources.joinpath(
+                    "resources/" + background + ".tiff"
+                )
+                if bg_resource.is_file():
+                    path_in_image = os.path.join(mount_point, ".background.tiff")
+                    with bg_resource.open("rb") as in_file:
+                        with open(path_in_image, "wb") as out_file:
+                            out_file.write(in_file.read())
+                else:
+                    raise ValueError('background file "%s" not found' % background)
+
+            alias = Alias.for_file(path_in_image)
+            background_bmk = Bookmark.for_file(path_in_image)
+
+            icvp["backgroundType"] = 2
+            icvp["backgroundImageAlias"] = alias.to_bytes()
+
+        callback(
+            {
+                "type": "operation::finished",
+                "operation": "background::create",
+            }
+        )
+
+        callback(
+            {
+                "type": "operation::start",
+                "operation": "files::add",
+                "total": len(options["files"]),
+            }
+        )
+
+        for f in options["files"]:
+            if isinstance(f, tuple):
+                f_in_image = os.path.join(mount_point, f[1])
+                f = f[0]
+            else:
+                basename = os.path.basename(f.rstrip("/"))
+                f_in_image = os.path.join(mount_point, basename)
+
+            callback(
+                {
+                    "type": "operation::start",
+                    "operation": "file::add",
+                    "file": f_in_image,
+                }
+            )
+
+            # use system ditto command to preserve code signing, etc.
+            subprocess.call(["/usr/bin/ditto", f, f_in_image])
+
+            callback(
+                {
+                    "type": "operation::finished",
+                    "operation": "file::add",
+                    "file": f_in_image,
+                }
+            )
+
+        callback(
+            {
+                "type": "operation::finished",
+                "operation": "files::add",
+            }
+        )
+
+        callback(
+            {
+                "type": "operation::start",
+                "operation": "symlinks::add",
+                "total": len(options["symlinks"]),
+            }
+        )
+
+        for name, target in options["symlinks"].items():
+            name_in_image = os.path.join(mount_point, name)
+            callback(
+                {
+                    "type": "operation::start",
+                    "operation": "symlink::add",
+                    "file": name_in_image,
+                    "target": target,
+                }
+            )
+            os.symlink(target, name_in_image)
+            callback(
+                {
+                    "type": "operation::finished",
+                    "operation": "symlink::add",
+                    "file": name_in_image,
+                    "target": target,
+                }
+            )
+
+        callback(
+            {
+                "type": "operation::finished",
+                "operation": "symlinks::add",
+            }
+        )
+
+        callback(
+            {
+                "type": "operation::start",
+                "operation": "extensions::hide",
+            }
+        )
+
+        to_hide = []
+        for name in options["hide_extensions"]:
+            name_in_image = os.path.join(mount_point, name)
+            to_hide.append(name_in_image)
+
+        if to_hide:
+            subprocess.call(["/usr/bin/SetFile", "-a", "E"] + to_hide)
+
+        to_hide = []
+        for name in options["hide"]:
+            name_in_image = os.path.join(mount_point, name)
+            to_hide.append(name_in_image)
+
+        if to_hide:
+            subprocess.call(["/usr/bin/SetFile", "-a", "V"] + to_hide)
+
+        callback(
+            {
+                "type": "operation::finished",
+                "operation": "extensions::hide",
+            }
+        )
+
+        userfn = options.get("create_hook", None)
+        if callable(userfn):
+            userfn(mount_point, options)
+
+        callback(
+            {
+                "type": "operation::start",
+                "operation": "dsstore::create",
+            }
+        )
+
+        image_dsstore = os.path.join(mount_point, ".DS_Store")
+
+        with DSStore.open(image_dsstore, "w+") as d:
+            d["."]["vSrn"] = ("long", 1)
+            d["."]["bwsp"] = bwsp
+            if include_icon_view_settings:
+                d["."]["icvp"] = icvp
+                if background_bmk:
+                    d["."]["pBBk"] = background_bmk
+            if include_list_view_settings:
+                d["."]["lsvp"] = lsvp
+            d["."]["icvl"] = icvl
+
+            for k, v in options["icon_locations"].items():
+                d[k]["Iloc"] = v
+
+        callback(
+            {
+                "type": "operation::finished",
+                "operation": "dsstore::create",
+            }
+        )
+
+        # Delete .Trashes, if it gets created
+        shutil.rmtree(os.path.join(mount_point, ".Trashes"), True)
+    except Exception:
+        # Always try to detach
+        hdiutil("detach", "-force", device, plist=False)
+        raise
+
+    callback(
+        {
+            "type": "operation::finished",
+            "operation": "dmg::create",
+        }
+    )
+
+    # Flush writes before attempting to detach.
+    subprocess.check_call(("sync", "--file-system", mount_point))
+
+    for tries in range(detach_retries):
+        callback(
+            {
+                "type": "command::start",
+                "command": "hdiutil::detach",
+            }
+        )
+
+        ret, output = hdiutil("detach", device, plist=False)
+
+        callback(
+            {
+                "type": "command::finished",
+                "command": "hdiutil::detach",
+                "ret:": ret,
+                "output:": output,
+            }
+        )
+
+        if not ret:
+            break
+        time.sleep(1)
+
+    if ret:
+        hdiutil("detach", "-force", device, plist=False)
+        raise DMGError(callback, "Unable to detach device cleanly")
+
+    callback(
+        {
+            "type": "command::start",
+            "command": "hdiutil::resize",
+        }
+    )
+
+    # Shrink the output to the minimum possible size
+    ret, output = hdiutil(
+        "resize", "-quiet", "-sectors", "min", writableFile.name, plist=False
+    )
+
+    callback(
+        {
+            "type": "command::finished",
+            "command": "hdiutil::resize",
+            "ret": ret,
+            "output": output,
+        }
+    )
+
+    if ret:
+        raise DMGError(callback, "Unable to shrink")
+
+    callback(
+        {
+            "type": "operation::start",
+            "operation": "dmg::shrink",
+        }
+    )
+
+    key_prefix = {"UDZO": "zlib", "UDBZ": "bzip2", "ULFO": "lzfse", "ULMO": "lzma"}
+    compression_level = options["compression_level"]
+    if options["format"] in key_prefix and compression_level:
+        compression_args = [
+            "-imagekey",
+            key_prefix[options["format"]] + "-level=" + str(compression_level),
+        ]
+    else:
+        compression_args = []
+
+    callback(
+        {
+            "type": "command::start",
+            "command": "hdiutil::convert",
+        }
+    )
+
+    ret, output = hdiutil(
+        "convert",
+        writableFile.name,
+        "-format",
+        options["format"],
+        "-ov",
+        "-o",
+        filename,
+        *compression_args,
+    )
+
+    callback(
+        {
+            "type": "command::finished",
+            "command": "hdiutil::convert",
+            "ret": ret,
+            "output": output,
+        }
+    )
+
+    if ret:
+        raise DMGError(callback, "Unable to convert")
+
+    callback(
+        {
+            "type": "operation::finished",
+            "operation": "dmg::shrink",
+        }
+    )
+
+    if options["license"]:
+        callback(
+            {
+                "type": "operation::start",
+                "command": "dmg::addlicense",
+            }
+        )
+
+        licenseDict = licensing.build_license(options["license"])
+
+        tempLicenseFile = open(os.path.join(dirname, "license.plist"), "wb")
+        plistlib.dump(licenseDict, tempLicenseFile)
+        tempLicenseFile.close()
+
+        # see https://developer.apple.com/forums/thread/668084
+        ret, output = hdiutil(
+            "udifrez", "-xml", tempLicenseFile.name, "", "-quiet", filename, plist=False
+        )
+
+        os.remove(tempLicenseFile.name)
+
+        if ret:
+            raise DMGError(callback, "Unable to add license")
+
+        callback(
+            {
+                "type": "operation::finished",
+                "command": "dmg::addlicense",
+            }
+        )
+
+    callback({"type": "build::finished"})
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/licensing.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/licensing.py
new file mode 100644
index 000000000..fb4254ee3
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/licensing.py
@@ -0,0 +1,329 @@
+import os
+
+# based on https://github.com/argv-minus-one/dmg-license/blob/master/language-info-generator/Languages.tsv
+# note that this table specifies STR# Resource ID but it seems to have no effect
+language_info_map = {
+    "da_DK": {"buttons": "Danish", "name": "Danish", "language_id": 9},
+    "de_AT": {"buttons": "German", "name": "German (Austrian)", "language_id": 92},
+    "de_CH": {"buttons": "German", "name": "German (Swiss)", "language_id": 19},
+    "de_DE": {"buttons": "German", "name": "German", "language_id": 3},
+    "en_AU": {"buttons": "English", "name": "English (Australian)", "language_id": 15},
+    "en_GB": {"buttons": "English", "name": "English (UK)", "language_id": 2},
+    "en_IE": {"buttons": "English", "name": "English (Ireland)", "language_id": 108},
+    "en_SG": {
+        "buttons": "English",
+        "name": "English (Singaporean)",
+        "language_id": 100,
+    },
+    "en_US": {"buttons": "English", "name": "English", "language_id": 0},
+    "es_ES": {"buttons": "Spanish", "name": "Spanish", "language_id": 8},
+    "fi_FI": {"buttons": "Finnish", "name": "Finnish", "language_id": 17},
+    "fr_BE": {"buttons": "French", "name": "French (Belgian)", "language_id": 98},
+    "fr_CA": {"buttons": "French", "name": "French (Canadian)", "language_id": 11},
+    "fr_CH": {"buttons": "French", "name": "French (Swiss)", "language_id": 18},
+    "fr_FR": {"buttons": "French", "name": "French", "language_id": 1},
+    "it_IT": {"buttons": "Italian", "name": "Italian", "language_id": 4},
+    "ja_JP": {
+        "buttons": "Japanese",
+        "name": "Japanese",
+        "language_id": 14,
+        "encoding": "shift_jis",  # not sure if this is correct encoding, but seems to be working
+        "multibyte": True,
+    },
+    "ko_KR": {
+        "buttons": "Korean",
+        "name": "Korean",
+        "language_id": 51,
+        "encoding": "ksx1001",
+        "multibyte": True,
+    },
+    "nb_NO": {"buttons": "Norwegian", "name": "Norwegian", "language_id": 12},
+    "nl_BE": {"buttons": "Dutch", "name": "Dutch", "language_id": 6},
+    "nl_NL": {"buttons": "Dutch", "name": "Dutch", "language_id": 5},
+    "pt_BR": {
+        "buttons": "Portuguese",
+        "name": "Portuguese (Brazilian)",
+        "language_id": 71,
+    },
+    "pt_PT": {"buttons": "Portuguese", "name": "Portuguese", "language_id": 10},
+    "ru_RU": {
+        "buttons": "Russian",
+        "name": "Russian",
+        "language_id": 49,
+        "encoding": "mac_cyrillic",
+    },
+    "sv_SE": {"buttons": "Swedish", "name": "Swedish", "language_id": 7},
+    "zh_CN": {
+        "buttons": "Simplified",
+        "name": "Simplified Chinese",
+        "language_id": 52,
+        "encoding": "gb2312",
+        "multibyte": True,
+    },
+    "zh_TW": {
+        "buttons": "Traditional",
+        "name": "Traditional Chinese",
+        "language_id": 53,
+        "encoding": "big5",
+        "multibyte": True,
+    },
+}
+
+# Buttons (these come from the SLAResources file which you can find in the SLA
+#          SDK on developer.apple.com)
+default_buttons = {
+    "English": (
+        "English",
+        "Agree",
+        "Disagree",
+        "Print",
+        "Save",
+        'If you agree with the terms of this license, press "Agree" to install the software.  If you do not agree, press "Disagree".',  # noqa; E501
+    ),
+    "German": (
+        "Deutsch",
+        "Akzeptieren",
+        "Ablehnen",
+        "Drucken",
+        "Sichern...",
+        'Klicken Sie in "Akzeptieren", wenn Sie mit den Bestimmungen des Software-Lizenzvertrags einverstanden sind. Falls nicht, bitte "Ablehnen" anklicken. Sie können die Software nur installieren, wenn Sie "Akzeptieren" angeklickt haben.',  # noqa; E501
+    ),
+    "Spanish": (
+        "Español",
+        "Aceptar",
+        "No aceptar",
+        "Imprimir",
+        "Guardar...",
+        'Si está de acuerdo con los términos de esta licencia, pulse "Aceptar" para instalar el software. En el supuesto de que no esté de acuerdo con los términos de esta licencia, pulse "No aceptar."',  # noqa; E501
+    ),
+    "French": (
+        "Français",
+        "Accepter",
+        "Refuser",
+        "Imprimer",
+        "Enregistrer...",
+        'Si vous acceptez les termes de la présente licence, cliquez sur "Accepter" afin d\'installer le logiciel. Si vous n\'êtes pas d\'accord avec les termes de la licence, cliquez sur "Refuser".',  # noqa; E501
+    ),
+    "Italian": (
+        "Italiano",
+        "Accetto",
+        "Rifiuto",
+        "Stampa",
+        "Registra...",
+        'Se accetti le condizioni di questa licenza, fai clic su "Accetto" per installare il software. Altrimenti fai clic su "Rifiuto".',  # noqa; E501
+    ),
+    "Japanese": (
+        "日本語",
+        "同意します",
+        "同意しません",
+        "印刷する",
+        "保存...",
+        "本ソフトウエア使用許諾契約の条件に同意される場合には、ソフトウエアをインストールするために「同意します」を押してください。\u3000同意されない場合には、「同意しません」を押してください。",  # noqa; E501
+    ),
+    "Dutch": (
+        "Nederlands",
+        "Ja",
+        "Nee",
+        "Print",
+        "Bewaar...",
+        "Indien u akkoord gaat met de voorwaarden van deze licentie, kunt u op 'Ja' klikken om de programmatuur te installeren. Indien u niet akkoord gaat, klikt u op 'Nee'.",  # noqa; E501
+    ),
+    "Russian": (
+        "Русский",
+        "Согласен",
+        "Не согласен",
+        "Распечатать",
+        "Сохранить",
+        "Если вы согласны с условиями данной лицензии, нажмите «Согласен», чтобы установить программное обеспечение. Если вы не согласны, нажмите «Не согласен».",  # noqa; E501
+    ),
+    "Swedish": (
+        "Svensk",
+        "Godkänns",
+        "Avböjs",
+        "Skriv ut",
+        "Spara...",
+        'Om Du godkänner licensvillkoren klicka på "Godkänns" för att installera programprodukten. Om Du inte godkänner licensvillkoren, klicka på "Avböjs".',  # noqa; E501
+    ),
+    "Portuguese": (
+        "Português",
+        "Concordar",
+        "Discordar",
+        "Imprimir",
+        "Salvar...",
+        'Se está de acordo com os termos desta licença, pressione "Concordar" para instalar o software. Se não está de acordo, pressione "Discordar".',  # noqa; E501
+    ),
+    "Simplified Chinese": (
+        "汉语",
+        "同意",
+        "不同意",
+        "打印",
+        "存储…",
+        "如果您同意本许可协议的条款，请按“同意”来安装此软件。如果您不同意，请按“不同意”。",  # noqa; E501
+    ),
+    "Traditional Chinese": (
+        "漢語",
+        "同意",
+        "不同意",
+        "列印",
+        "儲存…",
+        "如果您同意本許可證裡的條款，請按“同意”以安裝軟體。如果不同意，請按“不同意”。",  # noqa; E501
+    ),
+    "Danish": (
+        "Dansk",
+        "Enig",
+        "Uenig",
+        "Udskriv",
+        "Arkiver...",
+        "Hvis du accepterer betingelserne i licensaftalen, skal du klikke på “Enig” for at installere softwaren. Klik på “Uenig” for at annullere installeringen.",  # noqa; E501
+    ),
+    "Finnish": (
+        "Suomi",
+        "Hyväksyn",
+        "En hyväksy",
+        "Tulosta",
+        "Tallenna…",
+        'Hyväksy lisenssisopimuksen ehdot osoittamalla "Hyväksy". Jos et hyväksy sopimuksen ehtoja, osoita "En hyväksy".',  # noqa; E501
+    ),
+    "Korean": (
+        "한국어",
+        "동의",
+        "동의 안함",
+        "프린트",
+        "저장...",
+        '사용 계약서의 내용에 동의하면, "동의" 단추를 눌러 소프트웨어를 설치하십시오. 동의하지 않는다면, "동의 안함" 단추를 누르십시오.',  # noqa; E501
+    ),
+    "Norwegian": (
+        "Norsk",
+        "Enig",
+        "Ikke enig",
+        "Skriv ut",
+        "Arkiver...",
+        'Hvis De er enig i bestemmelsene i denne lisensavtalen, klikker De på "Enig"-knappen for å installere programvaren. Hvis De ikke er enig, klikker De på "Ikke enig".',  # noqa; E501
+    ),
+}
+
+udifrezXMLtemplate = {
+    "STR#": [],
+    # ?? License text would be included in a block like this:
+    # ?? 'TEXT': [
+    # ??     {
+    # ??         'Attributes': '0x0000',
+    # ??         'Data': b'license text',
+    # ??         'ID': '5000',
+    # ??         'Name': 'English'
+    # ??     }
+    # ?? ],
+    "TMPL": [
+        {
+            "Attributes": "0x0000",
+            "Data": b"\x13Default Language IDDWRD\x05CountOCNT\x04****LSTC\x0bsys lang IDDWRD\x1elocal res ID (offset from 5000DWRD\x102-byte language?DWRD\x04****LSTE",  # noqa: E501
+            "ID": "128",
+            "Name": "LPic",
+        }
+    ],
+}
+
+
+# Another implementation in TS:
+# https://github.com/argv-minus-one/dmg-license/blob/4268f2e822944fd670c1e197596396f233d6484e/src/makeLicensePlist.ts
+
+
+def build_license(license_info):
+    """Add a license agreement to the specified disk image file, see
+    https://developer.apple.com/forums/thread/668084."""
+    # Copy the original template
+    xml = dict(udifrezXMLtemplate)
+
+    licenses = license_info.get(
+        "licenses",
+        {"en_US": default_buttons["English"][5].encode("utf-8")},
+    )
+
+    lpic = b""
+    # The first field is the default language ID.
+    lpic += int(5000).to_bytes(2, "big")
+    # The second field is the count of language ID to license resource mappings.
+    lpic += len(licenses.items()).to_bytes(2, "big")
+
+    for language, license_data in licenses.items():
+        if language not in language_info_map:
+            raise Exception(
+                "Unknown language '"
+                + language
+                + "'. Valid languages are: "
+                + ", ".join(sorted(language_info_map.keys()))
+            )
+
+        language_info = language_info_map[language]
+        language_buttons = language_info["buttons"]
+        language_name = language_info["name"]
+        language_id = language_info["language_id"]
+        # for simplicity we use the same id for the resource as system language id + 5000
+        resource_id = language_id + 5000
+        language_encoding = language_info.get("encoding", "mac_roman")
+        multibyte_encoding = language_info.get("multibyte_encoding", False)
+
+        if os.path.isfile(license_data):
+            mode = "rb" if license_data.endswith(".rtf") else "r"
+            with open(license_data, mode=mode) as f:
+                license_data = f.read()
+
+        if isinstance(license_data, bytes):
+            if license_data.startswith(b"{\\rtf1"):
+                licenseDataFormat = "RTF "
+            else:
+                licenseDataFormat = "TEXT"
+        else:
+            licenseDataFormat = "TEXT"
+            license_data = license_data.encode(language_encoding)
+
+        if licenseDataFormat not in xml:
+            xml[licenseDataFormat] = []
+
+        xml[licenseDataFormat].append(
+            {
+                "Attributes": "0x0000",
+                "Data": license_data,
+                "ID": str(resource_id),
+                "Name": f"{language_name} SLA",
+            }
+        )
+
+        language_default_buttons = default_buttons.get(
+            language_buttons, default_buttons["English"]
+        )
+        buttons = license_info.get("buttons", {}).get(
+            language, language_default_buttons
+        )
+
+        assert len(buttons) == 6, "License buttons must have 6 entries."
+
+        buttons = [b.encode(language_encoding) for b in buttons]
+        buttons = [len(b).to_bytes(1, "big") + b for b in buttons]
+        xml["STR#"].append(
+            {
+                "Attributes": "0x0000",
+                # \x06 is apparently the number of buttons which is always 6
+                "Data": b"\x00\x06" + b"".join(buttons),
+                "ID": str(resource_id),
+                "Name": language_name,
+            }
+        )
+
+        # Finally, the list of resource ID mappings:
+        # Mapping field 1: system language ID
+        lpic += language_id.to_bytes(2, "big")
+        # Mapping field 2: local resource ID minus 5000
+        lpic += int(resource_id - 5000).to_bytes(2, "big")
+        # Mapping field 3: 2-byte language?
+        lpic += int(1 if multibyte_encoding else 0).to_bytes(2, "big")
+
+    xml["LPic"] = [
+        {
+            "Attributes": "0x0000",
+            "Data": lpic,
+            "ID": "5000",
+            "Name": "",
+        }
+    ]
+    return xml
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/qt_attribution.json b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/qt_attribution.json
index d9f97ae2c..d9f97ae2c 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/dmgbuild/qt_attribution.json
+++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/qt_attribution.json
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/LICENSE b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/LICENSE
index e91f4eb38..e91f4eb38 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/LICENSE
+++ b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/LICENSE
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/ds_store/__init__.py b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/__init__.py
new file mode 100644
index 000000000..bc8702fab
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/__init__.py
@@ -0,0 +1,5 @@
+from .store import DSStore, DSStoreEntry
+
+__version__ = "1.3.1"
+
+__all__ = ["__version__", "DSStore", "DSStoreEntry"]
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/ds_store/__main__.py b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/__main__.py
new file mode 100644
index 000000000..cf17ab5f6
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/__main__.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+#
+#  ds_store: Examine .DS_Store files.
+#
+
+import argparse
+import os
+import os.path
+import pprint
+import re
+import sys
+
+from ds_store import DSStore
+from ds_store.buddy import BuddyError
+
+_not_printable_re = re.compile(rb"[\x00-\x1f\x7f-\x9f]")
+
+
+def usage():
+    print(main.__doc__)
+    sys.exit(0)
+
+
+def chunks(iterable, length):
+    for i in range(0, len(iterable), length):
+        yield i, iterable[i : i + length]
+
+
+def pretty(value):
+    if isinstance(value, dict):
+        return f"{{\n {pprint.pformat(value, indent=4)[1:-1]}\n}}"
+    elif isinstance(value, bytearray):
+        lines = ["["]
+        for offset, chunk in chunks(value, 16):
+            printable_chunk = _not_printable_re.sub(b".", chunk).decode("latin-1")
+            hex_line = " ".join([f"{b:02x}" for b in chunk])
+            line = f"  {offset:08x}  {hex_line:<47s}  {printable_chunk}"
+            lines.append(line)
+        lines.append("]")
+        return "\n".join(lines)
+    elif isinstance(value, bytes):
+        return value.decode("latin-1")
+    else:
+        return value
+
+
+def main(argv):
+    """Display the contents of the .DS_Store file at the specified path.
+
+    If you specify just a directory, ds_store will inspect the .DS_Store
+    file in that directory.  If no paths are specified, ds_store will
+    display the contents of the .DS_Store file in the current directory.
+    """
+
+    parser = argparse.ArgumentParser(description=main.__doc__)
+    parser.add_argument("paths", nargs="*")
+    args = parser.parse_args(argv)
+
+    if len(args.paths) == 0:
+        args.paths = ["."]
+
+    failed = False
+    for path in args.paths:
+        if os.path.isdir(path):
+            path = os.path.join(path, ".DS_Store")
+
+        if not os.path.exists(path) or not os.path.isfile(path):
+            print(f"ds_store: {path} not found", file=sys.stderr)
+            failed = True
+            continue
+
+        try:
+            with DSStore.open(path, "r") as d:
+                print(path)
+                print("")
+
+                max_name_len = 0
+                for entry in d:
+                    name_len = len(entry.filename)
+                    if name_len > max_name_len:
+                        max_name_len = name_len
+
+                for entry in d:
+                    print(
+                        "{:<{width}} {} {}".format(
+                            entry.filename,
+                            entry.code.decode("latin-1"),
+                            pretty(entry.value),
+                            width=max_name_len,
+                        )
+                    )
+                print("")
+        except BuddyError as e:
+            print(f"ds_store: {path}: {e}")
+            failed = True
+
+    if failed:
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/buddy.py b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/buddy.py
index 320768cd3..27b11b3f7 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/buddy.py
+++ b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/buddy.py
@@ -1,23 +1,14 @@
-# -*- coding: utf-8 -*-
-import os
+import binascii
 import bisect
+import os
 import struct
-import binascii
 
-try:
-    {}.iterkeys
-    iterkeys = lambda x: x.iterkeys()
-except AttributeError:
-    iterkeys = lambda x: x.keys()
-try:
-    unicode
-except NameError:
-    unicode = str
 
 class BuddyError(Exception):
     pass
 
-class Block(object):
+
+class Block:
     def __init__(self, allocator, offset, size):
         self._allocator = allocator
         self._offset = offset
@@ -25,7 +16,7 @@ class Block(object):
         self._value = bytearray(allocator.read(offset, size))
         self._pos = 0
         self._dirty = False
-        
+
     def __len__(self):
         return self._size
 
@@ -34,7 +25,7 @@ class Block(object):
 
     def __exit__(self, exc_type, exc_value, traceback):
         self.close()
-    
+
     def close(self):
         if self._dirty:
             self.flush()
@@ -46,13 +37,13 @@ class Block(object):
 
     def invalidate(self):
         self._dirty = False
-        
+
     def zero_fill(self):
         len = self._size - self._pos
-        zeroes = b'\0' * len
-        self._value[self._pos:self._size] = zeroes
+        zeroes = b"\0" * len
+        self._value[self._pos : self._size] = zeroes
         self._dirty = True
-        
+
     def tell(self):
         return self._pos
 
@@ -63,12 +54,12 @@ class Block(object):
             pos = self._size - pos
 
         if pos < 0 or pos > self._size:
-            raise ValueError('Seek out of range in Block instance')
+            raise ValueError("Seek out of range in Block instance")
 
         self._pos = pos
 
     def read(self, size_or_format):
-        if isinstance(size_or_format, (str, unicode, bytes)):
+        if isinstance(size_or_format, (str, bytes)):
             size = struct.calcsize(size_or_format)
             fmt = size_or_format
         else:
@@ -76,11 +67,11 @@ class Block(object):
             fmt = None
 
         if self._size - self._pos < size:
-            raise BuddyError('Unable to read %lu bytes in block' % size)
+            raise BuddyError("Unable to read %lu bytes in block" % size)
 
-        data = self._value[self._pos:self._pos + size]
+        data = self._value[self._pos : self._pos + size]
         self._pos += size
-        
+
         if fmt is not None:
             if isinstance(data, bytearray):
                 return struct.unpack_from(fmt, bytes(data))
@@ -96,11 +87,11 @@ class Block(object):
             data = data_or_format
 
         if self._pos + len(data) > self._size:
-            raise ValueError('Attempt to write past end of Block')
+            raise ValueError("Attempt to write past end of Block")
 
-        self._value[self._pos:self._pos + len(data)] = data
+        self._value[self._pos : self._pos + len(data)] = data
         self._pos += len(data)
-        
+
         self._dirty = True
 
     def insert(self, data_or_format, *args):
@@ -109,78 +100,80 @@ class Block(object):
         else:
             data = data_or_format
 
-        del self._value[-len(data):]
-        self._value[self._pos:self._pos] = data
+        del self._value[-len(data) :]
+        self._value[self._pos : self._pos] = data
         self._pos += len(data)
 
         self._dirty = True
 
     def delete(self, size):
         if self._pos + size > self._size:
-            raise ValueError('Attempt to delete past end of Block')
-        del self._value[self._pos:self._pos + size]
-        self._value += b'\0' * size
+            raise ValueError("Attempt to delete past end of Block")
+        del self._value[self._pos : self._pos + size]
+        self._value += b"\0" * size
         self._dirty = True
-        
+
     def __str__(self):
         return binascii.b2a_hex(self._value)
-        
-class Allocator(object):
+
+
+class Allocator:
     def __init__(self, the_file):
         self._file = the_file
         self._dirty = False
 
         self._file.seek(0)
-        
+
         # Read the header
-        magic1, magic2, offset, size, offset2, self._unknown1 \
-          = self.read(-4, '>I4sIII16s')
+        (magic1, magic2, offset, size, offset2, self._unknown1) = self.read(
+            -4, ">I4sIII16s"
+        )
 
-        if magic2 != b'Bud1' or magic1 != 1:
-            raise BuddyError('Not a buddy file')
+        if magic2 != b"Bud1" or magic1 != 1:
+            raise BuddyError("Not a buddy file")
 
         if offset != offset2:
-            raise BuddyError('Root addresses differ')
+            raise BuddyError("Root addresses differ")
 
         self._root = Block(self, offset, size)
 
         # Read the block offsets
-        count, self._unknown2 = self._root.read('>II')
+        count, self._unknown2 = self._root.read(">II")
         self._offsets = []
         c = (count + 255) & ~255
         while c:
-            self._offsets += self._root.read('>256I')
+            self._offsets += self._root.read(">256I")
             c -= 256
         self._offsets = self._offsets[:count]
-        
+
         # Read the TOC
         self._toc = {}
-        count = self._root.read('>I')[0]
+        count = self._root.read(">I")[0]
         for n in range(count):
-            nlen = self._root.read('B')[0]
+            nlen = self._root.read("B")[0]
             name = bytes(self._root.read(nlen))
-            value = self._root.read('>I')[0]
+            value = self._root.read(">I")[0]
             self._toc[name] = value
 
         # Read the free lists
         self._free = []
         for n in range(32):
-            count = self._root.read('>I')
-            self._free.append(list(self._root.read('>%uI' % count)))
-        
+            count = self._root.read(">I")
+            self._free.append(list(self._root.read(">%uI" % count)))
+
     @classmethod
-    def open(cls, file_or_name, mode='r+'):
-        if isinstance(file_or_name, (str, unicode)):
-            if not 'b' in mode:
-                mode = mode[:1] + 'b' + mode[1:]
+    def open(cls, file_or_name, mode="r+"):
+        if isinstance(file_or_name, str):
+            if "b" not in mode:
+                mode = mode[:1] + "b" + mode[1:]
             f = open(file_or_name, mode)
         else:
             f = file_or_name
 
-        if 'w' in mode:
+        if "w" in mode:
             # Create an empty file in this case
             f.truncate()
-            
+
             # An empty root block needs 1264 bytes:
             #
             #     0  4       offset count
@@ -190,7 +183,7 @@ class Allocator(object):
             #  1032  4       toc count (0)
             #  1036  228     free list
             #  total 1264
-            
+
             # The free list will contain the following:
             #
             #     0  5 * 4   no blocks of width less than 5
@@ -208,28 +201,38 @@ class Allocator(object):
             #  located at offset 2**n where n is its width.)
 
             # Write the header
-            header = struct.pack(b'>I4sIII16s',
-                                 1, b'Bud1',
-                                 2048, 1264, 2048,
-                                 b'\x00\x00\x10\x0c'
-                                 b'\x00\x00\x00\x87'
-                                 b'\x00\x00\x20\x0b'
-                                 b'\x00\x00\x00\x00')
+            header = struct.pack(
+                b">I4sIII16s",
+                1,
+                b"Bud1",
+                2048,
+                1264,
+                2048,
+                b"\x00\x00\x10\x0c"
+                b"\x00\x00\x00\x87"
+                b"\x00\x00\x20\x0b"
+                b"\x00\x00\x00\x00",
+            )
             f.write(header)
-            f.write(b'\0' * 2016)
-            
+            f.write(b"\0" * 2016)
+
             # Write the root block
-            free_list = [struct.pack(b'>5I', 0, 0, 0, 0, 0)]
+            free_list = [struct.pack(b">5I", 0, 0, 0, 0, 0)]
             for n in range(5, 11):
-                free_list.append(struct.pack(b'>II', 1, 2**n))
-            free_list.append(struct.pack(b'>I', 0))
+                free_list.append(struct.pack(b">II", 1, 2**n))
+            free_list.append(struct.pack(b">I", 0))
             for n in range(12, 31):
-                free_list.append(struct.pack(b'>II', 1, 2**n))
-            free_list.append(struct.pack(b'>I', 0))
-            
-            root = b''.join([struct.pack(b'>III', 1, 0, 2048 | 5),
-                            struct.pack(b'>I', 0) * 255,
-                            struct.pack(b'>I', 0)] + free_list)
+                free_list.append(struct.pack(b">II", 1, 2**n))
+            free_list.append(struct.pack(b">I", 0))
+
+            root = b"".join(
+                [
+                    struct.pack(b">III", 1, 0, 2048 | 5),
+                    struct.pack(b">I", 0) * 255,
+                    struct.pack(b">I", 0),
+                ]
+                + free_list
+            )
             f.write(root)
 
         return Allocator(f)
@@ -239,7 +242,7 @@ class Allocator(object):
 
     def __exit__(self, exc_type, exc_value, traceback):
         self.close()
-    
+
     def close(self):
         self.flush()
         self._file.close()
@@ -252,51 +255,57 @@ class Allocator(object):
                 self._write_root_block_into(rblk)
 
             addr = self._offsets[0]
-            offset = addr & ~0x1f
-            size = 1 << (addr & 0x1f)
+            offset = addr & ~0x1F
+            size = 1 << (addr & 0x1F)
 
             self._file.seek(0, os.SEEK_SET)
-            self._file.write(struct.pack(b'>I4sIII16s',
-                                         1, b'Bud1',
-                                         offset, size, offset,
-                                         self._unknown1))
+            self._file.write(
+                struct.pack(
+                    b">I4sIII16s", 1, b"Bud1", offset, size, offset, self._unknown1
+                )
+            )
 
             self._dirty = False
-            
+
         self._file.flush()
-            
+
     def read(self, offset, size_or_format):
-        """Read data at `offset', or raise an exception.  `size_or_format'
-           may either be a byte count, in which case we return raw data,
-           or a format string for `struct.unpack', in which case we
-           work out the size and unpack the data before returning it."""
+        """Read data at `offset', or raise an exception.
+
+        `size_or_format' may either be a byte count, in which case we
+        return raw data, or a format string for `struct.unpack', in
+        which case we work out the size and unpack the data before
+        returning it.
+        """
         # N.B. There is a fixed offset of four bytes(!)
         self._file.seek(offset + 4, os.SEEK_SET)
 
-        if isinstance(size_or_format, (str, unicode)):
+        if isinstance(size_or_format, str):
             size = struct.calcsize(size_or_format)
             fmt = size_or_format
         else:
             size = size_or_format
             fmt = None
-        
+
         ret = self._file.read(size)
         if len(ret) < size:
-            ret += b'\0' * (size - len(ret))
+            ret += b"\0" * (size - len(ret))
 
         if fmt is not None:
             if isinstance(ret, bytearray):
                 ret = struct.unpack_from(fmt, bytes(ret))
             else:
                 ret = struct.unpack(fmt, ret)
-            
+
         return ret
 
     def write(self, offset, data_or_format, *args):
-        """Write data at `offset', or raise an exception.  `data_or_format'
-           may either be the data to write, or a format string for `struct.pack',
-           in which case we pack the additional arguments and write the
-           resulting data."""
+        """Write data at `offset', or raise an exception.
+
+        `data_or_format' may either be the data to write, or a format
+        string for `struct.pack', in which case we pack the additional
+        arguments and write the resulting data.
+        """
         # N.B. There is a fixed offset of four bytes(!)
         self._file.seek(offset + 4, os.SEEK_SET)
 
@@ -313,11 +322,11 @@ class Allocator(object):
         except IndexError:
             return None
 
-        offset = addr & ~0x1f
-        size = 1 << (addr & 0x1f)
+        offset = addr & ~0x1F
+        size = 1 << (addr & 0x1F)
 
         return Block(self, offset, size)
-    
+
     def _root_block_size(self):
         """Return the number of bytes required by the root block."""
         # Offsets
@@ -330,62 +339,62 @@ class Allocator(object):
 
         # Free list
         size += sum([4 + 4 * len(fl) for fl in self._free])
-        
+
         return size
 
     def _write_root_block_into(self, block):
         # Offsets
-        block.write('>II', len(self._offsets), self._unknown2)
-        block.write('>%uI' % len(self._offsets), *self._offsets)
+        block.write(">II", len(self._offsets), self._unknown2)
+        block.write(">%uI" % len(self._offsets), *self._offsets)
         extra = len(self._offsets) & 255
         if extra:
-            block.write(b'\0\0\0\0' * (256 - extra))
+            block.write(b"\0\0\0\0" * (256 - extra))
 
         # TOC
         keys = list(self._toc.keys())
         keys.sort()
 
-        block.write('>I', len(keys))
+        block.write(">I", len(keys))
         for k in keys:
-            block.write('B', len(k))
+            block.write("B", len(k))
             block.write(k)
-            block.write('>I', self._toc[k])
+            block.write(">I", self._toc[k])
 
         # Free list
         for w, f in enumerate(self._free):
-            block.write('>I', len(f))
+            block.write(">I", len(f))
             if len(f):
-                block.write('>%uI' % len(f), *f)
+                block.write(">%uI" % len(f), *f)
 
     def _buddy(self, offset, width):
         f = self._free[width]
         b = offset ^ (1 << width)
-        
+
         try:
             ndx = f.index(b)
         except ValueError:
             ndx = None
-            
+
         return (f, b, ndx)
 
     def _release(self, offset, width):
         # Coalesce
         while True:
-            f,b,ndx = self._buddy(offset, width)
+            f, b, ndx = self._buddy(offset, width)
 
             if ndx is None:
                 break
-            
+
             offset &= b
             width += 1
             del f[ndx]
-            
+
         # Add to the list
         bisect.insort(f, offset)
 
         # Mark as dirty
         self._dirty = True
-    
+
     def _alloc(self, width):
         w = width
         while not self._free[w]:
@@ -407,15 +416,15 @@ class Allocator(object):
             except ValueError:
                 block = len(self._offsets)
                 self._offsets.append(0)
-        
+
         # Compute block width
         width = max(bytes.bit_length(), 5)
 
         addr = self._offsets[block]
-        offset = addr & ~0x1f
-        
+        offset = addr & ~0x1F
+
         if addr:
-            blkwidth = addr & 0x1f
+            blkwidth = addr & 0x1F
             if blkwidth == width:
                 return block
             self._release(offset, width)
@@ -424,13 +433,13 @@ class Allocator(object):
         offset = self._alloc(width)
         self._offsets[block] = offset | width
         return block
-    
+
     def release(self, block):
         addr = self._offsets[block]
 
         if addr:
-            width = addr & 0x1f
-            offset = addr & ~0x1f
+            width = addr & 0x1F
+            offset = addr & ~0x1F
             self._release(offset, width)
 
         if block == len(self._offsets):
@@ -442,37 +451,36 @@ class Allocator(object):
         return len(self._toc)
 
     def __getitem__(self, key):
-        if not isinstance(key, (str, unicode)):
-            raise TypeError('Keys must be of string type')
+        if not isinstance(key, str):
+            raise TypeError("Keys must be of string type")
         if not isinstance(key, bytes):
-            key = key.encode('latin_1')
+            key = key.encode("latin_1")
         return self._toc[key]
 
     def __setitem__(self, key, value):
-        if not isinstance(key, (str, unicode)):
-            raise TypeError('Keys must be of string type')
+        if not isinstance(key, str):
+            raise TypeError("Keys must be of string type")
         if not isinstance(key, bytes):
-            key = key.encode('latin_1')
+            key = key.encode("latin_1")
         self._toc[key] = value
         self._dirty = True
 
     def __delitem__(self, key):
-        if not isinstance(key, (str, unicode)):
-            raise TypeError('Keys must be of string type')
+        if not isinstance(key, str):
+            raise TypeError("Keys must be of string type")
         if not isinstance(key, bytes):
-            key = key.encode('latin_1')
+            key = key.encode("latin_1")
         del self._toc[key]
         self._dirty = True
 
     def iterkeys(self):
-        return iterkeys(self._toc)
+        return self._toc.keys()
 
     def keys(self):
-        return iterkeys(self._toc)
+        return self._toc.keys()
 
     def __iter__(self):
-        return iterkeys(self._toc)
+        return self._toc.keys()
 
     def __contains__(self, key):
         return key in self._toc
-
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/qt_attribution.json b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/qt_attribution.json
index a4854d1ed..a4854d1ed 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/qt_attribution.json
+++ b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/qt_attribution.json
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/store.py b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/store.py
index b6f805b24..58e9e1bce 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/ds_store/store.py
+++ b/src/3rdparty/python/lib/python3.9/site-packages/ds_store/store.py
@@ -1,48 +1,36 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-
-import binascii
+import plistlib
 import struct
-import biplist
-import mac_alias
 
-try:
-    next
-except NameError:
-    next = lambda x: x.next()
-try:
-    unicode
-except NameError:
-    unicode = str
+import mac_alias
 
 from . import buddy
 
-class ILocCodec(object):
+
+class ILocCodec:
     @staticmethod
     def encode(point):
-        return struct.pack(b'>IIII', point[0], point[1],
-                           0xffffffff, 0xffff0000)
+        return struct.pack(b">IIII", point[0], point[1], 0xFFFFFFFF, 0xFFFF0000)
 
     @staticmethod
     def decode(bytesData):
         if isinstance(bytesData, bytearray):
-            x, y = struct.unpack_from(b'>II', bytes(bytesData[:8]))
+            x, y = struct.unpack_from(b">II", bytes(bytesData[:8]))
         else:
-            x, y = struct.unpack(b'>II', bytesData[:8])
+            x, y = struct.unpack(b">II", bytesData[:8])
         return (x, y)
 
-class PlistCodec(object):
+
+class PlistCodec:
     @staticmethod
     def encode(plist):
-        return biplist.writePlistToString(plist)
+        return plistlib.dumps(plist, fmt=plistlib.FMT_BINARY)
 
     @staticmethod
     def decode(bytes):
-        return biplist.readPlistFromString(bytes)
+        return plistlib.loads(bytes)
 
-class BookmarkCodec(object):
+
+class BookmarkCodec:
     @staticmethod
     def encode(bmk):
         return bmk.to_bytes()
@@ -51,70 +39,73 @@ class BookmarkCodec(object):
     def decode(bytes):
         return mac_alias.Bookmark.from_bytes(bytes)
 
+
 # This list tells the code how to decode particular kinds of entry in the
 # .DS_Store file.  This is really a convenience, and we currently only
 # support a tiny subset of the possible entry types.
 codecs = {
-    b'Iloc': ILocCodec,
-    b'bwsp': PlistCodec,
-    b'lsvp': PlistCodec,
-    b'lsvP': PlistCodec,
-    b'icvp': PlistCodec,
-    b'pBBk': BookmarkCodec
-    }
-
-class DSStoreEntry(object):
+    b"Iloc": ILocCodec,
+    b"bwsp": PlistCodec,
+    b"lsvp": PlistCodec,
+    b"lsvP": PlistCodec,
+    b"icvp": PlistCodec,
+    b"pBBk": BookmarkCodec,
+}
+
+
+class DSStoreEntry:
     """Holds the data from an entry in a ``.DS_Store`` file.  Note that this is
-    not meant to represent the entry itself---i.e. if you change the type
-    or value, your changes will *not* be reflected in the underlying file.
+    not meant to represent the entry itself---i.e. if you change the type or
+    value, your changes will *not* be reflected in the underlying file.
 
-    If you want to make a change, you should either use the :class:`DSStore`
-    object's :meth:`DSStore.insert` method (which will replace a key if it
-    already exists), or the mapping access mode for :class:`DSStore` (often
-    simpler anyway).
+    If you want to make a change, you should either use the
+    :class:`DSStore` object's :meth:`DSStore.insert` method (which will
+    replace a key if it already exists), or the mapping access mode for
+    :class:`DSStore` (often simpler anyway).
     """
+
     def __init__(self, filename, code, typecode, value=None):
         if str != bytes and type(filename) == bytes:
-            filename = filename.decode('utf-8')
+            filename = filename.decode("utf-8")
 
         if not isinstance(code, bytes):
-            code = code.encode('latin_1')
+            code = code.encode("latin_1")
 
         self.filename = filename
         self.code = code
         self.type = typecode
         self.value = value
-        
+
     @classmethod
     def read(cls, block):
-        """Read a ``.DS_Store`` entry from the containing Block"""
+        """Read a ``.DS_Store`` entry from the containing Block."""
         # First read the filename
-        nlen = block.read(b'>I')[0]
-        filename = block.read(2 * nlen).decode('utf-16be')
+        nlen = block.read(b">I")[0]
+        filename = block.read(2 * nlen).decode("utf-16be")
 
         # Next, read the code and type
-        code, typecode = block.read(b'>4s4s')
+        code, typecode = block.read(b">4s4s")
 
         # Finally, read the data
-        if typecode == b'bool':
-            value = block.read(b'>?')[0]
-        elif typecode == b'long' or typecode == b'shor':
-            value = block.read(b'>I')[0]
-        elif typecode == b'blob':
-            vlen = block.read(b'>I')[0]
+        if typecode == b"bool":
+            value = block.read(b">?")[0]
+        elif typecode == b"long" or typecode == b"shor":
+            value = block.read(b">I")[0]
+        elif typecode == b"blob":
+            vlen = block.read(b">I")[0]
             value = block.read(vlen)
 
             codec = codecs.get(code, None)
             if codec:
                 value = codec.decode(value)
                 typecode = codec
-        elif typecode == b'ustr':
-            vlen = block.read(b'>I')[0]
-            value = block.read(2 * vlen).decode('utf-16be')
-        elif typecode == b'type':
-            value = block.read(b'>4s')[0]
-        elif typecode == b'comp' or typecode == b'dutc':
-            value = block.read(b'>Q')[0]
+        elif typecode == b"ustr":
+            vlen = block.read(b">I")[0]
+            value = block.read(2 * vlen).decode("utf-16be")
+        elif typecode == b"type":
+            value = block.read(b">4s")[0]
+        elif typecode == b"comp" or typecode == b"dutc":
+            value = block.read(b">Q")[0]
         else:
             raise ValueError('Unknown type code "%s"' % typecode)
 
@@ -122,152 +113,138 @@ class DSStoreEntry(object):
 
     def __lt__(self, other):
         if not isinstance(other, DSStoreEntry):
-            raise TypeError('Can only compare against other DSStoreEntry objects')
+            raise TypeError("Can only compare against other DSStoreEntry objects")
         sfl = self.filename.lower()
         ofl = other.filename.lower()
-        return (sfl < ofl
-                or (self.filename == other.filename
-                    and self.code < other.code))
+        return sfl < ofl or (self.filename == other.filename and self.code < other.code)
 
     def __le__(self, other):
         if not isinstance(other, DSStoreEntry):
-            raise TypeError('Can only compare against other DSStoreEntry objects')
+            raise TypeError("Can only compare against other DSStoreEntry objects")
         sfl = self.filename.lower()
         ofl = other.filename.lower()
-        return (sfl < ofl
-                or (sfl == ofl
-                    and self.code <= other.code))
+        return sfl < ofl or (sfl == ofl and self.code <= other.code)
 
     def __eq__(self, other):
         if not isinstance(other, DSStoreEntry):
-            raise TypeError('Can only compare against other DSStoreEntry objects')
+            raise TypeError("Can only compare against other DSStoreEntry objects")
         sfl = self.filename.lower()
         ofl = other.filename.lower()
-        return (sfl == ofl
-                and self.code == other.code)
+        return sfl == ofl and self.code == other.code
 
     def __ne__(self, other):
         if not isinstance(other, DSStoreEntry):
-            raise TypeError('Can only compare against other DSStoreEntry objects')
+            raise TypeError("Can only compare against other DSStoreEntry objects")
         sfl = self.filename.lower()
         ofl = other.filename.lower()
-        return (sfl != ofl
-                or self.code != other.code)
+        return sfl != ofl or self.code != other.code
 
     def __gt__(self, other):
         if not isinstance(other, DSStoreEntry):
-            raise TypeError('Can only compare against other DSStoreEntry objects')
+            raise TypeError("Can only compare against other DSStoreEntry objects")
         sfl = self.filename.lower()
         ofl = other.filename.lower()
-        
+
         selfCode = self.code
         if str != bytes and type(selfCode) is bytes:
-            selfCode = selfCode.decode('utf-8')
+            selfCode = selfCode.decode("utf-8")
         otherCode = other.code
         if str != bytes and type(otherCode) is bytes:
-            otherCode = otherCode.decode('utf-8')
-        
-        return (sfl > ofl or (sfl == ofl and selfCode > otherCode))
+            otherCode = otherCode.decode("utf-8")
+
+        return sfl > ofl or (sfl == ofl and selfCode > otherCode)
 
     def __ge__(self, other):
         if not isinstance(other, DSStoreEntry):
-            raise TypeError('Can only compare against other DSStoreEntry objects')
+            raise TypeError("Can only compare against other DSStoreEntry objects")
         sfl = self.filename.lower()
         ofl = other.filename.lower()
-        return (sfl > ofl
-                or (sfl == ofl
-                    and self.code >= other.code))
+        return sfl > ofl or (sfl == ofl and self.code >= other.code)
 
-    def __cmp__(self, other):
-        if not isinstance(other, DSStoreEntry):
-            raise TypeError('Can only compare against other DSStoreEntry objects')
-        r = cmp(self.filename.lower(), other.filename.lower())
-        if r:
-            return r
-        return cmp(self.code, other.code)
-    
     def byte_length(self):
-        """Compute the length of this entry, in bytes"""
-        utf16 = self.filename.encode('utf-16be')
-        l = 4 + len(utf16) + 8
+        """Compute the length of this entry, in bytes."""
+        utf16 = self.filename.encode("utf-16be")
+        length = 4 + len(utf16) + 8
 
-        if isinstance(self.type, unicode):
-            entry_type = self.type.encode('latin_1')
+        if isinstance(self.type, str):
+            entry_type = self.type.encode("latin_1")
             value = self.value
         elif isinstance(self.type, (bytes, str)):
             entry_type = self.type
             value = self.value
         else:
-            entry_type = b'blob'
+            entry_type = b"blob"
             value = self.type.encode(self.value)
-            
-        if entry_type == b'bool':
-            l += 1
-        elif entry_type == b'long' or entry_type == b'shor':
-            l += 4
-        elif entry_type == b'blob':
-            l += 4 + len(value)
-        elif entry_type == b'ustr':
-            utf16 = value.encode('utf-16be')
-            l += 4 + len(utf16)
-        elif entry_type == b'type':
-            l += 4
-        elif entry_type == b'comp' or entry_type == b'dutc':
-            l += 8
+
+        if entry_type == b"bool":
+            length += 1
+        elif entry_type == b"long" or entry_type == b"shor":
+            length += 4
+        elif entry_type == b"blob":
+            length += 4 + len(value)
+        elif entry_type == b"ustr":
+            utf16 = value.encode("utf-16be")
+            length += 4 + len(utf16)
+        elif entry_type == b"type":
+            length += 4
+        elif entry_type == b"comp" or entry_type == b"dutc":
+            length += 8
         else:
             raise ValueError('Unknown type code "%s"' % entry_type)
 
-        return l
-    
+        return length
+
     def write(self, block, insert=False):
-        """Write this entry to the specified Block"""
+        """Write this entry to the specified Block."""
         if insert:
             w = block.insert
         else:
             w = block.write
 
-        if isinstance(self.type, unicode):
-            entry_type = self.type.encode('latin_1')
+        if isinstance(self.type, str):
+            entry_type = self.type.encode("latin_1")
             value = self.value
         elif isinstance(self.type, (bytes, str)):
             entry_type = self.type
             value = self.value
         else:
-            entry_type = b'blob'
+            entry_type = b"blob"
             value = self.type.encode(self.value)
 
-        utf16 = self.filename.encode('utf-16be')
-        w(b'>I', len(utf16) // 2)
+        utf16 = self.filename.encode("utf-16be")
+        w(b">I", len(utf16) // 2)
         w(utf16)
-        w(b'>4s4s', self.code, entry_type)
-
-        if entry_type == b'bool':
-            w(b'>?', value)
-        elif entry_type == b'long' or entry_type == b'shor':
-            w(b'>I', value)
-        elif entry_type == b'blob':
-            w(b'>I', len(value))
+        w(b">4s4s", self.code, entry_type)
+
+        if entry_type == b"bool":
+            w(b">?", value)
+        elif entry_type == b"long" or entry_type == b"shor":
+            w(b">I", value)
+        elif entry_type == b"blob":
+            w(b">I", len(value))
             w(value)
-        elif entry_type == b'ustr':
-            utf16 = value.encode('utf-16be')
-            w(b'>I', len(utf16) // 2)
+        elif entry_type == b"ustr":
+            utf16 = value.encode("utf-16be")
+            w(b">I", len(utf16) // 2)
             w(utf16)
-        elif entry_type == b'type':
-            if isinstance(value, unicode):
-                value = value.encode('latin_1')
-            w(b'>4s', value)
-        elif entry_type == b'comp' or entry_type == b'dutc':
-            w(b'>Q', value)
+        elif entry_type == b"type":
+            if isinstance(value, str):
+                value = value.encode("latin_1")
+            w(b">4s", value)
+        elif entry_type == b"comp" or entry_type == b"dutc":
+            w(b">Q", value)
         else:
             raise ValueError('Unknown type code "%s"' % entry_type)
-    
+
     def __repr__(self):
-        return '<%s %s>' % (self.filename, self.code)
+        return f"<{self.filename} {self.code}>"
+
+
+class DSStore:
+    """Python interface to a ``.DS_Store`` file.  Works by manipulating the
+    file on the disk---so this code will work with ``.DS_Store`` files for.
 
-class DSStore(object):
-    """Python interface to a ``.DS_Store`` file.  Works by manipulating the file
-    on the disk---so this code will work with ``.DS_Store`` files for *very*
-    large directories.
+    *very* large directories.
 
     A :class:`DSStore` object can be used as if it was a mapping, e.g.::
 
@@ -280,7 +257,7 @@ class DSStore(object):
 
     Currently, we know how to decode "Iloc", "bwsp", "lsvp", "lsvP" and "icvp"
     blobs.  "Iloc" decodes to an (x, y) tuple, while the others are all decoded
-    using ``biplist``.
+    using ``biplist`` or ``plistlib`` depending on Python version.
 
     Assignment also works, e.g.::
 
@@ -292,38 +269,48 @@ class DSStore(object):
 
     This is usually going to be the most convenient interface, though
     occasionally (for instance when creating a new ``.DS_Store`` file) you
-    may wish to drop down to using :class:`DSStoreEntry` objects directly."""
+    may wish to drop down to using :class:`DSStoreEntry` objects directly.
+    """
+
     def __init__(self, store):
         self._store = store
-        self._superblk = self._store['DSDB']
+        self._superblk = self._store["DSDB"]
         with self._get_block(self._superblk) as s:
-            self._rootnode, self._levels, self._records, \
-            self._nodes, self._page_size = s.read(b'>IIIII')
+            (
+                self._rootnode,
+                self._levels,
+                self._records,
+                self._nodes,
+                self._page_size,
+            ) = s.read(b">IIIII")
         self._min_usage = 2 * self._page_size // 3
         self._dirty = False
-        
+
     @classmethod
-    def open(cls, file_or_name, mode='r+', initial_entries=None):
+    def open(cls, file_or_name, mode="r+", initial_entries=None):
         """Open a ``.DS_Store`` file; pass either a Python file object, or a
-        filename in the ``file_or_name`` argument and a file access mode in
-        the ``mode`` argument.  If you are creating a new file using the "w"
-        or "w+" modes, you may also specify a list of entries with which
-        to initialise the file."""
+        filename in the ``file_or_name`` argument and a file access mode in the
+        ``mode`` argument.
+
+        If you are creating a new file using the "w" or "w+" modes, you
+        may also specify a list of entries with which to initialise the
+        file.
+        """
         store = buddy.Allocator.open(file_or_name, mode)
-        
-        if mode == 'w' or mode == 'w+':
+
+        if mode == "w" or mode == "w+":
             superblk = store.allocate(20)
-            store['DSDB'] = superblk
+            store["DSDB"] = superblk
             page_size = 4096
-            
+
             if not initial_entries:
                 root = store.allocate(page_size)
-                
+
                 with store.get_block(root) as rootblk:
                     rootblk.zero_fill()
 
                 with store.get_block(superblk) as s:
-                    s.write(b'>IIIII', root, 0, 0, 1, page_size)
+                    s.write(b">IIIII", root, 0, 0, 1, page_size)
             else:
                 # Make sure they're in sorted order
                 initial_entries = list(initial_entries)
@@ -357,48 +344,54 @@ class DSStore(object):
 
                     if len(nodes) == 1:
                         break
-                    
+
                     current_level = next_level
                     next_level = []
                     ptr_size = 4
 
                 # Allocate nodes
                 ptrs = [store.allocate(page_size) for n in range(node_count)]
-                
+
                 # Generate nodes
                 pointers = []
                 prev_pointers = None
                 for level in levels:
                     ppndx = 0
-                    lptrs = ptrs[-len(level):]
-                    del ptrs[-len(level):]
+                    lptrs = ptrs[-len(level) :]
+                    del ptrs[-len(level) :]
                     for node in level:
                         ndx = lptrs.pop(0)
                         if prev_pointers is None:
                             with store.get_block(ndx) as block:
-                                block.write(b'>II', 0, len(node))
+                                block.write(b">II", 0, len(node))
                                 for e in node:
                                     e.write(block)
                         else:
                             next_node = prev_pointers[ppndx + len(node)]
-                            node_ptrs = prev_pointers[ppndx:ppndx+len(node)]
-                            
+                            node_ptrs = prev_pointers[ppndx : ppndx + len(node)]
+
                             with store.get_block(ndx) as block:
-                                block.write(b'>II', next_node, len(node))
+                                block.write(b">II", next_node, len(node))
                                 for ptr, e in zip(node_ptrs, node):
-                                    block.write(b'>I', ptr)
+                                    block.write(b">I", ptr)
                                     e.write(block)
-                            
+
                         pointers.append(ndx)
                     prev_pointers = pointers
                     pointers = []
-                
+
                 root = prev_pointers[0]
 
                 with store.get_block(superblk) as s:
-                    s.write(b'>IIIII', root, len(levels), len(initial_entries),
-                            node_count, page_size)
-                    
+                    s.write(
+                        b">IIIII",
+                        root,
+                        len(levels),
+                        len(initial_entries),
+                        node_count,
+                        page_size,
+                    )
+
         return DSStore(store)
 
     def _get_block(self, number):
@@ -410,25 +403,31 @@ class DSStore(object):
             self._dirty = False
 
             with self._get_block(self._superblk) as s:
-                s.write(b'>IIIII', self._rootnode, self._levels, self._records,
-                        self._nodes, self._page_size)
+                s.write(
+                    b">IIIII",
+                    self._rootnode,
+                    self._levels,
+                    self._records,
+                    self._nodes,
+                    self._page_size,
+                )
         self._store.flush()
 
     def close(self):
         """Flush dirty data and close the underlying file."""
         self.flush()
         self._store.close()
-        
+
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
         self.close()
-        
+
     # Internal B-Tree nodes look like this:
     #
     # [ next | count | (ptr0 | rec0) | (ptr1 | rec1) ... (ptrN | recN) ]
-    
+
     # Leaf nodes look like this:
     #
     # [ 0 | count | rec0 | rec1 ... recN ]
@@ -438,10 +437,10 @@ class DSStore(object):
         if node is None:
             node = self._rootnode
         with self._get_block(node) as block:
-            next_node, count = block.read(b'>II')
+            next_node, count = block.read(b">II")
             if next_node:
                 for n in range(count):
-                    ptr = block.read(b'>I')[0]
+                    ptr = block.read(b">I")[0]
                     for e in self._traverse(ptr):
                         yield e
                     e = DSStoreEntry.read(block)
@@ -456,23 +455,30 @@ class DSStore(object):
     # Display the data in `node'
     def _dump_node(self, node):
         with self._get_block(node) as block:
-            next_node, count = block.read(b'>II')
-            print('next: %u\ncount: %u\n' % (next_node, count))
+            next_node, count = block.read(b">II")
+            print("next: %u\ncount: %u\n" % (next_node, count))
             for n in range(count):
                 if next_node:
-                    ptr = block.read(b'>I')[0]
-                    print('%8u ' % ptr, end=' ')
+                    ptr = block.read(b">I")[0]
+                    print("%8u " % ptr, end=" ")
                 else:
-                    print('         ', end=' ')
+                    print("         ", end=" ")
                 e = DSStoreEntry.read(block)
-                print(e, ' (%u)' % e.byte_length())
-            print('used: %u' % block.tell())
+                print(e, " (%u)" % e.byte_length())
+            print("used: %u" % block.tell())
 
     # Display the data in the super block
     def _dump_super(self):
-        print('root: %u\nlevels: %u\nrecords: %u\nnodes: %u\npage-size: %u' \
-          % (self._rootnode, self._levels, self._records,
-             self._nodes, self._page_size))
+        print(
+            "root: %u\nlevels: %u\nrecords: %u\nnodes: %u\npage-size: %u"
+            % (
+                self._rootnode,
+                self._levels,
+                self._records,
+                self._nodes,
+                self._page_size,
+            )
+        )
 
     # Splits entries across two blocks, returning one pivot
     #
@@ -480,9 +486,9 @@ class DSStore(object):
     def _split2(self, blocks, entries, pointers, before, internal):
         left_block = blocks[0]
         right_block = blocks[1]
-        
+
         count = len(entries)
-        
+
         # Find the feasible splits
         best_split = None
         best_diff = None
@@ -492,7 +498,7 @@ class DSStore(object):
             # We can use a *single* node for this
             best_split = count
         else:
-            # Split into two nodes  
+            # Split into two nodes
             for n in range(1, count - 1):
                 left_size = 8 + before[n]
                 right_size = 8 + total - before[n + 1]
@@ -501,7 +507,7 @@ class DSStore(object):
                     break
                 if right_size > self._page_size:
                     continue
-                
+
                 diff = abs(left_size - right_size)
 
                 if best_split is None or diff < best_diff:
@@ -510,54 +516,53 @@ class DSStore(object):
 
         if best_split is None:
             return None
-        
+
         # Write the nodes
         left_block.seek(0)
         if internal:
             next_node = pointers[best_split]
         else:
             next_node = 0
-        left_block.write(b'>II', next_node, best_split)
+        left_block.write(b">II", next_node, best_split)
 
         for n in range(best_split):
             if internal:
-                left_block.write(b'>I', pointers[n])
+                left_block.write(b">I", pointers[n])
             entries[n].write(left_block)
 
         left_block.zero_fill()
 
         if best_split == count:
             return []
-        
+
         right_block.seek(0)
         if internal:
             next_node = pointers[count]
         else:
             next_node = 0
-        right_block.write(b'>II', next_node, count - best_split - 1)
+        right_block.write(b">II", next_node, count - best_split - 1)
 
         for n in range(best_split + 1, count):
             if internal:
-                right_block.write(b'>I', pointers[n])
+                right_block.write(b">I", pointers[n])
             entries[n].write(right_block)
 
         right_block.zero_fill()
-            
+
         pivot = entries[best_split]
 
         return [pivot]
-    
+
     def _split(self, node, entry, right_ptr=0):
         self._nodes += 1
         self._dirty = True
         new_right = self._store.allocate(self._page_size)
-        with self._get_block(node) as block, \
-            self._get_block(new_right) as right_block:
+        with self._get_block(node) as block, self._get_block(new_right) as right_block:
 
             # First, measure and extract all the elements
             entry_size = entry.byte_length()
-            entry_pos = None
-            next_node, count = block.read(b'>II')
+            # ?? entry_pos = None
+            next_node, count = block.read(b">II")
             if next_node:
                 entry_size += 4
             pointers = []
@@ -567,11 +572,11 @@ class DSStore(object):
             for n in range(count):
                 pos = block.tell()
                 if next_node:
-                    ptr = block.read(b'>I')[0]
+                    ptr = block.read(b">I")[0]
                     pointers.append(ptr)
                 e = DSStoreEntry.read(block)
                 if e > entry:
-                    entry_pos = n
+                    # ?? entry_pos = n
                     entries.append(entry)
                     pointers.append(right_ptr)
                     before.append(total)
@@ -583,10 +588,10 @@ class DSStore(object):
             if next_node:
                 pointers.append(next_node)
 
-            pivot = self._split2([block, right_block],
-                                 entries, pointers, before,
-                                 bool(next_node))[0]
-            
+            pivot = self._split2(
+                [block, right_block], entries, pointers, before, bool(next_node)
+            )[0]
+
             self._records += 1
             self._nodes += 1
             self._dirty = True
@@ -598,7 +603,7 @@ class DSStore(object):
     def _new_root(self, left, pivot, right):
         new_root = self._store.allocate(self._page_size)
         with self._get_block(new_root) as block:
-            block.write(b'>III', right, 1, left)
+            block.write(b">III", right, 1, left)
             pivot.write(block)
         self._rootnode = new_root
         self._levels += 1
@@ -610,21 +615,21 @@ class DSStore(object):
     # pointer (inserted to the RIGHT of `entry')
     def _insert_inner(self, path, node, entry, right_ptr):
         with self._get_block(node) as block:
-            next_node, count = block.read(b'>II')
+            next_node, count = block.read(b">II")
             insert_pos = None
             insert_ndx = None
             n = 0
             while n < count:
                 pos = block.tell()
-                ptr = block.read(b'>I')[0]
+                ptr = block.read(b">I")[0]
                 e = DSStoreEntry.read(block)
                 if e == entry:
                     if n == count - 1:
                         right_ptr = next_node
                         next_node = ptr
-                        block_seek(pos)
+                        block.seek(pos)
                     else:
-                        right_ptr = block.read(b'>I')[0]
+                        right_ptr = block.read(b">I")[0]
                         block.seek(pos + 4)
                     insert_pos = pos
                     insert_ndx = n
@@ -651,32 +656,32 @@ class DSStore(object):
             else:
                 if insert_ndx == count:
                     block.seek(insert_pos)
-                    block.write(b'>I', next_node)
+                    block.write(b">I", next_node)
                     entry.write(block)
                     next_node = right_ptr
                 else:
                     block.seek(insert_pos + 4)
                     entry.write(block, True)
-                    block.insert('>I', right_ptr)
+                    block.insert(">I", right_ptr)
                 block.seek(0)
                 count += 1
-                block.write(b'>II', next_node, count)
+                block.write(b">II", next_node, count)
                 self._records += 1
                 self._dirty = True
 
     # Insert `entry' into the leaf node `node'
     def _insert_leaf(self, path, node, entry):
         with self._get_block(node) as block:
-            next_node, count = block.read(b'>II')
+            next_node, count = block.read(b">II")
             insert_pos = None
-            insert_ndx = None
+            # ?? insert_ndx = None
             n = 0
             while n < count:
                 pos = block.tell()
                 e = DSStoreEntry.read(block)
                 if e == entry:
                     insert_pos = pos
-                    insert_ndx = n
+                    # ?? insert_ndx = n
                     block.seek(pos)
                     block.delete(e.byte_length())
                     count -= 1
@@ -685,11 +690,11 @@ class DSStore(object):
                     continue
                 elif insert_pos is None and e > entry:
                     insert_pos = pos
-                    insert_ndx = n
+                    # ?? insert_ndx = n
                 n += 1
             if insert_pos is None:
                 insert_pos = block.tell()
-                insert_ndx = count
+                # ?? insert_ndx = count
             remaining = self._page_size - block.tell()
 
             if remaining < entry.byte_length():
@@ -703,21 +708,21 @@ class DSStore(object):
                 entry.write(block, True)
                 block.seek(0)
                 count += 1
-                block.write(b'>II', next_node, count)
+                block.write(b">II", next_node, count)
                 self._records += 1
                 self._dirty = True
 
     def insert(self, entry):
-        """Insert ``entry`` (which should be a :class:`DSStoreEntry`)
-        into the B-Tree."""
+        """Insert ``entry`` (which should be a :class:`DSStoreEntry`) into the
+        B-Tree."""
         path = []
         node = self._rootnode
         while True:
             with self._get_block(node) as block:
-                next_node, count = block.read(b'>II')
+                next_node, count = block.read(b">II")
                 if next_node:
                     for n in range(count):
-                        ptr = block.read(b'>I')[0]
+                        ptr = block.read(b">I")[0]
                         e = DSStoreEntry.read(block)
                         if entry < e:
                             next_node = ptr
@@ -735,12 +740,12 @@ class DSStore(object):
     # Return usage information for the specified `node'
     def _block_usage(self, node):
         with self._get_block(node) as block:
-            next_node, count = block.read(b'>II')
+            next_node, count = block.read(b">II")
 
             for n in range(count):
                 if next_node:
-                    ptr = block.read(b'>I')[0]
-                e = DSStoreEntry.read(block)
+                    block.read(b">I")[0]
+                DSStoreEntry.read(block)
 
             used = block.tell()
 
@@ -773,14 +778,14 @@ class DSStore(object):
                     continue
 
                 diff = abs(left_size - mid_size) * abs(right_size - mid_size)
-                
+
                 if best_split is None or diff < best_diff:
                     best_split = (n, m, count)
                     best_diff = diff
 
         if best_split is None:
             return None
-        
+
         # Write the nodes
         prev_split = -1
         for block, split in zip(blocks, best_split):
@@ -789,15 +794,15 @@ class DSStore(object):
                 next_node = pointers[split]
             else:
                 next_node = 0
-            block.write(b'>II', next_node, split)
+            block.write(b">II", next_node, split)
 
             for n in range(prev_split + 1, split):
                 if internal:
-                    block.write(b'>I', pointers[n])
+                    block.write(b">I", pointers[n])
                 entries[n].write(block)
 
             block.zero_fill()
-            
+
             prev_split = split
 
         return (entries[best_split[0]], entries[best_split[1]])
@@ -811,13 +816,13 @@ class DSStore(object):
         before = []
         total = 0
         ppivots = pivots + [None]
-        for b,p in zip(blocks, ppivots):
+        for b, p in zip(blocks, ppivots):
             b.seek(0)
-            next_node, count = b.read(b'>II')
+            next_node, count = b.read(b">II")
             for n in range(count):
                 pos = b.tell()
                 if next_node:
-                    ptr = b.read(b'>I')[0]
+                    ptr = b.read(b">I")[0]
                     pointers.append(ptr)
                 e = DSStoreEntry.read(b)
                 entries.append(e)
@@ -842,11 +847,11 @@ class DSStore(object):
             return
 
         with self._get_block(node) as block:
-            next_node, count = block.read(b'>II')
-            
+            next_node, count = block.read(b">II")
+
             with self._get_block(path[-1]) as parent:
                 # Find the left and right siblings and respective pivots
-                parent_next, parent_count = parent.read(b'>II')
+                parent_next, parent_count = parent.read(b">II")
                 left_pos = None
                 left_node = None
                 left_pivot = None
@@ -857,7 +862,7 @@ class DSStore(object):
                 prev_e = prev_ptr = prev_pos = None
                 for n in range(parent_count):
                     pos = parent.tell()
-                    ptr = parent.read(b'>I')[0]
+                    ptr = parent.read(b">I")[0]
                     e = DSStoreEntry.read(parent)
 
                     if ptr == node:
@@ -870,7 +875,7 @@ class DSStore(object):
                         right_node = ptr
                         right_pos = pos
                         break
-                
+
                     prev_e = e
                     prev_ptr = ptr
                     prev_pos = pos
@@ -884,24 +889,27 @@ class DSStore(object):
                     right_node = parent_next
                     right_pos = parent.tell()
 
-                parent_used = parent.tell()
-            
+                _ = parent.tell()
+
             if left_node and right_node:
-                with self._get_block(left_node) as left, \
-                    self._get_block(right_node) as right:
+                with self._get_block(left_node) as left, self._get_block(
+                    right_node
+                ) as right:
                     blocks = [left, block, right]
                     pivots = [left_pivot, right_pivot]
-                    
+
                     entries, pointers, before = self._extract(blocks, pivots)
 
                     # If there's a chance that we could use two pages instead
                     # of three, go for it
-                    pivots = self._split2(blocks, entries, pointers,
-                                           before, bool(next_node))
+                    pivots = self._split2(
+                        blocks, entries, pointers, before, bool(next_node)
+                    )
                     if pivots is None:
                         ptrs = [left_node, node, right_node]
-                        pivots = self._split3(blocks, entries, pointers,
-                                               before, bool(next_node))
+                        pivots = self._split3(
+                            blocks, entries, pointers, before, bool(next_node)
+                        )
                     else:
                         if pivots:
                             ptrs = [left_node, node]
@@ -913,7 +921,7 @@ class DSStore(object):
                         self._store.release(right_node)
                         self._nodes -= 1
                         self._dirty = True
-                        
+
                     # Remove the pivots from the parent
                     with self._get_block(path[-1]) as parent:
                         if right_node == parent_next:
@@ -925,11 +933,11 @@ class DSStore(object):
                             parent.delete(right_pos - left_pos)
                         parent.seek(0)
                         parent_count -= 2
-                        parent.write(b'>II', parent_next, parent_count)
+                        parent.write(b">II", parent_next, parent_count)
                         self._records -= 2
-                        
+
                     # Replace with those in pivots
-                    for e,rp in zip(pivots, ptrs[1:]):
+                    for e, rp in zip(pivots, ptrs[1:]):
                         self._insert_inner(path[:-1], path[-1], e, rp)
             elif left_node:
                 with self._get_block(left_node) as left:
@@ -938,8 +946,9 @@ class DSStore(object):
 
                     entries, pointers, before = self._extract(blocks, pivots)
 
-                    pivots = self._split2(blocks, entries, pointers,
-                                           before, bool(next_node))
+                    pivots = self._split2(
+                        blocks, entries, pointers, before, bool(next_node)
+                    )
 
                     # Remove the pivot from the parent
                     with self._get_block(path[-1]) as parent:
@@ -952,7 +961,7 @@ class DSStore(object):
                             parent.delete(node_pos - left_pos)
                         parent.seek(0)
                         parent_count -= 1
-                        parent.write(b'>II', parent_next, parent_count)
+                        parent.write(b">II", parent_next, parent_count)
                         self._records -= 1
 
                     # Replace the pivot
@@ -965,8 +974,9 @@ class DSStore(object):
 
                     entries, pointers, before = self._extract(blocks, pivots)
 
-                    pivots = self._split2(blocks, entries, pointers,
-                                           before, bool(next_node))
+                    pivots = self._split2(
+                        blocks, entries, pointers, before, bool(next_node)
+                    )
 
                     # Remove the pivot from the parent
                     with self._get_block(path[-1]) as parent:
@@ -979,13 +989,12 @@ class DSStore(object):
                             parent.delete(right_pos - node_pos)
                         parent.seek(0)
                         parent_count -= 1
-                        parent.write(b'>II', parent_next, parent_count)
+                        parent.write(b">II", parent_next, parent_count)
                         self._records -= 1
 
                     # Replace the pivot
                     if pivots:
-                        self._insert_inner(path[:-1], path[-1], pivots[0],
-                                           right_node)
+                        self._insert_inner(path[:-1], path[-1], pivots[0], right_node)
 
         if not path and not parent_count:
             self._store.release(path[-1])
@@ -994,7 +1003,7 @@ class DSStore(object):
             self._rootnode = node
         else:
             count, used = self._block_usage(path[-1])
-    
+
             if used < self._page_size // 2:
                 self._rebalance(path[:-1], path[-1])
 
@@ -1002,31 +1011,32 @@ class DSStore(object):
     # lower-cased.
     def _delete_leaf(self, node, filename_lc, code):
         found = False
-        
+
         with self._get_block(node) as block:
-            next_node, count = block.read(b'>II')
+            next_node, count = block.read(b">II")
 
             for n in range(count):
                 pos = block.tell()
                 e = DSStoreEntry.read(block)
-                if e.filename.lower() == filename_lc \
-                  and (code is None or e.code == code):
+                if e.filename.lower() == filename_lc and (
+                    code is None or e.code == code
+                ):
                     block.seek(pos)
                     block.delete(e.byte_length())
                     found = True
-                    
+
                     # This does not affect the loop; THIS IS NOT A BUG
                     count -= 1
 
                     self._records -= 1
                     self._dirty = True
-                    
+
             if found:
                 used = block.tell()
-                
+
                 block.seek(0)
-                block.write(b'>II', next_node, count)
-            
+                block.write(b">II", next_node, count)
+
                 return used < self._page_size // 2
             else:
                 return False
@@ -1040,7 +1050,7 @@ class DSStore(object):
         rebalance = None
         while True:
             with self._get_block(node) as block:
-                next_node, count = block.read(b'>II')
+                next_node, count = block.read(b">II")
 
                 if next_node:
                     path.append(node)
@@ -1053,7 +1063,7 @@ class DSStore(object):
 
                 count -= 1
                 block.seek(0)
-                block.write(b'>II', next_node, count)
+                block.write(b">II", next_node, count)
 
                 if pos < self._page_size // 2:
                     rebalance = (path, node)
@@ -1064,16 +1074,17 @@ class DSStore(object):
     # Delete an entry from an inner node, `node'
     def _delete_inner(self, path, node, filename_lc, code):
         rebalance = False
-        
+
         with self._get_block(node) as block:
-            next_node, count = block.read(b'>II')
+            next_node, count = block.read(b">II")
 
             for n in range(count):
                 pos = block.tell()
-                ptr = block.read(b'>I')[0]
+                ptr = block.read(b">I")[0]
                 e = DSStoreEntry.read(block)
-                if e.filename.lower() == filename_lc \
-                  and (code is None or e.code == code):
+                if e.filename.lower() == filename_lc and (
+                    code is None or e.code == code
+                ):
                     # Take the largest from the left subtree
                     rebalance, largest = self._take_largest(path, ptr)
 
@@ -1083,20 +1094,20 @@ class DSStore(object):
                         next_node = ptr
                         block.seek(pos)
                     else:
-                        right_ptr = block.read(b'>I')[0]
+                        right_ptr = block.read(b">I")[0]
                         block.seek(pos + 4)
-                        
+
                     block.delete(e.byte_length() + 4)
 
                     count -= 1
                     block.seek(0)
-                    block.write(b'>II', next_node, count)
+                    block.write(b">II", next_node, count)
 
                     self._records -= 1
                     self._dirty = True
-                    
+
                     break
-                    
+
         # Replace the pivot value
         self._insert_inner(path, node, largest, right_ptr)
 
@@ -1107,16 +1118,16 @@ class DSStore(object):
         return False
 
     def delete(self, filename, code):
-        """Delete an item, identified by ``filename`` and ``code``
-        from the B-Tree."""
+        """Delete an item, identified by ``filename`` and ``code`` from the
+        B-Tree."""
         if isinstance(filename, DSStoreEntry):
             code = filename.code
             filename = filename.filename
 
         # If we're deleting *every* node for "filename", we must recurse
         if code is None:
-            ###TODO: Fix this so we can do bulk deletes
-            raise ValueError('You must delete items individually.  Sorry')
+            # TODO: Fix this so we can do bulk deletes
+            raise ValueError("You must delete items individually.  Sorry")
 
         # Otherwise, we're deleting *one* specific node
         filename_lc = filename.lower()
@@ -1124,14 +1135,15 @@ class DSStore(object):
         node = self._rootnode
         while True:
             with self._get_block(node) as block:
-                next_node, count = block.read(b'>II')
+                next_node, count = block.read(b">II")
                 if next_node:
                     for n in range(count):
-                        ptr = block.read(b'>I')[0]
+                        ptr = block.read(b">I")[0]
                         e = DSStoreEntry.read(block)
                         e_lc = e.filename.lower()
-                        if filename_lc < e_lc \
-                            or (filename_lc == e_lc and code < e.code):
+                        if filename_lc < e_lc or (
+                            filename_lc == e_lc and code < e.code
+                        ):
                             next_node = ptr
                             break
                         elif filename_lc == e_lc and code == e.code:
@@ -1146,13 +1158,13 @@ class DSStore(object):
 
     # Find implementation
     def _find(self, node, filename_lc, code=None):
-        if not isinstance(code, bytes):
-            code = code.encode('latin_1')
+        if code is not None and not isinstance(code, bytes):
+            code = code.encode("latin_1")
         with self._get_block(node) as block:
-            next_node, count = block.read(b'>II')
+            next_node, count = block.read(b">II")
             if next_node:
                 for n in range(count):
-                    ptr = block.read(b'>I')[0]
+                    ptr = block.read(b">I")[0]
                     e = DSStoreEntry.read(block)
                     if filename_lc < e.filename.lower():
                         for e in self._find(ptr, filename_lc, code):
@@ -1176,16 +1188,16 @@ class DSStore(object):
                             yield e
                         elif code < e.code:
                             return
-                        
+
     def find(self, filename, code=None):
-        """Returns a generator that will iterate over matching entries in
-        the B-Tree."""
+        """Returns a generator that will iterate over matching entries in the
+        B-Tree."""
         if isinstance(filename, DSStoreEntry):
             code = filename.code
             filename = filename.filename
 
         filename_lc = filename.lower()
-        
+
         return self._find(self._rootnode, filename_lc, code)
 
     def __len__(self):
@@ -1194,36 +1206,36 @@ class DSStore(object):
     def __iter__(self):
         return self._traverse(self._rootnode)
 
-    class Partial(object):
+    class Partial:
         """This is used to implement indexing."""
+
         def __init__(self, store, filename):
             self._store = store
             self._filename = filename
 
         def __getitem__(self, code):
             if code is None:
-                raise KeyError('no such key - [%s][None]' % self._filename)
+                raise KeyError("no such key - [%s][None]" % self._filename)
 
             if not isinstance(code, bytes):
-                code = code.encode('latin_1')
+                code = code.encode("latin_1")
 
             try:
                 item = next(self._store.find(self._filename, code))
             except StopIteration:
-                raise KeyError('no such key - [%s][%s]' % (self._filename,
-                               code))
+                raise KeyError(f"no such key - [{self._filename}][{code}]")
 
-            if not isinstance(item.type, (bytes, str, unicode)):
+            if not isinstance(item.type, (bytes, str)):
                 return item.value
-            
+
             return (item.type, item.value)
-            
+
         def __setitem__(self, code, value):
             if code is None:
-                raise KeyError('bad key - [%s][None]' % self._filename)
+                raise KeyError("bad key - [%s][None]" % self._filename)
 
             if not isinstance(code, bytes):
-                code = code.encode('latin_1')
+                code = code.encode("latin_1")
 
             codec = codecs.get(code, None)
             if codec:
@@ -1232,20 +1244,19 @@ class DSStore(object):
             else:
                 entry_type = value[0]
                 entry_value = value[1]
-            
-            self._store.insert(DSStoreEntry(self._filename, code,
-                                             entry_type, entry_value))
+
+            self._store.insert(
+                DSStoreEntry(self._filename, code, entry_type, entry_value)
+            )
 
         def __delitem__(self, code):
             if code is None:
-                raise KeyError('no such key - [%s][None]' % self._filename)
+                raise KeyError("no such key - [%s][None]" % self._filename)
 
             self._store.delete(self._filename, code)
 
         def __iter__(self):
-            for item in self._store.find(self._filename):
-                yield item
+            yield from self._store.find(self._filename)
 
     def __getitem__(self, filename):
         return self.Partial(self, filename)
-    
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/LICENSE b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/LICENSE
index e91f4eb38..e91f4eb38 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/LICENSE
+++ b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/LICENSE
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/__init__.py b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/__init__.py
new file mode 100644
index 000000000..0f925e7d1
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/__init__.py
@@ -0,0 +1,47 @@
+# flake8: noqa
+from .alias import *
+from .bookmark import *
+
+__version__ = "2.2.2"
+
+__all__ = [
+    "__version__",
+    "ALIAS_KIND_FILE",
+    "ALIAS_KIND_FOLDER",
+    "ALIAS_HFS_VOLUME_SIGNATURE",
+    "ALIAS_FIXED_DISK",
+    "ALIAS_NETWORK_DISK",
+    "ALIAS_400KB_FLOPPY_DISK",
+    "ALIAS_800KB_FLOPPY_DISK",
+    "ALIAS_1_44MB_FLOPPY_DISK",
+    "ALIAS_EJECTABLE_DISK",
+    "ALIAS_NO_CNID",
+    "kBookmarkPath",
+    "kBookmarkCNIDPath",
+    "kBookmarkFileProperties",
+    "kBookmarkFileName",
+    "kBookmarkFileID",
+    "kBookmarkFileCreationDate",
+    "kBookmarkTOCPath",
+    "kBookmarkVolumePath",
+    "kBookmarkVolumeURL",
+    "kBookmarkVolumeName",
+    "kBookmarkVolumeUUID",
+    "kBookmarkVolumeSize",
+    "kBookmarkVolumeCreationDate",
+    "kBookmarkVolumeProperties",
+    "kBookmarkContainingFolder",
+    "kBookmarkUserName",
+    "kBookmarkUID",
+    "kBookmarkWasFileReference",
+    "kBookmarkCreationOptions",
+    "kBookmarkURLLengths",
+    "kBookmarkSecurityExtension",
+    "AppleShareInfo",
+    "VolumeInfo",
+    "TargetInfo",
+    "Alias",
+    "Bookmark",
+    "Data",
+    "URL",
+]
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/alias.py b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/alias.py
index f74b949ea..bf34fb01b 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/alias.py
+++ b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/alias.py
@@ -1,30 +1,29 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from __future__ import division
-
-import struct
 import datetime
 import io
-import re
 import os
 import os.path
-import stat
+import struct
 import sys
+from unicodedata import normalize
 
-if sys.platform == 'darwin':
+if sys.platform == "darwin":
     from . import osx
 
-try:
-    long
-except NameError:
-    long = int
+from .utils import mac_epoch
 
-from .utils import *
-    
 ALIAS_KIND_FILE = 0
 ALIAS_KIND_FOLDER = 1
 
-ALIAS_HFS_VOLUME_SIGNATURE = b'H+'
+ALIAS_HFS_VOLUME_SIGNATURE = b"H+"
+
+ALIAS_FILESYSTEM_UDF = "UDF (CD/DVD)"
+ALIAS_FILESYSTEM_FAT32 = "FAT32"
+ALIAS_FILESYSTEM_EXFAT = "exFAT"
+ALIAS_FILESYSTEM_HFSX = "HFSX"
+ALIAS_FILESYSTEM_HFSPLUS = "HFS+"
+ALIAS_FILESYSTEM_FTP = "FTP"
+ALIAS_FILESYSTEM_NTFS = "NTFS"
+ALIAS_FILESYSTEM_UNKNOWN = "unknown"
 
 ALIAS_FIXED_DISK = 0
 ALIAS_NETWORK_DISK = 1
@@ -33,19 +32,36 @@ ALIAS_800KB_FLOPPY_DISK = 3
 ALIAS_1_44MB_FLOPPY_DISK = 4
 ALIAS_EJECTABLE_DISK = 5
 
-ALIAS_NO_CNID = 0xffffffff
+ALIAS_NO_CNID = 0xFFFFFFFF
+
+ALIAS_FSTYPE_MAP = {
+    # Version 2 aliases
+    b"HX": ALIAS_FILESYSTEM_HFSX,
+    b"H+": ALIAS_FILESYSTEM_HFSPLUS,
+    # Version 3 aliases
+    b"BDcu": ALIAS_FILESYSTEM_UDF,
+    b"BDIS": ALIAS_FILESYSTEM_FAT32,
+    b"BDxF": ALIAS_FILESYSTEM_EXFAT,
+    b"HX\0\0": ALIAS_FILESYSTEM_HFSX,
+    b"H+\0\0": ALIAS_FILESYSTEM_HFSPLUS,
+    b"KG\0\0": ALIAS_FILESYSTEM_FTP,
+    b"NTcu": ALIAS_FILESYSTEM_NTFS,
+}
+
 
 def encode_utf8(s):
     if isinstance(s, bytes):
         return s
-    return s.encode('utf-8')
+    return s.encode("utf-8")
+
 
 def decode_utf8(s):
     if isinstance(s, bytes):
-        return s.decode('utf-8')
+        return s.decode("utf-8")
     return s
 
-class AppleShareInfo (object):
+
+class AppleShareInfo:
     def __init__(self, zone=None, server=None, user=None):
         #: The AppleShare zone
         self.zone = zone
@@ -55,22 +71,38 @@ class AppleShareInfo (object):
         self.user = user
 
     def __repr__(self):
-        return 'AppleShareInfo(%r,%r,%r)' % (self.zone, self.server, self.user)
-    
-class VolumeInfo (object):
-    def __init__(self, name, creation_date, fs_type, disk_type,
-                 attribute_flags, fs_id, appleshare_info=None,
-                 driver_name=None, posix_path=None, disk_image_alias=None,
-                 dialup_info=None, network_mount_info=None):
+        return "AppleShareInfo({!r},{!r},{!r})".format(
+            self.zone, self.server, self.user
+        )
+
+
+class VolumeInfo:
+    def __init__(
+        self,
+        name,
+        creation_date,
+        fs_type,
+        disk_type,
+        attribute_flags,
+        fs_id,
+        appleshare_info=None,
+        driver_name=None,
+        posix_path=None,
+        disk_image_alias=None,
+        dialup_info=None,
+        network_mount_info=None,
+    ):
         #: The name of the volume on which the target resides
         self.name = name
-        
+
         #: The creation date of the target's volume
         self.creation_date = creation_date
-        
-        #: The filesystem type (a two character code, e.g. ``b'H+'`` for HFS+)
+
+        #: The filesystem type
+        #: (for v2 aliases, this is a 2-character code; for v3 aliases, a
+        #: 4-character code).
         self.fs_type = fs_type
-        
+
         #: The type of disk; should be one of
         #:
         #:   * ALIAS_FIXED_DISK
@@ -109,30 +141,60 @@ class VolumeInfo (object):
         #: Network mount information (for automatic remounting)
         self.network_mount_info = network_mount_info
 
+    @property
+    def filesystem_type(self):
+        return ALIAS_FSTYPE_MAP.get(self.fs_type, ALIAS_FILESYSTEM_UNKNOWN)
+
     def __repr__(self):
-        args = ['name', 'creation_date', 'fs_type', 'disk_type',
-                'attribute_flags', 'fs_id']
+        args = [
+            "name",
+            "creation_date",
+            "fs_type",
+            "disk_type",
+            "attribute_flags",
+            "fs_id",
+        ]
         values = []
         for a in args:
             v = getattr(self, a)
             values.append(repr(v))
-            
-        kwargs = ['appleshare_info', 'driver_name', 'posix_path',
-                  'disk_image_alias', 'dialup_info', 'network_mount_info']
+
+        kwargs = [
+            "appleshare_info",
+            "driver_name",
+            "posix_path",
+            "disk_image_alias",
+            "dialup_info",
+            "network_mount_info",
+        ]
         for a in kwargs:
             v = getattr(self, a)
             if v is not None:
-                values.append('%s=%r' % (a, v))
-        return 'VolumeInfo(%s)' % ','.join(values)
-    
-class TargetInfo (object):
-    def __init__(self, kind, filename, folder_cnid, cnid, creation_date,
-                 creator_code, type_code, levels_from=-1, levels_to=-1,
-                 folder_name=None, cnid_path=None, carbon_path=None,
-                 posix_path=None, user_home_prefix_len=None):
+                values.append(f"{a}={v!r}")
+        return "VolumeInfo(%s)" % ",".join(values)
+
+
+class TargetInfo:
+    def __init__(
+        self,
+        kind,
+        filename,
+        folder_cnid,
+        cnid,
+        creation_date,
+        creator_code,
+        type_code,
+        levels_from=-1,
+        levels_to=-1,
+        folder_name=None,
+        cnid_path=None,
+        carbon_path=None,
+        posix_path=None,
+        user_home_prefix_len=None,
+    ):
         #: Either ALIAS_KIND_FILE or ALIAS_KIND_FOLDER
         self.kind = kind
-        
+
         #: The filename of the target
         self.filename = filename
 
@@ -178,26 +240,39 @@ class TargetInfo (object):
         self.user_home_prefix_len = user_home_prefix_len
 
     def __repr__(self):
-        args = ['kind', 'filename', 'folder_cnid', 'cnid', 'creation_date',
-                'creator_code', 'type_code']
+        args = [
+            "kind",
+            "filename",
+            "folder_cnid",
+            "cnid",
+            "creation_date",
+            "creator_code",
+            "type_code",
+        ]
         values = []
         for a in args:
             v = getattr(self, a)
             values.append(repr(v))
 
         if self.levels_from != -1:
-            values.append('levels_from=%r' % self.levels_from)
+            values.append("levels_from=%r" % self.levels_from)
         if self.levels_to != -1:
-            values.append('levels_to=%r' % self.levels_to)
-
-        kwargs = ['folder_name', 'cnid_path', 'carbon_path',
-                  'posix_path', 'user_home_prefix_len']
+            values.append("levels_to=%r" % self.levels_to)
+
+        kwargs = [
+            "folder_name",
+            "cnid_path",
+            "carbon_path",
+            "posix_path",
+            "user_home_prefix_len",
+        ]
         for a in kwargs:
             v = getattr(self, a)
-            values.append('%s=%r' % (a, v))
+            values.append(f"{a}={v!r}")
+
+        return "TargetInfo(%s)" % ",".join(values)
+
 
-        return 'TargetInfo(%s)' % ','.join(values)
-    
 TAG_CARBON_FOLDER_NAME = 0
 TAG_CNID_PATH = 1
 TAG_CARBON_PATH = 2
@@ -216,21 +291,28 @@ TAG_POSIX_PATH_TO_MOUNTPOINT = 19
 TAG_RECURSIVE_ALIAS_OF_DISK_IMAGE = 20
 TAG_USER_HOME_LENGTH_PREFIX = 21
 
-class Alias (object):
-    def __init__(self, appinfo=b'\0\0\0\0', version=2, volume=None,
-                       target=None, extra=[]):
+
+class Alias:
+    def __init__(
+        self,
+        appinfo=b"\0\0\0\0",
+        version=2,
+        volume=None,
+        target=None,
+        extra=[],
+    ):
         """Construct a new :class:`Alias` object with the specified
         contents."""
 
         #: Application specific information (four byte byte-string)
         self.appinfo = appinfo
 
-        #: Version (we support only version 2)
+        #: Version (we support versions 2 and 3)
         self.version = version
 
         #: A :class:`VolumeInfo` object describing the target's volume
         self.volume = volume
-        
+
         #: A :class:`TargetInfo` object describing the target
         self.target = target
 
@@ -239,47 +321,91 @@ class Alias (object):
 
     @classmethod
     def _from_fd(cls, b):
-        appinfo, recsize, version = struct.unpack(b'>4shh', b.read(8))
+        appinfo, recsize, version = struct.unpack(b">4shh", b.read(8))
 
         if recsize < 150:
-            raise ValueError('Incorrect alias length')
-                        
-        if version != 2:
-            raise ValueError('Unsupported alias version %u' % version)
-
-        kind, volname, voldate, fstype, disktype, \
-        folder_cnid, filename, cnid, crdate, creator_code, type_code, \
-        levels_from, levels_to, volattrs, volfsid, reserved = \
-              struct.unpack(b'>h28pI2shI64pII4s4shhI2s10s', b.read(142))
+            raise ValueError("Incorrect alias length")
+
+        if version not in (2, 3):
+            raise ValueError("Unsupported alias version %u" % version)
+
+        if version == 2:
+            (
+                kind,  # h
+                volname,  # 28p
+                voldate,  # I
+                fstype,  # 2s
+                disktype,  # h
+                folder_cnid,  # I
+                filename,  # 64p
+                cnid,  # I
+                crdate,  # I
+                creator_code,  # 4s
+                type_code,  # 4s
+                levels_from,  # h
+                levels_to,  # h
+                volattrs,  # I
+                volfsid,  # 2s
+                reserved,  # 10s
+            ) = struct.unpack(b">h28pI2shI64pII4s4shhI2s10s", b.read(142))
+        else:
+            (
+                kind,  # h
+                voldate_hr,  # Q
+                fstype,  # 4s
+                disktype,  # h
+                folder_cnid,  # I
+                cnid,  # I
+                crdate_hr,  # Q
+                volattrs,  # I
+                reserved,  # 14s
+            ) = struct.unpack(b">hQ4shIIQI14s", b.read(46))
+
+            volname = b""
+            filename = b""
+            creator_code = None
+            type_code = None
+            voldate = voldate_hr / 65536.0
+            crdate = crdate_hr / 65536.0
 
         voldate = mac_epoch + datetime.timedelta(seconds=voldate)
         crdate = mac_epoch + datetime.timedelta(seconds=crdate)
 
         alias = Alias()
         alias.appinfo = appinfo
-            
-        alias.volume = VolumeInfo (volname.decode().replace('/',':'),
-                                   voldate, fstype, disktype,
-                                   volattrs, volfsid)
-        alias.target = TargetInfo (kind, filename.decode().replace('/',':'),
-                                   folder_cnid, cnid,
-                                   crdate, creator_code, type_code)
+
+        alias.volume = VolumeInfo(
+            volname.decode().replace("/", ":"),
+            voldate,
+            fstype,
+            disktype,
+            volattrs,
+            volfsid,
+        )
+        alias.target = TargetInfo(
+            kind,
+            filename.decode().replace("/", ":"),
+            folder_cnid,
+            cnid,
+            crdate,
+            creator_code,
+            type_code,
+        )
         alias.target.levels_from = levels_from
         alias.target.levels_to = levels_to
-        
-        tag = struct.unpack(b'>h', b.read(2))[0]
+
+        tag = struct.unpack(b">h", b.read(2))[0]
 
         while tag != -1:
-            length = struct.unpack(b'>h', b.read(2))[0]
+            length = struct.unpack(b">h", b.read(2))[0]
             value = b.read(length)
             if length & 1:
                 b.read(1)
 
             if tag == TAG_CARBON_FOLDER_NAME:
-                alias.target.folder_name = value.decode().replace('/',':')
+                alias.target.folder_name = value.decode().replace("/", ":")
             elif tag == TAG_CNID_PATH:
-                alias.target.cnid_path = struct.unpack('>%uI' % (length // 4),
-                                                           value)
+                alias.target.cnid_path = struct.unpack(">%uI" % (length // 4), value)
             elif tag == TAG_CARBON_PATH:
                 alias.target.carbon_path = value
             elif tag == TAG_APPLESHARE_ZONE:
@@ -301,17 +427,19 @@ class Alias (object):
             elif tag == TAG_DIALUP_INFO:
                 alias.volume.dialup_info = value
             elif tag == TAG_UNICODE_FILENAME:
-                alias.target.filename = value[2:].decode('utf-16be')
+                alias.target.filename = value[2:].decode("utf-16be")
             elif tag == TAG_UNICODE_VOLUME_NAME:
-                alias.volume.name = value[2:].decode('utf-16be')
+                alias.volume.name = value[2:].decode("utf-16be")
             elif tag == TAG_HIGH_RES_VOLUME_CREATION_DATE:
-                seconds = struct.unpack(b'>Q', value)[0] / 65536.0
-                alias.volume.creation_date \
-                    = mac_epoch + datetime.timedelta(seconds=seconds)
+                seconds = struct.unpack(b">Q", value)[0] / 65536.0
+                alias.volume.creation_date = mac_epoch + datetime.timedelta(
+                    seconds=seconds
+                )
             elif tag == TAG_HIGH_RES_CREATION_DATE:
-                seconds = struct.unpack(b'>Q', value)[0] / 65536.0
-                alias.target.creation_date \
-                    = mac_epoch + datetime.timedelta(seconds=seconds)
+                seconds = struct.unpack(b">Q", value)[0] / 65536.0
+                alias.target.creation_date = mac_epoch + datetime.timedelta(
+                    seconds=seconds
+                )
             elif tag == TAG_POSIX_PATH:
                 alias.target.posix_path = value.decode()
             elif tag == TAG_POSIX_PATH_TO_MOUNTPOINT:
@@ -319,14 +447,14 @@ class Alias (object):
             elif tag == TAG_RECURSIVE_ALIAS_OF_DISK_IMAGE:
                 alias.volume.disk_image_alias = Alias.from_bytes(value)
             elif tag == TAG_USER_HOME_LENGTH_PREFIX:
-                alias.target.user_home_prefix_len = struct.unpack(b'>h', value)[0]
+                alias.target.user_home_prefix_len = struct.unpack(b">h", value)[0]
             else:
                 alias.extra.append((tag, value))
 
-            tag = struct.unpack(b'>h', b.read(2))[0]
-            
+            tag = struct.unpack(b">h", b.read(2))[0]
+
         return alias
-         
+
     @classmethod
     def from_bytes(cls, bytes):
         """Construct an :class:`Alias` object given binary Alias data."""
@@ -336,32 +464,40 @@ class Alias (object):
     @classmethod
     def for_file(cls, path):
         """Create an :class:`Alias` that points at the specified file."""
-        if sys.platform != 'darwin':
-            raise Exception('Not implemented (requires special support)')
+        if sys.platform != "darwin":
+            raise Exception("Not implemented (requires special support)")
 
         path = encode_utf8(path)
-        
+
         a = Alias()
 
         # Find the filesystem
         st = osx.statfs(path)
         vol_path = st.f_mntonname
-        
+
+        # File and folder names in HFS+ are normalized to a form similar to NFD.
+        # Must be normalized (NFD->NFC) before use to avoid unicode string comparison issues.
+        vol_path = normalize("NFC", vol_path.decode("utf-8")).encode("utf-8")
+
         # Grab its attributes
-        attrs = [osx.ATTR_CMN_CRTIME,
-                 osx.ATTR_VOL_NAME,
-                 0, 0, 0]
+        attrs = [osx.ATTR_CMN_CRTIME, osx.ATTR_VOL_NAME, 0, 0, 0]
         volinfo = osx.getattrlist(vol_path, attrs, 0)
 
         vol_crtime = volinfo[0]
         vol_name = encode_utf8(volinfo[1])
-        
+
         # Also grab various attributes of the file
-        attrs = [(osx.ATTR_CMN_OBJTYPE
-                  | osx.ATTR_CMN_CRTIME
-                  | osx.ATTR_CMN_FNDRINFO
-                  | osx.ATTR_CMN_FILEID
-                  | osx.ATTR_CMN_PARENTID), 0, 0, 0, 0]
+        attrs = [
+            osx.ATTR_CMN_OBJTYPE
+            | osx.ATTR_CMN_CRTIME
+            | osx.ATTR_CMN_FNDRINFO
+            | osx.ATTR_CMN_FILEID
+            | osx.ATTR_CMN_PARENTID,
+            0,
+            0,
+            0,
+            0,
+        ]
         info = osx.getattrlist(path, attrs, osx.FSOPT_NOFOLLOW)
 
         if info[0] == osx.VDIR:
@@ -371,27 +507,27 @@ class Alias (object):
 
         cnid = info[3]
         folder_cnid = info[4]
-        
+
         dirname, filename = os.path.split(path)
 
-        if dirname == b'' or dirname == b'.':
+        if dirname == b"" or dirname == b".":
             dirname = os.getcwd()
 
         foldername = os.path.basename(dirname)
-        
+
         creation_date = info[1]
 
         if kind == ALIAS_KIND_FILE:
-            creator_code = struct.pack(b'I', info[2].fileInfo.fileCreator)
-            type_code = struct.pack(b'I', info[2].fileInfo.fileType)
+            creator_code = struct.pack(b"I", info[2].fileInfo.fileCreator)
+            type_code = struct.pack(b"I", info[2].fileInfo.fileType)
         else:
-            creator_code = b'\0\0\0\0'
-            type_code = b'\0\0\0\0'
+            creator_code = b"\0\0\0\0"
+            type_code = b"\0\0\0\0"
 
-        a.target = TargetInfo(kind, filename, folder_cnid, cnid, creation_date,
-                              creator_code, type_code)
-        a.volume = VolumeInfo(vol_name, vol_crtime, b'H+',
-                              ALIAS_FIXED_DISK, 0, b'\0\0')
+        a.target = TargetInfo(
+            kind, filename, folder_cnid, cnid, creation_date, creator_code, type_code
+        )
+        a.volume = VolumeInfo(vol_name, vol_crtime, b"H+", ALIAS_FIXED_DISK, 0, b"\0\0")
 
         a.target.folder_name = foldername
         a.volume.posix_path = vol_path
@@ -399,10 +535,10 @@ class Alias (object):
         rel_path = os.path.relpath(path, vol_path)
 
         # Leave off the initial '/' if vol_path is '/' (no idea why)
-        if vol_path == b'/':
+        if vol_path == b"/":
             a.target.posix_path = rel_path
         else:
-            a.target.posix_path = b'/' + rel_path
+            a.target.posix_path = b"/" + rel_path
 
         # Construct the Carbon and CNID paths
         carbon_path = []
@@ -415,173 +551,202 @@ class Alias (object):
                 attrs = [osx.ATTR_CMN_FILEID, 0, 0, 0, 0]
                 info = osx.getattrlist(os.path.join(vol_path, head), attrs, 0)
                 cnid_path.append(info[0])
-            carbon_tail = tail.replace(b':',b'/')
+            carbon_tail = tail.replace(b":", b"/")
             carbon_path.insert(0, carbon_tail)
             head, tail = os.path.split(head)
 
-        carbon_path = vol_name + b':' + b':\0'.join(carbon_path)
+        carbon_path = vol_name + b":" + b":\0".join(carbon_path)
 
         a.target.carbon_path = carbon_path
         a.target.cnid_path = cnid_path
 
         return a
-    
+
     def _to_fd(self, b):
         # We'll come back and fix the length when we're done
         pos = b.tell()
-        b.write(struct.pack(b'>4shh', self.appinfo, 0, self.version))
+        b.write(struct.pack(b">4shh", self.appinfo, 0, self.version))
 
-        carbon_volname = encode_utf8(self.volume.name).replace(b':',b'/')
-        carbon_filename = encode_utf8(self.target.filename).replace(b':',b'/')
+        carbon_volname = encode_utf8(self.volume.name).replace(b":", b"/")
+        carbon_filename = encode_utf8(self.target.filename).replace(b":", b"/")
         voldate = (self.volume.creation_date - mac_epoch).total_seconds()
         crdate = (self.target.creation_date - mac_epoch).total_seconds()
 
-        # NOTE: crdate should be in local time, but that's system dependent
-        #       (so doing so is ridiculous, and nothing could rely on it).
-        b.write(struct.pack(b'>h28pI2shI64pII4s4shhI2s10s',
-                            self.target.kind,
-                            carbon_volname, int(voldate),
-                            self.volume.fs_type,
-                            self.volume.disk_type,
-                            self.target.folder_cnid,
-                            carbon_filename,
-                            self.target.cnid,
-                            int(crdate),
-                            self.target.creator_code,
-                            self.target.type_code,
-                            self.target.levels_from,
-                            self.target.levels_to,
-                            self.volume.attribute_flags,
-                            self.volume.fs_id,
-                            b'\0'*10))
+        if self.version == 2:
+            # NOTE: crdate should be in local time, but that's system dependent
+            #       (so doing so is ridiculous, and nothing could rely on it).
+            b.write(
+                struct.pack(
+                    b">h28pI2shI64pII4s4shhI2s10s",
+                    self.target.kind,  # h
+                    carbon_volname,  # 28p
+                    int(voldate),  # I
+                    self.volume.fs_type,  # 2s
+                    self.volume.disk_type,  # h
+                    self.target.folder_cnid,  # I
+                    carbon_filename,  # 64p
+                    self.target.cnid,  # I
+                    int(crdate),  # I
+                    self.target.creator_code,  # 4s
+                    self.target.type_code,  # 4s
+                    self.target.levels_from,  # h
+                    self.target.levels_to,  # h
+                    self.volume.attribute_flags,  # I
+                    self.volume.fs_id,  # 2s
+                    b"\0" * 10,  # 10s
+                )
+            )
+        else:
+            b.write(
+                struct.pack(
+                    b">hQ4shIIQI14s",
+                    self.target.kind,  # h
+                    int(voldate * 65536),  # Q
+                    self.volume.fs_type,  # 4s
+                    self.volume.disk_type,  # h
+                    self.target.folder_cnid,  # I
+                    self.target.cnid,  # I
+                    int(crdate * 65536),  # Q
+                    self.volume.attribute_flags,  # I
+                    b"\0" * 14,  # 14s
+                )
+            )
 
         # Excuse the odd order; we're copying Finder
         if self.target.folder_name:
-            carbon_foldername = encode_utf8(self.target.folder_name)\
-                                .replace(b':',b'/')
-            b.write(struct.pack(b'>hh', TAG_CARBON_FOLDER_NAME,
-                                len(carbon_foldername)))
+            carbon_foldername = encode_utf8(self.target.folder_name).replace(b":", b"/")
+            b.write(struct.pack(b">hh", TAG_CARBON_FOLDER_NAME, len(carbon_foldername)))
             b.write(carbon_foldername)
             if len(carbon_foldername) & 1:
-                b.write(b'\0')
+                b.write(b"\0")
 
-        b.write(struct.pack(b'>hhQhhQ',
+        b.write(
+            struct.pack(
+                b">hhQhhQ",
                 TAG_HIGH_RES_VOLUME_CREATION_DATE,
-                8, int(voldate * 65536),
+                8,
+                int(voldate * 65536),
                 TAG_HIGH_RES_CREATION_DATE,
-                8, int(crdate * 65536)))
+                8,
+                int(crdate * 65536),
+            )
+        )
 
         if self.target.cnid_path:
-            cnid_path = struct.pack('>%uI' % len(self.target.cnid_path),
-                                    *self.target.cnid_path)
-            b.write(struct.pack(b'>hh', TAG_CNID_PATH,
-                                 len(cnid_path)))
+            cnid_path = struct.pack(
+                ">%uI" % len(self.target.cnid_path), *self.target.cnid_path
+            )
+            b.write(struct.pack(b">hh", TAG_CNID_PATH, len(cnid_path)))
             b.write(cnid_path)
 
         if self.target.carbon_path:
-            carbon_path=encode_utf8(self.target.carbon_path)
-            b.write(struct.pack(b'>hh', TAG_CARBON_PATH,
-                                 len(carbon_path)))
+            carbon_path = encode_utf8(self.target.carbon_path)
+            b.write(struct.pack(b">hh", TAG_CARBON_PATH, len(carbon_path)))
             b.write(carbon_path)
             if len(carbon_path) & 1:
-                b.write(b'\0')
+                b.write(b"\0")
 
         if self.volume.appleshare_info:
             ai = self.volume.appleshare_info
             if ai.zone:
-                b.write(struct.pack(b'>hh', TAG_APPLESHARE_ZONE,
-                                     len(ai.zone)))
+                b.write(struct.pack(b">hh", TAG_APPLESHARE_ZONE, len(ai.zone)))
                 b.write(ai.zone)
                 if len(ai.zone) & 1:
-                    b.write(b'\0')
+                    b.write(b"\0")
             if ai.server:
-                b.write(struct.pack(b'>hh', TAG_APPLESHARE_SERVER_NAME,
-                                     len(ai.server)))
+                b.write(struct.pack(b">hh", TAG_APPLESHARE_SERVER_NAME, len(ai.server)))
                 b.write(ai.server)
                 if len(ai.server) & 1:
-                    b.write(b'\0')
+                    b.write(b"\0")
             if ai.username:
-                b.write(struct.pack(b'>hh', TAG_APPLESHARE_USERNAME,
-                                     len(ai.username)))
+                b.write(struct.pack(b">hh", TAG_APPLESHARE_USERNAME, len(ai.username)))
                 b.write(ai.username)
                 if len(ai.username) & 1:
-                    b.write(b'\0')
+                    b.write(b"\0")
 
         if self.volume.driver_name:
             driver_name = encode_utf8(self.volume.driver_name)
-            b.write(struct.pack(b'>hh', TAG_DRIVER_NAME,
-                                len(driver_name)))
+            b.write(struct.pack(b">hh", TAG_DRIVER_NAME, len(driver_name)))
             b.write(driver_name)
             if len(driver_name) & 1:
-                b.write(b'\0')
+                b.write(b"\0")
 
         if self.volume.network_mount_info:
-            b.write(struct.pack(b'>hh', TAG_NETWORK_MOUNT_INFO,
-                                len(self.volume.network_mount_info)))
+            b.write(
+                struct.pack(
+                    b">hh", TAG_NETWORK_MOUNT_INFO, len(self.volume.network_mount_info)
+                )
+            )
             b.write(self.volume.network_mount_info)
             if len(self.volume.network_mount_info) & 1:
-                b.write(b'\0')
+                b.write(b"\0")
 
         if self.volume.dialup_info:
-            b.write(struct.pack(b'>hh', TAG_DIALUP_INFO,
-                                len(self.volume.network_mount_info)))
+            b.write(
+                struct.pack(
+                    b">hh", TAG_DIALUP_INFO, len(self.volume.network_mount_info)
+                )
+            )
             b.write(self.volume.network_mount_info)
             if len(self.volume.network_mount_info) & 1:
-                b.write(b'\0')
+                b.write(b"\0")
 
-        utf16 = decode_utf8(self.target.filename)\
-                .replace(':','/').encode('utf-16-be')
-        b.write(struct.pack(b'>hhh', TAG_UNICODE_FILENAME,
-                            len(utf16) + 2,
-                            len(utf16) // 2))
+        utf16 = decode_utf8(self.target.filename).replace(":", "/").encode("utf-16-be")
+        b.write(
+            struct.pack(b">hhh", TAG_UNICODE_FILENAME, len(utf16) + 2, len(utf16) // 2)
+        )
         b.write(utf16)
 
-        utf16 = decode_utf8(self.volume.name)\
-                .replace(':','/').encode('utf-16-be')
-        b.write(struct.pack(b'>hhh', TAG_UNICODE_VOLUME_NAME,
-                            len(utf16) + 2,
-                            len(utf16) // 2))
+        utf16 = decode_utf8(self.volume.name).replace(":", "/").encode("utf-16-be")
+        b.write(
+            struct.pack(
+                b">hhh", TAG_UNICODE_VOLUME_NAME, len(utf16) + 2, len(utf16) // 2
+            )
+        )
         b.write(utf16)
 
         if self.target.posix_path:
             posix_path = encode_utf8(self.target.posix_path)
-            b.write(struct.pack(b'>hh', TAG_POSIX_PATH,
-                                len(posix_path)))
+            b.write(struct.pack(b">hh", TAG_POSIX_PATH, len(posix_path)))
             b.write(posix_path)
             if len(posix_path) & 1:
-                b.write(b'\0')
+                b.write(b"\0")
 
         if self.volume.posix_path:
             posix_path = encode_utf8(self.volume.posix_path)
-            b.write(struct.pack(b'>hh', TAG_POSIX_PATH_TO_MOUNTPOINT,
-                                len(posix_path)))
+            b.write(struct.pack(b">hh", TAG_POSIX_PATH_TO_MOUNTPOINT, len(posix_path)))
             b.write(posix_path)
             if len(posix_path) & 1:
-                b.write(b'\0')
+                b.write(b"\0")
 
         if self.volume.disk_image_alias:
             d = self.volume.disk_image_alias.to_bytes()
-            b.write(struct.pack(b'>hh', TAG_RECURSIVE_ALIAS_OF_DISK_IMAGE,
-                                len(d)))
+            b.write(struct.pack(b">hh", TAG_RECURSIVE_ALIAS_OF_DISK_IMAGE, len(d)))
             b.write(d)
             if len(d) & 1:
-                b.write(b'\0')
+                b.write(b"\0")
 
         if self.target.user_home_prefix_len is not None:
-            b.write(struct.pack(b'>hhh', TAG_USER_HOME_LENGTH_PREFIX,
-                                2, self.target.user_home_prefix_len))
-
-        for t,v in self.extra:
-            b.write(struct.pack(b'>hh', t, len(v)))
+            b.write(
+                struct.pack(
+                    b">hhh",
+                    TAG_USER_HOME_LENGTH_PREFIX,
+                    2,
+                    self.target.user_home_prefix_len,
+                )
+            )
+
+        for t, v in self.extra:
+            b.write(struct.pack(b">hh", t, len(v)))
             b.write(v)
             if len(v) & 1:
-                b.write(b'\0')
+                b.write(b"\0")
+
+        b.write(struct.pack(b">hh", -1, 0))
 
-        b.write(struct.pack(b'>hh', -1, 0))
-        
         blen = b.tell() - pos
         b.seek(pos + 4, os.SEEK_SET)
-        b.write(struct.pack(b'>h', blen))
+        b.write(struct.pack(b">h", blen))
 
     def to_bytes(self):
         """Returns the binary representation for this :class:`Alias`."""
@@ -590,18 +755,18 @@ class Alias (object):
             return b.getvalue()
 
     def __str__(self):
-        return '<Alias target=%s>' % self.target.filename
+        return "<Alias target=%s>" % self.target.filename
 
     def __repr__(self):
         values = []
-        if self.appinfo != b'\0\0\0\0':
-            values.append('appinfo=%r' % self.appinfo)
+        if self.appinfo != b"\0\0\0\0":
+            values.append("appinfo=%r" % self.appinfo)
         if self.version != 2:
-            values.append('version=%r' % self.version)
+            values.append("version=%r" % self.version)
         if self.volume is not None:
-            values.append('volume=%r' % self.volume)
+            values.append("volume=%r" % self.volume)
         if self.target is not None:
-            values.append('target=%r' % self.target)
+            values.append("target=%r" % self.target)
         if self.extra:
-            values.append('extra=%r' % self.extra)
-        return 'Alias(%s)' % ','.join(values)
+            values.append("extra=%r" % self.extra)
+        return "Alias(%s)" % ",".join(values)
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/bookmark.py b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/bookmark.py
new file mode 100644
index 000000000..00e16feb1
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/bookmark.py
@@ -0,0 +1,677 @@
+#  This file implements the Apple "bookmark" format, which is the replacement
+#  for the old-fashioned alias format.  The details of this format were
+#  reverse engineered; some things are still not entirely clear.
+#
+import datetime
+import os
+import struct
+import sys
+import uuid
+from urllib.parse import urljoin
+
+if sys.platform == "darwin":
+    from . import osx
+
+from .utils import osx_epoch
+
+BMK_DATA_TYPE_MASK = 0xFFFFFF00
+BMK_DATA_SUBTYPE_MASK = 0x000000FF
+
+BMK_STRING = 0x0100
+BMK_DATA = 0x0200
+BMK_NUMBER = 0x0300
+BMK_DATE = 0x0400
+BMK_BOOLEAN = 0x0500
+BMK_ARRAY = 0x0600
+BMK_DICT = 0x0700
+BMK_UUID = 0x0800
+BMK_URL = 0x0900
+BMK_NULL = 0x0A00
+
+BMK_ST_ZERO = 0x0000
+BMK_ST_ONE = 0x0001
+
+BMK_BOOLEAN_ST_FALSE = 0x0000
+BMK_BOOLEAN_ST_TRUE = 0x0001
+
+# Subtypes for BMK_NUMBER are really CFNumberType values
+kCFNumberSInt8Type = 1
+kCFNumberSInt16Type = 2
+kCFNumberSInt32Type = 3
+kCFNumberSInt64Type = 4
+kCFNumberFloat32Type = 5
+kCFNumberFloat64Type = 6
+kCFNumberCharType = 7
+kCFNumberShortType = 8
+kCFNumberIntType = 9
+kCFNumberLongType = 10
+kCFNumberLongLongType = 11
+kCFNumberFloatType = 12
+kCFNumberDoubleType = 13
+kCFNumberCFIndexType = 14
+kCFNumberNSIntegerType = 15
+kCFNumberCGFloatType = 16
+
+# Resource property flags (from CFURLPriv.h)
+kCFURLResourceIsRegularFile = 0x00000001
+kCFURLResourceIsDirectory = 0x00000002
+kCFURLResourceIsSymbolicLink = 0x00000004
+kCFURLResourceIsVolume = 0x00000008
+kCFURLResourceIsPackage = 0x00000010
+kCFURLResourceIsSystemImmutable = 0x00000020
+kCFURLResourceIsUserImmutable = 0x00000040
+kCFURLResourceIsHidden = 0x00000080
+kCFURLResourceHasHiddenExtension = 0x00000100
+kCFURLResourceIsApplication = 0x00000200
+kCFURLResourceIsCompressed = 0x00000400
+kCFURLResourceIsSystemCompressed = 0x00000400
+kCFURLCanSetHiddenExtension = 0x00000800
+kCFURLResourceIsReadable = 0x00001000
+kCFURLResourceIsWriteable = 0x00002000
+kCFURLResourceIsExecutable = 0x00004000
+kCFURLIsAliasFile = 0x00008000
+kCFURLIsMountTrigger = 0x00010000
+
+# Volume property flags (from CFURLPriv.h)
+kCFURLVolumeIsLocal = 0x1
+kCFURLVolumeIsAutomount = 0x2
+kCFURLVolumeDontBrowse = 0x4
+kCFURLVolumeIsReadOnly = 0x8
+kCFURLVolumeIsQuarantined = 0x10
+kCFURLVolumeIsEjectable = 0x20
+kCFURLVolumeIsRemovable = 0x40
+kCFURLVolumeIsInternal = 0x80
+kCFURLVolumeIsExternal = 0x100
+kCFURLVolumeIsDiskImage = 0x200
+kCFURLVolumeIsFileVault = 0x400
+kCFURLVolumeIsLocaliDiskMirror = 0x800
+kCFURLVolumeIsiPod = 0x1000
+kCFURLVolumeIsiDisk = 0x2000
+kCFURLVolumeIsCD = 0x4000
+kCFURLVolumeIsDVD = 0x8000
+kCFURLVolumeIsDeviceFileSystem = 0x10000
+kCFURLVolumeSupportsPersistentIDs = 0x100000000
+kCFURLVolumeSupportsSearchFS = 0x200000000
+kCFURLVolumeSupportsExchange = 0x400000000
+# reserved                                           0x800000000
+kCFURLVolumeSupportsSymbolicLinks = 0x1000000000
+kCFURLVolumeSupportsDenyModes = 0x2000000000
+kCFURLVolumeSupportsCopyFile = 0x4000000000
+kCFURLVolumeSupportsReadDirAttr = 0x8000000000
+kCFURLVolumeSupportsJournaling = 0x10000000000
+kCFURLVolumeSupportsRename = 0x20000000000
+kCFURLVolumeSupportsFastStatFS = 0x40000000000
+kCFURLVolumeSupportsCaseSensitiveNames = 0x80000000000
+kCFURLVolumeSupportsCasePreservedNames = 0x100000000000
+kCFURLVolumeSupportsFLock = 0x200000000000
+kCFURLVolumeHasNoRootDirectoryTimes = 0x400000000000
+kCFURLVolumeSupportsExtendedSecurity = 0x800000000000
+kCFURLVolumeSupports2TBFileSize = 0x1000000000000
+kCFURLVolumeSupportsHardLinks = 0x2000000000000
+kCFURLVolumeSupportsMandatoryByteRangeLocks = 0x4000000000000
+kCFURLVolumeSupportsPathFromID = 0x8000000000000
+# reserved                                      0x10000000000000
+kCFURLVolumeIsJournaling = 0x20000000000000
+kCFURLVolumeSupportsSparseFiles = 0x40000000000000
+kCFURLVolumeSupportsZeroRuns = 0x80000000000000
+kCFURLVolumeSupportsVolumeSizes = 0x100000000000000
+kCFURLVolumeSupportsRemoteEvents = 0x200000000000000
+kCFURLVolumeSupportsHiddenFiles = 0x400000000000000
+kCFURLVolumeSupportsDecmpFSCompression = 0x800000000000000
+kCFURLVolumeHas64BitObjectIDs = 0x1000000000000000
+kCFURLVolumePropertyFlagsAll = 0xFFFFFFFFFFFFFFFF
+
+BMK_URL_ST_ABSOLUTE = 0x0001
+BMK_URL_ST_RELATIVE = 0x0002
+
+# Bookmark keys
+kBookmarkURL = 0x1003  # A URL
+kBookmarkPath = 0x1004  # Array of path components
+kBookmarkCNIDPath = 0x1005  # Array of CNIDs
+kBookmarkFileProperties = (
+    0x1010  # (CFURL rp flags, CFURL rp flags asked for, 8 bytes NULL)
+)
+kBookmarkFileName = 0x1020
+kBookmarkFileID = 0x1030
+kBookmarkFileCreationDate = 0x1040
+# = 0x1054   # ?
+# = 0x1055   # ?
+# = 0x1056   # ?
+# = 0x1101   # ?
+# = 0x1102   # ?
+kBookmarkTOCPath = 0x2000  # A list of (TOC id, ?) pairs
+kBookmarkVolumePath = 0x2002
+kBookmarkVolumeURL = 0x2005
+kBookmarkVolumeName = 0x2010
+kBookmarkVolumeUUID = 0x2011  # Stored (perversely) as a string
+kBookmarkVolumeSize = 0x2012
+kBookmarkVolumeCreationDate = 0x2013
+kBookmarkVolumeProperties = (
+    0x2020  # (CFURL vp flags, CFURL vp flags asked for, 8 bytes NULL)
+)
+kBookmarkVolumeIsRoot = 0x2030  # True if volume is FS root
+kBookmarkVolumeBookmark = 0x2040  # Embedded bookmark for disk image (TOC id)
+kBookmarkVolumeMountPoint = 0x2050  # A URL
+# = 0x2070
+kBookmarkContainingFolder = 0xC001  # Index of containing folder in path
+kBookmarkUserName = 0xC011  # User that created bookmark
+kBookmarkUID = 0xC012  # UID that created bookmark
+kBookmarkWasFileReference = 0xD001  # True if the URL was a file reference
+kBookmarkCreationOptions = 0xD010
+kBookmarkURLLengths = 0xE003  # See below
+kBookmarkDisplayName = 0xF017
+kBookmarkIconData = 0xF020
+kBookmarkIconRef = 0xF021
+kBookmarkTypeBindingData = 0xF022
+kBookmarkCreationTime = 0xF030
+kBookmarkSandboxRwExtension = 0xF080
+kBookmarkSandboxRoExtension = 0xF081
+kBookmarkAliasData = 0xFE00
+
+# Alias for backwards compatibility
+kBookmarkSecurityExtension = kBookmarkSandboxRwExtension
+
+# kBookmarkURLLengths is an array that is set if the URL encoded by the
+# bookmark had a base URL; in that case, each entry is the length of the
+# base URL in question.  Thus a URL
+#
+#     file:///foo/bar/baz    blam/blat.html
+#
+# will result in [3, 2], while the URL
+#
+#     file:///foo    bar/baz    blam    blat.html
+#
+# would result in [1, 2, 1, 1]
+
+
+class Data:
+    def __init__(self, bytedata=None):
+        #: The bytes, stored as a byte string
+        self.bytes = bytes(bytedata)
+
+    def __repr__(self):
+        return "Data(%r)" % self.bytes
+
+
+class URL:
+    def __init__(self, base, rel=None):
+        if rel is not None:
+            #: The base URL, if any (a :class:`URL`)
+            self.base = base
+            #: The rest of the URL (a string)
+            self.relative = rel
+        else:
+            self.base = None
+            self.relative = base
+
+    @property
+    def absolute(self):
+        """Return an absolute URL."""
+        if self.base is None:
+            return self.relative
+        else:
+            return urljoin(self.base.absolute, self.relative)
+
+    def __repr__(self):
+        return "URL(%r)" % self.absolute
+
+
+class Bookmark:
+    def __init__(self, tocs=None):
+        if tocs is None:
+            #: The TOCs for this Bookmark
+            self.tocs = []
+        else:
+            self.tocs = tocs
+
+    @classmethod
+    def _get_item(cls, data, hdrsize, offset):
+        offset += hdrsize
+        if offset > len(data) - 8:
+            raise ValueError("Offset out of range")
+
+        length, typecode = struct.unpack(b"<II", data[offset : offset + 8])
+
+        if len(data) - offset < 8 + length:
+            raise ValueError("Data item truncated")
+
+        databytes = data[offset + 8 : offset + 8 + length]
+
+        dsubtype = typecode & BMK_DATA_SUBTYPE_MASK
+        dtype = typecode & BMK_DATA_TYPE_MASK
+
+        if dtype == BMK_STRING:
+            return databytes.decode("utf-8")
+        elif dtype == BMK_DATA:
+            return Data(databytes)
+        elif dtype == BMK_NUMBER:
+            if dsubtype == kCFNumberSInt8Type:
+                return ord(databytes[0])
+            elif dsubtype == kCFNumberSInt16Type:
+                return struct.unpack(b"<h", databytes)[0]
+            elif dsubtype == kCFNumberSInt32Type:
+                return struct.unpack(b"<i", databytes)[0]
+            elif dsubtype == kCFNumberSInt64Type:
+                return struct.unpack(b"<q", databytes)[0]
+            elif dsubtype == kCFNumberFloat32Type:
+                return struct.unpack(b"<f", databytes)[0]
+            elif dsubtype == kCFNumberFloat64Type:
+                return struct.unpack(b"<d", databytes)[0]
+        elif dtype == BMK_DATE:
+            # Yes, dates really are stored as *BIG-endian* doubles; everything
+            # else is little-endian
+            secs = datetime.timedelta(seconds=struct.unpack(b">d", databytes)[0])
+            return osx_epoch + secs
+        elif dtype == BMK_BOOLEAN:
+            if dsubtype == BMK_BOOLEAN_ST_TRUE:
+                return True
+            elif dsubtype == BMK_BOOLEAN_ST_FALSE:
+                return False
+        elif dtype == BMK_UUID:
+            return uuid.UUID(bytes=databytes)
+        elif dtype == BMK_URL:
+            if dsubtype == BMK_URL_ST_ABSOLUTE:
+                return URL(databytes.decode("utf-8"))
+            elif dsubtype == BMK_URL_ST_RELATIVE:
+                baseoff, reloff = struct.unpack(b"<II", databytes)
+                base = cls._get_item(data, hdrsize, baseoff)
+                rel = cls._get_item(data, hdrsize, reloff)
+                return URL(base, rel)
+        elif dtype == BMK_ARRAY:
+            result = []
+            for aoff in range(offset + 8, offset + 8 + length, 4):
+                (eltoff,) = struct.unpack(b"<I", data[aoff : aoff + 4])
+                result.append(cls._get_item(data, hdrsize, eltoff))
+            return result
+        elif dtype == BMK_DICT:
+            result = {}
+            for eoff in range(offset + 8, offset + 8 + length, 8):
+                keyoff, valoff = struct.unpack(b"<II", data[eoff : eoff + 8])
+                key = cls._get_item(data, hdrsize, keyoff)
+                val = cls._get_item(data, hdrsize, valoff)
+                result[key] = val
+            return result
+        elif dtype == BMK_NULL:
+            return None
+
+        print("Unknown data type %08x" % typecode)
+        return (typecode, databytes)
+
+    @classmethod
+    def from_bytes(cls, data):
+        """Create a :class:`Bookmark` given byte data."""
+
+        if len(data) < 16:
+            raise ValueError("Not a bookmark file (too short)")
+
+        if isinstance(data, bytearray):
+            data = bytes(data)
+
+        magic, size, dummy, hdrsize = struct.unpack(b"<4sIII", data[0:16])
+
+        if magic not in (b"book", b"alis"):
+            raise ValueError("Not a bookmark file (bad magic) %r" % magic)
+
+        if hdrsize < 16:
+            raise ValueError("Not a bookmark file (header size too short)")
+
+        if hdrsize > size:
+            raise ValueError("Not a bookmark file (header size too large)")
+
+        if size != len(data):
+            raise ValueError("Not a bookmark file (truncated)")
+
+        (tocoffset,) = struct.unpack(b"<I", data[hdrsize : hdrsize + 4])
+
+        tocs = []
+
+        while tocoffset != 0:
+            tocbase = hdrsize + tocoffset
+            if (tocoffset > size - hdrsize) or (size - tocbase < 20):
+                raise ValueError("TOC offset out of range")
+
+            (tocsize, tocmagic, tocid, nexttoc, toccount) = struct.unpack(
+                b"<IIIII", data[tocbase : tocbase + 20]
+            )
+
+            if tocmagic != 0xFFFFFFFE:
+                break
+
+            tocsize += 8
+
+            if size - tocbase < tocsize:
+                raise ValueError("TOC truncated")
+
+            if tocsize < 12 * toccount:
+                raise ValueError("TOC entries overrun TOC size")
+
+            toc = {}
+            for n in range(0, toccount):
+                ebase = tocbase + 20 + 12 * n
+                eid, eoffset, edummy = struct.unpack(b"<III", data[ebase : ebase + 12])
+
+                if eid & 0x80000000:
+                    eid = cls._get_item(data, hdrsize, eid & 0x7FFFFFFF)
+
+                toc[eid] = cls._get_item(data, hdrsize, eoffset)
+
+            tocs.append((tocid, toc))
+
+            tocoffset = nexttoc
+
+        return cls(tocs)
+
+    def __getitem__(self, key):
+        for tid, toc in self.tocs:
+            if key in toc:
+                return toc[key]
+        raise KeyError("Key not found")
+
+    def __setitem__(self, key, value):
+        if len(self.tocs) == 0:
+            self.tocs = [(1, {})]
+        self.tocs[0][1][key] = value
+
+    def get(self, key, default=None):
+        """Lookup the value for a given key, returning a default if not
+        present."""
+        for tid, toc in self.tocs:
+            if key in toc:
+                return toc[key]
+        return default
+
+    @classmethod
+    def _encode_item(cls, item, offset):
+        if item is True:
+            result = struct.pack(b"<II", 0, BMK_BOOLEAN | BMK_BOOLEAN_ST_TRUE)
+        elif item is False:
+            result = struct.pack(b"<II", 0, BMK_BOOLEAN | BMK_BOOLEAN_ST_FALSE)
+        elif isinstance(item, str):
+            encoded = item.encode("utf-8")
+            result = (
+                struct.pack(b"<II", len(encoded), BMK_STRING | BMK_ST_ONE) + encoded
+            )
+        elif isinstance(item, bytes):
+            result = struct.pack(b"<II", len(item), BMK_STRING | BMK_ST_ONE) + item
+        elif isinstance(item, Data):
+            result = struct.pack(
+                b"<II", len(item.bytes), BMK_DATA | BMK_ST_ONE
+            ) + bytes(item.bytes)
+        elif isinstance(item, bytearray):
+            result = struct.pack(b"<II", len(item), BMK_DATA | BMK_ST_ONE) + bytes(item)
+        elif isinstance(item, int):
+            if item > -0x80000000 and item < 0x7FFFFFFF:
+                result = struct.pack(b"<IIi", 4, BMK_NUMBER | kCFNumberSInt32Type, item)
+            else:
+                result = struct.pack(b"<IIq", 8, BMK_NUMBER | kCFNumberSInt64Type, item)
+        elif isinstance(item, float):
+            result = struct.pack(b"<IId", 8, BMK_NUMBER | kCFNumberFloat64Type, item)
+        elif isinstance(item, datetime.datetime):
+            secs = item - osx_epoch
+            result = struct.pack(b"<II", 8, BMK_DATE | BMK_ST_ZERO) + struct.pack(
+                b">d", float(secs.total_seconds())
+            )
+
+        elif isinstance(item, uuid.UUID):
+            result = struct.pack(b"<II", 16, BMK_UUID | BMK_ST_ONE) + item.bytes
+        elif isinstance(item, URL):
+            if item.base:
+                baseoff = offset + 16
+                reloff, baseenc = cls._encode_item(item.base, baseoff)
+                xoffset, relenc = cls._encode_item(item.relative, reloff)
+                result = b"".join(
+                    [
+                        struct.pack(
+                            b"<IIII", 8, BMK_URL | BMK_URL_ST_RELATIVE, baseoff, reloff
+                        ),
+                        baseenc,
+                        relenc,
+                    ]
+                )
+            else:
+                encoded = item.relative.encode("utf-8")
+                result = (
+                    struct.pack(b"<II", len(encoded), BMK_URL | BMK_URL_ST_ABSOLUTE)
+                    + encoded
+                )
+        elif isinstance(item, list):
+            ioffset = offset + 8 + len(item) * 4
+            result = [struct.pack(b"<II", len(item) * 4, BMK_ARRAY | BMK_ST_ONE)]
+            enc = []
+            for elt in item:
+                result.append(struct.pack(b"<I", ioffset))
+                ioffset, ienc = cls._encode_item(elt, ioffset)
+                enc.append(ienc)
+            result = b"".join(result + enc)
+        elif isinstance(item, dict):
+            ioffset = offset + 8 + len(item) * 8
+            result = [struct.pack(b"<II", len(item) * 8, BMK_DICT | BMK_ST_ONE)]
+            enc = []
+            for k, v in item.items():
+                result.append(struct.pack(b"<I", ioffset))
+                ioffset, ienc = cls._encode_item(k, ioffset)
+                enc.append(ienc)
+                result.append(struct.pack(b"<I", ioffset))
+                ioffset, ienc = cls._encode_item(v, ioffset)
+                enc.append(ienc)
+            result = b"".join(result + enc)
+        elif item is None:
+            result = struct.pack(b"<II", 0, BMK_NULL | BMK_ST_ONE)
+        else:
+            raise ValueError("Unknown item type when encoding: %s" % item)
+
+        offset += len(result)
+
+        # Pad to a multiple of 4 bytes
+        if offset & 3:
+            extra = 4 - (offset & 3)
+            result += b"\0" * extra
+            offset += extra
+
+        return (offset, result)
+
+    def to_bytes(self):
+        """Convert this :class:`Bookmark` to a byte representation."""
+
+        result = []
+        tocs = []
+        offset = 4  # For the offset to the first TOC
+
+        # Generate the data and build the TOCs
+        for tid, toc in self.tocs:
+            entries = []
+
+            for k, v in toc.items():
+                if isinstance(k, str):
+                    noffset = offset
+                    voffset, enc = self._encode_item(k, offset)
+                    result.append(enc)
+                    offset, enc = self._encode_item(v, voffset)
+                    result.append(enc)
+                    entries.append((noffset | 0x80000000, voffset))
+                else:
+                    entries.append((k, offset))
+                    offset, enc = self._encode_item(v, offset)
+                    result.append(enc)
+
+            # TOC entries must be sorted - CoreServicesInternal does a
+            # binary search to find data
+            entries.sort()
+
+            tocs.append(
+                (tid, b"".join([struct.pack(b"<III", k, o, 0) for k, o in entries]))
+            )
+
+        first_toc_offset = offset
+
+        # Now generate the TOC headers
+        for ndx, toc in enumerate(tocs):
+            tid, data = toc
+            if ndx == len(tocs) - 1:
+                next_offset = 0
+            else:
+                next_offset = offset + 20 + len(data)
+
+            result.append(
+                struct.pack(
+                    b"<IIIII",
+                    len(data) - 8,
+                    0xFFFFFFFE,
+                    tid,
+                    next_offset,
+                    len(data) // 12,
+                )
+            )
+            result.append(data)
+
+            offset += 20 + len(data)
+
+        # Finally, add the header (and the first TOC offset, which isn't part
+        # of the header, but goes just after it)
+        header = struct.pack(
+            b"<4sIIIQQQQI",
+            b"book",
+            offset + 48,
+            0x10040000,
+            48,
+            0,
+            0,
+            0,
+            0,
+            first_toc_offset,
+        )
+
+        result.insert(0, header)
+
+        return b"".join(result)
+
+    @classmethod
+    def for_file(cls, path):
+        """Construct a :class:`Bookmark` for a given file."""
+
+        # Find the filesystem
+        st = osx.statfs(path)
+        vol_path = st.f_mntonname.decode("utf-8")
+
+        # Grab its attributes
+        attrs = [
+            osx.ATTR_CMN_CRTIME,
+            osx.ATTR_VOL_SIZE | osx.ATTR_VOL_NAME | osx.ATTR_VOL_UUID,
+            0,
+            0,
+            0,
+        ]
+        volinfo = osx.getattrlist(vol_path, attrs, 0)
+
+        vol_crtime = volinfo[0]
+        vol_size = volinfo[1]
+        vol_name = volinfo[2]
+        vol_uuid = volinfo[3]
+
+        # Also grab various attributes of the file
+        attrs = [
+            (osx.ATTR_CMN_OBJTYPE | osx.ATTR_CMN_CRTIME | osx.ATTR_CMN_FILEID),
+            0,
+            0,
+            0,
+            0,
+        ]
+        info = osx.getattrlist(path, attrs, osx.FSOPT_NOFOLLOW)
+
+        cnid = info[2]
+        crtime = info[1]
+
+        if info[0] == osx.VREG:
+            flags = kCFURLResourceIsRegularFile
+        elif info[0] == osx.VDIR:
+            flags = kCFURLResourceIsDirectory
+        elif info[0] == osx.VLNK:
+            flags = kCFURLResourceIsSymbolicLink
+        else:
+            flags = kCFURLResourceIsRegularFile
+
+        dirname, filename = os.path.split(path)
+
+        relcount = 0
+        if not os.path.isabs(dirname):
+            curdir = os.getcwd()
+            head, tail = os.path.split(curdir)
+            relcount = 0
+            while head and tail:
+                relcount += 1
+                head, tail = os.path.split(head)
+            dirname = os.path.join(curdir, dirname)
+
+        # ?? foldername = os.path.basename(dirname)
+
+        rel_path = os.path.relpath(path, vol_path)
+
+        # Build the path arrays
+        name_path = []
+        cnid_path = []
+        head, tail = os.path.split(rel_path)
+        if not tail:
+            head, tail = os.path.split(head)
+        while head or tail:
+            if head:
+                attrs = [osx.ATTR_CMN_FILEID, 0, 0, 0, 0]
+                info = osx.getattrlist(os.path.join(vol_path, head), attrs, 0)
+                cnid_path.insert(0, info[0])
+                head, tail = os.path.split(head)
+                name_path.insert(0, tail)
+            else:
+                head, tail = os.path.split(head)
+        name_path.append(filename)
+        cnid_path.append(cnid)
+
+        url_lengths = [relcount, len(name_path) - relcount]
+
+        fileprops = Data(struct.pack(b"<QQQ", flags, 0x0F, 0))
+        volprops = Data(
+            struct.pack(
+                b"<QQQ",
+                0x81 | kCFURLVolumeSupportsPersistentIDs,
+                0x13EF | kCFURLVolumeSupportsPersistentIDs,
+                0,
+            )
+        )
+
+        toc = {
+            kBookmarkPath: name_path,
+            kBookmarkCNIDPath: cnid_path,
+            kBookmarkFileCreationDate: crtime,
+            kBookmarkFileProperties: fileprops,
+            kBookmarkContainingFolder: len(name_path) - 2,
+            kBookmarkVolumePath: vol_path,
+            kBookmarkVolumeIsRoot: vol_path == "/",
+            kBookmarkVolumeURL: URL("file://" + vol_path),
+            kBookmarkVolumeName: vol_name,
+            kBookmarkVolumeSize: vol_size,
+            kBookmarkVolumeCreationDate: vol_crtime,
+            kBookmarkVolumeUUID: str(vol_uuid).upper(),
+            kBookmarkVolumeProperties: volprops,
+            kBookmarkCreationOptions: 512,
+            kBookmarkWasFileReference: True,
+            kBookmarkUserName: "unknown",
+            kBookmarkUID: 99,
+        }
+
+        if relcount:
+            toc[kBookmarkURLLengths] = url_lengths
+
+        return Bookmark([(1, toc)])
+
+    def __repr__(self):
+        result = ["Bookmark(["]
+        for tid, toc in self.tocs:
+            result.append("(0x%x, {\n" % tid)
+            for k, v in toc.items():
+                if isinstance(k, str):
+                    kf = repr(k)
+                else:
+                    kf = "0x%04x" % k
+                result.append(f"  {kf}: {v!r}\n")
+            result.append("}),\n")
+        result.append("])")
+
+        return "".join(result)
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/osx.py b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/osx.py
index d4af65d75..1b2feabaa 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/osx.py
+++ b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/osx.py
@@ -1,247 +1,367 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from ctypes import *
-import struct
-import os
 import datetime
+import os
 import uuid
-
-from .utils import *
-
-libc = cdll.LoadLibrary('/usr/lib/libc.dylib')
+from ctypes import (
+    POINTER,
+    Structure,
+    Union,
+    byref,
+    c_byte,
+    c_char,
+    c_char_p,
+    c_int,
+    c_long,
+    c_longlong,
+    c_short,
+    c_uint,
+    c_ulong,
+    c_ulonglong,
+    c_ushort,
+    c_void_p,
+    cdll,
+    create_string_buffer,
+    sizeof,
+)
+
+from .utils import unix_epoch
+
+libc = cdll.LoadLibrary("/usr/lib/libc.dylib")
 
 # Constants
-FSOPT_NOFOLLOW         = 0x00000001
-FSOPT_NOINMEMUPDATE    = 0x00000002
-FSOPT_REPORT_FULLSIZE  = 0x00000004
+FSOPT_NOFOLLOW = 0x00000001
+FSOPT_NOINMEMUPDATE = 0x00000002
+FSOPT_REPORT_FULLSIZE = 0x00000004
 FSOPT_PACK_INVAL_ATTRS = 0x00000008
+FSOPT_ATTR_CMN_EXTENDED = 0x00000020
+FSOPT_RETURN_REALDEV = 0x00000200
 
-VOL_CAPABILITIES_FORMAT     = 0
+VOL_CAPABILITIES_FORMAT = 0
 VOL_CAPABILITIES_INTERFACES = 1
 
-VOL_CAP_FMT_PERSISTENTOBJECTIDS       = 0x00000001
-VOL_CAP_FMT_SYMBOLICLINKS             = 0x00000002
-VOL_CAP_FMT_HARDLINKS                 = 0x00000004
-VOL_CAP_FMT_JOURNAL                   = 0x00000008
-VOL_CAP_FMT_JOURNAL_ACTIVE            = 0x00000010
-VOL_CAP_FMT_NO_ROOT_TIMES             = 0x00000020
-VOL_CAP_FMT_SPARSE_FILES              = 0x00000040
-VOL_CAP_FMT_ZERO_RUNS                 = 0x00000080
-VOL_CAP_FMT_CASE_SENSITIVE            = 0x00000100
-VOL_CAP_FMT_CASE_PRESERVING           = 0x00000200
-VOL_CAP_FMT_FAST_STATFS               = 0x00000400
-VOL_CAP_FMT_2TB_FILESIZE              = 0x00000800
-VOL_CAP_FMT_OPENDENYMODES             = 0x00001000
-VOL_CAP_FMT_HIDDEN_FILES              = 0x00002000
-VOL_CAP_FMT_PATH_FROM_ID              = 0x00004000
-VOL_CAP_FMT_NO_VOLUME_SIZES           = 0x00008000
-VOL_CAP_FMT_DECMPFS_COMPRESSION       = 0x00010000
-VOL_CAP_FMT_64BIT_OBJECT_IDS          = 0x00020000
-
-VOL_CAP_INT_SEARCHFS                  = 0x00000001
-VOL_CAP_INT_ATTRLIST                  = 0x00000002
-VOL_CAP_INT_NFSEXPORT                 = 0x00000004
-VOL_CAP_INT_READDIRATTR               = 0x00000008
-VOL_CAP_INT_EXCHANGEDATA              = 0x00000010
-VOL_CAP_INT_COPYFILE                  = 0x00000020
-VOL_CAP_INT_ALLOCATE                  = 0x00000040
-VOL_CAP_INT_VOL_RENAME                = 0x00000080
-VOL_CAP_INT_ADVLOCK                   = 0x00000100
-VOL_CAP_INT_FLOCK                     = 0x00000200
-VOL_CAP_INT_EXTENDED_SECURITY         = 0x00000400
-VOL_CAP_INT_USERACCESS                = 0x00000800
-VOL_CAP_INT_MANLOCK                   = 0x00001000
-VOL_CAP_INT_NAMEDSTREAMS              = 0x00002000
-VOL_CAP_INT_EXTENDED_ATTR             = 0x00004000
-
-ATTR_CMN_NAME                         = 0x00000001
-ATTR_CMN_DEVID                        = 0x00000002
-ATTR_CMN_FSID                         = 0x00000004
-ATTR_CMN_OBJTYPE                      = 0x00000008
-ATTR_CMN_OBJTAG                       = 0x00000010
-ATTR_CMN_OBJID                        = 0x00000020
-ATTR_CMN_OBJPERMANENTID               = 0x00000040
-ATTR_CMN_PAROBJID                     = 0x00000080
-ATTR_CMN_SCRIPT                       = 0x00000100
-ATTR_CMN_CRTIME                       = 0x00000200
-ATTR_CMN_MODTIME                      = 0x00000400
-ATTR_CMN_CHGTIME                      = 0x00000800
-ATTR_CMN_ACCTIME                      = 0x00001000
-ATTR_CMN_BKUPTIME                     = 0x00002000
-ATTR_CMN_FNDRINFO                     = 0x00004000
-ATTR_CMN_OWNERID                      = 0x00008000
-ATTR_CMN_GRPID                        = 0x00010000
-ATTR_CMN_ACCESSMASK                   = 0x00020000
-ATTR_CMN_FLAGS                        = 0x00040000
-ATTR_CMN_USERACCESS                   = 0x00200000
-ATTR_CMN_EXTENDED_SECURITY            = 0x00400000
-ATTR_CMN_UUID                         = 0x00800000
-ATTR_CMN_GRPUUID                      = 0x01000000
-ATTR_CMN_FILEID                       = 0x02000000
-ATTR_CMN_PARENTID                     = 0x04000000
-ATTR_CMN_FULLPATH                     = 0x08000000
-ATTR_CMN_ADDEDTIME                    = 0x10000000
-ATTR_CMN_RETURNED_ATTRS               = 0x80000000
-ATTR_CMN_ALL_ATTRS                    = 0x9fe7ffff
-
-ATTR_VOL_FSTYPE				          = 0x00000001
-ATTR_VOL_SIGNATURE			          = 0x00000002
-ATTR_VOL_SIZE				          = 0x00000004
-ATTR_VOL_SPACEFREE			          = 0x00000008
-ATTR_VOL_SPACEAVAIL			          = 0x00000010
-ATTR_VOL_MINALLOCATION			      = 0x00000020
-ATTR_VOL_ALLOCATIONCLUMP		      = 0x00000040
-ATTR_VOL_IOBLOCKSIZE			      = 0x00000080
-ATTR_VOL_OBJCOUNT			          = 0x00000100
-ATTR_VOL_FILECOUNT			          = 0x00000200
-ATTR_VOL_DIRCOUNT			          = 0x00000400
-ATTR_VOL_MAXOBJCOUNT			      = 0x00000800
-ATTR_VOL_MOUNTPOINT			          = 0x00001000
-ATTR_VOL_NAME				          = 0x00002000
-ATTR_VOL_MOUNTFLAGS			          = 0x00004000
-ATTR_VOL_MOUNTEDDEVICE			      = 0x00008000
-ATTR_VOL_ENCODINGSUSED			      = 0x00010000
-ATTR_VOL_CAPABILITIES			      = 0x00020000
-ATTR_VOL_UUID				          = 0x00040000
-ATTR_VOL_ATTRIBUTES			          = 0x40000000
-ATTR_VOL_INFO				          = 0x80000000
-ATTR_VOL_ALL_ATTRS                    = 0xc007ffff
-
-ATTR_DIR_LINKCOUNT			          = 0x00000001
-ATTR_DIR_ENTRYCOUNT			          = 0x00000002
-ATTR_DIR_MOUNTSTATUS			      = 0x00000004
-DIR_MNTSTATUS_MNTPOINT		          = 0x00000001
-DIR_MNTSTATUS_TRIGGER			      = 0x00000002
-ATTR_DIR_ALL_ATTRS                    = 0x00000007
-
-ATTR_FILE_LINKCOUNT			          = 0x00000001
-ATTR_FILE_TOTALSIZE			          = 0x00000002
-ATTR_FILE_ALLOCSIZE			          = 0x00000004
-ATTR_FILE_IOBLOCKSIZE			      = 0x00000008
-ATTR_FILE_DEVTYPE			          = 0x00000020
-ATTR_FILE_DATALENGTH			      = 0x00000200
-ATTR_FILE_DATAALLOCSIZE			      = 0x00000400
-ATTR_FILE_RSRCLENGTH			      = 0x00001000
-ATTR_FILE_RSRCALLOCSIZE			      = 0x00002000
-
-ATTR_FILE_ALL_ATTRS                   = 0x0000362f
-
-ATTR_FORK_TOTALSIZE			          = 0x00000001
-ATTR_FORK_ALLOCSIZE			          = 0x00000002
-ATTR_FORK_ALL_ATTRS                   = 0x00000003
+VOL_CAP_FMT_PERSISTENTOBJECTIDS = 0x00000001
+VOL_CAP_FMT_SYMBOLICLINKS = 0x00000002
+VOL_CAP_FMT_HARDLINKS = 0x00000004
+VOL_CAP_FMT_JOURNAL = 0x00000008
+VOL_CAP_FMT_JOURNAL_ACTIVE = 0x00000010
+VOL_CAP_FMT_NO_ROOT_TIMES = 0x00000020
+VOL_CAP_FMT_SPARSE_FILES = 0x00000040
+VOL_CAP_FMT_ZERO_RUNS = 0x00000080
+VOL_CAP_FMT_CASE_SENSITIVE = 0x00000100
+VOL_CAP_FMT_CASE_PRESERVING = 0x00000200
+VOL_CAP_FMT_FAST_STATFS = 0x00000400
+VOL_CAP_FMT_2TB_FILESIZE = 0x00000800
+VOL_CAP_FMT_OPENDENYMODES = 0x00001000
+VOL_CAP_FMT_HIDDEN_FILES = 0x00002000
+VOL_CAP_FMT_PATH_FROM_ID = 0x00004000
+VOL_CAP_FMT_NO_VOLUME_SIZES = 0x00008000
+VOL_CAP_FMT_DECMPFS_COMPRESSION = 0x00010000
+VOL_CAP_FMT_64BIT_OBJECT_IDS = 0x00020000
+
+VOL_CAP_INT_SEARCHFS = 0x00000001
+VOL_CAP_INT_ATTRLIST = 0x00000002
+VOL_CAP_INT_NFSEXPORT = 0x00000004
+VOL_CAP_INT_READDIRATTR = 0x00000008
+VOL_CAP_INT_EXCHANGEDATA = 0x00000010
+VOL_CAP_INT_COPYFILE = 0x00000020
+VOL_CAP_INT_ALLOCATE = 0x00000040
+VOL_CAP_INT_VOL_RENAME = 0x00000080
+VOL_CAP_INT_ADVLOCK = 0x00000100
+VOL_CAP_INT_FLOCK = 0x00000200
+VOL_CAP_INT_EXTENDED_SECURITY = 0x00000400
+VOL_CAP_INT_USERACCESS = 0x00000800
+VOL_CAP_INT_MANLOCK = 0x00001000
+VOL_CAP_INT_NAMEDSTREAMS = 0x00002000
+VOL_CAP_INT_EXTENDED_ATTR = 0x00004000
+VOL_CAP_INT_CLONE = 0x00010000
+VOL_CAP_INT_SNAPSHOT = 0x00020000
+VOL_CAP_INT_RENAME_SWAP = 0x00040000
+VOL_CAP_INT_RENAME_EXCL = 0x00080000
+VOL_CAP_INT_RENAME_OPENFAIL = 0x00100000
+
+ATTR_CMN_NAME = 0x00000001
+ATTR_CMN_DEVID = 0x00000002
+ATTR_CMN_FSID = 0x00000004
+ATTR_CMN_OBJTYPE = 0x00000008
+ATTR_CMN_OBJTAG = 0x00000010
+ATTR_CMN_OBJID = 0x00000020
+ATTR_CMN_OBJPERMANENTID = 0x00000040
+ATTR_CMN_PAROBJID = 0x00000080
+ATTR_CMN_SCRIPT = 0x00000100
+ATTR_CMN_CRTIME = 0x00000200
+ATTR_CMN_MODTIME = 0x00000400
+ATTR_CMN_CHGTIME = 0x00000800
+ATTR_CMN_ACCTIME = 0x00001000
+ATTR_CMN_BKUPTIME = 0x00002000
+ATTR_CMN_FNDRINFO = 0x00004000
+ATTR_CMN_OWNERID = 0x00008000
+ATTR_CMN_GRPID = 0x00010000
+ATTR_CMN_ACCESSMASK = 0x00020000
+ATTR_CMN_FLAGS = 0x00040000
+ATTR_CMN_GEN_COUNT = 0x00080000
+ATTR_CMN_DOCUMENT_ID = 0x00100000
+ATTR_CMN_USERACCESS = 0x00200000
+ATTR_CMN_EXTENDED_SECURITY = 0x00400000
+ATTR_CMN_UUID = 0x00800000
+ATTR_CMN_GRPUUID = 0x01000000
+ATTR_CMN_FILEID = 0x02000000
+ATTR_CMN_PARENTID = 0x04000000
+ATTR_CMN_FULLPATH = 0x08000000
+ATTR_CMN_ADDEDTIME = 0x10000000
+ATTR_CMN_ERROR = 0x20000000
+ATTR_CMN_DATA_PROTECT_FLAGS = 0x40000000
+ATTR_CMN_RETURNED_ATTRS = 0x80000000
+ATTR_CMN_ALL_ATTRS = 0xFFFFFFFF
+
+ATTR_CMN_VALIDMASK = 0xFFFFFFFF
+ATTR_CMN_SETMASK = 0x51C7FF00
+ATTR_CMN_VOLSETMASK = 0x00006700
+
+ATTR_VOL_FSTYPE = 0x00000001
+ATTR_VOL_SIGNATURE = 0x00000002
+ATTR_VOL_SIZE = 0x00000004
+ATTR_VOL_SPACEFREE = 0x00000008
+ATTR_VOL_SPACEAVAIL = 0x00000010
+ATTR_VOL_MINALLOCATION = 0x00000020
+ATTR_VOL_ALLOCATIONCLUMP = 0x00000040
+ATTR_VOL_IOBLOCKSIZE = 0x00000080
+ATTR_VOL_OBJCOUNT = 0x00000100
+ATTR_VOL_FILECOUNT = 0x00000200
+ATTR_VOL_DIRCOUNT = 0x00000400
+ATTR_VOL_MAXOBJCOUNT = 0x00000800
+ATTR_VOL_MOUNTPOINT = 0x00001000
+ATTR_VOL_NAME = 0x00002000
+ATTR_VOL_MOUNTFLAGS = 0x00004000
+ATTR_VOL_MOUNTEDDEVICE = 0x00008000
+ATTR_VOL_ENCODINGSUSED = 0x00010000
+ATTR_VOL_CAPABILITIES = 0x00020000
+ATTR_VOL_UUID = 0x00040000
+ATTR_VOL_QUOTA_SIZE = 0x10000000
+ATTR_VOL_RESERVED_SIZE = 0x20000000
+ATTR_VOL_ATTRIBUTES = 0x40000000
+ATTR_VOL_INFO = 0x80000000
+ATTR_VOL_ALL_ATTRS = 0xF007FFFF
+
+ATTR_DIR_LINKCOUNT = 0x00000001
+ATTR_DIR_ENTRYCOUNT = 0x00000002
+ATTR_DIR_MOUNTSTATUS = 0x00000004
+DIR_MNTSTATUS_MNTPOINT = 0x00000001
+DIR_MNTSTATUS_TRIGGER = 0x00000002
+ATTR_DIR_ALLOCSIZE = 0x00000008
+ATTR_DIR_IOBLOCKSIZE = 0x00000010
+ATTR_DIR_DATALENGTH = 0x00000020
+ATTR_DIR_ALL_ATTRS = 0x0000003F
+
+ATTR_DIR_VALIDMASK = 0x0000003F
+ATTR_DIR_SETMASK = 0x00000000
+
+ATTR_FILE_LINKCOUNT = 0x00000001
+ATTR_FILE_TOTALSIZE = 0x00000002
+ATTR_FILE_ALLOCSIZE = 0x00000004
+ATTR_FILE_IOBLOCKSIZE = 0x00000008
+ATTR_FILE_DEVTYPE = 0x00000020
+ATTR_FILE_FORKCOUNT = 0x00000080
+ATTR_FILE_FORKLIST = 0x00000100
+ATTR_FILE_DATALENGTH = 0x00000200
+ATTR_FILE_DATAALLOCSIZE = 0x00000400
+ATTR_FILE_RSRCLENGTH = 0x00001000
+ATTR_FILE_RSRCALLOCSIZE = 0x00002000
+ATTR_FILE_ALL_ATTRS = 0x000037FF
+
+ATTR_FILE_VALIDMASK = 0x000037FF
+ATTR_FILE_SETMASK = 0x00000020
+
+# These are deprecated
+ATTR_FORK_TOTALSIZE = 0x00000001
+ATTR_FORK_ALLOCSIZE = 0x00000002
+ATTR_FORK_ALL_ATTRS = 0x00000003
+
+# These go in the fork attribute field
+ATTR_CMNEXT_RELPATH = 0x00000004
+ATTR_CMNEXT_PRIVATESIZE = 0x00000008
+ATTR_CMNEXT_LINKID = 0x0000010
+ATTR_CMNEXT_NOFIRMLINKPATH = 0x00000020
+ATTR_CMNEXT_REALDEVID = 0x00000040
+ATTR_CMNEXT_REALFSID = 0x00000080
+ATTR_CMNEXT_CLONEID = 0x00000100
+ATTR_CMNEXT_EXT_FLAGS = 0x00000200
+ATTR_CMNEXT_RECURSIVE_GENCOUNT = 0x00000400
+ATTR_CMNEXT_ALL_ATTRS = 0x000007FC
+
+ATTR_CMNEXT_VALIDMASK = 0x000007FC
+ATTR_CMNEXT_SETMASK = 0x00000000
+
+ATTR_FORK_VALIDMASK = 0x00000003
+ATTR_FORK_SETMASK = 0x00000000
 
 # These can't be used
-ATTR_FILE_FORKCOUNT			          = 0x00000080
-ATTR_FILE_FORKLIST			          = 0x00000100
-ATTR_CMN_NAMEDATTRCOUNT			      = 0x00080000
-ATTR_CMN_NAMEDATTRLIST			      = 0x00100000
-ATTR_FILE_DATAEXTENTS			      = 0x00000800
-ATTR_FILE_RSRCEXTENTS			      = 0x00004000
-ATTR_FILE_CLUMPSIZE			          = 0x00000010
-ATTR_FILE_FILETYPE			          = 0x00000040
+ATTR_CMN_NAMEDATTRCOUNT = 0x00080000
+ATTR_CMN_NAMEDATTRLIST = 0x00100000
+ATTR_FILE_CLUMPSIZE = 0x00000010
+ATTR_FILE_FILETYPE = 0x00000040
+ATTR_FILE_DATAEXTENTS = 0x00000800
+ATTR_FILE_RSRCEXTENTS = 0x00004000
+
 
 class attrlist(Structure):
-    _fields_ = [('bitmapcount', c_ushort),
-                ('reserved', c_ushort),
-                ('commonattr', c_uint),
-                ('volattr', c_uint),
-                ('dirattr', c_uint),
-                ('fileattr', c_uint),
-                ('forkattr', c_uint)]
+    _fields_ = [
+        ("bitmapcount", c_ushort),
+        ("reserved", c_ushort),
+        ("commonattr", c_uint),
+        ("volattr", c_uint),
+        ("dirattr", c_uint),
+        ("fileattr", c_uint),
+        ("forkattr", c_uint),
+    ]
+
 
 class attribute_set_t(Structure):
-    _fields_ = [('commonattr', c_uint),
-                ('volattr', c_uint),
-                ('dirattr', c_uint),
-                ('fileattr', c_uint),
-                ('forkattr', c_uint)]
+    _fields_ = [
+        ("commonattr", c_uint),
+        ("volattr", c_uint),
+        ("dirattr", c_uint),
+        ("fileattr", c_uint),
+        ("forkattr", c_uint),
+    ]
+
 
 class fsobj_id_t(Structure):
-    _fields_ = [('fid_objno', c_uint),
-                ('fid_generation', c_uint)]
+    _fields_ = [
+        ("fid_objno", c_uint),
+        ("fid_generation", c_uint),
+    ]
+
 
 class timespec(Structure):
-    _fields_ = [('tv_sec', c_long),
-                ('tv_nsec', c_long)]
+    _fields_ = [
+        ("tv_sec", c_long),
+        ("tv_nsec", c_long),
+    ]
+
 
 class attrreference_t(Structure):
-    _fields_ = [('attr_dataoffset', c_int),
-                ('attr_length', c_uint)]
+    _fields_ = [
+        ("attr_dataoffset", c_int),
+        ("attr_length", c_uint),
+    ]
+
 
 class fsid_t(Structure):
-    _fields_ = [('val', c_uint * 2)]
+    _fields_ = [
+        ("val", c_uint * 2),
+    ]
+
 
 class guid_t(Structure):
-    _fields_ = [('g_guid', c_byte*16)]
+    _fields_ = [
+        ("g_guid", c_byte * 16),
+    ]
+
 
 class kauth_ace(Structure):
-    _fields_ = [('ace_applicable', guid_t),
-                ('ace_flags', c_uint)]
+    _fields_ = [
+        ("ace_applicable", guid_t),
+        ("ace_flags", c_uint),
+    ]
+
 
 class kauth_acl(Structure):
-    _fields_ = [('acl_entrycount', c_uint),
-                ('acl_flags', c_uint),
-                ('acl_ace', kauth_ace * 128)]
+    _fields_ = [
+        ("acl_entrycount", c_uint),
+        ("acl_flags", c_uint),
+        ("acl_ace", kauth_ace * 128),
+    ]
+
 
 class kauth_filesec(Structure):
-    _fields_ = [('fsec_magic', c_uint),
-                ('fsec_owner', guid_t),
-                ('fsec_group', guid_t),
-                ('fsec_acl', kauth_acl)]
+    _fields_ = [
+        ("fsec_magic", c_uint),
+        ("fsec_owner", guid_t),
+        ("fsec_group", guid_t),
+        ("fsec_acl", kauth_acl),
+    ]
+
 
 class diskextent(Structure):
-    _fields_ = [('startblock', c_uint),
-                ('blockcount', c_uint)]
+    _fields_ = [
+        ("startblock", c_uint),
+        ("blockcount", c_uint),
+    ]
+
 
 OSType = c_uint
 UInt16 = c_ushort
 SInt16 = c_short
 SInt32 = c_int
 
+
 class Point(Structure):
-    _fields_ = [('x', SInt16),
-                ('y', SInt16)]
+    _fields_ = [
+        ("x", SInt16),
+        ("y", SInt16),
+    ]
+
+
 class Rect(Structure):
-    _fields_ = [('x', SInt16),
-                ('y', SInt16),
-                ('w', SInt16),
-                ('h', SInt16)]
+    _fields_ = [
+        ("x", SInt16),
+        ("y", SInt16),
+        ("w", SInt16),
+        ("h", SInt16),
+    ]
+
+
 class FileInfo(Structure):
-    _fields_ = [('fileType', OSType),
-                ('fileCreator', OSType),
-                ('finderFlags', UInt16),
-                ('location', Point),
-                ('reservedField', UInt16),
-                ('reserved1', SInt16 * 4),
-                ('extendedFinderFlags', UInt16),
-                ('reserved2', SInt16),
-                ('putAwayFolderID', SInt32)]
+    _fields_ = [
+        ("fileType", OSType),
+        ("fileCreator", OSType),
+        ("finderFlags", UInt16),
+        ("location", Point),
+        ("reservedField", UInt16),
+        ("reserved1", SInt16 * 4),
+        ("extendedFinderFlags", UInt16),
+        ("reserved2", SInt16),
+        ("putAwayFolderID", SInt32),
+    ]
+
+
 class FolderInfo(Structure):
-    _fields_ = [('windowBounds', Rect),
-                ('finderFlags', UInt16),
-                ('location', Point),
-                ('reservedField', UInt16),
-                ('scrollPosition', Point),
-                ('reserved1', SInt32),
-                ('extendedFinderFlags', UInt16),
-                ('reserved2', SInt16),
-                ('putAwayFolderID', SInt32)]
+    _fields_ = [
+        ("windowBounds", Rect),
+        ("finderFlags", UInt16),
+        ("location", Point),
+        ("reservedField", UInt16),
+        ("scrollPosition", Point),
+        ("reserved1", SInt32),
+        ("extendedFinderFlags", UInt16),
+        ("reserved2", SInt16),
+        ("putAwayFolderID", SInt32),
+    ]
+
+
 class FinderInfo(Union):
-    _fields_ = [('fileInfo', FileInfo),
-                ('folderInfo', FolderInfo)]
+    _fields_ = [
+        ("fileInfo", FileInfo),
+        ("folderInfo", FolderInfo),
+    ]
+
 
 extentrecord = diskextent * 8
-        
 vol_capabilities_set_t = c_uint * 4
 
+
 class vol_capabilities_attr_t(Structure):
-    _fields_ = [('capabilities', vol_capabilities_set_t),
-                ('valid', vol_capabilities_set_t)]
+    _fields_ = [
+        ("capabilities", vol_capabilities_set_t),
+        ("valid", vol_capabilities_set_t),
+    ]
+
 
 class vol_attributes_attr_t(Structure):
-    _fields_ = [('validattr', attribute_set_t),
-                ('nativeattr', attribute_set_t)]
+    _fields_ = [
+        ("validattr", attribute_set_t),
+        ("nativeattr", attribute_set_t),
+    ]
+
 
 dev_t = c_uint
 
@@ -298,28 +418,34 @@ int64_t = c_longlong
 uint64_t = c_ulonglong
 off_t = c_long
 size_t = c_ulong
-uuid_t = c_byte*16
+uuid_t = c_byte * 16
 
 NAME_MAX = 255
 PATH_MAX = 1024
+FSTYPE_MAX = 16
+
 
 class struct_statfs(Structure):
-    _fields_ = [('f_bsize', uint32_t),
-                ('f_iosize', int32_t),
-                ('f_blocks', uint64_t),
-                ('f_bfree', uint64_t),
-                ('f_bavail', uint64_t),
-                ('f_files', uint64_t),
-                ('f_ffree', uint64_t),
-                ('f_fsid', fsid_t),
-                ('f_owner', uid_t),
-                ('f_type', uint32_t),
-                ('f_flags', uint32_t),
-                ('f_fssubtype', uint32_t),
-                ('f_fstypename', c_char * 16),
-                ('f_mntonname', c_char * PATH_MAX),
-                ('f_mntfromname', c_char * PATH_MAX),
-                ('f_reserved', uint32_t * 8)]
+    _fields_ = [
+        ("f_bsize", uint32_t),
+        ("f_iosize", int32_t),
+        ("f_blocks", uint64_t),
+        ("f_bfree", uint64_t),
+        ("f_bavail", uint64_t),
+        ("f_files", uint64_t),
+        ("f_ffree", uint64_t),
+        ("f_fsid", fsid_t),
+        ("f_owner", uid_t),
+        ("f_type", uint32_t),
+        ("f_flags", uint32_t),
+        ("f_fssubtype", uint32_t),
+        ("f_fstypename", c_char * FSTYPE_MAX),
+        ("f_mntonname", c_char * PATH_MAX),
+        ("f_mntfromname", c_char * PATH_MAX),
+        ("f_flags_ext", uint32_t),
+        ("f_reserved", uint32_t * 7),
+    ]
+
 
 # Calculate the maximum number of bytes required for the attribute buffer
 _attr_info = (
@@ -330,6 +456,7 @@ _attr_info = (
     (0, ATTR_CMN_FSID, sizeof(fsid_t)),
     (0, ATTR_CMN_OBJTYPE, sizeof(fsobj_type_t)),
     (0, ATTR_CMN_OBJTAG, sizeof(fsobj_tag_t)),
+    (0, ATTR_CMN_OBJID, sizeof(fsobj_id_t)),
     (0, ATTR_CMN_OBJPERMANENTID, sizeof(fsobj_id_t)),
     (0, ATTR_CMN_PAROBJID, sizeof(fsobj_id_t)),
     (0, ATTR_CMN_SCRIPT, sizeof(text_encoding_t)),
@@ -345,6 +472,8 @@ _attr_info = (
     (0, ATTR_CMN_NAMEDATTRCOUNT, None),
     (0, ATTR_CMN_NAMEDATTRLIST, None),
     (0, ATTR_CMN_FLAGS, sizeof(uint32_t)),
+    (0, ATTR_CMN_GEN_COUNT, sizeof(uint32_t)),
+    (0, ATTR_CMN_DOCUMENT_ID, sizeof(uint32_t)),
     (0, ATTR_CMN_USERACCESS, sizeof(uint32_t)),
     (0, ATTR_CMN_EXTENDED_SECURITY, sizeof(attrreference_t) + sizeof(kauth_filesec)),
     (0, ATTR_CMN_UUID, sizeof(guid_t)),
@@ -353,7 +482,7 @@ _attr_info = (
     (0, ATTR_CMN_PARENTID, sizeof(uint64_t)),
     (0, ATTR_CMN_FULLPATH, sizeof(attrreference_t) + PATH_MAX),
     (0, ATTR_CMN_ADDEDTIME, sizeof(timespec)),
-
+    (0, ATTR_CMN_DATA_PROTECT_FLAGS, sizeof(uint32_t)),
     # Volume attributes
     (1, ATTR_VOL_FSTYPE, sizeof(uint32_t)),
     (1, ATTR_VOL_SIGNATURE, sizeof(uint32_t)),
@@ -374,13 +503,16 @@ _attr_info = (
     (1, ATTR_VOL_ENCODINGSUSED, sizeof(c_ulonglong)),
     (1, ATTR_VOL_CAPABILITIES, sizeof(vol_capabilities_attr_t)),
     (1, ATTR_VOL_UUID, sizeof(uuid_t)),
+    (1, ATTR_VOL_QUOTA_SIZE, sizeof(off_t)),
+    (1, ATTR_VOL_RESERVED_SIZE, sizeof(off_t)),
     (1, ATTR_VOL_ATTRIBUTES, sizeof(vol_attributes_attr_t)),
-
     # Directory attributes
     (2, ATTR_DIR_LINKCOUNT, sizeof(uint32_t)),
     (2, ATTR_DIR_ENTRYCOUNT, sizeof(uint32_t)),
     (2, ATTR_DIR_MOUNTSTATUS, sizeof(uint32_t)),
-
+    (2, ATTR_DIR_ALLOCSIZE, sizeof(off_t)),
+    (2, ATTR_DIR_IOBLOCKSIZE, sizeof(uint32_t)),
+    (2, ATTR_DIR_DATALENGTH, sizeof(off_t)),
     # File attributes
     (3, ATTR_FILE_LINKCOUNT, sizeof(uint32_t)),
     (3, ATTR_FILE_TOTALSIZE, sizeof(off_t)),
@@ -397,22 +529,33 @@ _attr_info = (
     (3, ATTR_FILE_RSRCLENGTH, sizeof(off_t)),
     (3, ATTR_FILE_RSRCALLOCSIZE, sizeof(off_t)),
     (3, ATTR_FILE_RSRCEXTENTS, sizeof(extentrecord)),
-
     # Fork attributes
     (4, ATTR_FORK_TOTALSIZE, sizeof(off_t)),
-    (4, ATTR_FORK_ALLOCSIZE, sizeof(off_t))
-    )
-    
+    (4, ATTR_FORK_ALLOCSIZE, sizeof(off_t)),
+    # Extended common attributes
+    (4, ATTR_CMNEXT_RELPATH, sizeof(attrreference_t) + PATH_MAX),
+    (4, ATTR_CMNEXT_PRIVATESIZE, sizeof(off_t)),
+    (4, ATTR_CMNEXT_LINKID, sizeof(uint64_t)),
+    (4, ATTR_CMNEXT_NOFIRMLINKPATH, sizeof(attrreference_t) + PATH_MAX),
+    (4, ATTR_CMNEXT_REALDEVID, sizeof(dev_t)),
+    (4, ATTR_CMNEXT_REALFSID, sizeof(fsid_t)),
+    (4, ATTR_CMNEXT_CLONEID, sizeof(uint64_t)),
+    (4, ATTR_CMNEXT_EXT_FLAGS, sizeof(uint64_t)),
+)
+
+
 def _attrbuf_size(attrs):
     size = 4
     for entry in _attr_info:
         if attrs[entry[0]] & entry[1]:
             if entry[2] is None:
-                raise ValueError('Unsupported attribute (%u, %x)'
-                                 % (entry[0], entry[1]))
+                raise ValueError(
+                    "Unsupported attribute (%u, %x)" % (entry[0], entry[1])
+                )
             size += entry[2]
     return size
 
+
 _getattrlist = libc.getattrlist
 _getattrlist.argtypes = [c_char_p, POINTER(attrlist), c_void_p, c_ulong, c_ulong]
 _getattrlist.restype = c_int
@@ -421,23 +564,40 @@ _fgetattrlist = libc.fgetattrlist
 _fgetattrlist.argtypes = [c_int, POINTER(attrlist), c_void_p, c_ulong, c_ulong]
 _fgetattrlist.restype = c_int
 
-_statfs = libc['statfs$INODE64']
-_statfs.argtypes = [c_char_p, POINTER(struct_statfs)]
+try:
+    _statfs = libc["statfs$INODE64"]
+except (KeyError, AttributeError):
+    _statfs = libc["statfs"]
+
+_statfs.argtypes = [
+    c_char_p,
+    POINTER(struct_statfs),
+]
 _statfs.restype = c_int
 
-_fstatfs = libc['fstatfs$INODE64']
-_fstatfs.argtypes = [c_int, POINTER(struct_statfs)]
+try:
+    _fstatfs = libc["fstatfs$INODE64"]
+except (KeyError, AttributeError):
+    _fstatfs = libc["fstatfs"]
+
+_fstatfs.argtypes = [
+    c_int,
+    POINTER(struct_statfs),
+]
 _fstatfs.restype = c_int
 
+
 def _datetime_from_timespec(ts):
     td = datetime.timedelta(seconds=ts.tv_sec + 1.0e-9 * ts.tv_nsec)
     return unix_epoch + td
 
+
 def _decode_utf8_nul(sz):
-    nul = sz.find(b'\0')
+    nul = sz.find(b"\0")
     if nul > -1:
         sz = sz[:nul]
-    return sz.decode('utf-8')
+    return sz.decode("utf-8")
+
 
 def _decode_attrlist_result(buf, attrs, options):
     result = []
@@ -452,14 +612,14 @@ def _decode_attrlist_result(buf, attrs, options):
     if attrs[0] & ATTR_CMN_RETURNED_ATTRS:
         a = attribute_set_t.from_buffer(buf, offset)
         result.append(a)
-        offset += sizeof (attribute_set_t)
+        offset += sizeof(attribute_set_t)
         if not (options & FSOPT_PACK_INVAL_ATTRS):
             attrs = [a.commonattr, a.volattr, a.dirattr, a.fileattr, a.forkattr]
     if attrs[0] & ATTR_CMN_NAME:
         a = attrreference_t.from_buffer(buf, offset)
         ofs = offset + a.attr_dataoffset
-        name = _decode_utf8_nul(buf[ofs:ofs+a.attr_length])
-        offset += sizeof (attrreference_t)
+        name = _decode_utf8_nul(buf[ofs : ofs + a.attr_length])
+        offset += sizeof(attrreference_t)
         result.append(name)
     if attrs[0] & ATTR_CMN_DEVID:
         a = dev_t.from_buffer(buf, offset)
@@ -533,6 +693,14 @@ def _decode_attrlist_result(buf, attrs, options):
         a = uint32_t.from_buffer(buf, offset)
         offset += sizeof(uint32_t)
         result.append(a.value)
+    if attrs[0] & ATTR_CMN_GEN_COUNT:
+        a = uint32_t.from_buffer(buf, offset)
+        offset += sizeof(uint32_t)
+        result.append(a.value)
+    if attrs[0] & ATTR_CMN_DOCUMENT_ID:
+        a = uint32_t.from_buffer(buf, offset)
+        offset += sizeof(uint32_t)
+        result.append(a.value)
     if attrs[0] & ATTR_CMN_USERACCESS:
         a = uint32_t.from_buffer(buf, offset)
         offset += sizeof(uint32_t)
@@ -542,22 +710,29 @@ def _decode_attrlist_result(buf, attrs, options):
         ofs = offset + a.attr_dataoffset
         offset += sizeof(attrreference_t)
         ec = uint32_t.from_buffer(buf, ofs + 36).value
+
         class kauth_acl(Structure):
-            _fields_ = [('acl_entrycount', c_uint),
-                        ('acl_flags', c_uint),
-                        ('acl_ace', kauth_ace * ec)]
+            _fields_ = [
+                ("acl_entrycount", c_uint),
+                ("acl_flags", c_uint),
+                ("acl_ace", kauth_ace * ec),
+            ]
+
         class kauth_filesec(Structure):
-            _fields_ = [('fsec_magic', c_uint),
-                        ('fsec_owner', guid_t),
-                        ('fsec_group', guid_t),
-                        ('fsec_acl', kauth_acl)]
+            _fields_ = [
+                ("fsec_magic", c_uint),
+                ("fsec_owner", guid_t),
+                ("fsec_group", guid_t),
+                ("fsec_acl", kauth_acl),
+            ]
+
         a = kauth_filesec.from_buffer(buf, ofs)
         result.append(a)
     if attrs[0] & ATTR_CMN_UUID:
-        result.append(uuid.UUID(bytes=buf[offset:offset+16]))
+        result.append(uuid.UUID(bytes=buf[offset : offset + 16]))
         offset += sizeof(guid_t)
     if attrs[0] & ATTR_CMN_GRPUUID:
-        result.append(uuid.UUID(bytes=buf[offset:offset+16]))
+        result.append(uuid.UUID(bytes=buf[offset : offset + 16]))
         offset += sizeof(guid_t)
     if attrs[0] & ATTR_CMN_FILEID:
         a = uint64_t.from_buffer(buf, offset)
@@ -570,13 +745,17 @@ def _decode_attrlist_result(buf, attrs, options):
     if attrs[0] & ATTR_CMN_FULLPATH:
         a = attrreference_t.from_buffer(buf, offset)
         ofs = offset + a.attr_dataoffset
-        path = _decode_utf8_nul(buf[ofs:ofs+a.attr_length])
-        offset += sizeof (attrreference_t)
+        path = _decode_utf8_nul(buf[ofs : ofs + a.attr_length])
+        offset += sizeof(attrreference_t)
         result.append(path)
     if attrs[0] & ATTR_CMN_ADDEDTIME:
         a = timespec.from_buffer(buf, offset)
         offset += sizeof(timespec)
         result.append(_datetime_from_timespec(a))
+    if attrs[0] & ATTR_CMN_DATA_PROTECT_FLAGS:
+        a = uint32_t.from_buffer(buf, offset)
+        offset += sizeof(uint32_t)
+        result.append(a.value)
 
     # Volume attributes
     if attrs[1] & ATTR_VOL_FSTYPE:
@@ -630,14 +809,14 @@ def _decode_attrlist_result(buf, attrs, options):
     if attrs[1] & ATTR_VOL_MOUNTPOINT:
         a = attrreference_t.from_buffer(buf, offset)
         ofs = offset + a.attr_dataoffset
-        path = _decode_utf8_nul(buf[ofs:ofs+a.attr_length])
-        offset += sizeof (attrreference_t)
+        path = _decode_utf8_nul(buf[ofs : ofs + a.attr_length])
+        offset += sizeof(attrreference_t)
         result.append(path)
     if attrs[1] & ATTR_VOL_NAME:
         a = attrreference_t.from_buffer(buf, offset)
         ofs = offset + a.attr_dataoffset
-        name = _decode_utf8_nul(buf[ofs:ofs+a.attr_length])
-        offset += sizeof (attrreference_t)
+        name = _decode_utf8_nul(buf[ofs : ofs + a.attr_length])
+        offset += sizeof(attrreference_t)
         result.append(name)
     if attrs[1] & ATTR_VOL_MOUNTFLAGS:
         a = uint32_t.from_buffer(buf, offset)
@@ -646,8 +825,8 @@ def _decode_attrlist_result(buf, attrs, options):
     if attrs[1] & ATTR_VOL_MOUNTEDDEVICE:
         a = attrreference_t.from_buffer(buf, offset)
         ofs = offset + a.attr_dataoffset
-        path = _decode_utf8_nul(buf[ofs:ofs+a.attr_length])
-        offset += sizeof (attrreference_t)
+        path = _decode_utf8_nul(buf[ofs : ofs + a.attr_length])
+        offset += sizeof(attrreference_t)
         result.append(path)
     if attrs[1] & ATTR_VOL_ENCODINGSUSED:
         a = c_ulonglong.from_buffer(buf, offset)
@@ -658,8 +837,16 @@ def _decode_attrlist_result(buf, attrs, options):
         offset += sizeof(vol_capabilities_attr_t)
         result.append(a)
     if attrs[1] & ATTR_VOL_UUID:
-        result.append(uuid.UUID(bytes=buf[offset:offset+16]))
+        result.append(uuid.UUID(bytes=buf[offset : offset + 16]))
         offset += sizeof(uuid_t)
+    if attrs[1] & ATTR_VOL_QUOTA_SIZE:
+        a = off_t.from_buffer(buf, offset)
+        offset += sizeof(off_t)
+        result.append(a.value)
+    if attrs[1] & ATTR_VOL_RESERVED_SIZE:
+        a = off_t.from_buffer(buf, offset)
+        offset += sizeof(off_t)
+        result.append(a.value)
     if attrs[1] & ATTR_VOL_ATTRIBUTES:
         a = vol_attributes_attr_t.from_buffer(buf, offset)
         offset += sizeof(vol_attributes_attr_t)
@@ -678,6 +865,18 @@ def _decode_attrlist_result(buf, attrs, options):
         a = uint32_t.from_buffer(buf, offset)
         offset += sizeof(uint32_t)
         result.append(a.value)
+    if attrs[2] & ATTR_DIR_ALLOCSIZE:
+        a = off_t.from_buffer(buf, offset)
+        offset += sizeof(off_t)
+        result.append(a.value)
+    if attrs[2] & ATTR_DIR_IOBLOCKSIZE:
+        a = uint32_t.from_buffer(buf, offset)
+        offset += sizeof(uint32_t)
+        result.append(a.value)
+    if attrs[2] & ATTR_DIR_DATALENGTH:
+        a = off_t.from_buffer(buf, offset)
+        offset += sizeof(off_t)
+        result.append(a.value)
 
     # File attributes
     if attrs[3] & ATTR_FILE_LINKCOUNT:
@@ -746,34 +945,78 @@ def _decode_attrlist_result(buf, attrs, options):
         a = off_t.from_buffer(buf, offset)
         offset += sizeof(off_t)
         result.append(a.value)
-        
+
+    # Extended common attributes
+    if attrs[4] & ATTR_CMNEXT_RELPATH:
+        a = attrreference_t.from_buffer(buf, offset)
+        ofs = offset + a.attr_dataoffset
+        path = _decode_utf8_nul(buf[ofs : ofs + a.attr_length])
+        offset += sizeof(attrreference_t)
+        result.append(path)
+    if attrs[4] & ATTR_CMNEXT_PRIVATESIZE:
+        a = off_t.from_buffer(buf, offset)
+        offset += sizeof(off_t)
+        result.append(a.value)
+    if attrs[4] & ATTR_CMNEXT_LINKID:
+        a = uint64_t.from_buffer(buf, offset)
+        offset += sizeof(uint64_t)
+        result.append(a.value)
+    if attrs[4] & ATTR_CMNEXT_NOFIRMLINKPATH:
+        a = attrreference_t.from_buffer(buf, offset)
+        ofs = offset + a.attr_dataoffset
+        path = _decode_utf8_nul(buf[ofs : ofs + a.attr_length])
+        offset += sizeof(attrreference_t)
+        result.append(path)
+    if attrs[4] & ATTR_CMNEXT_REALDEVID:
+        a = dev_t.from_buffer(buf, offset)
+        offset += sizeof(dev_t)
+        result.append(a.value)
+    if attrs[4] & ATTR_CMNEXT_REALFSID:
+        a = fsid_t.from_buffer(buf, offset)
+        offset += sizeof(fsid_t)
+        result.append(a.value)
+    if attrs[4] & ATTR_CMNEXT_CLONEID:
+        a = uint64_t.from_buffer(buf, offset)
+        offset += sizeof(uint64_t)
+        result.append(a.value)
+    if attrs[4] & ATTR_CMNEXT_EXT_FLAGS:
+        a = uint64_t.from_buffer(buf, offset)
+        offset += sizeof(uint64_t)
+        result.append(a.value)
+
     return result
 
+
 # Sadly, ctypes.get_errno() seems not to work
 __error = libc.__error
 __error.restype = POINTER(c_int)
 
+
 def _get_errno():
     return __error().contents.value
-                
+
+
 def getattrlist(path, attrs, options):
     if not isinstance(path, bytes):
-        path = path.encode('utf-8')
+        path = path.encode("utf-8")
     attrs = list(attrs)
     if attrs[1]:
         attrs[1] |= ATTR_VOL_INFO
-    alist = attrlist(bitmapcount=5,
-                     commonattr=attrs[0],
-                     volattr=attrs[1],
-                     dirattr=attrs[2],
-                     fileattr=attrs[3],
-                     forkattr=attrs[4])
+    alist = attrlist(
+        bitmapcount=5,
+        commonattr=attrs[0],
+        volattr=attrs[1],
+        dirattr=attrs[2],
+        fileattr=attrs[3],
+        forkattr=attrs[4],
+    )
 
     bufsize = _attrbuf_size(attrs)
     buf = create_string_buffer(bufsize)
 
-    ret = _getattrlist(path, byref(alist), buf, bufsize,
-                       options | FSOPT_REPORT_FULLSIZE)
+    ret = _getattrlist(
+        path, byref(alist), buf, bufsize, options | FSOPT_REPORT_FULLSIZE
+    )
 
     if ret < 0:
         err = _get_errno()
@@ -781,24 +1024,26 @@ def getattrlist(path, attrs, options):
 
     return _decode_attrlist_result(buf, attrs, options)
 
+
 def fgetattrlist(fd, attrs, options):
-    if hasattr(fd, 'fileno'):
+    if hasattr(fd, "fileno"):
         fd = fd.fileno()
     attrs = list(attrs)
     if attrs[1]:
         attrs[1] |= ATTR_VOL_INFO
-    alist = attrlist(bitmapcount=5,
-                     commonattr=attrs[0],
-                     volattr=attrs[1],
-                     dirattr=attrs[2],
-                     fileattr=attrs[3],
-                     forkattr=attrs[4])
+    alist = attrlist(
+        bitmapcount=5,
+        commonattr=attrs[0],
+        volattr=attrs[1],
+        dirattr=attrs[2],
+        fileattr=attrs[3],
+        forkattr=attrs[4],
+    )
 
     bufsize = _attrbuf_size(attrs)
     buf = create_string_buffer(bufsize)
 
-    ret = _fgetattrlist(fd, byref(alist), buf, bufsize,
-                        options | FSOPT_REPORT_FULLSIZE)
+    ret = _fgetattrlist(fd, byref(alist), buf, bufsize, options | FSOPT_REPORT_FULLSIZE)
 
     if ret < 0:
         err = _get_errno()
@@ -806,9 +1051,10 @@ def fgetattrlist(fd, attrs, options):
 
     return _decode_attrlist_result(buf, attrs, options)
 
+
 def statfs(path):
     if not isinstance(path, bytes):
-        path = path.encode('utf-8')
+        path = path.encode("utf-8")
     result = struct_statfs()
     ret = _statfs(path, byref(result))
     if ret < 0:
@@ -816,8 +1062,9 @@ def statfs(path):
         raise OSError(err, os.strerror(err), path)
     return result
 
+
 def fstatfs(fd):
-    if hasattr(fd, 'fileno'):
+    if hasattr(fd, "fileno"):
         fd = fd.fileno()
     result = struct_statfs()
     ret = _fstatfs(fd, byref(result))
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/qt_attribution.json b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/qt_attribution.json
index 968b6318c..968b6318c 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/qt_attribution.json
+++ b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/qt_attribution.json
diff --git a/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/utils.py b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/utils.py
new file mode 100644
index 000000000..3bf45155c
--- /dev/null
+++ b/src/3rdparty/python/lib/python3.9/site-packages/mac_alias/utils.py
@@ -0,0 +1,20 @@
+import datetime
+
+ZERO = datetime.timedelta(0)
+
+
+class UTC(datetime.tzinfo):
+    def utcoffset(self, dt):
+        return ZERO
+
+    def dst(self, dt):
+        return ZERO
+
+    def tzname(self, dt):
+        return "UTC"
+
+
+utc = UTC()
+mac_epoch = datetime.datetime(1904, 1, 1, 0, 0, 0, 0, utc)
+unix_epoch = datetime.datetime(1970, 1, 1, 0, 0, 0, 0, utc)
+osx_epoch = datetime.datetime(2001, 1, 1, 0, 0, 0, 0, utc)
diff --git a/src/app/app.pri b/src/app/app.pri
deleted file mode 100644
index 5cd9cb4aa..000000000
--- a/src/app/app.pri
+++ /dev/null
@@ -1,23 +0,0 @@
-include(../install_prefix.pri)
-
-QT = core
-TEMPLATE = app
-DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_PROCESS_COMBINED_ARGUMENT_START
-!isEmpty(QBS_APPS_DESTDIR):DESTDIR = $${QBS_APPS_DESTDIR}
-else:DESTDIR = ../../../bin
-
-!isEmpty(QBS_APPS_RPATH_DIR) {
-    linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${QBS_APPS_RPATH_DIR}\'
-    macx:QMAKE_LFLAGS += -Wl,-rpath,$${QBS_APPS_RPATH_DIR}
-}
-
-CONFIG += console
-CONFIG -= app_bundle
-CONFIG += c++17
-
-include($${PWD}/../lib/corelib/use_corelib.pri)
-include($${PWD}/shared/logging/logging.pri)
-
-!isEmpty(QBS_APPS_INSTALL_DIR):target.path = $${QBS_APPS_INSTALL_DIR}
-else:target.path = $${QBS_INSTALL_PREFIX}/bin
-INSTALLS += target
diff --git a/src/app/app.pro b/src/app/app.pro
deleted file mode 100644
index 935ce1776..000000000
--- a/src/app/app.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS =\
-    qbs\
-    qbs-create-project \
-    qbs-setup-android \
-    qbs-setup-toolchains \
-    qbs-setup-qt \
-    config
-
-!isEmpty(QT.widgets.name):SUBDIRS += config-ui
diff --git a/src/app/config-ui/config-ui.pro b/src/app/config-ui/config-ui.pro
deleted file mode 100644
index 84d3b3e4d..000000000
--- a/src/app/config-ui/config-ui.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-include(../app.pri)
-
-CONFIG -= console
-QT += gui widgets
-
-TARGET = qbs-config-ui
-
-HEADERS += \
-    commandlineparser.h \
-    mainwindow.h
-
-SOURCES += \
-    commandlineparser.cpp \
-    main.cpp \
-    mainwindow.cpp
-
-OTHER_FILES += \
-    Info.plist
-
-osx {
-    QMAKE_LFLAGS += -sectcreate __TEXT __info_plist $$shell_quote($$PWD/Info.plist)
-    OBJECTIVE_SOURCES += fgapp.mm
-    LIBS += -framework ApplicationServices -framework Cocoa
-}
-
-FORMS += mainwindow.ui
diff --git a/src/app/config-ui/mainwindow.cpp b/src/app/config-ui/mainwindow.cpp
index aaab1ddf7..31239dc41 100644
--- a/src/app/config-ui/mainwindow.cpp
+++ b/src/app/config-ui/mainwindow.cpp
@@ -67,7 +67,7 @@ class TrimValidator : public QValidator
 public:
     explicit TrimValidator(QObject *parent = nullptr) : QValidator(parent) {}
 
-public: // QValidator interface
+    // QValidator interface
     State validate(QString &input, int &pos) const override
     {
         Q_UNUSED(pos);
diff --git a/src/app/config/config.pro b/src/app/config/config.pro
deleted file mode 100644
index 278c481d1..000000000
--- a/src/app/config/config.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-include(../app.pri)
-
-TARGET = qbs-config
-
-SOURCES += \
-    configcommandexecutor.cpp \
-    configcommandlineparser.cpp \
-    configmain.cpp
-
-HEADERS += \
-    configcommand.h \
-    configcommandexecutor.h \
-    configcommandlineparser.h
diff --git a/src/app/config/configcommandexecutor.cpp b/src/app/config/configcommandexecutor.cpp
index a01058b11..cbcb5ee73 100644
--- a/src/app/config/configcommandexecutor.cpp
+++ b/src/app/config/configcommandexecutor.cpp
@@ -49,11 +49,52 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qtextstream.h>
+#include <QtCore/qjsondocument.h>
+#include <QtCore/qjsonobject.h>
 
 #include <cstdio>
 
 using namespace qbs;
 
+static QJsonObject settingsToJSONObject(
+    Settings &settings, qbs::Settings::Scopes scopes, const QString &parentGroup = {})
+{
+    QJsonObject result;
+
+    const auto allKeys = settings.directChildren(parentGroup, scopes);
+    for (const auto& key : allKeys) {
+        const auto fullKey = parentGroup.isEmpty()
+            ? key
+            : QStringLiteral("%1.%2").arg(parentGroup, key);
+        const auto value = settings.value(fullKey, scopes);
+        if (value.isValid()) { // looks like a real value
+            result[key] = QJsonValue::fromVariant(value);
+        } else { // looks like a group
+            result[key] = settingsToJSONObject(settings, scopes, fullKey);
+        }
+    }
+
+    return result;
+}
+
+static void settingsFromJSONObject(
+    Settings &settings, const QJsonObject &object, const QString &parentGroup = {})
+{
+    for (auto it = object.begin(), end = object.end(); it != end; ++it) {
+        const auto key = it.key();
+        const auto value = it.value();
+        const auto fullKey = parentGroup.isEmpty()
+            ? key
+            : QStringLiteral("%1.%2").arg(parentGroup, key);
+        if (value.isObject()) {
+            settingsFromJSONObject(settings, it.value().toObject(), fullKey);
+        } else {
+            settings.setValue(fullKey, value.toVariant());
+        }
+    }
+}
+
+
 ConfigCommandExecutor::ConfigCommandExecutor(Settings *settings, Settings::Scopes scope)
     : m_settings(settings), m_scope(scope)
 {
@@ -90,10 +131,10 @@ void ConfigCommandExecutor::execute(const ConfigCommand &command)
         break;
     case ConfigCommand::CfgImport:
         // Display old and new settings, in case import fails or user accidentally nukes everything
-        printf("old "); // Will end up as "old settings:"
+        std::printf("old "); // Will end up as "old settings:"
         printSettings(command);
         importSettings(command.fileName);
-        printf("\nnew ");
+        std::printf("\nnew ");
         printSettings(command);
         break;
     case ConfigCommand::CfgNone:
@@ -128,7 +169,7 @@ void ConfigCommandExecutor::printSettings(const ConfigCommand &command)
 
 void ConfigCommandExecutor::printOneSetting(const QString &key)
 {
-    printf("%s: %s\n", qPrintable(key),
+    std::printf("%s: %s\n", qPrintable(key),
            qPrintable(qbs::settingsValueToRepresentation(m_settings->value(key, m_scope))));
  }
 
@@ -139,12 +180,20 @@ void ConfigCommandExecutor::exportSettings(const QString &filename)
         throw ErrorInfo(tr("Could not open file '%1' for writing: %2")
                 .arg(QDir::toNativeSeparators(filename), file.errorString()));
     }
-    QTextStream stream(&file);
-    setupDefaultCodec(stream);
-    const auto keys = m_settings->allKeys(m_scope);
-    for (const QString &key : keys)
-        stream << key << ": " << qbs::settingsValueToRepresentation(m_settings->value(key, m_scope))
-               << Qt::endl;
+
+    if (QFileInfo(filename).suffix() == u"json") {
+        QJsonDocument doc;
+        doc.setObject(settingsToJSONObject(*m_settings, m_scope));
+        file.write(doc.toJson());
+    } else {
+        QTextStream stream(&file);
+        setupDefaultCodec(stream);
+        const auto keys = m_settings->allKeys(m_scope);
+        for (const QString &key : keys)
+            stream << key << ": "
+                << qbs::settingsValueToRepresentation(m_settings->value(key, m_scope))
+                << Qt::endl;
+    }
 }
 
 void ConfigCommandExecutor::importSettings(const QString &filename)
@@ -159,15 +208,21 @@ void ConfigCommandExecutor::importSettings(const QString &filename)
     for (const QString &key : keys)
         m_settings->remove(key);
 
-    QTextStream stream(&file);
-    setupDefaultCodec(stream);
-    while (!stream.atEnd()) {
-        QString line = stream.readLine();
-        int colon = line.indexOf(QLatin1Char(':'));
-        if (colon >= 0 && !line.startsWith(QLatin1Char('#'))) {
-            const QString key = line.left(colon).trimmed();
-            const QString value = line.mid(colon + 1).trimmed();
-            m_settings->setValue(key, representationToSettingsValue(value));
+    if (QFileInfo(filename).suffix() == u"json") {
+        const auto doc = QJsonDocument::fromJson(file.readAll());
+        const auto object = doc.object();
+        settingsFromJSONObject(*m_settings, doc.object());
+    } else {
+        QTextStream stream(&file);
+        setupDefaultCodec(stream);
+        while (!stream.atEnd()) {
+            QString line = stream.readLine();
+            int colon = line.indexOf(QLatin1Char(':'));
+            if (colon >= 0 && !line.startsWith(QLatin1Char('#'))) {
+                const QString key = line.left(colon).trimmed();
+                const QString value = line.mid(colon + 1).trimmed();
+                m_settings->setValue(key, representationToSettingsValue(value));
+            }
         }
     }
 }
diff --git a/src/app/config/configcommandlineparser.cpp b/src/app/config/configcommandlineparser.cpp
index 8652a58bc..1ad0cc4b1 100644
--- a/src/app/config/configcommandlineparser.cpp
+++ b/src/app/config/configcommandlineparser.cpp
@@ -126,8 +126,8 @@ void ConfigCommandLineParser::parse(const QStringList &commandLine)
             throw Error(Tr::tr("Profile properties must be provided."));
         if (m_command.varNames.size() % 2 != 0)
             throw Error(Tr::tr("Profile properties must be key/value pairs."));
-        for (int i = 0; i < m_command.varNames.size(); ++i) {
-            if (m_command.varNames.at(i).isEmpty())
+        for (const auto &varName : std::as_const(m_command.varNames)) {
+            if (varName.isEmpty())
                 throw Error(Tr::tr("Property names must not be empty."));
         }
         break;
@@ -152,7 +152,7 @@ void ConfigCommandLineParser::setScope(Settings::Scope scope)
 
 void ConfigCommandLineParser::printUsage() const
 {
-    puts("Usage:\n"
+    std::puts("Usage:\n"
         "    qbs config [--settings-dir <settings directory] <options>\n"
         "    qbs config [--settings-dir <settings directory] <key>\n"
         "    qbs config [--settings-dir <settings directory] <key> <value>"
diff --git a/src/app/qbs-create-project/create-project-main.cpp b/src/app/qbs-create-project/create-project-main.cpp
index bb5d1a6bc..51e7ce514 100644
--- a/src/app/qbs-create-project/create-project-main.cpp
+++ b/src/app/qbs-create-project/create-project-main.cpp
@@ -80,9 +80,9 @@ int main(int argc, char *argv[])
     const ProjectStructure projectStructure = parser.isSet(flatOpt)
             ? ProjectStructure::Flat : ProjectStructure::Composite;
     const QStringList whiteList = parser.value(whiteListOpt).split(QLatin1Char(','),
-                                                                   QBS_SKIP_EMPTY_PARTS);
+                                                                   Qt::SkipEmptyParts);
     const QStringList blackList = parser.value(blackListOpt).split(QLatin1Char(','),
-                                                                   QBS_SKIP_EMPTY_PARTS);
+                                                                   Qt::SkipEmptyParts);
     try {
         ProjectCreator().run(QDir::currentPath(), projectStructure, whiteList, blackList);
     } catch (const ErrorInfo &e) {
diff --git a/src/app/qbs-create-project/createproject.cpp b/src/app/qbs-create-project/createproject.cpp
index f2f1364f5..22c845994 100644
--- a/src/app/qbs-create-project/createproject.cpp
+++ b/src/app/qbs-create-project/createproject.cpp
@@ -43,6 +43,7 @@
 #include <tools/error.h>
 #include <tools/jsliterals.h>
 #include <tools/qttools.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qdiriterator.h>
@@ -61,10 +62,10 @@ void ProjectCreator::run(const QString &topLevelDir, ProjectStructure projectStr
                          const QStringList &whiteList, const QStringList &blackList)
 {
     m_projectStructure = projectStructure;
-    for (const QString &s : whiteList)
-        m_whiteList.push_back(QRegularExpression(QRegularExpression::wildcardToRegularExpression(s)));
-    for (const QString &s : blackList)
-        m_blackList.push_back(QRegularExpression(QRegularExpression::wildcardToRegularExpression(s)));
+    qbs::Internal::transform(whiteList, m_whiteList, [](const QString &s) {
+        return QRegularExpression(QRegularExpression::wildcardToRegularExpression(s)); });
+    qbs::Internal::transform(blackList, m_blackList, [](const QString &s) {
+        return QRegularExpression(QRegularExpression::wildcardToRegularExpression(s)); });
     m_topLevelProject.dirPath = topLevelDir;
     setupProject(&m_topLevelProject);
     serializeProject(m_topLevelProject);
@@ -123,7 +124,7 @@ void ProjectCreator::serializeProject(const ProjectCreator::Project &project)
             fileContents << indent << "Depends { name: \"cpp\" }\n";
         }
         fileContents << indent << "files: [\n";
-        for (const QString &fileName : qAsConst(project.fileNames))
+        for (const QString &fileName : std::as_const(project.fileNames))
             fileContents << indent << indent << qbs::toJSLiteral(fileName) << ",\n";
         fileContents << indent << "]\n";
         for (const ProjectPtr &p : project.subProjects)
@@ -151,7 +152,7 @@ void ProjectCreator::addGroups(QTextStream &stream, const QDir &baseDir,
            << qbs::toJSLiteral(baseDir.relativeFilePath(subProject.dirPath) + QLatin1Char('/'))
            << '\n';
     stream << indent << indent << "files: [\n";
-    for (const QString &fileName : qAsConst(subProject.fileNames))
+    for (const QString &fileName : std::as_const(subProject.fileNames))
         stream << indent << indent << indent << qbs::toJSLiteral(fileName) << ",\n";
     stream << indent << indent << "]\n";
     stream << indent << "}\n";
@@ -164,9 +165,8 @@ bool ProjectCreator::isSourceFile(const QString &fileName)
     const auto isMatch = [fileName](const QRegularExpression &rex) {
         return rex.match(fileName).hasMatch();
     };
-    return !std::any_of(m_blackList.cbegin(), m_blackList.cend(), isMatch)
-            && (m_whiteList.empty()
-                || std::any_of(m_whiteList.cbegin(), m_whiteList.cend(), isMatch));
+    return !qbs::Internal::any_of(m_blackList, isMatch)
+            && (m_whiteList.empty() || qbs::Internal::any_of(m_whiteList, isMatch));
 }
 
 ProjectCreator::ProductFlags ProjectCreator::getFlags(const ProjectCreator::Project &project)
@@ -184,7 +184,7 @@ ProjectCreator::ProductFlags ProjectCreator::getFlags(const ProjectCreator::Proj
 void ProjectCreator::getFlagsFromFileNames(const ProjectCreator::Project &project,
                                            ProductFlags &flags)
 {
-    for (const QString &fileName : qAsConst(project.fileNames)) {
+    for (const QString &fileName : std::as_const(project.fileNames)) {
         if (flags.testFlag(IsApp) && flags.testFlag(NeedsQt))
             return;
         const QFileInfo fi(project.dirPath + QLatin1Char('/') + fileName);
@@ -210,7 +210,7 @@ void ProjectCreator::getFlagsFromFileNames(const ProjectCreator::Project &projec
 void ProjectCreator::getFlagsFromFileContents(const ProjectCreator::Project &project,
                                               ProductFlags &flags)
 {
-    for (const QString &fileName : qAsConst(project.fileNames)) {
+    for (const QString &fileName : std::as_const(project.fileNames)) {
         QFile f (project.dirPath + QLatin1Char('/') + fileName);
         if (!f.open(QIODevice::ReadOnly)) {
             qDebug() << "Ignoring failure to read" << f.fileName();
diff --git a/src/app/qbs-create-project/qbs-create-project.pro b/src/app/qbs-create-project/qbs-create-project.pro
deleted file mode 100644
index 1edb85214..000000000
--- a/src/app/qbs-create-project/qbs-create-project.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-include(../app.pri)
-
-TARGET = qbs-create-project
-
-HEADERS += \
-    createproject.h
-SOURCES += \
-    createproject.cpp \
-    create-project-main.cpp
diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp
index 329bd0052..fad24d018 100644
--- a/src/app/qbs-setup-android/android-setup.cpp
+++ b/src/app/qbs-setup-android/android-setup.cpp
@@ -153,7 +153,7 @@ static QtInfoPerArch getQtAndroidInfo(const QString &qtSdkDir)
     QDirIterator dit(qtSdkDir, nameFilters, QDir::Dirs);
     while (dit.hasNext())
         qtDirs << dit.next();
-    for (const auto &qtDir : qAsConst(qtDirs)) {
+    for (const auto &qtDir : std::as_const(qtDirs)) {
         const QtAndroidInfo info = getInfoForQtDir(qtDir);
         if (info.isValid()) {
             for (const QString &arch: info.archs)
diff --git a/src/app/qbs-setup-android/qbs-setup-android.pro b/src/app/qbs-setup-android/qbs-setup-android.pro
deleted file mode 100644
index b5e57761d..000000000
--- a/src/app/qbs-setup-android/qbs-setup-android.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-include(../app.pri)
-
-TARGET = qbs-setup-android
-
-SOURCES += \
-    android-setup.cpp \
-    commandlineparser.cpp \
-    main.cpp
-
-HEADERS += \
-    android-setup.h \
-    commandlineparser.h
diff --git a/src/app/qbs-setup-qt/main.cpp b/src/app/qbs-setup-qt/main.cpp
index bef95eee2..b739bff2d 100644
--- a/src/app/qbs-setup-qt/main.cpp
+++ b/src/app/qbs-setup-qt/main.cpp
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
                 QString profileName = QLatin1String("qt-") + qtEnvironment.qtVersion.toString();
                 if (SetupQt::checkIfMoreThanOneQtWithTheSameVersion(qtEnvironment.qtVersion, qtEnvironments)) {
                     QStringList prefixPathParts = QFileInfo(qtEnvironment.qmakeFilePath).path()
-                            .split(QLatin1Char('/'), QBS_SKIP_EMPTY_PARTS);
+                            .split(QLatin1Char('/'), Qt::SkipEmptyParts);
                     if (!prefixPathParts.empty())
                         profileName += QLatin1String("-") + prefixPathParts.last();
                 }
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.pro b/src/app/qbs-setup-qt/qbs-setup-qt.pro
deleted file mode 100644
index a5694d6b7..000000000
--- a/src/app/qbs-setup-qt/qbs-setup-qt.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-include(../app.pri)
-
-TARGET = qbs-setup-qt
-
-SOURCES += \
-    commandlineparser.cpp \
-    main.cpp \
-    setupqt.cpp
-
-HEADERS += \
-    commandlineparser.h \
-    setupqt.h
-
-mingw {
-    RC_FILE = qbs-setup-qt.rc
-}
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index eb78ec36d..bac766482 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -156,7 +156,7 @@ static QString archFromDirName(const QString &dir)
     const std::string dirString = dir.toStdString();
     if (!std::regex_match(dirString, match, regexp))
         return {};
-    const QString arch = QString::fromStdString(match[1]);
+    QString arch = QString::fromStdString(match[1]);
     if (arch == QLatin1String("32"))
         return QStringLiteral("x86");
     if (arch == QLatin1String("64"))
@@ -172,7 +172,7 @@ static QString platformFromDirName(const QString &dir)
         return QStringLiteral("android");
     if (dir == QLatin1String("Boot2Qt"))
         return QStringLiteral("linux");
-    return QString::fromStdString(HostOsInfo::hostOSIdentifier());
+    return HostOsInfo::hostOSIdentifier();
 }
 
 QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath)
@@ -214,7 +214,7 @@ static bool isQtProfile(const Profile &profile)
     // For Profiles created with setup-qt < 5.13.
     const QStringList searchPaths
             = profile.value(QStringLiteral("preferences.qbsSearchPaths")).toStringList();
-    return std::any_of(searchPaths.cbegin(), searchPaths.cend(), [] (const QString &path) {
+    return Internal::any_of(searchPaths, [] (const QString &path) {
         return QFileInfo(path + QStringLiteral("/modules/Qt")).isDir();
     });
 }
@@ -299,15 +299,12 @@ QString profileNameWithoutHostArch(const QString &profileName)
 // then we drop the crosscompiling toolchain MSVC2017-x86_x64.
 static void compressMsvcProfiles(QStringList &profiles)
 {
-    auto it = std::remove_if(profiles.begin(), profiles.end(),
-                             [&profiles] (const QString &profileName) {
+    Internal::removeIf(profiles, [&profiles] (const QString &profileName) {
         int idx = profileName.indexOf(QLatin1Char('_'));
         if (idx == -1)
             return false;
         return contains(profiles, profileNameWithoutHostArch(profileName));
     });
-    if (it != profiles.end())
-        profiles.erase(it, profiles.end());
 }
 
 void SetupQt::saveToQbsSettings(const QString &qtVersionName,
@@ -317,7 +314,7 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName,
     const QString cleanQtVersionName = Profile::cleanName(qtVersionName);
     QString msg = QCoreApplication::translate("SetupQt", "Creating profile '%1'.")
             .arg(cleanQtVersionName);
-    printf("%s\n", qPrintable(msg));
+    std::printf("%s\n", qPrintable(msg));
 
     Profile profile(cleanQtVersionName, settings);
     profile.removeProfile();
diff --git a/src/app/qbs-setup-toolchains/CMakeLists.txt b/src/app/qbs-setup-toolchains/CMakeLists.txt
index bb287be52..64347cd6c 100644
--- a/src/app/qbs-setup-toolchains/CMakeLists.txt
+++ b/src/app/qbs-setup-toolchains/CMakeLists.txt
@@ -20,6 +20,8 @@ set(SOURCES
     probe.h
     sdccprobe.cpp
     sdccprobe.h
+    watcomprobe.cpp
+    watcomprobe.h
     xcodeprobe.cpp
     xcodeprobe.h
     )
diff --git a/src/app/qbs-setup-toolchains/clangclprobe.cpp b/src/app/qbs-setup-toolchains/clangclprobe.cpp
index d1a3a9ac5..272f953fc 100644
--- a/src/app/qbs-setup-toolchains/clangclprobe.cpp
+++ b/src/app/qbs-setup-toolchains/clangclprobe.cpp
@@ -50,6 +50,7 @@
 #include <tools/profile.h>
 #include <tools/qttools.h>
 #include <tools/settings.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfileinfo.h>
@@ -84,7 +85,7 @@ Profile createProfileHelper(
 QString findClangCl()
 {
     const auto compilerName = HostOsInfo::appendExecutableSuffix(QStringLiteral("clang-cl"));
-    const auto compilerFromPath = findExecutable(compilerName);
+    auto compilerFromPath = findExecutable(compilerName);
     if (!compilerFromPath.isEmpty())
         return compilerFromPath;
 
@@ -100,7 +101,7 @@ void createClangClProfile(const QFileInfo &compiler, Settings *settings,
             compiler.filePath(), ConsoleLogger::instance());
     if (clangCl.isEmpty())
         return;
-    const auto hostArch = QString::fromStdString(HostOsInfo::hostOSArchitecture());
+    const auto hostArch = HostOsInfo::hostOSArchitecture();
     createProfileHelper(
             settings, profileName, clangCl.toolchainInstallPath, clangCl.vcvarsallPath, hostArch);
 }
@@ -120,15 +121,23 @@ void clangClProbe(Settings *settings, std::vector<Profile> &profiles)
         return;
     }
 
-    const auto clangCl = clangCls.front();
     const QString architectures[] = {
         QStringLiteral("x86_64"),
         QStringLiteral("x86")
     };
-    for (const auto &arch: architectures) {
-        const auto profileName = QStringLiteral("clang-cl-%1").arg(arch);
-        auto profile = createProfileHelper(
-                settings, profileName, clangCl.toolchainInstallPath, clangCl.vcvarsallPath, arch);
-        profiles.push_back(std::move(profile));
+    for (size_t index = 0; index < clangCls.size(); ++index) {
+        const auto &clangCl = clangCls[index];
+        const QString suffix = index == 0 ? QString() : QStringLiteral("-%1").arg(index);
+        qbs::Internal::transform(
+            architectures, profiles, [settings, clangCl, suffix](const auto &arch) {
+                const auto profileName = QStringLiteral("clang-cl") + suffix
+                                         + QStringLiteral("-%1").arg(arch);
+                return createProfileHelper(
+                    settings,
+                    profileName,
+                    clangCl.toolchainInstallPath,
+                    clangCl.vcvarsallPath,
+                    arch);
+            });
     }
 }
diff --git a/src/app/qbs-setup-toolchains/cosmicprobe.cpp b/src/app/qbs-setup-toolchains/cosmicprobe.cpp
index a41b21ee8..82b7193bc 100644
--- a/src/app/qbs-setup-toolchains/cosmicprobe.cpp
+++ b/src/app/qbs-setup-toolchains/cosmicprobe.cpp
@@ -171,10 +171,8 @@ void cosmicProbe(Settings *settings, std::vector<Profile> &profiles)
     qbsInfo() << Tr::tr("Trying to detect COSMIC toolchains...");
 
     const std::vector<ToolchainInstallInfo> allInfos = installedCosmicsFromPath();
-    for (const ToolchainInstallInfo &info : allInfos) {
-        const auto profile = createCosmicProfileHelper(info, settings);
-        profiles.push_back(profile);
-    }
+    qbs::Internal::transform(allInfos, profiles, [settings](const auto &info) {
+        return createCosmicProfileHelper(info, settings); });
 
     if (allInfos.empty())
         qbsInfo() << Tr::tr("No COSMIC toolchains found.");
diff --git a/src/app/qbs-setup-toolchains/dmcprobe.cpp b/src/app/qbs-setup-toolchains/dmcprobe.cpp
index 3ac12eba5..097b1caed 100644
--- a/src/app/qbs-setup-toolchains/dmcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/dmcprobe.cpp
@@ -54,124 +54,164 @@
 #include <QtCore/qsettings.h>
 #include <QtCore/qstandardpaths.h>
 
+#include <optional>
+
 using namespace qbs;
 using Internal::Tr;
 using Internal::HostOsInfo;
 
+namespace {
+struct Target {
+    QString platform;
+    QString architecture;
+    QString extender;
+};
+}
+
 static QStringList knownDmcCompilerNames()
 {
     return {QStringLiteral("dmc")};
 }
 
-static QString guessDmcArchitecture(const QFileInfo &compiler)
+static QStringList dumpOutput(const QFileInfo &compiler, const QStringList &flags,
+                              const QStringList &keys)
 {
-    const QStringList keys = {QStringLiteral("__I86__")};
-    const auto macros = dumpMacros([&compiler, &keys]() {
-        const QString filePath = QDir(QDir::tempPath())
-                                     .absoluteFilePath(QLatin1String("dmc-dump.c"));
-        QFile fakeIn(filePath);
-        if (!fakeIn.open(QIODevice::Truncate | QIODevice::WriteOnly | QIODevice::Text)) {
-            qbsWarning() << Tr::tr("Unable to open temporary file %1 for output: %2")
-                                .arg(fakeIn.fileName(), fakeIn.errorString());
-            return QStringList{};
-        }
-        fakeIn.write("#define VALUE_TO_STRING(x) #x\n");
-        fakeIn.write("#define VALUE(x) VALUE_TO_STRING(x)\n");
-        fakeIn.write("#define VAR_NAME_VALUE(var) \"#define \" #var\" \"VALUE(var)\n");
-        for (const QString &key : keys) {
-            fakeIn.write("#if defined(" + key.toLatin1() + ")\n");
-            fakeIn.write("#pragma message (VAR_NAME_VALUE(" + key.toLatin1() + "))\n");
-            fakeIn.write("#endif\n");
-        }
-        fakeIn.close();
-        QProcess p;
-        p.start(compiler.absoluteFilePath(), {QStringLiteral("-e"), filePath});
-        p.waitForFinished(3000);
-        fakeIn.remove();
-        const QStringList lines = QString::fromUtf8(p.readAllStandardOutput())
-                                      .split(QRegularExpression(QLatin1String("\\r?\\n")));
-        return lines;
-    });
+    const QString filePath = QDir(QDir::tempPath()).absoluteFilePath(
+        QLatin1String("dmc-dump.c"));
+    QFile fakeIn(filePath);
+    if (!fakeIn.open(QIODevice::Truncate | QIODevice::WriteOnly | QIODevice::Text)) {
+        qbsWarning() << Tr::tr("Unable to open temporary file %1 for output: %2")
+                        .arg(fakeIn.fileName(), fakeIn.errorString());
+        return {};
+    }
+    fakeIn.write("#define VALUE_TO_STRING(x) #x\n");
+    fakeIn.write("#define VALUE(x) VALUE_TO_STRING(x)\n");
+    fakeIn.write("#define VAR_NAME_VALUE(var) \"#define \" #var\" \"VALUE(var)\n");
+    for (const auto &key : keys) {
+        const auto content = key.toLatin1();
+        fakeIn.write("#if defined(" + content + ")\n");
+        fakeIn.write("#pragma message (VAR_NAME_VALUE(" + content + "))\n");
+        fakeIn.write("#endif\n");
+    }
+    fakeIn.close();
 
-    for (const QString &key : keys) {
-        if (macros.contains(key)) {
-            bool ok = false;
-            const auto value = macros.value(key).toInt(&ok);
-            if (ok) {
-                switch (value) {
-                case 0: // 8088
-                case 2: // 286
-                case 3: // 386
-                case 4: // 486
-                    break;
-                case 5: // P5
-                case 6: // P6
-                    return QLatin1String("x86");
-                default:
-                    break;
-                }
-            }
-        }
+    QStringList args = {QStringLiteral("-e")};
+    args.reserve(args.size() + int(flags.size()));
+    std::copy(flags.cbegin(), flags.cend(), std::back_inserter(args));
+    args.push_back(QDir::toNativeSeparators(filePath));
+
+    QProcess p;
+    p.start(compiler.absoluteFilePath(), args);
+    p.waitForFinished(3000);
+    fakeIn.remove();
+    static QRegularExpression re(QLatin1String("\\r?\\n"));
+    return QString::fromUtf8(p.readAllStandardOutput()).split(re);
+}
+
+static std::optional<Target> dumpDmcTarget(const QFileInfo &compiler, const QStringList &flags)
+{
+    const QStringList keys = {
+        QStringLiteral("DOS16RM"),
+        QStringLiteral("DOS386"),
+        QStringLiteral("MSDOS"),
+        QStringLiteral("__NT__"),
+        QStringLiteral("_WINDOWS"),
+    };
+    const auto macros = dumpMacros([&compiler, &flags, &keys]() {
+        return dumpOutput(compiler, flags, keys); });
+
+    if (macros.contains(QLatin1String("__NT__"))) {
+        return Target{QLatin1String("windows"), QLatin1String("x86"), QLatin1String("")};
+    } else if (macros.contains(QLatin1String("_WINDOWS"))) {
+        return Target{QLatin1String("windows"), QLatin1String("x86_16"), QLatin1String("")};
+    } else if (macros.contains(QLatin1String("DOS386"))) {
+        if (flags.contains(QLatin1String("-mx")))
+            return Target{QLatin1String("dos"), QLatin1String("x86"), QLatin1String("dosx")};
+        else if (flags.contains(QLatin1String("-mp")))
+            return Target{QLatin1String("dos"), QLatin1String("x86"), QLatin1String("dosp")};
+    } else if (macros.contains(QLatin1String("DOS16RM"))) {
+        if (flags.contains(QLatin1String("-mz")))
+            return Target{QLatin1String("dos"), QLatin1String("x86_16"), QLatin1String("dosz")};
+        else if (flags.contains(QLatin1String("-mr")))
+            return Target{QLatin1String("dos"), QLatin1String("x86_16"), QLatin1String("dosr")};
+    } else if (macros.contains(QLatin1String("MSDOS"))) {
+        return Target{QLatin1String("dos"), QLatin1String("x86_16"), QLatin1String("")};
     }
 
-    return QLatin1String("unknown");
+    return {};
 }
 
-static Profile createDmcProfileHelper(const ToolchainInstallInfo &info,
-                                      Settings *settings,
-                                      QString profileName = QString())
+static std::vector<Profile> createDmcProfileHelper(const ToolchainInstallInfo &info,
+                                                   Settings *settings,
+                                                   QStringView profileName = {})
 {
     const QFileInfo compiler = info.compilerPath;
-    const QString architecture = guessDmcArchitecture(compiler);
+    std::vector<Profile> profiles;
 
-    // In case the profile is auto-detected.
-    if (profileName.isEmpty()) {
-        if (!info.compilerVersion.isValid()) {
-            profileName = QStringLiteral("dmc-unknown-%1").arg(architecture);
+    const QVector<QStringList> probes = {
+        { QStringLiteral("-mn"), QStringLiteral("-WA") }, // Windows NT 32 bit.
+        { QStringLiteral("-ml"),  QStringLiteral("-WA") }, // Windows 3.x 16 bit.
+        { QStringLiteral("-mx") }, // DOS with DOSX extender 32 bit.
+        { QStringLiteral("-mp") }, // DOS with Phar Lap extender 32 bit.
+        { QStringLiteral("-mr") }, // DOS with Rational DOS Extender 16 bit.
+        { QStringLiteral("-mz") }, // DOS with  ZPM DOS Extender 16 bit.
+        { QStringLiteral("-mc") }, // DOS 16 bit.
+    };
+
+   for (const auto &flags : probes) {
+       const auto target = dumpDmcTarget(compiler, flags);
+        if (!target)
+            continue;
+
+        QString fullProfilename;
+        QString platform = target->extender.isEmpty() ? target->platform : target->extender;
+        if (profileName.isEmpty()) {
+            // Create a full profile name in case we is in auto-detecting mode.
+            if (!info.compilerVersion.isValid()) {
+                fullProfilename = QStringLiteral("dmc-unknown-%1-%2")
+                        .arg(platform, target->architecture);
+            } else {
+                const QString version = info.compilerVersion.toString(QLatin1Char('_'),
+                                                                      QLatin1Char('_'));
+                fullProfilename = QStringLiteral("dmc-%1-%2-%3")
+                        .arg(version, platform, target->architecture);
+            }
         } else {
-            const QString version = info.compilerVersion.toString(QLatin1Char('_'),
-                                                                  QLatin1Char('_'));
-            profileName = QStringLiteral("dmc-%1-%2").arg(
-                version, architecture);
+            // Append the detected actual architecture name to the proposed profile name.
+            fullProfilename = QStringLiteral("%1-%2-%3")
+                    .arg(profileName, platform, target->architecture);
         }
-    }
 
-    Profile profile(profileName, settings);
-    profile.setValue(QLatin1String("cpp.toolchainInstallPath"), compiler.absolutePath());
-    profile.setValue(QLatin1String("qbs.toolchainType"), QLatin1String("dmc"));
-    if (!architecture.isEmpty())
-        profile.setValue(QLatin1String("qbs.architecture"), architecture);
+        Profile profile(fullProfilename, settings);
+        profile.setValue(QStringLiteral("cpp.toolchainInstallPath"), compiler.absolutePath());
+        profile.setValue(QStringLiteral("qbs.toolchainType"), QStringLiteral("dmc"));
+        profile.setValue(QStringLiteral("qbs.architecture"), target->architecture);
+        profile.setValue(QStringLiteral("qbs.targetPlatform"), target->platform);
+        if (!target->extender.isEmpty())
+            profile.setValue(QStringLiteral("cpp.extenderName"), target->extender);
 
-    qbsInfo() << Tr::tr("Profile '%1' created for '%2'.").arg(
-        profile.name(), compiler.absoluteFilePath());
-    return profile;
+        qbsInfo() << Tr::tr("Profile '%1' created for '%2'.")
+                     .arg(profile.name(), compiler.absoluteFilePath());
+
+        profiles.push_back(std::move(profile));
+   }
+
+    return profiles;
 }
 
-static Version dumpDmcCompilerVersion(const QFileInfo &compiler)
+static Version dumpDmcVersion(const QFileInfo &compiler)
 {
-    QProcess p;
-    QStringList args;
-    p.start(compiler.absoluteFilePath(), args);
-    p.waitForFinished(3000);
-    const auto es = p.exitStatus();
-    if (es != QProcess::NormalExit) {
-        const QByteArray out = p.readAll();
-        qbsWarning() << Tr::tr("Compiler dumping failed:\n%1")
-                            .arg(QString::fromUtf8(out));
-        return Version{};
+    const QStringList keys = {QStringLiteral("__DMC__")};
+    const auto macros = dumpMacros([&compiler, keys]() {
+        return dumpOutput(compiler, {}, keys); });
+    for (const auto &macro : macros) {
+        if (!macro.startsWith(QLatin1String("0x")))
+            continue;
+        const int verCode = macro.mid(2).toInt();
+        return Version{(verCode / 100), (verCode % 100), 0};
     }
-
-    const QByteArray output = p.readAllStandardOutput();
-    const QRegularExpression re(QLatin1String(
-        "^Digital Mars Compiler Version (\\d+)\\.?(\\d+)\\.?(\\*|\\d+)?"));
-    const QRegularExpressionMatch match = re.match(QString::fromLatin1(output));
-    if (!match.hasMatch())
-        return Version{};
-
-    const auto major = match.captured(1).toInt();
-    const auto minor = match.captured(2).toInt();
-    const auto patch = match.captured(3).toInt();
-    return Version{major, minor, patch};
+    qbsWarning() << Tr::tr("No __DMC__ token was found in the compiler dump");
+    return Version{};
 }
 
 static std::vector<ToolchainInstallInfo> installedDmcsFromPath()
@@ -184,7 +224,7 @@ static std::vector<ToolchainInstallInfo> installedDmcsFromPath()
                 HostOsInfo::appendExecutableSuffix(compilerName)));
         if (!dmcPath.exists())
             continue;
-        const Version version = dumpDmcCompilerVersion(dmcPath);
+        const Version version = dumpDmcVersion(dmcPath);
         infos.push_back({dmcPath, version});
     }
     std::sort(infos.begin(), infos.end());
@@ -200,10 +240,10 @@ bool isDmcCompiler(const QString &compilerName)
 }
 
 void createDmcProfile(const QFileInfo &compiler, Settings *settings,
-                      QString profileName)
+                      QStringView profileName)
 {
     const ToolchainInstallInfo info = {compiler, Version{}};
-    createDmcProfileHelper(info, settings, std::move(profileName));
+    createDmcProfileHelper(info, settings, profileName);
 }
 
 void dmcProbe(Settings *settings, std::vector<Profile> &profiles)
@@ -211,11 +251,14 @@ void dmcProbe(Settings *settings, std::vector<Profile> &profiles)
     qbsInfo() << Tr::tr("Trying to detect DMC toolchains...");
 
     const std::vector<ToolchainInstallInfo> allInfos = installedDmcsFromPath();
-    for (const ToolchainInstallInfo &info : allInfos) {
-        const auto profile = createDmcProfileHelper(info, settings);
-        profiles.push_back(profile);
+    if (allInfos.empty()) {
+        qbsInfo() << Tr::tr("No DMC toolchains found.");
+        return;
     }
 
-    if (allInfos.empty())
-        qbsInfo() << Tr::tr("No DMC toolchains found.");
+    for (const ToolchainInstallInfo &info : allInfos) {
+        const auto newProfiles = createDmcProfileHelper(info, settings);
+        profiles.reserve(profiles.size() + int(newProfiles.size()));
+        std::copy(newProfiles.cbegin(), newProfiles.cend(), std::back_inserter(profiles));
+    }
 }
diff --git a/src/app/qbs-setup-toolchains/dmcprobe.h b/src/app/qbs-setup-toolchains/dmcprobe.h
index a2fbc74cb..3159c2df5 100644
--- a/src/app/qbs-setup-toolchains/dmcprobe.h
+++ b/src/app/qbs-setup-toolchains/dmcprobe.h
@@ -54,7 +54,7 @@ class Settings;
 bool isDmcCompiler(const QString &compilerName);
 
 void createDmcProfile(const QFileInfo &compiler, qbs::Settings *settings,
-                      QString profileName);
+                      QStringView profileName);
 
 void dmcProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles);
 
diff --git a/src/app/qbs-setup-toolchains/gccprobe.cpp b/src/app/qbs-setup-toolchains/gccprobe.cpp
index 85aba8a68..c8c04b0cc 100644
--- a/src/app/qbs-setup-toolchains/gccprobe.cpp
+++ b/src/app/qbs-setup-toolchains/gccprobe.cpp
@@ -47,6 +47,7 @@
 #include <tools/hostosinfo.h>
 #include <tools/profile.h>
 #include <tools/settings.h>
+#include <tools/stlutils.h>
 #include <tools/toolchains.h>
 
 #include <QtCore/qdir.h>
@@ -230,12 +231,9 @@ private:
 static bool doesProfileTargetOS(const Profile &profile, const QString &os)
 {
     const auto target = profile.value(QStringLiteral("qbs.targetPlatform"));
-    if (target.isValid()) {
-        return Internal::contains(HostOsInfo::canonicalOSIdentifiers(
-                                      target.toString().toStdString()),
-                                  os.toStdString());
-    }
-    return Internal::contains(HostOsInfo::hostOSIdentifiers(), os.toStdString());
+    if (target.isValid())
+        return Internal::contains(HostOsInfo::canonicalOSIdentifiers(target.toString()), os);
+    return Internal::contains(HostOsInfo::hostOSIdentifiers(), os);
 }
 
 static QString buildProfileName(const QFileInfo &cfi)
@@ -269,11 +267,8 @@ static QStringList buildCompilerNameFilters(const QString &compilerName)
         QLatin1String("*-*-*-*-") + compilerName + QLatin1String("-[1-9]*")
     };
 
-    std::transform(filters.begin(), filters.end(), filters.begin(),
-                   [](const auto &filter) {
-        return HostOsInfo::appendExecutableSuffix(filter);
-    });
-
+    Internal::transform(filters, [](const auto &filter) {
+        return HostOsInfo::appendExecutableSuffix(filter); });
     return filters;
 }
 
@@ -531,7 +526,7 @@ void gccProbe(Settings *settings, std::vector<Profile> &profiles, const QString
 
     std::vector<QFileInfo> candidates;
     const auto filters = buildCompilerNameFilters(compilerName);
-    for (const auto &searchPath : qAsConst(searchPaths)) {
+    for (const auto &searchPath : std::as_const(searchPaths)) {
         const QDir dir(searchPath);
         const QStringList fileNames = dir.entryList(
                     filters, QDir::Files | QDir::Executable);
@@ -579,7 +574,7 @@ void gccProbe(Settings *settings, std::vector<Profile> &profiles, const QString
         });
     }
 
-    for (const auto &candidate : qAsConst(candidates)) {
+    for (const auto &candidate : std::as_const(candidates)) {
         const QString toolchainType = toolchainTypeFromCompilerName(
                     candidate.baseName());
         const QString profileName = buildProfileName(candidate);
diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp
index 6c1506778..adf5febb3 100644
--- a/src/app/qbs-setup-toolchains/iarewprobe.cpp
+++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp
@@ -177,9 +177,9 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler)
     }
 
     const QString arch = guessIarArchitecture(compiler);
-    if (arch == QLatin1String("arm")) {
+    if (arch == QLatin1String("arm"))
         return Version{verCode / 1000000, (verCode / 1000) % 1000, verCode % 1000};
-    } else if (arch == QLatin1String("avr")
+    if (arch == QLatin1String("avr")
                || arch == QLatin1String("mcs51")
                || arch == QLatin1String("stm8")
                || arch == QLatin1String("msp430")
@@ -323,10 +323,8 @@ void iarProbe(Settings *settings, std::vector<Profile> &profiles)
                    pathInfos.cbegin(), pathInfos.cend(),
                    std::back_inserter(allInfos));
 
-    for (const ToolchainInstallInfo &info : allInfos) {
-        const auto profile = createIarProfileHelper(info, settings);
-        profiles.push_back(profile);
-    }
+    qbs::Internal::transform(allInfos, profiles, [settings](const auto &info) {
+        return createIarProfileHelper(info, settings); });
 
     if (allInfos.empty())
         qbsInfo() << Tr::tr("No IAR toolchains found.");
diff --git a/src/app/qbs-setup-toolchains/keilprobe.cpp b/src/app/qbs-setup-toolchains/keilprobe.cpp
index 0f3bcca04..4bab54c92 100644
--- a/src/app/qbs-setup-toolchains/keilprobe.cpp
+++ b/src/app/qbs-setup-toolchains/keilprobe.cpp
@@ -184,8 +184,7 @@ static Version dumpMcsCompilerVersion(const QFileInfo &compiler)
     if (verCode < 0) {
         qbsWarning() << Tr::tr("No %1 tokens was found"
                                " in the compiler dump:\n%2")
-                        .arg(knownKeys.join(QLatin1Char(',')))
-                        .arg(QString::fromUtf8(dump));
+                        .arg(knownKeys.join(QLatin1Char(',')), QString::fromUtf8(dump));
         return Version{};
     }
     return Version{verCode / 100, verCode % 100};
@@ -308,11 +307,11 @@ static Version dumpArmClangCompilerVersion(const QFileInfo &compiler)
 static Version dumpKeilCompilerVersion(const QFileInfo &compiler)
 {
     const QString arch = guessKeilArchitecture(compiler);
-    if (arch == QLatin1String("mcs51") || arch == QLatin1String("mcs251")) {
+    if (arch == QLatin1String("mcs51") || arch == QLatin1String("mcs251"))
         return dumpMcsCompilerVersion(compiler);
-    } else if (arch == QLatin1String("c166")) {
+    if (arch == QLatin1String("c166"))
         return dumpC166CompilerVersion(compiler);
-    } else if (arch == QLatin1String("arm")) {
+    if (arch == QLatin1String("arm")) {
         if (isArmClangCompiler(compiler))
             return dumpArmClangCompilerVersion(compiler);
         return dumpArmCCCompilerVersion(compiler);
@@ -417,10 +416,8 @@ void keilProbe(Settings *settings, std::vector<Profile> &profiles)
                    pathInfos.cbegin(), pathInfos.cend(),
                    std::back_inserter(allInfos));
 
-    for (const ToolchainInstallInfo &info : allInfos) {
-        const auto profile = createKeilProfileHelper(info, settings);
-        profiles.push_back(profile);
-    }
+    qbs::Internal::transform(allInfos, profiles, [settings](const auto &info) {
+        return createKeilProfileHelper(info, settings); });
 
     if (allInfos.empty())
         qbsInfo() << Tr::tr("No KEIL toolchains found.");
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index 00aedaaab..84d36753e 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -130,16 +130,17 @@ void msvcProbe(Settings *settings, std::vector<Profile> &profiles)
             if (sdk.isDefault)
                 defaultWinSDK = sdk;
             const auto ais = MSVC::findSupportedArchitectures(sdk);
-            for (const MSVCArchInfo &ai : ais) {
+
+            qbs::Internal::transform(ais, winSDKs, [&sdk](const auto &ai) {
                 WinSDK specificSDK = sdk;
                 specificSDK.architecture = ai.arch;
                 specificSDK.binPath = ai.binPath;
-                winSDKs.push_back(specificSDK);
-            }
+                return specificSDK;
+            });
         }
     }
 
-    for (const WinSDK &sdk : qAsConst(winSDKs)) {
+    for (const WinSDK &sdk : std::as_const(winSDKs)) {
         qbsInfo() << Tr::tr("  Windows SDK %1 detected:\n"
                             "    installed in %2").arg(sdk.version, sdk.vcInstallPath);
         if (sdk.isDefault)
@@ -149,7 +150,7 @@ void msvcProbe(Settings *settings, std::vector<Profile> &profiles)
     // 2) Installed MSVCs
     std::vector<MSVC> msvcs = MSVC::installedCompilers(ConsoleLogger::instance());
 
-    for (const MSVC &msvc : qAsConst(msvcs)) {
+    for (const MSVC &msvc : std::as_const(msvcs)) {
         qbsInfo() << Tr::tr("  MSVC %1 (%2) detected in\n"
                             "    %3").arg(msvc.version, msvc.architecture,
                                           QDir::toNativeSeparators(msvc.binPath));
@@ -163,10 +164,10 @@ void msvcProbe(Settings *settings, std::vector<Profile> &profiles)
 
     qbsInfo() << Tr::tr("Detecting build environment...");
     std::vector<MSVC *> msvcPtrs;
-    msvcPtrs.resize(winSDKs.size() + msvcs.size());
-    std::transform(winSDKs.begin(), winSDKs.end(), msvcPtrs.begin(),
+    msvcPtrs.reserve(winSDKs.size() + msvcs.size());
+    std::transform(winSDKs.begin(), winSDKs.end(), std::back_inserter(msvcPtrs),
                    [] (WinSDK &sdk) -> MSVC * { return &sdk; });
-    std::transform(msvcs.begin(), msvcs.end(), msvcPtrs.begin() + winSDKs.size(),
+    std::transform(msvcs.begin(), msvcs.end(), std::back_inserter(msvcPtrs),
                    [] (MSVC &msvc) -> MSVC * { return &msvc; });
 
     VsEnvironmentDetector envDetector;
@@ -194,7 +195,7 @@ void msvcProbe(Settings *settings, std::vector<Profile> &profiles)
         // a new group of compilers of the same version incrementing the set size
         msvcVersions.insert(msvc.vcInstallPath);
         // index is the number of specific vcInstallPaths (e.g. compiler versions) seen so far
-        const qsizetype index = msvcVersions.size() - 1;
+        const size_t index = msvcVersions.size() - 1;
         const QString suffix = index == 0 ? QString() : QStringLiteral("-%1").arg(index);
         const QString name = QLatin1String("MSVC") + msvc.version + suffix + QLatin1Char('-')
                 + msvc.architecture;
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 5a04232e1..ceb95948b 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -46,6 +46,7 @@
 #include "keilprobe.h"
 #include "msvcprobe.h"
 #include "sdccprobe.h"
+#include "watcomprobe.h"
 #include "xcodeprobe.h"
 
 #include <logging/translator.h>
@@ -123,6 +124,8 @@ QString toolchainTypeFromCompilerName(const QString &compilerName)
         return QStringLiteral("cosmic");
     if (isDmcCompiler(compilerName))
         return QStringLiteral("dmc");
+    if (isWatcomCompiler(compilerName))
+        return QStringLiteral("watcom");
     return {};
 }
 
@@ -144,6 +147,7 @@ void probe(Settings *settings)
     sdccProbe(settings, profiles);
     cosmicProbe(settings, profiles);
     dmcProbe(settings, profiles);
+    watcomProbe(settings, profiles);
 
     if (profiles.empty()) {
         qStderr << Tr::tr("Could not detect any toolchains. No profile created.") << Qt::endl;
@@ -187,6 +191,8 @@ void createProfile(const QString &profileName, const QString &toolchainType,
         createCosmicProfile(compiler, settings, profileName);
     else if (toolchain.contains(QLatin1String("dmc")))
         createDmcProfile(compiler, settings, profileName);
+    else if (toolchain.contains(QLatin1String("watcom")))
+        createWatcomProfile(compiler, settings, profileName);
     else
         throw qbs::ErrorInfo(Tr::tr("Cannot create profile: Unknown toolchain type."));
 }
diff --git a/src/app/qbs-setup-toolchains/probe.h b/src/app/qbs-setup-toolchains/probe.h
index e97530285..827171fb2 100644
--- a/src/app/qbs-setup-toolchains/probe.h
+++ b/src/app/qbs-setup-toolchains/probe.h
@@ -80,8 +80,6 @@ int extractVersion(const QByteArray &macroDump, const QByteArray &keyToken);
 bool isSameExecutable(const QString &exe1, const QString &exe2);
 
 using MacrosMap = QMap<QString, QString>;
-using DefinesList = QVector<QByteArray>;
-
 MacrosMap dumpMacros(const std::function<QStringList()> &func);
 
 #endif // Header guard
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro
deleted file mode 100644
index 1ae1c710d..000000000
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-include(../app.pri)
-
-TARGET = qbs-setup-toolchains
-
-HEADERS += \
-    clangclprobe.h \
-    commandlineparser.h \
-    cosmicprobe.h \
-    dmcprobe.h \
-    gccprobe.h \
-    iarewprobe.h \
-    keilprobe.h \
-    msvcprobe.h \
-    probe.h \
-    sdccprobe.h \
-    xcodeprobe.h \
-
-SOURCES += \
-    clangclprobe.cpp \
-    commandlineparser.cpp \
-    cosmicprobe.cpp \
-    dmcprobe.cpp \
-    gccprobe.cpp \
-    iarewprobe.cpp \
-    keilprobe.cpp \
-    main.cpp \
-    msvcprobe.cpp \
-    probe.cpp \
-    sdccprobe.cpp \
-    xcodeprobe.cpp \
-
-mingw {
-    RC_FILE = qbs-setup-toolchains.rc
-}
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
index 2daf916e9..6987f3717 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
@@ -23,6 +23,8 @@ QbsApp {
         "probe.h",
         "sdccprobe.cpp",
         "sdccprobe.h",
+        "watcomprobe.cpp",
+        "watcomprobe.h",
         "xcodeprobe.cpp",
         "xcodeprobe.h",
     ]
diff --git a/src/app/qbs-setup-toolchains/sdccprobe.cpp b/src/app/qbs-setup-toolchains/sdccprobe.cpp
index a8a27fb96..25a3d9751 100644
--- a/src/app/qbs-setup-toolchains/sdccprobe.cpp
+++ b/src/app/qbs-setup-toolchains/sdccprobe.cpp
@@ -48,6 +48,7 @@
 #include <tools/profile.h>
 
 #include <QtCore/qprocess.h>
+#include <QtCore/qregularexpression.h>
 #include <QtCore/qsettings.h>
 #include <QtCore/qtemporaryfile.h>
 
@@ -60,8 +61,7 @@ static QStringList knownSdccCompilerNames()
     return {QStringLiteral("sdcc")};
 }
 
-static QByteArray dumpSdccMacros(const QFileInfo &compiler,
-                                 const QString &targetFlag = QString())
+static QStringList dumpOutput(const QFileInfo &compiler, const QString &targetFlag = QString())
 {
     QTemporaryFile fakeIn(QStringLiteral("XXXXXX.c"));
     if (!fakeIn.open()) {
@@ -71,39 +71,36 @@ static QByteArray dumpSdccMacros(const QFileInfo &compiler,
     }
     fakeIn.close();
 
-    const QStringList args = {QStringLiteral("-dM"),
-                              QStringLiteral("-E"),
-                              targetFlag,
-                              fakeIn.fileName()};
+    const QStringList args = {QStringLiteral("-dM"), QStringLiteral("-E"),
+                              targetFlag, fakeIn.fileName()};
     QProcess p;
     p.start(compiler.absoluteFilePath(), args);
     p.waitForFinished(3000);
     const auto es = p.exitStatus();
     if (es != QProcess::NormalExit) {
         const QByteArray out = p.readAll();
-        qbsWarning() << Tr::tr("Compiler dumping failed:\n%1")
-                        .arg(QString::fromUtf8(out));
+        qbsWarning() << Tr::tr("Compiler dumping failed:\n%1").arg(QString::fromUtf8(out));
         return {};
     }
 
-    return  p.readAllStandardOutput();
+    static QRegularExpression re(QStringLiteral("\\r?\\n"));
+    return QString::fromUtf8(p.readAllStandardOutput()).split(re);
 }
 
 static bool supportsSdccArchitecture(const QFileInfo &compiler, QStringView flag)
 {
-    const auto targetFlag = QStringLiteral("-m%1").arg(flag);
-    const auto macros = dumpSdccMacros(compiler, targetFlag);
+    const auto target = QStringLiteral("-m%1").arg(flag);
+    const auto macros = dumpMacros([&compiler, &target]() {
+        return dumpOutput(compiler, target); });
     const auto token = QStringLiteral("__SDCC_%1").arg(flag);
-    return macros.contains(token.toLatin1());
+    return macros.contains(token);
 }
 
-static std::vector<Profile> createSdccProfileHelper(
-        const ToolchainInstallInfo &info,
-        Settings *settings,
-        const QString &profileName = QString())
+static std::vector<Profile> createSdccProfileHelper(const ToolchainInstallInfo &info,
+                                                    Settings *settings,
+                                                    const QString &profileName = QString())
 {
     const QFileInfo compiler = info.compilerPath;
-
     std::vector<Profile> profiles;
 
     static constexpr struct KnownArch {
@@ -122,8 +119,7 @@ static std::vector<Profile> createSdccProfileHelper(
             // Create a full profile name in case we is
             // in auto-detecting mode.
             if (!info.compilerVersion.isValid()) {
-                fullProfileName = QStringLiteral("sdcc-unknown-%1")
-                        .arg(knownArch.architecture);
+                fullProfileName = QStringLiteral("sdcc-unknown-%1").arg(knownArch.architecture);
             } else {
                 const QString version = info.compilerVersion.toString(
                             QLatin1Char('_'), QLatin1Char('_'));
@@ -133,61 +129,34 @@ static std::vector<Profile> createSdccProfileHelper(
         } else {
             // Append the detected actual architecture name
             // to the proposed profile name.
-            fullProfileName = QStringLiteral("%1-%2").arg(
-                        profileName, knownArch.architecture);
+            fullProfileName = QStringLiteral("%1-%2").arg(profileName, knownArch.architecture);
         }
 
         Profile profile(fullProfileName, settings);
-        profile.setValue(QStringLiteral("cpp.toolchainInstallPath"),
-                         compiler.absolutePath());
-        profile.setValue(QStringLiteral("qbs.toolchainType"),
-                         QStringLiteral("sdcc"));
-        profile.setValue(QStringLiteral("qbs.architecture"),
-                         knownArch.architecture.toString());
+        profile.setValue(QStringLiteral("cpp.toolchainInstallPath"), compiler.absolutePath());
+        profile.setValue(QStringLiteral("qbs.toolchainType"), QStringLiteral("sdcc"));
+        profile.setValue(QStringLiteral("qbs.architecture"), knownArch.architecture.toString());
 
         qbsInfo() << Tr::tr("Profile '%1' created for '%2'.").arg(
                          profile.name(), compiler.absoluteFilePath());
+
+        profiles.push_back(std::move(profile));
     }
 
     return profiles;
 }
 
-static Version dumpOldSddcCompilerVersion(const QByteArray &macroDump)
-{
-    const auto keyToken = QByteArrayLiteral("__SDCC ");
-    const int startIndex = macroDump.indexOf(keyToken);
-    if (startIndex == -1)
-        return Version{};
-    const int endIndex = macroDump.indexOf('\n', startIndex);
-    if (endIndex == -1)
-        return Version{};
-    const auto keyLength = keyToken.length();
-    return Version::fromString(QString::fromLatin1(
-            macroDump.mid(startIndex + keyLength,
-                          endIndex - startIndex - keyLength).replace('_', '.')));
-}
-
-static Version dumpSdccCompilerVersion(const QFileInfo &compiler)
+static Version dumpSdccVersion(const QFileInfo &compiler)
 {
-    const QByteArray dump = dumpSdccMacros(compiler);
-    if (dump.isEmpty())
+    const auto macros = dumpMacros([&compiler]() { return dumpOutput(compiler); });
+    if (!macros.contains(QLatin1String("__SDCC"))) {
+        qbsWarning() << Tr::tr("No __SDCC token was found in the compiler dump");
         return Version{};
-
-    const int major = extractVersion(dump, "__SDCC_VERSION_MAJOR ");
-    const int minor = extractVersion(dump, "__SDCC_VERSION_MINOR ");
-    const int patch = extractVersion(dump, "__SDCC_VERSION_PATCH ");
-    if (major < 0 || minor < 0 || patch < 0) {
-        const auto version = dumpOldSddcCompilerVersion(dump);
-        if (!version.isValid()) {
-            qbsWarning() << Tr::tr("No '__SDCC_VERSION_xxx' or '__SDCC' token was found "
-                                   "in the compiler dump:\n%1")
-                            .arg(QString::fromUtf8(dump));
-            return Version{};
-        }
-        return version;
     }
 
-    return Version{major, minor, patch};
+    auto value = macros.value(QLatin1String("__SDCC"));
+    value.replace(QLatin1Char('_'), QLatin1Char('.'));
+    return Version::fromString(value);
 }
 
 static std::vector<ToolchainInstallInfo> installedSdccsFromPath()
@@ -200,7 +169,7 @@ static std::vector<ToolchainInstallInfo> installedSdccsFromPath()
                         HostOsInfo::appendExecutableSuffix(compilerName)));
         if (!sdccPath.exists())
             continue;
-        const Version version = dumpSdccCompilerVersion(sdccPath);
+        const Version version = dumpSdccVersion(sdccPath);
         infos.push_back({sdccPath, version});
     }
     std::sort(infos.begin(), infos.end());
@@ -293,13 +262,13 @@ void sdccProbe(Settings *settings, std::vector<Profile> &profiles)
                    pathInfos.cbegin(), pathInfos.cend(),
                    std::back_inserter(allInfos));
 
+    if (allInfos.empty())
+        qbsInfo() << Tr::tr("No SDCC toolchains found.");
+
     for (const ToolchainInstallInfo &info : allInfos) {
         const auto newProfiles = createSdccProfileHelper(info, settings);
         profiles.reserve(profiles.size() + int(newProfiles.size()));
         std::copy(newProfiles.cbegin(), newProfiles.cend(),
                   std::back_inserter(profiles));
     }
-
-    if (allInfos.empty())
-        qbsInfo() << Tr::tr("No SDCC toolchains found.");
 }
diff --git a/src/app/qbs-setup-toolchains/watcomprobe.cpp b/src/app/qbs-setup-toolchains/watcomprobe.cpp
new file mode 100644
index 000000000..cc9fee2b4
--- /dev/null
+++ b/src/app/qbs-setup-toolchains/watcomprobe.cpp
@@ -0,0 +1,255 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 Denis Shienkov <denis.shienkov@gmail.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "watcomprobe.h"
+#include "probe.h"
+
+#include "../shared/logging/consolelogger.h"
+
+#include <logging/translator.h>
+
+#include <tools/hostosinfo.h>
+#include <tools/profile.h>
+
+#include <QtCore/qdir.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qregularexpression.h>
+#include <QtCore/qsettings.h>
+#include <QtCore/qtemporaryfile.h>
+
+using namespace qbs;
+using Internal::HostOsInfo;
+using Internal::Tr;
+
+namespace {
+
+struct Details {
+    QStringView architecture;
+    QStringView platform;
+};
+
+constexpr struct Platform {
+    QStringView flag;
+    Details keys;
+    Details target;
+} knownPlatforms[] = {
+    // DOS 16/32 bit.
+    {u"-bdos", {u"__I86__", u"__DOS__"}, {u"x86_16", u"dos"}},
+    {u"-bdos4g", {u"__386__", u"__DOS__"}, {u"x86", u"dos"}},
+    // Windows 16/32 bit.
+    {u"-bwindows", {u"__I86__", u"__WINDOWS__"}, {u"x86_16", u"windows"}},
+    {u"-bnt", {u"__386__", u"__NT__"}, {u"x86", u"windows"}},
+    // OS/2 16/32 bit.
+    {u"-bos2", {u"__I86__", u"__OS2__"}, {u"x86_16", u"os2"}},
+    {u"-bos2v2", {u"__386__", u"__OS2__"}, {u"x86", u"os2"}},
+    // Linux 32 bit.
+    {u"-blinux", {u"__386__", u"__LINUX__"}, {u"x86", u"linux"}},
+};
+
+} // namespace
+
+static QStringList knownWatcomCompilerNames()
+{
+    return {QStringLiteral("owcc")};
+}
+
+static QStringList dumpOutput(const QFileInfo &compiler, QStringView flag,
+                              const QList<QStringView> &keys)
+{
+    const QString filePath = QDir(QDir::tempPath()).absoluteFilePath(
+        QLatin1String("watcom-dump.c"));
+    QFile fakeIn(filePath);
+    if (!fakeIn.open(QIODevice::Truncate | QIODevice::WriteOnly | QIODevice::Text)) {
+        qbsWarning() << Tr::tr("Unable to open temporary file %1 for output: %2")
+                        .arg(fakeIn.fileName(), fakeIn.errorString());
+        return {};
+    }
+    fakeIn.write("#define VALUE_TO_STRING(x) #x\n");
+    fakeIn.write("#define VALUE(x) VALUE_TO_STRING(x)\n");
+    fakeIn.write("#define VAR_NAME_VALUE(var) \"#define \" #var\" \"VALUE(var)\n");
+    for (const auto &key : keys) {
+        fakeIn.write("#if defined(" + key.toLatin1() + ")\n");
+        fakeIn.write("#pragma message (VAR_NAME_VALUE(" + key.toLatin1() + "))\n");
+        fakeIn.write("#endif\n");
+    }
+    fakeIn.close();
+    QProcess p;
+    QStringList args;
+    if (!flag.isEmpty())
+        args.push_back(flag.toString());
+    args.push_back(QDir::toNativeSeparators(filePath));
+    p.start(compiler.absoluteFilePath(), args);
+    p.waitForFinished(3000);
+    fakeIn.remove();
+    QStringList lines = QString::fromUtf8(p.readAllStandardOutput())
+                                .split(QRegularExpression(QLatin1String("\\r?\\n")));
+    return lines;
+}
+
+static bool supportsWatcomPlatform(const QFileInfo &compiler, const Platform &platform)
+{
+    const auto macros = dumpMacros([&compiler, &platform]() {
+        const QList<QStringView> keys = {platform.keys.architecture, platform.keys.platform};
+        return dumpOutput(compiler, platform.flag, keys); });
+
+    auto matches = [&macros](QStringView key) {
+        const auto k = key.toString();
+        if (!macros.contains(k))
+            return false;
+        return macros.value(k) == QLatin1String("1");
+    };
+
+    return matches(platform.keys.architecture) && matches(platform.keys.platform);
+}
+
+static std::vector<Profile> createWatcomProfileHelper(const ToolchainInstallInfo &info,
+                                                      Settings *settings,
+                                                      QStringView profileName = {})
+{
+    const QFileInfo compiler = info.compilerPath;
+    std::vector<Profile> profiles;
+
+    for (const auto &knownPlatform : knownPlatforms) {
+        // Don't create a profile in case the compiler does
+        // not support the proposed architecture.
+        if (!supportsWatcomPlatform(compiler, knownPlatform))
+            continue;
+
+        QString fullProfilename;
+        if (profileName.isEmpty()) {
+            // Create a full profile name in case we is in auto-detecting mode.
+            if (!info.compilerVersion.isValid()) {
+                fullProfilename = QStringLiteral("watcom-unknown-%1-%2")
+                        .arg(knownPlatform.target.platform)
+                        .arg(knownPlatform.target.architecture);
+            } else {
+                const QString version= info.compilerVersion.toString(QLatin1Char('_'),
+                                                                     QLatin1Char('_'));
+                fullProfilename = QStringLiteral("watcom-%1-%2-%3")
+                        .arg(version)
+                        .arg(knownPlatform.target.platform)
+                        .arg(knownPlatform.target.architecture);
+            }
+        } else {
+            // Append the detected actual architecture name to the proposed profile name.
+            fullProfilename = QStringLiteral("%1-%2-%3")
+                    .arg(profileName)
+                    .arg(knownPlatform.target.platform)
+                    .arg(knownPlatform.target.architecture);
+        }
+
+        Profile profile(fullProfilename, settings);
+        profile.setValue(QStringLiteral("cpp.toolchainInstallPath"), compiler.absolutePath());
+        profile.setValue(QStringLiteral("qbs.toolchainType"), QStringLiteral("watcom"));
+        profile.setValue(QStringLiteral("qbs.architecture"),
+                         knownPlatform.target.architecture.toString());
+        profile.setValue(QStringLiteral("qbs.targetPlatform"),
+                         knownPlatform.target.platform.toString());
+
+        qbsInfo() << Tr::tr("Profile '%1' created for '%2'.")
+                     .arg(profile.name(), compiler.absoluteFilePath());
+
+        profiles.push_back(std::move(profile));
+    }
+
+    return profiles;
+}
+
+static Version dumpWatcomVersion(const QFileInfo &compiler)
+{
+    const QList<QStringView> keys = {u"__WATCOMC__", u"__WATCOM_CPLUSPLUS__"};
+    const auto macros = dumpMacros([&compiler, &keys]() {
+        return dumpOutput(compiler, u"", keys); });
+    for (const auto &macro : macros) {
+        const int verCode = macro.toInt();
+        return Version{(verCode - 1100) / 100,
+                       (verCode / 10) % 10,
+                       ((verCode % 10) > 0) ? (verCode % 10) : 0};
+    }
+    qbsWarning() << Tr::tr("No __WATCOMC__ or __WATCOM_CPLUSPLUS__ tokens was found"
+                           " in the compiler dump");
+    return Version{};
+}
+
+static std::vector<ToolchainInstallInfo> installedWatcomsFromPath()
+{
+    std::vector<ToolchainInstallInfo> infos;
+    const auto compilerNames = knownWatcomCompilerNames();
+    for (const QString &compilerName : compilerNames) {
+        const QFileInfo watcomPath(findExecutable(
+            HostOsInfo::appendExecutableSuffix(compilerName)));
+        if (!watcomPath.exists())
+            continue;
+        const Version version = dumpWatcomVersion(watcomPath);
+        infos.push_back({watcomPath, version});
+    }
+    std::sort(infos.begin(), infos.end());
+    return infos;
+}
+
+bool isWatcomCompiler(const QString &compilerName)
+{
+    return Internal::any_of(knownWatcomCompilerNames(), [compilerName](const QString &knownName) {
+        return compilerName.contains(knownName);
+    });
+}
+
+void createWatcomProfile(const QFileInfo &compiler, Settings *settings, QStringView profileName)
+{
+    const ToolchainInstallInfo info = {compiler, Version{}};
+    createWatcomProfileHelper(info, settings, profileName);
+}
+
+void watcomProbe(Settings *settings, std::vector<Profile> &profiles)
+{
+    qbsInfo() << Tr::tr("Trying to detect WATCOM toolchains...");
+
+    const std::vector<ToolchainInstallInfo> allInfos = installedWatcomsFromPath();
+    if (allInfos.empty()) {
+        qbsInfo() << Tr::tr("No WATCOM toolchains found.");
+        return;
+    }
+
+    for (const ToolchainInstallInfo &info : allInfos) {
+        const auto newProfiles = createWatcomProfileHelper(info, settings);
+        profiles.reserve(profiles.size() + int(newProfiles.size()));
+        std::copy(newProfiles.cbegin(), newProfiles.cend(), std::back_inserter(profiles));
+    }
+}
diff --git a/src/app/qbs-setup-toolchains/watcomprobe.h b/src/app/qbs-setup-toolchains/watcomprobe.h
new file mode 100644
index 000000000..ea010461d
--- /dev/null
+++ b/src/app/qbs-setup-toolchains/watcomprobe.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 Denis Shienkov <denis.shienkov@gmail.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QBS_SETUPTOOLCHAINS_WATCOMPROBE_H
+#define QBS_SETUPTOOLCHAINS_WATCOMPROBE_H
+
+#include <QtCore/qlist.h>
+
+QT_BEGIN_NAMESPACE
+class QFileInfo;
+QT_END_NAMESPACE
+
+namespace qbs {
+class Profile;
+class Settings;
+} // namespace qbs
+
+bool isWatcomCompiler(const QString &compilerName);
+void createWatcomProfile(
+    const QFileInfo &compiler, qbs::Settings *settings, QStringView profileName);
+void watcomProbe(qbs::Settings *settings, std::vector<qbs::Profile> &profiles);
+
+#endif // Header guard
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
index 6f740a93a..ea27e4143 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
@@ -150,7 +150,7 @@ void XcodeProbe::detectDeveloperPaths()
     if (!selectedXcode.waitForFinished(-1) || selectedXcode.exitCode()) {
         qbsInfo() << Tr::tr("Could not detect selected Xcode with /usr/bin/xcode-select");
     } else {
-        QString path = QString::fromLocal8Bit(selectedXcode.readAllStandardOutput());
+        QString path = QString::fromLocal8Bit(selectedXcode.readAllStandardOutput().trimmed());
         addDeveloperPath(path);
     }
     addDeveloperPath(defaultDeveloperPath);
@@ -163,7 +163,7 @@ void XcodeProbe::detectDeveloperPaths()
         qbsInfo() << Tr::tr("Could not detect additional Xcode installations with /usr/bin/mdfind");
     } else {
         const auto paths = QString::fromLocal8Bit(launchServices.readAllStandardOutput())
-                .split(QLatin1Char('\n'), QBS_SKIP_EMPTY_PARTS);
+                .split(QLatin1Char('\n'), Qt::SkipEmptyParts);
         for (const QString &path : paths)
             addDeveloperPath(path + QStringLiteral("/Contents/Developer"));
     }
@@ -171,7 +171,7 @@ void XcodeProbe::detectDeveloperPaths()
 
 void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &xcodeName)
 {
-    qbsInfo() << Tr::tr("Profile '%1' created for '%2'.").arg(xcodeName).arg(devPath);
+    qbsInfo() << Tr::tr("Profile '%1' created for '%2'.").arg(xcodeName, devPath);
 
     Profile installationProfile(xcodeName, settings);
     installationProfile.removeProfile();
@@ -188,7 +188,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &x
               << QStringLiteral("appletvsimulator")
               << QStringLiteral("watchos")
               << QStringLiteral("watchsimulator");
-    for (const QString &platform : qAsConst(platforms)) {
+    for (const QString &platform : std::as_const(platforms)) {
         Profile platformProfile(xcodeName + QLatin1Char('-') + platform, settings);
         platformProfile.removeProfile();
         platformProfile.setBaseProfile(installationProfile.name());
@@ -212,7 +212,7 @@ void XcodeProbe::detectAll()
 {
     int i = 1;
     detectDeveloperPaths();
-    for (const QString &developerPath : qAsConst(developerPaths)) {
+    for (const QString &developerPath : std::as_const(developerPaths)) {
         QString profileName = QStringLiteral("xcode");
         if (developerPath != defaultDeveloperPath) {
             const auto devPath = developerPath.toStdString();
diff --git a/src/app/qbs/CMakeLists.txt b/src/app/qbs/CMakeLists.txt
index c190efccc..cd9240f98 100644
--- a/src/app/qbs/CMakeLists.txt
+++ b/src/app/qbs/CMakeLists.txt
@@ -7,6 +7,8 @@ set(SOURCES
     consoleprogressobserver.h
     ctrlchandler.cpp
     ctrlchandler.h
+    lspserver.cpp
+    lspserver.h
     main.cpp
     qbstool.cpp
     qbstool.h
@@ -43,7 +45,11 @@ add_qbs_app(qbs
         "QBS_RELATIVE_LIBEXEC_PATH=\"${QBS_RELATIVE_LIBEXEC_PATH}\""
         "QBS_RELATIVE_SEARCH_PATH=\"${QBS_RELATIVE_SEARCH_PATH}\""
         "QBS_RELATIVE_PLUGINS_PATH=\"${QBS_RELATIVE_PLUGINS_PATH}\""
-    DEPENDS qbscore qbsconsolelogger
+    DEPENDS
+        qbscore
+        qbsconsolelogger
+        qtclsp
+        Qt${QT_VERSION_MAJOR}::Network
     SOURCES ${SOURCES} ${PARSER_SOURCES}
     )
 
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index 4a28b93ec..200740145 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -97,9 +97,9 @@ void CommandLineFrontend::checkCancelStatus()
         m_cancelTimer->stop();
         if (m_resolveJobs.empty() && m_buildJobs.empty())
             std::exit(EXIT_FAILURE);
-        for (AbstractJob * const job : qAsConst(m_resolveJobs))
+        for (AbstractJob * const job : std::as_const(m_resolveJobs))
             job->cancel();
-        for (AbstractJob * const job : qAsConst(m_buildJobs))
+        for (AbstractJob * const job : std::as_const(m_buildJobs))
             job->cancel();
         break;
     case CancelStatusCanceling:
@@ -140,7 +140,7 @@ void CommandLineFrontend::start()
         }
 
         if (m_parser.showVersion()) {
-            puts(QBS_VERSION);
+            std::puts(QBS_VERSION);
             qApp->exit(EXIT_SUCCESS);
             return;
         }
@@ -152,11 +152,11 @@ void CommandLineFrontend::start()
         params.setDryRun(m_parser.dryRun());
         params.setForceProbeExecution(m_parser.forceProbesExecution());
         params.setWaitLockBuildGraph(m_parser.waitLockBuildGraph());
-        params.setFallbackProviderEnabled(!m_parser.disableFallbackProvider());
         params.setLogElapsedTime(m_parser.logTime());
         params.setSettingsDirectory(m_settings->baseDirectory());
         params.setOverrideBuildGraphData(m_parser.command() == ResolveCommandType);
         params.setPropertyCheckingMode(ErrorHandlingMode::Strict);
+        params.setDeprecationWarningMode(m_parser.deprecationWarningMode());
         if (!m_parser.buildBeforeInstalling() || !m_parser.commandCanResolve())
             params.setRestoreBehavior(SetupProjectParameters::RestoreOnly);
         const auto buildConfigs = m_parser.buildConfigurations();
@@ -183,6 +183,7 @@ void CommandLineFrontend::start()
             params.setConfigurationName(configurationName);
             params.setBuildRoot(buildDirectory(profileName));
             params.setOverriddenValues(userConfig);
+            params.setMaxJobCount(m_parser.jobCount(profileName));
             SetupProjectJob * const job = Project().setupProject(params,
                     ConsoleLogger::instance().logSink(), this);
             connectJob(job);
@@ -348,12 +349,12 @@ CommandLineFrontend::ProductMap CommandLineFrontend::productsToUse() const
     ProductMap products;
     QStringList productNames;
     const bool useAll = m_parser.products().empty();
-    for (const Project &project : qAsConst(m_projects)) {
+    for (const Project &project : std::as_const(m_projects)) {
         QList<ProductData> &productList = products[project];
         const ProjectData projectData = project.projectData();
         for (const ProductData &product : projectData.allProducts()) {
-            productNames << product.name();
-            if (useAll || m_parser.products().contains(product.name())) {
+            productNames << product.fullDisplayName();
+            if (useAll || m_parser.products().contains(product.fullDisplayName())) {
                 productList.push_back(product);
             }
         }
@@ -431,7 +432,7 @@ void CommandLineFrontend::handleProjectsResolved()
 void CommandLineFrontend::makeClean()
 {
     if (m_parser.products().empty()) {
-        for (const Project &project : qAsConst(m_projects)) {
+        for (const Project &project : std::as_const(m_projects)) {
             m_buildJobs << project.cleanAllProducts(m_parser.cleanOptions(project.profile()), this);
         }
     } else {
@@ -489,9 +490,22 @@ QString CommandLineFrontend::buildDirectory(const QString &profileName) const
     }
 
     QString projectName(QFileInfo(m_parser.projectFilePath()).baseName());
+    QString originalBuildDir = buildDir;
     buildDir.replace(BuildDirectoryOption::magicProjectString(), projectName);
+    const QString buildDirPlaceHolderMsgTemplate = Tr::tr(
+        "You must provide the path to the project file when using build directory "
+        "placeholder '%1'.");
+    if (buildDir != originalBuildDir && projectName.isEmpty()) {
+        throw ErrorInfo(
+            buildDirPlaceHolderMsgTemplate.arg(BuildDirectoryOption::magicProjectString()));
+    }
     QString projectDir(QFileInfo(m_parser.projectFilePath()).path());
+    originalBuildDir = buildDir;
     buildDir.replace(BuildDirectoryOption::magicProjectDirString(), projectDir);
+    if (buildDir != originalBuildDir && projectDir.isEmpty()) {
+        throw ErrorInfo(
+            buildDirPlaceHolderMsgTemplate.arg(BuildDirectoryOption::magicProjectDirString()));
+    }
     if (!QFileInfo(buildDir).isAbsolute())
         buildDir = QDir::currentPath() + QLatin1Char('/') + buildDir;
     buildDir = QDir::cleanPath(buildDir);
@@ -503,7 +517,7 @@ void CommandLineFrontend::build()
     if (m_parser.products().empty()) {
         const Project::ProductSelection productSelection = m_parser.withNonDefaultProducts()
                 ? Project::ProductSelectionWithNonDefault : Project::ProductSelectionDefaultOnly;
-        for (const Project &project : qAsConst(m_projects))
+        for (const Project &project : std::as_const(m_projects))
             m_buildJobs << project.buildAllProducts(buildOptions(project), productSelection, this);
     } else {
         const ProductMap &products = productsToUse();
@@ -564,7 +578,7 @@ int CommandLineFrontend::runTarget()
     const QString executableFilePath = productToRun.targetExecutable();
     if (executableFilePath.isEmpty()) {
         throw ErrorInfo(Tr::tr("Cannot run: Product '%1' is not an application.")
-                    .arg(productToRun.name()));
+                    .arg(productToRun.fullDisplayName()));
     }
     RunEnvironment runEnvironment = m_projects.front().getRunEnvironment(productToRun,
             m_parser.installOptions(m_projects.front().profile()),
@@ -609,7 +623,7 @@ void CommandLineFrontend::listProducts()
 
 void CommandLineFrontend::connectBuildJobs()
 {
-    for (AbstractJob * const job : qAsConst(m_buildJobs))
+    for (AbstractJob * const job : std::as_const(m_buildJobs))
         connectBuildJob(job);
 }
 
@@ -647,7 +661,7 @@ ProductData CommandLineFrontend::getTheOneRunnableProduct()
 
     if (m_parser.products().size() == 1) {
         for (const ProductData &p : m_projects.front().projectData().allProducts()) {
-            if (p.name() == m_parser.products().constFirst())
+            if (p.fullDisplayName() == m_parser.products().constFirst())
                 return p;
         }
         QBS_CHECK(false);
@@ -671,14 +685,8 @@ ProductData CommandLineFrontend::getTheOneRunnableProduct()
     ErrorInfo error(Tr::tr("Ambiguous use of command '%1': No product given, but project "
                            "has more than one runnable product.").arg(m_parser.commandName()));
     error.append(Tr::tr("Use the '--products' option with one of the following products:"));
-    for (const ProductData &p : qAsConst(runnableProducts)) {
-        QString productRepr = QLatin1String("\t") + p.name();
-        if (p.profile() != m_projects.front().profile()) {
-            productRepr.append(QLatin1String(" [")).append(p.profile())
-                    .append(QLatin1Char(']'));
-        }
-        error.append(productRepr);
-    }
+    for (const ProductData &p : std::as_const(runnableProducts))
+        error.append(QLatin1String("\t") + p.fullDisplayName());
     throw error;
 }
 
diff --git a/src/app/qbs/lspserver.cpp b/src/app/qbs/lspserver.cpp
new file mode 100644
index 000000000..c6cce6706
--- /dev/null
+++ b/src/app/qbs/lspserver.cpp
@@ -0,0 +1,629 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "lspserver.h"
+
+#include <api/projectdata.h>
+#include <logging/translator.h>
+#include <lsp/basemessage.h>
+#include <lsp/completion.h>
+#include <lsp/initializemessages.h>
+#include <lsp/jsonrpcmessages.h>
+#include <lsp/messages.h>
+#include <lsp/servercapabilities.h>
+#include <lsp/textsynchronization.h>
+#include <parser/qmljsastvisitor_p.h>
+#include <parser/qmljslexer_p.h>
+#include <parser/qmljsparser_p.h>
+#include <tools/qbsassert.h>
+#include <tools/stlutils.h>
+
+#include <QBuffer>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QMap>
+
+#include <unordered_map>
+#ifdef Q_OS_WINDOWS
+#include <process.h>
+#else
+#include <unistd.h>
+#endif
+
+namespace qbs::Internal {
+
+static int getPid()
+{
+#ifdef Q_OS_WINDOWS
+    return _getpid();
+#else
+    return getpid();
+#endif
+}
+
+using LspErrorResponse = lsp::ResponseError<std::nullptr_t>;
+using LspErrorCode = LspErrorResponse::ErrorCodes;
+
+class Document {
+public:
+    bool isPositionUpToDate(const CodePosition &pos) const;
+    bool isPositionUpToDate(const lsp::Position &pos) const;
+
+    QString savedContent;
+    QString currentContent;
+};
+
+static CodePosition posFromLspPos(const lsp::Position &pos)
+{
+    return {pos.line() + 1, pos.character() + 1};
+}
+
+static lsp::Position lspPosFromCodeLocation(const CodeLocation &loc)
+{
+    return {loc.line() - 1, loc.column() - 1};
+}
+
+static QString uriToString(const lsp::DocumentUri &uri)
+{
+    return uri.toFilePath([](const lsp::Utils::FilePath &fp) { return fp; });
+}
+
+static int posToOffset(const CodePosition &pos, const QString &doc);
+static int posToOffset(const lsp::Position &pos, const QString &doc)
+{
+    return posToOffset(posFromLspPos(pos), doc);
+}
+
+class AstNodeLocator : public QbsQmlJS::AST::Visitor
+{
+public:
+    AstNodeLocator(int position, QbsQmlJS::AST::UiProgram &ast)
+        : m_position(position)
+    {
+        ast.accept(this);
+    }
+
+    QList<QbsQmlJS::AST::Node *> path() const { return m_path; }
+
+private:
+    bool preVisit(QbsQmlJS::AST::Node *node) override
+    {
+        if (int(node->firstSourceLocation().offset) > m_position)
+            return false;
+        if (int(node->lastSourceLocation().offset) < m_position)
+            return false;
+        m_path << node;
+        return true;
+    }
+
+    const int m_position;
+    QList<QbsQmlJS::AST::Node *> m_path;
+};
+
+class LspServer::Private
+{
+public:
+    void setupConnection();
+    void handleIncomingData();
+    void discardSocket();
+    template<typename T> void sendResponse(const T &msg);
+    void sendErrorResponse(LspErrorCode code, const QString &message);
+    void sendErrorNotification(const QString &message);
+    void sendNoSuchDocumentError(const QString &filePath);
+    void sendMessage(const lsp::JsonObject &msg);
+    void sendMessage(const lsp::JsonRpcMessage &msg);
+    void handleCurrentMessage();
+    void handleInitializeRequest();
+    void handleInitializedNotification();
+    void handleGotoDefinitionRequest();
+    void handleCompletionRequest();
+    void handleShutdownRequest();
+    void handleDidOpenNotification();
+    void handleDidChangeNotification();
+    void handleDidSaveNotification();
+    void handleDidCloseNotification();
+
+    QLocalServer server;
+    QBuffer incomingData;
+    lsp::BaseMessage currentMessage;
+    QJsonObject messageObject;
+    QLocalSocket *socket = nullptr;
+    ProjectData projectData;
+    CodeLinks codeLinks;
+    std::unordered_map<QString, Document> documents;
+
+    enum class State { None, InitRequest, InitNotification, Shutdown };
+    State state = State::None;
+};
+
+LspServer::LspServer() : d(new Private)
+{
+    if (!d->server.listen(QString::fromLatin1("qbs-lsp-%1").arg(getPid()))) {
+        // This is not fatal, qbs main operation can continue.
+        qWarning() << "failed to open lsp socket:" << d->server.errorString();
+        return;
+    }
+    QObject::connect(&d->server, &QLocalServer::newConnection, [this] {
+        d->socket = d->server.nextPendingConnection();
+        d->setupConnection();
+        d->server.close();
+    });
+}
+
+LspServer::~LspServer() { delete d; }
+
+void LspServer::updateProjectData(const ProjectData &projectData, const CodeLinks &codeLinks)
+{
+    d->projectData = projectData;
+    d->codeLinks = codeLinks;
+}
+
+QString LspServer::socketPath() const { return d->server.fullServerName(); }
+
+void LspServer::Private::setupConnection()
+{
+    QBS_ASSERT(socket, return);
+
+    QObject::connect(socket, &QLocalSocket::errorOccurred, [this] { discardSocket(); });
+    QObject::connect(socket, &QLocalSocket::disconnected, [this] { discardSocket(); });
+    QObject::connect(socket, &QLocalSocket::readyRead, [this] { handleIncomingData(); });
+    incomingData.open(QIODevice::ReadWrite | QIODevice::Append);
+    handleIncomingData();
+}
+
+void LspServer::Private::handleIncomingData()
+{
+    const int pos = incomingData.pos();
+    incomingData.write(socket->readAll());
+    incomingData.seek(pos);
+    QString parseError;
+    lsp::BaseMessage::parse(&incomingData, parseError, currentMessage);
+    if (!parseError.isEmpty())
+        return sendErrorResponse(LspErrorResponse::ParseError, parseError);
+    if (currentMessage.isComplete()) {
+        incomingData.buffer().remove(0, incomingData.pos());
+        incomingData.seek(0);
+        handleCurrentMessage();
+        currentMessage = {};
+        messageObject = {};
+        if (socket)
+            handleIncomingData();
+    }
+}
+
+void LspServer::Private::discardSocket()
+{
+    socket->disconnect();
+    socket->deleteLater();
+    socket = nullptr;
+}
+
+template<typename T> void LspServer::Private::sendResponse(const T &msg)
+{
+    lsp::Response<T, std::nullptr_t> response(lsp::MessageId(messageObject.value(lsp::idKey)));
+    response.setResult(msg);
+    sendMessage(response);
+}
+
+void LspServer::Private::sendErrorResponse(LspErrorCode code, const QString &message)
+{
+    lsp::Response<lsp::JsonObject, std::nullptr_t> response(lsp::MessageId(
+        messageObject.value(lsp::idKey)));
+    lsp::ResponseError<std::nullptr_t> error;
+    error.setCode(code);
+    error.setMessage(message);
+    response.setError(error);
+    sendMessage(response);
+}
+
+void LspServer::Private::sendErrorNotification(const QString &message)
+{
+    lsp::ShowMessageParams params;
+    params.setType(lsp::Error);
+    params.setMessage(message);
+    sendMessage(lsp::ShowMessageNotification(params));
+}
+
+void LspServer::Private::sendNoSuchDocumentError(const QString &filePath)
+{
+    sendErrorNotification(Tr::tr("No such document: '%1'").arg(filePath));
+}
+
+void LspServer::Private::sendMessage(const lsp::JsonObject &msg)
+{
+    sendMessage(lsp::JsonRpcMessage(msg));
+}
+
+void LspServer::Private::sendMessage(const lsp::JsonRpcMessage &msg)
+{
+    lsp::BaseMessage baseMsg = msg.toBaseMessage();
+    socket->write(baseMsg.header());
+    socket->write(baseMsg.content);
+}
+
+void LspServer::Private::handleCurrentMessage()
+{
+    messageObject = lsp::JsonRpcMessage(currentMessage).toJsonObject();
+    const QString method = messageObject.value(lsp::methodKey).toString();
+    if (method == QLatin1String("exit"))
+        return discardSocket();
+    if (state == State::Shutdown) {
+        return sendErrorResponse(LspErrorResponse::InvalidRequest,
+                                 Tr::tr("Method '%1' not allowed after shutdown."));
+    }
+    if (method == "shutdown")
+        return handleShutdownRequest();
+    if (method == QLatin1String("initialize"))
+        return handleInitializeRequest();
+    if (state == State::None) {
+        return sendErrorResponse(LspErrorResponse::ServerNotInitialized,
+                                 Tr::tr("First message must be initialize request."));
+    }
+    if (method == "initialized")
+        return handleInitializedNotification();
+    if (method == "textDocument/didOpen")
+        return handleDidOpenNotification();
+    if (method == "textDocument/didChange")
+        return handleDidChangeNotification();
+    if (method == "textDocument/didSave")
+        return handleDidSaveNotification();
+    if (method == "textDocument/didClose")
+        return handleDidCloseNotification();
+    if (method == "textDocument/definition")
+        return handleGotoDefinitionRequest();
+    if (method == "textDocument/completion")
+        return handleCompletionRequest();
+
+    sendErrorResponse(LspErrorResponse::MethodNotFound, Tr::tr("This server can do very little."));
+}
+
+void LspServer::Private::handleInitializeRequest()
+{
+    if (state != State::None) {
+        return sendErrorResponse(LspErrorResponse::InvalidRequest,
+                                 Tr::tr("Received initialize request in initialized state."));
+    }
+    state = State::InitRequest;
+
+    lsp::ServerInfo serverInfo;
+    serverInfo.insert(lsp::nameKey, "qbs");
+    serverInfo.insert(lsp::versionKey, QBS_VERSION);
+    lsp::InitializeResult result;
+    result.insert(lsp::serverInfoKey, serverInfo);
+    lsp::ServerCapabilities capabilities; // TODO: hover
+    capabilities.setDefinitionProvider(true);
+    capabilities.setTextDocumentSync({int(lsp::TextDocumentSyncKind::Incremental)});
+    lsp::ServerCapabilities::CompletionOptions completionOptions;
+    completionOptions.setTriggerCharacters({"."});
+    capabilities.setCompletionProvider(completionOptions);
+    result.setCapabilities(capabilities);
+    sendResponse(result);
+}
+
+void LspServer::Private::handleInitializedNotification()
+{
+    if (state != State::InitRequest) {
+        return sendErrorResponse(LspErrorResponse::InvalidRequest,
+                                 Tr::tr("Unexpected initialized notification."));
+    }
+    state = State::InitNotification;
+}
+
+void LspServer::Private::handleGotoDefinitionRequest()
+{
+    const lsp::TextDocumentPositionParams params(messageObject.value(lsp::paramsKey));
+    const QString sourceFile = params.textDocument().uri().toLocalFile();
+    const Document *sourceDoc = nullptr;
+    if (const auto it = documents.find(sourceFile); it != documents.end())
+        sourceDoc = &it->second;
+    const auto fileEntry = codeLinks.constFind(sourceFile);
+    if (fileEntry == codeLinks.constEnd())
+        return sendResponse(nullptr);
+    const CodePosition sourcePos = posFromLspPos(params.position());
+    if (sourceDoc && !sourceDoc->isPositionUpToDate(sourcePos))
+        return sendResponse(nullptr);
+    for (auto it = fileEntry->cbegin(); it != fileEntry->cend(); ++it) {
+        if (!it.key().contains(sourcePos))
+            continue;
+        if (sourceDoc && !sourceDoc->isPositionUpToDate(it.key().end()))
+            return sendResponse(nullptr);
+        QList<CodeLocation> targets = it.value();
+        QBS_ASSERT(!targets.isEmpty(), return sendResponse(nullptr));
+        for (auto it = targets.begin(); it != targets.end();) {
+            const Document *targetDoc = nullptr;
+            if (it->filePath() == sourceFile)
+                targetDoc = sourceDoc;
+            else if (const auto docIt = documents.find(it->filePath()); docIt != documents.end())
+                targetDoc = &docIt->second;
+            if (targetDoc && !targetDoc->isPositionUpToDate(CodePosition(it->line(), it->column())))
+                it = targets.erase(it);
+            else
+                ++it;
+        }
+        struct JsonArray : public QJsonArray { void reserve(std::size_t) {}};
+        const auto locations = transformed<JsonArray>(targets,
+                                                      [](const CodeLocation &loc) {
+            const lsp::Position startPos = lspPosFromCodeLocation(loc);
+            const lsp::Position endPos(startPos.line(), startPos.character() + 1);
+            lsp::Location targetLocation;
+            targetLocation.setUri(lsp::DocumentUri::fromProtocol(
+                                      QUrl::fromLocalFile(loc.filePath()).toString()));
+            targetLocation.setRange({startPos, endPos});
+            return QJsonObject(targetLocation);
+        });
+        if (locations.size() == 1)
+            return sendResponse(locations.first().toObject());
+        return sendResponse(locations);
+    }
+    sendResponse(nullptr);
+}
+
+// We operate under the assumption that the client has basic QML support.
+// Therefore, we only provide completion for qbs modules and their properties.
+// Only a simple prefix match is implemented, with no regard to the contents after the cursor.
+void LspServer::Private::handleCompletionRequest()
+{
+    if (!projectData.isValid())
+        return sendResponse(nullptr);
+
+    const lsp::CompletionParams params(messageObject.value(lsp::paramsKey));
+    const QString sourceFile = params.textDocument().uri().toLocalFile();
+    const Document *sourceDoc = nullptr;
+    if (const auto it = documents.find(sourceFile); it != documents.end())
+        sourceDoc = &it->second;
+    if (!sourceDoc)
+        return sendResponse(nullptr);
+
+    // If there are products corresponding to this file, check only these when looking for modules.
+    // Otherwise, check all products.
+    const QList<ProductData> allProducts = projectData.allProducts();
+    if (allProducts.isEmpty())
+        return sendResponse(nullptr);
+    QList<ProductData> relevantProducts;
+    for (const ProductData &p : allProducts) {
+        if (p.location().filePath() == sourceFile)
+            relevantProducts << p;
+    }
+    if (relevantProducts.isEmpty())
+        relevantProducts = allProducts;
+
+    QString identifierPrefix;
+    QStringList modulePrefixes;
+    const int offset = posToOffset(params.position(), sourceDoc->currentContent) - 1;
+    if (offset < 0 || offset >= sourceDoc->currentContent.length())
+        return sendResponse(nullptr);
+    const auto collectFromRawString = [&] {
+        int currentPos = offset;
+        const auto constructIdentifier = [&] {
+            QString id;
+            while (currentPos >= 0) {
+                const QChar c = sourceDoc->currentContent.at(currentPos);
+                if (!c.isLetterOrNumber() && c != '_')
+                    break;
+                id.prepend(c);
+                --currentPos;
+            }
+            return id;
+        };
+        identifierPrefix = constructIdentifier();
+        while (true) {
+            if (currentPos <= 0 || sourceDoc->currentContent.at(currentPos) != '.')
+                return;
+            --currentPos;
+            const QString modulePrefix = constructIdentifier();
+            if (modulePrefix.isEmpty())
+                return;
+            modulePrefixes.prepend(modulePrefix);
+        }
+    };
+
+    // Parse the current file. Note that completion usually happens on invalid code, which
+    // often confuses the parser so much that it yields unusable results. Therefore, we always
+    // gather our input parameters from the raw string. We only use the parse result to skip
+    // completion in contexts where it is undesirable.
+    QbsQmlJS::Engine engine;
+    QbsQmlJS::Lexer lexer(&engine);
+    lexer.setCode(sourceDoc->currentContent, 1);
+    QbsQmlJS::Parser parser(&engine);
+    parser.parse();
+    if (parser.ast()) {
+        AstNodeLocator locator(offset, *parser.ast());
+        const QList<QbsQmlJS::AST::Node *> &astPath = locator.path();
+        if (!astPath.isEmpty()) {
+            switch (astPath.last()->kind) {
+            case QbsQmlJS::AST::Node::Kind_FieldMemberExpression:
+            case QbsQmlJS::AST::Node::Kind_UiObjectDefinition:
+            case QbsQmlJS::AST::Node::Kind_UiQualifiedId:
+            case QbsQmlJS::AST::Node::Kind_UiScriptBinding:
+                break;
+            default:
+                return sendResponse(nullptr);
+            }
+        }
+    }
+
+    collectFromRawString();
+    if (modulePrefixes.isEmpty() && identifierPrefix.isEmpty())
+        return sendResponse(nullptr); // We do not want to start completion from nothing.
+
+    QJsonArray results;
+    QMap<QString, QString> namesAndTypes;
+    for (const ProductData &product : std::as_const(relevantProducts)) {
+        const PropertyMap &moduleProps = product.moduleProperties();
+        const QStringList allModules = moduleProps.allModules();
+        const QString moduleNameOrPrefix = modulePrefixes.join('.');
+
+        // Case 1: Prefixes match a module name. Identifier can only expand to the name
+        // of a module property.
+        // Example: "Qt.core.a^" -> "Qt.core.availableBuildVariants"
+        if (!modulePrefixes.isEmpty() && allModules.contains(moduleNameOrPrefix)) {
+            for (const PropertyMap::PropertyInfo &info :
+                 moduleProps.allPropertiesForModule(moduleNameOrPrefix)) {
+                if (info.isBuiltin)
+                    continue;
+                if (!identifierPrefix.isEmpty() && !info.name.startsWith(identifierPrefix))
+                    continue;
+                namesAndTypes.insert(info.name, info.type);
+            }
+            continue;
+        }
+
+        // Case 2: Isolated identifier. Can only expand to a module name.
+        //     Example: "Q^" -> "Qt.core", "Qt.widgets", ...
+        // Case 3: Prefixes match a module prefix. Identifier can only expand to a module name.
+        //     Example: "Qt.c^" -> "Qt.core", "Qt.concurrent", ...
+        QString fullPrefix = identifierPrefix;
+        int nameOffset = 0;
+        if (!modulePrefixes.isEmpty()) {
+            fullPrefix.prepend(moduleNameOrPrefix + '.');
+            nameOffset = moduleNameOrPrefix.length() + 1;
+        }
+        for (const QString &module : allModules) {
+            if (module.startsWith(fullPrefix))
+                namesAndTypes.insert(module.mid(nameOffset), {});
+        }
+    }
+
+    for (auto it = namesAndTypes.cbegin(); it != namesAndTypes.cend(); ++it) {
+        lsp::CompletionItem item;
+        item.setLabel(it.key());
+        if (!it.value().isEmpty())
+            item.setDetail(it.value());
+        results.append(QJsonObject(item));
+    };
+    sendResponse(results);
+}
+
+void LspServer::Private::handleShutdownRequest()
+{
+    state = State::Shutdown;
+    sendResponse(nullptr);
+}
+
+void LspServer::Private::handleDidOpenNotification()
+{
+    const lsp::TextDocumentItem docItem = lsp::DidOpenTextDocumentNotification(messageObject)
+                                              .params().value_or(lsp::DidOpenTextDocumentParams())
+                                              .textDocument();
+    if (!docItem.isValid())
+        return sendErrorNotification(Tr::tr("Invalid didOpen parameters."));
+    const QString filePath = uriToString(docItem.uri());
+    Document &doc = documents[filePath];
+    doc.savedContent = doc.currentContent = docItem.text();
+}
+
+void LspServer::Private::handleDidChangeNotification()
+{
+    const auto params = lsp::DidChangeTextDocumentNotification(messageObject)
+                            .params().value_or(lsp::DidChangeTextDocumentParams());
+    if (!params.isValid())
+        return sendErrorNotification(Tr::tr("Invalid didChange parameters."));
+    const QString filePath = uriToString(params.textDocument().uri());
+    const auto docIt = documents.find(filePath);
+    if (docIt == documents.end())
+        return sendNoSuchDocumentError(filePath);
+    Document &doc = docIt->second;
+    const auto changes = params.contentChanges();
+    for (const auto &change : changes) {
+        const auto range = change.range();
+        if (!range) {
+            doc.currentContent = change.text();
+            continue;
+        }
+        const int startPos = posToOffset(range->start(), doc.currentContent);
+        const int endPos = posToOffset(range->end(), doc.currentContent);
+        if (startPos == -1 || endPos == -1 || startPos > endPos)
+            return sendErrorResponse(LspErrorResponse::InvalidParams, Tr::tr("Invalid range."));
+        doc.currentContent.replace(startPos, endPos - startPos, change.text());
+    }
+}
+
+void LspServer::Private::handleDidSaveNotification()
+{
+    const QString filePath = uriToString(lsp::DidSaveTextDocumentNotification(messageObject)
+                                             .params().value_or(lsp::DidSaveTextDocumentParams())
+                                             .textDocument().uri());
+    const auto docIt = documents.find(filePath);
+    if (docIt == documents.end())
+        return sendNoSuchDocumentError(filePath);
+    docIt->second.savedContent = docIt->second.currentContent;
+
+    // TODO: Mark the project data as out of date until the next update(),if the document
+    // is in buildSystemFiles().
+}
+
+void LspServer::Private::handleDidCloseNotification()
+{
+    const QString filePath = uriToString(lsp::DidCloseTextDocumentNotification(messageObject)
+                                             .params().value_or(lsp::DidCloseTextDocumentParams())
+                                             .textDocument().uri());
+    const auto docIt = documents.find(filePath);
+    if (docIt == documents.end())
+        return sendNoSuchDocumentError(filePath);
+    documents.erase(docIt);
+}
+
+static int posToOffset(const CodePosition &pos, const QString &doc)
+{
+    int offset = 0;
+    for (int newlines = 0, next = 0; newlines < pos.line() - 1; ++newlines) {
+        offset = doc.indexOf('\n', next);
+        if (offset == -1)
+            return -1;
+        next = offset + 1;
+    }
+    return offset + pos.column();
+}
+
+bool Document::isPositionUpToDate(const CodePosition &pos) const
+{
+    const int origOffset = posToOffset(pos, savedContent);
+    if (origOffset > int(currentContent.size()))
+        return false;
+    return QStringView(currentContent).left(origOffset)
+           == QStringView(savedContent).left(origOffset);
+}
+
+bool Document::isPositionUpToDate(const lsp::Position &pos) const
+{
+    return isPositionUpToDate(posFromLspPos(pos));
+}
+
+} // namespace qbs::Internal
+
diff --git a/src/lib/corelib/language/evaluationdata.h b/src/app/qbs/lspserver.h
index 791b2f234..566808309 100644
--- a/src/lib/corelib/language/evaluationdata.h
+++ b/src/app/qbs/lspserver.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2023 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qbs.
@@ -37,30 +37,29 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_EVALUATIONDATA_H
-#define QBS_EVALUATIONDATA_H
+#pragma once
 
-#include <QtCore/qhash.h>
-#include <QtCore/qvariant.h>
+#include <tools/codelocation.h>
 
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
+#include <QString>
 
 namespace qbs {
+class ProjectData;
 namespace Internal {
 
-class Evaluator;
-class Item;
-
-class EvaluationData
+class LspServer
 {
 public:
-    Evaluator *evaluator = nullptr;
-    const Item *item = nullptr;
-    mutable QHash<QScriptString, QScriptValue> valueCache;
+    LspServer();
+    ~LspServer();
+
+    void updateProjectData(const ProjectData &projectData, const CodeLinks &codeLinks);
+    QString socketPath() const;
+
+private:
+    class Private;
+    Private * const d;
 };
 
 } // namespace Internal
 } // namespace qbs
-
-#endif // QBS_EVALUATIONDATA_H
diff --git a/src/app/qbs/parser/commandlineoption.cpp b/src/app/qbs/parser/commandlineoption.cpp
index a09f36c2c..7572b4e66 100644
--- a/src/app/qbs/parser/commandlineoption.cpp
+++ b/src/app/qbs/parser/commandlineoption.cpp
@@ -334,7 +334,7 @@ void StringListOption::doParse(const QString &representation, QStringList &input
         throw ErrorInfo(Tr::tr("Invalid use of option '%1': Argument list must not be empty.\n"
                            "Usage: %2").arg(representation, description(command())));
     }
-    for (const QString &element : qAsConst(m_arguments)) {
+    for (const QString &element : std::as_const(m_arguments)) {
         if (element.isEmpty()) {
             throw ErrorInfo(Tr::tr("Invalid use of option '%1': Argument list must not contain "
                                "empty elements.\nUsage: %2")
@@ -663,27 +663,51 @@ void CommandEchoModeOption::doParse(const QString &representation, QStringList &
     m_echoMode = commandEchoModeFromName(mode);
 }
 
-QString WaitLockOption::description(CommandType command) const
+QString DeprecationWarningsOption::description(CommandType command) const
 {
     Q_UNUSED(command);
-    return Tr::tr("%1\n\tWait indefinitely for other processes to release the build graph lock.\n")
-            .arg(longRepresentation());
+    return Tr::tr("%1 <mode>\n"
+                  "\tWhat to do when encountering deprecated items or properties.\n"
+                  "\tPossible values are '%2'.\n"
+                  "\tThe default is '%3'.\n")
+            .arg(longRepresentation(),
+                 allDeprecationWarningModeStrings().join(QLatin1String("', '")),
+                 deprecationWarningModeName(defaultDeprecationWarningMode()));
 }
 
-QString WaitLockOption::longRepresentation() const
+QString DeprecationWarningsOption::longRepresentation() const
 {
-    return QStringLiteral("--wait-lock");
+    return QStringLiteral("--deprecation-warnings");
 }
 
-QString DisableFallbackProviderOption::description(CommandType) const
+void DeprecationWarningsOption::doParse(const QString &representation, QStringList &input)
 {
-    return Tr::tr("%1\n\tDo not fall back to pkg-config if a dependency is not found.\n")
+    const QString mode = getArgument(representation, input);
+    if (mode.isEmpty()) {
+        throw ErrorInfo(Tr::tr("Invalid use of option '%1': No deprecation warning mode given.\n"
+                               "Usage: %2")
+                    .arg(representation, description(command())));
+    }
+
+    if (!allDeprecationWarningModeStrings().contains(mode)) {
+        throw ErrorInfo(Tr::tr("Invalid use of option '%1': "
+                               "Invalid deprecation warning mode '%2' given.\nUsage: %3")
+                        .arg(representation, mode, description(command())));
+    }
+
+    m_mode = deprecationWarningModeFromName(mode);
+}
+
+QString WaitLockOption::description(CommandType command) const
+{
+    Q_UNUSED(command);
+    return Tr::tr("%1\n\tWait indefinitely for other processes to release the build graph lock.\n")
             .arg(longRepresentation());
 }
 
-QString DisableFallbackProviderOption::longRepresentation() const
+QString WaitLockOption::longRepresentation() const
 {
-    return QStringLiteral("--no-fallback-module-provider");
+    return QStringLiteral("--wait-lock");
 }
 
 QString RunEnvConfigOption::description(CommandType command) const
diff --git a/src/app/qbs/parser/commandlineoption.h b/src/app/qbs/parser/commandlineoption.h
index f8ec1c735..7b8baeae2 100644
--- a/src/app/qbs/parser/commandlineoption.h
+++ b/src/app/qbs/parser/commandlineoption.h
@@ -42,6 +42,7 @@
 #include "commandtype.h"
 
 #include <tools/commandechomode.h>
+#include <tools/deprecationwarningmode.h>
 #include <tools/joblimits.h>
 
 #include <QtCore/qstringlist.h>
@@ -54,7 +55,9 @@ public:
     enum Type {
         FileOptionType,
         BuildDirectoryOptionType,
-        LogLevelOptionType, VerboseOptionType, QuietOptionType,
+        LogLevelOptionType,
+        VerboseOptionType,
+        QuietOptionType,
         JobsOptionType,
         KeepGoingOptionType,
         DryRunOptionType,
@@ -63,7 +66,9 @@ public:
         ChangedFilesOptionType,
         ProductsOptionType,
         NoInstallOptionType,
-        InstallRootOptionType, RemoveFirstOptionType, NoBuildOptionType,
+        InstallRootOptionType,
+        RemoveFirstOptionType,
+        NoBuildOptionType,
         ForceTimestampCheckOptionType,
         ForceOutputCheckOptionType,
         BuildNonDefaultOptionType,
@@ -75,7 +80,7 @@ public:
         GeneratorOptionType,
         WaitLockOptionType,
         RunEnvConfigOptionType,
-        DisableFallbackProviderType,
+        DeprecationWarningsOptionType,
     };
 
     virtual ~CommandLineOption();
@@ -367,6 +372,20 @@ private:
     CommandEchoMode m_echoMode = CommandEchoModeInvalid;
 };
 
+class DeprecationWarningsOption : public CommandLineOption
+{
+public:
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return {}; }
+    QString longRepresentation() const override;
+    DeprecationWarningMode mode() const { return m_mode; }
+
+private:
+    void doParse(const QString &representation, QStringList &input) override;
+
+    DeprecationWarningMode m_mode = defaultDeprecationWarningMode();
+};
+
 class SettingsDirOption : public CommandLineOption
 {
 public:
@@ -415,14 +434,6 @@ public:
     QString longRepresentation() const override;
 };
 
-class DisableFallbackProviderOption : public OnOffOption
-{
-public:
-    QString description(CommandType command) const override;
-    QString shortRepresentation() const override { return {}; }
-    QString longRepresentation() const override;
-};
-
 } // namespace qbs
 
 #endif // QBS_COMMANDLINEOPTION_H
diff --git a/src/app/qbs/parser/commandlineoptionpool.cpp b/src/app/qbs/parser/commandlineoptionpool.cpp
index 63711f623..692c9c737 100644
--- a/src/app/qbs/parser/commandlineoptionpool.cpp
+++ b/src/app/qbs/parser/commandlineoptionpool.cpp
@@ -128,12 +128,12 @@ CommandLineOption *CommandLineOptionPool::getOption(CommandLineOption::Type type
         case CommandLineOption::WaitLockOptionType:
             option = new WaitLockOption;
             break;
-        case CommandLineOption::DisableFallbackProviderType:
-            option = new DisableFallbackProviderOption;
-            break;
         case CommandLineOption::RunEnvConfigOptionType:
             option = new RunEnvConfigOption;
             break;
+        case CommandLineOption::DeprecationWarningsOptionType:
+            option = new DeprecationWarningsOption;
+            break;
         default:
             qFatal("Unknown option type %d", type);
         }
@@ -276,15 +276,15 @@ WaitLockOption *CommandLineOptionPool::waitLockOption() const
     return static_cast<WaitLockOption *>(getOption(CommandLineOption::WaitLockOptionType));
 }
 
-DisableFallbackProviderOption *CommandLineOptionPool::disableFallbackProviderOption() const
+RunEnvConfigOption *CommandLineOptionPool::runEnvConfigOption() const
 {
-    return static_cast<DisableFallbackProviderOption *>(
-                getOption(CommandLineOption::DisableFallbackProviderType));
+    return static_cast<RunEnvConfigOption *>(getOption(CommandLineOption::RunEnvConfigOptionType));
 }
 
-RunEnvConfigOption *CommandLineOptionPool::runEnvConfigOption() const
+DeprecationWarningsOption *CommandLineOptionPool::deprecationWarningsOption() const
 {
-    return static_cast<RunEnvConfigOption *>(getOption(CommandLineOption::RunEnvConfigOptionType));
+    return static_cast<DeprecationWarningsOption *>
+            (getOption(CommandLineOption::DeprecationWarningsOptionType));
 }
 
 } // namespace qbs
diff --git a/src/app/qbs/parser/commandlineoptionpool.h b/src/app/qbs/parser/commandlineoptionpool.h
index c7ac263e1..022e9fd09 100644
--- a/src/app/qbs/parser/commandlineoptionpool.h
+++ b/src/app/qbs/parser/commandlineoptionpool.h
@@ -77,8 +77,8 @@ public:
     RespectProjectJobLimitsOption *respectProjectJobLimitsOption() const;
     GeneratorOption *generatorOption() const;
     WaitLockOption *waitLockOption() const;
-    DisableFallbackProviderOption *disableFallbackProviderOption() const;
     RunEnvConfigOption *runEnvConfigOption() const;
+    DeprecationWarningsOption *deprecationWarningsOption() const;
 
 private:
     mutable QHash<CommandLineOption::Type, CommandLineOption *> m_options;
diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index 5d3c14ebb..c548cf2b5 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -58,12 +58,14 @@
 #include <tools/qttools.h>
 #include <tools/settings.h>
 #include <tools/settingsrepresentation.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qtextstream.h>
 
+#include <algorithm>
 #include <utility>
 
 #ifdef Q_OS_UNIX
@@ -154,17 +156,11 @@ QString CommandLineParser::projectBuildDirectory() const
 
 BuildOptions CommandLineParser::buildOptions(const QString &profile) const
 {
-    Settings settings(settingsDir());
-    Preferences preferences(&settings, profile);
-
-    if (d->buildOptions.maxJobCount() <= 0) {
-        d->buildOptions.setMaxJobCount(preferences.jobs());
-    }
-
+    d->buildOptions.setMaxJobCount(jobCount(profile));
     if (d->buildOptions.echoMode() < 0) {
-        d->buildOptions.setEchoMode(preferences.defaultEchoMode());
+        Settings settings(settingsDir());
+        d->buildOptions.setEchoMode(Preferences(&settings, profile).defaultEchoMode());
     }
-
     return d->buildOptions;
 }
 
@@ -201,6 +197,15 @@ InstallOptions CommandLineParser::installOptions(const QString &profile) const
     return options;
 }
 
+int CommandLineParser::jobCount(const QString &profile) const
+{
+    if (const int explicitJobCount = d->optionPool.jobsOption()->jobCount(); explicitJobCount > 0)
+        return explicitJobCount;
+
+    Settings settings(settingsDir());
+    return Preferences(&settings, profile).jobs();
+}
+
 bool CommandLineParser::forceTimestampCheck() const
 {
     return d->optionPool.forceTimestampCheckOption()->enabled();
@@ -226,11 +231,6 @@ bool CommandLineParser::waitLockBuildGraph() const
     return d->optionPool.waitLockOption()->enabled();
 }
 
-bool CommandLineParser::disableFallbackProvider() const
-{
-    return d->optionPool.disableFallbackProviderOption()->enabled();
-}
-
 bool CommandLineParser::logTime() const
 {
     return d->logTime;
@@ -277,6 +277,11 @@ QString CommandLineParser::settingsDir() const
     return d->settingsDir();
 }
 
+DeprecationWarningMode CommandLineParser::deprecationWarningMode() const
+{
+    return d->optionPool.deprecationWarningsOption()->mode();
+}
+
 QString CommandLineParser::commandName() const
 {
     return d->command->representation();
@@ -328,7 +333,19 @@ void CommandLineParser::CommandLineParserPrivate::doParse()
     } else {
         command = commandFromString(commandLine.front());
         if (command) {
-            commandLine.removeFirst();
+            const QString commandName = commandLine.takeFirst();
+
+            // if the command line contains a `<command>` with
+            // either `-h` or `--help` switch, we transform
+            // it to corresponding `help <command>` instead
+            const QStringList helpSwitches = {QStringLiteral("-h"), QStringLiteral("--help")};
+            if (auto it = std::find_first_of(
+                    commandLine.begin(), commandLine.end(),
+                    helpSwitches.begin(), helpSwitches.end());
+                    it != commandLine.end()) {
+                command = commandPool.getCommand(HelpCommandType);
+                commandLine = QList{commandName}; // keep only command's name
+            }
         } else { // No command given.
             if (commandLine.front() == QLatin1String("-h")
                     || commandLine.front() == QLatin1String("--help")) {
@@ -407,7 +424,7 @@ QString CommandLineParser::CommandLineParserPrivate::generalHelp() const
     for (const Command * command : commands)
         commandMap.insert(command->representation(), command);
 
-    for (const Command * command : qAsConst(commandMap)) {
+    for (const Command * command : std::as_const(commandMap)) {
         help.append(QLatin1String("  ")).append(command->representation());
         const QString whitespace
                 = QString(rhsIndentation - 2 - command->representation().size(), QLatin1Char(' '));
@@ -418,7 +435,7 @@ QString CommandLineParser::CommandLineParserPrivate::generalHelp() const
     toolNames.sort();
     if (!toolNames.empty()) {
         help.append(QLatin1Char('\n')).append(Tr::tr("Auxiliary commands:\n"));
-        for (const QString &toolName : qAsConst(toolNames)) {
+        for (const QString &toolName : std::as_const(toolNames)) {
             help.append(QLatin1String("  ")).append(toolName);
             const QString whitespace = QString(rhsIndentation - 2 - toolName.size(),
                                                QLatin1Char(' '));
@@ -501,7 +518,7 @@ void CommandLineParser::CommandLineParserPrivate::setupBuildConfigurations()
 
     const QVariantMap globalProperties = propertiesPerConfiguration.takeFirst().second;
     QList<QVariantMap> buildConfigs;
-    for (const PropertyListItem &item : qAsConst(propertiesPerConfiguration)) {
+    for (const PropertyListItem &item : std::as_const(propertiesPerConfiguration)) {
         QVariantMap properties = item.second;
         for (QVariantMap::ConstIterator globalPropIt = globalProperties.constBegin();
                  globalPropIt != globalProperties.constEnd(); ++globalPropIt) {
@@ -582,18 +599,15 @@ QString CommandLineParser::CommandLineParserPrivate::propertyName(const QString
     // Make fully-qualified, ie "platform" -> "qbs.platform"
     if (aCommandLineName.contains(QLatin1Char('.')))
         return aCommandLineName;
-    else
-        return QLatin1String("qbs.") + aCommandLineName;
+    return QLatin1String("qbs.") + aCommandLineName;
 }
 
 bool CommandLineParser::CommandLineParserPrivate::checkForExistingBuildConfiguration(
         const QList<QVariantMap> &buildConfigs, const QString &configurationName)
 {
-    for (const QVariantMap &buildConfig : buildConfigs) {
-        if (configurationName == getBuildConfigurationName(buildConfig))
-            return true;
-    }
-    return false;
+    return Internal::any_of(buildConfigs, [&configurationName](const auto &buildConfig) {
+        return configurationName == getBuildConfigurationName(buildConfig);
+    });
 }
 
 bool CommandLineParser::CommandLineParserPrivate::withNonDefaultProducts() const
diff --git a/src/app/qbs/parser/commandlineparser.h b/src/app/qbs/parser/commandlineparser.h
index 70586b2d4..4df8829a2 100644
--- a/src/app/qbs/parser/commandlineparser.h
+++ b/src/app/qbs/parser/commandlineparser.h
@@ -41,6 +41,8 @@
 
 #include "commandtype.h"
 
+#include <tools/deprecationwarningmode.h>
+
 #include <QtCore/qstringlist.h>
 #include <QtCore/qvariant.h>
 
@@ -73,12 +75,12 @@ public:
     CleanOptions cleanOptions(const QString &profile) const;
     GenerateOptions generateOptions() const;
     InstallOptions installOptions(const QString &profile) const;
+    int jobCount(const QString &profile) const;
     bool forceTimestampCheck() const;
     bool forceOutputCheck() const;
     bool dryRun() const;
     bool forceProbesExecution() const;
     bool waitLockBuildGraph() const;
-    bool disableFallbackProvider() const;
     bool logTime() const;
     bool withNonDefaultProducts() const;
     bool buildBeforeInstalling() const;
@@ -89,6 +91,7 @@ public:
     bool showProgress() const;
     bool showVersion() const;
     QString settingsDir() const;
+    DeprecationWarningMode deprecationWarningMode() const;
 
 private:
     class CommandLineParserPrivate;
diff --git a/src/app/qbs/parser/parser.pri b/src/app/qbs/parser/parser.pri
deleted file mode 100644
index f708f1135..000000000
--- a/src/app/qbs/parser/parser.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-SOURCES += \
-    $$PWD/commandlineparser.cpp \
-    $$PWD/commandpool.cpp \
-    $$PWD/commandlineoption.cpp \
-    $$PWD/commandlineoptionpool.cpp \
-    $$PWD/parsercommand.cpp
-
-HEADERS += \
-    $$PWD/commandlineparser.h \
-    $$PWD/commandpool.h \
-    $$PWD/commandlineoption.h \
-    $$PWD/commandlineoptionpool.h \
-    $$PWD/commandtype.h \
-    $$PWD/parsercommand.h
-
-include(../../../../qbs_version.pri)
diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp
index 799bf5dcf..ef8da9551 100644
--- a/src/app/qbs/parser/parsercommand.cpp
+++ b/src/app/qbs/parser/parsercommand.cpp
@@ -164,7 +164,7 @@ QString Command::supportedOptionsDescription() const
     }
 
     QString s = Tr::tr("The possible options are:\n");
-    for (const CommandLineOption *option : qAsConst(optionMap))
+    for (const CommandLineOption *option : std::as_const(optionMap))
         s += option->description(type());
     return s;
 }
@@ -199,16 +199,18 @@ QString ResolveCommand::representation() const
 
 static QList<CommandLineOption::Type> resolveOptions()
 {
-    return {CommandLineOption::FileOptionType,
-            CommandLineOption::BuildDirectoryOptionType,
-            CommandLineOption::LogLevelOptionType,
-            CommandLineOption::VerboseOptionType,
-            CommandLineOption::QuietOptionType,
-            CommandLineOption::ShowProgressOptionType,
-            CommandLineOption::DryRunOptionType,
-            CommandLineOption::ForceProbesOptionType,
-            CommandLineOption::LogTimeOptionType,
-            CommandLineOption::DisableFallbackProviderType};
+    return {
+        CommandLineOption::FileOptionType,
+        CommandLineOption::BuildDirectoryOptionType,
+        CommandLineOption::LogLevelOptionType,
+        CommandLineOption::VerboseOptionType,
+        CommandLineOption::QuietOptionType,
+        CommandLineOption::ShowProgressOptionType,
+        CommandLineOption::DryRunOptionType,
+        CommandLineOption::ForceProbesOptionType,
+        CommandLineOption::LogTimeOptionType,
+        CommandLineOption::DeprecationWarningsOptionType,
+        CommandLineOption::JobsOptionType};
 }
 
 QList<CommandLineOption::Type> ResolveCommand::supportedOptions() const
@@ -278,7 +280,6 @@ static QList<CommandLineOption::Type> buildOptions()
             << CommandLineOption::ForceTimestampCheckOptionType
             << CommandLineOption::ForceOutputCheckOptionType
             << CommandLineOption::BuildNonDefaultOptionType
-            << CommandLineOption::JobsOptionType
             << CommandLineOption::CommandEchoModeOptionType
             << CommandLineOption::NoInstallOptionType
             << CommandLineOption::RemoveFirstOptionType
diff --git a/src/app/qbs/qbs.pro b/src/app/qbs/qbs.pro
deleted file mode 100644
index 6ce449aad..000000000
--- a/src/app/qbs/qbs.pro
+++ /dev/null
@@ -1,54 +0,0 @@
-include(../app.pri)
-include(parser/parser.pri)
-
-TARGET = qbs
-
-SOURCES += main.cpp \
-    ctrlchandler.cpp \
-    application.cpp \
-    session.cpp \
-    sessionpacket.cpp \
-    sessionpacketreader.cpp \
-    stdinreader.cpp \
-    status.cpp \
-    consoleprogressobserver.cpp \
-    commandlinefrontend.cpp \
-    qbstool.cpp
-
-HEADERS += \
-    ctrlchandler.h \
-    application.h \
-    session.h \
-    sessionpacket.h \
-    sessionpacketreader.h \
-    stdinreader.h \
-    status.h \
-    consoleprogressobserver.h \
-    commandlinefrontend.h \
-    qbstool.h
-
-include(../../library_dirname.pri)
-isEmpty(QBS_RELATIVE_LIBEXEC_PATH) {
-    win32:QBS_RELATIVE_LIBEXEC_PATH=.
-    else:QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs
-}
-isEmpty(QBS_RELATIVE_PLUGINS_PATH):QBS_RELATIVE_PLUGINS_PATH=../$${QBS_LIBRARY_DIRNAME}
-isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=..
-DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\"
-DEFINES += QBS_RELATIVE_PLUGINS_PATH=\\\"$${QBS_RELATIVE_PLUGINS_PATH}\\\"
-DEFINES += QBS_RELATIVE_SEARCH_PATH=\\\"$${QBS_RELATIVE_SEARCH_PATH}\\\"
-
-CONFIG(static, static|shared) {
-    include(../../plugins/qbs_plugin_common.pri)
-    LIBS += -L$$qbsPluginDestDir
-    scannerPlugins = cpp qt
-    for (scannerPlugin, scannerPlugins) {
-        include(../../plugins/scanner/$$scannerPlugin/$${scannerPlugin}.pri) \
-        include(../../plugins/use_plugin.pri)
-    }
-    generatorPlugins = clangcompilationdb iarew keiluv makefilegenerator visualstudio
-    for (generatorPlugin, generatorPlugins) {
-        include(../../plugins/generator/$$generatorPlugin/$${generatorPlugin}.pri) \
-        include(../../plugins/use_plugin.pri)
-    }
-}
diff --git a/src/app/qbs/qbs.qbs b/src/app/qbs/qbs.qbs
index 03685dd21..52c29e9b2 100644
--- a/src/app/qbs/qbs.qbs
+++ b/src/app/qbs/qbs.qbs
@@ -2,12 +2,16 @@ import qbs.Utilities
 
 QbsApp {
     name: "qbs_app"
-    Depends { name: "qbs resources" }
     targetName: "qbs"
+
+    Depends { name: "qbs resources" }
+    Depends { name: "qtclsp" }
+    Depends { name: "Qt.network" }
     Depends {
         condition: Qt.core.staticBuild || qbsbuildconfig.staticBuild
         productTypes: ["qbsplugin"]
     }
+
     cpp.defines: base.concat([
         "QBS_VERSION=" + Utilities.cStringQuote(qbsversion.version),
         "QBS_RELATIVE_LIBEXEC_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeLibexecPath),
@@ -54,5 +58,13 @@ QbsApp {
             "parsercommand.h",
         ]
     }
+    Group {
+        name: "lsp"
+        cpp.defines: outer.filter(function(d) { return d !== "QT_NO_CAST_FROM_ASCII"; })
+        files: [
+            "lspserver.cpp",
+            "lspserver.h",
+        ]
+    }
 }
 
diff --git a/src/app/qbs/session.cpp b/src/app/qbs/session.cpp
index 5a1fe145d..2cdcf2b63 100644
--- a/src/app/qbs/session.cpp
+++ b/src/app/qbs/session.cpp
@@ -39,6 +39,7 @@
 
 #include "session.h"
 
+#include "lspserver.h"
 #include "sessionpacket.h"
 #include "sessionpacketreader.h"
 
@@ -66,7 +67,6 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qprocess.h>
 
-#include <algorithm>
 #include <cstdlib>
 #include <iostream>
 #include <memory>
@@ -166,6 +166,7 @@ private:
     FileUpdateData prepareFileUpdate(const QJsonObject &request);
 
     SessionPacketReader m_packetReader;
+    LspServer m_lspServer;
     Project m_project;
     ProjectData m_projectData;
     SessionLogSink m_logSink;
@@ -193,7 +194,7 @@ Session::Session()
         qApp->exit(EXIT_FAILURE);
     }
 #endif
-    sendPacket(SessionPacket::helloMessage());
+    sendPacket(SessionPacket::helloMessage(m_lspServer.socketPath()));
     connect(&m_logSink, &SessionLogSink::newMessage, this, &Session::sendPacket);
     connect(&m_packetReader, &SessionPacketReader::errorOccurred,
             this, [](const QString &msg) {
@@ -287,6 +288,7 @@ void Session::setupProject(const QJsonObject &request)
         const ProjectData oldProjectData = m_projectData;
         m_project = setupJob->project();
         m_projectData = m_project.projectData();
+        m_lspServer.updateProjectData(m_projectData, m_project.codeLinks());
         QJsonObject reply;
         reply.insert(StringConstants::type(), QLatin1String("project-resolved"));
         if (success)
@@ -554,7 +556,7 @@ void Session::getGeneratedFilesForSources(const QJsonObject &request)
     reply.insert(StringConstants::type(), QLatin1String(replyType));
     const QJsonArray specs = request.value(StringConstants::productsKey()).toArray();
     QJsonArray resultProducts;
-    for (const QJsonValue &p : specs) {
+    for (const auto &p : specs) {
         const QJsonObject productObject = p.toObject();
         const ProductData product = getProductByName(
                     productObject.value(StringConstants::fullDisplayNameKey()).toString());
@@ -564,7 +566,7 @@ void Session::getGeneratedFilesForSources(const QJsonObject &request)
         resultProduct.insert(StringConstants::fullDisplayNameKey(), product.fullDisplayName());
         QJsonArray results;
         const QJsonArray requests = productObject.value(QLatin1String("requests")).toArray();
-        for (const QJsonValue &r : requests) {
+        for (const auto &r : requests) {
             const QJsonObject request = r.toObject();
             const QString filePath = request.value(QLatin1String("source-file")).toString();
             const QStringList tags = fromJson<QStringList>(request.value(QLatin1String("tags")));
@@ -621,10 +623,11 @@ Session::ProductSelection Session::getProductSelection(const QJsonObject &reques
 {
     const QJsonValue productSelection = request.value(StringConstants::productsKey());
     if (productSelection.isArray())
-        return ProductSelection(getProductsByName(fromJson<QStringList>(productSelection)));
-    return ProductSelection(productSelection.toString() == QLatin1String("all")
-                            ? Project::ProductSelectionWithNonDefault
-                            : Project::ProductSelectionDefaultOnly);
+        return {getProductsByName(fromJson<QStringList>(productSelection))};
+    return {
+        productSelection.toString() == QLatin1String("all")
+            ? Project::ProductSelectionWithNonDefault
+            : Project::ProductSelectionDefaultOnly};
 }
 
 Session::FileUpdateData Session::prepareFileUpdate(const QJsonObject &request)
@@ -646,7 +649,7 @@ Session::FileUpdateData Session::prepareFileUpdate(const QJsonObject &request)
         data.error = tr("Product '%1' not found in project.").arg(productName);
     }
     const QJsonArray filesArray = request.value(QLatin1String("files")).toArray();
-    for (const QJsonValue &v : filesArray)
+    for (const auto &v : filesArray)
         data.filePaths << v.toString();
     if (m_currentJob)
         data.error = tr("Cannot update the list of source files while a job is running.");
diff --git a/src/app/qbs/sessionpacket.cpp b/src/app/qbs/sessionpacket.cpp
index dd6d1726e..470e27091 100644
--- a/src/app/qbs/sessionpacket.cpp
+++ b/src/app/qbs/sessionpacket.cpp
@@ -82,7 +82,7 @@ SessionPacket::Status SessionPacket::parseInput(QByteArray &input)
 QJsonObject SessionPacket::retrievePacket()
 {
     QBS_ASSERT(isComplete(), return QJsonObject());
-    const auto packet = QJsonDocument::fromJson(QByteArray::fromBase64(m_payload)).object();
+    auto packet = QJsonDocument::fromJson(QByteArray::fromBase64(m_payload)).object();
     m_payload.clear();
     m_expectedPayloadLength = -1;
     return packet;
@@ -95,12 +95,13 @@ QByteArray SessionPacket::createPacket(const QJsonObject &packet)
             .append(jsonData);
 }
 
-QJsonObject SessionPacket::helloMessage()
+QJsonObject SessionPacket::helloMessage(const QString &lspSocket)
 {
     return QJsonObject{
         {StringConstants::type(), QLatin1String("hello")},
-        {QLatin1String("api-level"), 2},
-        {QLatin1String("api-compat-level"), 2}
+        {QLatin1String("api-level"), 5},
+        {QLatin1String("api-compat-level"), 2},
+        {QLatin1String("lsp-socket"), lspSocket}
     };
 }
 
diff --git a/src/app/qbs/sessionpacket.h b/src/app/qbs/sessionpacket.h
index d919ff340..e77b30b75 100644
--- a/src/app/qbs/sessionpacket.h
+++ b/src/app/qbs/sessionpacket.h
@@ -55,7 +55,7 @@ public:
     QJsonObject retrievePacket();
 
     static QByteArray createPacket(const QJsonObject &packet);
-    static QJsonObject helloMessage();
+    static QJsonObject helloMessage(const QString &lspSocket);
 
 private:
     bool isComplete() const;
diff --git a/src/app/qbs/sessionpacketreader.cpp b/src/app/qbs/sessionpacketreader.cpp
index e99ea01ed..daba30d7e 100644
--- a/src/app/qbs/sessionpacketreader.cpp
+++ b/src/app/qbs/sessionpacketreader.cpp
@@ -42,6 +42,8 @@
 #include "sessionpacket.h"
 #include "stdinreader.h"
 
+#include <QPointer>
+
 namespace qbs {
 namespace Internal {
 
@@ -64,8 +66,13 @@ void SessionPacketReader::start()
     StdinReader * const stdinReader = StdinReader::create(this);
     connect(stdinReader, &StdinReader::errorOccurred, this, &SessionPacketReader::errorOccurred);
     connect(stdinReader, &StdinReader::dataAvailable, this, [this](const QByteArray &data) {
+        /* Because this SessionPacketReader can be destroyed in the emit packetReceived,
+         * use a `QPointer self(this)` to check whether this instance still exists.
+         * When self evaluates to false, this instance should no longer be referenced,
+         * so the parent QObject and d should no longer be used in any way. */
+        QPointer self(this);
         d->incomingData += data;
-        while (!d->incomingData.isEmpty()) {
+        while (self && !d->incomingData.isEmpty()) {
             switch (d->currentPacket.parseInput(d->incomingData)) {
             case SessionPacket::Status::Invalid:
                 emit errorOccurred(tr("Received invalid input."));
diff --git a/src/app/qbs/status.cpp b/src/app/qbs/status.cpp
index a5e0c8228..8ee39e46f 100644
--- a/src/app/qbs/status.cpp
+++ b/src/app/qbs/status.cpp
@@ -143,10 +143,9 @@ int printStatus(const ProjectData &project)
             qbsInfo() << "  Group: " << group.name()
                       << " (" << group.location().filePath() << ":"
                       << group.location().line() << ")";
-            QStringList sourceFiles = group.allFilePaths();
-            std::sort(sourceFiles.begin(), sourceFiles.end());
-            for (const QString &sourceFile : qAsConst(sourceFiles)) {
-                if (!QFileInfo(sourceFile).exists())
+            const QStringList sourceFiles = Internal::sorted(group.allFilePaths());
+            for (const QString &sourceFile : sourceFiles) {
+                if (!QFileInfo::exists(sourceFile))
                     missingFiles.push_back(sourceFile);
                 qbsInfo() << "    " << sourceFile.mid(projectDirectoryPathLength + 1);
                 untrackedFilesInProject.removeOne(sourceFile);
@@ -155,11 +154,11 @@ int printStatus(const ProjectData &project)
     }
 
     qbsInfo() << "\nMissing files:";
-    for (const QString &untrackedFile : qAsConst(missingFiles))
+    for (const QString &untrackedFile : std::as_const(missingFiles))
         qbsInfo() << "    " << untrackedFile.mid(projectDirectoryPathLength + 1);
 
     qbsInfo() << "\nUntracked files:";
-    for (const QString &missingFile : qAsConst(untrackedFilesInProject))
+    for (const QString &missingFile : std::as_const(untrackedFilesInProject))
         qbsInfo() << "    " << missingFile.mid(projectDirectoryPathLength + 1);
 
     return 0;
diff --git a/src/app/qbs/stdinreader.cpp b/src/app/qbs/stdinreader.cpp
index 5f00d7de4..4708ff53c 100644
--- a/src/app/qbs/stdinreader.cpp
+++ b/src/app/qbs/stdinreader.cpp
@@ -43,6 +43,7 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qsocketnotifier.h>
+#include <QtCore/qthread.h>
 #include <QtCore/qtimer.h>
 
 #include <cerrno>
@@ -111,46 +112,183 @@ public:
     WindowsStdinReader(QObject *parent) : StdinReader(parent) {}
 
 private:
-    void start() override
-    {
 #ifdef Q_OS_WIN32
-        m_stdinHandle = GetStdHandle(STD_INPUT_HANDLE);
-        if (!m_stdinHandle) {
-            emit errorOccurred(tr("Failed to create handle for standard input."));
-            return;
+    class FileReaderThread : public QThread
+    {
+    public:
+        FileReaderThread(WindowsStdinReader &parent, HANDLE stdInHandle, HANDLE exitEventHandle)
+            : QThread(&parent), m_stdIn{stdInHandle}, m_exitEvent{exitEventHandle} { }
+        ~FileReaderThread()
+        {
+            wait();
+            CloseHandle(m_exitEvent);
+        }
+
+        void run() override
+        {
+            WindowsStdinReader *r = static_cast<WindowsStdinReader *>(parent());
+
+            char buf[1024];
+            while (true) {
+                DWORD bytesRead = 0;
+                if (!ReadFile(m_stdIn, buf, sizeof buf, &bytesRead, nullptr)) {
+                    emit r->errorOccurred(tr("Failed to read from input channel."));
+                    break;
+                }
+                if (!bytesRead)
+                    break;
+                emit r->dataAvailable(QByteArray(buf, bytesRead));
+            }
+        }
+    private:
+        HANDLE m_stdIn;
+        HANDLE m_exitEvent;
+    };
+
+    class ConsoleReaderThread : public QThread
+    {
+    public:
+        ConsoleReaderThread(WindowsStdinReader &parent, HANDLE stdInHandle, HANDLE exitEventHandle)
+            : QThread(&parent), m_stdIn{stdInHandle}, m_exitEvent{exitEventHandle} { }
+        virtual ~ConsoleReaderThread() override
+        {
+            SetEvent(m_exitEvent);
+            wait();
+            CloseHandle(m_exitEvent);
         }
 
-        // A timer seems slightly less awful than to block in a thread
-        // (how would we abort that one?), but ideally we'd like
-        // to have a signal-based approach like in the Unix variant.
-        const auto timer = new QTimer(this);
-        connect(timer, &QTimer::timeout, this, [this, timer] {
+        void run() override
+        {
+            WindowsStdinReader *r = static_cast<WindowsStdinReader *>(parent());
+
+            DWORD origConsoleMode;
+            GetConsoleMode(m_stdIn, &origConsoleMode);
+            DWORD consoleMode = ENABLE_PROCESSED_INPUT;
+            SetConsoleMode(m_stdIn, consoleMode);
+
+            HANDLE handles[2] = {m_exitEvent, m_stdIn};
             char buf[1024];
-            DWORD bytesAvail;
-            if (!PeekNamedPipe(m_stdinHandle, nullptr, 0, nullptr, &bytesAvail, nullptr)) {
-                timer->stop();
-                emit errorOccurred(tr("Failed to read from input channel."));
+            while (true) {
+                auto result = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
+                if (result == WAIT_OBJECT_0)
+                    break;
+                INPUT_RECORD consoleInput;
+                DWORD inputsRead = 0;
+                if (!PeekConsoleInputA(m_stdIn, &consoleInput, 1, &inputsRead)) {
+                    emit r->errorOccurred(tr("Failed to read from input channel."));
+                    break;
+                }
+                if (inputsRead) {
+                    if (consoleInput.EventType != KEY_EVENT
+                            || !consoleInput.Event.KeyEvent.bKeyDown
+                            || !consoleInput.Event.KeyEvent.uChar.AsciiChar) {
+                        if (!ReadConsoleInputA(m_stdIn, &consoleInput, 1, &inputsRead)) {
+                            emit r->errorOccurred(tr("Failed to read console input."));
+                            break;
+                        }
+                    } else {
+                        DWORD bytesRead = 0;
+                        if (!ReadConsoleA(m_stdIn, buf, sizeof buf, &bytesRead, nullptr)) {
+                            emit r->errorOccurred(tr("Failed to read console."));
+                            break;
+                        }
+                        emit r->dataAvailable(QByteArray(buf, bytesRead));
+                    }
+                }
+            }
+            SetConsoleMode(m_stdIn, origConsoleMode);
+        }
+    private:
+        HANDLE m_stdIn;
+        HANDLE m_exitEvent;
+    };
+
+    class PipeReaderThread : public QThread
+    {
+    public:
+        PipeReaderThread(WindowsStdinReader &parent, HANDLE stdInHandle, HANDLE exitEventHandle)
+            : QThread(&parent), m_stdIn{stdInHandle}, m_exitEvent{exitEventHandle} { }
+        virtual ~PipeReaderThread() override
+        {
+            SetEvent(m_exitEvent);
+            wait();
+            CloseHandle(m_exitEvent);
+        }
+
+        void run() override
+        {
+            WindowsStdinReader *r = static_cast<WindowsStdinReader *>(parent());
+
+            OVERLAPPED overlapped = {};
+            overlapped.hEvent = CreateEventA(NULL, TRUE, TRUE, NULL);
+            if (!overlapped.hEvent) {
+                emit r->errorOccurred(StdinReader::tr("Failed to create handle for overlapped event."));
                 return;
             }
-            while (bytesAvail > 0) {
-                DWORD bytesRead;
-                if (!ReadFile(m_stdinHandle, buf, std::min<DWORD>(bytesAvail, sizeof buf),
-                              &bytesRead, nullptr)) {
-                    timer->stop();
-                    emit errorOccurred(tr("Failed to read from input channel."));
-                    return;
+
+            char buf[1024];
+            DWORD bytesRead;
+            HANDLE handles[2] = {m_exitEvent, overlapped.hEvent};
+            while (true) {
+                bytesRead = 0;
+                auto readResult = ReadFile(m_stdIn, buf, sizeof buf, NULL, &overlapped);
+                if (!readResult) {
+                    if (GetLastError() != ERROR_IO_PENDING) {
+                        emit r->errorOccurred(StdinReader::tr("ReadFile Failed."));
+                        break;
+                    }
+
+                    auto result = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
+                    if (result == WAIT_OBJECT_0)
+                        break;
+                }
+                if (!GetOverlappedResult(m_stdIn, &overlapped, &bytesRead, FALSE)) {
+                    if (GetLastError() != ERROR_HANDLE_EOF)
+                        emit r->errorOccurred(StdinReader::tr("Error GetOverlappedResult."));
+                    break;
                 }
-                emit dataAvailable(QByteArray(buf, bytesRead));
-                bytesAvail -= bytesRead;
+                emit r->dataAvailable(QByteArray(buf, bytesRead));
             }
-        });
-        timer->start(10);
+            CancelIo(m_stdIn);
+            CloseHandle(overlapped.hEvent);
+        }
+    private:
+        HANDLE m_stdIn;
+        HANDLE m_exitEvent;
+    };
 #endif
-    }
 
+    void start() override
+    {
 #ifdef Q_OS_WIN32
-    HANDLE m_stdinHandle;
+        HANDLE stdInHandle = GetStdHandle(STD_INPUT_HANDLE);
+        if (!stdInHandle) {
+            emit errorOccurred(StdinReader::tr("Failed to create handle for standard input."));
+            return;
+        }
+        HANDLE exitEventHandle = CreateEventA(NULL, TRUE, FALSE, NULL);
+        if (!exitEventHandle) {
+            emit errorOccurred(StdinReader::tr("Failed to create handle for exit event."));
+            return;
+        }
+
+        auto result = GetFileType(stdInHandle);
+        switch (result) {
+        case FILE_TYPE_CHAR:
+            (new ConsoleReaderThread(*this, stdInHandle, exitEventHandle))->start();
+            return;
+        case FILE_TYPE_PIPE:
+            (new PipeReaderThread(*this, stdInHandle, exitEventHandle))->start();
+            return;
+        case FILE_TYPE_DISK:
+            (new FileReaderThread(*this, stdInHandle, exitEventHandle))->start();
+            return;
+        default:
+            emit errorOccurred(StdinReader::tr("Unable to handle unknown input type"));
+            return;
+        }
 #endif
+    }
 };
 
 StdinReader *StdinReader::create(QObject *parent)
diff --git a/src/app/shared/logging/coloredoutput.cpp b/src/app/shared/logging/coloredoutput.cpp
index 0f1bb26da..d5e45cada 100644
--- a/src/app/shared/logging/coloredoutput.cpp
+++ b/src/app/shared/logging/coloredoutput.cpp
@@ -62,15 +62,15 @@ void printfColored(TextColor color, const char *str, ...)
     va_end(vl);
 }
 
-void fprintfColored(TextColor color, FILE *file, const char *str, va_list vl)
+void fprintfColored(TextColor color, std::FILE *file, const char *str, va_list vl)
 {
 #if defined(Q_OS_UNIX)
     if (color != TextColorDefault && isatty(fileno(file))) {
         unsigned char bright = (color & TextColorBright) >> 3;
-        fprintf(file, "\033[%d;%dm", bright, 30 + (color & ~TextColorBright));
-        vfprintf(file, str, vl);
-        fprintf(stdout, "\033[0m");
-        fprintf(stderr, "\033[0m");
+        std::fprintf(file, "\033[%d;%dm", bright, 30 + (color & ~TextColorBright));
+        std::vfprintf(file, str, vl);
+        std::fprintf(stdout, "\033[0m");
+        std::fprintf(stderr, "\033[0m");
     } else
 #elif defined(Q_OS_WIN32)
     HANDLE hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -83,16 +83,16 @@ void fprintfColored(TextColor color, FILE *file, const char *str, va_list vl)
         if (color & TextColorBright)
             bgrColor += FOREGROUND_INTENSITY;
         SetConsoleTextAttribute(hStdout, (csbiInfo.wAttributes & 0xf0) | bgrColor);
-        vfprintf(file, str, vl);
+        std::vfprintf(file, str, vl);
         SetConsoleTextAttribute(hStdout, csbiInfo.wAttributes);
     } else
 #endif
     {
-        vfprintf(file, str, vl);
+        std::vfprintf(file, str, vl);
     }
 }
 
-void fprintfColored(TextColor color, FILE *file, const char *str, ...)
+void fprintfColored(TextColor color, std::FILE *file, const char *str, ...)
 {
     va_list vl;
     va_start(vl, str);
diff --git a/src/app/shared/logging/coloredoutput.h b/src/app/shared/logging/coloredoutput.h
index a7b145ba5..5b98a4ba2 100644
--- a/src/app/shared/logging/coloredoutput.h
+++ b/src/app/shared/logging/coloredoutput.h
@@ -66,8 +66,8 @@ enum TextColor {
 
 void printfColored(TextColor color, const char *str, va_list vl);
 void printfColored(TextColor color, const char *str, ...);
-void fprintfColored(TextColor color, FILE *file, const char *str, va_list vl);
-void fprintfColored(TextColor color, FILE *file, const char *str, ...);
+void fprintfColored(TextColor color, std::FILE *file, const char *str, va_list vl);
+void fprintfColored(TextColor color, std::FILE *file, const char *str, ...);
 bool terminalSupportsColor();
 
 #endif // QBS_COLOREDOUTPUT_H
diff --git a/src/app/shared/logging/consolelogger.cpp b/src/app/shared/logging/consolelogger.cpp
index 63b7dc9e3..8850ba488 100644
--- a/src/app/shared/logging/consolelogger.cpp
+++ b/src/app/shared/logging/consolelogger.cpp
@@ -64,7 +64,7 @@ void ConsoleLogSink::doPrintMessage(qbs::LoggerLevel level, const QString &messa
     if (!m_enabled)
         return;
 
-    FILE * const file = level == qbs::LoggerInfo && tag != QStringLiteral("stdErr")
+    std::FILE * const file = level == qbs::LoggerInfo && tag != QStringLiteral("stdErr")
             ? stdout : stderr;
 
     const QString levelTag = logLevelTag(level);
@@ -84,17 +84,17 @@ void ConsoleLogSink::doPrintMessage(qbs::LoggerLevel level, const QString &messa
     static QHash<QString, TextColor> colorTable = setupColorTable();
     fprintfWrapper(colorTable.value(tag, TextColorDefault), file, "%s\n",
                    message.toLocal8Bit().constData());
-    fflush(file);
+    std::fflush(file);
 }
 
-void ConsoleLogSink::fprintfWrapper(TextColor color, FILE *file, const char *str, ...)
+void ConsoleLogSink::fprintfWrapper(TextColor color, std::FILE *file, const char *str, ...)
 {
     va_list vl;
     va_start(vl, str);
     if (m_coloredOutputEnabled && terminalSupportsColor())
         fprintfColored(color, file, str, vl);
     else
-        vfprintf(file, str, vl);
+        std::vfprintf(file, str, vl);
     va_end(vl);
 }
 
diff --git a/src/app/shared/logging/logging.pri b/src/app/shared/logging/logging.pri
deleted file mode 100644
index e24f33e10..000000000
--- a/src/app/shared/logging/logging.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += $$PWD/consolelogger.h $$PWD/coloredoutput.h
-SOURCES += $$PWD/consolelogger.cpp $$PWD/coloredoutput.cpp
diff --git a/src/conan/extensions/generators/qbsdeps.py b/src/conan/extensions/generators/qbsdeps.py
new file mode 100644
index 000000000..77d875aa8
--- /dev/null
+++ b/src/conan/extensions/generators/qbsdeps.py
@@ -0,0 +1,218 @@
+############################################################################
+##
+## Copyright (C) 2024 Ivan Komissarov (abbapoh@gmail.com).
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of Qbs.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+from conan.tools.files import save
+from conan.errors import ConanException
+from conans.model.dependencies import get_transitive_requires
+import json
+import os
+
+
+class _QbsDepsModuleFile():
+    def __init__(self, qbsdeps, dep, component, deps, module_name):
+        self._qbsdeps = qbsdeps
+        self._dep = dep
+        self._component = component
+        self._deps = deps
+        self._module_name = module_name
+        self._build_bindirs = qbsdeps._build_bindirs
+
+        def _get_component_version(dep, component):
+            return (component.get_property("component_version") or
+                    component.get_property("system_package_version") or
+                    dep.ref.version)
+        self._version = _get_component_version(self._dep, self._component)
+
+    @property
+    def filename(self):
+        return self._module_name + '.json'
+
+    @property
+    def version(self):
+        return self._version
+
+    def get_content(self):
+        return {
+            'package_name': self._dep.ref.name,
+            'package_dir': self._get_package_dir(),
+            'version': str(self._version),
+            'cpp_info': self._component.serialize(),
+            'build_bindirs': self._build_bindirs,
+            'dependencies': [{'name': n, "version": str(v)} for n, v in self._deps],
+            'settings': {k: v for k, v in self._dep.settings.items()},
+            'options': {k: v for k, v in self._dep.options.items()}
+        }
+
+    def _get_package_dir(self):
+        # If editable, package_folder can be None
+        return self._dep.recipe_folder if self._dep.package_folder is None \
+            else self._dep.package_folder
+
+    def render(self):
+        return json.dumps(self.get_content(), indent=4)
+
+
+class _QbsDepGenerator:
+    ''' Handles a single package, can create multiple modules in case of several components '''
+    def __init__(self, conanfile, dep, build_bindirs):
+        self._conanfile = conanfile
+        self._dep = dep
+        self._build_bindirs = build_bindirs
+
+    @property
+    def content(self):
+        qbs_files = {}
+        transitive_reqs = get_transitive_requires(self._conanfile, self._dep)
+
+        def _get_package_name(dep):
+            # TODO: pkgconfig uses suffix, do we need it? see:
+            # https://github.com/conan-io/conan/blob/develop2/conan/tools/gnu/pkgconfigdeps.py#L319
+            return dep.cpp_info.get_property("pkg_config_name") or dep.ref.name
+
+        def _get_component_name(dep, comp_name):
+            if comp_name not in dep.cpp_info.components:
+                if dep.ref.name == comp_name:
+                    return _get_package_name(dep)
+                raise ConanException("Component '{name}::{cname}' not found in '{name}' "
+                                     "package requirement".format(name=dep.ref.name,
+                                                                  cname=comp_name))
+
+            # TODO: pkgconfig uses suffix, do we need it?
+            # We re-use pkg_config_name for compatiblitity with the Qbs pkg-config provider:
+            # in that case, Qbs/its users do not need to do additional mapping on their side
+            pkg_config_name = dep.cpp_info.components[comp_name].get_property("pkg_config_name")
+            return pkg_config_name or comp_name
+
+        def _get_name_with_namespace(namespace, name):
+            """
+            Build a name with a namespace, e.g., openssl-crypto
+            """
+            return f"{namespace}-{name}"
+
+        def get_components(dep):
+            ret = {}
+            for comp_ref_name, info in dep.cpp_info.get_sorted_components().items():
+                comp_name = _get_component_name(dep, comp_ref_name)
+                ret[comp_name] = info
+            return ret
+
+        # copy & paste from pkgconfig deps
+        def get_cpp_info_requires_names(dep, cpp_info):
+            ret = []
+            dep_ref_name = dep.ref.name
+            for req in cpp_info.requires:
+                pkg_ref_name, comp_ref_name = (
+                    req.split("::") if "::" in req else (dep_ref_name, req)
+                )
+
+                if dep_ref_name != pkg_ref_name:
+                    try:
+                        req_conanfile = transitive_reqs[pkg_ref_name]
+                    except KeyError:
+                        # If the dependency is not in the transitive, might be skipped
+                        continue
+                # For instance, dep == "hello/1.0" and req == "hello::cmp1" -> hello == hello
+                else:
+                    req_conanfile = dep
+
+                comp_name = _get_component_name(req_conanfile, comp_ref_name)
+                if not comp_name:
+                    pkg_name = _get_package_name(req_conanfile)
+                    # Creating a component name with namespace, e.g., dep-comp1
+                    comp_name = _get_name_with_namespace(pkg_name, comp_ref_name)
+                ret.append((comp_name, req_conanfile.ref.version))
+            return ret
+
+        if not self._dep.cpp_info.has_components:
+            module_name = _get_package_name(self._dep)
+            requires = get_cpp_info_requires_names(self._dep, self._dep.cpp_info._package)
+            if not requires:
+                # If no requires were found, let's try to get all the direct visible
+                # dependencies, e.g., requires = "other_pkg/1.0"
+                for deprequire, _ in self._dep.dependencies.direct_host.items():
+                    requires.append((deprequire.ref.name, deprequire.ref.version))
+            file = _QbsDepsModuleFile(
+                self, self._dep, self._dep.cpp_info._package, requires, module_name
+            )
+            qbs_files[file.filename] = file
+        else:
+            full_requires = []
+            for module_name, component in get_components(self._dep).items():
+                requires = get_cpp_info_requires_names(self._dep, component)
+                file = _QbsDepsModuleFile(self, self._dep, component, requires, module_name)
+                qbs_files[file.filename] = file
+                full_requires.append((module_name, file.version))
+            module_name = _get_package_name(self._dep)
+            file = _QbsDepsModuleFile(
+                self, self._dep, self._dep.cpp_info._package, full_requires, module_name)
+            # We create the root package's module file ONLY
+            # if it does not already exist in components
+            # An example is a grpc package where they have a "grpc" component
+            if file.filename not in qbs_files:
+                qbs_files[file.filename] = file
+
+        return qbs_files
+
+
+class QbsDeps:
+    ''' Handles multiple packages '''
+    def __init__(self, conanfile):
+        self._conanfile = conanfile
+
+    @property
+    def content(self):
+        qbs_files = {}
+
+        build_bindirs = {
+            dep.ref.name: dep.cpp_info.bindirs
+            for _, dep in self._conanfile.dependencies.build.items()}
+
+        for require, dep in self._conanfile.dependencies.items():
+
+            # skip build deps for now
+            if require.build:
+                continue
+
+            dep_build_bindirs = build_bindirs.get(dep.ref.name, [])
+            qbs_files.update(_QbsDepGenerator(self._conanfile, dep, dep_build_bindirs).content)
+        return qbs_files
+
+    def generate(self):
+        for file_name, qbs_deps_file in self.content.items():
+            save(self._conanfile, os.path.join('conan-qbs-deps', file_name), qbs_deps_file.render())
diff --git a/src/install_prefix.pri b/src/install_prefix.pri
deleted file mode 100644
index 34aef1d5f..000000000
--- a/src/install_prefix.pri
+++ /dev/null
@@ -1 +0,0 @@
-unix: isEmpty(QBS_INSTALL_PREFIX): QBS_INSTALL_PREFIX = /usr/local
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 48eee2608..f06c3168e 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (QBS_USE_BUNDLED_QT_SCRIPT OR NOT Qt5Script_FOUND)
-    add_subdirectory(scriptengine)
-endif()
-
 add_subdirectory(pkgconfig)
 add_subdirectory(corelib)
 add_subdirectory(msbuild)
diff --git a/src/lib/bundledlibs.pri b/src/lib/bundledlibs.pri
deleted file mode 100644
index 6ffedbbd8..000000000
--- a/src/lib/bundledlibs.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-!qbs_use_bundled_qtscript:!qtHaveModule(script) {
-    CONFIG += qbs_use_bundled_qtscript
-}
diff --git a/src/lib/corelib/CMakeLists.txt b/src/lib/corelib/CMakeLists.txt
index d4b2d8d38..97b5e6fad 100644
--- a/src/lib/corelib/CMakeLists.txt
+++ b/src/lib/corelib/CMakeLists.txt
@@ -110,7 +110,6 @@ set(BUILD_GRAPH_SOURCES
     rulesapplicator.h
     rulesevaluationcontext.cpp
     rulesevaluationcontext.h
-    scriptclasspropertyiterator.h
     timestampsupdater.cpp
     timestampsupdater.h
     transformer.cpp
@@ -154,6 +153,7 @@ set(JS_EXTENSIONS_SOURCES
     environmentextension.cpp
     file.cpp
     fileinfoextension.cpp
+    host.cpp
     jsextensions.cpp
     jsextensions.h
     moduleproperties.cpp
@@ -171,7 +171,6 @@ list_transform_prepend(JS_EXTENSIONS_SOURCES jsextensions/)
 
 if(APPLE)
     set(JS_EXTENSIONS_MACOS_SOURCES
-        propertylist_darwin.h
         propertylist_darwin.mm
         propertylistutils.h
         propertylistutils.mm
@@ -184,20 +183,13 @@ list_transform_prepend(JS_EXTENSIONS_MACOS_SOURCES jsextensions/)
 set(LANGUAGE_SOURCES
     artifactproperties.cpp
     artifactproperties.h
-    astimportshandler.cpp
-    astimportshandler.h
-    astpropertiesitemhandler.cpp
-    astpropertiesitemhandler.h
     asttools.cpp
     asttools.h
     builtindeclarations.cpp
     builtindeclarations.h
     deprecationinfo.h
-    evaluationdata.h
     evaluator.cpp
     evaluator.h
-    evaluatorscriptclass.cpp
-    evaluatorscriptclass.h
     filecontext.cpp
     filecontext.h
     filecontextbase.cpp
@@ -213,29 +205,13 @@ set(LANGUAGE_SOURCES
     itemobserver.h
     itempool.cpp
     itempool.h
-    itemreader.cpp
-    itemreader.h
-    itemreaderastvisitor.cpp
-    itemreaderastvisitor.h
-    itemreadervisitorstate.cpp
-    itemreadervisitorstate.h
     itemtype.h
     jsimports.h
     language.cpp
     language.h
-    loader.cpp
-    loader.h
-    moduleloader.cpp
-    moduleloader.h
-    modulemerger.cpp
-    modulemerger.h
     moduleproviderinfo.h
-    moduleproviderloader.cpp
-    moduleproviderloader.h
     preparescriptobserver.cpp
     preparescriptobserver.h
-    projectresolver.cpp
-    projectresolver.h
     property.cpp
     property.h
     propertydeclaration.cpp
@@ -259,6 +235,48 @@ list_transform_prepend(LANGUAGE_SOURCES language/)
 
 set(LANGUAGE_HEADERS language/forward_decls.h)
 
+set(LOADER_SOURCES
+    astimportshandler.cpp
+    astimportshandler.h
+    astpropertiesitemhandler.cpp
+    astpropertiesitemhandler.h
+    dependenciesresolver.cpp
+    dependenciesresolver.h
+    groupshandler.cpp
+    groupshandler.h
+    itemreader.cpp
+    itemreader.h
+    itemreaderastvisitor.cpp
+    itemreaderastvisitor.h
+    itemreadervisitorstate.cpp
+    itemreadervisitorstate.h
+    loaderutils.cpp
+    loaderutils.h
+    localprofiles.cpp
+    localprofiles.h
+    moduleinstantiator.cpp
+    moduleinstantiator.h
+    moduleloader.cpp
+    moduleloader.h
+    modulepropertymerger.cpp
+    modulepropertymerger.h
+    moduleproviderloader.cpp
+    moduleproviderloader.h
+    probesresolver.cpp
+    probesresolver.h
+    productitemmultiplexer.cpp
+    productitemmultiplexer.h
+    productresolver.cpp
+    productresolver.h
+    productscollector.cpp
+    productscollector.h
+    productsresolver.cpp
+    productsresolver.h
+    projectresolver.cpp
+    projectresolver.h
+    )
+list_transform_prepend(LOADER_SOURCES loader/)
+
 set(LOGGING_SOURCES
     categories.cpp
     categories.h
@@ -303,6 +321,7 @@ set(TOOLS_SOURCES
     cleanoptions.cpp
     codelocation.cpp
     commandechomode.cpp
+    deprecationwarningmode.cpp
     dynamictypecheck.h
     error.cpp
     executablefinder.cpp
@@ -332,8 +351,10 @@ set(TOOLS_SOURCES
     msvcinfo.cpp
     msvcinfo.h
     pathutils.h
+    pimpl.h
     persistence.cpp
     persistence.h
+    porting.h
     preferences.cpp
     processresult.cpp
     processresult_p.h
@@ -345,6 +366,7 @@ set(TOOLS_SOURCES
     progressobserver.cpp
     progressobserver.h
     projectgeneratormanager.cpp
+    propagate_const.h
     qbsassert.cpp
     qbsassert.h
     qbspluginmanager.cpp
@@ -385,10 +407,12 @@ set(TOOLS_HEADERS
     cleanoptions.h
     codelocation.h
     commandechomode.h
+    deprecationwarningmode.h
     error.h
     generateoptions.h
     installoptions.h
     joblimits.h
+    mutexdata.h
     preferences.h
     processresult.h
     profile.h
@@ -429,7 +453,7 @@ add_qbs_library(qbscore
         Qt${QT_VERSION_MAJOR}::Xml
         Qt6Core5Compat
         qbspkgconfig
-        qbsscriptengine
+        qbsquickjs
     PUBLIC_DEPENDS
         Qt${QT_VERSION_MAJOR}::Core
         ${EXTERNAL_DEPENDS}
@@ -448,6 +472,7 @@ add_qbs_library(qbscore
         ${JS_EXTENSIONS_MACOS_SOURCES}
         ${LANGUAGE_SOURCES}
         ${LANGUAGE_HEADERS}
+        ${LOADER_SOURCES}
         ${LOGGING_SOURCES}
         ${LOGGING_HEADERS}
         ${PARSER_SOURCES}
@@ -465,6 +490,4 @@ if(INSTALL_PUBLIC_HEADERS)
     install(FILES ${LOGGING_HEADERS} DESTINATION ${QBS_HEADERS_INSTALL_DIR}/logging)
     install(FILES ${LANGUAGE_HEADERS} DESTINATION ${QBS_HEADERS_INSTALL_DIR}/language)
     install(FILES ${TOOLS_HEADERS} DESTINATION ${QBS_HEADERS_INSTALL_DIR}/tools)
-    set(QMAKE_PRI_FILES use_installed_corelib.pri ../../../qbs_version.pri)
-    install(FILES ${QMAKE_PRI_FILES} DESTINATION ${QBS_HEADERS_INSTALL_DIR})
 endif()
diff --git a/src/lib/corelib/api/api.pri b/src/lib/corelib/api/api.pri
deleted file mode 100644
index 69443dffc..000000000
--- a/src/lib/corelib/api/api.pri
+++ /dev/null
@@ -1,49 +0,0 @@
-include(../../../install_prefix.pri)
-
-HEADERS += \
-    $$PWD/internaljobs.h \
-    $$PWD/projectdata.h \
-    $$PWD/runenvironment.h \
-    $$PWD/jobs.h \
-    $$PWD/languageinfo.h \
-    $$PWD/project.h \
-    $$PWD/project_p.h \
-    $$PWD/propertymap_p.h \
-    $$PWD/projectdata_p.h \
-    $$PWD/rulecommand.h \
-    $$PWD/rulecommand_p.h \
-    $$PWD/transformerdata.h \
-    $$PWD/transformerdata_p.h
-
-SOURCES += \
-    $$PWD/internaljobs.cpp \
-    $$PWD/runenvironment.cpp \
-    $$PWD/projectdata.cpp \
-    $$PWD/jobs.cpp \
-    $$PWD/languageinfo.cpp \
-    $$PWD/project.cpp \
-    $$PWD/rulecommand.cpp \
-    $$PWD/transformerdata.cpp
-
-!qbs_no_dev_install {
-    api_headers.files = \
-        $$PWD/jobs.h \
-        $$PWD/languageinfo.h \
-        $$PWD/project.h \
-        $$PWD/projectdata.h \
-        $$PWD/rulecommand.h \
-        $$PWD/runenvironment.h \
-        $$PWD/transformerdata.h
-    api_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/api
-    INSTALLS += api_headers
-}
-
-HEADERS += \
-    $$PWD/changeset.h \
-    $$PWD/projectfileupdater.h \
-    $$PWD/qmljsrewriter.h
-
-SOURCES += \
-    $$PWD/changeset.cpp \
-    $$PWD/projectfileupdater.cpp \
-    $$PWD/qmljsrewriter.cpp
diff --git a/src/lib/corelib/api/changeset.cpp b/src/lib/corelib/api/changeset.cpp
index 2cfdd6428..218e18fb2 100644
--- a/src/lib/corelib/api/changeset.cpp
+++ b/src/lib/corelib/api/changeset.cpp
@@ -60,9 +60,8 @@ static bool overlaps(int posA, int lengthA, int posB, int lengthB) {
                 || (posA <= posB && posA + lengthA > posB)
                 // A contained in B
                 || (posB < posA && posB + lengthB > posA + lengthA);
-    } else {
-        return (posB > posA && posB < posA + lengthA);
     }
+    return (posB > posA && posB < posA + lengthA);
 }
 
 bool ChangeSet::hasOverlap(int pos, int length)
diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp
index 0fabc6279..35766efa4 100644
--- a/src/lib/corelib/api/internaljobs.cpp
+++ b/src/lib/corelib/api/internaljobs.cpp
@@ -49,7 +49,8 @@
 #include <buildgraph/productinstaller.h>
 #include <buildgraph/rulesevaluationcontext.h>
 #include <language/language.h>
-#include <language/loader.h>
+#include <language/scriptengine.h>
+#include <loader/projectresolver.h>
 #include <logging/logger.h>
 #include <logging/translator.h>
 #include <tools/buildgraphlocker.h>
@@ -76,6 +77,8 @@ public:
     {
         std::lock_guard<std::mutex> lock(m_cancelMutex);
         m_canceled = true;
+        for (ScriptEngine * const engine : scriptEngines())
+            engine->cancel();
     }
 
 private:
@@ -321,23 +324,21 @@ void InternalSetupProjectJob::execute()
 
 void InternalSetupProjectJob::resolveProjectFromScratch(ScriptEngine *engine)
 {
-    Loader loader(engine, logger());
-    loader.setSearchPaths(m_parameters.searchPaths());
-    loader.setProgressObserver(observer());
-    m_newProject = loader.loadProject(m_parameters);
+    ProjectResolver resolver(m_parameters, engine, logger());
+    resolver.setProgressObserver(observer());
+    m_newProject = resolver.resolve();
     QBS_CHECK(m_newProject);
 }
 
 void InternalSetupProjectJob::resolveBuildDataFromScratch(const RulesEvaluationContextPtr &evalContext)
 {
-    TimedActivityLogger resolveLogger(logger(), QStringLiteral("Resolving build project"), timed());
     BuildDataResolver(logger()).resolveBuildData(m_newProject, evalContext);
 }
 
 BuildGraphLoadResult InternalSetupProjectJob::restoreProject(const RulesEvaluationContextPtr &evalContext)
 {
     BuildGraphLoader bgLoader(logger());
-    const BuildGraphLoadResult loadResult
+    BuildGraphLoadResult loadResult
             = bgLoader.load(m_existingProject, m_parameters, evalContext);
     return loadResult;
 }
diff --git a/src/lib/corelib/api/jobs.cpp b/src/lib/corelib/api/jobs.cpp
index 7a845b0ac..10c96bfee 100644
--- a/src/lib/corelib/api/jobs.cpp
+++ b/src/lib/corelib/api/jobs.cpp
@@ -231,7 +231,7 @@ Project SetupProjectJob::project() const
 {
     auto const wrapper = qobject_cast<const InternalJobThreadWrapper *>(internalJob());
     auto const job = qobject_cast<const InternalSetupProjectJob *>(wrapper->synchronousJob());
-    return Project(job->project(), job->logger());
+    return {job->project(), job->logger()};
 }
 
 void SetupProjectJob::resolve(const Project &existingProject,
diff --git a/src/lib/corelib/api/languageinfo.cpp b/src/lib/corelib/api/languageinfo.cpp
index 505012e88..f20a68ac3 100644
--- a/src/lib/corelib/api/languageinfo.cpp
+++ b/src/lib/corelib/api/languageinfo.cpp
@@ -61,7 +61,7 @@ std::string LanguageInfo::qmlTypeInfo()
     // Individual Components:
     auto typeNames = builtins.allTypeNames();
     typeNames.sort();
-    for (const QString &typeName : qAsConst(typeNames)) {
+    for (const QString &typeName : std::as_const(typeNames)) {
         const auto typeNameString = typeName.toStdString();
         result.append("    Component {\n");
         result.append("        name: \"" + typeNameString + "\"\n");
@@ -76,12 +76,10 @@ std::string LanguageInfo::qmlTypeInfo()
 
         Internal::ItemDeclaration itemDecl
                 = builtins.declarationsForType(builtins.typeForName(typeName));
-        auto properties = itemDecl.properties();
-        std::sort(std::begin(properties), std::end(properties), []
-                  (const Internal::PropertyDeclaration &a, const Internal::PropertyDeclaration &b) {
-            return a.name() < b.name();
-        });
-        for (const Internal::PropertyDeclaration &property : qAsConst(properties)) {
+        const auto properties = Internal::sorted(
+            itemDecl.properties(),
+            [](const auto &lhs, const auto &rhs) { return lhs.name() < rhs.name(); });
+        for (const Internal::PropertyDeclaration &property : properties) {
             result.append("        Property { name: \"");
             result.append(property.name().toUtf8().data());
             result.append("\"; ");
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 46c73dabd..53c711b49 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -61,7 +61,6 @@
 #include <buildgraph/timestampsupdater.h>
 #include <buildgraph/transformer.h>
 #include <language/language.h>
-#include <language/projectresolver.h>
 #include <language/propertymapinternal.h>
 #include <logging/logger.h>
 #include <logging/translator.h>
@@ -132,7 +131,7 @@ static void addDependencies(QVector<ResolvedProductPtr> &products)
 {
     for (int i = 0; i < products.size(); ++i) {
         const ResolvedProductPtr &product = products.at(i);
-        for (const ResolvedProductPtr &dependency : qAsConst(product->dependencies)) {
+        for (const ResolvedProductPtr &dependency : std::as_const(product->dependencies)) {
             if (!products.contains(dependency))
                 products.push_back(dependency);
         }
@@ -192,7 +191,7 @@ static QVector<ResolvedProductPtr> enabledInternalProducts(const ResolvedProject
         if (p->enabled && (includingNonDefault || p->builtByDefault()))
             products.push_back(p);
     }
-    for (const auto &subProject : qAsConst(project->subProjects))
+    for (const auto &subProject : std::as_const(project->subProjects))
         products << enabledInternalProducts(subProject, includingNonDefault);
     return products;
 }
@@ -216,7 +215,7 @@ static ResolvedProductPtr internalProductForProject(const ResolvedProjectConstPt
         if (matches(product, resolvedProduct))
             return resolvedProduct;
     }
-    for (const auto &subProject : qAsConst(project->subProjects)) {
+    for (const auto &subProject : std::as_const(project->subProjects)) {
         const ResolvedProductPtr &p = internalProductForProject(subProject, product);
         if (p)
             return p;
@@ -270,14 +269,10 @@ GroupData ProjectPrivate::createGroupDataFromGroup(const GroupPtr &resolvedGroup
     for (const auto &sa : resolvedGroup->files) {
         ArtifactData artifact = createApiSourceArtifact(sa);
         setupInstallData(artifact, product);
-        group.d->sourceArtifacts.push_back(artifact);
-    }
-    if (resolvedGroup->wildcards) {
-        for (const auto &sa : resolvedGroup->wildcards->files) {
-            ArtifactData artifact = createApiSourceArtifact(sa);
-            setupInstallData(artifact, product);
+        if (sa->fromWildcard)
             group.d->sourceArtifactsFromWildcards.push_back(artifact);
-        }
+        else
+            group.d->sourceArtifacts.push_back(artifact);
     }
     std::sort(group.d->sourceArtifacts.begin(),
               group.d->sourceArtifacts.end());
@@ -375,7 +370,7 @@ ProjectPrivate::GroupUpdateContext ProjectPrivate::getGroupContext(const Product
     context.resolvedProducts = internalProducts(context.products);
 
     const QString groupName = group.isValid() ? group.name() : product.name();
-    for (const ResolvedProductPtr &p : qAsConst(context.resolvedProducts)) {
+    for (const ResolvedProductPtr &p : std::as_const(context.resolvedProducts)) {
         for (const GroupPtr &g : p->groups) {
             if (g->name == groupName) {
                 context.resolvedGroups << g;
@@ -385,7 +380,7 @@ ProjectPrivate::GroupUpdateContext ProjectPrivate::getGroupContext(const Product
     }
     if (context.resolvedGroups.empty())
         throw ErrorInfo(Tr::tr("Group '%1' does not exist.").arg(groupName));
-    for (const ProductData &p : qAsConst(context.products)) {
+    for (const ProductData &p : std::as_const(context.products)) {
         const GroupData &g = findGroupData(p, groupName);
         QBS_CHECK(p.isValid());
         context.groups << g;
@@ -400,7 +395,7 @@ static bool matchesWildcard(const QString &filePath, const GroupConstPtr &group)
 {
     if (!group->wildcards)
         return false;
-    for (const QString &pattern : qAsConst(group->wildcards->patterns)) {
+    for (const QString &pattern : std::as_const(group->wildcards->patterns)) {
         QString fullPattern;
         if (QFileInfo(group->prefix).isAbsolute()) {
             fullPattern = group->prefix;
@@ -464,8 +459,8 @@ void ProjectPrivate::addFiles(const ProductData &product, const GroupData &group
 
     // We do not check for entries in other groups, because such doublettes might be legitimate
     // due to conditions.
-    for (const GroupPtr &group : qAsConst(groupContext.resolvedGroups)) {
-        for (const QString &filePath : qAsConst(filesContext.absoluteFilePaths)) {
+    for (const GroupPtr &group : std::as_const(groupContext.resolvedGroups)) {
+        for (const QString &filePath : std::as_const(filesContext.absoluteFilePaths)) {
             for (const auto &sa : group->files) {
                 if (sa->absoluteFilePath == filePath) {
                     throw ErrorInfo(Tr::tr("File '%1' already exists in group '%2'.")
@@ -528,7 +523,7 @@ void ProjectPrivate::prepareChangeToProject()
 RuleCommandList ProjectPrivate::ruleCommandListForTransformer(const Transformer *transformer)
 {
     RuleCommandList list;
-    for (const AbstractCommandPtr &internalCommand : qAsConst(transformer->commands.commands())) {
+    for (const AbstractCommandPtr &internalCommand : std::as_const(transformer->commands.commands())) {
         RuleCommand externalCommand;
         externalCommand.d->description = internalCommand->description();
         externalCommand.d->extendedDescription = internalCommand->extendedDescription();
@@ -569,11 +564,11 @@ RuleCommandList ProjectPrivate::ruleCommands(const ProductData &product,
     QBS_CHECK(resolvedProduct->buildData);
     const ArtifactSet &outputArtifacts = resolvedProduct->buildData->artifactsByFileTag()
             .value(FileTag(outputFileTag.toLocal8Bit()));
-    for (const Artifact * const outputArtifact : qAsConst(outputArtifacts)) {
+    for (const Artifact * const outputArtifact : std::as_const(outputArtifacts)) {
         const TransformerConstPtr transformer = outputArtifact->transformer;
         if (!transformer)
             continue;
-        for (const Artifact * const inputArtifact : qAsConst(transformer->inputs)) {
+        for (const Artifact * const inputArtifact : std::as_const(transformer->inputs)) {
             if (inputArtifact->filePath() == inputFilePath)
                 return ruleCommandListForTransformer(transformer.get());
         }
@@ -691,7 +686,7 @@ void ProjectPrivate::retrieveProjectData(ProjectData &projectData,
             }
         }
         for (const ResolvedProductPtr &resolvedDependentProduct
-             : qAsConst(resolvedProduct->dependencies)) {
+             : std::as_const(resolvedProduct->dependencies)) {
             product.d->dependencies << resolvedDependentProduct->fullDisplayName();
         }
         std::sort(product.d->type.begin(), product.d->type.end());
@@ -700,7 +695,7 @@ void ProjectPrivate::retrieveProjectData(ProjectData &projectData,
         product.d->isValid = true;
         projectData.d->products << product;
     }
-    for (const auto &internalSubProject : qAsConst(internalProject->subProjects)) {
+    for (const auto &internalSubProject : std::as_const(internalProject->subProjects)) {
         if (!internalSubProject->enabled)
             continue;
         ProjectData subProject;
@@ -802,8 +797,14 @@ RunEnvironment Project::getRunEnvironment(const ProductData &product,
         const QStringList &setupRunEnvConfig, Settings *settings) const
 {
     const ResolvedProductPtr resolvedProduct = d->internalProduct(product);
-    return RunEnvironment(resolvedProduct, d->internalProject, installOptions, environment,
-                          setupRunEnvConfig, settings, d->logger);
+    return {
+        resolvedProduct,
+        d->internalProject,
+        installOptions,
+        environment,
+        setupRunEnvConfig,
+        settings,
+        d->logger};
 }
 
 /*!
@@ -961,6 +962,12 @@ std::set<QString> Project::buildSystemFiles() const
     return rangeTo<std::set<QString>>(d->internalProject->buildSystemFiles);
 }
 
+CodeLinks Project::codeLinks() const
+{
+    QBS_ASSERT(isValid(), return {});
+    return d->internalProject->codeLinks;
+}
+
 RuleCommandList Project::ruleCommands(const ProductData &product,
         const QString &inputFilePath, const QString &outputFileTag, ErrorInfo *error) const
 {
@@ -1006,7 +1013,7 @@ Project::BuildGraphInfo Project::getBuildGraphInfo(const QString &bgFilePath,
         const Internal::TopLevelProjectConstPtr project = BuildGraphLoader::loadProject(bgFilePath);
         info.bgFilePath = bgFilePath;
         info.overriddenProperties = project->overriddenValues;
-        info.profileData = project->profileConfigs;
+        info.profileData = project->fullProfileConfigsTree();
         std::vector<std::pair<QString, QString>> props;
         for (const QString &prop : requestedProperties) {
             QStringList components = prop.split(QLatin1Char('.'));
@@ -1045,7 +1052,7 @@ Project::BuildGraphInfo Project::getBuildGraphInfo() const
             throw ErrorInfo(Tr::tr("A job is currently in progress."));
         info.bgFilePath = d->internalProject->buildGraphFilePath();
         info.overriddenProperties = d->internalProject->overriddenValues;
-        info.profileData = d->internalProject->profileConfigs;
+        info.profileData = d->internalProject->fullProfileConfigsTree();
     } catch (const ErrorInfo &e) {
         info.error = e;
     }
diff --git a/src/lib/corelib/api/project.h b/src/lib/corelib/api/project.h
index 380806f3a..7490eb41e 100644
--- a/src/lib/corelib/api/project.h
+++ b/src/lib/corelib/api/project.h
@@ -43,6 +43,7 @@
 #include "transformerdata.h"
 #include "../language/forward_decls.h"
 #include "../tools/error.h"
+#include "../tools/porting.h"
 #include "../tools/qbs_export.h"
 
 #include <QtCore/qshareddata.h>
@@ -83,7 +84,7 @@ class ProjectPrivate;
 class QBS_EXPORT Project
 {
     friend class SetupProjectJob;
-    friend uint qHash(const Project &p);
+    friend QHashValueType qHash(const Project &p);
 public:
     SetupProjectJob *setupProject(const SetupProjectParameters &parameters,
                                   ILogSink *logSink, QObject *jobOwner);
@@ -135,6 +136,7 @@ public:
     QVariantMap projectConfiguration() const;
 
     std::set<QString> buildSystemFiles() const;
+    CodeLinks codeLinks() const;
 
     RuleCommandList ruleCommands(const ProductData &product, const QString &inputFilePath,
                                  const QString &outputFileTag, ErrorInfo *error = nullptr) const;
@@ -173,7 +175,7 @@ private:
 };
 
 inline bool operator!=(const Project &p1, const Project &p2) { return !(p1 == p2); }
-inline uint qHash(const Project &p) { return QT_PREPEND_NAMESPACE(qHash)(p.d.data()); }
+inline QHashValueType qHash(const Project &p) { return QT_PREPEND_NAMESPACE(qHash)(p.d.data()); }
 
 } // namespace qbs
 
diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index 289c14781..628fe2a5d 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -40,13 +40,15 @@
 
 #include "projectdata_p.h"
 #include "propertymap_p.h"
+#include <language/builtindeclarations.h>
 #include <language/language.h>
 #include <language/propertymapinternal.h>
+#include <loader/loaderutils.h>
 #include <tools/fileinfo.h>
 #include <tools/jsliterals.h>
 #include <tools/qbsassert.h>
-#include <tools/stringconstants.h>
 #include <tools/qttools.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qdir.h>
@@ -62,9 +64,10 @@ using namespace Internal;
 template<typename T> static QJsonArray toJsonArray(const QList<T> &list,
                                                    const QStringList &moduleProperties)
 {
+    // We can't use transformed from stlutils.h here as QJsonArray has not the reserve() method.
     QJsonArray jsonArray;
-    std::transform(list.begin(), list.end(), std::back_inserter(jsonArray),
-                   [&moduleProperties](const T &v) { return v.toJson(moduleProperties);});
+    transform(list, jsonArray, [&moduleProperties](const T &v) {
+        return v.toJson(moduleProperties);});
     return jsonArray;
 }
 
@@ -72,7 +75,7 @@ static QVariant getModuleProperty(const PropertyMap &properties, const QString &
 {
     const int lastDotIndex = fullPropertyName.lastIndexOf(QLatin1Char('.'));
     if (lastDotIndex == -1)
-        return QVariant();
+        return {};
     return properties.getModuleProperty(fullPropertyName.left(lastDotIndex),
                                         fullPropertyName.mid(lastDotIndex + 1));
 }
@@ -218,11 +221,7 @@ bool GroupData::isEnabled() const
 QStringList GroupData::allFilePaths() const
 {
     const QList<ArtifactData> &artifacts = allSourceArtifacts();
-    QStringList paths;
-    paths.reserve(artifacts.size());
-    std::transform(artifacts.cbegin(), artifacts.cend(), std::back_inserter(paths),
-                          [](const ArtifactData &sa) { return sa.filePath(); });
-    return paths;
+    return transformed<QStringList>(artifacts, [](const auto &sa) { return sa.filePath(); });
 }
 
 bool operator!=(const GroupData &lhs, const GroupData &rhs)
@@ -560,7 +559,7 @@ const QString &ProductData::name() const
  */
 QString ProductData::fullDisplayName() const
 {
-    return ResolvedProduct::fullDisplayName(name(), multiplexConfigurationId());
+    return fullProductDisplayName(name(), multiplexConfigurationId());
 }
 
 /*!
@@ -637,14 +636,14 @@ const QList<ArtifactData> ProductData::targetArtifacts() const
 const QList<ArtifactData> ProductData::installableArtifacts() const
 {
     QList<ArtifactData> artifacts;
-    for (const GroupData &g : qAsConst(d->groups)) {
+    for (const GroupData &g : std::as_const(d->groups)) {
         const auto sourceArtifacts = g.allSourceArtifacts();
         for (const ArtifactData &a : sourceArtifacts) {
             if (a.installData().isInstallable())
                 artifacts << a;
         }
     }
-    for (const ArtifactData &a : qAsConst(d->generatedArtifacts)) {
+    for (const ArtifactData &a : std::as_const(d->generatedArtifacts)) {
         if (a.installData().isInstallable())
             artifacts << a;
     }
@@ -733,21 +732,16 @@ bool operator==(const ProductData &lhs, const ProductData &rhs)
     if (!lhs.isValid() && !rhs.isValid())
         return true;
 
-    return lhs.isValid() == rhs.isValid()
-            && lhs.name() == rhs.name()
-            && lhs.targetName() == rhs.targetName()
-            && lhs.type() == rhs.type()
-            && lhs.version() == rhs.version()
-            && lhs.dependencies() == rhs.dependencies()
-            && lhs.profile() == rhs.profile()
-            && lhs.multiplexConfigurationId() == rhs.multiplexConfigurationId()
-            && lhs.location() == rhs.location()
-            && lhs.groups() == rhs.groups()
-            && lhs.generatedArtifacts() == rhs.generatedArtifacts()
-            && lhs.properties() == rhs.properties()
-            && lhs.moduleProperties() == rhs.moduleProperties()
-            && lhs.isEnabled() == rhs.isEnabled()
-            && lhs.isMultiplexed() == rhs.isMultiplexed();
+    return lhs.isValid() == rhs.isValid() && lhs.name() == rhs.name()
+           && lhs.targetName() == rhs.targetName() && lhs.type() == rhs.type()
+           && lhs.version() == rhs.version() && lhs.dependencies() == rhs.dependencies()
+           && lhs.profile() == rhs.profile()
+           && lhs.multiplexConfigurationId() == rhs.multiplexConfigurationId()
+           && lhs.location() == rhs.location() && lhs.groups() == rhs.groups()
+           && lhs.generatedArtifacts() == rhs.generatedArtifacts()
+           && qVariantMapsEqual(lhs.properties(), rhs.properties())
+           && lhs.moduleProperties() == rhs.moduleProperties() && lhs.isEnabled() == rhs.isEnabled()
+           && lhs.isMultiplexed() == rhs.isMultiplexed();
 }
 
 bool operator!=(const ProductData &lhs, const ProductData &rhs)
@@ -869,7 +863,7 @@ const QList<ProjectData> &ProjectData::subProjects() const
 const QList<ProductData> ProjectData::allProducts() const
 {
     QList<ProductData> productList = products();
-    for (const ProjectData &pd : qAsConst(d->subProjects))
+    for (const ProjectData &pd : std::as_const(d->subProjects))
         productList << pd.allProducts();
     return productList;
 }
@@ -955,6 +949,52 @@ QStringList PropertyMap::allProperties() const
 }
 
 /*!
+ * \brief Returns the names of all modules whose properties can be requested.
+ */
+QStringList PropertyMap::allModules() const
+{
+    QStringList modules;
+    for (auto it = d->m_map->value().constBegin(); it != d->m_map->value().constEnd(); ++it) {
+        if (it.value().canConvert<QVariantMap>())
+            modules << it.key();
+    }
+    return modules;
+}
+
+/*!
+ * \brief Returns information about all properties of the given module.
+ */
+QList<PropertyMap::PropertyInfo> PropertyMap::allPropertiesForModule(const QString &module) const
+{
+    const QVariantMap moduleProps = d->m_map->value().value(module).toMap();
+    QList<PropertyInfo> properties;
+    const auto builtinProps = transformed<QStringList>(
+        BuiltinDeclarations::instance().declarationsForType(ItemType::Module).properties(),
+        [](const PropertyDeclaration &decl) { return decl.name(); });
+    for (auto it = moduleProps.begin(); it != moduleProps.end(); ++it) {
+        static const auto getType = [](const QVariant &v) -> QString {
+            switch (qVariantType(v)) {
+            case QMetaType::Bool:
+                return PropertyDeclaration::typeString(PropertyDeclaration::Boolean);
+            case QMetaType::Int:
+                return PropertyDeclaration::typeString(PropertyDeclaration::Integer);
+            case QMetaType::QVariantList:
+                return PropertyDeclaration::typeString(PropertyDeclaration::VariantList);
+            case QMetaType::QString:
+                return PropertyDeclaration::typeString(PropertyDeclaration::String);
+            case QMetaType::QStringList:
+                return PropertyDeclaration::typeString(PropertyDeclaration::StringList);
+            default:
+                return PropertyDeclaration::typeString(PropertyDeclaration::Variant);
+            }
+        };
+        properties << PropertyInfo{
+            it.key(), getType(it.value()), it.value(), builtinProps.contains(it.key())};
+    }
+    return properties;
+}
+
+/*!
  * \brief Returns the value of the given property of a product or group.
  */
 QVariant PropertyMap::getProperty(const QString &name) const
@@ -989,11 +1029,10 @@ QVariant PropertyMap::getModuleProperty(const QString &moduleName,
 
 static QString mapToString(const QVariantMap &map, const QString &prefix)
 {
-    QStringList keys(map.keys());
-    std::sort(keys.begin(), keys.end());
     QString stringRep;
-    for (const QString &key : qAsConst(keys)) {
-        const QVariant &val = map.value(key);
+    for (auto it = map.cbegin(), end = map.cend(); it != end; ++it) {
+        const QString &key = it.key();
+        const QVariant &val = it.value();
         if (val.userType() == QMetaType::QVariantMap) {
             stringRep += mapToString(val.value<QVariantMap>(), prefix + key + QLatin1Char('.'));
         } else {
diff --git a/src/lib/corelib/api/projectdata.h b/src/lib/corelib/api/projectdata.h
index 9fe6445c7..4b7bc2803 100644
--- a/src/lib/corelib/api/projectdata.h
+++ b/src/lib/corelib/api/projectdata.h
@@ -74,6 +74,14 @@ class QBS_EXPORT PropertyMap
     friend QBS_EXPORT bool operator!=(const PropertyMap &, const PropertyMap &);
 
 public:
+    struct PropertyInfo
+    {
+        QString name;
+        QString type;
+        QVariant value;
+        bool isBuiltin = false;
+    };
+
     PropertyMap();
     PropertyMap(const PropertyMap &other);
     PropertyMap(PropertyMap &&other) Q_DECL_NOEXCEPT;
@@ -83,6 +91,8 @@ public:
     PropertyMap &operator =(PropertyMap &&other) Q_DECL_NOEXCEPT;
 
     QStringList allProperties() const;
+    QStringList allModules() const;
+    QList<PropertyInfo> allPropertiesForModule(const QString &module) const;
     QVariant getProperty(const QString &name) const;
 
     QStringList getModulePropertiesAsStringList(const QString &moduleName,
diff --git a/src/lib/corelib/api/projectfileupdater.cpp b/src/lib/corelib/api/projectfileupdater.cpp
index 0bc5bc7c4..604600f8e 100644
--- a/src/lib/corelib/api/projectfileupdater.cpp
+++ b/src/lib/corelib/api/projectfileupdater.cpp
@@ -66,7 +66,7 @@ namespace Internal {
 class ItemFinder : public Visitor
 {
 public:
-    ItemFinder(const CodeLocation &cl) : m_cl(cl), m_item(nullptr) { }
+    ItemFinder(CodeLocation cl) : m_cl(std::move(cl)), m_item(nullptr) { }
 
     UiObjectDefinition *item() const { return m_item; }
 
@@ -182,7 +182,7 @@ void ProjectFileUpdater::apply()
         if (!parserMessages.empty()) {
             ErrorInfo errorInfo;
             errorInfo.append(Tr::tr("Failure parsing project file."));
-            for (const DiagnosticMessage &msg : qAsConst(parserMessages))
+            for (const DiagnosticMessage &msg : std::as_const(parserMessages))
                 errorInfo.append(msg.message, toCodeLocation(file.fileName(), msg.loc));
             throw errorInfo;
         }
@@ -208,6 +208,11 @@ ProjectFileGroupInserter::ProjectFileGroupInserter(ProductData product, QString
 {
 }
 
+static int extractLine(const QString &fileContent, int pos)
+{
+    return QStringView{fileContent}.left(pos).count(QLatin1Char('\n'));
+}
+
 void ProjectFileGroupInserter::doApply(QString &fileContent, UiProgram *ast)
 {
     ItemFinder itemFinder(m_product.location());
@@ -238,7 +243,7 @@ void ProjectFileGroupInserter::doApply(QString &fileContent, UiProgram *ast)
     const ChangeSet::EditOp &insertOp = editOps.front();
     setLineOffset(lineOffset);
 
-    int insertionLine = fileContent.left(insertOp.pos1).count(QLatin1Char('\n'));
+    int insertionLine = extractLine(fileContent, insertOp.pos1);
     for (int i = 0; i < insertOp.text.size() && insertOp.text.at(i) == QLatin1Char('\n'); ++i)
         ++insertionLine; // To account for newlines prepended by the rewriter.
     ++insertionLine; // To account for zero-based indexing.
@@ -268,7 +273,7 @@ static int getLineOffsetForChangedBinding(const ChangeSet &changeSet, const QStr
 
 static int getBindingLine(const ChangeSet &changeSet, const QString &fileContent)
 {
-    return fileContent.left(getEditOp(changeSet).pos1 + 1).count(QLatin1Char('\n')) + 1;
+    return extractLine(fileContent, getEditOp(changeSet).pos1 + 1) + 1;
 }
 
 
@@ -471,7 +476,7 @@ void ProjectFileFilesRemover::doApply(QString &fileContent, UiProgram *ast)
         }
         QString filesString;
         filesString += QLatin1String("[\n");
-        for (const QString &file : qAsConst(newFilesList)) {
+        for (const QString &file : std::as_const(newFilesList)) {
             filesString += QString(arrayElemIndentation, QLatin1Char(' '));
             filesString += QStringLiteral("\"%1\",\n").arg(file);
         }
diff --git a/src/lib/corelib/api/qmljsrewriter.cpp b/src/lib/corelib/api/qmljsrewriter.cpp
index b7e573e07..d98fe62e0 100644
--- a/src/lib/corelib/api/qmljsrewriter.cpp
+++ b/src/lib/corelib/api/qmljsrewriter.cpp
@@ -132,8 +132,7 @@ Rewriter::Range Rewriter::addBinding(AST::UiObjectInitializer *ast,
         break;
 
     case ObjectBinding:
-        newPropertyTemplate = QStringLiteral("%1: %2");
-        break;
+        Q_FALLTHROUGH();
 
     case ScriptBinding:
         newPropertyTemplate = QStringLiteral("%1: %2");
@@ -188,8 +187,7 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb
 
     if (lastObjectDef)
         return lastObjectDef;
-    else
-        return lastNonObjectDef;
+    return lastNonObjectDef;
 }
 
 UiArrayMemberList *Rewriter::searchMemberToInsertAfter(UiArrayMemberList *members,
@@ -221,8 +219,7 @@ UiArrayMemberList *Rewriter::searchMemberToInsertAfter(UiArrayMemberList *member
 
     if (lastObjectDef)
         return lastObjectDef;
-    else
-        return lastNonObjectDef;
+    return lastNonObjectDef;
 }
 
 UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *members,
@@ -301,7 +298,8 @@ void Rewriter::changeBinding(UiObjectInitializer *ast,
 
             break;
         // for grouped properties:
-        } else if (!prefix.isEmpty()) {
+        }
+        if (!prefix.isEmpty()) {
             if (auto def = cast<UiObjectDefinition *>(member)) {
                 if (toString(def->qualifiedTypeNameId) == prefix)
                     changeBinding(def->initializer, suffix, newValue, binding);
@@ -355,22 +353,20 @@ bool Rewriter::isMatchingPropertyMember(const QString &propertyName,
 {
     if (auto publicMember = cast<UiPublicMember*>(member))
         return publicMember->name == propertyName;
-    else if (auto objectBinding = cast<UiObjectBinding*>(member))
+    if (auto objectBinding = cast<UiObjectBinding*>(member))
         return toString(objectBinding->qualifiedId) == propertyName;
-    else if (auto scriptBinding = cast<UiScriptBinding*>(member))
+    if (auto scriptBinding = cast<UiScriptBinding*>(member))
         return toString(scriptBinding->qualifiedId) == propertyName;
-    else if (auto arrayBinding = cast<UiArrayBinding*>(member))
+    if (auto arrayBinding = cast<UiArrayBinding*>(member))
         return toString(arrayBinding->qualifiedId) == propertyName;
-    else
-        return false;
+    return false;
 }
 
 bool Rewriter::nextMemberOnSameLine(UiObjectMemberList *members)
 {
     if (members && members->next && members->next->member)
         return members->next->member->firstSourceLocation().startLine == members->member->lastSourceLocation().startLine;
-    else
-        return false;
+    return false;
 }
 
 void Rewriter::insertIntoArray(UiArrayBinding *ast, const QString &newValue)
@@ -465,7 +461,8 @@ bool Rewriter::includeSurroundingWhitespace(const QString &source, int &start, i
                 paragraphFound = true;
                 paragraphSkipped = true;
                 break;
-            } else if (end == source.length()) {
+            }
+            if (end == source.length()) {
                 break;
             }
 
diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp
index f54914964..23d0359b0 100644
--- a/src/lib/corelib/api/runenvironment.cpp
+++ b/src/lib/corelib/api/runenvironment.cpp
@@ -225,7 +225,7 @@ int RunEnvironment::doRunShell()
 static QString findExecutable(const QStringList &fileNames)
 {
     const QStringList path = QString::fromLocal8Bit(qgetenv("PATH"))
-            .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS);
+            .split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts);
 
     for (const QString &fileName : fileNames) {
         const QString exeFileName = HostOsInfo::appendExecutableSuffix(fileName);
@@ -313,13 +313,9 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg
             if (!process.waitForFinished(-1)) {
                 if (process.error() == QProcess::FailedToStart) {
                     throw ErrorInfo(Tr::tr("The process '%1' could not be started: %2")
-                                    .arg(targetExecutable)
-                                    .arg(process.errorString()));
-                } else {
-                    d->logger.qbsWarning()
-                            << "QProcess error: " << process.errorString();
+                                    .arg(targetExecutable, process.errorString()));
                 }
-
+                d->logger.qbsWarning() << "QProcess error: " << process.errorString();
                 return EXIT_FAILURE;
             }
 
@@ -353,8 +349,7 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg
                 if (!process.waitForFinished(-1)) {
                     if (process.error() == QProcess::FailedToStart) {
                         throw ErrorInfo(Tr::tr("The process '%1' could not be started: %2")
-                                        .arg(targetExecutable)
-                                        .arg(process.errorString()));
+                                        .arg(targetExecutable, process.errorString()));
                     }
 
                     return EXIT_FAILURE;
@@ -368,16 +363,16 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg
                                 << arguments;
             }
         } else {
-            if (QFileInfo(targetExecutable = findExecutable(QStringList()
-                        << QStringLiteral("iostool"))).isExecutable()) {
+            if (targetExecutable = findExecutable(QStringList{QStringLiteral("iostool")});
+                QFileInfo(targetExecutable).isExecutable()) {
                 targetArguments = QStringList()
                         << QStringLiteral("-run")
                         << QStringLiteral("-bundle")
                         << QDir::cleanPath(bundlePath);
                 if (!arguments.empty())
                     targetArguments << QStringLiteral("-extra-args") << arguments;
-            } else if (QFileInfo(targetExecutable = findExecutable(QStringList()
-                        << QStringLiteral("ios-deploy"))).isExecutable()) {
+            } else if (targetExecutable = findExecutable(QStringList{QStringLiteral("ios-deploy")});
+                       QFileInfo(targetExecutable).isExecutable()) {
                 targetArguments = QStringList()
                         << QStringLiteral("--no-wifi")
                         << QStringLiteral("--noninteractive")
@@ -458,13 +453,9 @@ int RunEnvironment::doRunTarget(const QString &targetBin, const QStringList &arg
             }
 #endif
             throw ErrorInfo(Tr::tr("The process '%1' could not be started: %2")
-                            .arg(targetExecutable)
-                            .arg(errorPrefixString + process.errorString()));
-        } else {
-            d->logger.qbsWarning()
-                    << "QProcess error: " << process.errorString();
+                            .arg(targetExecutable, errorPrefixString + process.errorString()));
         }
-
+        d->logger.qbsWarning() << "QProcess error: " << process.errorString();
         return EXIT_FAILURE;
     }
     return process.exitCode();
diff --git a/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
index 16c3621b6..ee82de43d 100644
--- a/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp
@@ -60,13 +60,12 @@ AbstractCommandExecutor::AbstractCommandExecutor(Logger logger, QObject *parent)
     , m_logger(std::move(logger))
 {
     m_watchdog.setSingleShot(true);
-    connect(&m_watchdog, &QTimer::timeout,
-            this, [this]() {
-        cancel(ErrorInfo{Tr::tr("Command cancelled because it exceeded the timeout.")});
+    connect(&m_watchdog, &QTimer::timeout, this, [this]() {
+        cancel(ErrorInfo{Tr::tr("Command cancelled because it exceeded the timeout: %1")
+                             .arg(m_command->descriptionForCancelMessage(
+                                 m_transformer->product()->fullDisplayName()))});
     });
-    connect(this, &AbstractCommandExecutor::finished,
-            &m_watchdog, &QTimer::stop);
-
+    connect(this, &AbstractCommandExecutor::finished, &m_watchdog, &QTimer::stop);
 }
 
 void AbstractCommandExecutor::start(Transformer *transformer, AbstractCommand *cmd)
diff --git a/src/lib/corelib/buildgraph/artifact.cpp b/src/lib/corelib/buildgraph/artifact.cpp
index 8d3a8bd3f..8f94353e6 100644
--- a/src/lib/corelib/buildgraph/artifact.cpp
+++ b/src/lib/corelib/buildgraph/artifact.cpp
@@ -64,6 +64,8 @@ Artifact::~Artifact()
 {
     for (Artifact *p : parentArtifacts())
         p->childrenAddedByScanner.remove(this);
+    if (m_deregister)
+        m_deregister(this);
 }
 
 void Artifact::accept(BuildGraphVisitor *visitor)
diff --git a/src/lib/corelib/buildgraph/artifact.h b/src/lib/corelib/buildgraph/artifact.h
index 2572a3b52..fce34b6ef 100644
--- a/src/lib/corelib/buildgraph/artifact.h
+++ b/src/lib/corelib/buildgraph/artifact.h
@@ -50,6 +50,7 @@
 
 #include <QtCore/qstring.h>
 
+#include <functional>
 #include <utility>
 #include <vector>
 
@@ -123,8 +124,12 @@ public:
     void load(PersistentPool &pool) override;
     void store(PersistentPool &pool) override;
 
+    using Deregister = std::function<void(const Artifact *)>;
+    void setDeregister(const Deregister &deregister) { m_deregister = deregister; }
+
 private:
     FileTags m_fileTags;
+    Deregister m_deregister;
 };
 
 template<> inline QString Set<Artifact *>::toString(Artifact * const &artifact) const
diff --git a/src/lib/corelib/buildgraph/artifactsscriptvalue.cpp b/src/lib/corelib/buildgraph/artifactsscriptvalue.cpp
index 2adb77d47..6d0ea738f 100644
--- a/src/lib/corelib/buildgraph/artifactsscriptvalue.cpp
+++ b/src/lib/corelib/buildgraph/artifactsscriptvalue.cpp
@@ -45,171 +45,178 @@
 #include <language/language.h>
 #include <language/scriptengine.h>
 
-#include <QtScript/qscriptclass.h>
-#include <QtScript/qscriptcontext.h>
+#include <tools/stlutils.h>
+#include <tools/stringconstants.h>
 
 namespace qbs {
 namespace Internal {
 
-enum BuildGraphScriptValueCommonPropertyKeys : quint32 {
-    CachedValueKey,
-    FileTagKey,
-    ProductPtrKey,
-};
-
-class ArtifactsScriptClass : public QScriptClass
+template<class ProductOrModule>
+static bool isRelevantArtifact(const ProductOrModule *productOrModule, const Artifact *artifact)
 {
-public:
-    ArtifactsScriptClass(QScriptEngine *engine) : QScriptClass(engine) { }
-
-private:
-    QueryFlags queryProperty(const QScriptValue &object, const QScriptString &name,
-                             QueryFlags flags, uint *id) override
-    {
-        getProduct(object);
-        qbsEngine()->setNonExistingArtifactSetRequested(m_product, name.toString());
-        return QScriptClass::queryProperty(object, name, flags, id);
-    }
-
-    QScriptClassPropertyIterator *newIterator(const QScriptValue &object) override
-    {
-        getProduct(object);
-        qbsEngine()->setArtifactsEnumerated(m_product);
-        return QScriptClass::newIterator(object);
+    if constexpr (std::is_same_v<ProductOrModule, ResolvedProduct>) {
+        Q_UNUSED(productOrModule)
+        return !artifact->isTargetOfModule();
+    } else {
+        return artifact->targetOfModule == productOrModule->name;
     }
-
-    void getProduct(const QScriptValue &object)
-    {
-        if (m_lastObjectId != object.objectId()) {
-            m_lastObjectId = object.objectId();
-            m_product = reinterpret_cast<const ResolvedProduct *>(
-                        object.data().property(ProductPtrKey).toVariant().value<quintptr>());
-        }
-    }
-
-    ScriptEngine *qbsEngine() const { return static_cast<ScriptEngine *>(engine()); }
-
-    qint64 m_lastObjectId = 0;
-    const ResolvedProduct *m_product = nullptr;
-};
-
-static bool isRelevantArtifact(const ResolvedProduct *, const Artifact *artifact)
-{
-    return !artifact->isTargetOfModule();
-}
-static bool isRelevantArtifact(const ResolvedModule *module, const Artifact *artifact)
-{
-    return artifact->targetOfModule == module->name;
 }
 
-static ArtifactSetByFileTag artifactsMap(const ResolvedProduct *product)
+template<class ProductOrModule>
+static ArtifactSetByFileTag artifactsMap(const ProductOrModule *productOrModule)
 {
-    return product->buildData->artifactsByFileTag();
+    if constexpr (std::is_same_v<ProductOrModule, ResolvedProduct>)
+        return productOrModule->buildData->artifactsByFileTag();
+    else
+        return artifactsMap(productOrModule->product);
 }
 
-static ArtifactSetByFileTag artifactsMap(const ResolvedModule *module)
+template<class ProductOrModule> static int scriptClassIndex()
 {
-    return artifactsMap(module->product);
+    if constexpr (std::is_same_v<ProductOrModule, ResolvedProduct>)
+        return 0;
+    return 1;
 }
 
-static QScriptValue createArtifactsObject(const ResolvedProduct *product, ScriptEngine *engine)
+template<class ProductOrModule>
+std::unique_lock<std::mutex> getArtifactsMapLock(ProductOrModule *productOrModule)
 {
-    QScriptClass *scriptClass = engine->artifactsScriptClass();
-    if (!scriptClass) {
-        scriptClass = new ArtifactsScriptClass(engine);
-        engine->setArtifactsScriptClass(scriptClass);
-    }
-    QScriptValue artifactsObj = engine->newObject(scriptClass);
-    QScriptValue data = engine->newObject();
-    QVariant v;
-    v.setValue<quintptr>(reinterpret_cast<quintptr>(product));
-    data.setProperty(ProductPtrKey, engine->newVariant(v));
-    artifactsObj.setData(data);
-    return artifactsObj;
+    if constexpr (std::is_same_v<ProductOrModule, ResolvedProduct>)
+        return productOrModule->buildData->getArtifactsMapLock();
+    else
+        return getArtifactsMapLock(productOrModule->product);
 }
 
-static QScriptValue createArtifactsObject(const ResolvedModule *, ScriptEngine *engine)
+template<class ProductOrModule>
+static bool checkAndSetArtifactsMapUpToDateFlag(const ProductOrModule *productOrModule)
 {
-    return engine->newObject();
+    if constexpr (std::is_same_v<ProductOrModule, ResolvedProduct>)
+        return productOrModule->buildData->checkAndSetJsArtifactsMapUpToDateFlag();
+    else
+        return checkAndSetArtifactsMapUpToDateFlag(productOrModule->product);
 }
 
-static bool checkAndSetArtifactsMapUpToDateFlag(const ResolvedProduct *p)
+// Must be called with artifacts map lock held!
+template<class ProductOrModule>
+void registerArtifactsMapAccess(ScriptEngine *engine, ProductOrModule *productOrModule)
 {
-    return p->buildData->checkAndSetJsArtifactsMapUpToDateFlag();
+    if constexpr (std::is_same_v<ProductOrModule, ResolvedProduct>) {
+        if (!checkAndSetArtifactsMapUpToDateFlag(productOrModule))
+            engine->setArtifactsMapRequested(productOrModule, true);
+        else
+            engine->setArtifactsMapRequested(productOrModule, false);
+    } else {
+        registerArtifactsMapAccess(engine, productOrModule->product);
+    }
 }
-static bool checkAndSetArtifactsMapUpToDateFlag(const ResolvedModule *) { return true; }
 
-static void registerArtifactsMapAccess(const ResolvedProduct *p, ScriptEngine *e, bool forceUpdate)
-{
-    e->setArtifactsMapRequested(p, forceUpdate);
-}
-static void registerArtifactsMapAccess(const ResolvedModule *, ScriptEngine *, bool) {}
-static void registerArtifactsSetAccess(const ResolvedProduct *p, const FileTag &t, ScriptEngine *e)
+template<class ProductOrModule>
+static int getArtifactsPropertyNames(JSContext *ctx, JSPropertyEnum **ptab, uint32_t *plen,
+                                     JSValueConst obj)
 {
-    e->setArtifactSetRequestedForTag(p, t);
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const auto productOrModule = attachedPointer<ProductOrModule>(
+                obj, engine->artifactsScriptClass(scriptClassIndex<ProductOrModule>()));
+    const std::unique_lock lock = getArtifactsMapLock(productOrModule);
+    registerArtifactsMapAccess(engine, productOrModule);
+    if constexpr (std::is_same_v<ProductOrModule, ResolvedProduct>)
+        engine->setArtifactsEnumerated(productOrModule);
+    const auto &map = artifactsMap(productOrModule);
+    const auto filter = [productOrModule](const Artifact *a) {
+        return isRelevantArtifact(productOrModule, a);
+    };
+    QStringList tags;
+    for (auto it = map.cbegin(); it != map.cend(); ++it) {
+        if (any_of(it.value(), filter)) {
+            tags << it.key().toString();
+        }
+    }
+    *plen = tags.size();
+    if (!tags.isEmpty()) {
+        *ptab = reinterpret_cast<JSPropertyEnum *>(js_malloc(ctx, *plen * sizeof **ptab));
+        JSPropertyEnum *entry = *ptab;
+        for (const QString &tag : std::as_const(tags)) {
+            entry->atom = JS_NewAtom(ctx, tag.toUtf8().constData());
+            entry->is_enumerable = 1;
+            ++entry;
+        }
+    } else {
+        *ptab = nullptr;
+    }
+    return 0;
 }
-static void registerArtifactsSetAccess(const ResolvedModule *, const FileTag &, ScriptEngine *) {}
 
-template<class ProductOrModule> static QScriptValue js_artifactsForFileTag(
-        QScriptContext *ctx, ScriptEngine *engine, const ProductOrModule *productOrModule)
+template<class ProductOrModule>
+static int getArtifactsProperty(JSContext *ctx, JSPropertyDescriptor *desc,
+                                JSValueConst obj, JSAtom prop)
 {
-    const FileTag fileTag = FileTag(ctx->callee().property(FileTagKey).toString().toUtf8());
-    registerArtifactsSetAccess(productOrModule, fileTag, engine);
-    QScriptValue result = ctx->callee().property(CachedValueKey);
-    if (result.isArray())
-        return result;
-    auto artifacts = artifactsMap(productOrModule).value(fileTag);
-    const auto filter = [productOrModule](const Artifact *a) {
+    if (!desc)
+        return 1;
+
+    desc->flags = JS_PROP_ENUMERABLE;
+    desc->value = desc->getter = desc->setter = JS_UNDEFINED;
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const auto productOrModule = attachedPointer<ProductOrModule>(
+                obj, engine->artifactsScriptClass(scriptClassIndex<ProductOrModule>()));
+    const std::unique_lock lock = getArtifactsMapLock(productOrModule);
+    registerArtifactsMapAccess(engine, productOrModule);
+    const QString tagString = getJsString(ctx, prop);
+    const FileTag fileTag(tagString.toUtf8());
+    const auto &map = artifactsMap(productOrModule);
+    const auto it = map.constFind(fileTag);
+    if (it == map.constEnd()) {
+        if constexpr (std::is_same_v<ProductOrModule, ResolvedProduct>)
+            engine->setNonExistingArtifactSetRequested(productOrModule, tagString);
+        return 1;
+    }
+    if constexpr (std::is_same_v<ProductOrModule, ResolvedProduct>)
+        engine->setArtifactSetRequestedForTag(productOrModule, fileTag);
+    ArtifactSet artifacts = it.value();
+    removeIf(artifacts, [productOrModule](const Artifact *a) {
         return !isRelevantArtifact(productOrModule, a);
-    };
-    artifacts.erase(std::remove_if(artifacts.begin(), artifacts.end(), filter), artifacts.end());
-    result = engine->newArray(uint(artifacts.size()));
-    ctx->callee().setProperty(CachedValueKey, result);
-    int k = 0;
-    for (const Artifact * const artifact : artifacts)
-        result.setProperty(k++, Transformer::translateFileConfig(engine, artifact, QString()));
-    return result;
+    });
+    if (!artifacts.empty()) {
+        desc->value = JS_NewArray(ctx); // TODO: Also cache this list?
+        int k = 0;
+        for (Artifact * const artifact : artifacts) {
+            JS_SetPropertyUint32(ctx, desc->value, k++,
+                                 Transformer::translateFileConfig(engine, artifact, QString()));
+        }
+    }
+    return 1;
 }
 
-template<class ProductOrModule> static QScriptValue js_artifacts(
-        QScriptContext *ctx, ScriptEngine *engine, const ProductOrModule *productOrModule)
+template<class ProductOrModule> static JSValue js_artifacts(JSContext *ctx,
+                                                            JSValue jsProductOrModule)
 {
-    QScriptValue artifactsObj = ctx->callee().property(CachedValueKey);
-    if (artifactsObj.isObject() && checkAndSetArtifactsMapUpToDateFlag(productOrModule)) {
-        registerArtifactsMapAccess(productOrModule, engine, false);
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const auto productOrModule = attachedPointer<ProductOrModule>(jsProductOrModule,
+                                                                  engine->dataWithPtrClass());
+    JSValue artifactsObj = engine->artifactsMapScriptValue(productOrModule);
+    if (!JS_IsUndefined(artifactsObj))
         return artifactsObj;
+    const int classIndex = scriptClassIndex<ProductOrModule>();
+    JSClassID scriptClass = engine->artifactsScriptClass(classIndex);
+    if (scriptClass == 0) {
+        const QByteArray className = "ArtifactsScriptClass" + QByteArray::number(classIndex);
+        scriptClass = engine->registerClass(className.constData(), nullptr, nullptr, JS_UNDEFINED,
+                                            &getArtifactsPropertyNames<ProductOrModule>,
+                                            &getArtifactsProperty<ProductOrModule>);
+        engine->setArtifactsScriptClass(classIndex, scriptClass);
     }
-    registerArtifactsMapAccess(productOrModule, engine, true);
-    artifactsObj = createArtifactsObject(productOrModule, engine);
-    ctx->callee().setProperty(CachedValueKey, artifactsObj);
-    const auto &map = artifactsMap(productOrModule);
-    for (auto it = map.cbegin(); it != map.cend(); ++it) {
-        const auto filter = [productOrModule](const Artifact *a) {
-            return isRelevantArtifact(productOrModule, a);
-        };
-        if (std::none_of(it.value().cbegin(), it.value().cend(), filter))
-            continue;
-        QScriptValue fileTagFunc = engine->newFunction(&js_artifactsForFileTag<ProductOrModule>,
-                                                       productOrModule);
-        const QString fileTag = it.key().toString();
-        fileTagFunc.setProperty(FileTagKey, fileTag);
-        artifactsObj.setProperty(fileTag, fileTagFunc,
-                                 QScriptValue::ReadOnly | QScriptValue::Undeletable
-                                 | QScriptValue::PropertyGetter);
-    }
+    artifactsObj = JS_NewObjectClass(engine->context(), scriptClass);
+    attachPointerTo(artifactsObj, productOrModule);
     return artifactsObj;
 }
 
-QScriptValue artifactsScriptValueForProduct(QScriptContext *ctx, ScriptEngine *engine,
-                                            const ResolvedProduct *product)
+JSValue artifactsScriptValueForProduct(JSContext *ctx, JSValue this_val, int, JSValue *)
 {
-    return js_artifacts(ctx, engine, product);
+    return js_artifacts<ResolvedProduct>(ctx, this_val);
 }
 
-QScriptValue artifactsScriptValueForModule(QScriptContext *ctx, ScriptEngine *engine,
-                                           const ResolvedModule *module)
+JSValue artifactsScriptValueForModule(JSContext *ctx, JSValueConst this_val, int, JSValueConst *)
 {
-    return js_artifacts(ctx, engine, module);
+    return js_artifacts<ResolvedModule>(ctx, this_val);
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/buildgraph/artifactsscriptvalue.h b/src/lib/corelib/buildgraph/artifactsscriptvalue.h
index c0da8a05e..dce457758 100644
--- a/src/lib/corelib/buildgraph/artifactsscriptvalue.h
+++ b/src/lib/corelib/buildgraph/artifactsscriptvalue.h
@@ -41,21 +41,14 @@
 
 #include <language/forward_decls.h>
 
-#include <QtScript/qscriptvalue.h>
-
-QT_BEGIN_NAMESPACE
-class QScriptContext;
-QT_END_NAMESPACE
+#include <quickjs.h>
 
 namespace qbs {
 namespace Internal {
 class ScriptEngine;
 
-QScriptValue artifactsScriptValueForProduct(QScriptContext *ctx, ScriptEngine *engine,
-                                            const ResolvedProduct *product);
-
-QScriptValue artifactsScriptValueForModule(QScriptContext *ctx, ScriptEngine *engine,
-                                           const ResolvedModule *module);
+JSValue artifactsScriptValueForProduct(JSContext *ctx, JSValueConst this_val, int, JSValueConst *);
+JSValue artifactsScriptValueForModule(JSContext *ctx, JSValueConst this_val, int, JSValueConst *);
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/buildgraph/artifactvisitor.cpp b/src/lib/corelib/buildgraph/artifactvisitor.cpp
index 22c987572..885292f06 100644
--- a/src/lib/corelib/buildgraph/artifactvisitor.cpp
+++ b/src/lib/corelib/buildgraph/artifactvisitor.cpp
@@ -55,7 +55,7 @@ void ArtifactVisitor::visitProduct(const ResolvedProductConstPtr &product)
 {
     if (!product->buildData)
         return;
-    for (BuildGraphNode *node : qAsConst(product->buildData->allNodes()))
+    for (BuildGraphNode *node : std::as_const(product->buildData->allNodes()))
         node->accept(this);
 }
 
diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp
index 82dae98b5..10aae5991 100644
--- a/src/lib/corelib/buildgraph/buildgraph.cpp
+++ b/src/lib/corelib/buildgraph/buildgraph.cpp
@@ -45,7 +45,6 @@
 #include "projectbuilddata.h"
 #include "productbuilddata.h"
 #include "rulenode.h"
-#include "scriptclasspropertyiterator.h"
 #include "transformer.h"
 
 #include <jsextensions/jsextensions.h>
@@ -62,14 +61,14 @@
 #include <logging/translator.h>
 #include <tools/error.h>
 #include <tools/fileinfo.h>
-#include <tools/scripttools.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
+#include <tools/scripttools.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
-#include <QtScript/qscriptclass.h>
 
 #include <algorithm>
 #include <iterator>
@@ -82,146 +81,187 @@ static QString childItemsProperty() { return QStringLiteral("childItems"); }
 static QString exportsProperty() { return QStringLiteral("exports"); }
 
 // TODO: Introduce productscriptvalue.{h,cpp}.
-static QScriptValue getDataForProductScriptValue(QScriptEngine *engine,
-                                                 const ResolvedProduct *product)
+
+static JSValue getDataObject(JSContext *ctx, JSValue obj)
 {
-    QScriptValue data = engine->newObject();
-    QVariant v;
-    v.setValue<quintptr>(reinterpret_cast<quintptr>(product));
-    data.setProperty(ProductPtrKey, engine->newVariant(v));
-    return data;
+    return getJsProperty(ctx, obj, StringConstants::dataPropertyInternal());
 }
 
-class ProductPropertyScriptClass : public QScriptClass
+static JSValue getValueFromData(JSContext *ctx, JSValue data,
+                                ModulePropertiesScriptValueCommonPropertyKeys key)
 {
-public:
-    ProductPropertyScriptClass(QScriptEngine *engine) : QScriptClass(engine) { }
-
-private:
-    QueryFlags queryProperty(const QScriptValue &object, const QScriptString &name, QueryFlags,
-                             uint *) override
-    {
-        if (name == StringConstants::parametersProperty()) {
-            m_result = object.data().property(DependencyParametersKey);
-            return HandlesReadAccess;
-        }
-        if (name == StringConstants::moduleNameProperty()) {
-            m_result = object.data().property(ModuleNameKey);
-            return HandlesReadAccess;
-        }
-        if (name == StringConstants::dependenciesProperty()
-                || name == StringConstants::artifactsProperty()
-                || name == exportsProperty()) {
-            // The prototype is not backed by a QScriptClass.
-            m_result = object.prototype().property(name);
-            return HandlesReadAccess;
-        }
-
-        getProduct(object);
-        QBS_ASSERT(m_product, return {});
-
-        const auto it = m_product->productProperties.find(name);
+    return JS_GetPropertyUint32(ctx, data, key);
+}
 
-        // It is important that we reject unknown property names. Otherwise QtScript will forward
-        // *everything* to us, including built-in stuff like the hasOwnProperty function.
-        if (it == m_product->productProperties.cend())
-            return {};
+static JSValue getValueFromObject(JSContext *ctx, JSValue obj,
+                                ModulePropertiesScriptValueCommonPropertyKeys key)
+{
+    const ScopedJsValue data(ctx, getDataObject(ctx, obj));
+    return getValueFromData(ctx, data, key);
+}
 
-        qbsEngine()->addPropertyRequestedInScript(Property(m_product->uniqueName(), QString(), name,
-                it.value(), Property::PropertyInProduct));
-        m_result = qbsEngine()->toScriptValue(it.value());
-        return HandlesReadAccess;
+void getPropertyNames(JSContext *ctx, JSPropertyEnum **ptab, uint32_t *plen,
+                      const QVariantMap &properties, const QStringList &extraPropertyNames,
+                      JSValue extraObject)
+{
+    JSPropertyEnum *basePTab = nullptr;
+    uint32_t basePlen = 0;
+    JS_GetOwnPropertyNames(ctx, &basePTab, &basePlen, extraObject,
+                           JS_GPN_STRING_MASK | JS_GPN_ENUM_ONLY);
+    *plen = uint32_t(extraPropertyNames.size() + properties.size() + basePlen);
+    *ptab = reinterpret_cast<JSPropertyEnum *>(js_malloc(ctx, *plen * sizeof **ptab));
+    JSPropertyEnum *entry = *ptab;
+    for (auto it = properties.begin(); it != properties.end(); ++it, ++entry) {
+        entry->atom = JS_NewAtom(ctx, it.key().toUtf8().constData());
+        entry->is_enumerable = 1;
     }
-
-    QScriptValue property(const QScriptValue &, const QScriptString &, uint) override
-    {
-        return m_result;
+    for (const QString &prop : extraPropertyNames) {
+        entry->atom = JS_NewAtom(ctx, prop.toUtf8().constData());
+        entry->is_enumerable = 1;
+        ++entry;
+    }
+    for (uint32_t i = 0; i < basePlen; ++i, ++entry) {
+        entry->atom = basePTab[i].atom;
+        entry->is_enumerable = 1;
+    }
+    js_free(ctx, basePTab);
+}
+
+static int getProductPropertyNames(JSContext *ctx, JSPropertyEnum **ptab, uint32_t *plen,
+                                   JSValueConst obj)
+{
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const ScopedJsValue data(ctx, getDataObject(engine->context(), obj));
+    const auto product = attachedPointer<ResolvedProduct>(
+                obj, engine->productPropertyScriptClass());
+    QBS_ASSERT(product, return -1);
+
+    // The "moduleName" convenience property is only available for the "main product" in a rule,
+    // and the "parameters" property exists only for elements of the "dependencies" array for
+    // which dependency parameters are present.
+    const auto hasModuleName = [&] {
+        const ScopedJsValue v(ctx, getValueFromData(ctx, data, ModuleNameKey));
+        return JS_IsString(v);
+    };
+    const auto hasDependencyParams = [&] {
+        const ScopedJsValue v(ctx, getValueFromData(ctx, data, DependencyParametersKey));
+        return JS_IsObject(v);
+    };
+    QStringList additionalProperties;
+    if (hasModuleName())
+        additionalProperties.push_back(StringConstants::moduleNameProperty());
+    else if (hasDependencyParams())
+        additionalProperties.push_back(StringConstants::parametersProperty());
+    getPropertyNames(ctx, ptab, plen, product->productProperties, additionalProperties,
+                     engine->baseProductScriptValue(product));
+    return 0;
+}
+
+static int getProductProperty(JSContext *ctx, JSPropertyDescriptor *desc, JSValueConst obj,
+                              JSAtom prop)
+{
+    if (desc) {
+        desc->getter = desc->setter = desc->value = JS_UNDEFINED;
+        desc->flags = JS_PROP_ENUMERABLE;
+    }
+    const QString name = getJsString(ctx, prop);
+    if (name == StringConstants::parametersProperty()) {
+        if (desc)
+            desc->value = getValueFromObject(ctx, obj, DependencyParametersKey);
+        return 1;
+    }
+    if (name == StringConstants::moduleNameProperty()) {
+        if (desc)
+            desc->value = getValueFromObject(ctx, obj, ModuleNameKey);
+        return 1;
     }
 
-    QScriptClassPropertyIterator *newIterator(const QScriptValue &object) override
-    {
-        getProduct(object);
-        QBS_ASSERT(m_product, return nullptr);
-
-        // These two are in the prototype and are thus common to all product script values.
-        std::vector<QString> additionalProperties({StringConstants::artifactsProperty(),
-                                                   StringConstants::dependenciesProperty(),
-                                                   exportsProperty()});
-
-        // The "moduleName" convenience property is only available for the "main product" in a rule,
-        // and the "parameters" property exists only for elements of the "dependencies" array for
-        // which dependency parameters are present.
-        if (object.data().property(ModuleNameKey).isValid())
-            additionalProperties.push_back(StringConstants::moduleNameProperty());
-        else if (object.data().property(DependencyParametersKey).isValid())
-            additionalProperties.push_back(StringConstants::parametersProperty());
-        return new ScriptClassPropertyIterator(object, m_product->productProperties,
-                                               additionalProperties);
-    }
-
-    void getProduct(const QScriptValue &object)
-    {
-        if (m_lastObjectId != object.objectId()) {
-            m_lastObjectId = object.objectId();
-            m_product = reinterpret_cast<const ResolvedProduct *>(
-                        object.data().property(ProductPtrKey).toVariant().value<quintptr>());
-        }
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const auto product = attachedPointer<ResolvedProduct>(
+                obj, engine->productPropertyScriptClass());
+    QBS_ASSERT(product, return -1);
+
+    const JSValue baseProductValue = engine->baseProductScriptValue(product);
+    if (name == exportsProperty()) {
+        if (desc)
+            desc->value = getJsProperty(ctx, baseProductValue, name);
+        engine->addRequestedExport(product);
+        return 1;
     }
 
-    ScriptEngine *qbsEngine() const { return static_cast<ScriptEngine *>(engine()); }
+    const auto it = product->productProperties.constFind(name);
+    if (it == product->productProperties.cend()) {
+        ScopedJsValue v(ctx, JS_GetProperty(ctx, baseProductValue, prop));
+        const int ret = JS_IsUndefined(v) ? 0 : 1;
+        if (desc)
+            desc->value = v.release();
+        return ret;
+    }
 
-    qint64 m_lastObjectId = 0;
-    const ResolvedProduct *m_product = nullptr;
-    QScriptValue m_result;
-};
+    engine->addPropertyRequestedInScript(Property(product->uniqueName(), QString(), name,
+                                                  it.value(), Property::PropertyInProduct));
+    if (desc)
+        desc->value = engine->toScriptValue(it.value());
+    return 1;
+}
 
-static QScriptValue setupProjectScriptValue(ScriptEngine *engine,
-        const ResolvedProjectConstPtr &project)
+static JSValue setupProjectScriptValue(ScriptEngine *engine, const ResolvedProjectConstPtr &project)
 {
-    QScriptValue &obj = engine->projectScriptValue(project.get());
-    if (obj.isValid())
-        return obj;
+    JSValue &obj = engine->projectScriptValue(project.get());
+    if (JS_IsObject(obj))
+        return JS_DupValue(engine->context(), obj);
     obj = engine->newObject();
-    obj.setProperty(StringConstants::filePathProperty(), project->location.filePath());
-    obj.setProperty(StringConstants::pathProperty(), FileInfo::path(project->location.filePath()));
+    setJsProperty(engine->context(), obj, StringConstants::filePathProperty(),
+                  project->location.filePath());
+    setJsProperty(engine->context(), obj, StringConstants::pathProperty(),
+                  FileInfo::path(project->location.filePath()));
     const QVariantMap &projectProperties = project->projectProperties();
     for (QVariantMap::const_iterator it = projectProperties.begin();
             it != projectProperties.end(); ++it) {
-        engine->setObservedProperty(obj, it.key(), engine->toScriptValue(it.value()));
+        const ScopedJsValue val(engine->context(), engine->toScriptValue(it.value()));
+        engine->setObservedProperty(obj, it.key(), val);
     }
-    engine->observer()->addProjectObjectId(obj.objectId(), project->name);
-    return obj;
+    engine->observer()->addProjectObjectId(jsObjectId(obj), project->name);
+    return JS_DupValue(engine->context(), obj);
 }
 
-static QScriptValue setupProductScriptValue(ScriptEngine *engine, const ResolvedProduct *product);
+static void setupBaseProductScriptValue(ScriptEngine *engine, const ResolvedProduct *product);
 
 class DependenciesFunction
 {
 public:
-    DependenciesFunction(ScriptEngine *engine)
-        : m_engine(engine)
-    {
-    }
+    DependenciesFunction(ScriptEngine *engine) : m_engine(engine) { }
 
-    void init(QScriptValue &productScriptValue, QScriptValue &exportsScriptValue,
-              const ResolvedProduct *product)
+    void init(JSValue &productScriptValue, JSValue exportsScriptValue)
     {
-        QScriptValue depfunc = m_engine->newFunction(&js_internalProductDependencies, product);
-        productScriptValue.setProperty(StringConstants::dependenciesProperty(), depfunc,
-                                       QScriptValue::ReadOnly | QScriptValue::Undeletable
-                                       | QScriptValue::PropertyGetter);
-        depfunc = m_engine->newFunction(&js_exportedProductDependencies, product);
-        exportsScriptValue.setProperty(StringConstants::dependenciesProperty(), depfunc,
-                                       QScriptValue::ReadOnly | QScriptValue::Undeletable
-                                       | QScriptValue::PropertyGetter);
+        const QByteArray name = StringConstants::dependenciesProperty().toUtf8();
+        const ScopedJsValue depfunc(
+                    m_engine->context(),
+                    JS_NewCFunction(m_engine->context(), &js_internalProductDependencies,
+                                    name.constData(), 0));
+        const ScopedJsAtom depAtom(m_engine->context(), name);
+        JS_DefineProperty(m_engine->context(), productScriptValue, depAtom, JS_UNDEFINED, depfunc,
+                          JS_UNDEFINED, JS_PROP_HAS_GET | JS_PROP_ENUMERABLE);
+        const ScopedJsValue exportedDepfunc(
+                    m_engine->context(),
+                    JS_NewCFunction(m_engine->context(), &js_exportedProductDependencies,
+                                    name.constData(), 0));
+        JS_DefineProperty(m_engine->context(), exportsScriptValue, depAtom, JS_UNDEFINED,
+                          exportedDepfunc, JS_UNDEFINED, JS_PROP_HAS_GET | JS_PROP_ENUMERABLE);
     }
 
 private:
     enum class DependencyType { Internal, Exported };
-    static QScriptValue js_productDependencies(QScriptContext *, ScriptEngine *engine,
-            const ResolvedProduct *product, DependencyType depType)
+    static JSValue js_productDependencies(const ResolvedProduct *product,
+                                          JSContext *ctx, JSValueConst this_val, int argc,
+                                          JSValueConst *argv, DependencyType depType)
     {
-        QScriptValue result = engine->newArray();
+        Q_UNUSED(this_val)
+        Q_UNUSED(argc)
+        Q_UNUSED(argv)
+
+        ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+        JSValue result = JS_NewArray(ctx);
         quint32 idx = 0;
         const bool exportCase = depType == DependencyType::Exported;
         std::vector<ResolvedProductPtr> productDeps;
@@ -243,202 +283,234 @@ private:
         } else {
             productDeps = product->dependencies;
         }
-        for (const ResolvedProductPtr &dependency : qAsConst(productDeps)) {
-            QScriptValue obj = engine->newObject(engine->productPropertyScriptClass());
-            obj.setPrototype(setupProductScriptValue(static_cast<ScriptEngine *>(engine),
-                                                     dependency.get()));
+        for (const ResolvedProductPtr &dependency : std::as_const(productDeps)) {
+            setupBaseProductScriptValue(engine, dependency.get());
+            JSValue obj = JS_NewObjectClass(engine->context(),
+                                            engine->productPropertyScriptClass());
+            attachPointerTo(obj, dependency.get());
             const QVariantMap &params
                     = (exportCase ? product->exportedModule.dependencyParameters.value(dependency)
                                   : product->dependencyParameters.value(dependency));
-            QScriptValue data = getDataForProductScriptValue(engine, dependency.get());
-            data.setProperty(DependencyParametersKey, dependencyParametersValue(
-                                 product->uniqueName(), dependency->name, params, engine));
-            obj.setData(data);
-            result.setProperty(idx++, obj);
+            JSValue data = JS_NewObjectClass(engine->context(), engine->dataWithPtrClass());
+            JS_SetPropertyUint32(ctx, data, DependencyParametersKey, dependencyParametersValue(
+                                     product->uniqueName(), dependency->name, params, engine));
+            defineJsProperty(ctx, obj, StringConstants::dataPropertyInternal(), data);
+            JS_SetPropertyUint32(ctx, result, idx++, obj);
         }
         if (exportCase) {
             for (const ExportedModuleDependency &m : product->exportedModule.moduleDependencies) {
-                QScriptValue obj = engine->newObject();
-                obj.setProperty(StringConstants::nameProperty(), m.name);
-                QScriptValue exportsValue = engine->newObject();
-                obj.setProperty(exportsProperty(), exportsValue);
-                exportsValue.setProperty(StringConstants::dependenciesProperty(),
-                                         engine->newArray());
+                JSValue obj = engine->newObject();
+                setJsProperty(ctx, obj, StringConstants::nameProperty(), m.name);
+                JSValue exportsValue = engine->newObject();
+                setJsProperty(ctx, obj, exportsProperty(), exportsValue);
+                setJsProperty(ctx, exportsValue, StringConstants::dependenciesProperty(),
+                              JS_NewArray(ctx));
                 for (auto modIt = m.moduleProperties.begin(); modIt != m.moduleProperties.end();
                      ++modIt) {
                     const QVariantMap entries = modIt.value().toMap();
                     if (entries.empty())
                         continue;
-                    QScriptValue moduleObj = engine->newObject();
-                    ModuleProperties::setModuleScriptValue(exportsValue, moduleObj, modIt.key());
-                    for (auto valIt = entries.begin(); valIt != entries.end(); ++valIt)
-                        moduleObj.setProperty(valIt.key(), engine->toScriptValue(valIt.value()));
+                    JSValue moduleObj = engine->newObject();
+                    ModuleProperties::setModuleScriptValue(engine, exportsValue, moduleObj,
+                                                           modIt.key());
+                    for (auto valIt = entries.begin(); valIt != entries.end(); ++valIt) {
+                        setJsProperty(ctx, moduleObj, valIt.key(),
+                                      engine->toScriptValue(valIt.value()));
+                    }
                 }
-                result.setProperty(idx++, obj);
+                JS_SetPropertyUint32(ctx, result, idx++, obj);
             }
             return result;
         }
         for (const auto &dependency : product->modules) {
             if (dependency->isProduct)
                 continue;
-            QScriptValue obj = engine->newObject(engine->modulePropertyScriptClass());
-            obj.setPrototype(engine->moduleScriptValuePrototype(dependency.get()));
-
-            // The prototype must exist already, because we set it up for all modules
-            // of the product in ModuleProperties::init().
-            QBS_ASSERT(obj.prototype().isValid(), ;);
-
+            JSValue obj = JS_NewObjectClass(ctx, engine->modulePropertyScriptClass());
+            attachPointerTo(obj, dependency.get());
             const QVariantMap &params = product->moduleParameters.value(dependency);
-            QScriptValue data = getDataForModuleScriptValue(engine, product, nullptr,
-                                                            dependency.get());
-            data.setProperty(DependencyParametersKey, dependencyParametersValue(
-                                 product->uniqueName(), dependency->name, params, engine));
-            obj.setData(data);
-            result.setProperty(idx++, obj);
+            JSValue data = createDataForModuleScriptValue(engine, nullptr);
+            JS_SetPropertyUint32(ctx, data, DependencyParametersKey, dependencyParametersValue(
+                                     product->uniqueName(), dependency->name, params, engine));
+            defineJsProperty(ctx, obj, StringConstants::dataPropertyInternal(), data);
+            JS_SetPropertyUint32(ctx, result, idx++, obj);
         }
         return result;
     }
 
-    static QScriptValue js_internalProductDependencies(QScriptContext *ctx, ScriptEngine *engine,
-                                                       const ResolvedProduct * const product)
+    static JSValue js_internalProductDependencies(JSContext *ctx, JSValueConst this_val,
+                                                  int argc, JSValueConst *argv)
     {
+        ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+        const auto product = attachedPointer<ResolvedProduct>(this_val, engine->dataWithPtrClass());
         engine->addDependenciesArrayRequested(product);
-        return js_productDependencies(ctx, engine, product, DependencyType::Internal);
+        return js_productDependencies(product, ctx, this_val, argc, argv,
+                                      DependencyType::Internal);
     }
 
-    static QScriptValue js_exportedProductDependencies(QScriptContext *ctx, ScriptEngine *engine,
-                                                       const ResolvedProduct * const product)
+    static JSValue js_exportedProductDependencies(JSContext *ctx, JSValueConst this_val,
+                                                  int argc, JSValueConst *argv)
     {
-        return js_productDependencies(ctx, engine, product, DependencyType::Exported);
+        const auto product = attachedPointer<ResolvedProduct>(
+                    this_val, ScriptEngine::engineForContext(ctx)->dataWithPtrClass());
+        return js_productDependencies(product, ctx, this_val, argc, argv, DependencyType::Exported);
     }
 
     ScriptEngine *m_engine;
 };
 
-static QScriptValue setupExportedPropertyScriptValue(const ExportedProperty &property,
+static JSValue setupExportedPropertyScriptValue(const ExportedProperty &property,
                                                      ScriptEngine *engine)
 {
-    QScriptValue propertyScriptValue = engine->newObject();
-    propertyScriptValue.setProperty(StringConstants::nameProperty(), property.fullName);
-    propertyScriptValue.setProperty(StringConstants::typeProperty(),
-                                    PropertyDeclaration::typeString(property.type));
-    propertyScriptValue.setProperty(StringConstants::sourceCodeProperty(), property.sourceCode);
-    propertyScriptValue.setProperty(QStringLiteral("isBuiltin"), property.isBuiltin);
+    JSValue propertyScriptValue = engine->newObject();
+    setJsProperty(engine->context(), propertyScriptValue, StringConstants::nameProperty(),
+                  property.fullName);
+    setJsProperty(engine->context(), propertyScriptValue, StringConstants::typeProperty(),
+                  PropertyDeclaration::typeString(property.type));
+    setJsProperty(engine->context(), propertyScriptValue, StringConstants::sourceCodeProperty(),
+                  property.sourceCode);
+    JS_SetPropertyStr(engine->context(), propertyScriptValue, "isBuiltin",
+                      JS_NewBool(engine->context(), property.isBuiltin));
     return propertyScriptValue;
 }
 
-static void setupExportedPropertiesScriptValue(QScriptValue &parentObject,
+static void setupExportedPropertiesScriptValue(JSValue &parentObject,
                                                const std::vector<ExportedProperty> &properties,
                                                ScriptEngine *engine)
 {
-    QScriptValue propertiesScriptValue = engine->newArray(static_cast<uint>(properties.size()));
-    parentObject.setProperty(QStringLiteral("properties"), propertiesScriptValue);
+    JSValue propertiesScriptValue = JS_NewArray(engine->context());
     quint32 arrayIndex = 0;
     for (const ExportedProperty &p : properties) {
-        propertiesScriptValue.setProperty(arrayIndex++,
-                                          setupExportedPropertyScriptValue(p, engine));
+        JS_SetPropertyUint32(engine->context(), propertiesScriptValue, arrayIndex++,
+                             setupExportedPropertyScriptValue(p, engine));
     }
+    JS_SetPropertyStr(engine->context(), parentObject, "properties", propertiesScriptValue);
 }
 
-static QScriptValue setupExportedItemScriptValue(const ExportedItem *item, ScriptEngine *engine)
+static JSValue setupExportedItemScriptValue(const ExportedItem *item, ScriptEngine *engine)
 {
-    QScriptValue itemScriptValue = engine->newObject();
-    itemScriptValue.setProperty(StringConstants::nameProperty(), item->name);
+    JSValue itemScriptValue = engine->newObject();
+    setJsProperty(engine->context(), itemScriptValue, StringConstants::nameProperty(), item->name);
     setupExportedPropertiesScriptValue(itemScriptValue, item->properties, engine);
-    QScriptValue childrenScriptValue = engine->newArray(static_cast<uint>(item->children.size()));
-    itemScriptValue.setProperty(childItemsProperty(), childrenScriptValue);
+    JSValue childrenScriptValue = JS_NewArray(engine->context());
     quint32 arrayIndex = 0;
     for (const auto &childItem : item->children) {
-        childrenScriptValue.setProperty(arrayIndex++,
-                                        setupExportedItemScriptValue(childItem.get(), engine));
+        JS_SetPropertyUint32(engine->context(), childrenScriptValue, arrayIndex++,
+                             setupExportedItemScriptValue(childItem.get(), engine));
     }
+    setJsProperty(engine->context(), itemScriptValue, childItemsProperty(), childrenScriptValue);
     return itemScriptValue;
 }
 
-static QScriptValue setupExportsScriptValue(const ExportedModule &module, ScriptEngine *engine)
+static JSValue setupExportsScriptValue(const ResolvedProduct *product, ScriptEngine *engine)
 {
-    QScriptValue exportsScriptValue = engine->newObject();
-    for (auto it = module.propertyValues.cbegin(); it != module.propertyValues.cend(); ++it)
-        exportsScriptValue.setProperty(it.key(), engine->toScriptValue(it.value()));
+    const ExportedModule &module = product->exportedModule;
+    JSValue exportsScriptValue = JS_NewObjectClass(engine->context(), engine->dataWithPtrClass());
+    attachPointerTo(exportsScriptValue, product);
+    for (auto it = module.propertyValues.cbegin(); it != module.propertyValues.cend(); ++it) {
+        setJsProperty(engine->context(), exportsScriptValue, it.key(),
+                      engine->toScriptValue(it.value()));
+    }
     setupExportedPropertiesScriptValue(exportsScriptValue, module.m_properties, engine);
-    QScriptValue childrenScriptValue = engine->newArray(static_cast<uint>(module.children.size()));
-    exportsScriptValue.setProperty(childItemsProperty(), childrenScriptValue);
+    JSValue childrenScriptValue = JS_NewArray(engine->context());
     quint32 arrayIndex = 0;
     for (const auto &exportedItem : module.children) {
-        childrenScriptValue.setProperty(arrayIndex++,
-                                        setupExportedItemScriptValue(exportedItem.get(), engine));
+        JS_SetPropertyUint32(engine->context(), childrenScriptValue, arrayIndex++,
+                             setupExportedItemScriptValue(exportedItem.get(), engine));
     }
-    QScriptValue importsScriptValue = engine->newArray(module.importStatements.size());
-    exportsScriptValue.setProperty(StringConstants::importsProperty(), importsScriptValue);
+    setJsProperty(engine->context(), exportsScriptValue, childItemsProperty(), childrenScriptValue);
+    JSValue importsScriptValue = JS_NewArray(engine->context());
     arrayIndex = 0;
-    for (const QString &importStatement : module.importStatements)
-        importsScriptValue.setProperty(arrayIndex++, importStatement);
+    for (const QString &importStatement : module.importStatements) {
+        JS_SetPropertyUint32(engine->context(), importsScriptValue, arrayIndex++,
+                             makeJsString(engine->context(), importStatement));
+    }
+    setJsProperty(engine->context(), exportsScriptValue, StringConstants::importsProperty(),
+                  importsScriptValue);
     for (auto it = module.modulePropertyValues.cbegin(); it != module.modulePropertyValues.cend();
          ++it) {
         const QVariantMap entries = it.value().toMap();
         if (entries.empty())
             continue;
-        QScriptValue moduleObject = engine->newObject();
-        ModuleProperties::setModuleScriptValue(exportsScriptValue, moduleObject, it.key());
-        for (auto valIt = entries.begin(); valIt != entries.end(); ++valIt)
-            moduleObject.setProperty(valIt.key(), engine->toScriptValue(valIt.value()));
+        JSValue moduleObject = engine->newObject();
+        ModuleProperties::setModuleScriptValue(engine, exportsScriptValue, moduleObject, it.key());
+        for (auto valIt = entries.begin(); valIt != entries.end(); ++valIt) {
+            setJsProperty(engine->context(), moduleObject, valIt.key(),
+                          engine->toScriptValue(valIt.value()));
+        }
     }
     return exportsScriptValue;
 }
 
-static QScriptValue setupProductScriptValue(ScriptEngine *engine, const ResolvedProduct *product)
+static void setupBaseProductScriptValue(ScriptEngine *engine, const ResolvedProduct *product)
 {
-    QScriptValue &productScriptValue = engine->productScriptValuePrototype(product);
-    if (productScriptValue.isValid())
-        return productScriptValue;
-    productScriptValue = engine->newObject();
-    ModuleProperties::init(productScriptValue, product);
-
-    QScriptValue artifactsFunc = engine->newFunction(&artifactsScriptValueForProduct, product);
-    productScriptValue.setProperty(StringConstants::artifactsProperty(), artifactsFunc,
-                                   QScriptValue::ReadOnly | QScriptValue::Undeletable
-                                   | QScriptValue::PropertyGetter);
-
-    QScriptValue exportsScriptValue = setupExportsScriptValue(product->exportedModule, engine);
-    DependenciesFunction(engine).init(productScriptValue, exportsScriptValue, product);
+    JSValue &productScriptValue = engine->baseProductScriptValue(product);
+    if (JS_IsObject(productScriptValue))
+        return;
+    const ScopedJsValue proto(engine->context(), JS_NewObject(engine->context()));
+    productScriptValue = JS_NewObjectProtoClass(engine->context(), proto,
+                                                engine->dataWithPtrClass());
+    attachPointerTo(productScriptValue, product);
+    ModuleProperties::init(engine, productScriptValue, product);
+
+    const QByteArray funcName = StringConstants::artifactsProperty().toUtf8();
+    const ScopedJsValue artifactsFunc(
+                engine->context(),
+                JS_NewCFunction(engine->context(), &artifactsScriptValueForProduct,
+                                funcName.constData(), 0));
+    const ScopedJsAtom artifactsAtom(engine->context(), funcName);
+    JS_DefineProperty(engine->context(), productScriptValue, artifactsAtom,
+                      JS_UNDEFINED, artifactsFunc, JS_UNDEFINED,
+                      JS_PROP_HAS_GET | JS_PROP_ENUMERABLE);
+
+    // FIXME: Proper un-observe rather than ref count decrease here.
+    ScopedJsValue exportsScriptValue(engine->context(), setupExportsScriptValue(product, engine));
+    DependenciesFunction(engine).init(productScriptValue, exportsScriptValue);
+
+    // TODO: Why are these necessary? We catch accesses to product.exports in getProductProperty().
+    // But the exportsQbs() and exportsPkgConfig() tests fail without them.
     engine->setObservedProperty(productScriptValue, exportsProperty(), exportsScriptValue);
-    engine->observer()->addExportsObjectId(exportsScriptValue.objectId(), product);
-    return productScriptValue;
+    engine->observer()->addExportsObjectId(jsObjectId(exportsScriptValue), product);
 }
 
 void setupScriptEngineForFile(ScriptEngine *engine, const FileContextBaseConstPtr &fileContext,
-        QScriptValue targetObject, const ObserveMode &observeMode)
+        JSValue targetObject, const ObserveMode &observeMode)
 {
     engine->import(fileContext, targetObject, observeMode);
-    JsExtensions::setupExtensions(fileContext->jsExtensions(), targetObject);
+    JsExtensions::setupExtensions(engine, fileContext->jsExtensions(), targetObject);
 }
 
 void setupScriptEngineForProduct(ScriptEngine *engine, ResolvedProduct *product,
-                                 const ResolvedModule *module, QScriptValue targetObject,
+                                 const ResolvedModule *module, JSValue targetObject,
                                  bool setBuildEnvironment)
 {
-    QScriptValue projectScriptValue = setupProjectScriptValue(engine, product->project.lock());
-    targetObject.setProperty(StringConstants::projectVar(), projectScriptValue);
-
+    JSValue projectScriptValue = setupProjectScriptValue(engine, product->project.lock());
+    setJsProperty(engine->context(), targetObject, StringConstants::projectVar(),
+                  projectScriptValue);
     if (setBuildEnvironment) {
         QVariant v;
         v.setValue<void*>(&product->buildEnvironment);
         engine->setProperty(StringConstants::qbsProcEnvVarInternal(), v);
     }
-    QScriptClass *scriptClass = engine->productPropertyScriptClass();
-    if (!scriptClass) {
-        scriptClass = new ProductPropertyScriptClass(engine);
-        engine->setProductPropertyScriptClass(scriptClass);
+    JSClassID scriptClass = engine->productPropertyScriptClass();
+    if (scriptClass == 0) {
+        engine->setProductPropertyScriptClass(engine->registerClass("ProductProperties", nullptr,
+                nullptr, JS_UNDEFINED, &getProductPropertyNames, &getProductProperty));
+        scriptClass = engine->productPropertyScriptClass();
     }
-    QScriptValue productScriptValue = engine->newObject(scriptClass);
-    productScriptValue.setPrototype(setupProductScriptValue(engine, product));
-    targetObject.setProperty(StringConstants::productVar(), productScriptValue);
+    setupBaseProductScriptValue(engine, product);
+    JSValue productScriptValue = JS_NewObjectClass(engine->context(), scriptClass);
+    attachPointerTo(productScriptValue, product);
+    setJsProperty(engine->context(), targetObject, StringConstants::productVar(),
+                  productScriptValue);
 
-    QScriptValue data = getDataForProductScriptValue(engine, product);
+    JSValue data = JS_NewObjectClass(engine->context(), engine->dataWithPtrClass());
     // If the Rule is in a Module, set up the 'moduleName' property
-    if (!module->name.isEmpty())
-        data.setProperty(ModuleNameKey, module->name);
-    productScriptValue.setData(data);
+    if (!module->name.isEmpty()) {
+        JS_SetPropertyUint32(engine->context(), data, ModuleNameKey,
+                             makeJsString(engine->context(), module->name));
+    }
+    defineJsProperty(engine->context(), productScriptValue,
+                     StringConstants::dataPropertyInternal(), data);
 }
 
 bool findPath(BuildGraphNode *u, BuildGraphNode *v, QList<BuildGraphNode *> &path)
@@ -448,7 +520,7 @@ bool findPath(BuildGraphNode *u, BuildGraphNode *v, QList<BuildGraphNode *> &pat
         return true;
     }
 
-    for (BuildGraphNode * const childNode : qAsConst(u->children)) {
+    for (BuildGraphNode * const childNode : std::as_const(u->children)) {
         if (findPath(childNode, v, path)) {
             path.prepend(u);
             return true;
@@ -493,12 +565,9 @@ static bool existsPath_impl(BuildGraphNode *u, BuildGraphNode *v, NodeSet *seen)
     if (!seen->insert(u).second)
         return false;
 
-    for (BuildGraphNode * const childNode : qAsConst(u->children)) {
-        if (existsPath_impl(childNode, v, seen))
-            return true;
-    }
-
-    return false;
+    return Internal::any_of(u->children, [v, seen](const auto &child) {
+        return existsPath_impl(child, v, seen);
+    });
 }
 
 static bool existsPath(BuildGraphNode *u, BuildGraphNode *v)
@@ -641,7 +710,7 @@ void updateArtifactFromSourceArtifact(const ResolvedProductPtr &product,
     const QVariantMap oldModuleProperties = artifact->properties->value();
     setArtifactData(artifact, sourceArtifact);
     if (oldFileTags != artifact->fileTags()
-            || oldModuleProperties != artifact->properties->value()) {
+        || !qVariantMapsEqual(oldModuleProperties, artifact->properties->value())) {
         invalidateArtifactAsRuleInputIfNecessary(artifact);
     }
 }
@@ -697,7 +766,7 @@ void updateGeneratedArtifacts(ResolvedProduct *product)
             provideFullFileTagsAndProperties(artifact);
             applyPerArtifactProperties(artifact);
             if (oldFileTags != artifact->fileTags()
-                    || oldModuleProperties != artifact->properties->value()) {
+                || !qVariantMapsEqual(oldModuleProperties, artifact->properties->value())) {
                 invalidateArtifactAsRuleInputIfNecessary(artifact);
             }
         }
@@ -740,17 +809,17 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product,
         QBS_CHECK(buildData);
     if (!product->buildData)
         return;
-    for (BuildGraphNode * const node : qAsConst(buildData->rootNodes())) {
+    for (BuildGraphNode * const node : std::as_const(buildData->rootNodes())) {
         qCDebug(lcBuildGraph).noquote() << "Checking root node" << node->toString();
         QBS_CHECK(buildData->allNodes().contains(node));
     }
     Set<QString> filePaths;
-    for (BuildGraphNode * const node : qAsConst(buildData->allNodes())) {
+    for (BuildGraphNode * const node : std::as_const(buildData->allNodes())) {
         qCDebug(lcBuildGraph).noquote() << "Sanity checking node" << node->toString();
         QBS_CHECK(node->product == product);
-        for (const BuildGraphNode * const parent : qAsConst(node->parents))
+        for (const BuildGraphNode * const parent : std::as_const(node->parents))
             QBS_CHECK(parent->children.contains(node));
-        for (BuildGraphNode * const child : qAsConst(node->children)) {
+        for (BuildGraphNode * const child : std::as_const(node->children)) {
             QBS_CHECK(child->parents.contains(node));
             QBS_CHECK(!child->product.expired());
             QBS_CHECK(child->product->buildData);
@@ -777,7 +846,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product,
                   !filePaths.contains(artifact->filePath()));
         filePaths << artifact->filePath();
 
-        for (Artifact * const child : qAsConst(artifact->childrenAddedByScanner))
+        for (Artifact * const child : std::as_const(artifact->childrenAddedByScanner))
             QBS_CHECK(artifact->children.contains(child));
         const TransformerConstPtr transformer = artifact->transformer;
         if (artifact->artifactType == Artifact::SourceFile)
@@ -796,7 +865,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product,
         qCDebug(lcBuildGraph)
                 << "The transformer has" << transformer->outputs.size() << "outputs.";
         ArtifactSet transformerOutputChildren;
-        for (const Artifact * const output : qAsConst(transformer->outputs)) {
+        for (const Artifact * const output : std::as_const(transformer->outputs)) {
             QBS_CHECK(output->transformer == transformer);
             transformerOutputChildren.unite(ArtifactSet::filtered(output->children));
             for (const Artifact *a : filterByType<Artifact>(output->children)) {
@@ -814,14 +883,14 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product,
         }
         if (lcBuildGraph().isDebugEnabled()) {
             qCDebug(lcBuildGraph) << "The transformer output children are:";
-            for (const Artifact * const a : qAsConst(transformerOutputChildren))
+            for (const Artifact * const a : std::as_const(transformerOutputChildren))
                 qCDebug(lcBuildGraph) << "\t" << a->fileName();
             qCDebug(lcBuildGraph) << "The transformer inputs are:";
-            for (const Artifact * const a : qAsConst(transformer->inputs))
+            for (const Artifact * const a : std::as_const(transformer->inputs))
                 qCDebug(lcBuildGraph) << "\t" << a->fileName();
         }
         QBS_CHECK(transformer->inputs.size() <= transformerOutputChildren.size());
-        for (Artifact * const transformerInput : qAsConst(transformer->inputs))
+        for (Artifact * const transformerInput : std::as_const(transformer->inputs))
             QBS_CHECK(transformerOutputChildren.contains(transformerInput));
         transformer->artifactsMapRequestedInPrepareScript.doSanityChecks();
         transformer->artifactsMapRequestedInCommands.doSanityChecks();
@@ -833,7 +902,7 @@ static void doSanityChecks(const ResolvedProjectPtr &project,
                            const Logger &logger)
 {
     logger.qbsDebug() << "Sanity checking project '" << project->name << "'";
-    for (const ResolvedProjectPtr &subProject : qAsConst(project->subProjects))
+    for (const ResolvedProjectPtr &subProject : std::as_const(project->subProjects))
         doSanityChecks(subProject, allProducts, productNames, logger);
 
     for (const auto &product : project->products) {
diff --git a/src/lib/corelib/buildgraph/buildgraph.h b/src/lib/corelib/buildgraph/buildgraph.h
index 2909b06bb..1eadb2e20 100644
--- a/src/lib/corelib/buildgraph/buildgraph.h
+++ b/src/lib/corelib/buildgraph/buildgraph.h
@@ -43,9 +43,10 @@
 #include <language/forward_decls.h>
 #include <tools/qbs_export.h>
 
-#include <QtCore/qstringlist.h>
+#include <quickjs.h>
 
-#include <QtScript/qscriptvalue.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/QVariantMap>
 
 namespace qbs {
 namespace Internal {
@@ -88,14 +89,18 @@ void removeGeneratedArtifactFromDisk(const QString &filePath, const Logger &logg
 void disconnect(BuildGraphNode *u, BuildGraphNode *v);
 
 void setupScriptEngineForFile(ScriptEngine *engine, const FileContextBaseConstPtr &fileContext,
-        QScriptValue targetObject, const ObserveMode &observeMode);
+        JSValue targetObject, const ObserveMode &observeMode);
 void setupScriptEngineForProduct(ScriptEngine *engine, ResolvedProduct *product,
-                                 const ResolvedModule *module, QScriptValue targetObject,
+                                 const ResolvedModule *module, JSValue targetObject,
                                  bool setBuildEnvironment);
 QString relativeArtifactFileName(const Artifact *artifact); // Debugging helpers
 
 void doSanityChecks(const ResolvedProjectPtr &project, const Logger &logger);
 
+void getPropertyNames(JSContext *ctx, JSPropertyEnum **ptab, uint32_t *plen,
+                      const QVariantMap &properties, const QStringList &extraPropertyNames,
+                      JSValueConst extraObject);
+
 } // namespace Internal
 } // namespace qbs
 
diff --git a/src/lib/corelib/buildgraph/buildgraph.pri b/src/lib/corelib/buildgraph/buildgraph.pri
deleted file mode 100644
index 2ed6be4fd..000000000
--- a/src/lib/corelib/buildgraph/buildgraph.pri
+++ /dev/null
@@ -1,89 +0,0 @@
-include(../../../install_prefix.pri)
-
-SOURCES += \
-    $$PWD/abstractcommandexecutor.cpp \
-    $$PWD/artifact.cpp \
-    $$PWD/artifactcleaner.cpp \
-    $$PWD/artifactsscriptvalue.cpp \
-    $$PWD/artifactvisitor.cpp \
-    $$PWD/buildgraph.cpp \
-    $$PWD/buildgraphloader.cpp \
-    $$PWD/buildgraphnode.cpp \
-    $$PWD/cycledetector.cpp \
-    $$PWD/dependencyparametersscriptvalue.cpp \
-    $$PWD/depscanner.cpp \
-    $$PWD/emptydirectoriesremover.cpp \
-    $$PWD/environmentscriptrunner.cpp \
-    $$PWD/executor.cpp \
-    $$PWD/executorjob.cpp \
-    $$PWD/filedependency.cpp \
-    $$PWD/inputartifactscanner.cpp \
-    $$PWD/jscommandexecutor.cpp \
-    $$PWD/nodeset.cpp \
-    $$PWD/nodetreedumper.cpp \
-    $$PWD/processcommandexecutor.cpp \
-    $$PWD/productbuilddata.cpp \
-    $$PWD/productinstaller.cpp \
-    $$PWD/projectbuilddata.cpp \
-    $$PWD/qtmocscanner.cpp \
-    $$PWD/rawscanneddependency.cpp \
-    $$PWD/rawscanresults.cpp \
-    $$PWD/requestedartifacts.cpp \
-    $$PWD/requesteddependencies.cpp \
-    $$PWD/rulecommands.cpp \
-    $$PWD/rulegraph.cpp \
-    $$PWD/rulenode.cpp \
-    $$PWD/rulesapplicator.cpp \
-    $$PWD/rulesevaluationcontext.cpp \
-    $$PWD/timestampsupdater.cpp \
-    $$PWD/transformerchangetracking.cpp \
-    $$PWD/transformer.cpp
-
-HEADERS += \
-    $$PWD/abstractcommandexecutor.h \
-    $$PWD/artifact.h \
-    $$PWD/artifactcleaner.h \
-    $$PWD/artifactsscriptvalue.h \
-    $$PWD/artifactvisitor.h \
-    $$PWD/buildgraph.h \
-    $$PWD/buildgraphloader.h \
-    $$PWD/buildgraphnode.h \
-    $$PWD/buildgraphvisitor.h \
-    $$PWD/cycledetector.h \
-    $$PWD/dependencyparametersscriptvalue.h \
-    $$PWD/depscanner.h \
-    $$PWD/emptydirectoriesremover.h \
-    $$PWD/environmentscriptrunner.h \
-    $$PWD/executor.h \
-    $$PWD/executorjob.h \
-    $$PWD/filedependency.h \
-    $$PWD/forward_decls.h \
-    $$PWD/inputartifactscanner.h \
-    $$PWD/jscommandexecutor.h \
-    $$PWD/nodeset.h \
-    $$PWD/nodetreedumper.h \
-    $$PWD/processcommandexecutor.h \
-    $$PWD/productbuilddata.h \
-    $$PWD/productinstaller.h \
-    $$PWD/projectbuilddata.h \
-    $$PWD/qtmocscanner.h \
-    $$PWD/rawscanneddependency.h \
-    $$PWD/rawscanresults.h \
-    $$PWD/requestedartifacts.h \
-    $$PWD/requesteddependencies.h \
-    $$PWD/rescuableartifactdata.h \
-    $$PWD/rulecommands.h \
-    $$PWD/rulegraph.h \
-    $$PWD/rulenode.h \
-    $$PWD/rulesapplicator.h \
-    $$PWD/rulesevaluationcontext.h \
-    $$PWD/scriptclasspropertyiterator.h \
-    $$PWD/timestampsupdater.h \
-    $$PWD/transformerchangetracking.h \
-    $$PWD/transformer.h
-
-!qbs_no_dev_install {
-    buildgraph_headers.files = $$PWD/forward_decls.h
-    buildgraph_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/buildgraph
-    INSTALLS += buildgraph_headers
-}
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index f1a5e5cb9..ffae52ab2 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -39,21 +39,20 @@
 #include "buildgraphloader.h"
 
 #include "buildgraph.h"
-#include "cycledetector.h"
 #include "emptydirectoriesremover.h"
 #include "productbuilddata.h"
 #include "projectbuilddata.h"
 #include "rulenode.h"
 #include "rulecommands.h"
-#include "rulesevaluationcontext.h"
 #include "transformer.h"
 
+#include <buildgraph/rulesevaluationcontext.h>
 #include <language/artifactproperties.h>
 #include <language/language.h>
-#include <language/loader.h>
 #include <language/propertymapinternal.h>
 #include <language/qualifiedid.h>
 #include <language/resolvedfilecontext.h>
+#include <loader/projectresolver.h>
 #include <logging/categories.h>
 #include <logging/translator.h>
 #include <tools/buildgraphlocker.h>
@@ -65,6 +64,7 @@
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
 #include <tools/settings.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qdir.h>
@@ -94,7 +94,7 @@ static void restoreBackPointers(const ResolvedProjectPtr &project)
         product->project = project;
         if (!product->buildData)
             continue;
-        for (BuildGraphNode * const n : qAsConst(product->buildData->allNodes())) {
+        for (BuildGraphNode * const n : std::as_const(product->buildData->allNodes())) {
             if (n->type() == BuildGraphNode::ArtifactNodeType) {
                 project->topLevelProject()->buildData
                         ->insertIntoLookupTable(static_cast<Artifact *>(n));
@@ -102,7 +102,7 @@ static void restoreBackPointers(const ResolvedProjectPtr &project)
         }
     }
 
-    for (const ResolvedProjectPtr &subProject : qAsConst(project->subProjects)) {
+    for (const ResolvedProjectPtr &subProject : std::as_const(project->subProjects)) {
         subProject->parentProject = project;
         restoreBackPointers(subProject);
     }
@@ -128,7 +128,7 @@ BuildGraphLoadResult BuildGraphLoader::load(const TopLevelProjectPtr &existingPr
     if (!m_result.loadedProject)
         return m_result;
     if (parameters.restoreBehavior() == SetupProjectParameters::RestoreOnly) {
-        for (const ErrorInfo &e : qAsConst(m_result.loadedProject->warningsEncountered))
+        for (const ErrorInfo &e : std::as_const(m_result.loadedProject->warningsEncountered))
             m_logger.printWarning(e);
         return m_result;
     }
@@ -219,7 +219,7 @@ bool BuildGraphLoader::checkBuildGraphCompatibility(const TopLevelProjectConstPt
     if (m_parameters.projectFilePath().isEmpty())
         m_parameters.setProjectFilePath(project->location.filePath());
     else
-        Loader::setupProjectFilePath(m_parameters);
+        m_parameters.finalizeProjectFilePath();
     if (QFileInfo(project->location.filePath()) == QFileInfo(m_parameters.projectFilePath()))
         return true;
     QString message = Tr::tr("Stored build graph at '%1' is for project file '%2', but "
@@ -243,7 +243,7 @@ static bool checkProductForChangedDependency(std::vector<ResolvedProductPtr> &ch
         return false;
     if (contains(changedProducts, product))
         return true;
-    for (const ResolvedProductPtr &dep : qAsConst(product->dependencies)) {
+    for (const ResolvedProductPtr &dep : std::as_const(product->dependencies)) {
         if (checkProductForChangedDependency(changedProducts, seenProducts, dep)) {
             changedProducts << product;
             return true;
@@ -268,14 +268,14 @@ static void makeChangedProductsListComplete(std::vector<ResolvedProductPtr> &cha
 static void updateProductAndRulePointers(const ResolvedProductPtr &newProduct)
 {
     std::unordered_map<RuleConstPtr, RuleConstPtr> ruleMap;
-    for (BuildGraphNode *node : qAsConst(newProduct->buildData->allNodes())) {
+    for (BuildGraphNode *node : std::as_const(newProduct->buildData->allNodes())) {
         node->product = newProduct;
         const auto findNewRule = [&ruleMap, &newProduct]
                 (const RuleConstPtr &oldRule) -> RuleConstPtr {
             const auto it = ruleMap.find(oldRule);
             if (it != ruleMap.cend())
                 return it->second;
-            for (const auto &r : qAsConst(newProduct->rules)) {
+            for (const auto &r : std::as_const(newProduct->rules)) {
                 if (*r == *oldRule) {
                     ruleMap.insert(std::make_pair(oldRule, r));
                     return r;
@@ -307,8 +307,10 @@ void BuildGraphLoader::trackProjectChanges()
     std::vector<ResolvedProductPtr> allRestoredProducts = restoredProject->allProducts();
     std::vector<ResolvedProductPtr> changedProducts;
     bool reResolvingNecessary = false;
-    if (!checkConfigCompatibility())
+    if (!checkConfigCompatibility()) {
+        m_logger.qbsInfo() << Tr::tr("One or more properties have changed.");
         reResolvingNecessary = true;
+    }
     if (hasProductFileChanged(allRestoredProducts, restoredProject->lastStartResolveTime,
                               buildSystemFiles, changedProducts)) {
         reResolvingNecessary = true;
@@ -329,33 +331,41 @@ void BuildGraphLoader::trackProjectChanges()
     }
 
     if (!reResolvingNecessary) {
-        for (const ErrorInfo &e : qAsConst(restoredProject->warningsEncountered))
+        for (const ErrorInfo &e : std::as_const(restoredProject->warningsEncountered))
             m_logger.printWarning(e);
         return;
     }
 
+    for (const QString &file : m_changedProjectFiles) {
+        m_logger.qbsInfo() << Tr::tr("Project file '%1' has changed.")
+                                  .arg(QDir::toNativeSeparators(file));
+    }
+    for (const QString &file : m_removedProjectFiles) {
+        m_logger.qbsInfo() << Tr::tr("Project file '%1' was removed.")
+                                  .arg(QDir::toNativeSeparators(file));
+    }
+
     restoredProject->buildData->setDirty();
     markTransformersForChangeTracking(allRestoredProducts);
     if (!m_parameters.overrideBuildGraphData())
         m_parameters.setEnvironment(restoredProject->environment);
-    Loader ldr(m_evalContext->engine(), m_logger);
-    ldr.setSearchPaths(m_parameters.searchPaths());
-    ldr.setProgressObserver(m_evalContext->observer());
-    ldr.setOldProjectProbes(restoredProject->probes);
+    ProjectResolver resolver(m_parameters, m_evalContext->engine(), m_logger);
+    resolver.setProgressObserver(m_evalContext->observer());
+    resolver.setOldProjectProbes(restoredProject->probes);
     if (!m_parameters.forceProbeExecution())
-        ldr.setStoredModuleProviderInfo(restoredProject->moduleProviderInfo);
-    ldr.setLastResolveTime(restoredProject->lastStartResolveTime);
+        resolver.setStoredModuleProviderInfo(restoredProject->moduleProviderInfo);
+    resolver.setLastResolveTime(restoredProject->lastStartResolveTime);
     QHash<QString, std::vector<ProbeConstPtr>> restoredProbes;
-    for (const auto &restoredProduct : qAsConst(allRestoredProducts))
+    for (const auto &restoredProduct : std::as_const(allRestoredProducts))
         restoredProbes.insert(restoredProduct->uniqueName(), restoredProduct->probes);
-    ldr.setOldProductProbes(restoredProbes);
+    resolver.setOldProductProbes(restoredProbes);
     if (!m_parameters.overrideBuildGraphData())
-        ldr.setStoredProfiles(restoredProject->profileConfigs);
-    m_result.newlyResolvedProject = ldr.loadProject(m_parameters);
+        resolver.setStoredProfiles(restoredProject->profileConfigs);
+    m_result.newlyResolvedProject = resolver.resolve();
 
     std::vector<ResolvedProductPtr> allNewlyResolvedProducts
             = m_result.newlyResolvedProject->allProducts();
-    for (const ResolvedProductPtr &cp : qAsConst(allNewlyResolvedProducts))
+    for (const ResolvedProductPtr &cp : std::as_const(allNewlyResolvedProducts))
         m_freshProductsByName.insert(cp->uniqueName(), cp);
 
     checkAllProductsForChanges(allRestoredProducts, changedProducts);
@@ -364,7 +374,7 @@ void BuildGraphLoader::trackProjectChanges()
     ChildListHash childLists;
     if (!changedProducts.empty()) {
         oldBuildData = std::make_shared<ProjectBuildData>(restoredProject->buildData.get());
-        for (const auto &product : qAsConst(allRestoredProducts)) {
+        for (const auto &product : std::as_const(allRestoredProducts)) {
             if (!product->buildData)
                 continue;
 
@@ -383,7 +393,7 @@ void BuildGraphLoader::trackProjectChanges()
     // mean that artifacts will have to get rebuilt; whether this is necesessary will be decided
     // an a per-artifact basis by the Executor on the next build.
     QHash<QString, AllRescuableArtifactData> rescuableArtifactData;
-    for (const ResolvedProductPtr &product : qAsConst(changedProducts)) {
+    for (const ResolvedProductPtr &product : std::as_const(changedProducts)) {
         const QString name = product->uniqueName();
         m_changedSourcesByProduct.erase(name);
         m_productsWhoseArtifactsNeedUpdate.remove(name);
@@ -427,7 +437,7 @@ void BuildGraphLoader::trackProjectChanges()
     }
 
     // Products still left in the list do not exist anymore.
-    for (const ResolvedProductPtr &removedProduct : qAsConst(allRestoredProducts)) {
+    for (const ResolvedProductPtr &removedProduct : std::as_const(allRestoredProducts)) {
         removeOne(changedProducts, removedProduct);
         onProductRemoved(removedProduct, m_result.newlyResolvedProject->buildData.get());
     }
@@ -453,7 +463,7 @@ void BuildGraphLoader::trackProjectChanges()
         updateGeneratedArtifacts(product.get());
     }
 
-    for (const auto &changedProduct : qAsConst(changedProducts)) {
+    for (const auto &changedProduct : std::as_const(changedProducts)) {
         rescueOldBuildData(changedProduct,
                            m_freshProductsByName.value(changedProduct->uniqueName()),
                            childLists, rescuableArtifactData.value(changedProduct->uniqueName()));
@@ -462,7 +472,7 @@ void BuildGraphLoader::trackProjectChanges()
     EmptyDirectoriesRemover(m_result.newlyResolvedProject.get(), m_logger)
             .removeEmptyParentDirectories(m_artifactsRemovedFromDisk);
 
-    for (FileResourceBase * const f : qAsConst(m_objectsToDelete)) {
+    for (FileResourceBase * const f : std::as_const(m_objectsToDelete)) {
         if (f->fileType() == FileResourceBase::FileTypeArtifact)
             static_cast<Artifact *>(f)->product.reset(); // To help with the sanity checks.
     }
@@ -479,12 +489,9 @@ bool BuildGraphLoader::probeExecutionForced(
     if (!restoredProject->probes.empty())
         return true;
 
-    for (const auto &p : qAsConst(restoredProducts)) {
-        if (!p->probes.empty())
-            return true;
-    }
-
-    return false;
+    return Internal::any_of(restoredProducts, [](const auto &p) {
+        return !p->probes.empty();
+    });
 }
 
 bool BuildGraphLoader::hasEnvironmentChanged(const TopLevelProjectConstPtr &restoredProject) const
@@ -501,9 +508,11 @@ bool BuildGraphLoader::hasEnvironmentChanged(const TopLevelProjectConstPtr &rest
     newEnv.remove(ldPreloadEnvVar);
 
     if (oldEnv != newEnv) {
-        qCDebug(lcBuildGraph) << "Set of environment variables changed. Must re-resolve project."
-                              << "\nold:" << restoredProject->environment.toStringList()
-                              << "\nnew:" << m_parameters.adjustedEnvironment().toStringList();
+        m_logger.qbsInfo() << Tr::tr("Environment changed.");
+        m_logger.qbsDebug() << Tr::tr("old: %1").arg(
+            restoredProject->environment.toStringList().join(QLatin1Char('\n')));
+        m_logger.qbsDebug() << Tr::tr("new: %2").arg(
+            m_parameters.adjustedEnvironment().toStringList().join(QLatin1Char('\n')));
         return true;
     }
     return false;
@@ -514,8 +523,8 @@ bool BuildGraphLoader::hasCanonicalFilePathResultChanged(const TopLevelProjectCo
     for (auto it = restoredProject->canonicalFilePathResults.constBegin();
          it != restoredProject->canonicalFilePathResults.constEnd(); ++it) {
         if (QFileInfo(it.key()).canonicalFilePath() != it.value()) {
-            qCDebug(lcBuildGraph) << "Canonical file path for file" << it.key()
-                                  << "changed, must re-resolve project.";
+            m_logger.qbsInfo() << Tr::tr("Canonical file path for file '%1' changed.")
+                                      .arg(QDir::toNativeSeparators(it.key()));
             return true;
         }
     }
@@ -528,8 +537,8 @@ bool BuildGraphLoader::hasFileExistsResultChanged(const TopLevelProjectConstPtr
     for (QHash<QString, bool>::ConstIterator it = restoredProject->fileExistsResults.constBegin();
          it != restoredProject->fileExistsResults.constEnd(); ++it) {
         if (FileInfo(it.key()).exists() != it.value()) {
-            qCDebug(lcBuildGraph) << "Existence check for file" << it.key()
-                                  << "changed, must re-resolve project.";
+            m_logger.qbsInfo() << Tr::tr("Existence check for file '%1' changed.")
+                                      .arg(QDir::toNativeSeparators(it.key()));
             return true;
         }
     }
@@ -543,9 +552,8 @@ bool BuildGraphLoader::hasDirectoryEntriesResultChanged(const TopLevelProjectCon
          it != restoredProject->directoryEntriesResults.constEnd(); ++it) {
         if (QDir(it.key().first).entryList(static_cast<QDir::Filters>(it.key().second), QDir::Name)
                 != it.value()) {
-            qCDebug(lcBuildGraph) << "Entry list for directory" << it.key().first
-                                  << static_cast<QDir::Filters>(it.key().second)
-                                  << "changed, must re-resolve project.";
+            m_logger.qbsInfo() << Tr::tr("Entry list for directory '%1' changed.")
+                                      .arg(QDir::toNativeSeparators(it.key().first));
             return true;
         }
     }
@@ -559,8 +567,8 @@ bool BuildGraphLoader::hasFileLastModifiedResultChanged(const TopLevelProjectCon
          = restoredProject->fileLastModifiedResults.constBegin();
          it != restoredProject->fileLastModifiedResults.constEnd(); ++it) {
         if (FileInfo(it.key()).lastModified() != it.value()) {
-            qCDebug(lcBuildGraph) << "Timestamp for file" << it.key()
-                                  << "changed, must re-resolve project.";
+            m_logger.qbsInfo() << Tr::tr("Timestamp for file '%1' has changed.")
+                                      .arg(QDir::toNativeSeparators(it.key()));
             return true;
         }
     }
@@ -578,17 +586,18 @@ bool BuildGraphLoader::hasProductFileChanged(const std::vector<ResolvedProductPt
         const FileInfo pfi(filePath);
         remainingBuildSystemFiles.remove(filePath);
         if (!pfi.exists()) {
-            qCDebug(lcBuildGraph) << "A product was removed, must re-resolve project";
+            m_removedProjectFiles << filePath;
             hasChanged = true;
         } else if (referenceTime < pfi.lastModified()) {
-            qCDebug(lcBuildGraph) << "A product was changed, must re-resolve project";
+            m_changedProjectFiles << filePath;
             hasChanged = true;
         } else if (!contains(changedProducts, product)) {
             bool foundMissingSourceFile = false;
-            for (const QString &file : qAsConst(product->missingSourceFiles)) {
+            for (const QString &file : std::as_const(product->missingSourceFiles)) {
                 if (FileInfo(file).exists()) {
-                    qCDebug(lcBuildGraph) << "Formerly missing file" << file << "in product"
-                                          << product->name << "exists now, must re-resolve project";
+                    m_logger.qbsInfo()
+                        << Tr::tr("Formerly missing file '%1' in product '%2' exists now.")
+                               .arg(QDir::toNativeSeparators(filePath), product->fullDisplayName());
                     foundMissingSourceFile = true;
                     break;
                 }
@@ -602,27 +611,14 @@ bool BuildGraphLoader::hasProductFileChanged(const std::vector<ResolvedProductPt
             AccumulatingTimer wildcardTimer(m_parameters.logElapsedTime()
                                             ? &m_wildcardExpansionEffort : nullptr);
             for (const GroupPtr &group : product->groups) {
-                if (!group->wildcards)
-                    continue;
-                const bool reExpansionRequired = std::any_of(
-                            group->wildcards->dirTimeStamps.cbegin(),
-                            group->wildcards->dirTimeStamps.cend(),
-                            [](const std::pair<QString, FileTime> &pair) {
-                                return FileInfo(pair.first).lastModified() > pair.second;
-                });
-                if (!reExpansionRequired)
-                    continue;
-                const Set<QString> files = group->wildcards->expandPatterns(group,
-                        FileInfo::path(group->location.filePath()),
-                        product->topLevelProject()->buildDirectory);
-                Set<QString> wcFiles;
-                for (const auto &sourceArtifact : group->wildcards->files)
-                    wcFiles += sourceArtifact->absoluteFilePath;
-                if (files == wcFiles)
-                    continue;
-                hasChanged = true;
-                changedProducts.push_back(product);
-                break;
+                if (group->wildcards && group->wildcards->hasChangedSinceExpansion()) {
+                    m_logger.qbsInfo()
+                        << Tr::tr("Must re-expand wildcards for group '%1' in product '%2'.")
+                               .arg(group->name, product->fullDisplayName());
+                    hasChanged = true;
+                    changedProducts.push_back(product);
+                    break;
+                }
             }
         }
     }
@@ -636,8 +632,7 @@ bool BuildGraphLoader::hasBuildSystemFileChanged(const Set<QString> &buildSystem
     for (const QString &file : buildSystemFiles) {
         const FileInfo fi(file);
         if (!fi.exists()) {
-            qCDebug(lcBuildGraph) << "Project file" << file
-                                  << "no longer exists, must re-resolve project.";
+            m_removedProjectFiles << file;
             return true;
         }
         const auto generatedChecker = [&file, restoredProject](const ModuleProviderInfo &mpi) {
@@ -648,7 +643,7 @@ bool BuildGraphLoader::hasBuildSystemFileChanged(const Set<QString> &buildSystem
         const FileTime referenceTime = fileWasCreatedByModuleProvider
                 ? restoredProject->lastEndResolveTime : restoredProject->lastStartResolveTime;
         if (referenceTime < fi.lastModified()) {
-            qCDebug(lcBuildGraph) << "Project file" << file << "changed, must re-resolve project.";
+            m_changedProjectFiles << file;
             return true;
         }
     }
@@ -743,9 +738,9 @@ static bool dependenciesAreEqual(const ResolvedProductConstPtr &p1,
         return false;
     Set<QString> names1;
     Set<QString> names2;
-    for (const auto &dep : qAsConst(p1->dependencies))
+    for (const auto &dep : std::as_const(p1->dependencies))
         names1 << dep->uniqueName();
-    for (const auto &dep : qAsConst(p2->dependencies))
+    for (const auto &dep : std::as_const(p2->dependencies))
         names2 << dep->uniqueName();
     return names1 == names2;
 }
@@ -775,10 +770,11 @@ bool BuildGraphLoader::checkProductForInstallInfoChanges(const ResolvedProductPt
             << StringConstants::installDirProperty() << StringConstants::installPrefixProperty()
             << StringConstants::installRootProperty();
     for (const QString &key : specialProperties) {
-        if (restoredProduct->moduleProperties->qbsPropertyValue(key)
-                != newlyResolvedProduct->moduleProperties->qbsPropertyValue(key)) {
+        if (!qVariantsEqual(
+                restoredProduct->moduleProperties->qbsPropertyValue(key),
+                newlyResolvedProduct->moduleProperties->qbsPropertyValue(key))) {
             qCDebug(lcBuildGraph).noquote().nospace()
-                    << "Product property 'qbs." << key << "' changed.";
+                << "Product property 'qbs." << key << "' changed.";
             return true;
         }
     }
@@ -824,7 +820,7 @@ void BuildGraphLoader::onProductRemoved(const ResolvedProductPtr &product,
 
     removeOne(product->project->products, product);
     if (product->buildData) {
-        for (BuildGraphNode * const node : qAsConst(product->buildData->allNodes())) {
+        for (BuildGraphNode * const node : std::as_const(product->buildData->allNodes())) {
             if (node->type() == BuildGraphNode::ArtifactNodeType) {
                 const auto artifact = static_cast<Artifact *>(node);
                 projectBuildData->removeArtifact(artifact, m_logger, removeArtifactsFromDisk,
@@ -832,10 +828,10 @@ void BuildGraphLoader::onProductRemoved(const ResolvedProductPtr &product,
                 if (removeArtifactsFromDisk && artifact->artifactType == Artifact::Generated)
                     m_artifactsRemovedFromDisk << artifact->filePath();
             } else {
-                for (BuildGraphNode * const parent : qAsConst(node->parents))
+                for (BuildGraphNode * const parent : std::as_const(node->parents))
                     parent->children.remove(node);
                 node->parents.clear();
-                for (BuildGraphNode * const child : qAsConst(node->children))
+                for (BuildGraphNode * const child : std::as_const(node->children))
                     child->parents.remove(node);
                 node->children.clear();
             }
@@ -864,11 +860,14 @@ void BuildGraphLoader::replaceFileDependencyWithArtifact(const ResolvedProductPt
 bool BuildGraphLoader::checkConfigCompatibility()
 {
     const TopLevelProjectConstPtr restoredProject = m_result.loadedProject;
-    if (m_parameters.topLevelProfile().isEmpty())
+    if (m_parameters.topLevelProfile().isEmpty()) {
         m_parameters.setTopLevelProfile(restoredProject->profile());
+        m_parameters.expandBuildConfiguration();
+    }
     if (!m_parameters.overrideBuildGraphData()) {
         if (!m_parameters.overriddenValues().empty()
-                && m_parameters.overriddenValues() != restoredProject->overriddenValues) {
+            && !qVariantMapsEqual(
+                m_parameters.overriddenValues(), restoredProject->overriddenValues)) {
             const auto toUserOutput = [](const QVariantMap &propMap) {
                 QString o;
                 for (auto it = propMap.begin(); it != propMap.end(); ++it) {
@@ -884,9 +883,9 @@ bool BuildGraphLoader::checkConfigCompatibility()
                                    "New property values: %2\n"
                                    "Use the 'resolve' command if "
                                    "you really want to rebuild with the new properties.")
-                            .arg(toUserOutput(restoredProject->overriddenValues))
-                            .arg(toUserOutput(m_parameters.overriddenValues())));
-            }
+                            .arg(toUserOutput(restoredProject->overriddenValues),
+                                     toUserOutput(m_parameters.overriddenValues())));
+        }
         m_parameters.setOverriddenValues(restoredProject->overriddenValues);
         if (m_parameters.topLevelProfile() != restoredProject->profile()) {
             throw ErrorInfo(Tr::tr("The current profile is '%1', but profile '%2' was used "
@@ -901,11 +900,12 @@ bool BuildGraphLoader::checkConfigCompatibility()
     }
     if (!m_parameters.overrideBuildGraphData())
         return true;
-    if (m_parameters.finalBuildConfigurationTree() != restoredProject->buildConfiguration())
+    if (!qVariantMapsEqual(
+            m_parameters.finalBuildConfigurationTree(), restoredProject->buildConfiguration()))
         return false;
     Settings settings(m_parameters.settingsDirectory());
-    for (QVariantMap::ConstIterator it = restoredProject->profileConfigs.constBegin();
-         it != restoredProject->profileConfigs.constEnd(); ++it) {
+    const QVariantMap profileConfigsTree = restoredProject->fullProfileConfigsTree();
+    for (auto it = profileConfigsTree.begin(); it != profileConfigsTree.end(); ++it) {
         const Profile profile(it.key(), &settings);
         const QVariantMap buildConfig = SetupProjectParameters::expandedBuildConfiguration(
                     profile, m_parameters.configurationName());
@@ -971,14 +971,12 @@ void BuildGraphLoader::rescueOldBuildData(const ResolvedProductConstPtr &restore
             rad.lastPrepareScriptExecutionTime
                     = oldArtifact->transformer->lastPrepareScriptExecutionTime;
             const ChildrenInfo &childrenInfo = childLists.value(oldArtifact);
-            for (Artifact * const child : qAsConst(childrenInfo.children)) {
+            for (Artifact * const child : std::as_const(childrenInfo.children)) {
                 rad.children.emplace_back(child->product->name,
                         child->product->multiplexConfigurationId, child->filePath(),
                         childrenInfo.childrenAddedByScanner.contains(child));
-                std::transform(oldArtifact->fileDependencies.cbegin(),
-                               oldArtifact->fileDependencies.cend(),
-                               std::back_inserter(rad.fileDependencies),
-                               std::mem_fn(&FileDependency::filePath));
+                transform(oldArtifact->fileDependencies, rad.fileDependencies,
+                          std::mem_fn(&FileDependency::filePath));
             }
             newlyResolvedProduct->buildData->addRescuableArtifactData(oldArtifact->filePath(), rad);
         }
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.h b/src/lib/corelib/buildgraph/buildgraphloader.h
index c62ba7fa7..02b00e29d 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.h
+++ b/src/lib/corelib/buildgraph/buildgraphloader.h
@@ -46,6 +46,7 @@
 
 #include <language/forward_decls.h>
 #include <logging/logger.h>
+#include <tools/set.h>
 #include <tools/setupprojectparameters.h>
 
 #include <QtCore/qprocess.h>
@@ -140,6 +141,8 @@ private:
     Logger m_logger;
     QStringList m_artifactsRemovedFromDisk;
     std::unordered_map<QString, std::vector<SourceArtifactConstPtr>> m_changedSourcesByProduct;
+    Set<QString> m_changedProjectFiles;
+    Set<QString> m_removedProjectFiles;
     Set<QString> m_productsWhoseArtifactsNeedUpdate;
     qint64 m_wildcardExpansionEffort = 0;
     qint64 m_propertyComparisonEffort = 0;
diff --git a/src/lib/corelib/buildgraph/buildgraphnode.cpp b/src/lib/corelib/buildgraph/buildgraphnode.cpp
index 7d011d50c..cb19ee95c 100644
--- a/src/lib/corelib/buildgraph/buildgraphnode.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphnode.cpp
@@ -56,9 +56,9 @@ BuildGraphNode::BuildGraphNode() : buildState(Untouched)
 
 BuildGraphNode::~BuildGraphNode()
 {
-    for (BuildGraphNode *p : qAsConst(parents))
+    for (BuildGraphNode *p : std::as_const(parents))
         p->children.remove(this);
-    for (BuildGraphNode *c : qAsConst(children))
+    for (BuildGraphNode *c : std::as_const(children))
         c->parents.remove(this);
 }
 
@@ -69,7 +69,7 @@ void BuildGraphNode::onChildDisconnected(BuildGraphNode *child)
 
 void BuildGraphNode::acceptChildren(BuildGraphVisitor *visitor)
 {
-    for (BuildGraphNode *child : qAsConst(children))
+    for (BuildGraphNode *child : std::as_const(children))
         child->accept(visitor);
 }
 
diff --git a/src/lib/corelib/buildgraph/cycledetector.cpp b/src/lib/corelib/buildgraph/cycledetector.cpp
index 5daed55fd..3a1c43cd1 100644
--- a/src/lib/corelib/buildgraph/cycledetector.cpp
+++ b/src/lib/corelib/buildgraph/cycledetector.cpp
@@ -91,7 +91,7 @@ bool CycleDetector::visitNode(BuildGraphNode *node)
 
     m_nodesInCurrentPath += node;
     m_parent = node;
-    for (BuildGraphNode * const child : qAsConst(node->children))
+    for (BuildGraphNode * const child : std::as_const(node->children))
         child->accept(this);
     m_nodesInCurrentPath -= node;
     m_allNodes += node;
diff --git a/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp b/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp
index ac6b1dc42..7b333d32f 100644
--- a/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp
+++ b/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.cpp
@@ -46,37 +46,39 @@
 namespace qbs {
 namespace Internal {
 
-static QScriptValue toScriptValue(ScriptEngine *engine, const QString &productName,
-                                  const QVariantMap &v, const QString &depName,
-                                  const QualifiedId &moduleName)
+static JSValue toScriptValue(ScriptEngine *engine, const QString &productName,
+                             const QVariantMap &v, const QString &depName,
+                             const QualifiedId &moduleName)
 {
-    QScriptValue obj = engine->newObject();
+    JSValue obj = engine->newObject();
     bool objIdAddedToObserver = false;
     for (auto it = v.begin(); it != v.end(); ++it) {
         if (it.value().userType() == QMetaType::QVariantMap) {
-            obj.setProperty(it.key(), toScriptValue(engine, productName, it.value().toMap(),
-                    depName, QualifiedId(moduleName) << it.key()));
+            setJsProperty(engine->context(), obj, it.key(),
+                          toScriptValue(engine, productName, it.value().toMap(),
+                                        depName, QualifiedId(moduleName) << it.key()));
         } else {
             if (!objIdAddedToObserver) {
                 objIdAddedToObserver = true;
-                engine->observer()->addParameterObjectId(obj.objectId(), productName, depName,
+                engine->observer()->addParameterObjectId(jsObjectId(obj), productName, depName,
                                                          moduleName);
             }
-            engine->setObservedProperty(obj, it.key(), engine->toScriptValue(it.value()));
+            const ScopedJsValue val(engine->context(), engine->toScriptValue(it.value()));
+            engine->setObservedProperty(obj, it.key(), val);
         }
     }
     return obj;
 }
 
 
-static QScriptValue toScriptValue(ScriptEngine *scriptEngine, const QString &productName,
-                                  const QVariantMap &v, const QString &depName)
+static JSValue toScriptValue(ScriptEngine *scriptEngine, const QString &productName,
+                             const QVariantMap &v, const QString &depName)
 {
     return toScriptValue(scriptEngine, productName, v, depName, {});
 }
 
-QScriptValue dependencyParametersValue(const QString &productName, const QString &dependencyName,
-                                       const QVariantMap &parametersMap, ScriptEngine *engine)
+JSValue dependencyParametersValue(const QString &productName, const QString &dependencyName,
+                                  const QVariantMap &parametersMap, ScriptEngine *engine)
 {
     return toScriptValue(engine, productName, parametersMap, dependencyName);
 }
diff --git a/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.h b/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.h
index 7e4287be6..2fb4634e8 100644
--- a/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.h
+++ b/src/lib/corelib/buildgraph/dependencyparametersscriptvalue.h
@@ -39,15 +39,16 @@
 #ifndef QBS_DEPENDENCYPARAMETERSSCRIPTVALUE_H
 #define QBS_DEPENDENCYPARAMETERSSCRIPTVALUE_H
 
+#include <quickjs.h>
+
 #include <QtCore/qvariant.h>
-#include <QtScript/qscriptvalue.h>
 
 namespace qbs {
 namespace Internal {
 class ScriptEngine;
 
-QScriptValue dependencyParametersValue(const QString &productName, const QString &dependencyName,
-                                       const QVariantMap &parametersMap, ScriptEngine *engine);
+JSValue dependencyParametersValue(const QString &productName, const QString &dependencyName,
+                                  const QVariantMap &parametersMap, ScriptEngine *engine);
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp
index 3f37841d9..01e781a54 100644
--- a/src/lib/corelib/buildgraph/depscanner.cpp
+++ b/src/lib/corelib/buildgraph/depscanner.cpp
@@ -56,7 +56,7 @@
 
 #include <QtCore/qvariant.h>
 
-#include <QtScript/qscriptcontext.h>
+#include <vector>
 
 namespace qbs {
 namespace Internal {
@@ -110,7 +110,7 @@ QStringList PluginDependencyScanner::collectDependencies(Artifact *artifact, Fil
     void *scannerHandle = m_plugin->open(filepath.utf16(), fileTags, ScanForDependenciesFlag);
     if (!scannerHandle)
         return {};
-    forever {
+    for (;;) {
         int flags = 0;
         int length = 0;
         const char *szOutFilePath = m_plugin->next(scannerHandle, &length, &flags);
@@ -158,10 +158,9 @@ UserDependencyScanner::UserDependencyScanner(ResolvedScannerConstPtr scanner,
                                              ScriptEngine *engine)
     : m_scanner(std::move(scanner)),
       m_engine(engine),
+      m_global(engine->context(), JS_NewObjectProto(engine->context(), m_engine->globalObject())),
       m_product(nullptr)
 {
-    m_global = m_engine->newObject();
-    m_global.setPrototype(m_engine->globalObject());
     setupScriptEngineForFile(m_engine, m_scanner->scanScript.fileContext(), m_global,
                              ObserveMode::Disabled); // TODO: QBS-1092
 }
@@ -218,7 +217,7 @@ public:
     }
 };
 
-QStringList UserDependencyScanner::evaluate(const Artifact *artifact,
+QStringList UserDependencyScanner::evaluate(Artifact *artifact,
         const FileResourceBase *fileToScan, const PrivateScriptFunction &script)
 {
     ScriptEngineActiveFlagGuard guard(m_engine);
@@ -229,38 +228,37 @@ QStringList UserDependencyScanner::evaluate(const Artifact *artifact,
                                     m_scanner->module.get(), m_global, true);
     }
 
-    QScriptValueList args;
+    JSValueList args;
     args.reserve(fileToScan ? 4 : 3);
-    args.push_back(m_global.property(StringConstants::projectVar()));
-    args.push_back(m_global.property(StringConstants::productVar()));
+    args.push_back(getJsProperty(m_engine->context(), m_global, StringConstants::projectVar()));
+    args.push_back(getJsProperty(m_engine->context(), m_global, StringConstants::productVar()));
     args.push_back(Transformer::translateFileConfig(m_engine, artifact, m_scanner->module->name));
     if (fileToScan)
-        args.push_back(fileToScan->filePath());
+        args.push_back(makeJsString(m_engine->context(), fileToScan->filePath()));
+    const ScopedJsValueList argsMgr(m_engine->context(), args);
 
-    m_engine->setGlobalObject(m_global);
-    QScriptValue &function = script.scriptFunction;
-    if (!function.isValid() || function.engine() != m_engine) {
-        function = m_engine->evaluate(script.sourceCode());
-        if (Q_UNLIKELY(!function.isFunction()))
-            throw ErrorInfo(Tr::tr("Invalid scan script."), script.location());
-    }
-    QScriptValue result = function.call(QScriptValue(), args);
-    m_engine->setGlobalObject(m_global.prototype());
+    const TemporaryGlobalObjectSetter gos(m_engine, m_global);
+    const JSValue function = script.getFunction(m_engine, Tr::tr("Invalid scan script."));
+    const ScopedJsValue result(
+                m_engine->context(),
+                JS_Call(m_engine->context(), function, m_engine->globalObject(),
+                int(args.size()), args.data()));
     m_engine->clearRequestedProperties();
-    if (Q_UNLIKELY(m_engine->hasErrorOrException(result))) {
-        QString msg = Tr::tr("evaluating scan script: ") + m_engine->lastErrorString(result);
-        const CodeLocation loc = m_engine->lastErrorLocation(result, script.location());
-        m_engine->clearExceptions();
-        throw ErrorInfo(msg, loc);
+    if (JsException ex = m_engine->checkAndClearException(script.location())) {
+        ErrorInfo err = ex.toErrorInfo();
+        err.prepend(Tr::tr("Error evaluating scan script"));
+        throw err;
     }
     QStringList list;
-    if (result.isArray()) {
-        const int count = result.property(StringConstants::lengthProperty()).toInt32();
+    if (JS_IsArray(m_engine->context(), result)) {
+        const int count = getJsIntProperty(m_engine->context(), result,
+                                           StringConstants::lengthProperty());
         list.reserve(count);
         for (qint32 i = 0; i < count; ++i) {
-            QScriptValue item = result.property(i);
-            if (item.isValid() && !item.isUndefined())
-                list.push_back(item.toString());
+            JSValue item = JS_GetPropertyUint32(m_engine->context(), result, i);
+            if (!JS_IsUninitialized(item) && !JS_IsUndefined(item))
+                list.push_back(getJsString(m_engine->context(), item));
+            JS_FreeValue(m_engine->context(), item);
         }
     }
     return list;
diff --git a/src/lib/corelib/buildgraph/depscanner.h b/src/lib/corelib/buildgraph/depscanner.h
index 6b18004f9..51816dbd7 100644
--- a/src/lib/corelib/buildgraph/depscanner.h
+++ b/src/lib/corelib/buildgraph/depscanner.h
@@ -43,11 +43,10 @@
 #include <language/forward_decls.h>
 #include <language/filetags.h>
 #include <language/preparescriptobserver.h>
+#include <tools/scripttools.h>
 
 #include <QtCore/qstringlist.h>
 
-#include <QtScript/qscriptvalue.h>
-
 class ScannerPlugin;
 
 namespace qbs {
@@ -115,11 +114,11 @@ private:
                                        const PropertyMapConstPtr &m2) const override;
     bool cacheIsPerFile() const override { return true; }
 
-    QStringList evaluate(const Artifact *artifact, const FileResourceBase *fileToScan, const PrivateScriptFunction &script);
+    QStringList evaluate(Artifact *artifact, const FileResourceBase *fileToScan, const PrivateScriptFunction &script);
 
     ResolvedScannerConstPtr m_scanner;
     ScriptEngine *m_engine;
-    QScriptValue m_global;
+    ScopedJsValue m_global;
     ResolvedProduct *m_product;
 };
 
diff --git a/src/lib/corelib/buildgraph/environmentscriptrunner.cpp b/src/lib/corelib/buildgraph/environmentscriptrunner.cpp
index 9dafbf296..0fbb3ab19 100644
--- a/src/lib/corelib/buildgraph/environmentscriptrunner.cpp
+++ b/src/lib/corelib/buildgraph/environmentscriptrunner.cpp
@@ -45,11 +45,14 @@
 #include <language/propertymapinternal.h>
 #include <language/resolvedfilecontext.h>
 #include <language/scriptengine.h>
+#include <logging/translator.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
-#include <logging/translator.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
+#include <quickjs.h>
+
 #include <QtCore/qhash.h>
 #include <QtCore/qvariant.h>
 
@@ -123,8 +126,7 @@ void EnvironmentScriptRunner::setupEnvironment()
     const auto hasScript = [this](const ResolvedModuleConstPtr &m) {
         return !getScript(m.get()).sourceCode().isEmpty();
     };
-    const bool hasAnyScripts = std::any_of(m_product->modules.cbegin(), m_product->modules.cend(),
-                                           hasScript);
+    const bool hasAnyScripts = Internal::any_of(m_product->modules, hasScript);
     if (!hasAnyScripts)
         return;
 
@@ -135,7 +137,7 @@ void EnvironmentScriptRunner::setupEnvironment()
     QHash<const ResolvedModule*, QList<const ResolvedModule*> > moduleParents;
     QHash<const ResolvedModule*, QList<const ResolvedModule*> > moduleChildren;
     for (const auto &module : m_product->modules) {
-        for (const QString &moduleName : qAsConst(module->moduleDependencies)) {
+        for (const QString &moduleName : std::as_const(module->moduleDependencies)) {
             const ResolvedModule * const depmod = moduleMap.value(moduleName);
             QBS_ASSERT(depmod, return);
             moduleParents[depmod].push_back(module.get());
@@ -165,38 +167,40 @@ void EnvironmentScriptRunner::setupEnvironment()
             continue;
 
         RulesEvaluationContext::Scope s(m_evalContext);
-        QScriptValue envScriptContext = engine()->newObject();
-        envScriptContext.setPrototype(engine()->globalObject());
+        JSContext * const ctx = engine()->context();
+        ScopedJsValue envScriptContext(ctx, JS_NewObjectProto(ctx, engine()->globalObject()));
         setupScriptEngineForProduct(engine(), m_product, module, envScriptContext, false);
         const QString &productKey = StringConstants::productVar();
         const QString &projectKey = StringConstants::projectVar();
-        m_evalContext->scope().setProperty(productKey, envScriptContext.property(productKey));
-        m_evalContext->scope().setProperty(projectKey, envScriptContext.property(projectKey));
+        setJsProperty(ctx, m_evalContext->scope(), productKey,
+                      getJsProperty(ctx, envScriptContext, productKey));
+        setJsProperty(ctx, m_evalContext->scope(), projectKey,
+                      getJsProperty(ctx, envScriptContext, projectKey));
         if (m_envType == RunEnv) {
-            QScriptValue configArray = engine()->newArray(m_runEnvConfig.size());
+            JSValue configArray = JS_NewArray(ctx);
             for (int i = 0; i < m_runEnvConfig.size(); ++i)
-                configArray.setProperty(i, QScriptValue(m_runEnvConfig.at(i)));
-            m_evalContext->scope().setProperty(QStringLiteral("config"), configArray);
+                JS_SetPropertyUint32(ctx, configArray, i, makeJsString(ctx, m_runEnvConfig.at(i)));
+            JS_SetPropertyStr(ctx, m_evalContext->scope(), "config", configArray);
         }
         setupScriptEngineForFile(engine(), setupScript.fileContext(), m_evalContext->scope(),
                                  ObserveMode::Disabled);
         // TODO: Cache evaluate result
-        QScriptValue fun = engine()->evaluate(setupScript.sourceCode(),
-                                              setupScript.location().filePath(),
-                                              setupScript.location().line());
-        QBS_CHECK(fun.isFunction());
-        const QScriptValueList svArgs = ScriptEngine::argumentList(scriptFunctionArgs,
-                                                                   m_evalContext->scope());
-        const QScriptValue res = fun.call(QScriptValue(), svArgs);
-        engine()->releaseResourcesOfScriptObjects();
-        if (Q_UNLIKELY(engine()->hasErrorOrException(res))) {
+        ScopedJsValue fun(ctx, engine()->evaluate(JsValueOwner::Caller, setupScript.sourceCode(),
+                                                  setupScript.location().filePath(),
+                                                  setupScript.location().line()));
+        QBS_CHECK(JS_IsFunction(ctx, fun));
+        const ScopedJsValueList svArgs = engine()->argumentList(scriptFunctionArgs,
+                                                                m_evalContext->scope());
+        JSValueList argsForFun = svArgs;
+        JS_Call(ctx, fun, engine()->globalObject(), int(argsForFun.size()), argsForFun.data());
+        if (const JsException ex = engine()->checkAndClearException(setupScript.location())) {
             const QString scriptName = m_envType == BuildEnv
                     ? StringConstants::setupBuildEnvironmentProperty()
                     : StringConstants::setupRunEnvironmentProperty();
-            throw ErrorInfo(Tr::tr("Error running %1 script for product '%2': %3")
-                            .arg(scriptName, m_product->fullDisplayName(),
-                                 engine()->lastErrorString(res)),
-                            engine()->lastErrorLocation(res, setupScript.location()));
+            ErrorInfo err = ex.toErrorInfo();
+            err.prepend(Tr::tr("Error running %1 script for product '%2'")
+                        .arg(scriptName, m_product->fullDisplayName()));
+            throw err;
         }
     }
 
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index 9ef51d95f..2b8232a0a 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -67,6 +67,7 @@
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
 #include <tools/settings.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qdir.h>
@@ -134,11 +135,9 @@ void Executor::retrieveSourceFileTimestamp(Artifact *artifact) const
 {
     QBS_CHECK(artifact->artifactType == Artifact::SourceFile);
 
-    if (m_buildOptions.changedFiles().empty())
-        artifact->setTimestamp(recursiveFileTime(artifact->filePath()));
-    else if (m_buildOptions.changedFiles().contains(artifact->filePath()))
+    if (m_buildOptions.changedFiles().contains(artifact->filePath()))
         artifact->setTimestamp(FileTime::currentTime());
-    else if (!artifact->timestamp().isValid())
+    else if (m_buildOptions.changedFiles().empty() || !artifact->timestamp().isValid())
         artifact->setTimestamp(recursiveFileTime(artifact->filePath()));
 
     artifact->timestampRetrieved = true;
@@ -205,7 +204,7 @@ private:
     {
         if (!m_seenProducts.insert(product).second)
             return;
-        for (const ResolvedProductPtr &dependency : qAsConst(product->dependencies))
+        for (const ResolvedProductPtr &dependency : std::as_const(product->dependencies))
             traverse(dependency);
         if (!product->buildData)
             return;
@@ -264,6 +263,7 @@ void Executor::doBuild()
     QBS_CHECK(!m_project->buildData->evaluationContext);
     m_project->buildData->evaluationContext = std::make_shared<RulesEvaluationContext>(m_logger);
     m_evalContext = m_project->buildData->evaluationContext;
+    m_progressObserver->addScriptEngine(m_evalContext->engine());
 
     m_elapsedTimeRules = m_elapsedTimeScanners = m_elapsedTimeInstalling = 0;
     m_evalContext->engine()->enableProfiling(m_buildOptions.logElapsedTime());
@@ -329,7 +329,7 @@ void Executor::updateLeaves(BuildGraphNode *node, NodeSet &seenNodes)
     }
 
     bool isLeaf = true;
-    for (BuildGraphNode *child : qAsConst(node->children)) {
+    for (BuildGraphNode *child : std::as_const(node->children)) {
         if (child->buildState != BuildGraphNode::Built) {
             isLeaf = false;
             updateLeaves(child, seenNodes);
@@ -397,8 +397,10 @@ bool Executor::schedulingBlockedByJobLimit(const BuildGraphNode *node)
         if (currentJobCount == 0)
             continue;
         const auto jobLimitIsExceeded = [currentJobCount, jobPool, this](const Transformer *t) {
-            const int maxJobCount = m_jobLimitsPerProduct.at(t->product().get())
-                    .getLimit(jobPool);
+            const auto it = m_jobLimitsPerProduct.find(t->product().get());
+            if (it == m_jobLimitsPerProduct.cend())
+                return false; // See checkNodeProduct() for why this is possible
+            const int maxJobCount = it->second.getLimit(jobPool);
             return maxJobCount > 0 && currentJobCount >= maxJobCount;
         };
 
@@ -450,7 +452,7 @@ bool Executor::isUpToDate(Artifact *artifact) const
             return false;
     }
 
-    for (FileDependency *fileDependency : qAsConst(artifact->fileDependencies)) {
+    for (FileDependency *fileDependency : std::as_const(artifact->fileDependencies)) {
         if (!fileDependency->timestamp().isValid()) {
             qCDebug(lcUpToDateCheck) << "file dependency doesn't exist"
                                      << fileDependency->filePath();
@@ -477,7 +479,7 @@ bool Executor::mustExecuteTransformer(const TransformerPtr &transformer) const
 
     bool hasAlwaysUpdatedArtifacts = false;
     bool hasUpToDateNotAlwaysUpdatedArtifacts = false;
-    for (Artifact *artifact : qAsConst(transformer->outputs)) {
+    for (Artifact *artifact : std::as_const(transformer->outputs)) {
         if (isUpToDate(artifact)) {
             if (artifact->alwaysUpdated)
                 hasAlwaysUpdatedArtifacts = true;
@@ -566,7 +568,7 @@ void Executor::finishJob(ExecutorJob *job, bool success)
     updateJobCounts(transformer.get(), -1);
     if (success) {
         m_project->buildData->setDirty();
-        for (Artifact * const artifact : qAsConst(transformer->outputs)) {
+        for (Artifact * const artifact : std::as_const(transformer->outputs)) {
             if (artifact->alwaysUpdated) {
                 artifact->setTimestamp(FileTime::currentTime());
                 for (Artifact * const parent : artifact->parentArtifacts())
@@ -619,14 +621,13 @@ void Executor::finishJob(ExecutorJob *job, bool success)
 
 static bool allChildrenBuilt(BuildGraphNode *node)
 {
-    return std::all_of(node->children.cbegin(), node->children.cend(),
-                       std::mem_fn(&BuildGraphNode::isBuilt));
+    return Internal::all_of(node->children, std::mem_fn(&BuildGraphNode::isBuilt));
 }
 
 void Executor::finishNode(BuildGraphNode *leaf)
 {
     leaf->buildState = BuildGraphNode::Built;
-    for (BuildGraphNode * const parent : qAsConst(leaf->parents)) {
+    for (BuildGraphNode * const parent : std::as_const(leaf->parents)) {
         if (parent->buildState != BuildGraphNode::Buildable) {
             qCDebug(lcExec).noquote() << "parent" << parent->toString()
                                       << "build state:" << toString(parent->buildState);
@@ -661,8 +662,8 @@ bool Executor::transformerHasMatchingOutputTags(const TransformerConstPtr &trans
     if (m_activeFileTags.empty())
         return true; // No filtering requested.
 
-    return std::any_of(transformer->outputs.cbegin(), transformer->outputs.cend(),
-                       [this](const Artifact *a) { return artifactHasMatchingOutputTags(a); });
+    return Internal::any_of(transformer->outputs, [this](const Artifact *a) {
+        return artifactHasMatchingOutputTags(a); });
 }
 
 bool Executor::artifactHasMatchingOutputTags(const Artifact *artifact) const
@@ -679,7 +680,7 @@ bool Executor::transformerHasMatchingInputFiles(const TransformerConstPtr &trans
         return false;
     if (transformer->inputs.empty())
         return true;
-    for (const Artifact * const input : qAsConst(transformer->inputs)) {
+    for (const Artifact * const input : std::as_const(transformer->inputs)) {
         const auto files = m_buildOptions.filesToConsider();
         for (const QString &filePath : files) {
             if (input->filePath() == filePath
@@ -695,7 +696,7 @@ bool Executor::transformerHasMatchingInputFiles(const TransformerConstPtr &trans
 void Executor::setupJobLimits()
 {
     Settings settings(m_buildOptions.settingsDirectory());
-    for (const auto &p : qAsConst(m_productsToBuild)) {
+    for (const auto &p : std::as_const(m_productsToBuild)) {
         const Preferences prefs(&settings, p->profile());
         const JobLimits &jobLimitsFromSettings = prefs.jobLimits();
         JobLimits effectiveJobLimits;
@@ -732,7 +733,7 @@ void Executor::setupProgressObserver()
     if (!m_progressObserver)
         return;
     int totalEffort = 1; // For the effort after the last rule application;
-    for (const auto &product : qAsConst(m_productsToBuild)) {
+    for (const auto &product : std::as_const(m_productsToBuild)) {
         QBS_CHECK(product->buildData);
         const auto filtered = filterByType<RuleNode>(product->buildData->allNodes());
         totalEffort += std::distance(filtered.begin(), filtered.end());
@@ -744,7 +745,7 @@ void Executor::doSanityChecks()
 {
     QBS_CHECK(m_project);
     QBS_CHECK(!m_productsToBuild.empty());
-    for (const auto &product : qAsConst(m_productsToBuild)) {
+    for (const auto &product : std::as_const(m_productsToBuild)) {
         QBS_CHECK(product->buildData);
         QBS_CHECK(product->topLevelProject() == m_project.get());
     }
@@ -915,7 +916,7 @@ bool Executor::checkForUnbuiltDependencies(Artifact *artifact)
 {
     bool buildingDependenciesFound = false;
     NodeSet unbuiltDependencies;
-    for (BuildGraphNode * const dependency : qAsConst(artifact->children)) {
+    for (BuildGraphNode * const dependency : std::as_const(artifact->children)) {
         switch (dependency->buildState) {
         case BuildGraphNode::Untouched:
         case BuildGraphNode::Buildable:
@@ -946,7 +947,7 @@ bool Executor::checkForUnbuiltDependencies(Artifact *artifact)
 
 void Executor::potentiallyRunTransformer(const TransformerPtr &transformer)
 {
-    for (Artifact * const output : qAsConst(transformer->outputs)) {
+    for (Artifact * const output : std::as_const(transformer->outputs)) {
         // Rescuing build data can introduce new dependencies, potentially delaying execution of
         // this transformer.
         bool childrenAddedDueToRescue;
@@ -969,7 +970,7 @@ void Executor::potentiallyRunTransformer(const TransformerPtr &transformer)
 
     const bool mustExecute = mustExecuteTransformer(transformer);
     if (mustExecute || m_buildOptions.forceTimestampCheck()) {
-        for (Artifact * const output : qAsConst(transformer->outputs)) {
+        for (Artifact * const output : std::as_const(transformer->outputs)) {
             // Scan all input artifacts. If new dependencies were found during scanning, delay
             // execution of this transformer.
             InputArtifactScanner scanner(output, m_inputArtifactScanContext, m_logger);
@@ -1000,7 +1001,7 @@ void Executor::runTransformer(const TransformerPtr &transformer)
 
     // create the output directories
     if (!m_buildOptions.dryRun()) {
-        for (Artifact * const output : qAsConst(transformer->outputs)) {
+        for (Artifact * const output : std::as_const(transformer->outputs)) {
             QDir outDir = QFileInfo(output->filePath()).absoluteDir();
             if (!outDir.exists() && !outDir.mkpath(StringConstants::dot())) {
                     throw ErrorInfo(tr("Failed to create directory '%1'.")
@@ -1011,7 +1012,7 @@ void Executor::runTransformer(const TransformerPtr &transformer)
 
     QBS_CHECK(!m_availableJobs.empty());
     ExecutorJob *job = m_availableJobs.takeFirst();
-    for (Artifact * const artifact : qAsConst(transformer->outputs))
+    for (Artifact * const artifact : std::as_const(transformer->outputs))
         artifact->buildState = BuildGraphNode::Building;
     m_processingJobs.insert(job, transformer);
     updateJobCounts(transformer.get(), 1);
@@ -1021,7 +1022,7 @@ void Executor::runTransformer(const TransformerPtr &transformer)
 void Executor::finishTransformer(const TransformerPtr &transformer)
 {
     transformer->markedForRerun = false;
-    for (Artifact * const artifact : qAsConst(transformer->outputs)) {
+    for (Artifact * const artifact : std::as_const(transformer->outputs)) {
         possiblyInstallArtifact(artifact);
         finishArtifact(artifact);
     }
@@ -1056,7 +1057,7 @@ void Executor::onJobFinished(const qbs::ErrorInfo &err)
         if (m_evalContext->engine()->isActive()) {
             qCDebug(lcExec) << "Executor job finished while rule execution is pausing. "
                                "Delaying slot execution.";
-            QTimer::singleShot(0, job, [job, err] { job->finished(err); });
+            QTimer::singleShot(0, job, [job, err] { emit job->finished(err); });
             return;
         }
 
@@ -1082,9 +1083,9 @@ void Executor::checkForUnbuiltProducts()
     if (m_buildOptions.executeRulesOnly())
         return;
     std::vector<ResolvedProductPtr> unbuiltProducts;
-    for (const ResolvedProductPtr &product : qAsConst(m_productsToBuild)) {
+    for (const ResolvedProductPtr &product : std::as_const(m_productsToBuild)) {
         bool productBuilt = true;
-        for (BuildGraphNode *rootNode : qAsConst(product->buildData->rootNodes())) {
+        for (BuildGraphNode *rootNode : std::as_const(product->buildData->rootNodes())) {
             if (rootNode->buildState != BuildGraphNode::Built) {
                 productBuilt = false;
                 unbuiltProducts.push_back(product);
@@ -1107,10 +1108,8 @@ void Executor::checkForUnbuiltProducts()
         m_logger.qbsInfo() << Tr::tr("Build done%1.").arg(configString());
     } else {
         m_error.append(Tr::tr("The following products could not be built%1:").arg(configString()));
-        QStringList productNames;
-        std::transform(unbuiltProducts.cbegin(), unbuiltProducts.cend(),
-                       std::back_inserter(productNames),
-                       [](const ResolvedProductConstPtr &p) { return p->fullDisplayName(); });
+        auto productNames = transformed<QStringList>(unbuiltProducts, [](const auto &p) {
+            return p->fullDisplayName(); });
         std::sort(productNames.begin(), productNames.end());
         m_error.append(productNames.join(QLatin1String(", ")));
     }
@@ -1200,11 +1199,11 @@ void Executor::prepareAllNodes()
     for (const ResolvedProductPtr &product : m_allProducts) {
         if (product->enabled) {
             QBS_CHECK(product->buildData);
-            for (BuildGraphNode * const node : qAsConst(product->buildData->allNodes()))
+            for (BuildGraphNode * const node : std::as_const(product->buildData->allNodes()))
                 node->buildState = BuildGraphNode::Untouched;
         }
     }
-    for (const ResolvedProductPtr &product : qAsConst(m_productsToBuild)) {
+    for (const ResolvedProductPtr &product : std::as_const(m_productsToBuild)) {
         QBS_CHECK(product->buildData);
         for (Artifact * const artifact : filterByType<Artifact>(product->buildData->allNodes()))
             prepareArtifact(artifact);
@@ -1230,8 +1229,8 @@ void Executor::syncFileDependencies()
             if (!product->buildData)
                 continue;
             const auto artifactList = filterByType<Artifact>(product->buildData->allNodes());
-            isReferencedByArtifact = std::any_of(artifactList.begin(), artifactList.end(),
-                    [dep](const Artifact *a) { return a->fileDependencies.contains(dep); });
+            isReferencedByArtifact = Internal::any_of(artifactList, [dep](const Artifact *a) {
+                return a->fileDependencies.contains(dep); });
             // TODO: Would it be safe to mark the artifact as "not up to date" here and clear
             //       its list of file dependencies, rather than doing the check again in
             //       isUpToDate()?
@@ -1288,7 +1287,7 @@ void Executor::setupForBuildingSelectedFiles(const BuildGraphNode *node)
  */
 void Executor::prepareReachableNodes()
 {
-    for (BuildGraphNode * const root : qAsConst(m_roots))
+    for (BuildGraphNode * const root : std::as_const(m_roots))
         prepareReachableNodes_impl(root);
 }
 
@@ -1300,7 +1299,7 @@ void Executor::prepareReachableNodes_impl(BuildGraphNode *node)
         return;
 
     node->buildState = BuildGraphNode::Buildable;
-    for (BuildGraphNode *child : qAsConst(node->children))
+    for (BuildGraphNode *child : std::as_const(node->children))
         prepareReachableNodes_impl(child);
 }
 
@@ -1308,7 +1307,7 @@ void Executor::prepareProducts()
 {
     ProductPrioritySetter prioritySetter(m_allProducts);
     prioritySetter.apply();
-    for (const ResolvedProductPtr &product : qAsConst(m_productsToBuild)) {
+    for (const ResolvedProductPtr &product : std::as_const(m_productsToBuild)) {
         EnvironmentScriptRunner(product.get(), m_evalContext.get(), m_project->environment)
                 .setupForBuild();
     }
@@ -1317,7 +1316,7 @@ void Executor::prepareProducts()
 void Executor::setupRootNodes()
 {
     m_roots.clear();
-    for (const ResolvedProductPtr &product : qAsConst(m_productsToBuild))
+    for (const ResolvedProductPtr &product : std::as_const(m_productsToBuild))
         m_roots += product->buildData->rootNodes();
 }
 
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index ad674596a..0c73f599f 100644
--- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
@@ -49,11 +49,12 @@
 
 #include <language/language.h>
 #include <logging/categories.h>
+#include <tools/error.h>
 #include <tools/fileinfo.h>
-#include <tools/scannerpluginmanager.h>
 #include <tools/qbsassert.h>
-#include <tools/error.h>
 #include <tools/qttools.h>
+#include <tools/scannerpluginmanager.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qstringlist.h>
@@ -102,9 +103,14 @@ static void resolveDepencency(const RawScannedDependency &dependency,
     }
 
     // prioritize found artifacts
-    if ((result->file = dependencyInProduct)
-        || (result->file = dependencyInOtherProduct)
-        || (result->file = fileDependencyArtifact)) {
+    if (dependencyInProduct)
+        result->file = dependencyInProduct;
+    else if (dependencyInOtherProduct)
+        result->file = dependencyInOtherProduct;
+    else
+        result->file = fileDependencyArtifact;
+
+    if (result->file) {
         result->filePath = result->file->filePath();
 
         if (result->file == dependencyInOtherProduct && !productOfDependencyIsDependency) {
@@ -157,7 +163,7 @@ void InputArtifactScanner::scan()
     for (Artifact * const dependency : childrenAddedByScanner)
         disconnect(m_artifact, dependency);
 
-    for (Artifact * const inputArtifact : qAsConst(m_artifact->transformer->inputs))
+    for (Artifact * const inputArtifact : std::as_const(m_artifact->transformer->inputs))
         scanForFileDependencies(inputArtifact);
 }
 
@@ -212,9 +218,9 @@ Set<DependencyScanner *> InputArtifactScanner::scannersForArtifact(const Artifac
         InputArtifactScannerContext::DependencyScannerCacheItem &cache = scannerCache[fileTag];
         if (!cache.valid) {
             cache.valid = true;
-            for (ScannerPlugin *scanner : ScannerPluginManager::scannersForFileTag(fileTag)) {
-                cache.scanners.push_back(std::make_shared<PluginDependencyScanner>(scanner));
-            }
+            const auto scanners = ScannerPluginManager::scannersForFileTag(fileTag);
+            transform(scanners, cache.scanners, [](const auto &scanner) {
+                return std::make_shared<PluginDependencyScanner>(scanner); });
             for (const ResolvedScannerConstPtr &scanner : product->scanners) {
                 if (scanner->inputs.contains(fileTag)) {
                     cache.scanners.push_back(
@@ -223,7 +229,7 @@ Set<DependencyScanner *> InputArtifactScanner::scannersForArtifact(const Artifac
                 }
             }
         }
-        for (const DependencyScannerPtr &scanner : qAsConst(cache.scanners))
+        for (const DependencyScannerPtr &scanner : std::as_const(cache.scanners))
             scanners += scanner.get();
     }
     return scanners;
@@ -242,21 +248,16 @@ void InputArtifactScanner::scanForScannerFileDependencies(DependencyScanner *sca
         cache.searchPaths = scanner->collectSearchPaths(inputArtifact);
     }
     qCDebug(lcDepScan) << "include paths (cache" << (cacheHit ? "hit)" : "miss)");
-    for (const QString &s : qAsConst(cache.searchPaths))
+    for (const QString &s : std::as_const(cache.searchPaths))
         qCDebug(lcDepScan) << "    " << s;
 
     const QString &filePathToBeScanned = fileToBeScanned->filePath();
     RawScanResults::ScanData &scanData = m_rawScanResults.findScanData(fileToBeScanned, scanner,
                                                                        m_artifact->properties);
     if (scanData.lastScanTime < fileToBeScanned->timestamp()) {
-        try {
-            qCDebug(lcDepScan) << "scanning" << FileInfo::fileName(filePathToBeScanned);
-            scanWithScannerPlugin(scanner, inputArtifact, fileToBeScanned, &scanData.rawScanResult);
-            scanData.lastScanTime = FileTime::currentTime();
-        } catch (const ErrorInfo &error) {
-            m_logger.printWarning(error);
-            return;
-        }
+        qCDebug(lcDepScan) << "scanning" << FileInfo::fileName(filePathToBeScanned);
+        scanWithScannerPlugin(scanner, inputArtifact, fileToBeScanned, &scanData.rawScanResult);
+        scanData.lastScanTime = FileTime::currentTime();
     }
 
     resolveScanResultDependencies(inputArtifact, scanData.rawScanResult, filesToScan, cache);
@@ -288,7 +289,7 @@ void InputArtifactScanner::resolveScanResultDependencies(const Artifact *inputAr
         }
 
         // try include paths
-        for (const QString &includePath : qAsConst(cache.searchPaths)) {
+        for (const QString &includePath : std::as_const(cache.searchPaths)) {
             resolveDepencency(dependency, inputArtifact->product.get(),
                               &resolvedDependency, includePath);
             if (resolvedDependency.isValid())
diff --git a/src/lib/corelib/buildgraph/jscommandexecutor.cpp b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
index abebc82b8..4d92bf7c3 100644
--- a/src/lib/corelib/buildgraph/jscommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/jscommandexecutor.cpp
@@ -40,7 +40,6 @@
 
 #include "jscommandexecutor.h"
 
-#include "artifact.h"
 #include "buildgraph.h"
 #include "rulecommands.h"
 #include "transformer.h"
@@ -55,7 +54,10 @@
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
 
+#include <quickjs.h>
+
 #include <QtCore/qeventloop.h>
+#include <QtCore/qmutex.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qthread.h>
 #include <QtCore/qtimer.h>
@@ -87,10 +89,11 @@ public:
 
     void cancel(const qbs::ErrorInfo &reason)
     {
+        QMutexLocker locker(&m_resultMutex);
         m_result.success = !reason.hasError();
         m_result.errorMessage = reason.toString();
         if (m_scriptEngine)
-            m_scriptEngine->abortEvaluation();
+            m_scriptEngine->cancel();
         m_cancelled = true;
     }
 
@@ -122,36 +125,30 @@ private:
         m_result.success = true;
         m_result.errorMessage.clear();
         ScriptEngine * const scriptEngine = provideScriptEngine();
-        QScriptValue scope = scriptEngine->newObject();
-        scope.setPrototype(scriptEngine->globalObject());
-        m_scriptEngine->clearRequestedProperties();
+        JSContext * const ctx = scriptEngine->context();
+        const ScopedJsValue scope(ctx, JS_NewObject(scriptEngine->context()));
         setupScriptEngineForFile(scriptEngine,
                                  transformer->rule->prepareScript.fileContext(), scope,
                                  ObserveMode::Enabled);
-
-        QScriptValue importScopeForSourceCode;
+        ScopedJsValue importScopeForSourceCode(ctx, JS_UNDEFINED);
         if (!cmd->scopeName().isEmpty())
-            importScopeForSourceCode = scope.property(cmd->scopeName());
+            importScopeForSourceCode.setValue(getJsProperty(ctx, scope, cmd->scopeName()));
 
         setupScriptEngineForProduct(scriptEngine, transformer->product().get(),
                                     transformer->rule->module.get(), scope, true);
-        transformer->setupInputs(scope);
-        transformer->setupOutputs(scope);
-        transformer->setupExplicitlyDependsOn(scope);
-
-        for (QVariantMap::const_iterator it = cmd->properties().constBegin();
-                it != cmd->properties().constEnd(); ++it) {
-            scope.setProperty(it.key(), scriptEngine->toScriptValue(it.value()));
-        }
-
-        scriptEngine->setGlobalObject(scope);
-        if (importScopeForSourceCode.isObject())
-            scriptEngine->currentContext()->pushScope(importScopeForSourceCode);
-        scriptEngine->evaluate(cmd->sourceCode());
-        scriptEngine->releaseResourcesOfScriptObjects();
-        if (importScopeForSourceCode.isObject())
-            scriptEngine->currentContext()->popScope();
-        scriptEngine->setGlobalObject(scope.prototype());
+        transformer->setupInputs(scriptEngine, scope);
+        transformer->setupOutputs(scriptEngine, scope);
+        transformer->setupExplicitlyDependsOn(scriptEngine, scope);
+
+        for (auto it = cmd->properties().constBegin(); it != cmd->properties().constEnd(); ++it)
+            setJsProperty(ctx, scope, it.key(), scriptEngine->toScriptValue(it.value()));
+
+        const TemporaryGlobalObjectSetter gos(scriptEngine, scope);
+        JSValueList scopeChain;
+        if (JS_IsObject(importScopeForSourceCode))
+            scopeChain << importScopeForSourceCode;
+        const ScopedJsValue res(ctx, scriptEngine->evaluate(JsValueOwner::Caller, cmd->sourceCode(),
+                                                            {}, 1, scopeChain));
         transformer->propertiesRequestedInCommands
                 += scriptEngine->propertiesRequestedInScript();
         unite(transformer->propertiesRequestedFromArtifactInCommands,
@@ -168,14 +165,17 @@ private:
                         std::make_pair(p->uniqueName(), p->exportedModule));
         }
         scriptEngine->clearRequestedProperties();
-        if (scriptEngine->hasUncaughtException()) {
+        if (const JsException exception = scriptEngine->checkAndClearException(cmd->codeLocation())) {
             // ### We don't know the line number of the command's sourceCode property assignment.
-            setError(scriptEngine->uncaughtException().toString(), cmd->codeLocation());
+            setError(exception.message(), cmd->codeLocation());
         }
     }
 
     void setError(const QString &errorMessage, const CodeLocation &codeLocation)
     {
+        QMutexLocker locker(&m_resultMutex);
+        if (m_cancelled)
+            return;
         m_result.success = false;
         m_result.errorMessage = errorMessage;
         m_result.errorLocation = codeLocation;
@@ -185,12 +185,15 @@ private:
     {
         if (!m_scriptEngine)
             m_scriptEngine = ScriptEngine::create(m_logger, EvalContext::JsCommand);
+        else
+            m_scriptEngine->reset();
         return m_scriptEngine.get();
     }
 
     Logger m_logger;
     std::unique_ptr<ScriptEngine> m_scriptEngine;
     JavaScriptCommandResult m_result;
+    QMutex m_resultMutex;
     bool m_running = false;
     bool m_cancelled = false;
 };
@@ -258,11 +261,8 @@ bool JsCommandExecutor::doStart()
 
 void JsCommandExecutor::cancel(const qbs::ErrorInfo &reason)
 {
-    if (m_running && (!dryRun() || command()->ignoreDryRun()))
-        QTimer::singleShot(0, m_objectInThread, [objectInThread = QPointer<JsCommandExecutorThreadObject>{m_objectInThread}, reason] {
-            if (objectInThread)
-                objectInThread->cancel(reason);
-        });
+    if (m_running && (!dryRun() || command()->ignoreDryRun()) && m_objectInThread)
+        m_objectInThread->cancel(reason);
 }
 
 void JsCommandExecutor::onJavaScriptCommandFinished()
diff --git a/src/lib/corelib/buildgraph/nodetreedumper.cpp b/src/lib/corelib/buildgraph/nodetreedumper.cpp
index 8475a46cf..6ad597c70 100644
--- a/src/lib/corelib/buildgraph/nodetreedumper.cpp
+++ b/src/lib/corelib/buildgraph/nodetreedumper.cpp
@@ -120,7 +120,7 @@ bool NodeTreeDumper::doVisit(BuildGraphNode *node, const QString &nodeRepr)
 
 QByteArray NodeTreeDumper::indentation() const
 {
-    return QByteArray(m_indentation, ' ');
+    return {m_indentation, ' '};
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
index 1026586f7..52a8fe75d 100644
--- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
@@ -61,19 +61,19 @@
 #include <tools/shellutils.h>
 #include <tools/stringconstants.h>
 
+#include <quickjs.h>
+
 #include <QtCore/qdir.h>
 #include <QtCore/qtemporaryfile.h>
 #include <QtCore/qtimer.h>
 
-#include <QtScript/qscriptvalue.h>
-
 namespace qbs {
 namespace Internal {
 
 ProcessCommandExecutor::ProcessCommandExecutor(const Logger &logger, QObject *parent)
     : AbstractCommandExecutor(logger, parent)
 {
-    connect(&m_process, static_cast<void (QbsProcess::*)(QProcess::ProcessError)>(&QbsProcess::error),
+    connect(&m_process, &QbsProcess::errorOccurred,
             this, &ProcessCommandExecutor::onProcessError);
     connect(&m_process, static_cast<void (QbsProcess::*)(int)>(&QbsProcess::finished),
             this, &ProcessCommandExecutor::onProcessFinished);
@@ -211,38 +211,43 @@ void ProcessCommandExecutor::cancel(const qbs::ErrorInfo &reason)
 QString ProcessCommandExecutor::filterProcessOutput(const QByteArray &_output,
         const QString &filterFunctionSource)
 {
-    const QString output = QString::fromLocal8Bit(_output);
+    QString output = QString::fromLocal8Bit(_output);
     if (filterFunctionSource.isEmpty())
         return output;
 
-    QScriptValue scope = scriptEngine()->newObject();
-    scope.setPrototype(scriptEngine()->globalObject());
-    for (QVariantMap::const_iterator it = command()->properties().constBegin();
-            it != command()->properties().constEnd(); ++it) {
-        scope.setProperty(it.key(), scriptEngine()->toScriptValue(it.value()));
+    JSContext * const ctx = scriptEngine()->context();
+    const ScopedJsValue scope(ctx, JS_NewObjectProto(ctx, scriptEngine()->globalObject()));
+    for (auto it = command()->properties().constBegin();
+         it != command()->properties().constEnd(); ++it) {
+        setJsProperty(ctx, scope, it.key(), scriptEngine()->toScriptValue(it.value()));
     }
 
-    TemporaryGlobalObjectSetter tgos(scope);
-    QScriptValue filterFunction = scriptEngine()->evaluate(QLatin1String("var f = ")
-                                                           + filterFunctionSource
-                                                           + QLatin1String("; f"));
-    if (!filterFunction.isFunction()) {
+    TemporaryGlobalObjectSetter tgos(scriptEngine(), scope);
+    const ScopedJsValue filterFunction(
+                ctx,
+                scriptEngine()->evaluate(JsValueOwner::Caller,
+                                         QLatin1String("var f = ")
+                                         + filterFunctionSource
+                                         + QLatin1String("; f")));
+    if (!JS_IsFunction(scriptEngine()->context(), filterFunction)) {
         logger().printWarning(ErrorInfo(Tr::tr("Error in filter function: %1.\n%2")
-                         .arg(filterFunctionSource, filterFunction.toString())));
+                         .arg(filterFunctionSource,
+                              getJsString(scriptEngine()->context(), filterFunction))));
         return output;
     }
 
-    QScriptValue outputArg = scriptEngine()->newArray(1);
-    outputArg.setProperty(0, scriptEngine()->toScriptValue(output));
-    QScriptValue filteredOutput = filterFunction.call(scriptEngine()->undefinedValue(), outputArg);
-    if (scriptEngine()->hasErrorOrException(filteredOutput)) {
-        logger().printWarning(ErrorInfo(Tr::tr("Error when calling output filter function: %1")
-                         .arg(scriptEngine()->lastErrorString(filteredOutput)),
-                                        scriptEngine()->lastErrorLocation(filteredOutput)));
+    const ScopedJsValue outputArg(ctx, scriptEngine()->toScriptValue(output));
+    JSValue outputArgForCall = outputArg;
+    const ScopedJsValue filteredOutput(
+                ctx, JS_Call(ctx, filterFunction, JS_UNDEFINED, 1, &outputArgForCall));
+    if (const JsException ex = scriptEngine()->checkAndClearException({})) {
+        ErrorInfo err = ex.toErrorInfo();
+        err.prepend(Tr::tr("Error when calling output filter function"));
+        logger().printWarning(err);
         return output;
     }
 
-    return filteredOutput.toString();
+    return getJsString(ctx, filteredOutput);
 }
 
 static QProcess::ProcessError saveToFile(const QString &filePath, const QByteArray &content)
@@ -286,7 +291,7 @@ void ProcessCommandExecutor::getProcessOutput(bool stdOut, ProcessResult &result
     } else {
         if (!contentString.isEmpty() && contentString.endsWith(QLatin1Char('\n')))
             contentString.chop(1);
-        *target = contentString.split(QLatin1Char('\n'), QBS_SKIP_EMPTY_PARTS);
+        *target = contentString.split(QLatin1Char('\n'), Qt::SkipEmptyParts);
     }
 }
 
@@ -393,7 +398,7 @@ void ProcessCommandExecutor::doReportCommandDescription(const QString &productNa
         if (m_echoMode == CommandEchoModeCommandLineWithEnvironment) {
             QStringList keys = m_commandEnvironment.keys();
             keys.sort();
-            for (const QString &key : qAsConst(keys))
+            for (const QString &key : std::as_const(keys))
                 fullInvocation += environmentVariableString(key, m_commandEnvironment.value(key));
         }
         fullInvocation += m_shellInvocation;
diff --git a/src/lib/corelib/buildgraph/productbuilddata.cpp b/src/lib/corelib/buildgraph/productbuilddata.cpp
index db51b2b9f..6ec01a1ce 100644
--- a/src/lib/corelib/buildgraph/productbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/productbuilddata.cpp
@@ -102,7 +102,6 @@ void ProductBuildData::addFileTagToArtifact(Artifact *artifact, const FileTag &t
 
 ArtifactSetByFileTag ProductBuildData::artifactsByFileTag() const
 {
-    std::lock_guard<std::mutex> l(m_artifactsMapMutex);
     return m_artifactsByFileTag;
 }
 
@@ -124,7 +123,6 @@ void ProductBuildData::addRescuableArtifactData(const QString &filePath,
 
 bool ProductBuildData::checkAndSetJsArtifactsMapUpToDateFlag()
 {
-    std::lock_guard<std::mutex> l(m_artifactsMapMutex);
     if (!m_jsArtifactsMapUpToDate) {
         m_jsArtifactsMapUpToDate = true;
         return false;
diff --git a/src/lib/corelib/buildgraph/productbuilddata.h b/src/lib/corelib/buildgraph/productbuilddata.h
index a7660af27..f6c531713 100644
--- a/src/lib/corelib/buildgraph/productbuilddata.h
+++ b/src/lib/corelib/buildgraph/productbuilddata.h
@@ -86,6 +86,9 @@ public:
     void setBuildPriority(unsigned int prio) { m_buildPriority = prio; }
 
     bool checkAndSetJsArtifactsMapUpToDateFlag();
+    std::unique_lock<std::mutex> getArtifactsMapLock() {
+        return std::unique_lock(m_artifactsMapMutex);
+    }
 
     template<PersistentPool::OpType opType> void completeSerializationOp(PersistentPool &pool)
     {
diff --git a/src/lib/corelib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp
index 80a76d7f5..f757c8a85 100644
--- a/src/lib/corelib/buildgraph/productinstaller.cpp
+++ b/src/lib/corelib/buildgraph/productinstaller.cpp
@@ -96,7 +96,7 @@ void ProductInstaller::install()
         removeInstallRoot();
 
     QList<const Artifact *> artifactsToInstall;
-    for (const auto &product : qAsConst(m_products)) {
+    for (const auto &product : std::as_const(m_products)) {
         QBS_CHECK(product->buildData);
         for (const Artifact *artifact : filterByType<Artifact>(product->buildData->allNodes())) {
             if (artifact->properties->qbsPropertyValue(StringConstants::installProperty()).toBool())
@@ -105,7 +105,7 @@ void ProductInstaller::install()
     }
     m_observer->initialize(Tr::tr("Installing"), artifactsToInstall.size());
 
-    for (const Artifact * const a : qAsConst(artifactsToInstall)) {
+    for (const Artifact * const a : std::as_const(artifactsToInstall)) {
         copyFile(a);
         m_observer->incrementProgressValue();
     }
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp
index 0ac6b1537..36ac75331 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp
@@ -157,7 +157,7 @@ void ProjectBuildData::insertFileDependency(FileDependency *dependency)
 static void disconnectArtifactChildren(Artifact *artifact)
 {
     qCDebug(lcBuildGraph) << "disconnect children of" << relativeArtifactFileName(artifact);
-    for (BuildGraphNode * const child : qAsConst(artifact->children))
+    for (BuildGraphNode * const child : std::as_const(artifact->children))
         child->parents.remove(artifact);
     artifact->children.clear();
     artifact->childrenAddedByScanner.clear();
@@ -166,7 +166,7 @@ static void disconnectArtifactChildren(Artifact *artifact)
 static void disconnectArtifactParents(Artifact *artifact)
 {
     qCDebug(lcBuildGraph) << "disconnect parents of" << relativeArtifactFileName(artifact);
-    for (BuildGraphNode * const parent : qAsConst(artifact->parents)) {
+    for (BuildGraphNode * const parent : std::as_const(artifact->parents)) {
         parent->children.remove(artifact);
         if (parent->type() != BuildGraphNode::ArtifactNodeType)
             continue;
@@ -240,7 +240,6 @@ void ProjectBuildData::removeArtifact(Artifact *artifact,
         artifact->transformer->outputs.remove(artifact);
     if (removeFromProduct)
         artifact->product->buildData->removeArtifact(artifact);
-    m_isDirty = false;
 }
 
 void ProjectBuildData::setDirty()
@@ -258,7 +257,7 @@ void ProjectBuildData::setClean()
 void ProjectBuildData::load(PersistentPool &pool)
 {
     serializationOp<PersistentPool::Load>(pool);
-    for (FileDependency * const dep : qAsConst(fileDependencies))
+    for (FileDependency * const dep : std::as_const(fileDependencies))
         insertIntoLookupTable(dep);
     m_isDirty = false;
 }
@@ -338,7 +337,7 @@ private:
     {
         if (!m_rulesOnPath.insert(rule.get()).second) {
             QString pathstr;
-            for (const Rule *r : qAsConst(m_rulePath)) {
+            for (const Rule *r : std::as_const(m_rulePath)) {
                 pathstr += QLatin1Char('\n') + r->toString() + QLatin1Char('\t')
                         + r->prepareScript.location().toString();
             }
@@ -395,7 +394,7 @@ void BuildDataResolver::resolveProductBuildData(const ResolvedProductPtr &produc
     product->buildData = std::make_unique<ProductBuildData>();
     ArtifactSetByFileTag artifactsPerFileTag;
 
-    for (const auto &dependency : qAsConst(product->dependencies)) {
+    for (const auto &dependency : std::as_const(product->dependencies)) {
         QBS_CHECK(dependency->enabled);
         resolveProductBuildData(dependency);
     }
@@ -474,7 +473,7 @@ ScriptEngine *BuildDataResolver::engine() const
     return evalContext()->engine();
 }
 
-QScriptValue BuildDataResolver::scope() const
+JSValue BuildDataResolver::scope() const
 {
     return evalContext()->scope();
 }
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.h b/src/lib/corelib/buildgraph/projectbuilddata.h
index 930344435..416651912 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.h
+++ b/src/lib/corelib/buildgraph/projectbuilddata.h
@@ -47,11 +47,11 @@
 #include <tools/set.h>
 #include <tools/qttools.h>
 
+#include <quickjs.h>
+
 #include <QtCore/qlist.h>
 #include <QtCore/qstring.h>
 
-#include <QtScript/qscriptvalue.h>
-
 #include <unordered_map>
 
 namespace qbs {
@@ -126,7 +126,7 @@ private:
 
     RulesEvaluationContextPtr evalContext() const;
     ScriptEngine *engine() const;
-    QScriptValue scope() const;
+    JSValue scope() const;
 
     TopLevelProjectPtr m_project;
     Logger m_logger;
diff --git a/src/lib/corelib/buildgraph/qtmocscanner.cpp b/src/lib/corelib/buildgraph/qtmocscanner.cpp
index 4e054a636..7df84e52c 100644
--- a/src/lib/corelib/buildgraph/qtmocscanner.cpp
+++ b/src/lib/corelib/buildgraph/qtmocscanner.cpp
@@ -54,9 +54,6 @@
 
 #include <QtCore/qdebug.h>
 
-#include <QtScript/qscriptcontext.h>
-#include <QtScript/qscriptengine.h>
-
 namespace qbs {
 namespace Internal {
 
@@ -102,21 +99,23 @@ private:
 
 static QString qtMocScannerJsName() { return QStringLiteral("QtMocScanner"); }
 
-QtMocScanner::QtMocScanner(const ResolvedProductPtr &product, QScriptValue targetScriptValue)
-    : m_tags(*commonFileTags())
+QtMocScanner::QtMocScanner(const ResolvedProductPtr &product, ScriptEngine *engine, JSValue targetScriptValue)
+    : m_engine(engine)
+    , m_tags(*commonFileTags())
     , m_product(product)
-    , m_targetScriptValue(targetScriptValue)
+    , m_targetScriptValue(JS_DupValue(engine->context(), targetScriptValue))
 {
-    const auto engine = static_cast<ScriptEngine *>(targetScriptValue.engine());
-    QScriptValue scannerObj = engine->newObject();
-    targetScriptValue.setProperty(qtMocScannerJsName(), scannerObj);
-    QScriptValue applyFunction = engine->newFunction(&js_apply, this);
-    scannerObj.setProperty(QStringLiteral("apply"), applyFunction);
+    JSValue scannerObj = JS_NewObjectClass(engine->context(), engine->dataWithPtrClass());
+    attachPointerTo(scannerObj, this);
+    setJsProperty(engine->context(), targetScriptValue, qtMocScannerJsName(), scannerObj);
+    JSValue applyFunction = JS_NewCFunction(engine->context(), &js_apply, "QtMocScanner", 1);
+    setJsProperty(engine->context(), scannerObj, QStringLiteral("apply"), applyFunction);
 }
 
 QtMocScanner::~QtMocScanner()
 {
-    m_targetScriptValue.setProperty(qtMocScannerJsName(), QScriptValue());
+    setJsProperty(m_engine->context(), m_targetScriptValue, qtMocScannerJsName(), JS_UNDEFINED);
+    JS_FreeValue(m_engine->context(), m_targetScriptValue);
 }
 
 static RawScanResult runScanner(ScannerPlugin *scanner, const Artifact *artifact)
@@ -153,7 +152,7 @@ static RawScanResult runScanner(ScannerPlugin *scanner, const Artifact *artifact
         }
 
         QString baseDirOfInFilePath = artifact->dirPath();
-        forever {
+        for (;;) {
             int flags = 0;
             const char *szOutFilePath = scanner->next(opaq, &length, &flags);
             if (szOutFilePath == nullptr)
@@ -199,22 +198,24 @@ void QtMocScanner::findIncludedMocCppFiles()
     }
 }
 
-QScriptValue QtMocScanner::js_apply(QScriptContext *ctx, QScriptEngine *engine,
-                                    QtMocScanner *that)
+JSValue QtMocScanner::js_apply(JSContext *ctx, JSValue this_val, int argc, JSValue *argv)
 {
-    QScriptValue input = ctx->argument(0);
-    return that->apply(engine, attachedPointer<Artifact>(input));
+    if (argc < 1)
+        return throwError(ctx, Tr::tr("QtMocScanner.apply() requires an argument."));
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const auto scanner = attachedPointer<QtMocScanner>(this_val, engine->dataWithPtrClass());
+    return scanner->apply(engine, attachedPointer<Artifact>(argv[0], engine->dataWithPtrClass()));
 }
 
-static QScriptValue scannerCountError(QScriptEngine *engine, size_t scannerCount,
-        const QString &fileTag)
+static JSValue scannerCountError(ScriptEngine *engine, size_t scannerCount,
+                                 const QString &fileTag)
 {
-    return engine->currentContext()->throwError(
-                Tr::tr("There are %1 scanners for the file tag %2. "
-                       "Expected is exactly one.").arg(scannerCount).arg(fileTag));
+    return throwError(engine->context(),
+                      Tr::tr("There are %1 scanners for the file tag %2. "
+                             "Expected is exactly one.").arg(scannerCount).arg(fileTag));
 }
 
-QScriptValue QtMocScanner::apply(QScriptEngine *engine, const Artifact *artifact)
+JSValue QtMocScanner::apply(ScriptEngine *engine, const Artifact *artifact)
 {
     if (!m_cppScanner) {
         auto scanners = ScannerPluginManager::scannersForFileTag(m_tags.cpp);
@@ -266,11 +267,13 @@ QScriptValue QtMocScanner::apply(QScriptEngine *engine, const Artifact *artifact
                           << "mustCompile:" << mustCompile
                           << "hasPluginMetaDataMacro:" << hasPluginMetaDataMacro;
 
-    QScriptValue obj = engine->newObject();
-    obj.setProperty(QStringLiteral("hasQObjectMacro"), hasQObjectMacro);
-    obj.setProperty(QStringLiteral("mustCompile"), mustCompile);
-    obj.setProperty(QStringLiteral("hasPluginMetaDataMacro"), hasPluginMetaDataMacro);
-    static_cast<ScriptEngine *>(engine)->setUsesIo();
+    JSValue obj = engine->newObject();
+    JSContext * const ctx = m_engine->context();
+    setJsProperty(ctx, obj, QStringLiteral("hasQObjectMacro"), JS_NewBool(ctx, hasQObjectMacro));
+    setJsProperty(ctx, obj, QStringLiteral("mustCompile"), JS_NewBool(ctx, mustCompile));
+    setJsProperty(ctx, obj, QStringLiteral("hasPluginMetaDataMacro"),
+                  JS_NewBool(ctx, hasPluginMetaDataMacro));
+    engine->setUsesIo();
     return obj;
 }
 
diff --git a/src/lib/corelib/buildgraph/qtmocscanner.h b/src/lib/corelib/buildgraph/qtmocscanner.h
index 6455383f3..2e2a00007 100644
--- a/src/lib/corelib/buildgraph/qtmocscanner.h
+++ b/src/lib/corelib/buildgraph/qtmocscanner.h
@@ -41,12 +41,11 @@
 #define QBS_QTMOCSCANNER_H
 
 #include <language/language.h>
+#include <quickjs.h>
 
 #include <QtCore/qhash.h>
 #include <QtCore/qstring.h>
 
-#include <QtScript/qscriptvalue.h>
-
 QT_BEGIN_NAMESPACE
 class QScriptContext;
 QT_END_NAMESPACE
@@ -55,6 +54,7 @@ class ScannerPlugin;
 
 namespace qbs {
 namespace Internal {
+class ScriptEngine;
 
 class Artifact;
 struct CommonFileTags;
@@ -62,17 +62,19 @@ struct CommonFileTags;
 class QtMocScanner
 {
 public:
-    explicit QtMocScanner(const ResolvedProductPtr &product, QScriptValue targetScriptValue);
+    explicit QtMocScanner(const ResolvedProductPtr &product, ScriptEngine *engine,
+                          JSValue targetScriptValue);
     ~QtMocScanner();
 
 private:
     void findIncludedMocCppFiles();
-    static QScriptValue js_apply(QScriptContext *ctx, QScriptEngine *engine, QtMocScanner *that);
-    QScriptValue apply(QScriptEngine *engine, const Artifact *artifact);
+    static JSValue js_apply(JSContext *ctx, JSValue this_val, int argc, JSValue *argv);
+    JSValue apply(ScriptEngine *engine, const Artifact *artifact);
 
+    ScriptEngine * const m_engine;
     const CommonFileTags &m_tags;
     const ResolvedProductPtr &m_product;
-    QScriptValue m_targetScriptValue;
+    JSValue m_targetScriptValue;
     QHash<QString, QString> m_includedMocCppFiles;
     ScannerPlugin *m_cppScanner = nullptr;
 };
diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp
index 9eed7c715..be90c2fd5 100644
--- a/src/lib/corelib/buildgraph/rulecommands.cpp
+++ b/src/lib/corelib/buildgraph/rulecommands.cpp
@@ -39,6 +39,8 @@
 ****************************************************************************/
 
 #include "rulecommands.h"
+
+#include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/error.h>
 #include <tools/fileinfo.h>
@@ -48,9 +50,6 @@
 
 #include <QtCore/qfile.h>
 
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalueiterator.h>
-
 namespace qbs {
 namespace Internal {
 
@@ -79,10 +78,11 @@ static QString stdoutFilterFunctionProperty() { return QStringLiteral("stdoutFil
 static QString timeoutProperty() { return QStringLiteral("timeout"); }
 static QString workingDirProperty() { return QStringLiteral("workingDirectory"); }
 
-static QString invokedSourceCode(const QScriptValue &codeOrFunction)
+static QString invokedSourceCode(JSContext *ctx, const JSValue &codeOrFunction)
 {
-    const QString &code = codeOrFunction.toString();
-    return codeOrFunction.isFunction() ? QStringLiteral("(") + code + QStringLiteral(")()") : code;
+    const QString &code = getJsString(ctx, codeOrFunction);
+    return JS_IsFunction(ctx, codeOrFunction)
+            ? QStringLiteral("(") + code + QStringLiteral(")()") : code;
 }
 
 AbstractCommand::AbstractCommand()
@@ -99,28 +99,25 @@ AbstractCommand::~AbstractCommand() = default;
 
 bool AbstractCommand::equals(const AbstractCommand *other) const
 {
-    return type() == other->type()
-            && m_description == other->m_description
-            && m_extendedDescription == other->m_extendedDescription
-            && m_highlight == other->m_highlight
-            && m_ignoreDryRun == other->m_ignoreDryRun
-            && m_silent == other->m_silent
-            && m_jobPool == other->m_jobPool
-            && m_timeout == other->m_timeout
-            && m_properties == other->m_properties;
-}
-
-void AbstractCommand::fillFromScriptValue(const QScriptValue *scriptValue, const CodeLocation &codeLocation)
-{
-    m_description = scriptValue->property(StringConstants::descriptionProperty()).toString();
-    m_extendedDescription = scriptValue->property(extendedDescriptionProperty()).toString();
-    m_highlight = scriptValue->property(highlightProperty()).toString();
-    m_ignoreDryRun = scriptValue->property(ignoreDryRunProperty()).toBool();
-    m_silent = scriptValue->property(silentProperty()).toBool();
-    m_jobPool = scriptValue->property(StringConstants::jobPoolProperty()).toString();
-    const auto timeoutScriptValue = scriptValue->property(timeoutProperty());
-    if (!timeoutScriptValue.isUndefined() && !timeoutScriptValue.isNull())
-        m_timeout = timeoutScriptValue.toInt32();
+    return type() == other->type() && m_description == other->m_description
+           && m_extendedDescription == other->m_extendedDescription
+           && m_highlight == other->m_highlight && m_ignoreDryRun == other->m_ignoreDryRun
+           && m_silent == other->m_silent && m_jobPool == other->m_jobPool
+           && m_timeout == other->m_timeout && qVariantMapsEqual(m_properties, other->m_properties);
+}
+
+void AbstractCommand::fillFromScriptValue(JSContext *ctx, const JSValue *scriptValue,
+                                          const CodeLocation &codeLocation)
+{
+    m_description = getJsStringProperty(ctx, *scriptValue, StringConstants::descriptionProperty());
+    m_extendedDescription = getJsStringProperty(ctx, *scriptValue, extendedDescriptionProperty());
+    m_highlight = getJsStringProperty(ctx, *scriptValue, highlightProperty());
+    m_ignoreDryRun = getJsBoolProperty(ctx, *scriptValue, ignoreDryRunProperty());
+    m_silent = getJsBoolProperty(ctx, *scriptValue, silentProperty());
+    m_jobPool = getJsStringProperty(ctx, *scriptValue, StringConstants::jobPoolProperty());
+    const auto timeoutScriptValue = getJsProperty(ctx, *scriptValue, timeoutProperty());
+    if (!JS_IsUndefined(timeoutScriptValue) && !JS_IsNull(timeoutScriptValue))
+        m_timeout = JS_VALUE_GET_INT(timeoutScriptValue);
     m_codeLocation = codeLocation;
 
     m_predefinedProperties
@@ -138,6 +135,11 @@ QString AbstractCommand::fullDescription(const QString &productName) const
     return description() + QLatin1String(" [") + productName + QLatin1Char(']');
 }
 
+QString AbstractCommand::descriptionForCancelMessage(const QString &productName) const
+{
+    return fullDescription(productName);
+}
+
 void AbstractCommand::load(PersistentPool &pool)
 {
     serializationOp<PersistentPool::Load>(pool);
@@ -148,94 +150,95 @@ void AbstractCommand::store(PersistentPool &pool)
     serializationOp<PersistentPool::Store>(pool);
 }
 
-void AbstractCommand::applyCommandProperties(const QScriptValue *scriptValue)
+void AbstractCommand::applyCommandProperties(JSContext *ctx, const JSValue *scriptValue)
 {
-    QScriptValueIterator it(*scriptValue);
-    while (it.hasNext()) {
-        it.next();
-        if (m_predefinedProperties.contains(it.name()))
-            continue;
-        const QVariant value = it.value().toVariant();
-        if (QMetaType::Type(value.userType()) == QMetaType::QObjectStar
-                || it.value().scriptClass()
-                || it.value().data().isValid()) {
+    handleJsProperties(ctx, *scriptValue, [this, ctx](const JSAtom &prop, const JSPropertyDescriptor &desc) {
+        const QString name = getJsString(ctx, prop);
+        if (m_predefinedProperties.contains(name))
+            return;
+        // TODO: Use script class for command objects, don't allow setting random properties
+        if (!isSimpleValue(desc.value)) {
             throw ErrorInfo(Tr::tr("Property '%1' has a type unsuitable for storing in a command "
-                                   "object.").arg(it.name()), m_codeLocation);
+                                   "object.").arg(name), m_codeLocation);
         }
-        m_properties.insert(it.name(), value);
-    }
-}
-
-static QScriptValue js_CommandBase(QScriptContext *context, QScriptEngine *engine)
-{
-    QScriptValue cmd = context->thisObject();
-    QBS_ASSERT(context->isCalledAsConstructor(), cmd = engine->newObject());
-    cmd.setProperty(StringConstants::descriptionProperty(),
-                    engine->toScriptValue(AbstractCommand::defaultDescription()));
-    cmd.setProperty(extendedDescriptionProperty(),
-                    engine->toScriptValue(AbstractCommand::defaultExtendedDescription()));
-    cmd.setProperty(highlightProperty(),
-                    engine->toScriptValue(AbstractCommand::defaultHighLight()));
-    cmd.setProperty(ignoreDryRunProperty(),
-                    engine->toScriptValue(AbstractCommand::defaultIgnoreDryRun()));
-    cmd.setProperty(silentProperty(),
-                    engine->toScriptValue(AbstractCommand::defaultIsSilent()));
-    cmd.setProperty(timeoutProperty(),
-                    engine->toScriptValue(AbstractCommand::defaultTimeout()));
+        m_properties.insert(name, getJsVariant(ctx, desc.value));
+    });
+}
+
+static JSValue js_CommandBase(JSContext *ctx)
+{
+    const JSValue cmd = JS_NewObject(ctx);
+    setJsProperty(ctx, cmd, StringConstants::descriptionProperty(),
+                  makeJsString(ctx, AbstractCommand::defaultDescription()));
+    setJsProperty(ctx, cmd, extendedDescriptionProperty(),
+                  makeJsString(ctx, AbstractCommand::defaultExtendedDescription()));
+    setJsProperty(ctx, cmd, highlightProperty(),
+                  makeJsString(ctx, AbstractCommand::defaultHighLight()));
+    setJsProperty(ctx, cmd, ignoreDryRunProperty(),
+                  JS_NewBool(ctx, AbstractCommand::defaultIgnoreDryRun()));
+    setJsProperty(ctx, cmd, silentProperty(),
+                  JS_NewBool(ctx, AbstractCommand::defaultIsSilent()));
+    setJsProperty(ctx, cmd, timeoutProperty(),
+                  JS_NewInt32(ctx, AbstractCommand::defaultTimeout()));
     return cmd;
 }
 
-static QScriptValue js_Command(QScriptContext *context, QScriptEngine *engine)
+static JSValue js_Command(JSContext *ctx, JSValueConst, JSValueConst,
+                          int argc, JSValueConst *argv, int)
 {
-    if (Q_UNLIKELY(!context->isCalledAsConstructor()))
-        return context->throwError(Tr::tr("Command constructor called without new."));
-
     static ProcessCommandPtr commandPrototype = ProcessCommand::create();
-
-    QScriptValue program = context->argument(0);
-    if (program.isUndefined())
-        program = engine->toScriptValue(commandPrototype->program());
-    QScriptValue arguments = context->argument(1);
-    if (arguments.isUndefined())
-        arguments = engine->toScriptValue(commandPrototype->arguments());
-    QScriptValue cmd = js_CommandBase(context, engine);
-    cmd.setProperty(StringConstants::classNameProperty(),
-                    engine->toScriptValue(StringConstants::commandType()));
-    cmd.setProperty(programProperty(), program);
-    cmd.setProperty(argumentsProperty(), arguments);
-    cmd.setProperty(workingDirProperty(),
-                    engine->toScriptValue(commandPrototype->workingDir()));
-    cmd.setProperty(maxExitCodeProperty(),
-                    engine->toScriptValue(commandPrototype->maxExitCode()));
-    cmd.setProperty(stdoutFilterFunctionProperty(),
-                    engine->toScriptValue(commandPrototype->stdoutFilterFunction()));
-    cmd.setProperty(stderrFilterFunctionProperty(),
-                    engine->toScriptValue(commandPrototype->stderrFilterFunction()));
-    cmd.setProperty(responseFileThresholdProperty(),
-                    engine->toScriptValue(commandPrototype->responseFileThreshold()));
-    cmd.setProperty(responseFileArgumentIndexProperty(),
-                    engine->toScriptValue(commandPrototype->responseFileArgumentIndex()));
-    cmd.setProperty(responseFileUsagePrefixProperty(),
-                    engine->toScriptValue(commandPrototype->responseFileUsagePrefix()));
-    cmd.setProperty(responseFileSeparatorProperty(),
-                    engine->toScriptValue(commandPrototype->responseFileSeparator()));
-    cmd.setProperty(stdoutFilePathProperty(),
-                    engine->toScriptValue(commandPrototype->stdoutFilePath()));
-    cmd.setProperty(stderrFilePathProperty(),
-                    engine->toScriptValue(commandPrototype->stderrFilePath()));
-    cmd.setProperty(environmentProperty(),
-                    engine->toScriptValue(commandPrototype->environment().toStringList()));
-    cmd.setProperty(ignoreDryRunProperty(),
-                    engine->toScriptValue(commandPrototype->ignoreDryRun()));
+    JSValue program = JS_UNDEFINED;
+    if (argc > 0)
+        program = JS_DupValue(ctx, argv[0]);
+    if (JS_IsUndefined(program))
+        program = makeJsString(ctx, commandPrototype->program());
+    JSValue arguments = JS_UNDEFINED;
+    if (argc > 1)
+        arguments = JS_DupValue(ctx, argv[1]);
+    if (JS_IsUndefined(arguments))
+        arguments = makeJsStringList(ctx, commandPrototype->arguments());
+    if (JS_IsString(arguments)) {
+        JSValue args = JS_NewArray(ctx);
+        JS_SetPropertyUint32(ctx, args, 0, arguments);
+        arguments = args;
+    }
+    JSValue cmd = js_CommandBase(ctx);
+    setJsProperty(ctx, cmd, StringConstants::classNameProperty(),
+                  makeJsString(ctx, StringConstants::commandType()));
+    setJsProperty(ctx, cmd, programProperty(), program);
+    setJsProperty(ctx, cmd, argumentsProperty(), arguments);
+    setJsProperty(ctx, cmd, workingDirProperty(),
+                  makeJsString(ctx, commandPrototype->workingDir()));
+    setJsProperty(ctx, cmd, maxExitCodeProperty(),
+                  JS_NewInt32(ctx, commandPrototype->maxExitCode()));
+    setJsProperty(ctx, cmd, stdoutFilterFunctionProperty(),
+                  makeJsString(ctx, commandPrototype->stdoutFilterFunction()));
+    setJsProperty(ctx, cmd, stderrFilterFunctionProperty(),
+                  makeJsString(ctx, commandPrototype->stderrFilterFunction()));
+    setJsProperty(ctx, cmd, responseFileThresholdProperty(),
+                  JS_NewInt32(ctx, commandPrototype->responseFileThreshold()));
+    setJsProperty(ctx, cmd, responseFileArgumentIndexProperty(),
+                  JS_NewInt32(ctx, commandPrototype->responseFileArgumentIndex()));
+    setJsProperty(ctx, cmd, responseFileUsagePrefixProperty(),
+                  makeJsString(ctx, commandPrototype->responseFileUsagePrefix()));
+    setJsProperty(ctx, cmd, responseFileSeparatorProperty(),
+                  makeJsString(ctx, commandPrototype->responseFileSeparator()));
+    setJsProperty(ctx, cmd, stdoutFilePathProperty(),
+                  makeJsString(ctx, commandPrototype->stdoutFilePath()));
+    setJsProperty(ctx, cmd, stderrFilePathProperty(),
+                  makeJsString(ctx, commandPrototype->stderrFilePath()));
+    setJsProperty(ctx, cmd, environmentProperty(),
+                  makeJsStringList(ctx, commandPrototype->environment().toStringList()));
+    setJsProperty(ctx, cmd, ignoreDryRunProperty(),
+                  JS_NewBool(ctx, commandPrototype->ignoreDryRun()));
     return cmd;
 }
 
 
-void ProcessCommand::setupForJavaScript(QScriptValue targetObject)
+void ProcessCommand::setupForJavaScript(ScriptEngine *engine, JSValue targetObject)
 {
-    QBS_CHECK(targetObject.isObject());
-    QScriptValue ctor = targetObject.engine()->newFunction(js_Command, 2);
-    targetObject.setProperty(StringConstants::commandType(), ctor);
+    engine->registerClass(StringConstants::commandType().toUtf8().constData(), js_Command, nullptr,
+                          targetObject);
 }
 
 ProcessCommand::ProcessCommand()
@@ -289,40 +292,37 @@ bool ProcessCommand::equals(const AbstractCommand *otherAbstractCommand) const
             && m_environment == other->m_environment;
 }
 
-void ProcessCommand::fillFromScriptValue(const QScriptValue *scriptValue, const CodeLocation &codeLocation)
-{
-    AbstractCommand::fillFromScriptValue(scriptValue, codeLocation);
-    m_program = scriptValue->property(programProperty()).toString();
-    m_arguments = scriptValue->property(argumentsProperty()).toVariant().toStringList();
-    m_workingDir = scriptValue->property(workingDirProperty()).toString();
-    m_maxExitCode = scriptValue->property(maxExitCodeProperty()).toInt32();
-
-    // toString() is required, presumably due to QtScript bug that manifests itself on Windows
-    const QScriptValue stdoutFilterFunction
-            = scriptValue->property(stdoutFilterFunctionProperty()).toString();
-
-    m_stdoutFilterFunction = invokedSourceCode(stdoutFilterFunction);
-
-    // toString() is required, presumably due to QtScript bug that manifests itself on Windows
-    const QScriptValue stderrFilterFunction
-            = scriptValue->property(stderrFilterFunctionProperty()).toString();
-
-    m_stderrFilterFunction = invokedSourceCode(stderrFilterFunction);
-    m_relevantEnvVars = scriptValue->property(QStringLiteral("relevantEnvironmentVariables"))
-            .toVariant().toStringList();
-    m_responseFileThreshold = scriptValue->property(responseFileThresholdProperty())
-            .toInt32();
-    m_responseFileArgumentIndex = scriptValue->property(responseFileArgumentIndexProperty())
-            .toInt32();
-    m_responseFileUsagePrefix = scriptValue->property(responseFileUsagePrefixProperty())
-            .toString();
-    m_responseFileSeparator = scriptValue->property(responseFileSeparatorProperty())
-            .toString();
-    QStringList envList = scriptValue->property(environmentProperty()).toVariant()
-            .toStringList();
+void ProcessCommand::fillFromScriptValue(JSContext *ctx, const JSValue *scriptValue, const CodeLocation &codeLocation)
+{
+    AbstractCommand::fillFromScriptValue(ctx, scriptValue, codeLocation);
+    m_program = getJsStringProperty(ctx, *scriptValue, programProperty());
+    m_arguments = getJsStringListProperty(ctx, *scriptValue, argumentsProperty());
+    m_workingDir = getJsStringProperty(ctx, *scriptValue, workingDirProperty());
+    m_maxExitCode = getJsIntProperty(ctx, *scriptValue, maxExitCodeProperty());
+
+    const ScopedJsValue stdoutFilterFunction(ctx, getJsProperty(ctx, *scriptValue,
+                                                                stdoutFilterFunctionProperty()));
+    if (JS_IsFunction(ctx, stdoutFilterFunction))
+        m_stdoutFilterFunction = QLatin1Char('(') + getJsString(ctx, stdoutFilterFunction) + QLatin1Char(')');
+
+    const ScopedJsValue stderrFilterFunction(ctx, getJsProperty(ctx, *scriptValue,
+                                                                stderrFilterFunctionProperty()));
+    if (JS_IsFunction(ctx, stderrFilterFunction))
+        m_stderrFilterFunction = QLatin1Char('(') + getJsString(ctx, stderrFilterFunction) + QLatin1Char(')');
+
+    m_relevantEnvVars = getJsStringListProperty(ctx, *scriptValue,
+                                                QStringLiteral("relevantEnvironmentVariables"));
+    m_responseFileThreshold = getJsIntProperty(ctx, *scriptValue, responseFileThresholdProperty());
+    m_responseFileArgumentIndex = getJsIntProperty(ctx, *scriptValue,
+                                                   responseFileArgumentIndexProperty());
+    m_responseFileUsagePrefix = getJsStringProperty(ctx, *scriptValue,
+                                                    responseFileUsagePrefixProperty());
+    m_responseFileSeparator = getJsStringProperty(ctx, *scriptValue,
+                                                  responseFileSeparatorProperty());
+    QStringList envList = getJsStringListProperty(ctx, *scriptValue, environmentProperty());
     getEnvironmentFromList(envList);
-    m_stdoutFilePath = scriptValue->property(stdoutFilePathProperty()).toString();
-    m_stderrFilePath = scriptValue->property(stderrFilePathProperty()).toString();
+    m_stdoutFilePath = getJsStringProperty(ctx, *scriptValue, stdoutFilePathProperty());
+    m_stderrFilePath = getJsStringProperty(ctx, *scriptValue, stderrFilePathProperty());
 
     m_predefinedProperties
             << programProperty()
@@ -337,7 +337,13 @@ void ProcessCommand::fillFromScriptValue(const QScriptValue *scriptValue, const
             << environmentProperty()
             << stdoutFilePathProperty()
             << stderrFilePathProperty();
-    applyCommandProperties(scriptValue);
+    applyCommandProperties(ctx, scriptValue);
+}
+
+QString ProcessCommand::descriptionForCancelMessage(const QString &productName) const
+{
+    return description() + QLatin1String(" (") + QDir::toNativeSeparators(m_program)
+           + QLatin1String(") [") + productName + QLatin1Char(']');
 }
 
 QStringList ProcessCommand::relevantEnvVars() const
@@ -365,43 +371,42 @@ void ProcessCommand::store(PersistentPool &pool)
     serializationOp<PersistentPool::Store>(pool);
 }
 
-static QString currentImportScopeName(QScriptContext *context)
+static QString currentImportScopeName(JSContext *ctx)
 {
-    for (; context; context = context->parentContext()) {
-        QScriptValue v = context->thisObject()
-                .property(StringConstants::importScopeNamePropertyInternal());
-        if (v.isString())
-            return v.toString();
+    const ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const JSValueList &contextStack = engine->contextStack();
+    for (auto it = contextStack.rbegin(); it != contextStack.rend(); ++it) {
+        if (!JS_IsObject(*it))
+            continue;
+        const ScopedJsValue v(ctx, getJsProperty(ctx, *it,
+                StringConstants::importScopeNamePropertyInternal()));
+        if (JS_IsString(v))
+            return getJsString(ctx, v);
     }
     return {};
 }
 
-static QScriptValue js_JavaScriptCommand(QScriptContext *context, QScriptEngine *engine)
+static JSValue js_JavaScriptCommand(JSContext *ctx, JSValueConst, JSValueConst,
+                                    int argc, JSValueConst *, int)
 {
-    if (Q_UNLIKELY(!context->isCalledAsConstructor()))
-        return context->throwError(Tr::tr("JavaScriptCommand constructor called without new."));
-    if (Q_UNLIKELY(context->argumentCount() != 0)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                  Tr::tr("JavaScriptCommand c'tor doesn't take arguments."));
-    }
+    if (argc > 0)
+        return throwError(ctx, Tr::tr("JavaScriptCommand c'tor doesn't take arguments."));
 
     static JavaScriptCommandPtr commandPrototype = JavaScriptCommand::create();
-    QScriptValue cmd = js_CommandBase(context, engine);
-    cmd.setProperty(StringConstants::classNameProperty(),
-                    engine->toScriptValue(StringConstants::javaScriptCommandType()));
-    cmd.setProperty(StringConstants::sourceCodeProperty(),
-                    engine->toScriptValue(commandPrototype->sourceCode()));
-    cmd.setProperty(StringConstants::importScopeNamePropertyInternal(),
-                    engine->toScriptValue(currentImportScopeName(context)));
-
+    JSValue cmd = js_CommandBase(ctx);
+    setJsProperty(ctx, cmd, StringConstants::classNameProperty(),
+                  makeJsString(ctx, StringConstants::javaScriptCommandType()));
+    setJsProperty(ctx, cmd, StringConstants::sourceCodeProperty(),
+                  makeJsString(ctx, commandPrototype->sourceCode()));
+    setJsProperty(ctx, cmd, StringConstants::importScopeNamePropertyInternal(),
+                  makeJsString(ctx, currentImportScopeName(ctx)));
     return cmd;
 }
 
-void JavaScriptCommand::setupForJavaScript(QScriptValue targetObject)
+void JavaScriptCommand::setupForJavaScript(ScriptEngine *engine, JSValue targetObject)
 {
-    QBS_CHECK(targetObject.isObject());
-    QScriptValue ctor = targetObject.engine()->newFunction(js_JavaScriptCommand, 0);
-    targetObject.setProperty(StringConstants::javaScriptCommandType(), ctor);
+    engine->registerClass(StringConstants::javaScriptCommandType().toUtf8().constData(),
+                          js_JavaScriptCommand, nullptr, targetObject);
 }
 
 JavaScriptCommand::JavaScriptCommand() = default;
@@ -414,22 +419,24 @@ bool JavaScriptCommand::equals(const AbstractCommand *otherAbstractCommand) cons
     return m_sourceCode == other->m_sourceCode;
 }
 
-void JavaScriptCommand::fillFromScriptValue(const QScriptValue *scriptValue, const CodeLocation &codeLocation)
+void JavaScriptCommand::fillFromScriptValue(JSContext *ctx, const JSValue *scriptValue,
+                                            const CodeLocation &codeLocation)
 {
-    AbstractCommand::fillFromScriptValue(scriptValue, codeLocation);
+    AbstractCommand::fillFromScriptValue(ctx, scriptValue, codeLocation);
 
-    const QScriptValue importScope = scriptValue->property(
-                StringConstants::importScopeNamePropertyInternal());
-    if (importScope.isString())
-        m_scopeName = importScope.toString();
+    const ScopedJsValue importScope(ctx, getJsProperty(ctx, *scriptValue,
+            StringConstants::importScopeNamePropertyInternal()));
+    if (JS_IsString(importScope))
+        m_scopeName = getJsString(ctx, importScope);
 
-    const QScriptValue sourceCode = scriptValue->property(StringConstants::sourceCodeProperty());
-    m_sourceCode = invokedSourceCode(sourceCode);
+    const ScopedJsValue sourceCode(ctx, getJsProperty(ctx, *scriptValue,
+                                                      StringConstants::sourceCodeProperty()));
+    m_sourceCode = invokedSourceCode(ctx, sourceCode);
 
     m_predefinedProperties << StringConstants::classNameProperty()
                            << StringConstants::sourceCodeProperty()
                            << StringConstants::importScopeNamePropertyInternal();
-    applyCommandProperties(scriptValue);
+    applyCommandProperties(ctx, scriptValue);
 }
 
 void JavaScriptCommand::load(PersistentPool &pool)
diff --git a/src/lib/corelib/buildgraph/rulecommands.h b/src/lib/corelib/buildgraph/rulecommands.h
index 725cd6d89..4296146d2 100644
--- a/src/lib/corelib/buildgraph/rulecommands.h
+++ b/src/lib/corelib/buildgraph/rulecommands.h
@@ -47,14 +47,15 @@
 #include <tools/persistence.h>
 #include <tools/set.h>
 
+#include <quickjs.h>
+
 #include <QtCore/qprocess.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qvariant.h>
 
-#include <QtScript/qscriptvalue.h>
-
 namespace qbs {
 namespace Internal {
+class ScriptEngine;
 
 class AbstractCommand
 {
@@ -75,7 +76,9 @@ public:
 
     virtual CommandType type() const = 0;
     virtual bool equals(const AbstractCommand *other) const;
-    virtual void fillFromScriptValue(const QScriptValue *scriptValue, const CodeLocation &codeLocation);
+    virtual void fillFromScriptValue(JSContext *ctx, const JSValue *scriptValue,
+                                     const CodeLocation &codeLocation);
+    virtual QString descriptionForCancelMessage(const QString &productName) const;
 
     QString fullDescription(const QString &productName) const;
     const QString description() const { return m_description; }
@@ -94,7 +97,7 @@ public:
 
 protected:
     AbstractCommand();
-    void applyCommandProperties(const QScriptValue *scriptValue);
+    void applyCommandProperties(JSContext *ctx, const JSValue *scriptValue);
 
     Set<QString> m_predefinedProperties;
 
@@ -121,12 +124,13 @@ class ProcessCommand : public AbstractCommand
 {
 public:
     static ProcessCommandPtr create() { return ProcessCommandPtr(new ProcessCommand); }
-    static void setupForJavaScript(QScriptValue targetObject);
+    static void setupForJavaScript(ScriptEngine *engine, JSValue targetObject);
 
     CommandType type() const override { return ProcessCommandType; }
     bool equals(const AbstractCommand *otherAbstractCommand) const override;
-    void fillFromScriptValue(const QScriptValue *scriptValue,
+    void fillFromScriptValue(JSContext *ctx, const JSValue *scriptValue,
                              const CodeLocation &codeLocation) override;
+    QString descriptionForCancelMessage(const QString &productName) const override;
     const QString program() const { return m_program; }
     const QStringList arguments() const { return m_arguments; }
     const QString workingDir() const { return m_workingDir; }
@@ -186,16 +190,15 @@ class JavaScriptCommand : public AbstractCommand
 {
 public:
     static JavaScriptCommandPtr create() { return JavaScriptCommandPtr(new JavaScriptCommand); }
-    static void setupForJavaScript(QScriptValue targetObject);
+    static void setupForJavaScript(ScriptEngine *engine, JSValue targetObject);
 
     CommandType type() const override { return JavaScriptCommandType; }
     bool equals(const AbstractCommand *otherAbstractCommand) const override;
-    void fillFromScriptValue(const QScriptValue *scriptValue,
+    void fillFromScriptValue(JSContext *ctx, const JSValue *scriptValue,
                              const CodeLocation &codeLocation) override;
 
     const QString &scopeName() const { return m_scopeName; }
     const QString &sourceCode() const { return m_sourceCode; }
-    void setSourceCode(const QString &str) { m_sourceCode = str; }
 
     void load(PersistentPool &pool) override;
     void store(PersistentPool &pool) override;
diff --git a/src/lib/corelib/buildgraph/rulegraph.cpp b/src/lib/corelib/buildgraph/rulegraph.cpp
index 23f22b7f2..2acc2a97e 100644
--- a/src/lib/corelib/buildgraph/rulegraph.cpp
+++ b/src/lib/corelib/buildgraph/rulegraph.cpp
@@ -61,11 +61,11 @@ void RuleGraph::build(const std::vector<RulePtr> &rules, const FileTags &product
     m_parents.resize(rules.size());
     m_children.resize(rules.size());
 
-    for (const auto &rule : qAsConst(m_rules)) {
+    for (const auto &rule : std::as_const(m_rules)) {
         FileTags inFileTags = rule->inputs;
         inFileTags += rule->auxiliaryInputs;
         inFileTags += rule->explicitlyDependsOn;
-        for (const FileTag &fileTag : qAsConst(inFileTags)) {
+        for (const FileTag &fileTag : std::as_const(inFileTags)) {
             inputFileTagToRule[fileTag].push_back(rule.get());
             for (const Rule * const producingRule : m_outputFileTagToRule.value(fileTag)) {
                 if (!producingRule->collectedOutputFileTags().intersects(
@@ -82,38 +82,38 @@ void RuleGraph::build(const std::vector<RulePtr> &rules, const FileTags &product
         productRules << rules;
         //### check: the rule graph must be a in valid shape!
     }
-    for (const Rule *r : qAsConst(productRules))
+    for (const Rule *r : std::as_const(productRules))
         m_rootRules += r->ruleGraphId;
 }
 
 void RuleGraph::accept(RuleGraphVisitor *visitor) const
 {
     const RuleConstPtr nullParent;
-    for (int rootIndex : qAsConst(m_rootRules))
+    for (int rootIndex : std::as_const(m_rootRules))
         traverse(visitor, nullParent, m_rules.at(rootIndex));
 }
 
 void RuleGraph::dump() const
 {
     QByteArray indent;
-    printf("---rule graph dump:\n");
+    std::printf("---rule graph dump:\n");
     Set<int> rootRules;
-    for (const auto &rule : qAsConst(m_rules))
+    for (const auto &rule : std::as_const(m_rules))
         if (m_parents[rule->ruleGraphId].empty())
             rootRules += rule->ruleGraphId;
-    for (int idx : qAsConst(rootRules))
+    for (int idx : std::as_const(rootRules))
         dump_impl(indent, idx);
 }
 
 void RuleGraph::dump_impl(QByteArray &indent, int rootIndex) const
 {
     const RuleConstPtr r = m_rules[rootIndex];
-    printf("%s", indent.constData());
-    printf("%s", qPrintable(r->toString()));
-    printf("\n");
+    std::printf("%s", indent.constData());
+    std::printf("%s", qPrintable(r->toString()));
+    std::printf("\n");
 
     indent.append("  ");
-    for (int childIndex : qAsConst(m_children[rootIndex]))
+    for (int childIndex : std::as_const(m_children[rootIndex]))
         dump_impl(indent, childIndex);
     indent.chop(2);
 }
diff --git a/src/lib/corelib/buildgraph/rulenode.cpp b/src/lib/corelib/buildgraph/rulenode.cpp
index 0558ba144..8568e4098 100644
--- a/src/lib/corelib/buildgraph/rulenode.cpp
+++ b/src/lib/corelib/buildgraph/rulenode.cpp
@@ -229,7 +229,7 @@ int RuleNode::transformerCount() const
 ArtifactSet RuleNode::currentInputArtifacts() const
 {
     ArtifactSet s;
-    for (const FileTag &t : qAsConst(m_rule->inputs)) {
+    for (const FileTag &t : std::as_const(m_rule->inputs)) {
         for (Artifact *artifact : product->lookupArtifactsByFileTag(t)) {
             if (artifact->isTargetOfModule())
                 continue;
@@ -246,7 +246,7 @@ ArtifactSet RuleNode::currentInputArtifacts() const
 
     if (m_rule->inputsFromDependencies.empty())
         return s;
-    for (const FileTag &t : qAsConst(m_rule->inputsFromDependencies)) {
+    for (const FileTag &t : std::as_const(m_rule->inputsFromDependencies)) {
         for (Artifact *artifact : product->lookupArtifactsByFileTag(t)) {
             if (!artifact->isTargetOfModule())
                 continue;
@@ -258,7 +258,7 @@ ArtifactSet RuleNode::currentInputArtifacts() const
         }
     }
 
-    for (const auto &dep : qAsConst(product->dependencies)) {
+    for (const auto &dep : std::as_const(product->dependencies)) {
         if (!dep->buildData)
             continue;
         for (Artifact * const a : filterByType<Artifact>(dep->buildData->allNodes())) {
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp
index f464734b8..94cee0c62 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp
@@ -1,5 +1,3 @@
-#include <utility>
-
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
@@ -41,7 +39,6 @@
 #include "rulesapplicator.h"
 
 #include "buildgraph.h"
-#include "productbuilddata.h"
 #include "projectbuilddata.h"
 #include "qtmocscanner.h"
 #include "rulecommands.h"
@@ -57,7 +54,6 @@
 #include <language/preparescriptobserver.h>
 #include <language/propertymapinternal.h>
 #include <language/resolvedfilecontext.h>
-#include <language/scriptengine.h>
 #include <logging/categories.h>
 #include <logging/translator.h>
 #include <tools/error.h>
@@ -69,7 +65,6 @@
 
 #include <QtCore/qcryptographichash.h>
 #include <QtCore/qdir.h>
-#include <QtScript/qscriptvalueiterator.h>
 
 #include <memory>
 #include <vector>
@@ -113,10 +108,10 @@ void RulesApplicator::applyRule(RuleNode *ruleNode, const ArtifactSet &inputArti
     m_completeInputSet = inputArtifacts;
     if (m_rule->name.startsWith(QLatin1String("QtCoreMocRule"))) {
         delete m_mocScanner;
-        m_mocScanner = new QtMocScanner(m_product, scope());
+        m_mocScanner = new QtMocScanner(m_product, engine(), scope());
     }
-    QScriptValue prepareScriptContext = engine()->newObject();
-    prepareScriptContext.setPrototype(engine()->globalObject());
+    ScopedJsValue prepareScriptContext(jsContext(), engine()->newObject());
+    JS_SetPrototype(jsContext(), prepareScriptContext, engine()->globalObject());
     setupScriptEngineForFile(engine(), m_rule->prepareScript.fileContext(), scope(),
                              ObserveMode::Enabled);
     setupScriptEngineForProduct(engine(), m_product.get(), m_rule->module.get(),
@@ -134,6 +129,7 @@ void RulesApplicator::applyRule(RuleNode *ruleNode, const ArtifactSet &inputArti
     }
     if (engine()->usesIo())
         m_ruleUsesIo = true;
+    engine()->releaseInputArtifactScriptValues(ruleNode);
 }
 
 void RulesApplicator::handleRemovedRuleOutputs(const ArtifactSet &inputArtifacts,
@@ -150,7 +146,7 @@ void RulesApplicator::handleRemovedRuleOutputs(const ArtifactSet &inputArtifacts
         project->buildData->removeArtifactAndExclusiveDependents(removedArtifact, logger, true,
                                                                  &artifactsToRemove);
     }
-    for (Artifact * const artifact : qAsConst(artifactsToRemove)) {
+    for (Artifact * const artifact : std::as_const(artifactsToRemove)) {
         QBS_CHECK(!inputArtifacts.contains(artifact));
         removedArtifacts << artifact->filePath();
         delete artifact;
@@ -164,9 +160,9 @@ ArtifactSet RulesApplicator::collectAuxiliaryInputs(const Rule *rule,
                                    CurrentProduct | Dependencies);
 }
 
-static void copyProperty(const QString &name, const QScriptValue &src, QScriptValue dst)
+static void copyProperty(JSContext *ctx, const QString &name, const JSValue &src, JSValue dst)
 {
-    dst.setProperty(name, src.property(name));
+    setJsProperty(ctx, dst, name, getJsProperty(ctx, src, name));
 }
 
 static QStringList toStringList(const ArtifactSet &artifacts)
@@ -180,7 +176,7 @@ static QStringList toStringList(const ArtifactSet &artifacts)
     return lst;
 }
 
-void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &prepareScriptContext)
+void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, JSValue prepareScriptContext)
 {
     evalContext()->checkForCancelation();
     for (const Artifact *inputArtifact : inputArtifacts)
@@ -202,20 +198,22 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p
     engine()->clearRequestedProperties();
 
     // create the output artifacts from the set of input artifacts
-    m_transformer->setupInputs(prepareScriptContext);
-    m_transformer->setupExplicitlyDependsOn(prepareScriptContext);
-    copyProperty(StringConstants::inputsVar(), prepareScriptContext, scope());
-    copyProperty(StringConstants::inputVar(), prepareScriptContext, scope());
-    copyProperty(StringConstants::explicitlyDependsOnVar(), prepareScriptContext, scope());
-    copyProperty(StringConstants::productVar(), prepareScriptContext, scope());
-    copyProperty(StringConstants::projectVar(), prepareScriptContext, scope());
+    m_transformer->setupInputs(engine(), prepareScriptContext);
+    m_transformer->setupExplicitlyDependsOn(engine(), prepareScriptContext);
+    copyProperty(jsContext(), StringConstants::inputsVar(), prepareScriptContext, scope());
+    copyProperty(jsContext(), StringConstants::inputVar(), prepareScriptContext, scope());
+    copyProperty(jsContext(), StringConstants::explicitlyDependsOnVar(),
+                 prepareScriptContext, scope());
+    copyProperty(jsContext(), StringConstants::productVar(), prepareScriptContext, scope());
+    copyProperty(jsContext(), StringConstants::projectVar(), prepareScriptContext, scope());
     if (m_rule->isDynamic()) {
-        outputArtifacts = runOutputArtifactsScript(inputArtifacts,
-                    ScriptEngine::argumentList(Rule::argumentNamesForOutputArtifacts(), scope()));
+        const ScopedJsValueList argList
+                = engine()->argumentList(Rule::argumentNamesForOutputArtifacts(), scope());
+        outputArtifacts = runOutputArtifactsScript(inputArtifacts, argList);
     } else {
         Set<QString> outputFilePaths;
         for (const auto &ruleArtifact : m_rule->artifacts) {
-            const OutputArtifactInfo outputInfo = createOutputArtifactFromRuleArtifact(
+            const OutputArtifactInfo &outputInfo = createOutputArtifactFromRuleArtifact(
                         ruleArtifact, inputArtifacts, &outputFilePaths);
             if (!outputInfo.artifact)
                 continue;
@@ -249,59 +247,64 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p
     if (outputArtifacts.empty())
         return;
 
-    for (Artifact * const outputArtifact : qAsConst(outputArtifacts)) {
-        for (Artifact * const dependency : qAsConst(m_transformer->explicitlyDependsOn))
+    for (Artifact * const outputArtifact : std::as_const(outputArtifacts)) {
+        for (Artifact * const dependency : std::as_const(m_transformer->explicitlyDependsOn))
             connect(outputArtifact, dependency);
     }
 
     if (inputArtifacts != m_transformer->inputs)
-        m_transformer->setupInputs(prepareScriptContext);
+        m_transformer->setupInputs(engine(), prepareScriptContext);
 
     // change the transformer outputs according to the bindings in Artifact
-    QScriptValue scriptValue;
-    if (!ruleArtifactArtifactMap.empty())
-        engine()->setGlobalObject(prepareScriptContext);
-    for (auto it = ruleArtifactArtifactMap.crbegin(), end = ruleArtifactArtifactMap.crend();
-         it != end; ++it) {
-        const RuleArtifact *ra = it->first;
-        if (ra->bindings.empty())
-            continue;
-
-        // expose attributes of this artifact
-        const OutputArtifactInfo outputInfo = it->second;
-        Artifact *outputArtifact = outputInfo.artifact;
-        outputArtifact->properties = outputArtifact->properties->clone();
+    if (!ruleArtifactArtifactMap.empty()) {
+        const TemporaryGlobalObjectSetter gos(engine(), prepareScriptContext);
+        for (auto it = ruleArtifactArtifactMap.crbegin(), end = ruleArtifactArtifactMap.crend();
+             it != end; ++it) {
+            const RuleArtifact *ra = it->first;
+            if (ra->bindings.empty())
+                continue;
 
-        scope().setProperty(StringConstants::fileNameProperty(),
-                            engine()->toScriptValue(outputArtifact->filePath()));
-        scope().setProperty(StringConstants::fileTagsProperty(),
-                            toScriptValue(engine(), outputArtifact->fileTags().toStringList()));
-
-        QVariantMap artifactModulesCfg = outputArtifact->properties->value();
-        for (const auto &binding : ra->bindings) {
-            scriptValue = engine()->evaluate(binding.code);
-            if (Q_UNLIKELY(engine()->hasErrorOrException(scriptValue))) {
-                QString msg = QStringLiteral("evaluating rule binding '%1': %2");
-                throw ErrorInfo(msg.arg(binding.name.join(QLatin1Char('.')),
-                                        engine()->lastErrorString(scriptValue)),
-                                engine()->lastErrorLocation(scriptValue, binding.location));
+            // expose attributes of this artifact
+            const OutputArtifactInfo &outputInfo = it->second;
+            Artifact *outputArtifact = outputInfo.artifact;
+            outputArtifact->properties = outputArtifact->properties->clone();
+
+            setJsProperty(jsContext(), scope(), StringConstants::fileNameProperty(),
+                          engine()->toScriptValue(outputArtifact->filePath()));
+            setJsProperty(jsContext(), scope(), StringConstants::fileTagsProperty(),
+                          makeJsStringList(engine()->context(),
+                                           outputArtifact->fileTags().toStringList()));
+
+            QVariantMap artifactModulesCfg = outputArtifact->properties->value();
+            for (const auto &binding : ra->bindings) {
+                const ScopedJsValue scriptValue(jsContext(), engine()->evaluate(
+                                                    JsValueOwner::Caller, binding.code,
+                                                    binding.location.filePath(),
+                                                    binding.location.line()));
+                if (JsException ex = engine()->checkAndClearException(binding.location)) {
+                    ErrorInfo err = ex.toErrorInfo();
+                    err.prepend(QStringLiteral("evaluating rule binding '%1'")
+                                .arg(binding.name.join(QLatin1Char('.'))));
+                    throw err;
+                }
+                const QVariant value = getJsVariant(jsContext(), scriptValue);
+                setConfigProperty(artifactModulesCfg, binding.name, value);
+                outputArtifact->pureProperties.emplace_back(binding.name, value);
+            }
+            outputArtifact->properties->setValue(artifactModulesCfg);
+            if (!outputInfo.newlyCreated
+                && (outputArtifact->fileTags() != outputInfo.oldFileTags
+                    || !qVariantMapsEqual(
+                        outputArtifact->properties->value(), outputInfo.oldProperties))) {
+                invalidateArtifactAsRuleInputIfNecessary(outputArtifact);
             }
-            const QVariant value = scriptValue.toVariant();
-            setConfigProperty(artifactModulesCfg, binding.name, value);
-            outputArtifact->pureProperties.emplace_back(binding.name, value);
-        }
-        outputArtifact->properties->setValue(artifactModulesCfg);
-        if (!outputInfo.newlyCreated && (outputArtifact->fileTags() != outputInfo.oldFileTags
-                || outputArtifact->properties->value() != outputInfo.oldProperties)) {
-            invalidateArtifactAsRuleInputIfNecessary(outputArtifact);
         }
     }
-    if (!ruleArtifactArtifactMap.empty())
-        engine()->setGlobalObject(prepareScriptContext.prototype());
 
-    m_transformer->setupOutputs(prepareScriptContext);
-    m_transformer->createCommands(engine(), m_rule->prepareScript,
-            ScriptEngine::argumentList(Rule::argumentNamesForPrepare(), prepareScriptContext));
+    m_transformer->setupOutputs(engine(), prepareScriptContext);
+    const ScopedJsValueList argList = engine()->argumentList(Rule::argumentNamesForPrepare(),
+                                                             prepareScriptContext);
+    m_transformer->createCommands(engine(), m_rule->prepareScript, argList);
     if (Q_UNLIKELY(m_transformer->commands.empty()))
         throw ErrorInfo(Tr::tr("There is a rule without commands: %1.")
                         .arg(m_rule->toString()), m_rule->prepareScript.location());
@@ -311,7 +314,7 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p
             || m_oldTransformer->commands != m_transformer->commands
             || commandsNeedRerun(m_transformer.get(), m_product.get(), m_productsByName,
                                  m_projectsByName)) {
-        for (Artifact * const output : qAsConst(outputArtifacts)) {
+        for (Artifact * const output : std::as_const(outputArtifacts)) {
             output->clearTimestamp();
             m_invalidatedArtifacts += output;
         }
@@ -386,12 +389,14 @@ RulesApplicator::OutputArtifactInfo RulesApplicator::createOutputArtifactFromRul
     FileTags fileTags;
     bool alwaysUpdated;
     if (ruleArtifact) {
-        QScriptValue scriptValue = engine()->evaluate(ruleArtifact->filePath,
-                                                      ruleArtifact->filePathLocation.filePath(),
-                                                      ruleArtifact->filePathLocation.line());
-        if (Q_UNLIKELY(engine()->hasErrorOrException(scriptValue)))
-            throw engine()->lastError(scriptValue, ruleArtifact->filePathLocation);
-        outputPath = scriptValue.toString();
+        const ScopedJsValue scriptValue(
+                    jsContext(),
+                    engine()->evaluate(JsValueOwner::Caller, ruleArtifact->filePath,
+                                       ruleArtifact->filePathLocation.filePath(),
+                                       ruleArtifact->filePathLocation.line()));
+        if (JsException ex = engine()->checkAndClearException(ruleArtifact->filePathLocation))
+            throw ex.toErrorInfo();
+        outputPath = getJsString(jsContext(), scriptValue);
         fileTags = ruleArtifact->fileTags;
         alwaysUpdated = ruleArtifact->alwaysUpdated;
     } else {
@@ -415,11 +420,7 @@ RulesApplicator::OutputArtifactInfo RulesApplicator::createOutputArtifactFromRul
 RulesApplicator::OutputArtifactInfo RulesApplicator::createOutputArtifact(const QString &filePath,
         const FileTags &fileTags, bool alwaysUpdated, const ArtifactSet &inputArtifacts)
 {
-    QString outputPath = filePath;
-    // don't let the output artifact "escape" its build dir
-    outputPath.replace(StringConstants::dotDot(), QStringLiteral("dotdot"));
-    outputPath = resolveOutPath(outputPath);
-
+    const QString outputPath = resolveOutPath(filePath);
     if (m_rule->isDynamic()) {
         const Set<FileTag> undeclaredTags = fileTags - m_rule->collectedOutputFileTags();
         if (!undeclaredTags.empty()) {
@@ -514,26 +515,31 @@ public:
 };
 
 QList<Artifact *> RulesApplicator::runOutputArtifactsScript(const ArtifactSet &inputArtifacts,
-        const QScriptValueList &args)
+        const JSValueList &args)
 {
     QList<Artifact *> lst;
-    QScriptValue fun = engine()->evaluate(m_rule->outputArtifactsScript.sourceCode(),
-                                          m_rule->outputArtifactsScript.location().filePath(),
-                                          m_rule->outputArtifactsScript.location().line());
-    if (!fun.isFunction())
+    const ScopedJsValue fun(jsContext(),
+                            engine()->evaluate(JsValueOwner::Caller,
+                                               m_rule->outputArtifactsScript.sourceCode(),
+                                               m_rule->outputArtifactsScript.location().filePath(),
+                                               m_rule->outputArtifactsScript.location().line()));
+    if (!JS_IsFunction(jsContext(), fun))
         throw ErrorInfo(QStringLiteral("Function expected."),
                         m_rule->outputArtifactsScript.location());
-    QScriptValue res = fun.call(QScriptValue(), args);
-    engine()->releaseResourcesOfScriptObjects();
-    if (engine()->hasErrorOrException(res))
-        throw engine()->lastError(res, m_rule->outputArtifactsScript.location());
-    if (!res.isArray())
+    JSValueList argv(args.begin(), args.end());
+    const ScopedJsValue res(
+                jsContext(),
+                JS_Call(jsContext(), fun, engine()->globalObject(), int(args.size()), argv.data()));
+    if (JsException ex = engine()->checkAndClearException(m_rule->outputArtifactsScript.location()))
+        throw ex.toErrorInfo();
+    if (!JS_IsArray(jsContext(), res))
         throw ErrorInfo(Tr::tr("Rule.outputArtifacts must return an array of objects."),
                         m_rule->outputArtifactsScript.location());
-    const quint32 c = res.property(StringConstants::lengthProperty()).toUInt32();
+    const quint32 c = getJsIntProperty(jsContext(), res, StringConstants::lengthProperty());
     for (quint32 i = 0; i < c; ++i) {
         try {
-            lst.push_back(createOutputArtifactFromScriptValue(res.property(i), inputArtifacts));
+            ScopedJsValue val(engine()->context(), JS_GetPropertyUint32(jsContext(), res, i));
+            lst.push_back(createOutputArtifactFromScriptValue(val, inputArtifacts));
         } catch (const RuleOutputArtifactsException &roae) {
             ErrorInfo ei = roae;
             ei.prepend(Tr::tr("Error in Rule.outputArtifacts[%1]").arg(i),
@@ -556,6 +562,8 @@ class ArtifactBindingsExtractor
         QString name;
         QVariant value;
     };
+    ScriptEngine *m_engine = nullptr;
+    JSContext *m_ctx = nullptr;
     std::vector<Entry> m_propertyValues;
 
     static Set<QString> getArtifactItemPropertyNames()
@@ -570,35 +578,36 @@ class ArtifactBindingsExtractor
         return s;
     }
 
-    void extractPropertyValues(const QScriptValue &obj, const QString &moduleName = QString())
+    void extractPropertyValues(const JSValue &obj, const QString &moduleName = QString())
     {
-        QScriptValueIterator svit(obj);
-        while (svit.hasNext()) {
-            svit.next();
-            const QString name = svit.name();
+        handleJsProperties(m_ctx, obj, [&](const JSAtom &prop, const JSPropertyDescriptor &desc) {
+            const QString name = getJsString(m_ctx, prop);
             if (moduleName.isEmpty()) {
                 // Ignore property names that are part of the Artifact item.
                 static const Set<QString> artifactItemPropertyNames
                         = getArtifactItemPropertyNames();
                 if (artifactItemPropertyNames.contains(name))
-                    continue;
+                    return;
             }
 
-            const QScriptValue value = svit.value();
-            if (value.isObject() && !value.isArray() && !value.isError() && !value.isRegExp()) {
+            const JSValue value = desc.value;
+            if (JS_IsObject(value) && !JS_IsArray(m_ctx, value) && !JS_IsError(m_ctx, value)
+                    && !JS_IsRegExp(m_ctx, value)) {
                 QString newModuleName;
                 if (!moduleName.isEmpty())
                     newModuleName.append(moduleName + QLatin1Char('.'));
                 newModuleName.append(name);
                 extractPropertyValues(value, newModuleName);
             } else {
-                m_propertyValues.emplace_back(moduleName, name, value.toVariant());
+                m_propertyValues.emplace_back(moduleName, name, getJsVariant(m_ctx, value));
             }
-        }
+        });
     }
 public:
-    void apply(Artifact *outputArtifact, const QScriptValue &obj)
+    void apply(ScriptEngine *engine, Artifact *outputArtifact, const JSValue &obj)
     {
+        m_engine = engine;
+        m_ctx = m_engine->context();
         extractPropertyValues(obj);
         if (m_propertyValues.empty())
             return;
@@ -614,24 +623,27 @@ public:
     }
 };
 
-Artifact *RulesApplicator::createOutputArtifactFromScriptValue(const QScriptValue &obj,
+Artifact *RulesApplicator::createOutputArtifactFromScriptValue(const JSValue &obj,
         const ArtifactSet &inputArtifacts)
 {
-    if (!obj.isObject()) {
+    if (!JS_IsObject(obj)) {
         throw ErrorInfo(Tr::tr("Elements of the Rule.outputArtifacts array must be "
                                "of Object type."), m_rule->outputArtifactsScript.location());
     }
-    const QString unresolvedFilePath
-            = obj.property(StringConstants::filePathProperty()).toVariant().toString();
+    QString unresolvedFilePath;
+    const ScopedJsValue jsFilePath(jsContext(), getJsProperty(jsContext(), obj,
+                                                              StringConstants::filePathProperty()));
+    if (JS_IsString(jsFilePath))
+        unresolvedFilePath = getJsString(jsContext(), jsFilePath);
     if (unresolvedFilePath.isEmpty()) {
         throw RuleOutputArtifactsException(
                 Tr::tr("Property filePath must be a non-empty string."));
     }
     const QString filePath = FileInfo::resolvePath(m_product->buildDirectory(), unresolvedFilePath);
     const FileTags fileTags = FileTags::fromStringList(
-                obj.property(StringConstants::fileTagsProperty()).toVariant().toStringList());
-    const QVariant alwaysUpdatedVar
-            = obj.property(StringConstants::alwaysUpdatedProperty()).toVariant();
+                getJsStringListProperty(jsContext(), obj, StringConstants::fileTagsProperty()));
+    const QVariant alwaysUpdatedVar = getJsVariantProperty(jsContext(), obj,
+                                                           StringConstants::alwaysUpdatedProperty());
     const bool alwaysUpdated = alwaysUpdatedVar.isValid() ? alwaysUpdatedVar.toBool() : true;
     OutputArtifactInfo outputInfo = createOutputArtifact(filePath, fileTags, alwaysUpdated,
                                                          inputArtifacts);
@@ -642,16 +654,17 @@ Artifact *RulesApplicator::createOutputArtifactFromScriptValue(const QScriptValu
                        "Alternatively, a FileTagger can be provided.")
                     .arg(unresolvedFilePath));
     }
-    const FileTags explicitlyDependsOn = FileTags::fromStringList(
-                obj.property(StringConstants::explicitlyDependsOnProperty())
-                .toVariant().toStringList());
+    const FileTags explicitlyDependsOn = FileTags::fromStringList(getJsStringListProperty(
+            jsContext(), obj, StringConstants::explicitlyDependsOnProperty()));
     for (const FileTag &tag : explicitlyDependsOn) {
         for (Artifact * const dependency : m_product->lookupArtifactsByFileTag(tag))
             connect(outputInfo.artifact, dependency);
     }
-    ArtifactBindingsExtractor().apply(outputInfo.artifact, obj);
-    if (!outputInfo.newlyCreated && (outputInfo.artifact->fileTags() != outputInfo.oldFileTags
-            || outputInfo.artifact->properties->value() != outputInfo.oldProperties)) {
+    ArtifactBindingsExtractor().apply(engine(), outputInfo.artifact, obj);
+    if (!outputInfo.newlyCreated
+        && (outputInfo.artifact->fileTags() != outputInfo.oldFileTags
+            || !qVariantMapsEqual(
+                outputInfo.artifact->properties->value(), outputInfo.oldProperties))) {
         invalidateArtifactAsRuleInputIfNecessary(outputInfo.artifact);
     }
     return outputInfo.artifact;
@@ -659,9 +672,14 @@ Artifact *RulesApplicator::createOutputArtifactFromScriptValue(const QScriptValu
 
 QString RulesApplicator::resolveOutPath(const QString &path) const
 {
-    QString buildDir = m_product->topLevelProject()->buildDirectory;
-    QString result = FileInfo::resolvePath(buildDir, path);
-    result = QDir::cleanPath(result);
+    const QString buildDir = m_product->topLevelProject()->buildDirectory;
+    QString result = QDir::cleanPath(FileInfo::resolvePath(buildDir, path));
+    if (!result.startsWith(buildDir + QLatin1Char('/'))) {
+        throw ErrorInfo(
+            Tr::tr("Refusing to create artifact '%1' outside of build directory '%2'.")
+                .arg(QDir::toNativeSeparators(result), QDir::toNativeSeparators(buildDir)),
+            m_rule->prepareScript.location());
+    }
     return result;
 }
 
@@ -670,15 +688,9 @@ const RulesEvaluationContextPtr &RulesApplicator::evalContext() const
     return m_product->topLevelProject()->buildData->evaluationContext;
 }
 
-ScriptEngine *RulesApplicator::engine() const
-{
-    return evalContext()->engine();
-}
-
-QScriptValue RulesApplicator::scope() const
-{
-    return evalContext()->scope();
-}
+ScriptEngine *RulesApplicator::engine() const { return evalContext()->engine(); }
+JSContext *RulesApplicator::jsContext() const { return engine()->context(); }
+JSValue RulesApplicator::scope() const { return evalContext()->scope(); }
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.h b/src/lib/corelib/buildgraph/rulesapplicator.h
index da7815014..72f9aadcc 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.h
+++ b/src/lib/corelib/buildgraph/rulesapplicator.h
@@ -44,12 +44,13 @@
 #include "nodeset.h"
 #include <language/filetags.h>
 #include <language/forward_decls.h>
+#include <language/scriptengine.h>
 #include <logging/logger.h>
+#include <quickjs.h>
 
 #include <QtCore/qflags.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qstring.h>
-#include <QtScript/qscriptvalue.h>
 
 #include <unordered_map>
 
@@ -85,7 +86,7 @@ public:
     Q_DECLARE_FLAGS(InputsSources, InputsSourceFlag)
 
 private:
-    void doApply(const ArtifactSet &inputArtifacts, QScriptValue &prepareScriptContext);
+    void doApply(const ArtifactSet &inputArtifacts, JSValue prepareScriptContext);
     ArtifactSet collectOldOutputArtifacts(const ArtifactSet &inputArtifacts) const;
 
     struct OutputArtifactInfo {
@@ -100,13 +101,14 @@ private:
     OutputArtifactInfo createOutputArtifact(const QString &filePath, const FileTags &fileTags,
             bool alwaysUpdated, const ArtifactSet &inputArtifacts);
     QList<Artifact *> runOutputArtifactsScript(const ArtifactSet &inputArtifacts,
-            const QScriptValueList &args);
-    Artifact *createOutputArtifactFromScriptValue(const QScriptValue &obj,
+            const JSValueList &args);
+    Artifact *createOutputArtifactFromScriptValue(const JSValue &obj,
             const ArtifactSet &inputArtifacts);
     QString resolveOutPath(const QString &path) const;
     const RulesEvaluationContextPtr &evalContext() const;
     ScriptEngine *engine() const;
-    QScriptValue scope() const;
+    JSContext *jsContext() const;
+    JSValue scope() const;
 
     static ArtifactSet collectAdditionalInputs(const FileTags &tags,
                                                const Rule *rule, const ResolvedProduct *product,
diff --git a/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
index 0422b9288..2d0f5d44d 100644
--- a/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
+++ b/src/lib/corelib/buildgraph/rulesevaluationcontext.cpp
@@ -38,9 +38,7 @@
 ****************************************************************************/
 #include "rulesevaluationcontext.h"
 
-#include "artifact.h"
 #include "rulecommands.h"
-#include "transformer.h"
 #include <language/language.h>
 #include <language/scriptengine.h>
 #include <logging/translator.h>
@@ -57,15 +55,19 @@ RulesEvaluationContext::RulesEvaluationContext(Logger logger)
     : m_logger(std::move(logger)),
       m_engine(ScriptEngine::create(m_logger, EvalContext::RuleExecution)),
       m_observer(nullptr),
-      m_initScopeCalls(0)
+      m_initScopeCalls(0),
+      m_prepareScriptScope(m_engine->newObject())
 {
-    m_prepareScriptScope = m_engine->newObject();
-    m_prepareScriptScope.setPrototype(m_engine->globalObject());
-    ProcessCommand::setupForJavaScript(m_prepareScriptScope);
-    JavaScriptCommand::setupForJavaScript(m_prepareScriptScope);
+
+    JS_SetPrototype(m_engine->context(), m_prepareScriptScope, m_engine->globalObject());
+    ProcessCommand::setupForJavaScript(m_engine.get(), m_prepareScriptScope);
+    JavaScriptCommand::setupForJavaScript(m_engine.get(), m_prepareScriptScope);
 }
 
-RulesEvaluationContext::~RulesEvaluationContext() = default;
+RulesEvaluationContext::~RulesEvaluationContext()
+{
+    JS_FreeValue(m_engine->context(), m_prepareScriptScope);
+}
 
 void RulesEvaluationContext::initializeObserver(const QString &description, int maximumProgress)
 {
@@ -92,7 +94,7 @@ void RulesEvaluationContext::initScope()
 
     m_engine->setActive(true);
     m_scope = m_engine->newObject();
-    m_scope.setPrototype(m_prepareScriptScope);
+    JS_SetPrototype(m_engine->context(), m_scope, m_prepareScriptScope);
     m_engine->setGlobalObject(m_scope);
 }
 
@@ -102,8 +104,11 @@ void RulesEvaluationContext::cleanupScope()
     if (--m_initScopeCalls > 0)
         return;
 
-    m_scope = QScriptValue();
-    m_engine->setGlobalObject(m_prepareScriptScope.prototype());
+    JS_FreeValue(m_engine->context(), m_scope);
+    m_scope = JS_UNDEFINED;
+    const ScopedJsValue proto(engine()->context(),
+                              JS_GetPrototype(m_engine->context(), m_prepareScriptScope));
+    m_engine->setGlobalObject(proto);
     m_engine->setActive(false);
 }
 
diff --git a/src/lib/corelib/buildgraph/rulesevaluationcontext.h b/src/lib/corelib/buildgraph/rulesevaluationcontext.h
index bb7955496..7ff75b51f 100644
--- a/src/lib/corelib/buildgraph/rulesevaluationcontext.h
+++ b/src/lib/corelib/buildgraph/rulesevaluationcontext.h
@@ -42,12 +42,11 @@
 #include <language/forward_decls.h>
 #include <logging/logger.h>
 
+#include <quickjs.h>
+
 #include <QtCore/qhash.h>
 #include <QtCore/qstring.h>
 
-#include <QtScript/qscriptprogram.h>
-#include <QtScript/qscriptvalue.h>
-
 namespace qbs {
 namespace Internal {
 class ProgressObserver;
@@ -70,7 +69,7 @@ public:
     };
 
     ScriptEngine *engine() const { return m_engine.get(); }
-    QScriptValue scope() const { return m_scope; }
+    JSValue scope() const { return m_scope; }
 
     void setObserver(ProgressObserver *observer) { m_observer = observer; }
     ProgressObserver *observer() const { return m_observer; }
@@ -79,8 +78,6 @@ public:
     void checkForCancelation();
 
 private:
-    friend class Scope;
-
     void initScope();
     void cleanupScope();
 
@@ -88,8 +85,8 @@ private:
     const std::unique_ptr<ScriptEngine> m_engine;
     ProgressObserver *m_observer;
     unsigned int m_initScopeCalls;
-    QScriptValue m_scope;
-    QScriptValue m_prepareScriptScope;
+    JSValue m_scope = JS_UNDEFINED;
+    const JSValue m_prepareScriptScope;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp
index 29f2bcdf0..2346ad5c9 100644
--- a/src/lib/corelib/buildgraph/transformer.cpp
+++ b/src/lib/corelib/buildgraph/transformer.cpp
@@ -39,6 +39,7 @@
 #include "transformer.h"
 
 #include "artifact.h"
+#include "productbuilddata.h"
 #include <jsextensions/moduleproperties.h>
 #include <language/language.h>
 #include <language/preparescriptobserver.h>
@@ -54,6 +55,7 @@
 #include <QtCore/qdir.h>
 
 #include <algorithm>
+#include <vector>
 
 namespace qbs {
 namespace Internal {
@@ -64,78 +66,82 @@ Transformer::Transformer() : alwaysRun(false)
 
 Transformer::~Transformer() = default;
 
-static QScriptValue js_baseName(QScriptContext *ctx, QScriptEngine *engine,
-                                const Artifact *artifact)
+static JSValue js_baseName(JSContext *ctx, JSValueConst this_val, int, JSValueConst *)
 {
-    Q_UNUSED(ctx);
-    Q_UNUSED(engine);
-    return {FileInfo::baseName(artifact->filePath())};
+    return ScriptEngine::engineForContext(ctx)->getArtifactProperty(this_val,
+            [ctx](const Artifact *a) {
+        return makeJsString(ctx, FileInfo::baseName(a->filePath()));
+    });
 }
 
-static QScriptValue js_completeBaseName(QScriptContext *ctx, QScriptEngine *engine,
-                                        const Artifact *artifact)
+static JSValue js_completeBaseName(JSContext *ctx, JSValueConst this_val, int, JSValueConst *)
 {
-    Q_UNUSED(ctx);
-    Q_UNUSED(engine);
-    return {FileInfo::completeBaseName(artifact->filePath())};
+    return ScriptEngine::engineForContext(ctx)->getArtifactProperty(this_val,
+            [ctx](const Artifact *a) {
+        return makeJsString(ctx, FileInfo::completeBaseName(a->filePath()));
+    });
 }
 
-static QScriptValue js_baseDir(QScriptContext *ctx, QScriptEngine *engine,
-                               const Artifact *artifact)
+static JSValue js_baseDir(JSContext *ctx, JSValueConst this_val, int, JSValueConst *)
 {
-    Q_UNUSED(ctx);
-    Q_UNUSED(engine);
-    QString basedir;
-    if (artifact->artifactType == Artifact::SourceFile) {
-        QDir sourceDir(artifact->product->sourceDirectory);
-        basedir = FileInfo::path(sourceDir.relativeFilePath(artifact->filePath()));
-    } else {
-        QDir buildDir(artifact->product->buildDirectory());
-        basedir = FileInfo::path(buildDir.relativeFilePath(artifact->filePath()));
-    }
-    return basedir;
+    return ScriptEngine::engineForContext(ctx)->getArtifactProperty(this_val,
+            [ctx](const Artifact *artifact) {
+        QString basedir;
+        if (artifact->artifactType == Artifact::SourceFile) {
+            QDir sourceDir(artifact->product->sourceDirectory);
+            basedir = FileInfo::path(sourceDir.relativeFilePath(artifact->filePath()));
+        } else {
+            QDir buildDir(artifact->product->buildDirectory());
+            basedir = FileInfo::path(buildDir.relativeFilePath(artifact->filePath()));
+        }
+        return makeJsString(ctx, basedir);
+    });
 }
 
-static QScriptValue js_children(QScriptContext *ctx, QScriptEngine *engine, const Artifact *artifact)
+static JSValue js_children(JSContext *ctx, JSValueConst this_val, int, JSValueConst *)
 {
-    Q_UNUSED(ctx);
-    QScriptValue sv = engine->newArray();
-    uint idx = 0;
-    for (const Artifact *child : artifact->childArtifacts()) {
-        sv.setProperty(idx++, Transformer::translateFileConfig(static_cast<ScriptEngine *>(engine),
-                                                               child, QString()));
-    }
-    return sv;
+    return ScriptEngine::engineForContext(ctx)->getArtifactProperty(this_val,
+            [ctx](const Artifact *artifact) {
+        JSValue sv = JS_NewArray(ctx);
+        uint idx = 0;
+
+        // FIXME: childArtifacts() is not guarded by any mutex ...
+        for (Artifact *child : artifact->childArtifacts()) {
+            JS_SetPropertyUint32(ctx, sv, idx++, Transformer::translateFileConfig(
+                                     ScriptEngine::engineForContext(ctx), child, QString()));
+        }
+        return sv;
+    });
 }
 
-static void setArtifactProperty(QScriptValue &obj, const QString &name,
-        QScriptValue (*func)(QScriptContext *, QScriptEngine *, const Artifact *),
-        const Artifact *artifact)
+static void setArtifactProperty(JSContext *ctx, JSValue &obj, const QString &name,
+                                JSCFunction *func)
 {
-    obj.setProperty(name, static_cast<ScriptEngine *>(obj.engine())->newFunction(func, artifact),
-                    QScriptValue::PropertyGetter);
+    const QByteArray nameBa = name.toUtf8();
+    const JSValue jsFunc = JS_NewCFunction(ctx, func, nameBa.constData(), 0);
+    const ScopedJsAtom nameAtom(ctx, nameBa);
+    JS_DefinePropertyGetSet(ctx, obj, nameAtom, jsFunc, JS_UNDEFINED, JS_PROP_HAS_GET);
 }
 
-QScriptValue Transformer::translateFileConfig(ScriptEngine *scriptEngine, const Artifact *artifact,
-                                              const QString &defaultModuleName)
+JSValue Transformer::translateFileConfig(ScriptEngine *engine, Artifact *artifact,
+                                         const QString &defaultModuleName)
 {
-    QScriptValue obj = scriptEngine->newObject();
-    attachPointerTo(obj, artifact);
-    ModuleProperties::init(obj, artifact);
-    obj.setProperty(StringConstants::fileNameProperty(), artifact->fileName());
-    obj.setProperty(StringConstants::filePathProperty(), artifact->filePath());
-    setArtifactProperty(obj, StringConstants::baseNameProperty(), js_baseName, artifact);
-    setArtifactProperty(obj, StringConstants::completeBaseNameProperty(), js_completeBaseName,
-                        artifact);
-    setArtifactProperty(obj, QStringLiteral("baseDir"), js_baseDir, artifact);
-    setArtifactProperty(obj, QStringLiteral("children"), js_children, artifact);
-    const QStringList fileTags = sorted(artifact->fileTags().toStringList());
-    scriptEngine->setObservedProperty(obj, StringConstants::fileTagsProperty(),
-                                      scriptEngine->toScriptValue(fileTags));
-    scriptEngine->observer()->addArtifactId(obj.objectId());
-    if (!defaultModuleName.isEmpty())
-        obj.setProperty(StringConstants::moduleNameProperty(), defaultModuleName);
-    return obj;
+    return engine->getArtifactScriptValue(artifact, defaultModuleName, [&](JSValue obj) {
+        ModuleProperties::init(engine, obj, artifact);
+        JSContext * const ctx = engine->context();
+        setJsProperty(ctx, obj, StringConstants::fileNameProperty(), artifact->fileName());
+        setJsProperty(ctx, obj, StringConstants::filePathProperty(), artifact->filePath());
+        setArtifactProperty(ctx, obj, StringConstants::baseNameProperty(), js_baseName);
+        setArtifactProperty(ctx, obj, StringConstants::completeBaseNameProperty(), js_completeBaseName);
+        setArtifactProperty(ctx, obj, QStringLiteral("baseDir"), js_baseDir);
+        setArtifactProperty(ctx, obj, QStringLiteral("children"), js_children);
+        const QStringList fileTags = sorted(artifact->fileTags().toStringList());
+        const ScopedJsValue jsFileTags(ctx, engine->toScriptValue(fileTags));
+        engine->setObservedProperty(obj, StringConstants::fileTagsProperty(), jsFileTags);
+        engine->observer()->addArtifactId(jsObjectId(obj));
+        if (!defaultModuleName.isEmpty())
+            setJsProperty(ctx, obj, StringConstants::moduleNameProperty(), defaultModuleName);
+    });
 }
 
 static bool compareByFilePath(const Artifact *a1, const Artifact *a2)
@@ -143,9 +149,8 @@ static bool compareByFilePath(const Artifact *a1, const Artifact *a2)
     return a1->filePath() < a2->filePath();
 }
 
-QScriptValue Transformer::translateInOutputs(ScriptEngine *scriptEngine,
-                                             const ArtifactSet &artifacts,
-                                             const QString &defaultModuleName)
+JSValue Transformer::translateInOutputs(ScriptEngine *engine, const ArtifactSet &artifacts,
+                                        const QString &defaultModuleName)
 {
     using TagArtifactsMap = QMap<QString, QList<Artifact*>>;
     TagArtifactsMap tagArtifactsMap;
@@ -155,16 +160,16 @@ QScriptValue Transformer::translateInOutputs(ScriptEngine *scriptEngine,
     for (TagArtifactsMap::Iterator it = tagArtifactsMap.begin(); it != tagArtifactsMap.end(); ++it)
         std::sort(it.value().begin(), it.value().end(), compareByFilePath);
 
-    QScriptValue jsTagFiles = scriptEngine->newObject();
-    for (TagArtifactsMap::const_iterator tag = tagArtifactsMap.constBegin(); tag != tagArtifactsMap.constEnd(); ++tag) {
+    JSValue jsTagFiles = engine->newObject();
+    for (auto tag = tagArtifactsMap.constBegin(); tag != tagArtifactsMap.constEnd(); ++tag) {
         const QList<Artifact*> &artifacts = tag.value();
-        QScriptValue jsFileConfig = scriptEngine->newArray(artifacts.size());
+        JSValue jsFileConfig = JS_NewArray(engine->context());
         int i = 0;
         for (Artifact * const artifact : artifacts) {
-            jsFileConfig.setProperty(i++, translateFileConfig(scriptEngine, artifact,
-                                                              defaultModuleName));
+            JS_SetPropertyUint32(engine->context(), jsFileConfig, i++,
+                                 translateFileConfig(engine, artifact, defaultModuleName));
         }
-        jsTagFiles.setProperty(tag.key(), jsFileConfig);
+        setJsProperty(engine->context(), jsTagFiles, tag.key(), jsFileConfig);
     }
 
     return jsTagFiles;
@@ -177,66 +182,70 @@ ResolvedProductPtr Transformer::product() const
     return (*outputs.cbegin())->product.lock();
 }
 
-void Transformer::setupInputs(QScriptValue targetScriptValue, const ArtifactSet &inputs,
-        const QString &defaultModuleName)
+void Transformer::setupInputs(ScriptEngine *engine, JSValue targetScriptValue,
+                              const ArtifactSet &inputs, const QString &defaultModuleName)
 {
-    const auto scriptEngine = static_cast<ScriptEngine *>(targetScriptValue.engine());
-    QScriptValue scriptValue = translateInOutputs(scriptEngine, inputs, defaultModuleName);
-    targetScriptValue.setProperty(StringConstants::inputsVar(), scriptValue);
-    QScriptValue inputScriptValue;
+    JSValue scriptValue = translateInOutputs(engine, inputs, defaultModuleName);
+    setJsProperty(engine->context(), targetScriptValue, StringConstants::inputsVar(), scriptValue);
+    JSValue inputScriptValue = JS_UNDEFINED;
     if (inputs.size() == 1) {
         Artifact *input = *inputs.cbegin();
         const FileTags &fileTags = input->fileTags();
         QBS_ASSERT(!fileTags.empty(), return);
-        QScriptValue inputsForFileTag = scriptValue.property(fileTags.cbegin()->toString());
-        inputScriptValue = inputsForFileTag.property(0);
+        const ScopedJsValue inputsForFileTag(
+                    engine->context(),
+                    getJsProperty(engine->context(), scriptValue, fileTags.cbegin()->toString()));
+        inputScriptValue = JS_GetPropertyUint32(engine->context(), inputsForFileTag, 0);
     }
-    targetScriptValue.setProperty(StringConstants::inputVar(), inputScriptValue);
+    setJsProperty(engine->context(), targetScriptValue, StringConstants::inputVar(),
+                  inputScriptValue);
 }
 
-void Transformer::setupInputs(const QScriptValue &targetScriptValue)
+void Transformer::setupInputs(ScriptEngine *engine, const JSValue &targetScriptValue)
 {
-    setupInputs(targetScriptValue, inputs, rule->module->name);
+    setupInputs(engine, targetScriptValue, inputs, rule->module->name);
 }
 
-void Transformer::setupOutputs(QScriptValue targetScriptValue)
+void Transformer::setupOutputs(ScriptEngine *engine, JSValue targetScriptValue)
 {
-    const auto scriptEngine = static_cast<ScriptEngine *>(targetScriptValue.engine());
     const QString &defaultModuleName = rule->module->name;
-    QScriptValue scriptValue = translateInOutputs(scriptEngine, outputs, defaultModuleName);
-    targetScriptValue.setProperty(StringConstants::outputsVar(), scriptValue);
-    QScriptValue outputScriptValue;
+    JSValue scriptValue = translateInOutputs(engine, outputs, defaultModuleName);
+    setJsProperty(engine->context(), targetScriptValue, StringConstants::outputsVar(), scriptValue);
+    JSValue outputScriptValue = JS_UNDEFINED;
     if (outputs.size() == 1) {
         Artifact *output = *outputs.cbegin();
         const FileTags &fileTags = output->fileTags();
         QBS_ASSERT(!fileTags.empty(), return);
-        QScriptValue outputsForFileTag = scriptValue.property(fileTags.cbegin()->toString());
-        outputScriptValue = outputsForFileTag.property(0);
+        const ScopedJsValue outputsForFileTag(
+                    engine->context(),
+                    getJsProperty(engine->context(), scriptValue, fileTags.cbegin()->toString()));
+        outputScriptValue = JS_GetPropertyUint32(engine->context(), outputsForFileTag, 0);
     }
-    targetScriptValue.setProperty(StringConstants::outputVar(), outputScriptValue);
+    setJsProperty(engine->context(), targetScriptValue, StringConstants::outputVar(),
+                  outputScriptValue);
 }
 
-void Transformer::setupExplicitlyDependsOn(QScriptValue targetScriptValue)
+void Transformer::setupExplicitlyDependsOn(ScriptEngine *engine, JSValue targetScriptValue)
 {
-    const auto scriptEngine = static_cast<ScriptEngine *>(targetScriptValue.engine());
-    QScriptValue scriptValue = translateInOutputs(scriptEngine, explicitlyDependsOn,
-                                                  rule->module->name);
-    targetScriptValue.setProperty(StringConstants::explicitlyDependsOnVar(), scriptValue);
+    JSValue scriptValue = translateInOutputs(engine, explicitlyDependsOn, rule->module->name);
+    setJsProperty(engine->context(), targetScriptValue, StringConstants::explicitlyDependsOnVar(),
+                  scriptValue);
 }
 
-AbstractCommandPtr Transformer::createCommandFromScriptValue(const QScriptValue &scriptValue,
-                                                             const CodeLocation &codeLocation)
+AbstractCommandPtr Transformer::createCommandFromScriptValue(
+        ScriptEngine *engine, const JSValue &scriptValue, const CodeLocation &codeLocation)
 {
     AbstractCommandPtr cmdBase;
-    if (scriptValue.isUndefined() || !scriptValue.isValid())
+    if (JS_IsUndefined(scriptValue) || JS_IsUninitialized(scriptValue))
         return cmdBase;
-    QString className = scriptValue.property(StringConstants::classNameProperty()).toString();
+    QString className = getJsStringProperty(engine->context(), scriptValue,
+                                            StringConstants::classNameProperty());
     if (className == StringConstants::commandType())
         cmdBase = ProcessCommand::create();
     else if (className == StringConstants::javaScriptCommandType())
         cmdBase = JavaScriptCommand::create();
     if (cmdBase)
-        cmdBase->fillFromScriptValue(&scriptValue, codeLocation);
+        cmdBase->fillFromScriptValue(engine->context(), &scriptValue, codeLocation);
     if (className == StringConstants::commandType()) {
         auto procCmd = static_cast<ProcessCommand *>(cmdBase.get());
         procCmd->clearRelevantEnvValues();
@@ -248,18 +257,14 @@ AbstractCommandPtr Transformer::createCommandFromScriptValue(const QScriptValue
 }
 
 void Transformer::createCommands(ScriptEngine *engine, const PrivateScriptFunction &script,
-                                 const QScriptValueList &args)
+                                 const JSValueList &args)
 {
-    if (!script.scriptFunction.isValid() || script.scriptFunction.engine() != engine) {
-        script.scriptFunction = engine->evaluate(script.sourceCode(),
-                                                  script.location().filePath(),
-                                                  script.location().line());
-        if (Q_UNLIKELY(!script.scriptFunction.isFunction()))
-            throw ErrorInfo(Tr::tr("Invalid prepare script."), script.location());
-    }
-
-    QScriptValue scriptValue = script.scriptFunction.call(QScriptValue(), args);
-    engine->releaseResourcesOfScriptObjects();
+    JSValueList argv(args.cbegin(), args.cend());
+    const JSValue function = script.getFunction(engine, Tr::tr("Invalid prepare script."));
+    const ScopedJsValue scriptValue(
+                engine->context(),
+                JS_Call(engine->context(), function, engine->globalObject(),
+                int(argv.size()), argv.data()));
     propertiesRequestedInPrepareScript = engine->propertiesRequestedInScript();
     propertiesRequestedFromArtifactInPrepareScript = engine->propertiesRequestedFromArtifact();
     importedFilesUsedInPrepareScript = engine->importedFilesUsedInScript();
@@ -271,22 +276,24 @@ void Transformer::createCommands(ScriptEngine *engine, const PrivateScriptFuncti
                                                                      p->exportedModule));
     }
     engine->clearRequestedProperties();
-    if (Q_UNLIKELY(engine->hasErrorOrException(scriptValue)))
-        throw engine->lastError(scriptValue, script.location());
+    if (JsException ex = engine->checkAndClearException(script.location()))
+        throw ex.toErrorInfo();
     commands.clear();
-    if (scriptValue.isArray()) {
-        const int count = scriptValue.property(StringConstants::lengthProperty()).toInt32();
+    if (JS_IsArray(engine->context(), scriptValue)) {
+        const int count = JS_VALUE_GET_INT(getJsProperty(engine->context(), scriptValue,
+                                                         StringConstants::lengthProperty()));
         for (qint32 i = 0; i < count; ++i) {
-            QScriptValue item = scriptValue.property(i);
-            if (item.isValid() && !item.isUndefined()) {
-                const AbstractCommandPtr cmd
-                        = createCommandFromScriptValue(item, script.location());
+            ScopedJsValue item(engine->context(),
+                               JS_GetPropertyUint32(engine->context(), scriptValue, i));
+            if (!JS_IsUninitialized(item) && !JS_IsUndefined(item)) {
+                const AbstractCommandPtr cmd = createCommandFromScriptValue(engine, item,
+                                                                            script.location());
                 if (cmd)
                     commands.addCommand(cmd);
             }
         }
     } else {
-        const AbstractCommandPtr cmd = createCommandFromScriptValue(scriptValue,
+        const AbstractCommandPtr cmd = createCommandFromScriptValue(engine, scriptValue,
                                                                     script.location());
         if (cmd)
             commands.addCommand(cmd);
diff --git a/src/lib/corelib/buildgraph/transformer.h b/src/lib/corelib/buildgraph/transformer.h
index 8772ed868..927572310 100644
--- a/src/lib/corelib/buildgraph/transformer.h
+++ b/src/lib/corelib/buildgraph/transformer.h
@@ -52,6 +52,8 @@
 #include <tools/filetime.h>
 #include <tools/persistence.h>
 
+#include <quickjs.h>
+
 #include <QtCore/qhash.h>
 
 namespace qbs {
@@ -91,15 +93,14 @@ public:
     bool commandsNeedChangeTracking = false;
     bool markedForRerun = false;
 
-    static QScriptValue translateFileConfig(ScriptEngine *scriptEngine,
-                                            const Artifact *artifact,
-                                            const QString &defaultModuleName);
+    static JSValue translateFileConfig(ScriptEngine *engine, Artifact *artifact,
+                                       const QString &defaultModuleName);
     ResolvedProductPtr product() const;
-    void setupInputs(const QScriptValue &targetScriptValue);
-    void setupOutputs(QScriptValue targetScriptValue);
-    void setupExplicitlyDependsOn(QScriptValue targetScriptValue);
+    void setupInputs(ScriptEngine *engine, const JSValue &targetScriptValue);
+    void setupOutputs(ScriptEngine *engine, JSValue targetScriptValue);
+    void setupExplicitlyDependsOn(ScriptEngine *engine, JSValue targetScriptValue);
     void createCommands(ScriptEngine *engine, const PrivateScriptFunction &script,
-                        const QScriptValueList &args);
+                        const JSValueList &args);
     void rescueChangeTrackingData(const TransformerConstPtr &other);
 
     Set<QString> jobPools() const;
@@ -124,14 +125,13 @@ public:
 
 private:
     Transformer();
-    AbstractCommandPtr createCommandFromScriptValue(const QScriptValue &scriptValue,
+    AbstractCommandPtr createCommandFromScriptValue(ScriptEngine *engine, const JSValue &scriptValue,
                                                     const CodeLocation &codeLocation);
 
-    static void setupInputs(QScriptValue targetScriptValue, const ArtifactSet &inputs,
-            const QString &defaultModuleName);
-    static QScriptValue translateInOutputs(ScriptEngine *scriptEngine,
-                                           const ArtifactSet &artifacts,
-                                           const QString &defaultModuleName);
+    static void setupInputs(ScriptEngine *engine, JSValue targetScriptValue,
+                            const ArtifactSet &inputs, const QString &defaultModuleName);
+    static JSValue translateInOutputs(ScriptEngine *engine, const ArtifactSet &artifacts,
+                                      const QString &defaultModuleName);
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/buildgraph/transformerchangetracking.cpp b/src/lib/corelib/buildgraph/transformerchangetracking.cpp
index e44c31639..ae43e8219 100644
--- a/src/lib/corelib/buildgraph/transformerchangetracking.cpp
+++ b/src/lib/corelib/buildgraph/transformerchangetracking.cpp
@@ -39,6 +39,7 @@
 #include <tools/fileinfo.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qvariant.h>
 
@@ -157,7 +158,7 @@ bool TrafoChangeTracker::checkForPropertyChange(const Property &restoredProperty
     case Property::PropertyInArtifact:
         QBS_CHECK(false);
     }
-    if (restoredProperty.value != v) {
+    if (!qVariantsEqual(restoredProperty.value, v)) {
         qCDebug(lcBuildGraph).noquote().nospace()
                 << "Value for property '" << restoredProperty.moduleName << "."
                 << restoredProperty.propertyName << "' has changed.\n"
@@ -209,11 +210,9 @@ bool TrafoChangeTracker::isExportedModuleUpToDate(const QString &productName,
 bool TrafoChangeTracker::areExportedModulesUpToDate(
         const std::unordered_map<QString, ExportedModule> &exportedModules) const
 {
-    for (const auto &kv : exportedModules) {
-        if (!isExportedModuleUpToDate(kv.first, kv.second))
-            return false;
-    }
-    return true;
+    return Internal::all_of(exportedModules, [this](const auto &kv) {
+        return isExportedModuleUpToDate(kv.first, kv.second);
+    });
 }
 
 const Artifact *TrafoChangeTracker::getArtifact(const QString &filePath,
@@ -258,7 +257,7 @@ const ResolvedProduct *TrafoChangeTracker::getProduct(const QString &name) const
 
 bool TrafoChangeTracker::prepareScriptNeedsRerun() const
 {
-    for (const Property &property : qAsConst(m_transformer->propertiesRequestedInPrepareScript)) {
+    for (const Property &property : std::as_const(m_transformer->propertiesRequestedInPrepareScript)) {
         if (checkForPropertyChange(property, propertyMapByKind(property)))
             return true;
     }
@@ -270,7 +269,7 @@ bool TrafoChangeTracker::prepareScriptNeedsRerun() const
 
     for (auto it = m_transformer->propertiesRequestedFromArtifactInPrepareScript.constBegin();
          it != m_transformer->propertiesRequestedFromArtifactInPrepareScript.constEnd(); ++it) {
-        for (const Property &property : qAsConst(it.value())) {
+        for (const Property &property : std::as_const(it.value())) {
             const Artifact * const artifact = getArtifact(it.key(), property.productName);
             if (!artifact)
                 return true;
@@ -298,15 +297,14 @@ bool TrafoChangeTracker::prepareScriptNeedsRerun() const
 
 bool TrafoChangeTracker::commandsNeedRerun() const
 {
-    for (const Property &property : qAsConst(m_transformer->propertiesRequestedInCommands)) {
+    for (const Property &property : std::as_const(m_transformer->propertiesRequestedInCommands)) {
         if (checkForPropertyChange(property, propertyMapByKind(property)))
             return true;
     }
 
-    QMap<QString, SourceArtifactConstPtr> artifactMap;
     for (auto it = m_transformer->propertiesRequestedFromArtifactInCommands.cbegin();
          it != m_transformer->propertiesRequestedFromArtifactInCommands.cend(); ++it) {
-        for (const Property &property : qAsConst(it.value())) {
+        for (const Property &property : std::as_const(it.value())) {
             const Artifact * const artifact = getArtifact(it.key(), property.productName);
             if (!artifact)
                 return true;
@@ -333,7 +331,7 @@ bool TrafoChangeTracker::commandsNeedRerun() const
         return true;
 
     // TODO: Also track env access in JS commands and prepare scripts
-    for (const AbstractCommandPtr &c : qAsConst(m_transformer->commands.commands())) {
+    for (const AbstractCommandPtr &c : std::as_const(m_transformer->commands.commands())) {
         if (c->type() != AbstractCommand::ProcessCommandType)
             continue;
         const ProcessCommandPtr &processCmd = std::static_pointer_cast<ProcessCommand>(c);
diff --git a/src/lib/corelib/corelib.pro b/src/lib/corelib/corelib.pro
deleted file mode 100644
index afe07f48f..000000000
--- a/src/lib/corelib/corelib.pro
+++ /dev/null
@@ -1,43 +0,0 @@
-TARGET = qbscore
-include(../library.pri)
-include(../bundledlibs.pri)
-
-qbs_use_bundled_qtscript {
-    include(../scriptengine/use_scriptengine.pri)
-} else {
-    QT += script
-}
-
-include(../pkgconfig/use_pkgconfig.pri)
-
-isEmpty(QBS_RELATIVE_LIBEXEC_PATH) {
-    win32:QBS_RELATIVE_LIBEXEC_PATH=../bin
-    else:QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs
-}
-DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\"
-
-QT += core-private network
-
-INCLUDEPATH += $$PWD
-
-include(api/api.pri)
-include(buildgraph/buildgraph.pri)
-include(generators/generators.pri)
-include(jsextensions/jsextensions.pri)
-include(language/language.pri)
-include(logging/logging.pri)
-include(parser/parser.pri)
-include(tools/tools.pri)
-
-win32:LIBS += -lpsapi -lshell32
-
-HEADERS += \
-    qbs.h
-
-!qbs_no_dev_install {
-    qbs_h.files = qbs.h
-    qbs_h.path = $${QBS_INSTALL_PREFIX}/include/qbs
-    use_pri.files = use_installed_corelib.pri ../../../qbs_version.pri
-    use_pri.path = $${qbs_h.path}
-    INSTALLS += qbs_h use_pri
-}
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index 6656d638b..1a7890166 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -7,31 +7,26 @@ QbsLibrary {
         name: "Qt.core5compat";
         condition: Utilities.versionCompare(Qt.core.version, "6.0.0") >= 0
     }
-    Depends {
-        name: "Qt.script"
-        condition: !qbsbuildconfig.useBundledQtScript
-        required: false
-    }
-    Depends {
-        name: "qbsscriptengine"
-        condition: qbsbuildconfig.useBundledQtScript || !Qt.script.present
-    }
+    Depends { name: "quickjs" }
     Depends { name: "qbspkgconfig" }
     name: "qbscore"
-    property stringList bundledQtScriptIncludes: qbsbuildconfig.useBundledQtScript
-            || !Qt.script.present ? qbsscriptengine.includePaths : []
-    cpp.includePaths: base.concat(bundledQtScriptIncludes).concat([
+    cpp.includePaths: base.concat([
         ".",
         "../.." // for the plugin headers
     ])
-    property stringList enableUnitTestsDefines:
-        qbsbuildconfig.enableUnitTests ? ["QBS_ENABLE_UNIT_TESTS"] : []
-    property stringList systemSettingsDirDefines: qbsbuildconfig.systemSettingsDir
-        ? ['QBS_SYSTEM_SETTINGS_DIR="' + qbsbuildconfig.systemSettingsDir + '"'] : []
-    cpp.defines: base.concat([
-        "QBS_RELATIVE_LIBEXEC_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeLibexecPath),
-        "QBS_VERSION=" + Utilities.cStringQuote(version),
-    ]).concat(enableUnitTestsDefines).concat(systemSettingsDirDefines)
+    cpp.defines: {
+        var defines = base.concat([
+            "QBS_RELATIVE_LIBEXEC_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeLibexecPath),
+            "QBS_VERSION=" + Utilities.cStringQuote(version),
+        ]);
+        if (project.withTests)
+            defines.push("QBS_WITH_TESTS");
+        if (qbsbuildconfig.enableUnitTests)
+            defines.push("QBS_ENABLE_UNIT_TESTS");
+        if (qbsbuildconfig.systemSettingsDir)
+            defines.push('QBS_SYSTEM_SETTINGS_DIR="' + qbsbuildconfig.systemSettingsDir + '"');
+        return defines;
+    }
 
     Properties {
         condition: qbs.targetOS.contains("windows")
@@ -172,7 +167,6 @@ QbsLibrary {
             "rulesapplicator.h",
             "rulesevaluationcontext.cpp",
             "rulesevaluationcontext.h",
-            "scriptclasspropertyiterator.h",
             "timestampsupdater.cpp",
             "timestampsupdater.h",
             "transformer.cpp",
@@ -232,6 +226,8 @@ QbsLibrary {
             "environmentextension.cpp",
             "file.cpp",
             "fileinfoextension.cpp",
+            "host.cpp",
+            "jsextension.h",
             "jsextensions.cpp",
             "jsextensions.h",
             "moduleproperties.cpp",
@@ -259,9 +255,6 @@ QbsLibrary {
         prefix: "jsextensions/"
         condition: qbs.targetOS.contains("darwin")
         files: [
-            // This is ugly, but because of QBS-1592 we cannot check the platform in the header
-            // using Q_OS_DARWIN
-            "propertylist_darwin.h",
             "propertylist_darwin.mm",
             "propertylistutils.h",
             "propertylistutils.mm",
@@ -273,20 +266,13 @@ QbsLibrary {
         files: [
             "artifactproperties.cpp",
             "artifactproperties.h",
-            "astimportshandler.cpp",
-            "astimportshandler.h",
-            "astpropertiesitemhandler.cpp",
-            "astpropertiesitemhandler.h",
             "asttools.cpp",
             "asttools.h",
             "builtindeclarations.cpp",
             "builtindeclarations.h",
             "deprecationinfo.h",
-            "evaluationdata.h",
             "evaluator.cpp",
             "evaluator.h",
-            "evaluatorscriptclass.cpp",
-            "evaluatorscriptclass.h",
             "filecontext.cpp",
             "filecontext.h",
             "filecontextbase.cpp",
@@ -302,29 +288,13 @@ QbsLibrary {
             "itemobserver.h",
             "itempool.cpp",
             "itempool.h",
-            "itemreader.cpp",
-            "itemreader.h",
-            "itemreaderastvisitor.cpp",
-            "itemreaderastvisitor.h",
-            "itemreadervisitorstate.cpp",
-            "itemreadervisitorstate.h",
             "itemtype.h",
             "jsimports.h",
             "language.cpp",
             "language.h",
-            "loader.cpp",
-            "loader.h",
-            "moduleloader.cpp",
-            "moduleloader.h",
-            "modulemerger.cpp",
-            "modulemerger.h",
             "moduleproviderinfo.h",
-            "moduleproviderloader.cpp",
-            "moduleproviderloader.h",
             "preparescriptobserver.cpp",
             "preparescriptobserver.h",
-            "projectresolver.cpp",
-            "projectresolver.h",
             "property.cpp",
             "property.h",
             "propertydeclaration.cpp",
@@ -352,6 +322,50 @@ QbsLibrary {
         files: "language/forward_decls.h"
     }
     Group {
+        name: "loader"
+        prefix: name + '/'
+        files: [
+            "astimportshandler.cpp",
+            "astimportshandler.h",
+            "astpropertiesitemhandler.cpp",
+            "astpropertiesitemhandler.h",
+            "dependenciesresolver.cpp",
+            "dependenciesresolver.h",
+            "groupshandler.cpp",
+            "groupshandler.h",
+            "itemreader.cpp",
+            "itemreader.h",
+            "itemreaderastvisitor.cpp",
+            "itemreaderastvisitor.h",
+            "itemreadervisitorstate.cpp",
+            "itemreadervisitorstate.h",
+            "loaderutils.cpp",
+            "loaderutils.h",
+            "localprofiles.cpp",
+            "localprofiles.h",
+            "moduleinstantiator.cpp",
+            "moduleinstantiator.h",
+            "moduleloader.cpp",
+            "moduleloader.h",
+            "modulepropertymerger.cpp",
+            "modulepropertymerger.h",
+            "moduleproviderloader.cpp",
+            "moduleproviderloader.h",
+            "probesresolver.cpp",
+            "probesresolver.h",
+            "productitemmultiplexer.cpp",
+            "productitemmultiplexer.h",
+            "productresolver.cpp",
+            "productresolver.h",
+            "productscollector.cpp",
+            "productscollector.h",
+            "productsresolver.cpp",
+            "productsresolver.h",
+            "projectresolver.cpp",
+            "projectresolver.h",
+        ]
+    }
+    Group {
         name: "logging"
         prefix: name + '/'
         files: [
@@ -407,6 +421,7 @@ QbsLibrary {
             "cleanoptions.cpp",
             "codelocation.cpp",
             "commandechomode.cpp",
+            "deprecationwarningmode.cpp",
             "dynamictypecheck.h",
             "error.cpp",
             "executablefinder.cpp",
@@ -436,8 +451,10 @@ QbsLibrary {
             "msvcinfo.cpp",
             "msvcinfo.h",
             "pathutils.h",
+            "pimpl.h",
             "persistence.cpp",
             "persistence.h",
+            "porting.h",
             "preferences.cpp",
             "processresult.cpp",
             "processresult_p.h",
@@ -449,6 +466,7 @@ QbsLibrary {
             "progressobserver.cpp",
             "progressobserver.h",
             "projectgeneratormanager.cpp",
+            "propagate_const.h",
             "qbsassert.cpp",
             "qbsassert.h",
             "qbspluginmanager.cpp",
@@ -491,10 +509,12 @@ QbsLibrary {
             "cleanoptions.h",
             "codelocation.h",
             "commandechomode.h",
+            "deprecationwarningmode.h",
             "error.h",
             "generateoptions.h",
             "installoptions.h",
             "joblimits.h",
+            "mutexdata.h",
             "preferences.h",
             "processresult.h",
             "profile.h",
@@ -519,13 +539,4 @@ QbsLibrary {
             "applecodesignutils.h"
         ]
     }
-    Group {
-        name: "use_installed.pri"
-        files: [
-            "use_installed_corelib.pri",
-            "../../../qbs_version.pri"
-        ]
-        qbs.install: qbsbuildconfig.installApiHeaders
-        qbs.installDir: headerInstallPrefix
-    }
 }
diff --git a/src/lib/corelib/generators/generator.cpp b/src/lib/corelib/generators/generator.cpp
index d3cdce412..8fdd3555e 100644
--- a/src/lib/corelib/generators/generator.cpp
+++ b/src/lib/corelib/generators/generator.cpp
@@ -82,14 +82,11 @@ ErrorInfo ProjectGenerator::generate(const QList<Project> &projects,
                                 const QString &qbsSettingsDir,
                                 const Internal::Logger &logger)
 {
-    d->projects = projects;
-    std::sort(d->projects.begin(), d->projects.end(),
-              [](const Project &a, const Project &b) {
-                  return _configurationName(a) < _configurationName(b); });
-    d->buildConfigurations = buildConfigurations;
-    std::sort(d->buildConfigurations.begin(), d->buildConfigurations.end(),
-              [](const QVariantMap &a, const QVariantMap &b) {
-                  return _configurationName(a) < _configurationName(b); });
+    d->projects = Internal::sorted(projects, [](const Project &lhs, const Project &rhs) {
+        return _configurationName(lhs) < _configurationName(rhs); });
+    d->buildConfigurations = Internal::sorted(
+        buildConfigurations, [](const QVariantMap &lhs, const QVariantMap &rhs) {
+            return _configurationName(lhs) < _configurationName(rhs); });
     d->installOptions = installOptions;
     d->qbsSettingsDir = qbsSettingsDir;
     d->logger = logger;
@@ -210,7 +207,7 @@ const GeneratableProject ProjectGenerator::project() const
 {
     QMap<QString, ProjectData> rootProjects;
     GeneratableProject proj;
-    for (const auto &project : qAsConst(d->projects)) {
+    for (const auto &project : std::as_const(d->projects)) {
         const QString configurationName = _configurationName(project);
         rootProjects.insert(configurationName, project.projectData());
         proj.projects.insert(configurationName, project);
diff --git a/src/lib/corelib/generators/generators.pri b/src/lib/corelib/generators/generators.pri
deleted file mode 100644
index e9730d895..000000000
--- a/src/lib/corelib/generators/generators.pri
+++ /dev/null
@@ -1,38 +0,0 @@
-include(../../../install_prefix.pri)
-
-SOURCES += \
-    $$PWD/generatableprojectiterator.cpp \
-    $$PWD/generator.cpp \
-    $$PWD/generatordata.cpp \
-    $$PWD/generatorutils.cpp \
-    $$PWD/generatorversioninfo.cpp \
-    $$PWD/xmlproject.cpp \
-    $$PWD/xmlprojectwriter.cpp\
-    $$PWD/xmlproperty.cpp \
-    $$PWD/xmlpropertygroup.cpp \
-    $$PWD/xmlworkspace.cpp \
-    $$PWD/xmlworkspacewriter.cpp
-
-HEADERS += \
-    $$PWD/generatableprojectiterator.h \
-    $$PWD/generator.h \
-    $$PWD/generatordata.h \
-    $$PWD/generatorutils.h \
-    $$PWD/generatorversioninfo.h \
-    $$PWD/igeneratableprojectvisitor.h \
-    $$PWD/ixmlnodevisitor.h \
-    $$PWD/ixmlnodevisitor.h \
-    $$PWD/xmlproject.h \
-    $$PWD/xmlprojectwriter.h \
-    $$PWD/xmlproperty.h \
-    $$PWD/xmlpropertygroup.h \
-    $$PWD/xmlworkspace.h \
-    $$PWD/xmlworkspacewriter.h
-
-!qbs_no_dev_install {
-    generators_headers.files = \
-        $$PWD/generator.h \
-        $$PWD/generatordata.h
-    generators_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/generators
-    INSTALLS += generators_headers
-}
diff --git a/src/lib/corelib/generators/generatorutils.cpp b/src/lib/corelib/generators/generatorutils.cpp
index 3767c9467..d2dcbba25 100644
--- a/src/lib/corelib/generators/generatorutils.cpp
+++ b/src/lib/corelib/generators/generatorutils.cpp
@@ -30,6 +30,8 @@
 
 #include "generatorutils.h"
 
+#include <tools/stlutils.h>
+
 namespace qbs {
 namespace gen {
 namespace utils {
@@ -125,7 +127,7 @@ std::vector<ProductData> dependenciesOf(const ProductData &qbsProduct,
 {
     std::vector<ProductData> result;
     const auto &depsNames = qbsProduct.dependencies();
-    for (const auto &product : qAsConst(genProject.products)) {
+    for (const auto &product : std::as_const(genProject.products)) {
         const auto pt = product.type();
         if (!pt.contains(QLatin1String("staticlibrary")))
             continue;
@@ -142,7 +144,8 @@ QString targetBinary(const ProductData &qbsProduct)
     const auto &type = qbsProduct.type();
     if (type.contains(QLatin1String("application"))) {
         return QFileInfo(qbsProduct.targetExecutable()).fileName();
-    } else if (type.contains(QLatin1String("staticlibrary"))) {
+    }
+    if (type.contains(QLatin1String("staticlibrary"))) {
         for (const auto &artifact : qbsProduct.targetArtifacts()) {
             if (artifact.fileTags().contains(QLatin1String("staticlibrary")))
                 return QFileInfo(artifact.filePath()).fileName();
@@ -188,11 +191,10 @@ QStringList cppStringModuleProperties(const PropertyMap &qbsProps,
 {
     QStringList properties;
     for (const auto &propertyName : propertyNames) {
-        const auto entries = qbsProps.getModuleProperty(
-                    Internal::StringConstants::cppModule(),
-                    propertyName).toStringList();
-        for (const auto &entry : entries)
-            properties.push_back(entry.trimmed());
+        const auto entries = qbsProps.getModuleProperty(Internal::StringConstants::cppModule(),
+                                                        propertyName).toStringList();
+        Internal::transform(entries, properties, [](const auto &entry) {
+            return entry.trimmed(); });
     }
     return properties;
 }
@@ -220,7 +222,7 @@ static QString parseFlagValue(const QString &flagKey,
             return parts.at(1).trimmed();
     } else if (flagKey < *flagIt) {
         // In this case an option is in form of 'flagKey<flagValue>'.
-        return flagIt->mid(flagKey.count()).trimmed();
+        return flagIt->mid(flagKey.size()).trimmed();
     } else {
         // In this case an option is in form of 'flagKey <flagValue>'.
         ++flagIt;
diff --git a/src/lib/corelib/generators/generatorversioninfo.h b/src/lib/corelib/generators/generatorversioninfo.h
index 38616eb98..5c867326f 100644
--- a/src/lib/corelib/generators/generatorversioninfo.h
+++ b/src/lib/corelib/generators/generatorversioninfo.h
@@ -74,7 +74,7 @@ private:
     utils::ArchitectureFlags m_archs;
 };
 
-inline quint32 qHash(const VersionInfo &info)
+inline auto qHash(const VersionInfo &info)
 {
     return qHash(info.version().toString());
 }
diff --git a/src/lib/corelib/jsextensions/binaryfile.cpp b/src/lib/corelib/jsextensions/binaryfile.cpp
index bb35235b1..e4d2583dd 100644
--- a/src/lib/corelib/jsextensions/binaryfile.cpp
+++ b/src/lib/corelib/jsextensions/binaryfile.cpp
@@ -39,26 +39,22 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+
 #include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/hostosinfo.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qfile.h>
 #include <QtCore/qfileinfo.h>
-#include <QtCore/qobject.h>
-#include <QtCore/qvariant.h>
-
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
 
 namespace qbs {
 namespace Internal {
 
-class BinaryFile : public QObject, public QScriptable, public ResourceAcquiringScriptObject
+class BinaryFile : public JsExtension<BinaryFile>
 {
-    Q_OBJECT
-    Q_ENUMS(OpenMode)
+    friend class JsExtension<BinaryFile>;
 public:
     enum OpenMode {
         ReadOnly = 1,
@@ -66,63 +62,85 @@ public:
         ReadWrite = ReadOnly | WriteOnly
     };
 
-    static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine);
-
-    Q_INVOKABLE void close();
-    Q_INVOKABLE QString filePath();
-    Q_INVOKABLE bool atEof() const;
-    Q_INVOKABLE qint64 size() const;
-    Q_INVOKABLE void resize(qint64 size);
-    Q_INVOKABLE qint64 pos() const;
-    Q_INVOKABLE void seek(qint64 pos);
-    Q_INVOKABLE QVariantList read(qint64 size);
-    Q_INVOKABLE void write(const QVariantList &data);
+    static const char *name() { return "BinaryFile"; }
+    static void declareEnums(JSContext *ctx, JSValue classObj);
+    static JSValue ctor(JSContext *ctx, JSValueConst, JSValueConst,
+                        int argc, JSValueConst *argv, int);
 
 private:
-    explicit BinaryFile(QScriptContext *context, const QString &filePath, OpenMode mode = ReadOnly);
-
-    bool checkForClosed() const;
-
-    // ResourceAcquiringScriptObject implementation
-    void releaseResources() override;
+    static void setupMethods(JSContext *ctx, JSValue obj);
+
+    DEFINE_JS_FORWARDER(jsClose, &BinaryFile::close, "BinaryFile.close")
+    DEFINE_JS_FORWARDER(jsFilePath, &BinaryFile::filePath, "BinaryFile.filePath")
+    DEFINE_JS_FORWARDER(jsAtEof, &BinaryFile::atEof, "BinaryFile.atEof")
+    DEFINE_JS_FORWARDER(jsSize, &BinaryFile::size, "BinaryFile.size")
+    DEFINE_JS_FORWARDER(jsResize, &BinaryFile::resize, "BinaryFile.resize")
+    DEFINE_JS_FORWARDER(jsPos, &BinaryFile::pos, "BinaryFile.pos")
+    DEFINE_JS_FORWARDER(jsSeek, &BinaryFile::seek, "BinaryFile.seek")
+    DEFINE_JS_FORWARDER(jsRead, &BinaryFile::read, "BinaryFile.read")
+    DEFINE_JS_FORWARDER(jsWrite, &BinaryFile::write, "BinaryFile.write")
+
+    void close();
+    QString filePath();
+    bool atEof() const;
+    qint64 size() const;
+    void resize(qint64 size);
+    qint64 pos() const;
+    void seek(qint64 pos);
+    QByteArray read(qint64 size);
+    void write(const QByteArray &data);
+
+    explicit BinaryFile(JSContext *, const QString &filePath, OpenMode mode);
+
+    void checkForClosed() const;
 
     std::unique_ptr<QFile> m_file;
 };
 
-QScriptValue BinaryFile::ctor(QScriptContext *context, QScriptEngine *engine)
+void BinaryFile::declareEnums(JSContext *ctx, JSValue classObj)
 {
-    BinaryFile *t = nullptr;
-    switch (context->argumentCount()) {
-    case 0:
-        return context->throwError(Tr::tr("BinaryFile constructor needs "
-                                          "path of file to be opened."));
-    case 1:
-        t = new BinaryFile(context, context->argument(0).toString());
-        break;
-    case 2:
-        t = new BinaryFile(context,
-                           context->argument(0).toString(),
-                           static_cast<OpenMode>(context->argument(1).toInt32()));
-        break;
-    default:
-        return context->throwError(Tr::tr("BinaryFile constructor takes at most two parameters."));
-    }
-
-    const auto se = static_cast<ScriptEngine *>(engine);
-    se->addResourceAcquiringScriptObject(t);
-    const DubiousContextList dubiousContexts {
-        DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
-    };
-    se->checkContext(QStringLiteral("qbs.BinaryFile"), dubiousContexts);
-    se->setUsesIo();
+    DECLARE_ENUM(ctx, classObj, ReadOnly);
+    DECLARE_ENUM(ctx, classObj, WriteOnly);
+    DECLARE_ENUM(ctx, classObj, ReadWrite);
+}
 
-    return engine->newQObject(t, QScriptEngine::QtOwnership);
+void BinaryFile::setupMethods(JSContext *ctx, JSValue obj)
+{
+    setupMethod(ctx, obj, "close", &jsClose, 0);
+    setupMethod(ctx, obj, "filePath", &jsFilePath, 0);
+    setupMethod(ctx, obj, "atEof", &jsAtEof, 0);
+    setupMethod(ctx, obj, "size", &jsSize, 0);
+    setupMethod(ctx, obj, "resize", &jsResize, 0);
+    setupMethod(ctx, obj, "pos", &jsPos, 0);
+    setupMethod(ctx, obj, "seek", &jsSeek, 0);
+    setupMethod(ctx, obj, "read", &jsRead, 0);
+    setupMethod(ctx, obj, "write", &jsWrite, 0);
 }
 
-BinaryFile::BinaryFile(QScriptContext *context, const QString &filePath, OpenMode mode)
+JSValue BinaryFile::ctor(JSContext *ctx, JSValueConst, JSValueConst,
+                         int argc, JSValueConst *argv, int)
 {
-    Q_ASSERT(thisObject().engine() == engine());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "BinaryFile constructor", argc, argv);
+        OpenMode mode = ReadOnly;
+        if (argc > 1) {
+            mode = static_cast<OpenMode>
+                    (fromArg<qint32>(ctx, "BinaryFile constructor", 2, argv[1]));
+        }
+        const JSValue obj = createObject(ctx, filePath, mode);
+
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts {
+            DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
+        };
+        se->checkContext(QStringLiteral("qbs.BinaryFile"), dubiousContexts);
+        se->setUsesIo();
+        return obj;
+    } catch (const QString &error) { return throwError(ctx, error); }
+}
 
+BinaryFile::BinaryFile(JSContext *, const QString &filePath, OpenMode mode)
+{
     QIODevice::OpenMode m = QIODevice::NotOpen;
     switch (mode) {
     case ReadWrite:
@@ -135,134 +153,91 @@ BinaryFile::BinaryFile(QScriptContext *context, const QString &filePath, OpenMod
         m = QIODevice::WriteOnly;
         break;
     default:
-        context->throwError(Tr::tr("Unable to open file '%1': Undefined mode '%2'")
-                            .arg(filePath, mode));
-        return;
+        throw Tr::tr("Unable to open file '%1': Undefined mode '%2'").arg(filePath).arg(mode);
     }
 
-    m_file = std::make_unique<QFile>(filePath);
-    if (Q_UNLIKELY(!m_file->open(m))) {
-        context->throwError(Tr::tr("Unable to open file '%1': %2")
-                            .arg(filePath, m_file->errorString()));
-        m_file.reset();
-    }
+    auto file = std::make_unique<QFile>(filePath);
+    if (Q_UNLIKELY(!file->open(m)))
+        throw Tr::tr("Unable to open file '%1': %2").arg(filePath, file->errorString());
+    m_file = std::move(file);
 }
 
 void BinaryFile::close()
 {
-    if (checkForClosed())
-        return;
+    checkForClosed();
     m_file->close();
     m_file.reset();
 }
 
 QString BinaryFile::filePath()
 {
-    if (checkForClosed())
-        return {};
+    checkForClosed();
     return QFileInfo(*m_file).absoluteFilePath();
 }
 
 bool BinaryFile::atEof() const
 {
-    if (checkForClosed())
-        return true;
+    checkForClosed();
     return m_file->atEnd();
 }
 
 qint64 BinaryFile::size() const
 {
-    if (checkForClosed())
-        return -1;
+    checkForClosed();
     return m_file->size();
 }
 
 void BinaryFile::resize(qint64 size)
 {
-    if (checkForClosed())
-        return;
-    if (Q_UNLIKELY(!m_file->resize(size))) {
-        context()->throwError(Tr::tr("Could not resize '%1': %2")
-                              .arg(m_file->fileName(), m_file->errorString()));
-    }
+    checkForClosed();
+    if (Q_UNLIKELY(!m_file->resize(size)))
+        throw Tr::tr("Could not resize '%1': %2").arg(m_file->fileName(), m_file->errorString());
 }
 
 qint64 BinaryFile::pos() const
 {
-    if (checkForClosed())
-        return -1;
+    checkForClosed();
     return m_file->pos();
 }
 
 void BinaryFile::seek(qint64 pos)
 {
-    if (checkForClosed())
-        return;
-    if (Q_UNLIKELY(!m_file->seek(pos))) {
-        context()->throwError(Tr::tr("Could not seek '%1': %2")
-                              .arg(m_file->fileName(), m_file->errorString()));
-    }
+    checkForClosed();
+    if (Q_UNLIKELY(!m_file->seek(pos)))
+        throw Tr::tr("Could not seek '%1': %2").arg(m_file->fileName(), m_file->errorString());
 }
 
-QVariantList BinaryFile::read(qint64 size)
+QByteArray BinaryFile::read(qint64 size)
 {
-    if (checkForClosed())
-        return {};
-    const QByteArray bytes = m_file->read(size);
+    checkForClosed();
+    QByteArray bytes = m_file->read(size);
     if (Q_UNLIKELY(bytes.size() == 0 && m_file->error() != QFile::NoError)) {
-        context()->throwError(Tr::tr("Could not read from '%1': %2")
-                              .arg(m_file->fileName(), m_file->errorString()));
+        throw (Tr::tr("Could not read from '%1': %2")
+                .arg(m_file->fileName(), m_file->errorString()));
     }
-
-    QVariantList data;
-    std::for_each(bytes.constBegin(), bytes.constEnd(), [&data](const char &c) {
-        data.append(c); });
-    return data;
+    return bytes;
 }
 
-void BinaryFile::write(const QVariantList &data)
+void BinaryFile::write(const QByteArray &data)
 {
-    if (checkForClosed())
-        return;
-
-    QByteArray bytes;
-    std::for_each(data.constBegin(), data.constEnd(), [&bytes](const QVariant &v) {
-        bytes.append(char(v.toUInt() & 0xFF)); });
-
-    const qint64 size = m_file->write(bytes);
+    checkForClosed();
+    const qint64 size = m_file->write(data);
     if (Q_UNLIKELY(size == -1)) {
-        context()->throwError(Tr::tr("Could not write to '%1': %2")
-                              .arg(m_file->fileName(), m_file->errorString()));
+        throw Tr::tr("Could not write to '%1': %2")
+                .arg(m_file->fileName(), m_file->errorString());
     }
 }
 
-bool BinaryFile::checkForClosed() const
-{
-    if (m_file)
-        return false;
-    if (QScriptContext *ctx = context())
-        ctx->throwError(Tr::tr("Access to BinaryFile object that was already closed."));
-    return true;
-}
-
-void BinaryFile::releaseResources()
+void BinaryFile::checkForClosed() const
 {
-    close();
-    deleteLater();
+    if (!m_file)
+        throw Tr::tr("Access to BinaryFile object that was already closed.");
 }
 
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionBinaryFile(QScriptValue extensionObject)
+void initializeJsExtensionBinaryFile(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    const QScriptValue obj = engine->newQMetaObject(&BinaryFile::staticMetaObject,
-                                                    engine->newFunction(&BinaryFile::ctor));
-    extensionObject.setProperty(QStringLiteral("BinaryFile"), obj);
+    qbs::Internal::BinaryFile::registerClass(engine, extensionObject);
 }
-
-Q_DECLARE_METATYPE(qbs::Internal::BinaryFile *)
-
-#include "binaryfile.moc"
diff --git a/src/lib/corelib/jsextensions/domxml.cpp b/src/lib/corelib/jsextensions/domxml.cpp
index 86e1574c6..35cff186b 100644
--- a/src/lib/corelib/jsextensions/domxml.cpp
+++ b/src/lib/corelib/jsextensions/domxml.cpp
@@ -38,428 +38,516 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+
 #include <language/scriptengine.h>
 
 #include <QtCore/qfile.h>
-#include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
 
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
-#include <QtScript/qscriptable.h>
-
 #include <QtXml/qdom.h>
 
 namespace qbs {
 namespace Internal {
 
-class XmlDomDocument;
-
-class XmlDomNode: public QObject, public QScriptable
+template<class C> class XmlDomNode : public JsExtension<XmlDomNode<C>>
 {
-    Q_OBJECT
 public:
-    static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine);
-
-    Q_INVOKABLE bool isElement() const;
-    Q_INVOKABLE bool isCDATASection() const;
-    Q_INVOKABLE bool isText() const;
-
-    Q_INVOKABLE QString attribute(const QString & name, const QString & defValue = QString());
-    Q_INVOKABLE void setAttribute(const QString & name, const QString & value);
-    Q_INVOKABLE bool hasAttribute(const QString & name) const;
-    Q_INVOKABLE QString tagName() const;
-    Q_INVOKABLE void setTagName(const QString & name);
-
-    Q_INVOKABLE QString text() const;
-
-    Q_INVOKABLE QString data() const;
-    Q_INVOKABLE void setData(const QString &v) const;
-
-    Q_INVOKABLE void clear();
-    Q_INVOKABLE bool hasAttributes() const;
-    Q_INVOKABLE bool hasChildNodes() const;
-    Q_INVOKABLE QScriptValue parentNode() const;
-    Q_INVOKABLE QScriptValue firstChild(const QString & tagName = QString());
-    Q_INVOKABLE QScriptValue lastChild(const QString & tagName = QString()) const;
-    Q_INVOKABLE QScriptValue previousSibling(const QString & tagName = QString()) const;
-    Q_INVOKABLE QScriptValue nextSibling(const QString & tagName = QString()) const;
-
-    Q_INVOKABLE QScriptValue appendChild(const QScriptValue &newChild);
-    Q_INVOKABLE QScriptValue insertBefore(const QScriptValue& newChild, const QScriptValue& refChild);
-    Q_INVOKABLE QScriptValue insertAfter(const QScriptValue& newChild, const QScriptValue& refChild);
-    Q_INVOKABLE QScriptValue replaceChild(const QScriptValue& newChild, const QScriptValue& oldChild);
-    Q_INVOKABLE QScriptValue removeChild(const QScriptValue& oldChild);
-
-protected:
-    friend class XmlDomDocument;
-    XmlDomNode(const QDomNode &other = QDomNode());
-    QDomNode m_domNode;
-};
+    static const char *name();
+    XmlDomNode(const C &value) : m_value(value) {}
+    XmlDomNode(JSContext *, const QString &name);
+    XmlDomNode(JSContext *) {}
 
-class XmlDomDocument: public XmlDomNode
-{
-    Q_OBJECT
-public:
-    static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine);
-    Q_INVOKABLE QScriptValue documentElement();
-    Q_INVOKABLE QScriptValue createElement(const QString & tagName);
-    Q_INVOKABLE QScriptValue createCDATASection(const QString & value);
-    Q_INVOKABLE QScriptValue createTextNode(const QString & value);
-
-    Q_INVOKABLE bool setContent(const QString & content);
-    Q_INVOKABLE QString toString(int indent = 1);
+    static JSValue ctor(JSContext *ctx, JSValueConst, JSValueConst,
+                        int argc, JSValueConst *argv, int);
+    static void setupMethods(JSContext *ctx, JSValue obj);
 
-    Q_INVOKABLE void save(const QString & filePath, int indent = 1);
-    Q_INVOKABLE void load(const QString & filePath);
-
-protected:
-    XmlDomDocument(QScriptContext *context, const QString &name = QString());
+    C value() const { return m_value; }
 
 private:
-    QDomDocument m_domDocument;
-};
-
-QScriptValue XmlDomDocument::ctor(QScriptContext *context, QScriptEngine *engine)
-{
-    XmlDomDocument *xml = nullptr;
-    switch (context->argumentCount()) {
-    case 0:
-        xml = new XmlDomDocument(context);
-        break;
-    case 1:
-        xml = new XmlDomDocument(context, context->argument(0).toString());
-        break;
-    default:
-        return context->throwError(QStringLiteral("DomXml(QString file = QLatin1String(\"\"))"));
-    }
-    QScriptValue obj = engine->newQObject(xml, QScriptEngine::ScriptOwnership);
-    static_cast<ScriptEngine *>(engine)->setUsesIo();
-    return obj;
-}
-
-QScriptValue XmlDomDocument::documentElement()
-{
-    return engine()->newQObject(new XmlDomNode(m_domDocument.documentElement()), QScriptEngine::ScriptOwnership);
-}
-
-QScriptValue XmlDomDocument::createElement(const QString &tagName)
-{
-    return engine()->newQObject(new XmlDomNode(m_domDocument.createElement(tagName)), QScriptEngine::ScriptOwnership);
-}
-
-QScriptValue XmlDomDocument::createCDATASection(const QString &value)
-{
-    return engine()->newQObject(new XmlDomNode(m_domDocument.createCDATASection(value)), QScriptEngine::ScriptOwnership);
-}
-
-QScriptValue XmlDomDocument::createTextNode(const QString &value)
-{
-    return engine()->newQObject(new XmlDomNode(m_domDocument.createTextNode(value)), QScriptEngine::ScriptOwnership);
-}
-
-bool XmlDomDocument::setContent(const QString &content)
-{
-    return m_domDocument.setContent(content);
-}
-
-QString XmlDomDocument::toString(int indent)
-{
-    return m_domDocument.toString(indent);
-}
-
-void XmlDomDocument::save(const QString &filePath, int indent)
-{
-    QFile f(filePath);
-    if (!f.open(QIODevice::WriteOnly)) {
-        context()->throwError(QStringLiteral("unable to open '%1'")
-                              .arg(filePath));
-        return;
+#define XML_JS_FWD(name, func, text) DEFINE_JS_FORWARDER_QUAL(XmlDomNode, name, func, text)
+
+    XML_JS_FWD(jsIsElement, &XmlDomNode::isElement, "DomNode.isElement");
+    XML_JS_FWD(jsIsCDATASection, &XmlDomNode::isCDATASection, "DomNode.isCDATASection");
+    XML_JS_FWD(jsIsText, &XmlDomNode::isText, "DomNode.isText");
+    XML_JS_FWD(jsHasAttribute, &XmlDomNode::hasAttribute, "DomNode.hasAttribute");
+    XML_JS_FWD(jsTagName, &XmlDomNode::tagName, "DomNode.tagName");
+    XML_JS_FWD(jsSetTagName, &XmlDomNode::setTagName, "DomNode.setTagName");
+    XML_JS_FWD(jsText, &XmlDomNode::text, "DomNode.text");
+    XML_JS_FWD(jsData, &XmlDomNode::data, "DomNode.data");
+    XML_JS_FWD(jsSetData, &XmlDomNode::setData, "DomNode.setData");
+    XML_JS_FWD(jsClear, &XmlDomNode::clear, "DomNode.clear");
+    XML_JS_FWD(jsHasAttributes, &XmlDomNode::hasAttributes, "DomNode.hasAttributes");
+    XML_JS_FWD(jsHasChildNodes, &XmlDomNode::hasChildNodes, "DomNode.hasChildNodes");
+    XML_JS_FWD(jsSetAttribute, &XmlDomNode::setAttribute, "DomNode.setAttribute");
+    XML_JS_FWD(jsAppendChild, &XmlDomNode::appendChild, "DomNode.appendChild");
+    XML_JS_FWD(jsInsertBefore, &XmlDomNode::insertBefore, "DomNode.insertBefore");
+    XML_JS_FWD(jsInsertAfter, &XmlDomNode::insertAfter, "DomNode.insertAfter");
+    XML_JS_FWD(jsReplaceChild, &XmlDomNode::replaceChild, "DomNode.replaceChild");
+    XML_JS_FWD(jsRemoveChild, &XmlDomNode::removeChild, "DomNode.removeChild");
+
+    static JSValue jsAttribute(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+    {
+        try {
+            const auto name = JsExtension<XmlDomNode>::template getArgument<QString>
+                    (ctx, "DomNode.attribute", argc, argv);
+            QString defaultValue;
+            if (argc > 1)
+                defaultValue = JsExtension<XmlDomNode>::template fromArg<QString>
+                        (ctx, "DomNode.attribute", 2, argv[1]);
+            return makeJsString(ctx, JsExtension<XmlDomNode>::fromJsObject
+                                (ctx, this_val)->attribute(name, defaultValue));
+        } catch (const QString &error) {
+            return throwError(ctx, error);
+        }
     }
-
-    QByteArray buff(m_domDocument.toByteArray(indent));
-    if (buff.size() != f.write(buff))
+    static JSValue jsParentNode(JSContext *ctx, JSValueConst this_val, int, JSValueConst *)
     {
-        context()->throwError(f.errorString());
-        f.close();
-        return;
+        return JsExtension<XmlDomNode<QDomNode>>::createObjectDirect(
+                ctx, JsExtension<XmlDomNode>::fromJsObject(ctx, this_val)->parentNode());
     }
-
-    f.close();
-    if (f.error() != QFile::NoError)
-        context()->throwError(f.errorString());
-}
-
-void XmlDomDocument::load(const QString &filePath)
-{
-    QFile f(filePath);
-    if (!f.open(QIODevice::ReadOnly)) {
-        context()->throwError(QStringLiteral("unable to open '%1'")
-                              .arg(filePath));
-        return;
+    static JSValue jsFirstChild(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+    {
+        try {
+            QString tagName;
+            if (argc > 0)
+                tagName = JsExtension<XmlDomNode>::template getArgument<QString>
+                        (ctx, "DomNode.firstChild", argc, argv);
+            return JsExtension<XmlDomNode<QDomNode>>::createObjectDirect
+                    (ctx, JsExtension<XmlDomNode>::fromJsObject(ctx, this_val)->firstChild(tagName));
+        } catch (const QString &error) {
+            return throwError(ctx, error);
+        }
+    }
+    static JSValue jsLastChild(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+    {
+        try {
+            QString tagName;
+            if (argc > 0)
+                tagName = JsExtension<XmlDomNode>::template getArgument<QString>
+                        (ctx, "DomNode.lastChild", argc, argv);
+            return JsExtension<XmlDomNode<QDomNode>>::createObjectDirect
+                    (ctx, JsExtension<XmlDomNode>::fromJsObject(ctx, this_val)->lastChild(tagName));
+        } catch (const QString &error) {
+            return throwError(ctx, error);
+        }
+    }
+    static JSValue jsPreviousSibling(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+    {
+        try {
+            QString tagName;
+            if (argc > 0)
+                tagName = JsExtension<XmlDomNode>::template getArgument<QString>
+                        (ctx, "DomNode.previousSibling", argc, argv);
+            return JsExtension<XmlDomNode<QDomNode>>::createObjectDirect(ctx, JsExtension<XmlDomNode>::fromJsObject
+                                                            (ctx, this_val)->previousSibling(tagName));
+        } catch (const QString &error) {
+            return throwError(ctx, error);
+        }
+    }
+    static JSValue jsNextSibling(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+    {
+        try {
+            QString tagName;
+            if (argc > 0)
+                tagName = JsExtension<C>::template getArgument<QString>
+                        (ctx, "Xml.DomElement.nextSibling", argc, argv);
+            return JsExtension<XmlDomNode<QDomNode>>::createObjectDirect
+                    (ctx, JsExtension<XmlDomNode>::fromJsObject(ctx, this_val)->nextSibling(tagName));
+        } catch (const QString &error) {
+            return throwError(ctx, error);
+        }
     }
 
-    QString errorMsg;
-    if (!m_domDocument.setContent(&f, &errorMsg)) {
-        context()->throwError(errorMsg);
-        return;
+    // Implemented for QDomDocument only.
+    static JSValue jsDocumentElement(JSContext *ctx, JSValueConst this_val, int, JSValueConst *);
+    static JSValue jsCreateElement(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv);
+    static JSValue jsCreateCDATASection(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv);
+    static JSValue jsCreateTextNode(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv);
+    static JSValue jsSetContent(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+    static JSValue jsToString(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+    static JSValue jsSave(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+    static JSValue jsLoad(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+    bool isElement() const { return m_value.isElement(); }
+    bool isCDATASection() const { return m_value.isCDATASection(); }
+    bool isText() const { return m_value.isText(); }
+    QString attribute(const QString &name, const QString &defaultValue)
+    {
+        QDomElement el = m_value.toElement();
+        if (el.isNull())
+            throw QStringLiteral("Node '%1' is not an element node").arg(m_value.nodeName());
+        return el.attribute(name, defaultValue);
+    }
+    void setAttribute(const QString &name, const QString &value)
+    {
+        QDomElement el = m_value.toElement();
+        if (el.isNull())
+            throw QStringLiteral("Node '%1' is not an element node").arg(m_value.nodeName());
+        el.setAttribute(name, value);
+    }
+    bool hasAttribute(const QString &name) const
+    {
+        QDomElement el = m_value.toElement();
+        if (el.isNull())
+            throw QStringLiteral("Node '%1' is not an element node").arg(m_value.nodeName());
+        return el.hasAttribute(name);
+    }
+    QString tagName() const
+    {
+        QDomElement el = m_value.toElement();
+        if (el.isNull())
+            throw QStringLiteral("Node '%1' is not an element node").arg(m_value.nodeName());
+        return el.tagName();
+    }
+    void setTagName(const QString &name)
+    {
+        QDomElement el = m_value.toElement();
+        if (el.isNull())
+            throw QStringLiteral("Node '%1' is not an element node").arg(m_value.nodeName());
+        el.setTagName(name);
     }
-}
 
-XmlDomDocument::XmlDomDocument(QScriptContext *context, const QString &name):m_domDocument(name)
-{
-    Q_UNUSED(context)
-    m_domNode = m_domDocument;
-}
+    QString text() const
+    {
+        QDomElement el = m_value.toElement();
+        if (el.isNull())
+            throw QStringLiteral("Node '%1' is not an element node").arg(m_value.nodeName());
+        return el.text();
+    }
 
-QScriptValue XmlDomNode::ctor(QScriptContext *context, QScriptEngine *engine)
-{
-    Q_UNUSED(context)
-    return engine->newQObject(new XmlDomNode(), QScriptEngine::ScriptOwnership);
-}
+    QString data() const
+    {
+        if (m_value.isText())
+            return m_value.toText().data();
+        if (m_value.isCDATASection())
+            return m_value.toCDATASection().data();
+        if (m_value.isCharacterData())
+            return m_value.toCharacterData().data();
+        throw QStringLiteral("Node '%1' is not a character data node").arg(m_value.nodeName());
+    }
+    void setData(const QString &v) const
+    {
+        if (m_value.isText())
+            return m_value.toText().setData(v);
+        if (m_value.isCDATASection())
+            return m_value.toCDATASection().setData(v);
+        if (m_value.isCharacterData())
+            return m_value.toCharacterData().setData(v);
+        throw QStringLiteral("Node '%1' is not a character data node").arg(m_value.nodeName());
+    }
+    void clear() { m_value.clear(); }
+    bool hasAttributes() const { return m_value.hasAttributes(); }
+    bool hasChildNodes() const { return m_value.hasChildNodes(); }
 
-bool XmlDomNode::isElement() const
-{
-    return m_domNode.isElement();
-}
+    XmlDomNode<QDomNode> *parentNode() const
+    {
+        return new XmlDomNode<QDomNode>(m_value.parentNode());
+    }
+    XmlDomNode<QDomNode> *firstChild(const QString &tagName)
+    {
+        if (tagName.isEmpty())
+            return new XmlDomNode<QDomNode>(m_value.firstChild());
+        return new XmlDomNode<QDomNode>(m_value.firstChildElement(tagName));
+    }
+    XmlDomNode<QDomNode> *lastChild(const QString &tagName) const
+    {
+        if (tagName.isEmpty())
+            return new XmlDomNode<QDomNode>(m_value.lastChild());
+        return new XmlDomNode<QDomNode>(m_value.lastChildElement(tagName));
+    }
+    XmlDomNode<QDomNode> *previousSibling(const QString &tagName) const
+    {
+        if (tagName.isEmpty())
+            return new XmlDomNode<QDomNode>(m_value.previousSibling());
+        return new XmlDomNode<QDomNode>(m_value.previousSiblingElement(tagName));
+    }
+    XmlDomNode<QDomNode> *nextSibling(const QString &tagName) const
+    {
+        if (tagName.isEmpty())
+            return new XmlDomNode<QDomNode>(m_value.nextSibling());
+        return new XmlDomNode<QDomNode>(m_value.nextSiblingElement(tagName));
+    }
+    void appendChild(const XmlDomNode<QDomNode> *newChild)
+    {
+        m_value.appendChild(newChild->value());
+    }
+    void insertBefore(const XmlDomNode<QDomNode> *newChild, const XmlDomNode<QDomNode> *refChild)
+    {
+        m_value.insertBefore(newChild->value(), refChild->value());
+    }
+    void insertAfter(const XmlDomNode<QDomNode> *newChild, const XmlDomNode<QDomNode> *refChild)
+    {
+        m_value.insertAfter(newChild->value(), refChild->value());
+    }
+    void replaceChild(const XmlDomNode<QDomNode> *newChild, const XmlDomNode<QDomNode> *oldChild)
+    {
+        m_value.replaceChild(newChild->value(), oldChild->value());
+    }
+    void removeChild(const XmlDomNode<QDomNode> *oldChild)
+    {
+        m_value.removeChild(oldChild->value());
+    }
 
-bool XmlDomNode::isCDATASection() const
-{
-    return m_domNode.isCDATASection();
-}
+    // Implemented for QDomDocument only.
+    XmlDomNode<QDomNode> *documentElement();
+    XmlDomNode<QDomNode> *createElement(const QString &tagName);
+    XmlDomNode<QDomNode> *createCDATASection(const QString &value);
+    XmlDomNode<QDomNode> *createTextNode(const QString &value);
 
-bool XmlDomNode::isText() const
-{
-    return m_domNode.isText();
-}
+    bool setContent(const QString &content);
+    QString toString(int indent = 1);
 
-QString XmlDomNode::attribute(const QString &name, const QString &defValue)
-{
-    QDomElement el = m_domNode.toElement();
-    if (el.isNull()) {
-        context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName()));
-        return defValue;
-    }
-    return el.attribute(name, defValue);
-}
+    void save(const QString &filePath, int indent = 1);
+    void load(const QString &filePath);
 
-void XmlDomNode::setAttribute(const QString &name, const QString &value)
-{
-    QDomElement el = m_domNode.toElement();
-    if (el.isNull()) {
-        context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName()));
-        return;
-    }
-    el.setAttribute(name, value);
-}
+    C m_value;
+};
 
-bool XmlDomNode::hasAttribute(const QString &name) const
-{
-    QDomElement el = m_domNode.toElement();
-    if (el.isNull()) {
-        context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName()));
-        return false;
-    }
-    return el.hasAttribute(name);
-}
+template<> const char *XmlDomNode<QDomNode>::name() { return "DomNode"; }
+template<> const char *XmlDomNode<QDomDocument>::name() { return "DomDocument"; }
 
-QString XmlDomNode::tagName() const
+template<> JSValue XmlDomNode<QDomNode>::ctor(JSContext *ctx, JSValue, JSValue, int , JSValue *,
+                                              int)
 {
-    QDomElement el = m_domNode.toElement();
-    if (el.isNull()) {
-        context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName()));
-        return {};
-    }
-    return el.tagName();
+    const JSValue obj = createObject(ctx);
+    const auto se = ScriptEngine::engineForContext(ctx);
+    const DubiousContextList dubiousContexts{
+        DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
+    };
+    se->checkContext(QStringLiteral("qbs.Xml.DomNode"), dubiousContexts);
+    se->setUsesIo();
+    return obj;
 }
 
-void XmlDomNode::setTagName(const QString &name)
+template<> JSValue XmlDomNode<QDomDocument>::ctor(JSContext *ctx, JSValue, JSValue,
+                                                  int argc, JSValue *argv, int)
 {
-    QDomElement el = m_domNode.toElement();
-    if (el.isNull()) {
-        context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName()));
-        return;
-    }
-    el.setTagName(name);
+    try {
+        JSValue obj;
+        if (argc == 0) {
+            obj = createObject(ctx);
+        } else {
+            const auto name = getArgument<QString>(ctx, "XmlDomDocument constructor",
+                                                   argc, argv);
+            obj = createObject(ctx, name);
+        }
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts{
+            DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
+        };
+        se->checkContext(QStringLiteral("qbs.Xml.DomDocument"), dubiousContexts);
+        se->setUsesIo();
+        return obj;
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QString XmlDomNode::text() const
+template<> XmlDomNode<QDomNode> *XmlDomNode<QDomDocument>::documentElement()
 {
-    QDomElement el = m_domNode.toElement();
-    if (el.isNull()) {
-        context()->throwError(QStringLiteral("Node '%1' is not an element node").arg(m_domNode.nodeName()));
-        return {};
-    }
-    return el.text();
+    return new XmlDomNode<QDomNode>(m_value.documentElement());
 }
 
-QString XmlDomNode::data() const
+template<> XmlDomNode<QDomNode> *XmlDomNode<QDomDocument>::createElement(const QString &tagName)
 {
-    if (m_domNode.isText())
-        return m_domNode.toText().data();
-    if (m_domNode.isCDATASection())
-        return m_domNode.toCDATASection().data();
-    if (m_domNode.isCharacterData())
-        return m_domNode.toCharacterData().data();
-    context()->throwError(QStringLiteral("Node '%1' is not a character data node").arg(m_domNode.nodeName()));
-    return {};
+    return new XmlDomNode<QDomNode>(m_value.createElement(tagName));
 }
 
-void XmlDomNode::setData(const QString &v) const
+template<> XmlDomNode<QDomNode> *XmlDomNode<QDomDocument>::createCDATASection(const QString &value)
 {
-    if (m_domNode.isText())
-        return m_domNode.toText().setData(v);
-    if (m_domNode.isCDATASection())
-        return m_domNode.toCDATASection().setData(v);
-    if (m_domNode.isCharacterData())
-        return m_domNode.toCharacterData().setData(v);
-    context()->throwError(QStringLiteral("Node '%1' is not a character data node").arg(m_domNode.nodeName()));
+    return new XmlDomNode<QDomNode>(m_value.createCDATASection(value));
 }
 
-void XmlDomNode::clear()
+template<> XmlDomNode<QDomNode> *XmlDomNode<QDomDocument>::createTextNode(const QString &value)
 {
-    m_domNode.clear();
+    return new XmlDomNode<QDomNode>(m_value.createTextNode(value));
 }
 
-bool XmlDomNode::hasAttributes() const
+template<> bool XmlDomNode<QDomDocument>::setContent(const QString &content)
 {
-    return m_domNode.hasAttributes();
+    return static_cast<bool>(m_value.setContent(content));
 }
 
-bool XmlDomNode::hasChildNodes() const
+template<> QString XmlDomNode<QDomDocument>::toString(int indent)
 {
-    return m_domNode.hasChildNodes();
+    return m_value.toString(indent);
 }
 
-QScriptValue XmlDomNode::parentNode() const
+template<> JSValue XmlDomNode<QDomDocument>::jsDocumentElement(JSContext *ctx, JSValue this_val,
+                                                               int, JSValue *)
 {
-    return engine()->newQObject(new XmlDomNode(m_domNode.parentNode()), QScriptEngine::ScriptOwnership);
+    return XmlDomNode<QDomNode>::createObjectDirect(
+                ctx, fromJsObject(ctx, this_val)->documentElement());
 }
 
-QScriptValue XmlDomNode::firstChild(const QString &tagName)
+template<> JSValue XmlDomNode<QDomDocument>::jsCreateElement(JSContext *ctx, JSValue this_val,
+                                                             int argc, JSValue *argv)
 {
-    if (tagName.isEmpty())
-        return engine()->newQObject(new XmlDomNode(m_domNode.firstChild()), QScriptEngine::ScriptOwnership);
-    return engine()->newQObject(new XmlDomNode(m_domNode.firstChildElement(tagName)), QScriptEngine::ScriptOwnership);
+    try {
+        const auto tagName = getArgument<QString>(ctx, "DomDocument.createElement", argc, argv);
+        const JSValue obj = XmlDomNode<QDomNode>::createObjectDirect(
+                    ctx, fromJsObject(ctx, this_val)->createElement(tagName));
+        return obj;
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 }
 
-QScriptValue XmlDomNode::lastChild(const QString &tagName) const
+template<> JSValue XmlDomNode<QDomDocument>::jsCreateCDATASection(JSContext *ctx, JSValue this_val,
+                                                                  int argc, JSValue *argv)
 {
-    if (tagName.isEmpty())
-        return engine()->newQObject(new XmlDomNode(m_domNode.lastChild()), QScriptEngine::ScriptOwnership);
-    return engine()->newQObject(new XmlDomNode(m_domNode.lastChildElement(tagName)), QScriptEngine::ScriptOwnership);
+    try {
+        const auto value = getArgument<QString>(ctx, "DomDocument.createCDATASection", argc, argv);
+        return XmlDomNode<QDomNode>::createObjectDirect(
+                    ctx, fromJsObject(ctx, this_val)->createCDATASection(value));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 }
 
-QScriptValue XmlDomNode::previousSibling(const QString &tagName) const
+template<> JSValue XmlDomNode<QDomDocument>::jsCreateTextNode(JSContext *ctx, JSValue this_val,
+                                                              int argc, JSValue *argv)
 {
-    if (tagName.isEmpty())
-        return engine()->newQObject(new XmlDomNode(m_domNode.previousSibling()), QScriptEngine::ScriptOwnership);
-    return engine()->newQObject(new XmlDomNode(m_domNode.previousSiblingElement(tagName)), QScriptEngine::ScriptOwnership);
+    try {
+        const auto value = getArgument<QString>(ctx, "DomDocument.createTextNode", argc, argv);
+        return XmlDomNode<QDomNode>::createObjectDirect(
+                    ctx, fromJsObject(ctx, this_val)->createTextNode(value));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 }
 
-QScriptValue XmlDomNode::nextSibling(const QString &tagName) const
+template<> JSValue XmlDomNode<QDomDocument>::jsSetContent(JSContext *ctx, JSValue this_val,
+                                                          int argc, JSValue *argv)
 {
-    if (tagName.isEmpty())
-        return engine()->newQObject(new XmlDomNode(m_domNode.nextSibling()), QScriptEngine::ScriptOwnership);
-    return engine()->newQObject(new XmlDomNode(m_domNode.nextSiblingElement(tagName)), QScriptEngine::ScriptOwnership);
+    try {
+        const auto content = getArgument<QString>(ctx, "DomDocument.setContent", argc, argv);
+        return JS_NewBool(ctx, fromJsObject(ctx, this_val)->setContent(content));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 }
 
-QScriptValue XmlDomNode::appendChild(const QScriptValue &newChild)
+template<> JSValue XmlDomNode<QDomDocument>::jsToString(JSContext *ctx, JSValue this_val,
+                                                        int argc, JSValue *argv)
 {
-    auto newNode = qobject_cast<XmlDomNode*>(newChild.toQObject());
-    if (!newNode) {
-        context()->throwError(QStringLiteral("First argument is not a XmlDomNode object"));
-        return {};
+    try {
+        qint32 indent = 1;
+        if (argc > 0)
+            indent = getArgument<qint32>(ctx, "DomDocument.toString", argc, argv);
+        return makeJsString(ctx, fromJsObject(ctx, this_val)->toString(indent));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
-    return engine()->newQObject(new XmlDomNode(m_domNode.appendChild(newNode->m_domNode)), QScriptEngine::ScriptOwnership);
 }
 
-QScriptValue XmlDomNode::insertBefore(const QScriptValue &newChild, const QScriptValue &refChild)
+template<> void XmlDomNode<QDomDocument>::save(const QString &filePath, int indent)
 {
-    auto newNode = qobject_cast<XmlDomNode*>(newChild.toQObject());
-    if (!newNode) {
-        context()->throwError(QStringLiteral("First argument is not a XmlDomNode object"));
-        return {};
-    }
+    QFile f(filePath);
+    if (!f.open(QIODevice::WriteOnly))
+        throw QStringLiteral("unable to open '%1'").arg(filePath);
 
-    auto refNode = qobject_cast<XmlDomNode*>(refChild.toQObject());
-    if (!refNode) {
-        context()->throwError(QStringLiteral("Second argument is not a XmlDomNode object"));
-        return {};
-    }
+    QByteArray buff(m_value.toByteArray(indent));
+    if (buff.size() != f.write(buff))
+        throw f.errorString();
 
-    return engine()->newQObject(new XmlDomNode(m_domNode.insertBefore(newNode->m_domNode, refNode->m_domNode)), QScriptEngine::ScriptOwnership);
+    f.close();
+    if (f.error() != QFile::NoError)
+        throw f.errorString();
 }
 
-QScriptValue XmlDomNode::insertAfter(const QScriptValue &newChild, const QScriptValue &refChild)
+template<> JSValue XmlDomNode<QDomDocument>::jsSave(JSContext *ctx, JSValue this_val,
+                                                    int argc, JSValue *argv)
 {
-    auto newNode = qobject_cast<XmlDomNode*>(newChild.toQObject());
-    if (!newNode) {
-        context()->throwError(QStringLiteral("First argument is not a XmlDomNode object"));
-        return {};
-    }
-
-    auto refNode = qobject_cast<XmlDomNode*>(refChild.toQObject());
-    if (!refNode) {
-        context()->throwError(QStringLiteral("Second argument is not a XmlDomNode object"));
-        return {};
+    try {
+        const auto filePath = getArgument<QString>(ctx, "DomDocument.save", argc, argv);
+        qint32 indent = 1;
+        if (argc > 1)
+            indent = fromArg<qint32>(ctx, "toString", 2, argv[1]);
+        fromJsObject(ctx, this_val)->save(filePath, indent);
+        return JS_UNDEFINED;
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
-
-    return engine()->newQObject(new XmlDomNode(m_domNode.insertAfter(newNode->m_domNode, refNode->m_domNode)), QScriptEngine::ScriptOwnership);
 }
 
-QScriptValue XmlDomNode::replaceChild(const QScriptValue &newChild, const QScriptValue &oldChild)
+template<> void XmlDomNode<QDomDocument>::load(const QString &filePath)
 {
-    auto newNode = qobject_cast<XmlDomNode*>(newChild.toQObject());
-    if (!newNode) {
-        context()->throwError(QStringLiteral("First argument is not a XmlDomNode object"));
-        return {};
-    }
-
-    auto oldNode = qobject_cast<XmlDomNode*>(oldChild.toQObject());
-    if (!oldNode) {
-        context()->throwError(QStringLiteral("Second argument is not a XmlDomNode object"));
-        return {};
-    }
+    QFile f(filePath);
+    if (!f.open(QIODevice::ReadOnly))
+        throw QStringLiteral("unable to open '%1'").arg(filePath);
 
-    return engine()->newQObject(new XmlDomNode(m_domNode.replaceChild(newNode->m_domNode, oldNode->m_domNode)), QScriptEngine::ScriptOwnership);
+    QString errorMsg;
+    if (!m_value.setContent(&f, &errorMsg))
+        throw errorMsg;
 }
 
-QScriptValue XmlDomNode::removeChild(const QScriptValue &oldChild)
+template<> JSValue XmlDomNode<QDomDocument>::jsLoad(JSContext *ctx, JSValue this_val,
+                                                    int argc, JSValue *argv)
 {
-    auto oldNode = qobject_cast<XmlDomNode*>(oldChild.toQObject());
-    if (!oldNode) {
-        context()->throwError(QStringLiteral("First argument is not a XmlDomNode object"));
-        return {};
+    try {
+        const auto filePath = getArgument<QString>(ctx, "DomDocument.load", argc, argv);
+        fromJsObject(ctx, this_val)->load(filePath);
+        return JS_UNDEFINED;
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
-
-    return engine()->newQObject(new XmlDomNode(m_domNode.removeChild(oldNode->m_domNode)), QScriptEngine::ScriptOwnership);
 }
 
-XmlDomNode::XmlDomNode(const QDomNode &other)
-{
-    m_domNode = other;
+template<> XmlDomNode<QDomDocument>::XmlDomNode(JSContext *, const QString &name) : m_value(name) {}
+
+template<class C>
+void XmlDomNode<C>::setupMethods(JSContext *ctx, JSValue obj)
+{
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "appendChild", &jsAppendChild, 1);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "attribute", &jsAttribute, 2);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "clear", &jsClear, 0);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "data", &jsData, 0);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "firstChild", &jsFirstChild, 1);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "hasAttribute", &jsHasAttribute, 1);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "hasAttributes", &jsHasAttributes, 0);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "hasChildNodes", &jsHasChildNodes, 0);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "insertAfter", &jsInsertAfter, 2);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "insertBefore", &jsInsertBefore, 2);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "isCDATASection", &jsIsCDATASection, 0);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "isElement", &jsIsElement, 0);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "isText", &jsIsText, 0);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "lastChild", &jsLastChild, 1);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "nextSibling", &jsNextSibling, 1);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "parentNode", &jsParentNode, 0);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "previousSibling", &jsPreviousSibling, 1);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "removeChild", &jsRemoveChild, 1);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "replaceChild", &jsReplaceChild, 2);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "setAttribute", &jsSetAttribute, 2);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "setData", &jsSetData, 1);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "setTagName", &jsSetTagName, 1);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "tagName", &jsTagName, 0);
+    JsExtension<XmlDomNode>::setupMethod(ctx, obj, "text", &jsText, 0);
+    if constexpr (std::is_same_v<C, QDomDocument>) {
+        JsExtension<XmlDomNode>::setupMethod(ctx, obj, "documentElement", &jsDocumentElement, 0);
+        JsExtension<XmlDomNode>::setupMethod(ctx, obj, "createElement", &jsCreateElement, 1);
+        JsExtension<XmlDomNode>::setupMethod(ctx, obj, "createCDATASection",
+                                             &jsCreateCDATASection, 1);
+        JsExtension<XmlDomNode>::setupMethod(ctx, obj, "createTextNode", &jsCreateTextNode, 1);
+        JsExtension<XmlDomNode>::setupMethod(ctx, obj, "setContent", &jsSetContent, 1);
+        JsExtension<XmlDomNode>::setupMethod(ctx, obj, "toString", &jsToString, 1);
+        JsExtension<XmlDomNode>::setupMethod(ctx, obj, "save", &jsSave, 2);
+        JsExtension<XmlDomNode>::setupMethod(ctx, obj, "load", &jsLoad, 1);
+    }
 }
 
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionXml(QScriptValue extensionObject)
+void initializeJsExtensionXml(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
     using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue docObj = engine->newQMetaObject(&XmlDomDocument::staticMetaObject,
-                                                 engine->newFunction(&XmlDomDocument::ctor));
-    QScriptValue nodeObj = engine->newQMetaObject(&XmlDomNode::staticMetaObject,
-                                                  engine->newFunction(&XmlDomNode::ctor));
-    QScriptValue contextObject = engine->newObject();
-    contextObject.setProperty(QStringLiteral("DomDocument"), docObj);
-    contextObject.setProperty(QStringLiteral("DomElement"), nodeObj);
-
-    extensionObject.setProperty(QStringLiteral("Xml"), contextObject);
+    JSValue contextObject = engine->newObject();
+    XmlDomNode<QDomNode>::registerClass(engine, contextObject);
+    XmlDomNode<QDomDocument>::registerClass(engine, contextObject);
+    setJsProperty(engine->context(), extensionObject, QLatin1String("Xml"), contextObject);
 }
-
-Q_DECLARE_METATYPE(qbs::Internal::XmlDomDocument *)
-Q_DECLARE_METATYPE(qbs::Internal::XmlDomNode *)
-
-#include "domxml.moc"
diff --git a/src/lib/corelib/jsextensions/environmentextension.cpp b/src/lib/corelib/jsextensions/environmentextension.cpp
index cf17c938b..e973072d0 100644
--- a/src/lib/corelib/jsextensions/environmentextension.cpp
+++ b/src/lib/corelib/jsextensions/environmentextension.cpp
@@ -37,6 +37,8 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+
 #include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/hostosinfo.h>
@@ -44,93 +46,89 @@
 
 #include <QtCore/qdir.h>
 
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptengine.h>
-
 namespace qbs {
 namespace Internal {
 
-class EnvironmentExtension : public QObject, QScriptable
+class EnvironmentExtension : public JsExtension<EnvironmentExtension>
 {
-    Q_OBJECT
 public:
-    void initializeJsExtensionEnvironment(QScriptValue extensionObject);
-    static QScriptValue js_ctor(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_getEnv(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_putEnv(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_unsetEnv(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_currentEnv(QScriptContext *context, QScriptEngine *engine);
+    static const char *name() { return "Environment"; }
+    static void setupStaticMethods(JSContext *ctx, JSValue classObj);
+    static JSValue jsGetEnv(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsPutEnv(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsUnsetEnv(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsCurrentEnv(JSContext *ctx, JSValueConst, int, JSValueConst *);
 };
 
-QScriptValue EnvironmentExtension::js_ctor(QScriptContext *context, QScriptEngine *engine)
+void EnvironmentExtension::setupStaticMethods(JSContext *ctx, JSValue classObj)
 {
-    Q_UNUSED(engine);
-    return context->throwError(Tr::tr("'Environment' cannot be instantiated."));
+    setupMethod(ctx, classObj, "getEnv", &EnvironmentExtension::jsGetEnv, 1);
+    setupMethod(ctx, classObj, "putEnv", &EnvironmentExtension::jsPutEnv, 2);
+    setupMethod(ctx, classObj, "unsetEnv", &EnvironmentExtension::jsUnsetEnv, 1);
+    setupMethod(ctx, classObj, "currentEnv", &EnvironmentExtension::jsCurrentEnv, 0);
 }
 
-static QProcessEnvironment *getProcessEnvironment(QScriptContext *context, QScriptEngine *engine,
-                                                  const QString &func, bool doThrow = true)
+static QProcessEnvironment *getProcessEnvironment(ScriptEngine *engine, const QString &func,
+                                                  bool doThrow = true)
 {
     QVariant v = engine->property(StringConstants::qbsProcEnvVarInternal());
     auto procenv = reinterpret_cast<QProcessEnvironment *>(v.value<void *>());
-    if (!procenv && doThrow)
-        throw context->throwError(QScriptContext::UnknownError,
-                                  QStringLiteral("%1 can only be called from ").arg(func) +
-                                  QStringLiteral("Module.setupBuildEnvironment and ") +
-                                  QStringLiteral("Module.setupRunEnvironment"));
+    if (!procenv && doThrow) {
+        throw QStringLiteral("%1 can only be called from "
+                             "Module.setupBuildEnvironment and "
+                             "Module.setupRunEnvironment").arg(func);
+    }
     return procenv;
 }
 
-QScriptValue EnvironmentExtension::js_getEnv(QScriptContext *context, QScriptEngine *engine)
+JSValue EnvironmentExtension::jsGetEnv(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv)
 {
-    if (Q_UNLIKELY(context->argumentCount() != 1))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("getEnv expects 1 argument"));
-    const QProcessEnvironment env = static_cast<ScriptEngine *>(engine)->environment();
-    const QProcessEnvironment *procenv = getProcessEnvironment(context, engine,
-                                                               QStringLiteral("getEnv"), false);
-    if (!procenv)
-        procenv = &env;
-
-    const QString name = context->argument(0).toString();
-    const QString value = procenv->value(name);
-    return value.isNull() ? engine->undefinedValue() : value;
+    try {
+        const auto name = getArgument<QString>(ctx, "Environment.getEnv", argc, argv);
+        ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+        const QProcessEnvironment env = engine->environment();
+        const QProcessEnvironment *procenv = getProcessEnvironment(engine, QStringLiteral("getEnv"),
+                                                                   false);
+        if (!procenv)
+            procenv = &env;
+        const QString value = procenv->value(name);
+        return value.isNull() ? engine->undefinedValue() : makeJsString(ctx, value);
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue EnvironmentExtension::js_putEnv(QScriptContext *context, QScriptEngine *engine)
+JSValue EnvironmentExtension::jsPutEnv(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    if (Q_UNLIKELY(context->argumentCount() != 2))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("putEnv expects 2 arguments"));
-    getProcessEnvironment(context, engine, QStringLiteral("putEnv"))->insert(
-                context->argument(0).toString(),
-                context->argument(1).toString());
-    return engine->undefinedValue();
+    try {
+        const auto args = getArguments<QString, QString>(ctx, "Environment.putEnv", argc, argv);
+        getProcessEnvironment(ScriptEngine::engineForContext(ctx), QStringLiteral("putEnv"))
+                ->insert(std::get<0>(args), std::get<1>(args));
+        return JS_UNDEFINED;
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue EnvironmentExtension::js_unsetEnv(QScriptContext *context, QScriptEngine *engine)
+JSValue EnvironmentExtension::jsUnsetEnv(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    if (Q_UNLIKELY(context->argumentCount() != 1))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("unsetEnv expects 1 argument"));
-    getProcessEnvironment(context, engine, QStringLiteral("unsetEnv"))->remove(
-                context->argument(0).toString());
-    return engine->undefinedValue();
+    try {
+        const auto name = getArgument<QString>(ctx, "Environment.unsetEnv", argc, argv);
+        getProcessEnvironment(ScriptEngine::engineForContext(ctx), QStringLiteral("unsetEnv"))
+                ->remove(name);
+        return JS_UNDEFINED;
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue EnvironmentExtension::js_currentEnv(QScriptContext *context, QScriptEngine *engine)
+JSValue EnvironmentExtension::jsCurrentEnv(JSContext *ctx, JSValue, int, JSValue *)
 {
-    Q_UNUSED(context);
-    const QProcessEnvironment env = static_cast<ScriptEngine *>(engine)->environment();
-    const QProcessEnvironment *procenv = getProcessEnvironment(context, engine,
-                                                               QStringLiteral("currentEnv"), false);
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const QProcessEnvironment env = engine->environment();
+    const QProcessEnvironment *procenv = getProcessEnvironment(engine, QStringLiteral("currentEnv"),
+                                                               false);
     if (!procenv)
         procenv = &env;
-    QScriptValue envObject = engine->newObject();
+    JSValue envObject = engine->newObject();
     const auto keys = procenv->keys();
     for (const QString &key : keys) {
         const QString keyName = HostOsInfo::isWindowsHost() ? key.toUpper() : key;
-        envObject.setProperty(keyName, QScriptValue(procenv->value(key)));
+        setJsProperty(ctx, envObject, keyName, procenv->value(key));
     }
     return envObject;
 }
@@ -138,23 +136,7 @@ QScriptValue EnvironmentExtension::js_currentEnv(QScriptContext *context, QScrip
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionEnvironment(QScriptValue extensionObject)
+void initializeJsExtensionEnvironment(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue environmentObj = engine->newQMetaObject(&EnvironmentExtension::staticMetaObject,
-                                             engine->newFunction(&EnvironmentExtension::js_ctor));
-    environmentObj.setProperty(QStringLiteral("getEnv"),
-                               engine->newFunction(EnvironmentExtension::js_getEnv, 1));
-    environmentObj.setProperty(QStringLiteral("putEnv"),
-                               engine->newFunction(EnvironmentExtension::js_putEnv, 2));
-    environmentObj.setProperty(QStringLiteral("unsetEnv"),
-                               engine->newFunction(EnvironmentExtension::js_unsetEnv, 1));
-    environmentObj.setProperty(QStringLiteral("currentEnv"),
-                               engine->newFunction(EnvironmentExtension::js_currentEnv, 0));
-    extensionObject.setProperty(QStringLiteral("Environment"), environmentObj);
+    qbs::Internal::EnvironmentExtension::registerClass(engine, extensionObject);
 }
-
-Q_DECLARE_METATYPE(qbs::Internal::EnvironmentExtension *)
-
-#include "environmentextension.moc"
diff --git a/src/lib/corelib/jsextensions/file.cpp b/src/lib/corelib/jsextensions/file.cpp
index 7cd2aadb8..6c24635a0 100644
--- a/src/lib/corelib/jsextensions/file.cpp
+++ b/src/lib/corelib/jsextensions/file.cpp
@@ -37,6 +37,8 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+
 #include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/fileinfo.h>
@@ -44,15 +46,11 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qfileinfo.h>
 
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptengine.h>
-
 namespace qbs {
 namespace Internal {
 
-class File : public QObject, QScriptable
+class File : public JsExtension<File>
 {
-    Q_OBJECT
 public:
     enum Filter {
         Dirs = 0x001,
@@ -82,209 +80,198 @@ public:
         NoFilter = -1
     };
     Q_DECLARE_FLAGS(Filters, Filter)
-    Q_ENUMS(Filter)
 
-    static QScriptValue js_ctor(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_copy(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_exists(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_directoryEntries(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_lastModified(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_makePath(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_move(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_remove(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_canonicalFilePath(QScriptContext *context, QScriptEngine *engine);
+    static const char *name() { return "File"; }
+    static void setupStaticMethods(JSContext *ctx, JSValue classObj);
+    static void declareEnums(JSContext *ctx, JSValue classObj);
+    static JSValue jsCopy(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsExists(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsDirectoryEntries(JSContext *ctx, JSValueConst,
+                                      int argc, JSValueConst *argv);
+    static JSValue jsLastModified(JSContext *ctx, JSValueConst,
+                                  int argc, JSValueConst *argv);
+    static JSValue jsMakePath(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsMove(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsRemove(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsCanonicalFilePath(JSContext *ctx, JSValueConst,
+                                       int argc, JSValueConst *argv);
 };
 
-QScriptValue File::js_ctor(QScriptContext *context, QScriptEngine *engine)
+void File::setupStaticMethods(JSContext *ctx, JSValue classObj)
 {
-    Q_UNUSED(engine);
-    return context->throwError(Tr::tr("'File' cannot be instantiated."));
+    setupMethod(ctx, classObj, "copy", &File::jsCopy, 2);
+    setupMethod(ctx, classObj, "exists", &File::jsExists, 1);
+    setupMethod(ctx, classObj, "directoryEntries", File::jsDirectoryEntries, 2);
+    setupMethod(ctx, classObj, "lastModified", File::jsLastModified, 1);
+    setupMethod(ctx, classObj, "makePath", &File::jsMakePath, 1);
+    setupMethod(ctx, classObj, "move", &File::jsMove, 3);
+    setupMethod(ctx, classObj, "remove", &File::jsRemove, 1);
+    setupMethod(ctx, classObj, "canonicalFilePath", &File::jsCanonicalFilePath, 1);
 }
 
-QScriptValue File::js_copy(QScriptContext *context, QScriptEngine *engine)
+void File::declareEnums(JSContext *ctx, JSValue classObj)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 2)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("copy expects 2 arguments"));
-    }
-
-    const auto se = static_cast<ScriptEngine *>(engine);
-    const DubiousContextList dubiousContexts({
-            DubiousContext(EvalContext::PropertyEvaluation),
-            DubiousContext(EvalContext::RuleExecution, DubiousContext::SuggestMoving)
-    });
-    se->checkContext(QStringLiteral("File.copy()"), dubiousContexts);
-
-    const QString sourceFile = context->argument(0).toString();
-    const QString targetFile = context->argument(1).toString();
-    QString errorMessage;
-    if (Q_UNLIKELY(!copyFileRecursion(sourceFile, targetFile, true, true, &errorMessage)))
-        return context->throwError(errorMessage);
-    return true;
+    DECLARE_ENUM(ctx, classObj, Dirs);
+    DECLARE_ENUM(ctx, classObj, Files);
+    DECLARE_ENUM(ctx, classObj, Drives);
+    DECLARE_ENUM(ctx, classObj, NoSymLinks);
+    DECLARE_ENUM(ctx, classObj, AllEntries);
+    DECLARE_ENUM(ctx, classObj, TypeMask);
+    DECLARE_ENUM(ctx, classObj, Readable);
+    DECLARE_ENUM(ctx, classObj, Writable);
+    DECLARE_ENUM(ctx, classObj, Executable);
+    DECLARE_ENUM(ctx, classObj, PermissionMask);
+    DECLARE_ENUM(ctx, classObj, Modified);
+    DECLARE_ENUM(ctx, classObj, Hidden);
+    DECLARE_ENUM(ctx, classObj, System);
+    DECLARE_ENUM(ctx, classObj, AccessMask);
+    DECLARE_ENUM(ctx, classObj, AllDirs);
+    DECLARE_ENUM(ctx, classObj, CaseSensitive);
+    DECLARE_ENUM(ctx, classObj, NoDot);
+    DECLARE_ENUM(ctx, classObj, NoDotDot);
+    DECLARE_ENUM(ctx, classObj, NoDotAndDotDot);
+    DECLARE_ENUM(ctx, classObj, NoFilter);
 }
 
-QScriptValue File::js_exists(QScriptContext *context, QScriptEngine *engine)
+JSValue File::jsCopy(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("exist expects 1 argument"));
-    }
-    const QString filePath = context->argument(0).toString();
-    const bool exists = FileInfo::exists(filePath);
-    const auto se = static_cast<ScriptEngine *>(engine);
-    se->addFileExistsResult(filePath, exists);
-    return exists;
+    try {
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts({
+                DubiousContext(EvalContext::PropertyEvaluation),
+                DubiousContext(EvalContext::RuleExecution, DubiousContext::SuggestMoving)
+        });
+        se->checkContext(QStringLiteral("File.copy()"), dubiousContexts);
+
+        const auto args = getArguments<QString, QString>(ctx, "File.copy", argc, argv);
+        QString errorMessage;
+        if (Q_UNLIKELY(!copyFileRecursion(std::get<0>(args), std::get<1>(args), true, true,
+                                          &errorMessage))) {
+            throw errorMessage;
+        }
+        return JS_TRUE;
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue File::js_directoryEntries(QScriptContext *context, QScriptEngine *engine)
+JSValue File::jsExists(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 2)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("directoryEntries expects 2 arguments"));
-    }
-
-    const auto se = static_cast<ScriptEngine *>(engine);
-    const DubiousContextList dubiousContexts({
-            DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
-    });
-    se->checkContext(QStringLiteral("File.directoryEntries()"), dubiousContexts);
-
-    const QString path = context->argument(0).toString();
-    const auto filters = static_cast<QDir::Filters>(context->argument(1).toUInt32());
-    QDir dir(path);
-    const QStringList entries = dir.entryList(filters, QDir::Name);
-    se->addDirectoryEntriesResult(path, filters, entries);
-    return qScriptValueFromSequence(engine, entries);
+    try {
+        const auto filePath = getArgument<QString>(ctx, "File.exists", argc, argv);
+        const bool exists = FileInfo::exists(filePath);
+        ScriptEngine::engineForContext(ctx)->addFileExistsResult(filePath, exists);
+        return JS_NewBool(ctx, exists);
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue File::js_remove(QScriptContext *context, QScriptEngine *engine)
+JSValue File::jsDirectoryEntries(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("remove expects 1 argument"));
-    }
-
-    const auto se = static_cast<ScriptEngine *>(engine);
-    const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation) });
-    se->checkContext(QStringLiteral("File.remove()"), dubiousContexts);
-
-    QString fileName = context->argument(0).toString();
-
-    QString errorMessage;
-    if (Q_UNLIKELY(!removeFileRecursion(QFileInfo(fileName), &errorMessage)))
-        return context->throwError(errorMessage);
-    return true;
+    try {
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts({
+                DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
+        });
+        se->checkContext(QStringLiteral("File.directoryEntries()"), dubiousContexts);
+
+        const auto args = getArguments<QString, qint32>(ctx, "Environment.directoryEntries",
+                                                        argc, argv);
+        const QString path = std::get<0>(args);
+        const QDir dir(path);
+        const auto filters = static_cast<QDir::Filters>(std::get<1>(args));
+        const QStringList entries = dir.entryList(filters, QDir::Name);
+        se->addDirectoryEntriesResult(path, filters, entries);
+        return makeJsStringList(ctx, entries);
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue File::js_lastModified(QScriptContext *context, QScriptEngine *engine)
+JSValue File::jsRemove(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("File.lastModified() expects an argument"));
-    }
-    const QString filePath = context->argument(0).toString();
-    const FileTime timestamp = FileInfo(filePath).lastModified();
-    const auto se = static_cast<ScriptEngine *>(engine);
-    se->addFileLastModifiedResult(filePath, timestamp);
-    return timestamp.asDouble();
+    try {
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts{DubiousContext(EvalContext::PropertyEvaluation)};
+        se->checkContext(QStringLiteral("File.remove()"), dubiousContexts);
+        const auto fileName = getArgument<QString>(ctx, "Environment.remove", argc, argv);
+        QString errorMessage;
+        if (Q_UNLIKELY(!removeFileRecursion(QFileInfo(fileName), &errorMessage)))
+            throw errorMessage;
+        return JS_TRUE;
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue File::js_makePath(QScriptContext *context, QScriptEngine *engine)
+JSValue File::jsLastModified(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("makePath expects 1 argument"));
-    }
-
-    const auto se = static_cast<ScriptEngine *>(engine);
-    const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation) });
-    se->checkContext(QStringLiteral("File.makePath()"), dubiousContexts);
-
-    return QDir::root().mkpath(context->argument(0).toString());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "Environment.lastModified", argc, argv);
+        const FileTime timestamp = FileInfo(filePath).lastModified();
+        const auto se = ScriptEngine::engineForContext(ctx);
+        se->addFileLastModifiedResult(filePath, timestamp);
+        return JS_NewFloat64(ctx, timestamp.asDouble());
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue File::js_move(QScriptContext *context, QScriptEngine *engine)
+JSValue File::jsMakePath(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 2)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("move expects 2 arguments"));
-    }
-
-    const auto se = static_cast<ScriptEngine *>(engine);
-    const DubiousContextList dubiousContexts({ DubiousContext(EvalContext::PropertyEvaluation) });
-    se->checkContext(QStringLiteral("File.move()"), dubiousContexts);
-
-    const QString sourceFile = context->argument(0).toString();
-    const QString targetFile = context->argument(1).toString();
-    const bool overwrite = context->argumentCount() > 2 ? context->argument(2).toBool() : true;
-
-    if (Q_UNLIKELY(QFileInfo(sourceFile).isDir()))
-        return context->throwError(QStringLiteral("Could not move '%1' to '%2': "
-                                                         "Source file path is a directory.")
-                                   .arg(sourceFile, targetFile));
-
-    if (Q_UNLIKELY(QFileInfo(targetFile).isDir())) {
-        return context->throwError(QStringLiteral("Could not move '%1' to '%2': "
-                                                         "Destination file path is a directory.")
-                                   .arg(sourceFile, targetFile));
-    }
-
-    QFile f(targetFile);
-    if (overwrite && f.exists() && !f.remove())
-        return context->throwError(QStringLiteral("Could not move '%1' to '%2': %3")
-                                   .arg(sourceFile, targetFile, f.errorString()));
-
-    if (QFile::exists(targetFile))
-        return context->throwError(QStringLiteral("Could not move '%1' to '%2': "
-                                                         "Destination file exists.")
-                                   .arg(sourceFile, targetFile));
+    try {
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts{DubiousContext(EvalContext::PropertyEvaluation)};
+        se->checkContext(QStringLiteral("File.makePath()"), dubiousContexts);
+        const auto path = getArgument<QString>(ctx, "File.makePath", argc, argv);
+        return JS_NewBool(ctx, QDir::root().mkpath(path));
+    } catch (const QString &error) { return throwError(ctx, error); }
+}
 
-    QFile f2(sourceFile);
-    if (Q_UNLIKELY(!f2.rename(targetFile)))
-        return context->throwError(QStringLiteral("Could not move '%1' to '%2': %3")
-                                   .arg(sourceFile, targetFile, f2.errorString()));
-    return true;
+JSValue File::jsMove(JSContext *ctx, JSValue, int argc, JSValue *argv)
+{
+    try {
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts{DubiousContext(EvalContext::PropertyEvaluation)};
+        se->checkContext(QStringLiteral("File.move()"), dubiousContexts);
+
+        const auto args = getArguments<QString, QString>(ctx, "File.move", argc, argv);
+        const QString sourceFile = std::get<0>(args);
+        const QString targetFile = std::get<1>(args);
+        const auto overwrite = argc > 2 ? fromArg<bool>(ctx, "File.move", 3, argv[2]) : true;
+
+        if (Q_UNLIKELY(QFileInfo(sourceFile).isDir())) {
+            throw QStringLiteral("Could not move '%1' to '%2': "
+                                 "Source file path is a directory.").arg(sourceFile, targetFile);
+        }
+        if (Q_UNLIKELY(QFileInfo(targetFile).isDir())) {
+            throw QStringLiteral("Could not move '%1' to '%2': "
+                                 "Destination file path is a directory.")
+                    .arg(sourceFile, targetFile);
+        }
+
+        QFile f(targetFile);
+        if (overwrite && f.exists() && !f.remove()) {
+            throw QStringLiteral("Could not move '%1' to '%2': %3")
+                .arg(sourceFile, targetFile, f.errorString());
+        }
+        if (QFile::exists(targetFile)) {
+            throw QStringLiteral("Could not move '%1' to '%2': "
+                                 "Destination file exists.").arg(sourceFile, targetFile);
+        }
+
+        QFile f2(sourceFile);
+        if (Q_UNLIKELY(!f2.rename(targetFile))) {
+            throw QStringLiteral("Could not move '%1' to '%2': %3")
+                .arg(sourceFile, targetFile, f2.errorString());
+        }
+        return JS_TRUE;
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue File::js_canonicalFilePath(QScriptContext *context, QScriptEngine *engine)
+JSValue File::jsCanonicalFilePath(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("canonicalFilePath expects 1 argument"));
-    }
-    return QFileInfo(context->argument(0).toString()).canonicalFilePath();
+    try {
+        const auto path = getArgument<QString>(ctx, "File.canonicalFilePath", argc, argv);
+        return makeJsString(ctx, QFileInfo(path).canonicalFilePath());
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionFile(QScriptValue extensionObject)
+void initializeJsExtensionFile(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue fileObj = engine->newQMetaObject(&File::staticMetaObject,
-                                                  engine->newFunction(&File::js_ctor));
-    fileObj.setProperty(QStringLiteral("copy"), engine->newFunction(File::js_copy));
-    fileObj.setProperty(QStringLiteral("exists"), engine->newFunction(File::js_exists));
-    fileObj.setProperty(QStringLiteral("directoryEntries"),
-                        engine->newFunction(File::js_directoryEntries));
-    fileObj.setProperty(QStringLiteral("lastModified"), engine->newFunction(File::js_lastModified));
-    fileObj.setProperty(QStringLiteral("makePath"), engine->newFunction(File::js_makePath));
-    fileObj.setProperty(QStringLiteral("move"), engine->newFunction(File::js_move));
-    fileObj.setProperty(QStringLiteral("remove"), engine->newFunction(File::js_remove));
-    fileObj.setProperty(QStringLiteral("canonicalFilePath"),
-                        engine->newFunction(File::js_canonicalFilePath));
-    extensionObject.setProperty(QStringLiteral("File"), fileObj);
+    qbs::Internal::File::registerClass(engine, extensionObject);
 }
-
-Q_DECLARE_METATYPE(qbs::Internal::File *)
-
-#include "file.moc"
diff --git a/src/lib/corelib/jsextensions/fileinfoextension.cpp b/src/lib/corelib/jsextensions/fileinfoextension.cpp
index 038f3db41..cfc45ca40 100644
--- a/src/lib/corelib/jsextensions/fileinfoextension.cpp
+++ b/src/lib/corelib/jsextensions/fileinfoextension.cpp
@@ -37,6 +37,8 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+
 #include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/fileinfo.h>
@@ -45,9 +47,6 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qfileinfo.h>
 
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptengine.h>
-
 #include <regex>
 
 namespace qbs {
@@ -63,268 +62,253 @@ static QString uniqueSeparators(QString path)
     return path;
 }
 
-class FileInfoExtension : public QObject, QScriptable
+class FileInfoExtension : public JsExtension<FileInfoExtension>
 {
-    Q_OBJECT
 public:
-    static QScriptValue js_ctor(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_path(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_fileName(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_baseName(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_suffix(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_completeSuffix(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_canonicalPath(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_cleanPath(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_completeBaseName(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_relativePath(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_resolvePath(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_isAbsolutePath(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_toWindowsSeparators(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_fromWindowsSeparators(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_toNativeSeparators(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_fromNativeSeparators(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_joinPaths(QScriptContext *context, QScriptEngine *engine);
+    static const char *name() { return "FileInfo"; }
+    static void setupStaticMethods(JSContext *ctx, JSValue classObj);
+    static JSValue jsPath(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsFileName(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsBaseName(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsSuffix(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsCompleteSuffix(JSContext *ctx, JSValueConst,
+                                    int argc, JSValueConst *argv);
+    static JSValue jsCanonicalPath(JSContext *ctx, JSValueConst,
+                                   int argc, JSValueConst *argv);
+    static JSValue jsCleanPath(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsCompleteBaseName(JSContext *ctx, JSValueConst,
+                                      int argc, JSValueConst *argv);
+    static JSValue jsRelativePath(JSContext *ctx, JSValueConst,
+                                  int argc, JSValueConst *argv);
+    static JSValue jsResolvePath(JSContext *ctx, JSValueConst,
+                                 int argc, JSValueConst *argv);
+    static JSValue jsIsAbsolutePath(JSContext *ctx, JSValueConst,
+                                    int argc, JSValueConst *argv);
+    static JSValue jsToWindowsSeparators(JSContext *ctx, JSValueConst,
+                                         int argc, JSValueConst *argv);
+    static JSValue jsFromWindowsSeparators(JSContext *ctx, JSValueConst,
+                                           int argc, JSValueConst *argv);
+    static JSValue jsToNativeSeparators(JSContext *ctx, JSValueConst,
+                                        int argc, JSValueConst *argv);
+    static JSValue jsFromNativeSeparators(JSContext *ctx, JSValueConst,
+                                          int argc, JSValueConst *argv);
+    static JSValue jsJoinPaths(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue jsPathListSeparator(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue jsPathSeparator(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue jsExecutableSuffix(JSContext *ctx, JSValueConst, int, JSValueConst *);
 };
 
-QScriptValue FileInfoExtension::js_ctor(QScriptContext *context, QScriptEngine *engine)
+void FileInfoExtension::setupStaticMethods(JSContext *ctx, JSValue classObj)
 {
-    Q_UNUSED(engine);
-    return context->throwError(Tr::tr("'FileInfo' cannot be instantiated."));
+    setupMethod(ctx, classObj, StringConstants::fileInfoPath(), &FileInfoExtension::jsPath, 1);
+    setupMethod(ctx, classObj, StringConstants::fileInfoFileName(),
+                      &FileInfoExtension::jsFileName, 1);
+    setupMethod(ctx, classObj, StringConstants::baseNameProperty(),
+                      &FileInfoExtension::jsBaseName, 1);
+    setupMethod(ctx, classObj, "suffix", &FileInfoExtension::jsSuffix, 1);
+    setupMethod(ctx, classObj, "completeSuffix", &FileInfoExtension::jsCompleteSuffix, 1);
+    setupMethod(ctx, classObj, "canonicalPath", &FileInfoExtension::jsCanonicalPath, 1);
+    setupMethod(ctx, classObj, "cleanPath", &FileInfoExtension::jsCleanPath, 1);
+    setupMethod(ctx, classObj, StringConstants::completeBaseNameProperty(),
+                      &FileInfoExtension::jsCompleteBaseName, 1);
+    setupMethod(ctx, classObj, "relativePath", &FileInfoExtension::jsRelativePath, 1);
+    setupMethod(ctx, classObj, "resolvePath", &FileInfoExtension::jsResolvePath, 1);
+    setupMethod(ctx, classObj, "isAbsolutePath", &FileInfoExtension::jsIsAbsolutePath, 1);
+    setupMethod(ctx, classObj, "toWindowsSeparators",
+                      &FileInfoExtension::jsToWindowsSeparators, 1);
+    setupMethod(ctx, classObj, "fromWindowsSeparators",
+                      &FileInfoExtension::jsFromWindowsSeparators, 1);
+    setupMethod(ctx, classObj, "toNativeSeparators",
+                      &FileInfoExtension::jsToNativeSeparators, 1);
+    setupMethod(ctx, classObj, "fromNativeSeparators",
+                      &FileInfoExtension::jsFromNativeSeparators, 1);
+    setupMethod(ctx, classObj, "joinPaths", &FileInfoExtension::jsJoinPaths, 0);
+    setupMethod(ctx, classObj, "pathListSeparator",
+                      &FileInfoExtension::jsPathListSeparator, 0);
+    setupMethod(ctx, classObj, "pathSeparator", &FileInfoExtension::jsPathSeparator, 0);
+    setupMethod(ctx, classObj, "executableSuffix", &FileInfoExtension::jsExecutableSuffix, 0);
 }
 
-QScriptValue FileInfoExtension::js_path(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsPath(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("path expects 1 argument"));
-    }
-    HostOsInfo::HostOs hostOs = HostOsInfo::hostOs();
-    if (context->argumentCount() > 1) {
-        hostOs = context->argument(1).toVariant().toStringList().contains(QLatin1String("windows"))
-                ? HostOsInfo::HostOsWindows : HostOsInfo::HostOsOtherUnix;
-    }
-    return FileInfo::path(context->argument(0).toString(), hostOs);
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.path", argc, argv);
+        HostOsInfo::HostOs hostOs = HostOsInfo::hostOs();
+        if (argc > 1) {
+            const auto osList = fromArg<QStringList>(ctx, "FileInfo.path", 2, argv[1]);
+            hostOs = osList.contains(QLatin1String("windows"))
+                    ? HostOsInfo::HostOsWindows : HostOsInfo::HostOsOtherUnix;
+        }
+        return makeJsString(ctx, FileInfo::path(filePath, hostOs));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_fileName(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsFileName(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("fileName expects 1 argument"));
-    }
-    return FileInfo::fileName(context->argument(0).toString());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.fileName", argc, argv);
+        return makeJsString(ctx, FileInfo::fileName(filePath));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_baseName(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsBaseName(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("baseName expects 1 argument"));
-    }
-    return FileInfo::baseName(context->argument(0).toString());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.baseName", argc, argv);
+        return makeJsString(ctx, FileInfo::baseName(filePath));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_suffix(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsSuffix(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("suffix expects 1 argument"));
-    }
-    return FileInfo::suffix(context->argument(0).toString());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.suffix", argc, argv);
+        return makeJsString(ctx, FileInfo::suffix(filePath));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_completeSuffix(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsCompleteSuffix(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("completeSuffix expects 1 argument"));
-    }
-    return FileInfo::completeSuffix(context->argument(0).toString());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.completeSuffix", argc, argv);
+        return makeJsString(ctx, FileInfo::completeSuffix(filePath));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_canonicalPath(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsCanonicalPath(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("canonicalPath expects 1 argument"));
-    }
-    return QFileInfo(context->argument(0).toString()).canonicalFilePath();
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.canonicalPath", argc, argv);
+        return makeJsString(ctx, QFileInfo(filePath).canonicalFilePath());
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_cleanPath(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsCleanPath(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("cleanPath expects 1 argument"));
-    }
-    return QDir::cleanPath(context->argument(0).toString());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.cleanPath", argc, argv);
+        return makeJsString(ctx, QDir::cleanPath(filePath));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_completeBaseName(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsCompleteBaseName(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("completeBaseName expects 1 argument"));
-    }
-    return FileInfo::completeBaseName(context->argument(0).toString());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.completeBaseName", argc, argv);
+        return makeJsString(ctx, FileInfo::completeBaseName(filePath));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_relativePath(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsRelativePath(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("relativePath expects 2 arguments"));
-    }
-    const QString baseDir = context->argument(0).toString();
-    const QString filePath = context->argument(1).toString();
-    if (!FileInfo::isAbsolute(baseDir)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("FileInfo.relativePath() expects an absolute path as "
-                                          "its first argument, but it is '%1'.").arg(baseDir));
-    }
-    if (!FileInfo::isAbsolute(filePath)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("FileInfo.relativePath() expects an absolute path as "
-                                          "its second argument, but it is '%1'.").arg(filePath));
-    }
-    return QDir(baseDir).relativeFilePath(filePath);
+    try {
+        const auto args = getArguments<QString, QString>(ctx, "File.relativePath", argc, argv);
+        const QString baseDir = std::get<0>(args);
+        const QString filePath = std::get<1>(args);
+        if (!FileInfo::isAbsolute(baseDir)) {
+            throw Tr::tr("FileInfo.relativePath() expects an absolute path as "
+                         "its first argument, but it is '%1'.").arg(baseDir);
+        }
+        if (!FileInfo::isAbsolute(filePath)) {
+            throw Tr::tr("FileInfo.relativePath() expects an absolute path as "
+                         "its second argument, but it is '%1'.").arg(filePath);
+        }
+        return makeJsString(ctx, QDir(baseDir).relativeFilePath(filePath));
+
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_resolvePath(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsResolvePath(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("resolvePath expects 2 arguments"));
-    }
-    const QString base = context->argument(0).toString();
-    const QString rel = context->argument(1).toString();
-    return FileInfo::resolvePath(base, rel);
+    try {
+        const auto args = getArguments<QString, QString>(ctx, "File.resolvePath", argc, argv);
+        const QString base = std::get<0>(args);
+        const QString rel = std::get<1>(args);
+        return makeJsString(ctx, FileInfo::resolvePath(base, rel));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_isAbsolutePath(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsIsAbsolutePath(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("isAbsolutePath expects 1 argument"));
-    }
-    HostOsInfo::HostOs hostOs = HostOsInfo::hostOs();
-    if (context->argumentCount() > 1) {
-        hostOs = context->argument(1).toVariant().toStringList().contains(QLatin1String("windows"))
-                ? HostOsInfo::HostOsWindows : HostOsInfo::HostOsOtherUnix;
-    }
-    return FileInfo::isAbsolute(context->argument(0).toString(), hostOs);
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.isAbsolutePath", argc, argv);
+        HostOsInfo::HostOs hostOs = HostOsInfo::hostOs();
+        if (argc > 1) {
+            const auto osList = fromArg<QStringList>(ctx, "FileInfo.isAbsolutePath", 2, argv[1]);
+            hostOs = osList.contains(QLatin1String("windows"))
+                    ? HostOsInfo::HostOsWindows : HostOsInfo::HostOsOtherUnix;
+        }
+        return JS_NewBool(ctx, FileInfo::isAbsolute(filePath, hostOs));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_toWindowsSeparators(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsToWindowsSeparators(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("toWindowsSeparators expects 1 argument"));
-    }
-    return context->argument(0).toString().replace(QLatin1Char('/'), QLatin1Char('\\'));
+    try {
+        auto filePath = getArgument<QString>(ctx, "FileInfo.toWindowsSeparators", argc, argv);
+        return makeJsString(ctx, filePath.replace(QLatin1Char('/'), QLatin1Char('\\')));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_fromWindowsSeparators(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsFromWindowsSeparators(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("fromWindowsSeparators expects 1 argument"));
-    }
-    return context->argument(0).toString().replace(QLatin1Char('\\'), QLatin1Char('/'));
+    try {
+        auto filePath = getArgument<QString>(ctx, "FileInfo.fromWindowsSeparators", argc, argv);
+        return makeJsString(ctx, filePath.replace(QLatin1Char('\\'), QLatin1Char('/')));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_toNativeSeparators(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsToNativeSeparators(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("toNativeSeparators expects 1 argument"));
-    }
-    return QDir::toNativeSeparators(context->argument(0).toString());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.toWindowsSeparators", argc, argv);
+        return makeJsString(ctx, QDir::toNativeSeparators(filePath));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_fromNativeSeparators(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsFromNativeSeparators(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("fromNativeSeparators expects 1 argument"));
-    }
-    return QDir::fromNativeSeparators(context->argument(0).toString());
+    try {
+        const auto filePath = getArgument<QString>(ctx, "FileInfo.fromWindowsSeparators",
+                                                   argc, argv);
+        return makeJsString(ctx, QDir::fromNativeSeparators(filePath));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue FileInfoExtension::js_joinPaths(QScriptContext *context, QScriptEngine *engine)
+JSValue FileInfoExtension::jsJoinPaths(JSContext *ctx, JSValue, int argc, JSValue *argv)
 {
-    Q_UNUSED(engine);
-    QStringList paths;
-    for (int i = 0; i < context->argumentCount(); ++i) {
-        const QScriptValue value = context->argument(i);
-        if (!value.isUndefined() && !value.isNull()) {
-            const QString arg = value.toString();
-            if (!arg.isEmpty())
-                paths.push_back(arg);
+    try {
+        QStringList paths;
+        for (int i = 0; i < argc; ++i) {
+            const auto value = fromArg<QString>(ctx, "FileInfo.joinPaths", i + 1, argv[i]);
+            if (!value.isEmpty())
+                paths.push_back(value);
         }
-    }
-    return engine->toScriptValue(uniqueSeparators(paths.join(QLatin1Char('/'))));
+        return makeJsString(ctx, uniqueSeparators(paths.join(QLatin1Char('/'))));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-} // namespace Internal
-} // namespace qbs
+JSValue FileInfoExtension::jsPathListSeparator(JSContext *ctx, JSValue, int, JSValue *)
+{
+    return makeJsString(ctx, QString(HostOsInfo::pathListSeparator()));
+}
 
-void initializeJsExtensionFileInfo(QScriptValue extensionObject)
+JSValue FileInfoExtension::jsPathSeparator(JSContext *ctx, JSValue, int, JSValue *)
 {
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue fileInfoObj = engine->newQMetaObject(&FileInfoExtension::staticMetaObject,
-                                                  engine->newFunction(&FileInfoExtension::js_ctor));
-    fileInfoObj.setProperty(StringConstants::fileInfoPath(),
-                            engine->newFunction(FileInfoExtension::js_path));
-    fileInfoObj.setProperty(StringConstants::fileInfoFileName(),
-                            engine->newFunction(FileInfoExtension::js_fileName));
-    fileInfoObj.setProperty(StringConstants::baseNameProperty(),
-                            engine->newFunction(FileInfoExtension::js_baseName));
-    fileInfoObj.setProperty(QStringLiteral("suffix"),
-                            engine->newFunction(FileInfoExtension::js_suffix));
-    fileInfoObj.setProperty(QStringLiteral("completeSuffix"),
-                            engine->newFunction(FileInfoExtension::js_completeSuffix));
-    fileInfoObj.setProperty(QStringLiteral("canonicalPath"),
-                            engine->newFunction(FileInfoExtension::js_canonicalPath));
-    fileInfoObj.setProperty(QStringLiteral("cleanPath"),
-                            engine->newFunction(FileInfoExtension::js_cleanPath));
-    fileInfoObj.setProperty(StringConstants::completeBaseNameProperty(),
-                            engine->newFunction(FileInfoExtension::js_completeBaseName));
-    fileInfoObj.setProperty(QStringLiteral("relativePath"),
-                            engine->newFunction(FileInfoExtension::js_relativePath));
-    fileInfoObj.setProperty(QStringLiteral("resolvePath"),
-                            engine->newFunction(FileInfoExtension::js_resolvePath));
-    fileInfoObj.setProperty(QStringLiteral("isAbsolutePath"),
-                            engine->newFunction(FileInfoExtension::js_isAbsolutePath));
-    fileInfoObj.setProperty(QStringLiteral("toWindowsSeparators"),
-                            engine->newFunction(FileInfoExtension::js_toWindowsSeparators));
-    fileInfoObj.setProperty(QStringLiteral("fromWindowsSeparators"),
-                            engine->newFunction(FileInfoExtension::js_fromWindowsSeparators));
-    fileInfoObj.setProperty(QStringLiteral("toNativeSeparators"),
-                            engine->newFunction(FileInfoExtension::js_toNativeSeparators));
-    fileInfoObj.setProperty(QStringLiteral("fromNativeSeparators"),
-                            engine->newFunction(FileInfoExtension::js_fromNativeSeparators));
-    fileInfoObj.setProperty(QStringLiteral("joinPaths"),
-                            engine->newFunction(FileInfoExtension::js_joinPaths));
-    extensionObject.setProperty(QStringLiteral("FileInfo"), fileInfoObj);
+    return makeJsString(ctx, QString(HostOsInfo::pathSeparator()));
 }
 
-Q_DECLARE_METATYPE(qbs::Internal::FileInfoExtension *)
+JSValue FileInfoExtension::jsExecutableSuffix(JSContext *ctx, JSValue, int, JSValue *)
+{
+    static QString executableSuffix = HostOsInfo::isWindowsHost() ?
+                QLatin1String(QBS_HOST_EXE_SUFFIX) : QString();
+    return makeJsString(ctx, executableSuffix);
+}
 
-#include "fileinfoextension.moc"
+} // namespace Internal
+} // namespace qbs
+
+void initializeJsExtensionFileInfo(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
+{
+    qbs::Internal::FileInfoExtension::registerClass(engine, extensionObject);
+}
diff --git a/src/lib/corelib/jsextensions/host.cpp b/src/lib/corelib/jsextensions/host.cpp
new file mode 100644
index 000000000..24d40fe6a
--- /dev/null
+++ b/src/lib/corelib/jsextensions/host.cpp
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 Raphaël Cotty <raphael.cotty@gmail.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "jsextension.h"
+
+#include <language/scriptengine.h>
+#include <logging/translator.h>
+#include <tools/fileinfo.h>
+
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
+
+namespace qbs {
+namespace Internal {
+
+class Host : public JsExtension<Host>
+{
+public:
+    static const char *name() { return "Host"; }
+    static void setupStaticMethods(JSContext *ctx, JSValue classObj);
+    static JSValue jsArchitecture(JSContext *ctx, JSValueConst, int, JSValueConst *) {
+        return makeJsString(ctx, HostOsInfo::hostOSArchitecture());
+    }
+    static JSValue jsOs(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue jsPlatform(JSContext *ctx, JSValueConst, int, JSValueConst *) {
+        return makeJsString(ctx, HostOsInfo::hostOSIdentifier());
+    }
+    static JSValue jsOsVersion(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue jsOsBuildVersion(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue jsOsVersionParts(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue jsOsVersionMajor(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue jsOsVersionMinor(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue jsOsVersionPatch(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue jsNullDevice(JSContext *ctx, JSValueConst, int, JSValueConst *);
+};
+
+static QStringList osList()
+{
+    QStringList list;
+    for (const auto &s : HostOsInfo::canonicalOSIdentifiers(HostOsInfo::hostOSIdentifier()))
+        list.push_back(s);
+    return list;
+}
+
+void Host::setupStaticMethods(JSContext *ctx, JSValue classObj)
+{
+    setupMethod(ctx, classObj, "architecture", &Host::jsArchitecture, 0);
+    setupMethod(ctx, classObj, "os", &Host::jsOs, 0);
+    setupMethod(ctx, classObj, "platform", &Host::jsPlatform, 0);
+    setupMethod(ctx, classObj, "osVersion", &Host::jsOsVersion, 0);
+    setupMethod(ctx, classObj, "osBuildVersion", &Host::jsOsBuildVersion, 0);
+    setupMethod(ctx, classObj, "osVersionParts", &Host::jsOsVersionParts, 0);
+    setupMethod(ctx, classObj, "osVersionMajor", &Host::jsOsVersionMajor, 0);
+    setupMethod(ctx, classObj, "osVersionMinor", &Host::jsOsVersionMinor, 0);
+    setupMethod(ctx, classObj, "osVersionPatch", &Host::jsOsVersionPatch, 0);
+    setupMethod(ctx, classObj, "nullDevice", &Host::jsNullDevice, 0);
+}
+
+JSValue Host::jsOs(JSContext *ctx, JSValue, int, JSValue *)
+{
+    static QStringList host = osList();
+    return makeJsStringList(ctx, host);
+}
+
+JSValue Host::jsOsVersion(JSContext *ctx, JSValue, int, JSValue *)
+{
+    static QString osVersion = HostOsInfo::hostOsVersion().toString();
+    return osVersion.isNull() ? JS_UNDEFINED : makeJsString(ctx, osVersion);
+}
+
+JSValue Host::jsOsBuildVersion(JSContext *ctx, JSValue, int, JSValue *)
+{
+    static QString osBuildVersion = HostOsInfo::hostOsBuildVersion();
+    return osBuildVersion.isNull() ? JS_UNDEFINED : makeJsString(ctx, osBuildVersion);
+}
+
+JSValue Host::jsOsVersionParts(JSContext *ctx, JSValue, int, JSValue *)
+{
+    static QStringList osVersionParts = HostOsInfo::hostOsVersion().toString().split(
+                QStringLiteral("."));
+    return makeJsStringList(ctx, osVersionParts);
+}
+
+JSValue Host::jsOsVersionMajor(JSContext *ctx, JSValue, int, JSValue *)
+{
+    static int osVersionMajor = HostOsInfo::hostOsVersion().majorVersion();
+    return JS_NewInt32(ctx, osVersionMajor);
+}
+
+JSValue Host::jsOsVersionMinor(JSContext *ctx, JSValue, int, JSValue *)
+{
+    static int osVersionMinor = HostOsInfo::hostOsVersion().minorVersion();
+    return JS_NewInt32(ctx, osVersionMinor);
+}
+
+JSValue Host::jsOsVersionPatch(JSContext *ctx, JSValue, int, JSValue *)
+{
+    static int osVersionPatch = HostOsInfo::hostOsVersion().patchLevel();
+    return JS_NewInt32(ctx, osVersionPatch);
+}
+
+JSValue Host::jsNullDevice(JSContext *ctx, JSValue, int, JSValue *)
+{
+    static QString nullDevice = HostOsInfo::isWindowsHost() ? QStringLiteral("NUL") :
+                                                              QStringLiteral("/dev/null");
+    return makeJsString(ctx, nullDevice);
+}
+
+} // namespace Internal
+} // namespace qbs
+
+void initializeJsExtensionHost(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
+{
+    qbs::Internal::Host::registerClass(engine, extensionObject);
+}
diff --git a/src/lib/corelib/jsextensions/jsextension.h b/src/lib/corelib/jsextensions/jsextension.h
new file mode 100644
index 000000000..d34fb2b83
--- /dev/null
+++ b/src/lib/corelib/jsextensions/jsextension.h
@@ -0,0 +1,339 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <language/scriptengine.h>
+#include <logging/translator.h>
+
+#include <optional>
+#include <tuple>
+#include <utility>
+
+namespace qbs::Internal {
+
+template<typename ...T> struct PackHelper {};
+template<typename T> struct FromArgHelper;
+template <typename T> struct FunctionTrait;
+
+#define DECLARE_ENUM(ctx, obj, enumVal) \
+    JS_SetPropertyStr((ctx), (obj), #enumVal, JS_NewInt32((ctx), (enumVal)))
+
+template<class Derived> class JsExtension
+{
+#define DEFINE_JS_FORWARDER(name, func, text)                                                \
+    static JSValue name(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) \
+    {                                                                                        \
+        return jsForward(func, text, ctx, this_val, argc, argv);                             \
+    }
+
+#define DEFINE_JS_FORWARDER_QUAL(klass, name, func, text)                                    \
+    static JSValue name(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) \
+    {                                                                                        \
+        return klass::jsForward(func, text, ctx, this_val, argc, argv);                      \
+    }
+
+public:
+    virtual ~JsExtension() = default;
+
+    template<typename ...Args > static JSValue createObject(JSContext *ctx, Args... args)
+    {
+        ScopedJsValue obj(ctx, JS_NewObjectClass(ctx, classId(ctx)));
+        JS_SetOpaque(obj, new Derived(ctx, args...));
+        Derived::setupMethods(ctx, obj);
+        return obj.release();
+    }
+
+    static JSValue createObjectDirect(JSContext *ctx, void *obj)
+    {
+        JSValue jsObj = JS_NewObjectClass(ctx, classId(ctx));
+        attachPointerTo(jsObj, obj);
+        Derived::setupMethods(ctx, jsObj);
+        return jsObj;
+    }
+
+    static Derived *fromJsObject(JSContext *ctx, JSValue obj)
+    {
+        return attachedPointer<Derived>(obj, classId(ctx));
+    }
+
+    static void registerClass(ScriptEngine *engine, JSValue extensionObject)
+    {
+        if (const JSValue cachedValue = engine->getInternalExtension(Derived::name());
+                !JS_IsUndefined(cachedValue)) {
+            JS_SetPropertyStr(engine->context(), extensionObject, Derived::name(), cachedValue);
+            return;
+        }
+        engine->registerClass(Derived::name(), &Derived::ctor, &finalizer, extensionObject);
+        const ScopedJsValue classObj(
+                    engine->context(),
+                    JS_GetPropertyStr(engine->context(), extensionObject, Derived::name()));
+        Derived::setupStaticMethods(engine->context(), classObj);
+        Derived::declareEnums(engine->context(), classObj);
+    }
+
+    // obj is either class (for "static" methods) or class instance
+    template<typename Func> static void setupMethod(JSContext *ctx, JSValue obj, const char *name,
+                                                    Func func, int argc)
+    {
+        JS_DefinePropertyValueStr(ctx, obj, name, JS_NewCFunction(ctx, func, name, argc), 0);
+    }
+
+    template<typename Func> static void setupMethod(JSContext *ctx, JSValue obj,
+                                                    const QString &name, Func func, int argc)
+    {
+        setupMethod(ctx, obj, name.toUtf8().constData(), func, argc);
+    }
+
+    template<typename T> static T fromArg(JSContext *ctx, const char *funcName, int pos, JSValue v)
+    {
+        return FromArgHelper<T>::fromArg(ctx, funcName, pos, v);
+    }
+
+    template <typename Tuple, std::size_t... I>
+    static void assignToTuple(Tuple &tuple, std::index_sequence<I...>, JSContext *ctx, const char *funcName, JSValueConst *argv) {
+        Q_UNUSED(ctx)
+        Q_UNUSED(funcName)
+        Q_UNUSED(argv)
+        ((std::get<I>(tuple) = fromArg<std::tuple_element_t<I, Tuple>>(ctx, funcName, I + 1, argv[I])), ...);
+    }
+
+    template<typename ...Args> static std::tuple<Args...> getArguments(JSContext *ctx,
+            const char *funcName, int argc, JSValueConst *argv)
+    {
+        constexpr int expectedArgc = sizeof ...(Args);
+        if (argc < expectedArgc) {
+            throw Tr::tr("%1 requires %d arguments.")
+                    .arg(QLatin1String(funcName)).arg(expectedArgc);
+        }
+        std::tuple<std::remove_const_t<std::remove_reference_t<Args>>...> values;
+        assignToTuple(values, std::make_index_sequence<std::tuple_size<decltype(values)>::value>(),
+                      ctx, funcName, argv);
+        return values;
+    }
+    template<typename ...Args> static std::tuple<Args...> getArgumentsHelper(PackHelper<Args...>, JSContext *ctx,
+            const char *funcName, int argc, JSValueConst *argv)
+    {
+        return getArguments<Args...>(ctx, funcName, argc, argv);
+    }
+
+    template<typename T> static T getArgument(JSContext *ctx, const char *funcName,
+                                              int argc, JSValueConst *argv)
+    {
+        return std::get<0>(getArguments<T>(ctx, funcName, argc, argv));
+    }
+
+    template <typename Func, typename Tuple, std::size_t... I>
+    static void jsForwardHelperVoid(Derived *obj, Func func, const Tuple &tuple, std::index_sequence<I...>) {
+        (obj->*func)(std::get<I>(tuple)...);
+    }
+    template <typename Func, typename Ret, typename Tuple, std::size_t... I>
+    static Ret jsForwardHelperRet(Derived *obj, Func &func, Tuple const& tuple, std::index_sequence<I...>) {
+        return (obj->*func)(std::get<I>(tuple)...);
+    }
+
+    static JSValue toJsValue(JSContext *ctx, const QString &s) { return makeJsString(ctx, s); }
+    static JSValue toJsValue(JSContext *ctx, bool v) { return JS_NewBool(ctx, v); }
+    static JSValue toJsValue(JSContext *ctx, qint32 v) { return JS_NewInt32(ctx, v); }
+    static JSValue toJsValue(JSContext *ctx, qint64 v) { return JS_NewInt64(ctx, v); }
+    static JSValue toJsValue(JSContext *ctx, const QVariant &v) { return makeJsVariant(ctx, v); }
+    static JSValue toJsValue(JSContext *ctx, const QByteArray &data)
+    {
+        const JSValue array = JS_NewArray(ctx);
+        for (int i = 0; i < data.size(); ++i) {
+            JS_SetPropertyUint32(ctx, array, i,
+                                 JS_NewUint32(ctx, static_cast<unsigned char>(data.at(i))));
+        }
+        return array;
+    }
+    static JSValue toJsValue(JSContext *ctx, const QVariantMap &m)
+    {
+        return makeJsVariantMap(ctx, m);
+    }
+    template<typename T> static JSValue toJsValue(JSContext *ctx, const std::optional<T> &v)
+    {
+        if (!v)
+            return JS_UNDEFINED;
+        return makeJsString(ctx, *v);
+    }
+
+    template<typename Func>
+    static JSValue jsForward(Func func, const char *name, JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+    {
+        try {
+            using Ret = typename FunctionTrait<Func>::Ret;
+            using Args = typename FunctionTrait<Func>::Args;
+            const auto args = getArgumentsHelper(Args(), ctx, name, argc, argv);
+            const auto obj = fromJsObject(ctx, this_val);
+            if constexpr (std::is_same_v<Ret, void>) {
+                jsForwardHelperVoid(obj, func, args, std::make_index_sequence<std::tuple_size<decltype(args)>::value>());
+                return JS_UNDEFINED;
+            } else {
+                return toJsValue(ctx, jsForwardHelperRet<Func, Ret>(obj, func, args, std::make_index_sequence<std::tuple_size_v<decltype(args)>>()));
+            }
+        } catch (const QString &error) {
+            return throwError(ctx, error);
+        }
+    }
+
+    static void setupMethods(JSContext *, JSValue) {}
+    static void setupStaticMethods(JSContext *, JSValue) {}
+    static void declareEnums(JSContext *, JSValue) {}
+
+private:
+    static void finalizer(JSRuntime *rt, JSValue val)
+    {
+        delete attachedPointer<Derived>(val, classId(rt));
+    }
+
+    static JSClassID classId(JSContext *ctx)
+    {
+        return ScriptEngine::engineForContext(ctx)->getClassId(Derived::name());
+    }
+
+    static JSClassID classId(JSRuntime *rt)
+    {
+        return ScriptEngine::engineForRuntime(rt)->getClassId(Derived::name());
+    }
+
+    static JSValue ctor(JSContext *ctx, JSValueConst, JSValueConst, int, JSValueConst *, int)
+    {
+        return throwError(ctx, Tr::tr("'%1' cannot be instantiated.")
+                          .arg(QLatin1String(Derived::name())));
+    }
+};
+
+template<> struct FromArgHelper<bool> {
+    static bool fromArg(JSContext *ctx, const char *, int, JSValue v) {
+        return JS_ToBool(ctx, v);
+    }
+};
+template<> struct FromArgHelper<qint32> {
+    static qint32 fromArg(JSContext *ctx, const char *funcName, int pos, JSValue v) {
+        int32_t val;
+        if (JS_ToInt32(ctx, &val, v) < 0) {
+            throw Tr::tr("%1 requires an integer as argument %2")
+                    .arg(QLatin1String(funcName)).arg(pos);
+        }
+        return val;
+    }
+};
+template<> struct FromArgHelper<qint64> {
+    static qint64 fromArg(JSContext *ctx, const char *funcName, int pos, JSValue v) {
+        int64_t val;
+        if (JS_ToInt64(ctx, &val, v) < 0) {
+            throw Tr::tr("%1 requires an integer as argument %2")
+                    .arg(QLatin1String(funcName)).arg(pos);
+        }
+        return val;
+    }
+};
+template<> struct FromArgHelper<QByteArray> {
+    static QByteArray fromArg(JSContext *ctx, const char *funcName, int pos, JSValue v) {
+        const auto throwError = [&] {
+            throw Tr::tr("%1 requires an array of bytes as argument %2")
+                    .arg(QLatin1String(funcName)).arg(pos);
+        };
+        if (!JS_IsArray(ctx, v))
+            throwError();
+        QByteArray data;
+        data.resize(getJsIntProperty(ctx, v, QLatin1String("length")));
+        for (int i = 0; i < data.size(); ++i) {
+            const JSValue jsNumber = JS_GetPropertyUint32(ctx, v, i);
+            if (JS_VALUE_GET_TAG(jsNumber) != JS_TAG_INT)
+                throwError();
+            uint32_t n;
+            JS_ToUint32(ctx, &n, jsNumber);
+            if (n > 0xff)
+                throwError();
+            data[i] = n;
+        }
+        return data;
+    }
+};
+template<> struct FromArgHelper<QString> {
+    static QString fromArg(JSContext *ctx, const char *funcName, int pos, JSValue v) {
+        if (JS_IsUndefined(v))
+            return {};
+        const ScopedJsValue stringified(ctx, JS_ToString(ctx, v));
+        if (!JS_IsString(stringified)) {
+            throw Tr::tr("%1 requires a string as argument %2")
+                    .arg(QLatin1String(funcName)).arg(pos);
+        }
+        return getJsString(ctx, stringified);
+    }
+};
+template<> struct FromArgHelper<QStringList> {
+    static QStringList fromArg(JSContext *ctx, const char *funcName, int pos, JSValue v) {
+        if (!JS_IsArray(ctx, v)) {
+            throw Tr::tr("%1 requires an array of strings as argument %2")
+                    .arg(QLatin1String(funcName)).arg(pos);
+        }
+        return getJsStringList(ctx, v);
+    }
+};
+template<> struct FromArgHelper<QVariant> {
+    static QVariant fromArg(JSContext *ctx, const char *, int, JSValue v) {
+        return getJsVariant(ctx, v);
+    }
+};
+template<class C> struct FromArgHelper<C *> {
+    static C *fromArg(JSContext *ctx, const char *funcName, int pos, JSValue v) {
+        C * const obj = JsExtension<C>::fromJsObject(ctx, v);
+        if (!obj) {
+            throw Tr::tr("Argument %2 has wrong type in call to %1")
+                    .arg(QLatin1String(funcName)).arg(pos);
+        }
+        return obj;
+    }
+};
+
+template <typename R, typename C, typename... A>
+struct FunctionTrait<R(C::*)(A... )> {
+    using Ret = R;
+    using Args = PackHelper<std::remove_reference_t<A>...>;
+};
+template <typename R, typename C, typename... A>
+struct FunctionTrait<R(C::*)(A... ) const> {
+    using Ret = R;
+    using Args = PackHelper<std::remove_reference_t<A>...>;
+};
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/jsextensions/jsextensions.cpp b/src/lib/corelib/jsextensions/jsextensions.cpp
index fc464b44d..66d7ebbd6 100644
--- a/src/lib/corelib/jsextensions/jsextensions.cpp
+++ b/src/lib/corelib/jsextensions/jsextensions.cpp
@@ -39,17 +39,19 @@
 
 #include "jsextensions.h"
 
+#include <language/scriptengine.h>
+#include <tools/scripttools.h>
+
 #include <QtCore/qmap.h>
-#include <QtScript/qscriptengine.h>
 
 #include <utility>
 
-using InitializerMap = QMap<QString, void (*)(QScriptValue)>;
+using InitializerMap = QMap<QString, void (*)(qbs::Internal::ScriptEngine *, JSValue)>;
 static InitializerMap setupMap()
 {
 #define INITIALIZER_NAME(name) initializeJsExtension##name
 #define ADD_JS_EXTENSION(name) \
-    void INITIALIZER_NAME(name)(QScriptValue); \
+    void INITIALIZER_NAME(name)(qbs::Internal::ScriptEngine *, JSValue); \
     map.insert(QStringLiteral(#name), &INITIALIZER_NAME(name))
 
     InitializerMap map;
@@ -57,6 +59,7 @@ static InitializerMap setupMap()
     ADD_JS_EXTENSION(Environment);
     ADD_JS_EXTENSION(File);
     ADD_JS_EXTENSION(FileInfo);
+    ADD_JS_EXTENSION(Host);
     ADD_JS_EXTENSION(PkgConfig);
     ADD_JS_EXTENSION(Process);
     ADD_JS_EXTENSION(PropertyList);
@@ -76,20 +79,21 @@ static InitializerMap &initializers()
     return theMap;
 }
 
-void JsExtensions::setupExtensions(const QStringList &names, const QScriptValue &scope)
+void JsExtensions::setupExtensions(ScriptEngine *engine, const QStringList &names,
+                                   const JSValue &scope)
 {
     for (const QString &name : names)
-        initializers().value(name)(scope);
+        initializers().value(name)(engine, scope);
 }
 
-QScriptValue JsExtensions::loadExtension(QScriptEngine *engine, const QString &name)
+JSValue JsExtensions::loadExtension(ScriptEngine *engine, const QString &name)
 {
     if (!hasExtension(name))
         return {};
 
-    QScriptValue extensionObj = engine->newObject();
-    initializers().value(name)(extensionObj);
-    return extensionObj.property(name);
+    ScopedJsValue extensionObj(engine->context(), engine->newObject());
+    initializers().value(name)(engine, extensionObj);
+    return getJsProperty(engine->context(), extensionObj, name);
 }
 
 bool JsExtensions::hasExtension(const QString &name)
diff --git a/src/lib/corelib/jsextensions/jsextensions.h b/src/lib/corelib/jsextensions/jsextensions.h
index f1ebfbdc3..2602679b5 100644
--- a/src/lib/corelib/jsextensions/jsextensions.h
+++ b/src/lib/corelib/jsextensions/jsextensions.h
@@ -40,22 +40,20 @@
 #ifndef QBS_JSEXTENSIONS_H
 #define QBS_JSEXTENSIONS_H
 
-#include <QtCore/qhash.h>
-#include <QtCore/qstringlist.h>
+#include <quickjs.h>
 
-QT_BEGIN_NAMESPACE
-class QScriptEngine;
-class QScriptValue;
-QT_END_NAMESPACE
+#include <QtCore/qstringlist.h>
 
 namespace qbs {
 namespace Internal {
+class ScriptEngine;
 
 class JsExtensions
 {
 public:
-    static void setupExtensions(const QStringList &names, const QScriptValue &scope);
-    static QScriptValue loadExtension(QScriptEngine *engine, const QString &name);
+    static void setupExtensions(ScriptEngine *engine, const QStringList &names,
+                                const JSValue &scope);
+    static JSValue loadExtension(ScriptEngine *engine, const QString &name);
     static bool hasExtension(const QString &name);
     static QStringList extensionNames();
 };
diff --git a/src/lib/corelib/jsextensions/jsextensions.pri b/src/lib/corelib/jsextensions/jsextensions.pri
deleted file mode 100644
index d77f5a687..000000000
--- a/src/lib/corelib/jsextensions/jsextensions.pri
+++ /dev/null
@@ -1,28 +0,0 @@
-QT += xml
-
-HEADERS += \
-    $$PWD/moduleproperties.h \
-    $$PWD/jsextensions.h \
-    $$PWD/pkgconfigjs.h
-
-SOURCES += \
-    $$PWD/environmentextension.cpp \
-    $$PWD/file.cpp \
-    $$PWD/fileinfoextension.cpp \
-    $$PWD/temporarydir.cpp \
-    $$PWD/textfile.cpp \
-    $$PWD/binaryfile.cpp \
-    $$PWD/pkgconfigjs.cpp \
-    $$PWD/process.cpp \
-    $$PWD/moduleproperties.cpp \
-    $$PWD/domxml.cpp \
-    $$PWD/jsextensions.cpp \
-    $$PWD/utilitiesextension.cpp
-
-darwin {
-    HEADERS += $$PWD/propertylistutils.h $$PWD/propertylist_darwin.h
-    SOURCES += $$PWD/propertylist_darwin.mm $$PWD/propertylistutils.mm
-    LIBS += -framework Foundation
-} else {
-    SOURCES += $$PWD/propertylist.cpp
-}
diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp
index f721e0016..2c73f2c53 100644
--- a/src/lib/corelib/jsextensions/moduleproperties.cpp
+++ b/src/lib/corelib/jsextensions/moduleproperties.cpp
@@ -41,8 +41,8 @@
 
 #include <buildgraph/artifact.h>
 #include <buildgraph/artifactsscriptvalue.h>
+#include <buildgraph/buildgraph.h>
 #include <buildgraph/dependencyparametersscriptvalue.h>
-#include <buildgraph/scriptclasspropertyiterator.h>
 #include <language/language.h>
 #include <language/propertymapinternal.h>
 #include <language/qualifiedid.h>
@@ -53,28 +53,21 @@
 #include <tools/qttools.h>
 #include <tools/stlutils.h>
 #include <tools/stringconstants.h>
-
-#include <QtScript/qscriptclass.h>
+#include <utility>
 
 namespace qbs {
 namespace Internal {
 
-QScriptValue getDataForModuleScriptValue(QScriptEngine *engine, const ResolvedProduct *product,
-                                         const Artifact *artifact, const ResolvedModule *module)
+JSValue createDataForModuleScriptValue(ScriptEngine *engine, const Artifact *artifact)
 {
-    QScriptValue data = engine->newObject();
-    data.setProperty(ModuleNameKey, module->name);
-    QVariant v;
-    v.setValue<quintptr>(reinterpret_cast<quintptr>(product));
-    data.setProperty(ProductPtrKey, engine->newVariant(v));
-    v.setValue<quintptr>(reinterpret_cast<quintptr>(artifact));
-    data.setProperty(ArtifactPtrKey, engine->newVariant(v));
+    JSValue data = JS_NewObjectClass(engine->context(), engine->dataWithPtrClass());
+    attachPointerTo(data, artifact);
     return data;
 }
 
-static QScriptValue getModuleProperty(const ResolvedProduct *product, const Artifact *artifact,
-                                      ScriptEngine *engine, const QString &moduleName,
-                                      const QString &propertyName, bool *isPresent = nullptr)
+static JSValue getModuleProperty(const ResolvedProduct *product, const Artifact *artifact,
+                                 ScriptEngine *engine, const QString &moduleName,
+                                 const QString &propertyName, bool *isPresent = nullptr)
 {
     const PropertyMapConstPtr &properties = artifact ? artifact->properties
                                                      : product->moduleProperties;
@@ -84,7 +77,7 @@ static QScriptValue getModuleProperty(const ResolvedProduct *product, const Arti
     if (!value.isValid()) {
         value = properties->moduleProperty(moduleName, propertyName, isPresent);
 
-        // Cache the variant value. We must not cache the QScriptValue here, because it's a
+        // Cache the variant value. We must not cache the script value here, because it's a
         // reference and the user might change the actual object.
         if (engine->isPropertyCacheEnabled())
             engine->addToPropertyCache(moduleName, propertyName, properties, value);
@@ -102,111 +95,101 @@ static QScriptValue getModuleProperty(const ResolvedProduct *product, const Arti
     return engine->toScriptValue(value);
 }
 
-class ModulePropertyScriptClass : public QScriptClass
-{
-public:
-    ModulePropertyScriptClass(QScriptEngine *engine)
-        : QScriptClass(engine)
-    {
-    }
-
-private:
-    QueryFlags queryProperty(const QScriptValue &object, const QScriptString &name,
-                             QueryFlags flags, uint *id) override
-    {
-        Q_UNUSED(flags);
-        Q_UNUSED(id);
-
-        if (name == StringConstants::dependenciesProperty()
-                || name == StringConstants::artifactsProperty()) {
-            // The prototype is not backed by a QScriptClass.
-            m_result = object.prototype().property(name);
-            return HandlesReadAccess;
-        }
-
-        if (name == StringConstants::parametersProperty()) {
-            m_result = object.data().property(DependencyParametersKey);
-            return HandlesReadAccess;
-        }
+struct ModuleData {
+    JSValue dependencyParameters = JS_UNDEFINED;
+    const Artifact *artifact = nullptr;
+};
 
-        setup(object);
-        QBS_ASSERT(m_product, return {});
-        bool isPresent;
-        m_result = getModuleProperty(m_product, m_artifact, static_cast<ScriptEngine *>(engine()),
-                                     m_moduleName, name, &isPresent);
+ModuleData getModuleData(JSContext *ctx, JSValue obj)
+{
+    const ScopedJsValue jsData(ctx, getJsProperty(ctx, obj,
+                                                  StringConstants::dataPropertyInternal()));
+    ModuleData data;
+    data.dependencyParameters = JS_GetPropertyUint32(ctx, jsData, DependencyParametersKey);
+    data.artifact = attachedPointer<Artifact>(
+                jsData, ScriptEngine::engineForContext(ctx)->dataWithPtrClass());
+    return data;
+}
 
-        // It is important that we reject unknown property names. Otherwise QtScript will forward
-        // *everything* to us, including built-in stuff like the hasOwnProperty function.
-        return isPresent ? HandlesReadAccess : QueryFlags();
+static int getModulePropertyNames(JSContext *ctx, JSPropertyEnum **ptab, uint32_t *plen,
+                                  JSValueConst obj)
+{
+    const auto engine = ScriptEngine::engineForContext(ctx);
+    const ModuleData data = getModuleData(ctx, obj);
+    const auto module = attachedPointer<ResolvedModule>(obj, engine->modulePropertyScriptClass());
+    QBS_ASSERT(module, return -1);
+
+    const PropertyMapInternal *propertyMap;
+    QStringList additionalProperties;
+    if (data.artifact) {
+        propertyMap = data.artifact->properties.get();
+    } else {
+        propertyMap = module->product->moduleProperties.get();
+        if (JS_IsObject(data.dependencyParameters))
+            additionalProperties.push_back(StringConstants::parametersProperty());
     }
+    JS_FreeValue(ctx, data.dependencyParameters);
+    getPropertyNames(ctx, ptab, plen, propertyMap->value().value(module->name).toMap(),
+                     additionalProperties, engine->baseModuleScriptValue(module));
+    return 0;
+}
 
-    QScriptValue property(const QScriptValue &, const QScriptString &, uint) override
-    {
-        return m_result;
+static int getModuleProperty(JSContext *ctx, JSPropertyDescriptor *desc, JSValueConst obj,
+                             JSAtom prop)
+{
+    if (desc) {
+        desc->getter = desc->setter = desc->value = JS_UNDEFINED;
+        desc->flags = JS_PROP_ENUMERABLE;
     }
-
-    QScriptClassPropertyIterator *newIterator(const QScriptValue &object) override
-    {
-        setup(object);
-        QBS_ASSERT(m_artifact || m_product, return nullptr);
-        const PropertyMapInternal *propertyMap;
-        std::vector<QString> additionalProperties({StringConstants::artifactsProperty(),
-                                                   StringConstants::dependenciesProperty()});
-        if (m_artifact) {
-            propertyMap = m_artifact->properties.get();
-        } else {
-            propertyMap = m_product->moduleProperties.get();
-            if (object.data().property(DependencyParametersKey).isValid())
-                additionalProperties.push_back(StringConstants::parametersProperty());
-        }
-        return new ScriptClassPropertyIterator(object,
-                                               propertyMap->value().value(m_moduleName).toMap(),
-                                               additionalProperties);
+    const auto engine = ScriptEngine::engineForContext(ctx);
+    const QString name = getJsString(ctx, prop);
+    const ModuleData data = getModuleData(ctx, obj);
+    const auto module = attachedPointer<ResolvedModule>(obj, engine->modulePropertyScriptClass());
+    QBS_ASSERT(module, return -1);
+
+    ScopedJsValue parametersMgr(ctx, data.dependencyParameters);
+    if (name == StringConstants::parametersProperty()) {
+        if (desc)
+            desc->value = parametersMgr.release();
+        return 1;
     }
 
-    void setup(const QScriptValue &object)
-    {
-        if (m_lastObjectId != object.objectId()) {
-            m_lastObjectId = object.objectId();
-            const QScriptValue data = object.data();
-            QBS_ASSERT(data.isValid(), return);
-            m_moduleName = data.property(ModuleNameKey).toString();
-            m_product = reinterpret_cast<const ResolvedProduct *>(
-                        data.property(ProductPtrKey).toVariant().value<quintptr>());
-            m_artifact = reinterpret_cast<const Artifact *>(
-                        data.property(ArtifactPtrKey).toVariant().value<quintptr>());
-        }
+    bool isPresent;
+    JSValue value = getModuleProperty(
+                module->product, data.artifact, ScriptEngine::engineForContext(ctx),
+                module->name, name, &isPresent);
+    if (isPresent) {
+        if (desc)
+            desc->value = value;
+        return 1;
     }
 
-    qint64 m_lastObjectId = 0;
-    QString m_moduleName;
-    const ResolvedProduct *m_product = nullptr;
-    const Artifact *m_artifact = nullptr;
-    QScriptValue m_result;
-};
-
-static QString ptrKey() { return QStringLiteral("__internalPtr"); }
-static QString typeKey() { return QStringLiteral("__type"); }
-static QString artifactType() { return QStringLiteral("artifact"); }
+    ScopedJsValue v(ctx, JS_GetProperty(ctx, engine->baseModuleScriptValue(module), prop));
+    const int ret = JS_IsUndefined(v) ? 0 : 1;
+    if (desc)
+        desc->value = v.release();
+    return ret;
+}
 
-static QScriptValue js_moduleDependencies(QScriptContext *, ScriptEngine *engine,
-                                          const ResolvedModule *module)
+static JSValue js_moduleDependencies(JSContext *ctx, JSValueConst this_val, int , JSValueConst *)
 {
-    QScriptValue result = engine->newArray();
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const auto module = attachedPointer<ResolvedModule>(this_val, engine->dataWithPtrClass());
+    JSValue result = JS_NewArray(engine->context());
     quint32 idx = 0;
-    for (const QString &depName : qAsConst(module->moduleDependencies)) {
+    for (const QString &depName : std::as_const(module->moduleDependencies)) {
         for (const auto &dep : module->product->modules) {
             if (dep->name != depName)
                 continue;
-            QScriptValue obj = engine->newObject(engine->modulePropertyScriptClass());
-            obj.setPrototype(engine->moduleScriptValuePrototype(dep.get()));
-            QScriptValue data = getDataForModuleScriptValue(engine, module->product, nullptr,
-                                                            dep.get());
+            JSValue obj = JS_NewObjectClass(ctx, engine->modulePropertyScriptClass());
+            attachPointerTo(obj, dep.get());
+            JSValue data = createDataForModuleScriptValue(engine, nullptr);
             const QVariantMap &params = module->product->moduleParameters.value(dep);
-            data.setProperty(DependencyParametersKey, dependencyParametersValue(
-                                 module->product->uniqueName(), dep->name, params, engine));
-            obj.setData(data);
-            result.setProperty(idx++, obj);
+            JS_SetPropertyUint32(ctx, data, DependencyParametersKey,
+                                 dependencyParametersValue(module->product->uniqueName(),
+                                                           dep->name, params, engine));
+            defineJsProperty(ctx, obj, StringConstants::dataPropertyInternal(), data);
+            JS_SetPropertyUint32(ctx, result, idx++, obj);
             break;
         }
     }
@@ -214,35 +197,84 @@ static QScriptValue js_moduleDependencies(QScriptContext *, ScriptEngine *engine
     return result;
 }
 
-static QScriptValue setupModuleScriptValue(ScriptEngine *engine,
-                                           const ResolvedModule *module)
+template<class ProductOrArtifact>
+static JSValue moduleProperty(JSContext *ctx, JSValue this_val, int argc, JSValue *argv)
+{
+    if (Q_UNLIKELY(argc < 2))
+        return throwError(ctx, Tr::tr("Function moduleProperty() expects 2 arguments"));
+
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const ResolvedProduct *product = nullptr;
+    const Artifact *artifact = nullptr;
+    if constexpr (std::is_same_v<ProductOrArtifact, ResolvedProduct>) {
+        product = attachedPointer<ResolvedProduct>(this_val, engine->productPropertyScriptClass());
+    } else {
+        artifact = attachedPointer<Artifact>(this_val, engine->dataWithPtrClass());
+        product = artifact->product;
+    }
+
+    const QString moduleName = getJsString(ctx, argv[0]);
+    const QString propertyName = getJsString(ctx, argv[1]);
+    return getModuleProperty(product, artifact, engine, moduleName, propertyName);
+}
+
+
+template<class ProductOrArtifact>
+static JSValue js_moduleProperty(JSContext *ctx, JSValue this_val, int argc, JSValue *argv)
+{
+    try {
+        return moduleProperty<ProductOrArtifact>(ctx, this_val, argc, argv);
+    } catch (const ErrorInfo &e) {
+        return throwError(ctx, e.toString());
+    }
+}
+
+template<class ProductOrArtifact>
+static void initModuleProperties(ScriptEngine *engine, JSValue objectWithProperties)
+{
+    JSContext * const ctx = engine->context();
+    JSValue func = JS_NewCFunction(ctx, js_moduleProperty<ProductOrArtifact>, "moduleProperty", 2);
+    setJsProperty(ctx, objectWithProperties, QStringLiteral("moduleProperty"), func);
+}
+
+static JSValue setupBaseModuleScriptValue(ScriptEngine *engine, const ResolvedModule *module)
 {
-    QScriptValue &moduleScriptValue = engine->moduleScriptValuePrototype(module);
-    if (moduleScriptValue.isValid())
+    JSValue &moduleScriptValue = engine->baseModuleScriptValue(module);
+    if (JS_IsObject(moduleScriptValue))
         return moduleScriptValue;
-    moduleScriptValue = engine->newObject();
-    QScriptValue depfunc = engine->newFunction<const ResolvedModule *>(&js_moduleDependencies,
-                                                                       module);
-    moduleScriptValue.setProperty(StringConstants::dependenciesProperty(), depfunc,
-                                  QScriptValue::ReadOnly | QScriptValue::Undeletable
-                                  | QScriptValue::PropertyGetter);
-    QScriptValue artifactsFunc = engine->newFunction(&artifactsScriptValueForModule, module);
-    moduleScriptValue.setProperty(StringConstants::artifactsProperty(), artifactsFunc,
-                                   QScriptValue::ReadOnly | QScriptValue::Undeletable
-                                   | QScriptValue::PropertyGetter);
+    const ScopedJsValue proto(engine->context(), JS_NewObject(engine->context()));
+    moduleScriptValue = JS_NewObjectProtoClass(engine->context(), proto,
+                                               engine->dataWithPtrClass());
+    attachPointerTo(moduleScriptValue, module);
+    QByteArray name = StringConstants::dependenciesProperty().toUtf8();
+    const ScopedJsValue depfunc(
+                engine->context(),
+                JS_NewCFunction(engine->context(), js_moduleDependencies, name.constData(), 0));
+    const ScopedJsAtom depAtom(engine->context(), name);
+    JS_DefineProperty(engine->context(), moduleScriptValue, depAtom,
+                      JS_UNDEFINED, depfunc, JS_UNDEFINED, JS_PROP_HAS_GET | JS_PROP_ENUMERABLE);
+    name = StringConstants::artifactsProperty().toUtf8();
+    const ScopedJsValue artifactsFunc(
+                engine->context(),
+                JS_NewCFunction(engine->context(), &artifactsScriptValueForModule,
+                                name.constData(), 0));
+    const ScopedJsAtom artifactsAtom(engine->context(), name);
+    JS_DefineProperty(engine->context(), moduleScriptValue, artifactsAtom,
+                      JS_UNDEFINED, artifactsFunc, JS_UNDEFINED,
+                      JS_PROP_HAS_GET | JS_PROP_ENUMERABLE);
     return moduleScriptValue;
 }
 
-void ModuleProperties::init(QScriptValue productObject,
+void ModuleProperties::init(ScriptEngine *engine, JSValue productObject,
                             const ResolvedProduct *product)
 {
-    init(productObject, product, StringConstants::productValue());
-    setupModules(productObject, product, nullptr);
+    initModuleProperties<ResolvedProduct>(engine, productObject);
+    setupModules(engine, productObject, product, nullptr);
 }
 
-void ModuleProperties::init(QScriptValue artifactObject, const Artifact *artifact)
+void ModuleProperties::init(ScriptEngine *engine, JSValue artifactObject, const Artifact *artifact)
 {
-    init(artifactObject, artifact, artifactType());
+    initModuleProperties<Artifact>(engine, artifactObject);
     const auto product = artifact->product;
     const QVariantMap productProperties {
         {StringConstants::buildDirectoryProperty(), product->buildDirectory()},
@@ -252,106 +284,51 @@ void ModuleProperties::init(QScriptValue artifactObject, const Artifact *artifac
         {StringConstants::targetNameProperty(), product->targetName},
         {StringConstants::typeProperty(), sorted(product->fileTags.toStringList())}
     };
-    QScriptEngine * const engine = artifactObject.engine();
-    artifactObject.setProperty(StringConstants::productVar(),
-                               engine->toScriptValue(productProperties));
-    setupModules(artifactObject, artifact->product.get(), artifact);
+    setJsProperty(engine->context(), artifactObject, StringConstants::productVar(),
+                  engine->toScriptValue(productProperties));
+    setupModules(engine, artifactObject, artifact->product.get(), artifact);
 }
 
-void ModuleProperties::setModuleScriptValue(QScriptValue targetObject,
-        const QScriptValue &moduleObject, const QString &moduleName)
+void ModuleProperties::setModuleScriptValue(ScriptEngine *engine, JSValue targetObject,
+                                            const JSValue &moduleObject, const QString &moduleName)
 {
-    auto const e = static_cast<ScriptEngine *>(targetObject.engine());
     const QualifiedId name = QualifiedId::fromString(moduleName);
-    QScriptValue obj = targetObject;
+    JSValue obj = targetObject;
     for (int i = 0; i < name.size() - 1; ++i) {
-        QScriptValue tmp = obj.property(name.at(i));
-        if (!tmp.isObject())
-            tmp = e->newObject();
-        obj.setProperty(name.at(i), tmp);
+        JSValue tmp = getJsProperty(engine->context(), obj, name.at(i));
+        if (!JS_IsObject(tmp)) {
+            tmp = engine->newObject();
+            setJsProperty(engine->context(), obj, name.at(i), tmp);
+        } else {
+            JS_FreeValue(engine->context(), tmp);
+        }
         obj = tmp;
     }
-    obj.setProperty(name.last(), moduleObject);
-    if (moduleName.size() > 1)
-        targetObject.setProperty(moduleName, moduleObject);
-}
-
-void ModuleProperties::init(QScriptValue objectWithProperties, const void *ptr,
-                            const QString &type)
-{
-    QScriptEngine * const engine = objectWithProperties.engine();
-    objectWithProperties.setProperty(QStringLiteral("moduleProperty"),
-                                     engine->newFunction(ModuleProperties::js_moduleProperty, 2));
-    objectWithProperties.setProperty(ptrKey(), engine->toScriptValue(quintptr(ptr)));
-    objectWithProperties.setProperty(typeKey(), type);
+    setJsProperty(engine->context(), obj, name.last(), moduleObject);
+    if (name.size() > 1) {
+        setJsProperty(engine->context(), targetObject, moduleName,
+                      JS_DupValue(engine->context(), moduleObject));
+    }
 }
 
-void ModuleProperties::setupModules(QScriptValue &object, const ResolvedProduct *product,
-                                    const Artifact *artifact)
+void ModuleProperties::setupModules(ScriptEngine *engine, JSValue &object,
+                                    const ResolvedProduct *product, const Artifact *artifact)
 {
-    const auto engine = static_cast<ScriptEngine *>(object.engine());
-    QScriptClass *modulePropertyScriptClass = engine->modulePropertyScriptClass();
-    if (!modulePropertyScriptClass) {
-        modulePropertyScriptClass = new ModulePropertyScriptClass(engine);
+    JSClassID modulePropertyScriptClass = engine->modulePropertyScriptClass();
+    if (modulePropertyScriptClass == 0) {
+        modulePropertyScriptClass = engine->registerClass("ModulePropertyScriptClass", nullptr,
+                nullptr, JS_UNDEFINED, &getModulePropertyNames, &getModuleProperty);
         engine->setModulePropertyScriptClass(modulePropertyScriptClass);
     }
     for (const auto &module : product->modules) {
-        QScriptValue moduleObjectPrototype = setupModuleScriptValue(engine, module.get());
-        QScriptValue moduleObject = engine->newObject(modulePropertyScriptClass);
-        moduleObject.setPrototype(moduleObjectPrototype);
-        moduleObject.setData(getDataForModuleScriptValue(engine, product, artifact, module.get()));
-        setModuleScriptValue(object, moduleObject, module->name);
-    }
-}
-
-QScriptValue ModuleProperties::js_moduleProperty(QScriptContext *context, QScriptEngine *engine)
-{
-    try {
-        return moduleProperty(context, engine);
-    } catch (const ErrorInfo &e) {
-        return context->throwError(e.toString());
+        setupBaseModuleScriptValue(engine, module.get());
+        JSValue moduleObject = JS_NewObjectClass(engine->context(), modulePropertyScriptClass);
+        attachPointerTo(moduleObject, module.get());
+        defineJsProperty(engine->context(), moduleObject, StringConstants::dataPropertyInternal(),
+                         createDataForModuleScriptValue(engine, artifact));
+        setModuleScriptValue(engine, object, moduleObject, module->name);
     }
 }
 
-QScriptValue ModuleProperties::moduleProperty(QScriptContext *context, QScriptEngine *engine)
-{
-    if (Q_UNLIKELY(context->argumentCount() < 2)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   Tr::tr("Function moduleProperty() expects 2 arguments"));
-    }
-
-    const QScriptValue objectWithProperties = context->thisObject();
-    const QScriptValue typeScriptValue = objectWithProperties.property(typeKey());
-    if (Q_UNLIKELY(!typeScriptValue.isString())) {
-        return context->throwError(QScriptContext::TypeError,
-                QStringLiteral("Internal error: __type not set up"));
-    }
-    const QScriptValue ptrScriptValue = objectWithProperties.property(ptrKey());
-    if (Q_UNLIKELY(!ptrScriptValue.isNumber())) {
-        return context->throwError(QScriptContext::TypeError,
-                QStringLiteral("Internal error: __internalPtr not set up"));
-    }
-
-    const void *ptr = reinterpret_cast<const void *>(qscriptvalue_cast<quintptr>(ptrScriptValue));
-    const ResolvedProduct *product = nullptr;
-    const Artifact *artifact = nullptr;
-    if (typeScriptValue.toString() == StringConstants::productValue()) {
-        QBS_ASSERT(ptr, return {});
-        product = static_cast<const ResolvedProduct *>(ptr);
-    } else if (typeScriptValue.toString() == artifactType()) {
-        QBS_ASSERT(ptr, return {});
-        artifact = static_cast<const Artifact *>(ptr);
-        product = artifact->product.get();
-    } else {
-        return context->throwError(QScriptContext::TypeError,
-                                   QStringLiteral("Internal error: invalid type"));
-    }
-
-    const auto qbsEngine = static_cast<ScriptEngine *>(engine);
-    const QString moduleName = context->argument(0).toString();
-    const QString propertyName = context->argument(1).toString();
-    return getModuleProperty(product, artifact, qbsEngine, moduleName, propertyName);
-}
-
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/jsextensions/moduleproperties.h b/src/lib/corelib/jsextensions/moduleproperties.h
index 3fe4fbfd0..6272ee8a2 100644
--- a/src/lib/corelib/jsextensions/moduleproperties.h
+++ b/src/lib/corelib/jsextensions/moduleproperties.h
@@ -43,41 +43,32 @@
 #include <buildgraph/forward_decls.h>
 #include <language/forward_decls.h>
 
-#include <QtScript/qscriptcontext.h>
-#include <QtScript/qscriptvalue.h>
+#include <quickjs.h>
 
 namespace qbs {
 namespace Internal {
-
 class ScriptEngine;
 
 enum ModulePropertiesScriptValueCommonPropertyKeys : quint32
 {
     ModuleNameKey,
-    ProductPtrKey,
-    ArtifactPtrKey,
     DependencyParametersKey,
 };
 
-QScriptValue getDataForModuleScriptValue(QScriptEngine *engine, const ResolvedProduct *product,
-                                         const Artifact *artifact, const ResolvedModule *module);
+JSValue createDataForModuleScriptValue(ScriptEngine *engine,
+                                       const Artifact *artifact);
 
 class ModuleProperties
 {
 public:
-    static void init(QScriptValue productObject, const ResolvedProduct *product);
-    static void init(QScriptValue artifactObject, const Artifact *artifact);
-    static void setModuleScriptValue(QScriptValue targetObject, const QScriptValue &moduleObject,
-                                     const QString &moduleName);
+    static void init(ScriptEngine *engine, JSValue productObject, const ResolvedProduct *product);
+    static void init(ScriptEngine *engine, JSValue artifactObject, const Artifact *artifact);
+    static void setModuleScriptValue(ScriptEngine *engine, JSValue targetObject,
+                                     const JSValue &moduleObject, const QString &moduleName);
 
 private:
-    static void init(QScriptValue objectWithProperties, const void *ptr, const QString &type);
-    static void setupModules(QScriptValue &object, const ResolvedProduct *product,
+    static void setupModules(ScriptEngine *engine, JSValue &object, const ResolvedProduct *product,
                              const Artifact *artifact);
-
-    static QScriptValue js_moduleProperty(QScriptContext *context, QScriptEngine *engine);
-
-    static QScriptValue moduleProperty(QScriptContext *context, QScriptEngine *engine);
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/jsextensions/pkgconfigjs.cpp b/src/lib/corelib/jsextensions/pkgconfigjs.cpp
index 3bace6f06..817a3dfb9 100644
--- a/src/lib/corelib/jsextensions/pkgconfigjs.cpp
+++ b/src/lib/corelib/jsextensions/pkgconfigjs.cpp
@@ -42,9 +42,6 @@
 #include <language/scriptengine.h>
 #include <tools/version.h>
 
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
-
 #include <QtCore/QProcessEnvironment>
 
 #include <stdexcept>
@@ -62,6 +59,14 @@ template<typename C, typename F> QVariantList convert(const C &c, F &&f)
     return result;
 }
 
+QVariantMap variablesMapToMap(const PcPackage::VariablesMap &variables)
+{
+    QVariantMap result;
+    for (const auto &item: variables)
+        result.insert(QString::fromStdString(item.first), QString::fromStdString(item.second));
+    return result;
+}
+
 QVariantMap packageToMap(const PcPackage &package)
 {
     QVariantMap result;
@@ -116,7 +121,6 @@ QVariantMap packageToMap(const PcPackage &package)
         case Type::AlwaysMatch:
             break;
         }
-        result[QStringLiteral("comparison")] = QVariant::fromValue(qint32(version.comparison));
         return result;
     };
 
@@ -127,6 +131,7 @@ QVariantMap packageToMap(const PcPackage &package)
     result[QStringLiteral("requiresPrivate")] =
             convert(package.requiresPrivate, requiredVersionToMap);
     result[QStringLiteral("conflicts")] = convert(package.conflicts, requiredVersionToMap);
+    result[QStringLiteral("variables")] = variablesMapToMap(package.variables);
 
     return result;
 };
@@ -171,44 +176,45 @@ PcPackage::VariablesMap variablesFromQVariantMap(const QVariantMap &map)
 
 std::vector<std::string> stringListToStdVector(const QStringList &list)
 {
-    std::vector<std::string> result;
-    result.reserve(list.size());
-    for (const auto &string : list)
-        result.push_back(string.toStdString());
-    return result;
+    return transformed<std::vector<std::string>>(list, [](const auto &s) {
+        return s.toStdString(); });
 }
 
 } // namespace
 
-QScriptValue PkgConfigJs::ctor(QScriptContext *context, QScriptEngine *engine)
+void PkgConfigJs::declareEnums(JSContext *ctx, JSValue classObj)
 {
-    try {
-        PkgConfigJs *e = nullptr;
-        switch (context->argumentCount()) {
-        case 0:
-            e = new PkgConfigJs(context, engine);
-            break;
-        case 1:
-            e = new PkgConfigJs(context, engine, context->argument(0).toVariant().toMap());
-            break;
-
-        default:
-            return context->throwError(
-                    QStringLiteral("TextFile constructor takes at most three parameters."));
-        }
+    DECLARE_ENUM(ctx, classObj, LibraryName);
+    DECLARE_ENUM(ctx, classObj, LibraryPath);
+    DECLARE_ENUM(ctx, classObj, StaticLibraryName);
+    DECLARE_ENUM(ctx, classObj, Framework);
+    DECLARE_ENUM(ctx, classObj, FrameworkPath);
+    DECLARE_ENUM(ctx, classObj, LinkerFlag);
+    DECLARE_ENUM(ctx, classObj, IncludePath);
+    DECLARE_ENUM(ctx, classObj, SystemIncludePath);
+    DECLARE_ENUM(ctx, classObj, Define);
+    DECLARE_ENUM(ctx, classObj, CompilerFlag);
+}
 
-        return engine->newQObject(e, QScriptEngine::ScriptOwnership);
+JSValue PkgConfigJs::ctor(JSContext *ctx, JSValue, JSValue, int argc, JSValue *argv, int)
+{
+    try {
+        QVariantMap options;
+        if (argc > 0)
+            options = fromArg<QVariant>(ctx, "PkgConfig constructor", 1, argv[0]).toMap();
+        JSValue obj = createObject(ctx, options);
+        return obj;
     } catch (const PcException &e) {
-        return context->throwError(QString::fromUtf8(e.what()));
+        return throwError(ctx, QString::fromUtf8(e.what()));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
 }
 
-PkgConfigJs::PkgConfigJs(
-        QScriptContext *context, QScriptEngine *engine, const QVariantMap &options) :
+PkgConfigJs::PkgConfigJs(JSContext *ctx, const QVariantMap &options) :
     m_pkgConfig(std::make_unique<PkgConfig>(
-        convertOptions(static_cast<ScriptEngine *>(engine)->environment(), options)))
+        convertOptions(ScriptEngine::engineForContext(ctx)->environment(), options)))
 {
-    Q_UNUSED(context);
     for (const auto &package : m_pkgConfig->packages()) {
         m_packages.insert(
                 QString::fromStdString(package.getBaseFileName()), packageVariantToMap(package));
@@ -235,7 +241,7 @@ PkgConfig::Options PkgConfigJs::convertOptions(const QProcessEnvironment &env, c
                 [](const QString &str){ return str.toStdString(); });
     result.disableUninstalled = map.value(QStringLiteral("disableUninstalled"), true).toBool();
     result.staticMode = map.value(QStringLiteral("staticMode"), false).toBool();
-    result.mergeDependencies = map.value(QStringLiteral("mergeDependencies"), true).toBool();
+    result.definePrefix = map.value(QStringLiteral("definePrefix"), false).toBool();
     result.globalVariables =
             variablesFromQVariantMap(map.value(QStringLiteral("globalVariables")).toMap());
     result.systemVariables = envToVariablesMap(env);
@@ -243,16 +249,15 @@ PkgConfig::Options PkgConfigJs::convertOptions(const QProcessEnvironment &env, c
     return result;
 }
 
+void PkgConfigJs::setupMethods(JSContext *ctx, JSValue obj)
+{
+    setupMethod(ctx, obj, "packages", &PkgConfigJs::jsPackages, 0);
+}
+
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionPkgConfig(QScriptValue extensionObject)
+void initializeJsExtensionPkgConfig(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue obj = engine->newQMetaObject(
-                &PkgConfigJs::staticMetaObject, engine->newFunction(&PkgConfigJs::ctor));
-    extensionObject.setProperty(QStringLiteral("PkgConfig"), obj);
+    qbs::Internal::PkgConfigJs::registerClass(engine, extensionObject);
 }
-
-Q_DECLARE_METATYPE(qbs::Internal::PkgConfigJs *)
diff --git a/src/lib/corelib/jsextensions/pkgconfigjs.h b/src/lib/corelib/jsextensions/pkgconfigjs.h
index 462a8f2bd..7e84545a0 100644
--- a/src/lib/corelib/jsextensions/pkgconfigjs.h
+++ b/src/lib/corelib/jsextensions/pkgconfigjs.h
@@ -37,16 +37,15 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+
 #include "tools/qbs_export.h"
 #include <tools/stlutils.h>
 
 #include <pkgconfig.h>
 
-#include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
 
-#include <QtScript/qscriptable.h>
-
 #include <memory>
 
 class QProcessEnvironment;
@@ -54,13 +53,10 @@ class QProcessEnvironment;
 namespace qbs {
 namespace Internal {
 
-class QBS_AUTOTEST_EXPORT PkgConfigJs : public QObject, QScriptable
+class QBS_AUTOTEST_EXPORT PkgConfigJs : public JsExtension<PkgConfigJs>
 {
-    Q_OBJECT
 public:
-
-    // can we trick moc here to avoid duplication?
-    enum class FlagType {
+    enum FlagType {
         LibraryName = toUnderlying(PcPackage::Flag::Type::LibraryName),
         LibraryPath = toUnderlying(PcPackage::Flag::Type::LibraryPath),
         StaticLibraryName = toUnderlying(PcPackage::Flag::Type::StaticLibraryName),
@@ -72,7 +68,6 @@ public:
         Define = toUnderlying(PcPackage::Flag::Type::Define),
         CompilerFlag = toUnderlying(PcPackage::Flag::Type::CompilerFlag),
     };
-    Q_ENUM(FlagType);
 
     enum class ComparisonType {
         LessThan,
@@ -83,18 +78,22 @@ public:
         NotEqual,
         AlwaysMatch
     };
-    Q_ENUM(ComparisonType);
 
-    static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine);
+    static const char *name() { return "PkgConfig"; }
+    static void declareEnums(JSContext *ctx, JSValue classObj);
+    static JSValue ctor(JSContext *ctx, JSValueConst, JSValueConst,
+                        int argc, JSValueConst *argv, int);
 
-    explicit PkgConfigJs(
-            QScriptContext *context, QScriptEngine *engine, const QVariantMap &options = {});
+    explicit PkgConfigJs(JSContext *ctx, const QVariantMap &options = {});
 
-    Q_INVOKABLE QVariantMap packages() const { return m_packages; }
+    DEFINE_JS_FORWARDER(jsPackages, &PkgConfigJs::packages, "PkgConfig.packages")
+    QVariantMap packages() const { return m_packages; }
 
     // also used in tests
     static PkgConfig::Options convertOptions(const QProcessEnvironment &env, const QVariantMap &map);
 
+    static void setupMethods(JSContext *ctx, JSValue obj);
+
 private:
     std::unique_ptr<PkgConfig> m_pkgConfig;
     QVariantMap m_packages;
diff --git a/src/lib/corelib/jsextensions/process.cpp b/src/lib/corelib/jsextensions/process.cpp
index 8257be6dc..f0febb364 100644
--- a/src/lib/corelib/jsextensions/process.cpp
+++ b/src/lib/corelib/jsextensions/process.cpp
@@ -37,6 +37,8 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+
 #include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/executablefinder.h>
@@ -44,7 +46,6 @@
 #include <tools/shellutils.h>
 #include <tools/stringconstants.h>
 
-#include <QtCore/qobject.h>
 #include <QtCore/qprocess.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qvariant.h>
@@ -53,133 +54,161 @@
 #else
 #include <QtCore/qtextcodec.h>
 #endif
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
 
 namespace qbs {
 namespace Internal {
 
-class Process : public QObject, public QScriptable, public ResourceAcquiringScriptObject
+class Process : public JsExtension<Process>
 {
-    Q_OBJECT
+    friend class JsExtension<Process>;
 public:
-    static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine);
-    Process(QScriptContext *context);
-
-    Q_INVOKABLE QString getEnv(const QString &name);
-    Q_INVOKABLE void setEnv(const QString &name, const QString &value);
-    Q_INVOKABLE void setCodec(const QString &codec);
+    static const char *name() { return "Process"; }
+    static JSValue ctor(JSContext *ctx, JSValueConst, JSValueConst, int, JSValueConst *, int);
+    static void setupStaticMethods(JSContext *ctx, JSValue classObj);
+    static void setupMethods(JSContext *ctx, JSValue obj);
+    Process(JSContext *context);
+
+    DEFINE_JS_FORWARDER(jsGetEnv, &Process::getEnv, "Process.getEnv")
+    DEFINE_JS_FORWARDER(jsSetEnv, &Process::setEnv, "Process.setEnv")
+    DEFINE_JS_FORWARDER(jsSetCodec, &Process::setCodec, "Process.setCodec")
+    DEFINE_JS_FORWARDER(jsWorkingDir, &Process::workingDirectory, "Process.workingDirectory")
+    DEFINE_JS_FORWARDER(jsSetWorkingDir, &Process::setWorkingDirectory,
+                        "Process.setWorkingDirectory")
+    DEFINE_JS_FORWARDER(jsStart, &Process::start, "Process.start")
+    DEFINE_JS_FORWARDER(jsClose, &Process::close, "Process.close")
+    DEFINE_JS_FORWARDER(jsTerminate, &Process::terminate, "Process.terminate")
+    DEFINE_JS_FORWARDER(jsKill, &Process::kill, "Process.kill")
+    DEFINE_JS_FORWARDER(jsReadLine, &Process::readLine, "Process.readLine")
+    DEFINE_JS_FORWARDER(jsAtEnd, &Process::atEnd, "Process.atEnd")
+    DEFINE_JS_FORWARDER(jsReadStdOut, &Process::readStdOut, "Process.readStdOut")
+    DEFINE_JS_FORWARDER(jsReadStdErr, &Process::readStdErr, "Process.readStdErr")
+    DEFINE_JS_FORWARDER(jsCloseWriteChannel, &Process::closeWriteChannel,
+                        "Process.closeWriteChannel")
+    DEFINE_JS_FORWARDER(jsWrite, &Process::write, "Process.write")
+    DEFINE_JS_FORWARDER(jsWriteLine, &Process::writeLine, "Process.writeLine")
+    DEFINE_JS_FORWARDER(jsExitCode, &Process::exitCode, "Process.exitCode")
+
+    static JSValue jsExec(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+    {
+        try {
+            const auto args = getArguments<QString, QStringList>(ctx, "Process.exec", argc, argv);
+            bool throwOnError = false;
+            if (argc > 2)
+                throwOnError = fromArg<bool>(ctx, "Process.exec", 3, argv[2]);
+            return JS_NewInt32(ctx, fromJsObject(ctx, this_val)
+                               ->exec(std::get<0>(args), std::get<1>(args), throwOnError));
+        } catch (const QString &error) { return throwError(ctx, error); }
+    }
+    static JSValue jsWaitForFinished(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+    {
+        try {
+            int msecs = 30000;
+            if (argc > 0)
+                msecs = getArgument<int>(ctx, "Process.waitForFinished", argc, argv);
+            return JS_NewBool(ctx, fromJsObject(ctx, this_val)->waitForFinished(msecs));
+        } catch (const QString &error) { return throwError(ctx, error); }
+    }
+    QString getEnv(const QString &name) const { return m_environment.value(name); }
+    void setEnv(const QString &name, const QString &value) { m_environment.insert(name, value); }
+    void setCodec(const QString &codec);
 
-    Q_INVOKABLE QString workingDirectory();
-    Q_INVOKABLE void setWorkingDirectory(const QString &dir);
+    QString workingDirectory() const { return m_workingDirectory; }
+    void setWorkingDirectory(const QString &dir) { m_workingDirectory = dir; }
 
-    Q_INVOKABLE bool start(const QString &program, const QStringList &arguments);
-    Q_INVOKABLE int exec(const QString &program, const QStringList &arguments,
-                         bool throwOnError = false);
-    Q_INVOKABLE void close();
-    Q_INVOKABLE bool waitForFinished(int msecs = 30000);
-    Q_INVOKABLE void terminate();
-    Q_INVOKABLE void kill();
+    bool start(const QString &program, const QStringList &arguments);
+    int exec(const QString &program, const QStringList &arguments, bool throwOnError);
+    void close();
+    bool waitForFinished(int msecs);
+    void terminate() { m_qProcess->terminate(); }
+    void kill() { m_qProcess->kill(); }
 
-    Q_INVOKABLE QString readLine();
-    Q_INVOKABLE bool atEnd() const;
-    Q_INVOKABLE QString readStdOut();
-    Q_INVOKABLE QString readStdErr();
+    QString readLine();
+    bool atEnd() const { return m_qProcess->atEnd(); }
+    QString readStdOut() { return m_codec->toUnicode(m_qProcess->readAllStandardOutput()); }
+    QString readStdErr() { return m_codec->toUnicode(m_qProcess->readAllStandardError()); }
 
-    Q_INVOKABLE void closeWriteChannel();
+    void closeWriteChannel() { m_qProcess->closeWriteChannel(); }
 
-    Q_INVOKABLE void write(const QString &str);
-    Q_INVOKABLE void writeLine(const QString &str);
+    void write(const QString &str) { m_qProcess->write(m_codec->fromUnicode(str)); }
+    void writeLine(const QString &str);
 
-    Q_INVOKABLE int exitCode() const;
+    int exitCode() const { return m_qProcess->exitCode(); }
 
-    static QScriptValue js_shellQuote(QScriptContext *context, QScriptEngine *engine);
+    static JSValue jsShellQuote(JSContext *ctx, JSValue, int argc, JSValue *argv);
 
 private:
     QString findExecutable(const QString &filePath) const;
 
-    // ResourceAcquiringScriptObject implementation
-    void releaseResources() override;
-
     std::unique_ptr<QProcess> m_qProcess;
     QProcessEnvironment m_environment;
     QString m_workingDirectory;
     QTextCodec *m_codec = nullptr;
 };
 
-QScriptValue Process::ctor(QScriptContext *context, QScriptEngine *engine)
+JSValue Process::ctor(JSContext *ctx, JSValueConst, JSValueConst, int, JSValueConst *, int)
 {
-    Process *t;
-    switch (context->argumentCount()) {
-    case 0:
-        t = new Process(context);
-        break;
-    default:
-        return context->throwError(QStringLiteral("Process()"));
-    }
+    try {
+        JSValue obj = createObject(ctx);
 
-    const auto se = static_cast<ScriptEngine *>(engine);
-    se->addResourceAcquiringScriptObject(t);
-    const DubiousContextList dubiousContexts ({
+        Process * const process = fromJsObject(ctx, obj);
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts{
             DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
-    });
-    se->checkContext(QStringLiteral("qbs.Process"), dubiousContexts);
-
-    QScriptValue obj = engine->newQObject(t, QScriptEngine::QtOwnership);
-
-    // Get environment
-    QVariant v = engine->property(StringConstants::qbsProcEnvVarInternal());
-    if (v.isNull()) {
-        // The build environment is not initialized yet.
-        // This can happen if one uses Process on the RHS of a binding like Group.name.
-        t->m_environment = static_cast<ScriptEngine *>(engine)->environment();
-    } else {
-        t->m_environment
-            = QProcessEnvironment(*reinterpret_cast<QProcessEnvironment*>(v.value<void*>()));
-    }
-    se->setUsesIo();
-
-    return obj;
-}
-
-Process::Process(QScriptContext *context)
-{
-    Q_UNUSED(context);
-    Q_ASSERT(thisObject().engine() == engine());
-
-    m_qProcess = std::make_unique<QProcess>();
-    m_codec = QTextCodec::codecForName("UTF-8");
-}
-
-QString Process::getEnv(const QString &name)
-{
-    Q_ASSERT(thisObject().engine() == engine());
-    return m_environment.value(name);
+        };
+        se->checkContext(QStringLiteral("qbs.Process"), dubiousContexts);
+
+        // Get environment
+        QVariant v = se->property(StringConstants::qbsProcEnvVarInternal());
+        if (v.isNull()) {
+            // The build environment is not initialized yet.
+            // This can happen if one uses Process on the RHS of a binding like Group.name.
+            process->m_environment = se->environment();
+        } else {
+            process->m_environment
+                = QProcessEnvironment(*reinterpret_cast<QProcessEnvironment*>(v.value<void*>()));
+        }
+        se->setUsesIo();
+        return obj;
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-void Process::setEnv(const QString &name, const QString &value)
+void Process::setupStaticMethods(JSContext *ctx, JSValue classObj)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    m_environment.insert(name, value);
+    setupMethod(ctx, classObj, "shellQuote", &Process::jsShellQuote, 3);
 }
 
-QString Process::workingDirectory()
+void Process::setupMethods(JSContext *ctx, JSValue obj)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    return m_workingDirectory;
+    setupMethod(ctx, obj, "getEnv", &jsGetEnv, 1);
+    setupMethod(ctx, obj, "setEnv", &jsSetEnv, 2);
+    setupMethod(ctx, obj, "setCodec", &jsSetCodec, 1);
+    setupMethod(ctx, obj, "workingDirectory", &jsWorkingDir, 0);
+    setupMethod(ctx, obj, "setWorkingDirectory", &jsSetWorkingDir, 1);
+    setupMethod(ctx, obj, "start", &jsStart, 2);
+    setupMethod(ctx, obj, "exec", &jsExec, 3);
+    setupMethod(ctx, obj, "close", &jsClose, 0);
+    setupMethod(ctx, obj, "waitForFinished", &jsWaitForFinished, 1);
+    setupMethod(ctx, obj, "terminate", &jsTerminate, 0);
+    setupMethod(ctx, obj, "kill", &jsKill, 0);
+    setupMethod(ctx, obj, "readLine", &jsReadLine, 0);
+    setupMethod(ctx, obj, "atEnd", &jsAtEnd, 0);
+    setupMethod(ctx, obj, "readStdOut", &jsReadStdOut, 0);
+    setupMethod(ctx, obj, "readStdErr", &jsReadStdErr, 0);
+    setupMethod(ctx, obj, "closeWriteChannel", &jsCloseWriteChannel, 0);
+    setupMethod(ctx, obj, "write", &jsWrite, 1);
+    setupMethod(ctx, obj, "writeLine", &jsWriteLine, 1);
+    setupMethod(ctx, obj, "exitCode", &jsExitCode, 0);
 }
 
-void Process::setWorkingDirectory(const QString &dir)
+Process::Process(JSContext *)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    m_workingDirectory = dir;
+    m_qProcess = std::make_unique<QProcess>();
+    m_codec = QTextCodec::codecForName("UTF-8");
 }
 
 bool Process::start(const QString &program, const QStringList &arguments)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-
     if (!m_workingDirectory.isEmpty())
         m_qProcess->setWorkingDirectory(m_workingDirectory);
 
@@ -190,13 +219,9 @@ bool Process::start(const QString &program, const QStringList &arguments)
 
 int Process::exec(const QString &program, const QStringList &arguments, bool throwOnError)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-
     if (!start(findExecutable(program), arguments)) {
-        if (throwOnError) {
-            context()->throwError(Tr::tr("Error running '%1': %2")
-                                  .arg(program, m_qProcess->errorString()));
-        }
+        if (throwOnError)
+            throw Tr::tr("Error running '%1': %2").arg(program, m_qProcess->errorString());
         return -1;
     }
     m_qProcess->closeWriteChannel();
@@ -204,20 +229,20 @@ int Process::exec(const QString &program, const QStringList &arguments, bool thr
     if (throwOnError) {
         if (m_qProcess->error() != QProcess::UnknownError
                 && m_qProcess->error() != QProcess::Crashed) {
-            context()->throwError(Tr::tr("Error running '%1': %2")
-                                  .arg(program, m_qProcess->errorString()));
+            throw Tr::tr("Error running '%1': %2").arg(program, m_qProcess->errorString());
         } else if (m_qProcess->exitStatus() == QProcess::CrashExit || m_qProcess->exitCode() != 0) {
             QString errorMessage = m_qProcess->error() == QProcess::Crashed
                     ? Tr::tr("Error running '%1': %2").arg(program, m_qProcess->errorString())
-                    : Tr::tr("Process '%1 %2' finished with exit code %3.").arg(program).
-                      arg(arguments.join(QStringLiteral(" "))).arg(m_qProcess->exitCode());
+                    : Tr::tr("Process '%1 %2' finished with exit code %3.")
+                                             .arg(program, arguments.join(QStringLiteral(" ")))
+                                             .arg(m_qProcess->exitCode());
             const QString stdOut = readStdOut();
             if (!stdOut.isEmpty())
                 errorMessage.append(Tr::tr(" The standard output was:\n")).append(stdOut);
             const QString stdErr = readStdErr();
             if (!stdErr.isEmpty())
                 errorMessage.append(Tr::tr(" The standard error output was:\n")).append(stdErr);
-            context()->throwError(errorMessage);
+            throw errorMessage;
         }
     }
     if (m_qProcess->error() != QProcess::UnknownError)
@@ -229,32 +254,18 @@ void Process::close()
 {
     if (!m_qProcess)
         return;
-    Q_ASSERT(thisObject().engine() == engine());
     m_qProcess.reset();
 }
 
 bool Process::waitForFinished(int msecs)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-
     if (m_qProcess->state() == QProcess::NotRunning)
         return true;
     return m_qProcess->waitForFinished(msecs);
 }
 
-void Process::terminate()
-{
-    m_qProcess->terminate();
-}
-
-void Process::kill()
-{
-    m_qProcess->kill();
-}
-
 void Process::setCodec(const QString &codec)
 {
-    Q_ASSERT(thisObject().engine() == engine());
     const auto newCodec = QTextCodec::codecForName(qPrintable(codec));
     if (newCodec)
         m_codec = newCodec;
@@ -268,82 +279,36 @@ QString Process::readLine()
     return result;
 }
 
-bool Process::atEnd() const
-{
-    return m_qProcess->atEnd();
-}
-
-QString Process::readStdOut()
-{
-    return m_codec->toUnicode(m_qProcess->readAllStandardOutput());
-}
-
-QString Process::readStdErr()
-{
-    return m_codec->toUnicode(m_qProcess->readAllStandardError());
-}
-
-void Process::closeWriteChannel()
-{
-    m_qProcess->closeWriteChannel();
-}
-
-int Process::exitCode() const
-{
-    return m_qProcess->exitCode();
-}
-
 QString Process::findExecutable(const QString &filePath) const
 {
     ExecutableFinder exeFinder(ResolvedProductPtr(), m_environment);
     return exeFinder.findExecutable(filePath, m_workingDirectory);
 }
 
-void Process::releaseResources()
-{
-    close();
-    deleteLater();
-}
-
-void Process::write(const QString &str)
-{
-    m_qProcess->write(m_codec->fromUnicode(str));
-}
-
 void Process::writeLine(const QString &str)
 {
     m_qProcess->write(m_codec->fromUnicode(str));
     m_qProcess->putChar('\n');
 }
 
-QScriptValue Process::js_shellQuote(QScriptContext *context, QScriptEngine *engine)
+JSValue Process::jsShellQuote(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv)
 {
-    if (Q_UNLIKELY(context->argumentCount() < 2)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("shellQuote expects at least 2 arguments"));
-    }
-    const QString program = context->argument(0).toString();
-    const QStringList args = context->argument(1).toVariant().toStringList();
-    HostOsInfo::HostOs hostOs = HostOsInfo::hostOs();
-    if (context->argumentCount() > 2) {
-        hostOs = context->argument(2).toVariant().toStringList().contains(QLatin1String("windows"))
-                ? HostOsInfo::HostOsWindows : HostOsInfo::HostOsOtherUnix;
-    }
-    return engine->toScriptValue(shellQuote(program, args, hostOs));
+    try {
+        const auto args = getArguments<QString, QStringList>(ctx, "Process.shellQuote", argc, argv);
+        HostOsInfo::HostOs hostOs = HostOsInfo::hostOs();
+        if (argc > 2) {
+            const auto osList = fromArg<QStringList>(ctx, "Process.shellQuote", 3, argv[2]);
+            hostOs = osList.contains(QLatin1String("windows"))
+                    ? HostOsInfo::HostOsWindows : HostOsInfo::HostOsOtherUnix;
+        }
+        return makeJsString(ctx, shellQuote(std::get<0>(args), std::get<1>(args), hostOs));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionProcess(QScriptValue extensionObject)
+void initializeJsExtensionProcess(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue obj = engine->newQMetaObject(&Process::staticMetaObject, engine->newFunction(&Process::ctor));
-    extensionObject.setProperty(QStringLiteral("Process"), obj);
-    obj.setProperty(QStringLiteral("shellQuote"), engine->newFunction(Process::js_shellQuote, 3));
+    qbs::Internal::Process::registerClass(engine, extensionObject);
 }
-
-Q_DECLARE_METATYPE(qbs::Internal::Process *)
-
-#include "process.moc"
diff --git a/src/lib/corelib/jsextensions/propertylist.cpp b/src/lib/corelib/jsextensions/propertylist.cpp
index 197d5e99e..914701203 100644
--- a/src/lib/corelib/jsextensions/propertylist.cpp
+++ b/src/lib/corelib/jsextensions/propertylist.cpp
@@ -38,11 +38,11 @@
 **
 ****************************************************************************/
 
-#include <QtScript/qscriptengine.h>
+#include <language/scriptengine.h>
 
-void initializeJsExtensionPropertyList(QScriptValue extensionObject)
+void initializeJsExtensionPropertyList(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue obj = engine->newObject(); // provide a fake object
-    extensionObject.setProperty(QStringLiteral("PropertyList"), obj);
+    JSValue obj = engine->newObject(); // provide a fake object
+    qbs::Internal::setJsProperty(engine->context(), extensionObject,
+                                 QStringLiteral("PropertyList"), obj);
 }
diff --git a/src/lib/corelib/jsextensions/propertylist_darwin.h b/src/lib/corelib/jsextensions/propertylist_darwin.h
deleted file mode 100644
index 279309681..000000000
--- a/src/lib/corelib/jsextensions/propertylist_darwin.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2015 Petroules Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBS_PROPERTYLIST_H
-#define QBS_PROPERTYLIST_H
-
-#include <QtCore/qglobal.h>
-
-#include <QtCore/qobject.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qvariant.h>
-
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptvalue.h>
-
-#include <memory>
-
-namespace qbs {
-namespace Internal {
-
-void initializeJsExtensionPropertyList(QScriptValue extensionObject);
-
-class PropertyListPrivate;
-
-// We need to have this class in the header since CMake's automoc doesn't handle .mm files
-class PropertyList : public QObject, public QScriptable
-{
-    Q_OBJECT
-public:
-    static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine);
-    PropertyList(QScriptContext *context);
-    ~PropertyList() override;
-    Q_INVOKABLE bool isEmpty() const;
-    Q_INVOKABLE void clear();
-    Q_INVOKABLE void readFromObject(const QScriptValue &value);
-    Q_INVOKABLE void readFromString(const QString &input);
-    Q_INVOKABLE void readFromFile(const QString &filePath);
-    Q_INVOKABLE void readFromData(const QByteArray &data);
-    Q_INVOKABLE void writeToFile(const QString &filePath, const QString &plistFormat);
-    Q_INVOKABLE QScriptValue format() const;
-    Q_INVOKABLE QScriptValue toObject() const;
-    Q_INVOKABLE QString toString(const QString &plistFormat) const;
-    Q_INVOKABLE QString toXMLString() const;
-    Q_INVOKABLE QString toJSON(const QString &style = QString()) const;
-private:
-    const std::unique_ptr<PropertyListPrivate> d;
-};
-
-} // namespace Internal
-} // namespace qbs
-
-Q_DECLARE_METATYPE(qbs::Internal::PropertyList *)
-
-#endif // QBS_PROPERTYLIST_H
diff --git a/src/lib/corelib/jsextensions/propertylist_darwin.mm b/src/lib/corelib/jsextensions/propertylist_darwin.mm
index caf9feb3e..97e8f6209 100644
--- a/src/lib/corelib/jsextensions/propertylist_darwin.mm
+++ b/src/lib/corelib/jsextensions/propertylist_darwin.mm
@@ -38,92 +38,122 @@
 **
 ****************************************************************************/
 
-#include "propertylist_darwin.h"
+#include "jsextension.h"
+#include "propertylistutils.h"
 
 #include <language/scriptengine.h>
+#include <logging/translator.h>
 #include <tools/hostosinfo.h>
 
 #include <QtCore/qfile.h>
-#include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qvariant.h>
 
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
-
-// Same values as CoreFoundation and Foundation APIs
-enum {
-    QPropertyListOpenStepFormat = 1,
-    QPropertyListXMLFormat_v1_0 = 100,
-    QPropertyListBinaryFormat_v1_0 = 200,
-    QPropertyListJSONFormat = 1000 // If this conflicts someday, just change it :)
-};
-
 namespace qbs {
 namespace Internal {
 
-class PropertyListPrivate
+class PropertyList : public JsExtension<PropertyList>
 {
 public:
-    PropertyListPrivate();
-
-    QVariant propertyListObject;
-    int propertyListFormat;
-
-    void readFromData(QScriptContext *context, const QByteArray &data);
-    QByteArray writeToData(QScriptContext *context, const QString &format);
-};
+    static const char *name() { return "PropertyList"; }
+    static JSValue ctor(JSContext *ctx, JSValueConst, JSValueConst, int, JSValueConst *, int);
+    PropertyList(JSContext *) {}
+    static void setupMethods(JSContext *ctx, JSValue obj);
+
+    DEFINE_JS_FORWARDER(jsIsEmpty, &PropertyList::isEmpty, "PropertyList.isEmpty");
+    DEFINE_JS_FORWARDER(jsClear, &PropertyList::clear, "PropertyList.clear");
+    DEFINE_JS_FORWARDER(jsReadFromObject, &PropertyList::readFromObject,
+                        "PropertyList.readFromObject");
+    DEFINE_JS_FORWARDER(jsReadFromString, &PropertyList::readFromString,
+                        "PropertyList.readFromString");
+    DEFINE_JS_FORWARDER(jsReadFromFile, &PropertyList::readFromFile, "PropertyList.readFromFile");
+    DEFINE_JS_FORWARDER(jsReadFromData, &PropertyList::readFromData, "PropertyList.readFromData");
+    DEFINE_JS_FORWARDER(jsWriteToFile, &PropertyList::writeToFile, "PropertyList.writeToFile");
+    DEFINE_JS_FORWARDER(jsFormat, &PropertyList::format, "PropertyList.format");
+    DEFINE_JS_FORWARDER(jsToObject, &PropertyList::toObject, "PropertyList.toObject");
+    DEFINE_JS_FORWARDER(jsToString, &PropertyList::toString, "PropertyList.toString");
+    DEFINE_JS_FORWARDER(jsToXmlString, &PropertyList::toXMLString, "PropertyList.toXMLString");
+
+    static JSValue jsToJson(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+    {
+        try {
+            QString style;
+            if (argc > 0)
+                style = fromArg<QString>(ctx, "Process.exec", 1, argv[0]);
+            return toJsValue(ctx, fromJsObject(ctx, this_val)->toJSON(style));
+        } catch (const QString &error) { return throwError(ctx, error); }
+    }
 
-QScriptValue PropertyList::ctor(QScriptContext *context, QScriptEngine *engine)
-{
-    auto const se = static_cast<ScriptEngine *>(engine);
-    const DubiousContextList dubiousContexts({
-            DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
-    });
-    se->checkContext(QStringLiteral("qbs.PropertyList"), dubiousContexts);
+private:
+    bool isEmpty() const { return m_propertyListObject.isNull(); }
+    void clear();
+    void readFromObject(const QVariant &value);
+    void readFromString(const QString &input);
+    void readFromFile(const QString &filePath);
+    void readFromData(const QByteArray &data);
+    void writeToFile(const QString &filePath, const QString &plistFormat);
+    std::optional<QString> format() const;
+    QVariant toObject() const {
+        return m_propertyListObject.isNull() ? QVariantMap() : m_propertyListObject;
+    }
+    QString toString(const QString &plistFormat) const;
+    QString toXMLString() const;
+    QString toJSON(const QString &style = QString()) const;
 
-    auto p = new PropertyList(context);
-    QScriptValue obj = engine->newQObject(p, QScriptEngine::ScriptOwnership);
-    return obj;
-}
+    QByteArray writeToData(const QString &format) const;
 
-PropertyListPrivate::PropertyListPrivate()
-    : propertyListObject(), propertyListFormat(0)
-{
-}
+    QVariant m_propertyListObject;
+    int m_propertyListFormat = 0;
+};
 
-PropertyList::~PropertyList() = default;
+// Same values as CoreFoundation and Foundation APIs
+enum {
+    QPropertyListOpenStepFormat = 1,
+    QPropertyListXMLFormat_v1_0 = 100,
+    QPropertyListBinaryFormat_v1_0 = 200,
+    QPropertyListJSONFormat = 1000 // If this conflicts someday, just change it :)
+};
 
-PropertyList::PropertyList(QScriptContext *context)
-    : d(std::make_unique<PropertyListPrivate>())
+JSValue PropertyList::ctor(JSContext *ctx, JSValueConst, JSValueConst, int, JSValueConst *, int)
 {
-    Q_UNUSED(context);
-    Q_ASSERT(thisObject().engine() == engine());
+    try {
+        JSValue obj = createObject(ctx);
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts{
+            DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
+        };
+        se->checkContext(QStringLiteral("qbs.PropertyList"), dubiousContexts);
+        return obj;
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-bool PropertyList::isEmpty() const
+void PropertyList::setupMethods(JSContext *ctx, JSValue obj)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    auto p = qscriptvalue_cast<PropertyList*>(thisObject());
-    return p->d->propertyListObject.isNull();
+    setupMethod(ctx, obj, "isEmpty", &jsIsEmpty, 0);
+    setupMethod(ctx, obj, "clear", &jsClear, 0);
+    setupMethod(ctx, obj, "readFromObject", &jsReadFromObject, 1);
+    setupMethod(ctx, obj, "readFromString", &jsReadFromString, 1);
+    setupMethod(ctx, obj, "readFromFile", &jsReadFromFile, 1);
+    setupMethod(ctx, obj, "readFromData", &jsReadFromData, 1);
+    setupMethod(ctx, obj, "writeToFile", &jsWriteToFile, 1);
+    setupMethod(ctx, obj, "format", &jsFormat, 0);
+    setupMethod(ctx, obj, "toObject", &jsToObject, 0);
+    setupMethod(ctx, obj, "toString", &jsToString, 1);
+    setupMethod(ctx, obj, "toXMLString", &jsToXmlString, 1);
+    setupMethod(ctx, obj, "toJSON", &jsToJson, 1);
 }
 
 void PropertyList::clear()
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    auto p = qscriptvalue_cast<PropertyList*>(thisObject());
-    p->d->propertyListObject = QVariant();
-    p->d->propertyListFormat = 0;
+    m_propertyListObject = QVariant();
+    m_propertyListFormat = 0;
 }
 
-void PropertyList::readFromObject(const QScriptValue &value)
+void PropertyList::readFromObject(const QVariant &value)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    auto p = qscriptvalue_cast<PropertyList*>(thisObject());
-    p->d->propertyListObject = value.toVariant();
-    p->d->propertyListFormat = 0; // wasn't deserialized from any external format
+    m_propertyListObject = value;
+    m_propertyListFormat = 0; // wasn't deserialized from any external format
 }
 
 void PropertyList::readFromString(const QString &input)
@@ -133,49 +163,68 @@ void PropertyList::readFromString(const QString &input)
 
 void PropertyList::readFromFile(const QString &filePath)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    auto p = qscriptvalue_cast<PropertyList*>(thisObject());
-
     QFile file(filePath);
     if (file.open(QIODevice::ReadOnly)) {
         const QByteArray data = file.readAll();
         if (file.error() == QFile::NoError) {
-            p->d->readFromData(p->context(), data);
+            readFromData(data);
             return;
         }
     }
-
-    p->context()->throwError(QStringLiteral("%1: %2").arg(filePath).arg(file.errorString()));
+    throw QStringLiteral("%1: %2").arg(filePath).arg(file.errorString());
 }
 
 void PropertyList::readFromData(const QByteArray &data)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    auto p = qscriptvalue_cast<PropertyList*>(thisObject());
-    p->d->readFromData(p->context(), data);
+    @autoreleasepool {
+        NSPropertyListFormat format;
+        int internalFormat = 0;
+        NSString *errorString = nil;
+        id plist = [NSPropertyListSerialization propertyListWithData:data.toNSData()
+                                                             options:0
+                                                              format:&format error:nil];
+        if (plist) {
+            internalFormat = format;
+        } else {
+            NSError *error = nil;
+            plist = [NSJSONSerialization JSONObjectWithData:data.toNSData()
+                                                    options:0
+                                                      error:&error];
+            if (Q_UNLIKELY(!plist)) {
+                errorString = [error localizedDescription];
+            } else {
+                internalFormat = QPropertyListJSONFormat;
+            }
+        }
+
+        if (Q_UNLIKELY(!plist))
+            throw QString::fromNSString(errorString);
+        QVariant obj = QPropertyListUtils::fromPropertyList(plist);
+        if (!obj.isNull()) {
+            m_propertyListObject = obj;
+            m_propertyListFormat = internalFormat;
+        } else {
+            throw Tr::tr("error converting property list");
+        }
+    }
 }
 
 void PropertyList::writeToFile(const QString &filePath, const QString &plistFormat)
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    auto p = qscriptvalue_cast<PropertyList*>(thisObject());
-
     QFile file(filePath);
-    QByteArray data = p->d->writeToData(p->context(), plistFormat);
+    QByteArray data = writeToData(plistFormat);
     if (Q_LIKELY(!data.isEmpty())) {
         if (file.open(QIODevice::WriteOnly) && file.write(data) == data.size()) {
             return;
         }
     }
 
-    p->context()->throwError(QStringLiteral("%1: %2").arg(filePath).arg(file.errorString()));
+    throw QStringLiteral("%1: %2").arg(filePath).arg(file.errorString());
 }
 
-QScriptValue PropertyList::format() const
+std::optional<QString> PropertyList::format() const
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    auto p = qscriptvalue_cast<PropertyList*>(thisObject());
-    switch (p->d->propertyListFormat)
+    switch (m_propertyListFormat)
     {
     case QPropertyListOpenStepFormat:
         return QStringLiteral("openstep");
@@ -186,32 +235,20 @@ QScriptValue PropertyList::format() const
     case QPropertyListJSONFormat:
         return QStringLiteral("json");
     default:
-        return p->engine()->undefinedValue();
+        return {};
     }
 }
 
-QScriptValue PropertyList::toObject() const
-{
-    Q_ASSERT(thisObject().engine() == engine());
-    auto p = qscriptvalue_cast<PropertyList*>(thisObject());
-    return p->engine()->toScriptValue(p->d->propertyListObject);
-}
-
 QString PropertyList::toString(const QString &plistFormat) const
 {
-    Q_ASSERT(thisObject().engine() == engine());
-    auto p = qscriptvalue_cast<PropertyList*>(thisObject());
-
     if (plistFormat == QLatin1String("binary1")) {
-        p->context()->throwError(QStringLiteral("Property list object cannot be converted to a "
-                                               "string in the binary1 format; this format can only "
-                                               "be written directly to a file"));
-        return {};
+        throw Tr::tr("Property list object cannot be converted to a "
+                     "string in the binary1 format; this format can only "
+                     "be written directly to a file");
     }
 
     if (!isEmpty())
-        return QString::fromUtf8(p->d->writeToData(p->context(), plistFormat));
-
+        return QString::fromUtf8(writeToData(plistFormat));
     return {};
 }
 
@@ -229,63 +266,16 @@ QString PropertyList::toJSON(const QString &style) const
     return toString(format);
 }
 
-} // namespace Internal
-} // namespace qbs
-
-#include "propertylistutils.h"
-
-namespace qbs {
-namespace Internal {
-
-void PropertyListPrivate::readFromData(QScriptContext *context, const QByteArray &data)
-{
-    @autoreleasepool {
-        NSPropertyListFormat format;
-        int internalFormat = 0;
-        NSString *errorString = nil;
-        id plist = [NSPropertyListSerialization propertyListWithData:data.toNSData()
-                                                             options:0
-                                                              format:&format error:nil];
-        if (plist) {
-            internalFormat = format;
-        } else {
-            NSError *error = nil;
-            plist = [NSJSONSerialization JSONObjectWithData:data.toNSData()
-                                                    options:0
-                                                      error:&error];
-            if (Q_UNLIKELY(!plist)) {
-                errorString = [error localizedDescription];
-            } else {
-                internalFormat = QPropertyListJSONFormat;
-            }
-        }
-
-        if (Q_UNLIKELY(!plist)) {
-            context->throwError(QString::fromNSString(errorString));
-        } else {
-            QVariant obj = QPropertyListUtils::fromPropertyList(plist);
-            if (!obj.isNull()) {
-                propertyListObject = obj;
-                propertyListFormat = internalFormat;
-            } else {
-                context->throwError(QStringLiteral("error converting property list"));
-            }
-        }
-    }
-}
-
-QByteArray PropertyListPrivate::writeToData(QScriptContext *context, const QString &format)
+QByteArray PropertyList::writeToData(const QString &format) const
 {
     @autoreleasepool {
         NSError *error = nil;
         NSString *errorString = nil;
         NSData *data = nil;
 
-        id obj = QPropertyListUtils::toPropertyList(propertyListObject);
-        if (!obj) {
-            context->throwError(QStringLiteral("error converting property list"));
-            return QByteArray();
-        }
+        id obj = QPropertyListUtils::toPropertyList(m_propertyListObject);
+        if (!obj)
+            throw Tr::tr("error converting property list");
 
         if (format == QLatin1String("json") || format == QLatin1String("json-pretty") ||
             format == QLatin1String("json-compact")) {
@@ -322,9 +312,8 @@ QByteArray PropertyListPrivate::writeToData(QScriptContext *context, const QStri
                                                      @"format", format.toUtf8().constData()];
         }
 
-        if (Q_UNLIKELY(!data)) {
-            context->throwError(QString::fromNSString(errorString));
-        }
+        if (Q_UNLIKELY(!data))
+            throw QString::fromNSString(errorString);
 
         return QByteArray::fromNSData(data);
     }
@@ -333,11 +322,7 @@ QByteArray PropertyListPrivate::writeToData(QScriptContext *context, const QStri
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionPropertyList(QScriptValue extensionObject)
+void initializeJsExtensionPropertyList(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue obj = engine->newQMetaObject(&PropertyList::staticMetaObject,
-                                              engine->newFunction(&PropertyList::ctor));
-    extensionObject.setProperty(QStringLiteral("PropertyList"), obj);
+    qbs::Internal::PropertyList::registerClass(engine, extensionObject);
 }
diff --git a/src/lib/corelib/jsextensions/temporarydir.cpp b/src/lib/corelib/jsextensions/temporarydir.cpp
index 470d21d20..209c058f2 100644
--- a/src/lib/corelib/jsextensions/temporarydir.cpp
+++ b/src/lib/corelib/jsextensions/temporarydir.cpp
@@ -38,17 +38,14 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+
 #include <language/scriptengine.h>
 
 #include <QtCore/qfileinfo.h>
-#include <QtCore/qobject.h>
 #include <QtCore/qtemporarydir.h>
 #include <QtCore/qvariant.h>
 
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
-
 namespace qbs {
 namespace Internal {
 
@@ -60,63 +57,49 @@ static bool tempDirIsCanonical()
     return false;
 }
 
-class TemporaryDir : public QObject, public QScriptable
+class TemporaryDir : public JsExtension<TemporaryDir>
 {
-    Q_OBJECT
+    friend class JsExtension<TemporaryDir>;
 public:
-    static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine);
-    TemporaryDir(QScriptContext *context);
-    Q_INVOKABLE bool isValid() const;
-    Q_INVOKABLE QString path() const;
-    Q_INVOKABLE bool remove();
+    static const char *name() { return "TemporaryDir"; }
+    static JSValue ctor(JSContext *ctx, JSValueConst, JSValueConst, int, JSValueConst *, int)
+    {
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts{DubiousContext(EvalContext::PropertyEvaluation,
+                                                                DubiousContext::SuggestMoving)};
+        se->checkContext(QStringLiteral("qbs.TemporaryDir"), dubiousContexts);
+        return createObject(ctx);
+    }
+    static void setupMethods(JSContext *ctx, JSValue obj)
+    {
+        setupMethod(ctx, obj, "isValid", &jsIsValid, 0);
+        setupMethod(ctx, obj, "path", &jsPath, 0);
+        setupMethod(ctx, obj, "remove", &jsRemove, 0);
+    }
+
 private:
-    QTemporaryDir dir;
-};
+    TemporaryDir(JSContext *) { m_dir.setAutoRemove(false); }
 
-QScriptValue TemporaryDir::ctor(QScriptContext *context, QScriptEngine *engine)
-{
-    const auto se = static_cast<ScriptEngine *>(engine);
-    const DubiousContextList dubiousContexts({
-            DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
-    });
-    se->checkContext(QStringLiteral("qbs.TemporaryDir"), dubiousContexts);
+    DEFINE_JS_FORWARDER(jsIsValid, &TemporaryDir::isValid, "TemporaryDir.isValid")
+    DEFINE_JS_FORWARDER(jsPath, &TemporaryDir::path, "TemporaryDir.path")
+    DEFINE_JS_FORWARDER(jsRemove, &TemporaryDir::remove, "TemporaryDir.remove")
 
-    const auto t = new TemporaryDir(context);
-    QScriptValue obj = engine->newQObject(t, QScriptEngine::ScriptOwnership);
-    return obj;
-}
+    bool isValid() const { return m_dir.isValid(); }
 
-TemporaryDir::TemporaryDir(QScriptContext *context)
-{
-    Q_UNUSED(context);
-    dir.setAutoRemove(false);
-}
+    QString path() const
+    {
+        return tempDirIsCanonical() ? m_dir.path() : QFileInfo(m_dir.path()).canonicalFilePath();
+    }
 
-bool TemporaryDir::isValid() const
-{
-    return dir.isValid();
-}
-
-QString TemporaryDir::path() const
-{
-    return tempDirIsCanonical() ? dir.path() : QFileInfo(dir.path()).canonicalFilePath();
-}
+    bool remove() { return m_dir.remove(); }
 
-bool TemporaryDir::remove()
-{
-    return dir.remove();
-}
+    QTemporaryDir m_dir;
+};
 
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionTemporaryDir(QScriptValue extensionObject)
+void initializeJsExtensionTemporaryDir(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue obj = engine->newQMetaObject(&TemporaryDir::staticMetaObject,
-                                              engine->newFunction(&TemporaryDir::ctor));
-    extensionObject.setProperty(QStringLiteral("TemporaryDir"), obj);
+    qbs::Internal::TemporaryDir::registerClass(engine, extensionObject);
 }
-
-#include "temporarydir.moc"
diff --git a/src/lib/corelib/jsextensions/textfile.cpp b/src/lib/corelib/jsextensions/textfile.cpp
index f4171b117..c9f0edec9 100644
--- a/src/lib/corelib/jsextensions/textfile.cpp
+++ b/src/lib/corelib/jsextensions/textfile.cpp
@@ -37,13 +37,14 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+
 #include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/hostosinfo.h>
 
 #include <QtCore/qfile.h>
 #include <QtCore/qfileinfo.h>
-#include <QtCore/qobject.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qvariant.h>
 
@@ -53,17 +54,12 @@
 #include <QtCore/qtextcodec.h>
 #endif
 
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
-
 namespace qbs {
 namespace Internal {
 
-class TextFile : public QObject, public QScriptable, public ResourceAcquiringScriptObject
+class TextFile : public JsExtension<TextFile>
 {
-    Q_OBJECT
-    Q_ENUMS(OpenMode)
+    friend class JsExtension<TextFile>;
 public:
     enum OpenMode
     {
@@ -73,75 +69,91 @@ public:
         Append = 4
     };
 
-    static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine);
-
-    Q_INVOKABLE void close();
-    Q_INVOKABLE QString filePath();
-    Q_INVOKABLE void setCodec(const QString &codec);
-    Q_INVOKABLE QString readLine();
-    Q_INVOKABLE QString readAll();
-    Q_INVOKABLE bool atEof() const;
-    Q_INVOKABLE void truncate();
-    Q_INVOKABLE void write(const QString &str);
-    Q_INVOKABLE void writeLine(const QString &str);
+    static const char *name() { return "TextFile"; }
+    static void declareEnums(JSContext *ctx, JSValue classObj);
+    static JSValue ctor(JSContext *ctx, JSValueConst, JSValueConst,
+                        int argc, JSValueConst *argv, int);
+    static void setupMethods(JSContext *ctx, JSValue obj);
 
 private:
-    TextFile(QScriptContext *context, const QString &filePath, OpenMode mode = ReadOnly,
-             const QString &codec = QLatin1String("UTF-8"));
-
-    bool checkForClosed() const;
-
-    // ResourceAcquiringScriptObject implementation
-    void releaseResources() override;
+    DEFINE_JS_FORWARDER(jsClose, &TextFile::close, "TextFile.close")
+    DEFINE_JS_FORWARDER(jsFilePath, &TextFile::filePath, "TextFile.filePath")
+    DEFINE_JS_FORWARDER(jsSetCodec, &TextFile::setCodec, "TextFile.setCodec")
+    DEFINE_JS_FORWARDER(jsReadLine, &TextFile::readLine, "TextFile.readLine")
+    DEFINE_JS_FORWARDER(jsReadAll, &TextFile::readAll, "TextFile.readAll")
+    DEFINE_JS_FORWARDER(jsAtEof, &TextFile::atEof, "TextFile.atEof")
+    DEFINE_JS_FORWARDER(jsTruncate, &TextFile::truncate, "TextFile.truncate")
+    DEFINE_JS_FORWARDER(jsWrite, &TextFile::write, "TextFile.write")
+    DEFINE_JS_FORWARDER(jsWriteLine, &TextFile::writeLine, "TextFile.writeLine")
+
+    void close();
+    QString filePath();
+    void setCodec(const QString &codec);
+    QString readLine();
+    QString readAll();
+    bool atEof() const;
+    void truncate();
+    void write(const QString &str);
+    void writeLine(const QString &str);
+
+    TextFile(JSContext *, const QString &filePath, OpenMode mode, const QString &codec);
+
+    void checkForClosed() const;
 
     std::unique_ptr<QFile> m_file;
     QTextCodec *m_codec = nullptr;
 };
 
-QScriptValue TextFile::ctor(QScriptContext *context, QScriptEngine *engine)
+void TextFile::declareEnums(JSContext *ctx, JSValue classObj)
 {
-    TextFile *t;
-    switch (context->argumentCount()) {
-    case 0:
-        return context->throwError(Tr::tr("TextFile constructor needs path of file to be opened."));
-    case 1:
-        t = new TextFile(context, context->argument(0).toString());
-        break;
-    case 2:
-        t = new TextFile(context,
-                         context->argument(0).toString(),
-                         static_cast<OpenMode>(context->argument(1).toInt32())
-                         );
-        break;
-    case 3:
-        t = new TextFile(context,
-                         context->argument(0).toString(),
-                         static_cast<OpenMode>(context->argument(1).toInt32()),
-                         context->argument(2).toString()
-                         );
-        break;
-    default:
-        return context->throwError(Tr::tr("TextFile constructor takes at most three parameters."));
-    }
+    DECLARE_ENUM(ctx, classObj, ReadOnly);
+    DECLARE_ENUM(ctx, classObj, WriteOnly);
+    DECLARE_ENUM(ctx, classObj, ReadWrite);
+    DECLARE_ENUM(ctx, classObj, Append);
+}
 
-    const auto se = static_cast<ScriptEngine *>(engine);
-    se->addResourceAcquiringScriptObject(t);
-    const DubiousContextList dubiousContexts({
+JSValue TextFile::ctor(JSContext *ctx, JSValueConst, JSValueConst,
+                       int argc, JSValueConst *argv, int)
+{
+    try {
+        const auto filePath = getArgument<QString>(ctx, "TextFile constructor", argc, argv);
+        OpenMode mode = ReadOnly;
+        QString codec = QLatin1String("UTF-8");
+        if (argc > 1) {
+            mode = static_cast<OpenMode>
+                    (fromArg<qint32>(ctx, "TextFile constructor", 2, argv[1]));
+        }
+        if (argc > 2) {
+            codec = fromArg<QString>(ctx, "TextFile constructor", 3, argv[2]);
+        }
+        ScopedJsValue obj(ctx, createObject(ctx, filePath, mode, codec));
+
+        const auto se = ScriptEngine::engineForContext(ctx);
+        const DubiousContextList dubiousContexts {
             DubiousContext(EvalContext::PropertyEvaluation, DubiousContext::SuggestMoving)
-    });
-    se->checkContext(QStringLiteral("qbs.TextFile"), dubiousContexts);
-    se->setUsesIo();
-
-    return engine->newQObject(t, QScriptEngine::QtOwnership);
+        };
+        se->checkContext(QStringLiteral("qbs.TextFile"), dubiousContexts);
+        se->setUsesIo();
+        return obj.release();
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-TextFile::TextFile(QScriptContext *context, const QString &filePath, OpenMode mode,
-                   const QString &codec)
+void TextFile::setupMethods(JSContext *ctx, JSValue obj)
 {
-    Q_UNUSED(codec)
-    Q_ASSERT(thisObject().engine() == engine());
+    setupMethod(ctx, obj, "close", &jsClose, 0);
+    setupMethod(ctx, obj, "filePath", &jsFilePath, 0);
+    setupMethod(ctx, obj, "atEof", &jsAtEof, 0);
+    setupMethod(ctx, obj, "setCodec", &jsSetCodec, 1);
+    setupMethod(ctx, obj, "readLine", &jsReadLine, 0);
+    setupMethod(ctx, obj, "readAll", &jsReadAll, 0);
+    setupMethod(ctx, obj, "truncate", &jsTruncate, 0);
+    setupMethod(ctx, obj, "write", &jsWrite, 1);
+    setupMethod(ctx, obj, "writeLine", &jsWriteLine, 1);
+}
 
-    m_file = std::make_unique<QFile>(filePath);
+TextFile::TextFile(JSContext *, const QString &filePath, OpenMode mode, const QString &codec)
+{
+    auto file = std::make_unique<QFile>(filePath);
     const auto newCodec = QTextCodec::codecForName(qPrintable(codec));
     m_codec = newCodec ? newCodec : QTextCodec::codecForName("UTF-8");
     QIODevice::OpenMode m = QIODevice::NotOpen;
@@ -152,32 +164,27 @@ TextFile::TextFile(QScriptContext *context, const QString &filePath, OpenMode mo
     if (mode & Append)
         m |= QIODevice::Append;
     m |= QIODevice::Text;
-    if (Q_UNLIKELY(!m_file->open(m))) {
-        context->throwError(Tr::tr("Unable to open file '%1': %2")
-                            .arg(filePath, m_file->errorString()));
-        m_file.reset();
-    }
+    if (Q_UNLIKELY(!file->open(m)))
+        throw Tr::tr("Unable to open file '%1': %2").arg(filePath, file->errorString());
+    m_file = std::move(file);
 }
 
 void TextFile::close()
 {
-    if (checkForClosed())
-        return;
+    checkForClosed();
     m_file->close();
     m_file.reset();
 }
 
 QString TextFile::filePath()
 {
-    if (checkForClosed())
-        return {};
+    checkForClosed();
     return QFileInfo(*m_file).absoluteFilePath();
 }
 
 void TextFile::setCodec(const QString &codec)
 {
-    if (checkForClosed())
-        return;
+    checkForClosed();
     const auto newCodec = QTextCodec::codecForName(qPrintable(codec));
     if (newCodec)
         m_codec = newCodec;
@@ -185,8 +192,7 @@ void TextFile::setCodec(const QString &codec)
 
 QString TextFile::readLine()
 {
-    if (checkForClosed())
-        return {};
+    checkForClosed();
     auto result = m_codec->toUnicode(m_file->readLine());
     if (!result.isEmpty() && result.back() == QLatin1Char('\n'))
         result.chop(1);
@@ -195,68 +201,45 @@ QString TextFile::readLine()
 
 QString TextFile::readAll()
 {
-    if (checkForClosed())
-        return {};
+    checkForClosed();
     return m_codec->toUnicode(m_file->readAll());
 }
 
 bool TextFile::atEof() const
 {
-    if (checkForClosed())
-        return true;
+    checkForClosed();
     return m_file->atEnd();
 }
 
 void TextFile::truncate()
 {
-    if (checkForClosed())
-        return;
+    checkForClosed();
     m_file->resize(0);
 }
 
 void TextFile::write(const QString &str)
 {
-    if (checkForClosed())
-        return;
+    checkForClosed();
     m_file->write(m_codec->fromUnicode(str));
 }
 
 void TextFile::writeLine(const QString &str)
 {
-    if (checkForClosed())
-        return;
+    checkForClosed();
     m_file->write(m_codec->fromUnicode(str));
     m_file->putChar('\n');
 }
 
-bool TextFile::checkForClosed() const
+void TextFile::checkForClosed() const
 {
-    if (m_file)
-        return false;
-    QScriptContext *ctx = context();
-    if (ctx)
-        ctx->throwError(Tr::tr("Access to TextFile object that was already closed."));
-    return true;
-}
-
-void TextFile::releaseResources()
-{
-    close();
-    deleteLater();
+    if (!m_file)
+        throw Tr::tr("Access to TextFile object that was already closed.");
 }
 
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionTextFile(QScriptValue extensionObject)
+void initializeJsExtensionTextFile(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
 {
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue obj = engine->newQMetaObject(&TextFile::staticMetaObject,
-                                              engine->newFunction(&TextFile::ctor));
-    extensionObject.setProperty(QStringLiteral("TextFile"), obj);
+    qbs::Internal::TextFile::registerClass(engine, extensionObject);
 }
-
-Q_DECLARE_METATYPE(qbs::Internal::TextFile *)
-
-#include "textfile.moc"
diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp
index 282362382..cdcee59fa 100644
--- a/src/lib/corelib/jsextensions/utilitiesextension.cpp
+++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp
@@ -37,12 +37,15 @@
 **
 ****************************************************************************/
 
+#include "jsextension.h"
+#include "jsextensions.h"
+
 #include <api/languageinfo.h>
-#include <jsextensions/jsextensions.h>
 #include <language/scriptengine.h>
 #include <logging/translator.h>
 #include <tools/architectures.h>
 #include <tools/hostosinfo.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 #include <tools/toolchains.h>
 #include <tools/version.h>
@@ -83,9 +86,6 @@ struct fat_arch_64 {
 #include <QtCore/qfile.h>
 #include <QtCore/qlibrary.h>
 
-#include <QtScript/qscriptable.h>
-#include <QtScript/qscriptengine.h>
-
 namespace qbs {
 namespace Internal {
 
@@ -93,116 +93,145 @@ class DummyLogSink : public ILogSink {
     void doPrintMessage(LoggerLevel, const QString &, const QString &) override { }
 };
 
-class UtilitiesExtension : public QObject, QScriptable
+class UtilitiesExtension : public JsExtension<UtilitiesExtension>
 {
-    Q_OBJECT
 public:
-    static QScriptValue js_ctor(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_canonicalArchitecture(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_canonicalPlatform(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_canonicalTargetArchitecture(QScriptContext *context,
-                                                       QScriptEngine *engine);
-    static QScriptValue js_canonicalToolchain(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_cStringQuote(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_getHash(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_getNativeSetting(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_kernelVersion(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_nativeSettingGroups(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_rfc1034identifier(QScriptContext *context, QScriptEngine *engine);
-
-    static QScriptValue js_smimeMessageContent(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_certificateInfo(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_signingIdentities(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_msvcCompilerInfo(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_clangClCompilerInfo(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_installedMSVCs(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_installedClangCls(QScriptContext *context, QScriptEngine *engine);
-
-    static QScriptValue js_versionCompare(QScriptContext *context, QScriptEngine *engine);
-
-    static QScriptValue js_qmlTypeInfo(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_builtinExtensionNames(QScriptContext *context, QScriptEngine *engine);
-    static QScriptValue js_isSharedLibrary(QScriptContext *context, QScriptEngine *engine);
-
-    static QScriptValue js_getArchitecturesFromBinary(QScriptContext *context,
-                                                      QScriptEngine *engine);
+    static const char *name() { return "Utilities"; }
+    static void setupStaticMethods(JSContext *ctx, JSValue classObj);
+    static JSValue js_canonicalArchitecture(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_canonicalPlatform(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue js_canonicalTargetArchitecture(JSContext *ctx, JSValueConst,
+                                                  int, JSValueConst *);
+    static JSValue js_canonicalToolchain(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_cStringQuote(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue js_getHash(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue js_getNativeSetting(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue js_kernelVersion(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_nativeSettingGroups(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_rfc1034identifier(JSContext *ctx, JSValueConst, int, JSValueConst *);
+
+    static JSValue js_smimeMessageContent(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_certificateInfo(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_signingIdentities(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_msvcCompilerInfo(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue js_clangClCompilerInfo(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+    static JSValue js_installedMSVCs(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_installedClangCls(JSContext *ctx, JSValueConst, int, JSValueConst *);
+
+    static JSValue js_versionCompare(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+
+    static JSValue js_qmlTypeInfo(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_builtinExtensionNames(JSContext *ctx, JSValueConst, int, JSValueConst *);
+    static JSValue js_isSharedLibrary(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv);
+
+    static JSValue js_getArchitecturesFromBinary(JSContext *ctx, JSValueConst, int, JSValueConst *);
 };
 
-QScriptValue UtilitiesExtension::js_ctor(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_canonicalPlatform(JSContext *ctx, JSValueConst,
+                                                 int argc, JSValueConst *argv)
 {
-    Q_UNUSED(engine);
-    return context->throwError(Tr::tr("'Utilities' cannot be instantiated."));
+    try {
+        const auto platform = getArgument<QString>(ctx, "Utilities.canonicalPlatform", argc, argv);
+        if (platform.isEmpty())
+            return makeJsStringList(ctx, {});
+        std::vector<QString> platforms = HostOsInfo::canonicalOSIdentifiers(platform);
+        return makeJsStringList(ctx, QStringList(std::move_iterator(platforms.begin()),
+                                                 std::move_iterator(platforms.end())));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 }
 
-QScriptValue UtilitiesExtension::js_canonicalPlatform(QScriptContext *context,
-                                                      QScriptEngine *engine)
+JSValue UtilitiesExtension::js_canonicalTargetArchitecture(JSContext *ctx, JSValueConst,
+                                                           int argc, JSValueConst *argv)
 {
-    const QScriptValue value = context->argument(0);
-    if (value.isUndefined() || value.isNull())
-        return engine->toScriptValue(QStringList());
-
-    if (context->argumentCount() == 1 && value.isString()) {
-        return engine->toScriptValue([&value] {
-            QStringList list;
-            for (const auto &s : HostOsInfo::canonicalOSIdentifiers(value.toString().toStdString()))
-                list.push_back(QString::fromStdString(s));
-            return list;
-        }());
+    try {
+        const auto arch = getArgument<QString>(ctx, "Utilities.canonicalTargetArchitecture",
+                                               argc, argv);
+        QString endianness, vendor, system, abi;
+        if (argc > 1)
+            endianness = fromArg<QString>(ctx, "Utilities.canonicalTargetArchitecture", 2, argv[1]);
+        if (argc > 2)
+            vendor = fromArg<QString>(ctx, "Utilities.canonicalTargetArchitecture", 3, argv[2]);
+        if (argc > 3)
+            system = fromArg<QString>(ctx, "Utilities.canonicalTargetArchitecture", 4, argv[3]);
+        if (argc > 4)
+            abi = fromArg<QString>(ctx, "Utilities.canonicalTargetArchitecture", 5, argv[4]);
+        return makeJsString(ctx,
+                            canonicalTargetArchitecture(arch, endianness, vendor, system, abi));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
-
-    return context->throwError(QScriptContext::SyntaxError,
-        QStringLiteral("canonicalPlatform expects one argument of type string"));
 }
 
-QScriptValue UtilitiesExtension::js_canonicalTargetArchitecture(QScriptContext *context,
-                                                                QScriptEngine *engine)
+void UtilitiesExtension::setupStaticMethods(JSContext *ctx, JSValue classObj)
 {
-    const QScriptValue arch = context->argument(0);
-    if (arch.isUndefined() || arch.isNull())
-        return arch;
-
-    QScriptValue endianness = context->argument(1);
-    if (endianness.isUndefined() || endianness.isNull())
-        endianness = QString();
-    const QScriptValue vendor = context->argument(2);
-    const QScriptValue system = context->argument(3);
-    const QScriptValue abi = context->argument(4);
-
-    if (!arch.isString() || !endianness.isString()
-            || !vendor.isString() || !system.isString() || !abi.isString())
-        return context->throwError(QScriptContext::SyntaxError,
-            QStringLiteral("canonicalTargetArchitecture expects 1 to 5 arguments of type string"));
-
-    return engine->toScriptValue(canonicalTargetArchitecture(arch.toString(), endianness.toString(),
-                                                             vendor.toString(),
-                                                             system.toString(), abi.toString()));
+    setupMethod(ctx, classObj, "canonicalArchitecture",
+                      &UtilitiesExtension::js_canonicalArchitecture, 1);
+    setupMethod(ctx, classObj, "canonicalPlatform",
+                      &UtilitiesExtension::js_canonicalPlatform, 1);
+    setupMethod(ctx, classObj, "canonicalTargetArchitecture",
+                      &UtilitiesExtension::js_canonicalTargetArchitecture, 1);
+    setupMethod(ctx, classObj, "canonicalToolchain",
+                      &UtilitiesExtension::js_canonicalToolchain, 1);
+    setupMethod(ctx, classObj, "cStringQuote", &UtilitiesExtension::js_cStringQuote, 1);
+    setupMethod(ctx, classObj, "getHash", &UtilitiesExtension::js_getHash, 1);
+    setupMethod(ctx, classObj, "getNativeSetting",
+                      &UtilitiesExtension::js_getNativeSetting, 3);
+    setupMethod(ctx, classObj, "kernelVersion", &UtilitiesExtension::js_kernelVersion, 0);
+    setupMethod(ctx, classObj, "nativeSettingGroups",
+                      &UtilitiesExtension::js_nativeSettingGroups, 1);
+    setupMethod(ctx, classObj, "rfc1034Identifier",
+                      &UtilitiesExtension::js_rfc1034identifier, 1);
+    setupMethod(ctx, classObj, "smimeMessageContent",
+                      &UtilitiesExtension::js_smimeMessageContent, 1);
+    setupMethod(ctx, classObj, "certificateInfo", &UtilitiesExtension::js_certificateInfo, 1);
+    setupMethod(ctx, classObj, "signingIdentities",
+                      &UtilitiesExtension::js_signingIdentities, 1);
+    setupMethod(ctx, classObj, "msvcCompilerInfo",
+                      &UtilitiesExtension::js_msvcCompilerInfo, 1);
+    setupMethod(ctx, classObj, "clangClCompilerInfo",
+                      &UtilitiesExtension::js_clangClCompilerInfo, 1);
+    setupMethod(ctx, classObj, "installedMSVCs", &UtilitiesExtension::js_installedMSVCs, 1);
+    setupMethod(ctx, classObj, "installedClangCls",
+                      &UtilitiesExtension::js_installedClangCls, 1);
+    setupMethod(ctx, classObj, "versionCompare", &UtilitiesExtension::js_versionCompare, 2);
+    setupMethod(ctx, classObj, "qmlTypeInfo", &UtilitiesExtension::js_qmlTypeInfo, 0);
+    setupMethod(ctx, classObj, "builtinExtensionNames",
+                      &UtilitiesExtension::js_builtinExtensionNames, 0);
+    setupMethod(ctx, classObj, "isSharedLibrary", &UtilitiesExtension::js_isSharedLibrary, 1);
+    setupMethod(ctx, classObj, "getArchitecturesFromBinary",
+                      &UtilitiesExtension::js_getArchitecturesFromBinary, 1);
 }
 
-QScriptValue UtilitiesExtension::js_canonicalArchitecture(QScriptContext *context,
-                                                          QScriptEngine *engine)
+JSValue UtilitiesExtension::js_canonicalArchitecture(JSContext *ctx, JSValueConst,
+                                                     int argc, JSValueConst *argv)
 {
-    const QScriptValue value = context->argument(0);
-    if (value.isUndefined() || value.isNull())
-        return value;
-
-    if (context->argumentCount() == 1 && value.isString())
-        return engine->toScriptValue(canonicalArchitecture(value.toString()));
-
-    return context->throwError(QScriptContext::SyntaxError,
-        QStringLiteral("canonicalArchitecture expects one argument of type string"));
+    try {
+        const auto arch = getArgument<QString>(ctx, "Utilities.canonicalArchitecture", argc, argv);
+        if (arch.isEmpty())
+            return makeJsString(ctx, {});
+        return makeJsString(ctx, canonicalArchitecture(arch));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 }
 
-QScriptValue UtilitiesExtension::js_canonicalToolchain(QScriptContext *context,
-                                                       QScriptEngine *engine)
+JSValue UtilitiesExtension::js_canonicalToolchain(JSContext *ctx, JSValueConst,
+                                                  int argc, JSValueConst *argv)
 {
-    QStringList toolchain;
-    for (int i = 0; i < context->argumentCount(); ++i)
-        toolchain << context->argument(i).toString();
-    return engine->toScriptValue(canonicalToolchain(toolchain));
+    try {
+        QStringList toolchain;
+        for (int i = 0; i < argc; ++i)
+            toolchain << fromArg<QString>(ctx, "Utilities.canonicalToolchain", i + 1, argv[i]);
+        return makeJsStringList(ctx, canonicalToolchain(toolchain));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 }
 
 // copied from src/corelib/tools/qtools_p.h
-Q_DECL_CONSTEXPR inline char toHexUpper(uint value) Q_DECL_NOTHROW
+Q_DECL_CONSTEXPR inline uchar toHexUpper(uint value) Q_DECL_NOTHROW
 {
     return "0123456789ABCDEF"[value & 0xF];
 }
@@ -330,74 +359,85 @@ static inline QString escapedString(const Char *begin, int length, bool isUnicod
     return out;
 }
 
-QScriptValue UtilitiesExtension::js_cStringQuote(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_cStringQuote(JSContext *ctx, JSValueConst,
+                                            int argc, JSValueConst *argv)
 {
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("cStringQuote expects 1 argument"));
+    try {
+        const auto str = getArgument<QString>(ctx, "Utilities.cStringQuote", argc, argv);
+        return makeJsString(ctx, escapedString(
+                                reinterpret_cast<const ushort *>(str.constData()), str.size()));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
-    QString value = context->argument(0).toString();
-    return engine->toScriptValue(escapedString(reinterpret_cast<const ushort *>(value.constData()), value.size()));
 }
 
-QScriptValue UtilitiesExtension::js_getHash(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_getHash(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv)
 {
-    if (Q_UNLIKELY(context->argumentCount() < 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("getHash expects 1 argument"));
+    try {
+        const QByteArray input = getArgument<QString>(ctx, "Utilities.getHash", argc, argv)
+                .toLatin1();
+        const QByteArray hash = QCryptographicHash::hash(input, QCryptographicHash::Sha1)
+                .toHex().left(16);
+        return makeJsString(ctx, QString::fromLatin1(hash));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
-    const QByteArray input = context->argument(0).toString().toLatin1();
-    const QByteArray hash
-            = QCryptographicHash::hash(input, QCryptographicHash::Sha1).toHex().left(16);
-    return engine->toScriptValue(QString::fromLatin1(hash));
 }
 
-QScriptValue UtilitiesExtension::js_getNativeSetting(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_getNativeSetting(JSContext *ctx, JSValueConst,
+                                                int argc, JSValueConst *argv)
 {
-    if (Q_UNLIKELY(context->argumentCount() < 1 || context->argumentCount() > 3)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("getNativeSetting expects between 1 and 3 arguments"));
-    }
+    try {
+        const auto path = getArgument<QString>(ctx, "Utilities.getNativeSetting", argc, argv);
 
-    QString key = context->argumentCount() > 1 ? context->argument(1).toString() : QString();
+        QString key;
+        if (argc > 1)
+            key = fromArg<QString>(ctx, "Utilities.getNativeSetting", 2, argv[1]);
 
-    // We'll let empty string represent the default registry value
-    if (HostOsInfo::isWindowsHost() && key.isEmpty())
-        key = StringConstants::dot();
+        // QSettings will ignore the default value if an empty key is passed.
+        if (key.isEmpty()) {
+            key = HostOsInfo::isWindowsHost() ? StringConstants::dot() // default registry value
+                                              : QLatin1String("__dummy");
+        }
 
-    QVariant defaultValue = context->argumentCount() > 2 ? context->argument(2).toVariant() : QVariant();
+        QVariant defaultValue;
+        if (argc > 2)
+            defaultValue = fromArg<QVariant>(ctx, "Utilities.getNativeSetting", 3, argv[2]);
 
-    QSettings settings(context->argument(0).toString(), QSettings::NativeFormat);
-    QVariant value = settings.value(key, defaultValue);
-    return value.isNull() ? engine->undefinedValue() : engine->toScriptValue(value);
+        const QSettings settings(path, QSettings::NativeFormat);
+        const QVariant v = settings.value(key, defaultValue);
+        return v.isNull() ? JS_UNDEFINED : makeJsVariant(ctx, v);
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 }
 
-QScriptValue UtilitiesExtension::js_kernelVersion(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_kernelVersion(JSContext *ctx, JSValueConst, int, JSValueConst *)
 {
-    Q_UNUSED(context);
-    return engine->toScriptValue(QSysInfo::kernelVersion());
+    return makeJsString(ctx, QSysInfo::kernelVersion());
 }
 
-QScriptValue UtilitiesExtension::js_nativeSettingGroups(QScriptContext *context,
-                                                        QScriptEngine *engine)
+JSValue UtilitiesExtension::js_nativeSettingGroups(JSContext *ctx, JSValueConst,
+                                                   int argc, JSValueConst *argv)
 {
-    if (Q_UNLIKELY(context->argumentCount() != 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("nativeSettingGroups expects 1 argument"));
+    try {
+        const auto path = getArgument<QString>(ctx, "Utilities.nativeSettingGroups", argc, argv);
+        QSettings settings(path, QSettings::NativeFormat);
+        return makeJsStringList(ctx, settings.childGroups());
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
-
-    QSettings settings(context->argument(0).toString(), QSettings::NativeFormat);
-    return engine->toScriptValue(settings.childGroups());
 }
 
-QScriptValue UtilitiesExtension::js_rfc1034identifier(QScriptContext *context,
-                                                      QScriptEngine *engine)
+JSValue UtilitiesExtension::js_rfc1034identifier(JSContext *ctx, JSValueConst,
+                                                 int argc, JSValueConst *argv)
 {
-    if (Q_UNLIKELY(context->argumentCount() != 1))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("rfc1034Identifier expects 1 argument"));
-    const QString identifier = context->argument(0).toString();
-    return engine->toScriptValue(HostOsInfo::rfc1034Identifier(identifier));
+    try {
+        const auto identifier = getArgument<QString>(ctx, "Utilities.rfc1034identifier", argc, argv);
+        return makeJsString(ctx, HostOsInfo::rfc1034Identifier(identifier));
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 }
 
 /**
@@ -410,60 +450,75 @@ QScriptValue UtilitiesExtension::js_rfc1034identifier(QScriptContext *context,
  * \note A provisioning profile is an S/MIME message whose contents are an XML property list,
  * so this method can be used to read such files.
  */
-QScriptValue UtilitiesExtension::js_smimeMessageContent(QScriptContext *context,
-                                                        QScriptEngine *engine)
+JSValue UtilitiesExtension::js_smimeMessageContent(JSContext *ctx, JSValueConst,
+                                                   int argc, JSValueConst *argv)
 {
 #if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX)
-    Q_UNUSED(engine);
-    return context->throwError(QScriptContext::UnknownError,
-        QStringLiteral("smimeMessageContent is not available on this platform"));
+    Q_UNUSED(argc)
+    Q_UNUSED(argv)
+    return throwError(ctx, QStringLiteral("smimeMessageContent is not available on this platform"));
 #else
-    if (Q_UNLIKELY(context->argumentCount() != 1))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("smimeMessageContent expects 1 argument"));
-
-    const QString filePath = context->argument(0).toString();
-    QFile file(filePath);
-    if (!file.open(QIODevice::ReadOnly))
-        return engine->undefinedValue();
-
-    QByteArray content = smimeMessageContent(file.readAll());
-    if (content.isEmpty())
-        return engine->undefinedValue();
-    return engine->toScriptValue(content);
+    try {
+        const QString filePath = getArgument<QString>(ctx, "Utilities.smimeMessageContent",
+                                                      argc, argv);
+        QFile file(filePath);
+        if (!file.open(QIODevice::ReadOnly))
+            return JS_UNDEFINED;
+
+        QByteArray content = smimeMessageContent(file.readAll());
+        if (content.isEmpty())
+            return JS_UNDEFINED;
+        return toJsValue(ctx, content);
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 #endif
 }
 
-QScriptValue UtilitiesExtension::js_certificateInfo(QScriptContext *context,
-                                                    QScriptEngine *engine)
+JSValue UtilitiesExtension::js_certificateInfo(JSContext *ctx, JSValueConst,
+                                               int argc, JSValueConst *argv)
 {
 #if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX)
-    Q_UNUSED(engine);
-    return context->throwError(QScriptContext::UnknownError,
-        QStringLiteral("certificateInfo is not available on this platform"));
+    Q_UNUSED(argc)
+    Q_UNUSED(argv)
+    return throwError(ctx, QStringLiteral("certificateInfo is not available on this platform"));
 #else
-    if (Q_UNLIKELY(context->argumentCount() != 1))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("certificateInfo expects 1 argument"));
-    return engine->toScriptValue(certificateInfo(context->argument(0).toVariant().toByteArray()));
+    try {
+        const QVariant arg = getArgument<QVariant>(ctx, "Utilities.certificateInfo", argc, argv);
+        return toJsValue(ctx, certificateInfo(arg.toByteArray()));
+    }  catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 #endif
 }
 
 // Rough command line equivalent: security find-identity -p codesigning -v
-QScriptValue UtilitiesExtension::js_signingIdentities(QScriptContext *context,
-                                                      QScriptEngine *engine)
+JSValue UtilitiesExtension::js_signingIdentities(JSContext *ctx, JSValueConst, int, JSValueConst *)
 {
 #if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX)
-    Q_UNUSED(engine);
-    return context->throwError(QScriptContext::UnknownError,
-        QStringLiteral("signingIdentities is not available on this platform"));
+    return throwError(ctx, QStringLiteral("signingIdentities is not available on this platform"));
 #else
-    Q_UNUSED(context);
-    return engine->toScriptValue(identitiesProperties());
+    return makeJsVariantMap(ctx, identitiesProperties());
 #endif
 }
 
 #ifdef Q_OS_WIN
+// Try to detect the cross-architecture from the compiler path; prepend the host architecture
+// if it is differ than the target architecture (e.g. something like x64_x86 and so forth).
+static QString detectArchitecture(const QString &compilerFilePath, const QString &targetArch)
+{
+    const auto startIndex = compilerFilePath.lastIndexOf(QLatin1String("Host"));
+    if (startIndex == -1)
+        return targetArch;
+    const auto endIndex = compilerFilePath.indexOf(QLatin1Char('/'), startIndex);
+    if (endIndex == -1)
+        return targetArch;
+    const auto hostArch = compilerFilePath.mid(startIndex + 4, endIndex - startIndex - 4).toLower();
+    if (hostArch.isEmpty() || (hostArch == targetArch))
+        return targetArch;
+    return hostArch + QLatin1Char('_') + targetArch;
+}
+
 static std::pair<QVariantMap /*result*/, QString /*error*/> msvcCompilerInfoHelper(
         const QString &compilerFilePath,
         MSVC::CompilerLanguage language,
@@ -471,7 +526,8 @@ static std::pair<QVariantMap /*result*/, QString /*error*/> msvcCompilerInfoHelp
         const QString &arch,
         const QString &sdkVersion)
 {
-    MSVC msvc(compilerFilePath, arch, sdkVersion);
+    QString detailedArch = detectArchitecture(compilerFilePath, arch);
+    MSVC msvc(compilerFilePath, std::move(detailedArch), sdkVersion);
     VsEnvironmentDetector envdetector(vcvarsallPath);
     if (!envdetector.start(&msvc))
         return { {}, QStringLiteral("Detecting the MSVC build environment failed: ")
@@ -479,7 +535,8 @@ static std::pair<QVariantMap /*result*/, QString /*error*/> msvcCompilerInfoHelp
 
     try {
         QVariantMap envMap;
-        for (const QString &key : msvc.environment.keys())
+        const auto keys = msvc.environment.keys();
+        for (const QString &key : keys)
             envMap.insert(key, msvc.environment.value(key));
 
         return {
@@ -495,186 +552,164 @@ static std::pair<QVariantMap /*result*/, QString /*error*/> msvcCompilerInfoHelp
 }
 #endif
 
-QScriptValue UtilitiesExtension::js_msvcCompilerInfo(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_msvcCompilerInfo(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv)
 {
 #ifndef Q_OS_WIN
-    Q_UNUSED(engine);
-    return context->throwError(QScriptContext::UnknownError,
-        QStringLiteral("msvcCompilerInfo is not available on this platform"));
+    Q_UNUSED(argc)
+    Q_UNUSED(argv)
+    return throwError(ctx, QStringLiteral("msvcCompilerInfo is not available on this platform"));
 #else
-    if (Q_UNLIKELY(context->argumentCount() < 3))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("msvcCompilerInfo expects 3 arguments"));
-
-    const QString compilerFilePath = context->argument(0).toString();
-    const QString compilerLanguage = context->argument(1).toString();
-    const QString sdkVersion =
-            !context->argument(2).isNull() && !context->argument(2).isUndefined()
-            ? context->argument(2).toString()
-            : QString();
-    MSVC::CompilerLanguage language;
-    if (compilerLanguage == QStringLiteral("c"))
-        language = MSVC::CLanguage;
-    else if (compilerLanguage == StringConstants::cppLang())
-        language = MSVC::CPlusPlusLanguage;
-    else
-        return context->throwError(QScriptContext::TypeError,
-            QStringLiteral("msvcCompilerInfo expects \"c\" or \"cpp\" as its second argument"));
-
-    const auto result = msvcCompilerInfoHelper(
-            compilerFilePath,
-            language,
-            {},
-            MSVC::architectureFromClPath(compilerFilePath),
-            sdkVersion);
-    if (result.first.isEmpty())
-        return context->throwError(QScriptContext::UnknownError, result.second);
-    return engine->toScriptValue(result.first);
+    try {
+        const auto args = getArguments<QString, QString, QString>(ctx, "Utilities.msvcCompilerInfo", argc, argv);
+        const QString compilerFilePath = std::get<0>(args);
+        const QString compilerLanguage = std::get<1>(args);
+        const QString sdkVersion = std::get<2>(args);
+        MSVC::CompilerLanguage language;
+        if (compilerLanguage == QStringLiteral("c"))
+            language = MSVC::CLanguage;
+        else if (compilerLanguage == StringConstants::cppLang())
+            language = MSVC::CPlusPlusLanguage;
+        else
+            throw Tr::tr("Utilities.msvcCompilerInfo expects \"c\" or \"cpp\" as its second argument");
+        const auto result = msvcCompilerInfoHelper(
+                    compilerFilePath,
+                    language,
+                    {},
+                    MSVC::architectureFromClPath(compilerFilePath),
+                    sdkVersion);
+        if (result.first.isEmpty())
+            throw result.second;
+        return toJsValue(ctx, result.first);
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 #endif
 }
 
-QScriptValue UtilitiesExtension::js_clangClCompilerInfo(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_clangClCompilerInfo(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv)
 {
 #ifndef Q_OS_WIN
-    Q_UNUSED(engine);
-    return context->throwError(QScriptContext::UnknownError,
-        QStringLiteral("clangClCompilerInfo is not available on this platform"));
+    Q_UNUSED(argc)
+    Q_UNUSED(argv)
+    return throwError(ctx, QStringLiteral("clangClCompilerInfo is not available on this platform"));
 #else
-    if (Q_UNLIKELY(context->argumentCount() < 5))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("clangClCompilerInfo expects 5 arguments"));
+    try {
+        const auto args = getArguments<QString, QString, QString, QString, QString>(ctx, "Utilities.clangClCompilerInfo", argc, argv);
+    const QString compilerFilePath = std::get<0>(args);
 
-    const QString compilerFilePath = context->argument(0).toString();
     // architecture cannot be empty as vcvarsall.bat requires at least 1 arg, so fallback
     // to host architecture if none is present
-    QString arch = !context->argument(1).isNull() && !context->argument(1).isUndefined()
-            ? context->argument(1).toString()
-            : QString::fromStdString(HostOsInfo::hostOSArchitecture());
-    QString vcvarsallPath = context->argument(2).toString();
-    const QString compilerLanguage =
-            !context->argument(3).isNull() && !context->argument(3).isUndefined()
-            ? context->argument(3).toString()
-            : QString();
-    const QString sdkVersion =
-            !context->argument(4).isNull() && !context->argument(4).isUndefined()
-            ? context->argument(4).toString()
-            : QString();
+    QString arch = std::get<1>(args);
+    if (arch.isEmpty())
+        arch = HostOsInfo::hostOSArchitecture();
+
+    const QString vcvarsallPath = std::get<2>(args);
+    const QString compilerLanguage = std::get<3>(args);
+    const QString sdkVersion = std::get<4>(args);
     MSVC::CompilerLanguage language;
     if (compilerLanguage == QStringLiteral("c"))
         language = MSVC::CLanguage;
     else if (compilerLanguage == StringConstants::cppLang())
         language = MSVC::CPlusPlusLanguage;
     else
-        return context->throwError(QScriptContext::TypeError,
-            QStringLiteral("clangClCompilerInfo expects \"c\" or \"cpp\" as its fourth argument"));
+        throw Tr::tr("Utilities.clangClCompilerInfo expects \"c\" or \"cpp\" as its fourth argument");
 
     const auto result = msvcCompilerInfoHelper(
             compilerFilePath, language, vcvarsallPath, arch, sdkVersion);
     if (result.first.isEmpty())
-        return context->throwError(QScriptContext::UnknownError, result.second);
-    return engine->toScriptValue(result.first);
+        throw result.second;
+    return toJsValue(ctx, result.first);
+    } catch (const QString &error) {
+        return throwError(ctx, error);
+    }
 #endif
 }
 
-QScriptValue UtilitiesExtension::js_installedMSVCs(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_installedMSVCs(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv)
 {
 #ifndef Q_OS_WIN
-    Q_UNUSED(engine);
-    return context->throwError(QScriptContext::UnknownError,
-        QStringLiteral("installedMSVCs is not available on this platform"));
+    return throwError(ctx, QStringLiteral("Utilities.installedMSVCs is not available on this platform"));
+    Q_UNUSED(argc)
+    Q_UNUSED(argv)
 #else
-    if (Q_UNLIKELY(context->argumentCount() != 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("installedMSVCs expects 1 arguments"));
+    try {
+        const QString hostArch = HostOsInfo::hostOSArchitecture();
+        QString preferredArch = getArgument<QString>(ctx, "Utilities.installedMSVCs", argc, argv);
+        if (preferredArch.isEmpty())
+            preferredArch = hostArch;
+
+        DummyLogSink dummySink;
+        Logger dummyLogger(&dummySink);
+        auto msvcs = MSVC::installedCompilers(dummyLogger);
+
+        const auto predicate = [&preferredArch, &hostArch](const MSVC &msvc)
+        {
+            auto archPair = MSVC::getHostTargetArchPair(msvc.architecture);
+            return archPair.first != hostArch || preferredArch != archPair.second;
+        };
+        Internal::removeIf(msvcs, predicate);
+        QVariantList result;
+        for (const auto &msvc: msvcs)
+            result.append(msvc.toVariantMap());
+        return makeJsVariantList(ctx, result);
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
-
-    const auto value0 = context->argument(0);
-    const auto hostArch = QString::fromStdString(HostOsInfo::hostOSArchitecture());
-    const auto preferredArch = !value0.isNull() && !value0.isUndefined()
-            ? value0.toString()
-            : hostArch;
-
-    DummyLogSink dummySink;
-    Logger dummyLogger(&dummySink);
-    auto msvcs = MSVC::installedCompilers(dummyLogger);
-
-    const auto predicate = [&preferredArch, &hostArch](const MSVC &msvc)
-    {
-        auto archPair = MSVC::getHostTargetArchPair(msvc.architecture);
-        return archPair.first != hostArch || preferredArch != archPair.second;
-    };
-    msvcs.erase(std::remove_if(msvcs.begin(), msvcs.end(), predicate), msvcs.end());
-    QVariantList result;
-    for (const auto &msvc: msvcs)
-        result.append(msvc.toVariantMap());
-    return engine->toScriptValue(result);
 #endif
 }
 
-QScriptValue UtilitiesExtension::js_installedClangCls(
-        QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_installedClangCls(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv)
 {
 #ifndef Q_OS_WIN
-    Q_UNUSED(engine);
-    return context->throwError(QScriptContext::UnknownError,
-        QStringLiteral("installedClangCls is not available on this platform"));
+    Q_UNUSED(argc)
+    Q_UNUSED(argv)
+    return throwError(ctx, QStringLiteral("Utilities.installedClangCls is not available on this platform"));
 #else
-    if (Q_UNLIKELY(context->argumentCount() != 1)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("installedClangCls expects 1 arguments"));
+    try {
+        const QString path = getArgument<QString>(ctx, "Utilities.installedClangCls", argc, argv);
+        DummyLogSink dummySink;
+        Logger dummyLogger(&dummySink);
+        auto compilers = ClangClInfo::installedCompilers({path}, dummyLogger);
+        QVariantList result;
+        for (const auto &compiler: compilers)
+            result.append(compiler.toVariantMap());
+        return makeJsVariantList(ctx, result);
+    } catch (const QString &error) {
+        return throwError(ctx, error);
     }
-
-    const auto value0 = context->argument(0);
-    const auto path = !value0.isNull() && !value0.isUndefined() ? value0.toString() : QString();
-
-    DummyLogSink dummySink;
-    Logger dummyLogger(&dummySink);
-    auto compilers = ClangClInfo::installedCompilers({path}, dummyLogger);
-    QVariantList result;
-    for (const auto &compiler: compilers)
-        result.append(compiler.toVariantMap());
-    return engine->toScriptValue(result);
 #endif
 }
 
-QScriptValue UtilitiesExtension::js_versionCompare(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_versionCompare(JSContext *ctx, JSValueConst,
+                                              int argc, JSValueConst *argv)
 {
-    if (context->argumentCount() == 2) {
-        const QScriptValue value1 = context->argument(0);
-        const QScriptValue value2 = context->argument(1);
-        if (value1.isString() && value2.isString()) {
-            const auto a = Version::fromString(value1.toString());
-            const auto b = Version::fromString(value2.toString());
-            return engine->toScriptValue(compare(a, b));
-        }
-    }
-
-    return context->throwError(QScriptContext::SyntaxError,
-        QStringLiteral("versionCompare expects two arguments of type string"));
+    try {
+        const auto args = getArguments<QString, QString>(ctx, "Utilities.versionCompare",
+                                                         argc, argv);
+        const auto a = Version::fromString(std::get<0>(args), true);
+        const auto b = Version::fromString(std::get<1>(args), true);
+        return JS_NewInt32(ctx, compare(a, b));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
-QScriptValue UtilitiesExtension::js_qmlTypeInfo(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_qmlTypeInfo(JSContext *ctx, JSValueConst, int, JSValueConst *)
 {
-    Q_UNUSED(context);
-    return engine->toScriptValue(QString::fromStdString(qbs::LanguageInfo::qmlTypeInfo()));
+    return makeJsString(ctx, QString::fromStdString(qbs::LanguageInfo::qmlTypeInfo()));
 }
 
-QScriptValue UtilitiesExtension::js_builtinExtensionNames(QScriptContext *context,
-                                                          QScriptEngine *engine)
+JSValue UtilitiesExtension::js_builtinExtensionNames(JSContext *ctx, JSValueConst,
+                                                     int, JSValueConst *)
 {
-    Q_UNUSED(context);
-    return engine->toScriptValue(JsExtensions::extensionNames());
+    return makeJsStringList(ctx, JsExtensions::extensionNames());
 }
 
-QScriptValue UtilitiesExtension::js_isSharedLibrary(QScriptContext *context, QScriptEngine *engine)
+JSValue UtilitiesExtension::js_isSharedLibrary(JSContext *ctx, JSValueConst,
+                                               int argc, JSValueConst *argv)
 {
-    if (context->argumentCount() == 1) {
-        const QScriptValue value = context->argument(0);
-        if (value.isString())
-            return engine->toScriptValue(QLibrary::isLibrary(value.toString()));
-    }
-    return context->throwError(QScriptContext::SyntaxError,
-        QStringLiteral("isSharedLibrary expects one argument of type string"));
+    try {
+        const auto fileName = getArgument<QString>(ctx, "Utilities.isSharedLibrary", argc, argv);
+        return JS_NewBool(ctx, QLibrary::isLibrary(fileName));
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
 #ifdef __APPLE__
@@ -747,7 +782,7 @@ static QStringList detectMachOArchs(QIODevice *device)
         if (strncmp(ar_header, ARMAG, SARMAG) == 0) {
             while (!device->atEnd()) {
                 static_assert(sizeof(ar_hdr) == 60, "sizeof(ar_hdr) != 60");
-                ar_hdr header;
+                ar_hdr header{};
                 if (device->read(reinterpret_cast<char *>(&header),
                                  sizeof(ar_hdr)) != sizeof(ar_hdr))
                     return {};
@@ -797,7 +832,7 @@ static QStringList detectMachOArchs(QIODevice *device)
 
     pos = device->pos();
 
-    fat_header fatheader;
+    fat_header fatheader{};
     fatheader.magic = readInt(device, nullptr, false);
     if (fatheader.magic == FAT_MAGIC || fatheader.magic == FAT_CIGAM ||
         fatheader.magic == FAT_MAGIC_64 || fatheader.magic == FAT_CIGAM_64) {
@@ -810,7 +845,7 @@ static QStringList detectMachOArchs(QIODevice *device)
         QStringList archs;
 
         for (uint32_t n = 0; n < fatheader.nfat_arch; ++n) {
-            fat_arch_64 fatarch;
+            fat_arch_64 fatarch{};
             static_assert(sizeof(fat_arch_64) == 32, "sizeof(fat_arch_64) != 32");
             static_assert(sizeof(fat_arch) == 20, "sizeof(fat_arch) != 20");
             const qint64 expectedBytes = is64bit ? sizeof(fat_arch_64) : sizeof(fat_arch);
@@ -840,7 +875,7 @@ static QStringList detectMachOArchs(QIODevice *device)
         return {};
 
     bool swap = false;
-    mach_header header;
+    mach_header header{};
     header.magic = readInt(device, nullptr, swap);
     switch (header.magic) {
     case MH_CIGAM:
@@ -872,88 +907,32 @@ static QStringList detectMachOArchs(QIODevice *device)
 }
 #endif
 
-QScriptValue UtilitiesExtension::js_getArchitecturesFromBinary(QScriptContext *context,
-                                                               QScriptEngine *engine)
+JSValue UtilitiesExtension::js_getArchitecturesFromBinary(JSContext *ctx, JSValueConst,
+                                                          int argc, JSValueConst *argv)
 {
-    if (context->argumentCount() != 1) {
-        return context->throwError(QScriptContext::SyntaxError,
-                QStringLiteral("getArchitecturesFromBinary expects exactly one argument"));
-    }
-    const QScriptValue arg = context->argument(0);
-    if (!arg.isString()) {
-        return context->throwError(QScriptContext::SyntaxError,
-                QStringLiteral("getArchitecturesFromBinary expects a string argument"));
-    }
-    QStringList archs;
+    try {
+        const auto path = getArgument<QString>(ctx, "Utilities.getArchitecturesFromBinary",
+                                               argc, argv);
+        QStringList archs;
 #ifdef __APPLE__
-    QFile file(arg.toString());
-    if (!file.open(QIODevice::ReadOnly)) {
-        return context->throwError(QScriptContext::SyntaxError,
-                QStringLiteral("Failed to open file '%1': %2")
-                                   .arg(file.fileName(), file.errorString()));
-    }
-    archs = detectMachOArchs(&file);
+        QFile file(path);
+        if (!file.open(QIODevice::ReadOnly)) {
+            throw Tr::tr("In Utilities.getArchitecturesFromBinary: "
+                         "Failed to open file '%1': %2")
+                    .arg(file.fileName(), file.errorString());
+        }
+        archs = detectMachOArchs(&file);
+#else
+        Q_UNUSED(path)
 #endif // __APPLE__
-    return engine->toScriptValue(archs);
+        return makeJsStringList(ctx, archs);
+    } catch (const QString &error) { return throwError(ctx, error); }
 }
 
 } // namespace Internal
 } // namespace qbs
 
-void initializeJsExtensionUtilities(QScriptValue extensionObject)
-{
-    using namespace qbs::Internal;
-    QScriptEngine *engine = extensionObject.engine();
-    QScriptValue environmentObj = engine->newQMetaObject(&UtilitiesExtension::staticMetaObject,
-                                             engine->newFunction(&UtilitiesExtension::js_ctor));
-    environmentObj.setProperty(QStringLiteral("canonicalArchitecture"),
-                               engine->newFunction(UtilitiesExtension::js_canonicalArchitecture, 1));
-    environmentObj.setProperty(QStringLiteral("canonicalPlatform"),
-                               engine->newFunction(UtilitiesExtension::js_canonicalPlatform, 1));
-    environmentObj.setProperty(QStringLiteral("canonicalTargetArchitecture"),
-                               engine->newFunction(
-                                   UtilitiesExtension::js_canonicalTargetArchitecture, 4));
-    environmentObj.setProperty(QStringLiteral("canonicalToolchain"),
-                               engine->newFunction(UtilitiesExtension::js_canonicalToolchain));
-    environmentObj.setProperty(QStringLiteral("cStringQuote"),
-                               engine->newFunction(UtilitiesExtension::js_cStringQuote, 1));
-    environmentObj.setProperty(QStringLiteral("getHash"),
-                               engine->newFunction(UtilitiesExtension::js_getHash, 1));
-    environmentObj.setProperty(QStringLiteral("getNativeSetting"),
-                               engine->newFunction(UtilitiesExtension::js_getNativeSetting, 3));
-    environmentObj.setProperty(QStringLiteral("kernelVersion"),
-                               engine->newFunction(UtilitiesExtension::js_kernelVersion, 0));
-    environmentObj.setProperty(QStringLiteral("nativeSettingGroups"),
-                               engine->newFunction(UtilitiesExtension::js_nativeSettingGroups, 1));
-    environmentObj.setProperty(QStringLiteral("rfc1034Identifier"),
-                               engine->newFunction(UtilitiesExtension::js_rfc1034identifier, 1));
-    environmentObj.setProperty(QStringLiteral("smimeMessageContent"),
-                               engine->newFunction(UtilitiesExtension::js_smimeMessageContent, 1));
-    environmentObj.setProperty(QStringLiteral("certificateInfo"),
-                               engine->newFunction(UtilitiesExtension::js_certificateInfo, 1));
-    environmentObj.setProperty(QStringLiteral("signingIdentities"),
-                               engine->newFunction(UtilitiesExtension::js_signingIdentities, 0));
-    environmentObj.setProperty(QStringLiteral("msvcCompilerInfo"),
-                               engine->newFunction(UtilitiesExtension::js_msvcCompilerInfo, 1));
-    environmentObj.setProperty(QStringLiteral("clangClCompilerInfo"),
-                               engine->newFunction(UtilitiesExtension::js_clangClCompilerInfo, 1));
-    environmentObj.setProperty(QStringLiteral("installedMSVCs"),
-                               engine->newFunction(UtilitiesExtension::js_installedMSVCs, 1));
-    environmentObj.setProperty(QStringLiteral("installedClangCls"),
-                               engine->newFunction(UtilitiesExtension::js_installedClangCls, 1));
-    environmentObj.setProperty(QStringLiteral("versionCompare"),
-                               engine->newFunction(UtilitiesExtension::js_versionCompare, 2));
-    environmentObj.setProperty(QStringLiteral("qmlTypeInfo"),
-                               engine->newFunction(UtilitiesExtension::js_qmlTypeInfo, 0));
-    environmentObj.setProperty(QStringLiteral("builtinExtensionNames"),
-                               engine->newFunction(UtilitiesExtension::js_builtinExtensionNames, 0));
-    environmentObj.setProperty(QStringLiteral("isSharedLibrary"),
-                               engine->newFunction(UtilitiesExtension::js_isSharedLibrary, 1));
-    environmentObj.setProperty(QStringLiteral("getArchitecturesFromBinary"),
-                               engine->newFunction(UtilitiesExtension::js_getArchitecturesFromBinary, 1));
-    extensionObject.setProperty(QStringLiteral("Utilities"), environmentObj);
-}
-
-Q_DECLARE_METATYPE(qbs::Internal::UtilitiesExtension *)
-
-#include "utilitiesextension.moc"
+void initializeJsExtensionUtilities(qbs::Internal::ScriptEngine *engine, JSValue extensionObject)
+{
+    qbs::Internal::UtilitiesExtension::registerClass(engine, extensionObject);
+}
diff --git a/src/lib/corelib/language/builtindeclarations.cpp b/src/lib/corelib/language/builtindeclarations.cpp
index 7266333f5..44dc8a326 100644
--- a/src/lib/corelib/language/builtindeclarations.cpp
+++ b/src/lib/corelib/language/builtindeclarations.cpp
@@ -166,25 +166,28 @@ void BuiltinDeclarations::insert(const ItemDeclaration &decl)
 
 static PropertyDeclaration conditionProperty()
 {
-    return PropertyDeclaration(StringConstants::conditionProperty(), PropertyDeclaration::Boolean,
-                               StringConstants::trueValue());
+    return {
+        StringConstants::conditionProperty(),
+        PropertyDeclaration::Boolean,
+        StringConstants::trueValue()};
 }
 
 static PropertyDeclaration alwaysRunProperty()
 {
-    return PropertyDeclaration(StringConstants::alwaysRunProperty(), PropertyDeclaration::Boolean,
-                               StringConstants::falseValue());
+    return {
+        StringConstants::alwaysRunProperty(),
+        PropertyDeclaration::Boolean,
+        StringConstants::falseValue()};
 }
 
 static PropertyDeclaration nameProperty()
 {
-    return PropertyDeclaration(StringConstants::nameProperty(), PropertyDeclaration::String);
+    return {StringConstants::nameProperty(), PropertyDeclaration::String};
 }
 
 static PropertyDeclaration buildDirProperty()
 {
-    return PropertyDeclaration(StringConstants::buildDirectoryProperty(),
-                               PropertyDeclaration::Path);
+    return {StringConstants::buildDirectoryProperty(), PropertyDeclaration::Path};
 }
 
 static PropertyDeclaration prepareScriptProperty()
@@ -244,11 +247,11 @@ void BuiltinDeclarations::addDependsItem()
                                 PropertyDeclaration::StringList);
     item << PropertyDeclaration(StringConstants::limitToSubProjectProperty(),
                                 PropertyDeclaration::Boolean, StringConstants::falseValue());
-    item << PropertyDeclaration(StringConstants::multiplexConfigurationIdsProperty(),
-                                PropertyDeclaration::StringList, QString(),
-                                PropertyDeclaration::ReadOnlyFlag);
-    item << PropertyDeclaration(StringConstants::enableFallbackProperty(),
-                                PropertyDeclaration::Boolean, StringConstants::trueValue());
+    item << PropertyDeclaration(
+        StringConstants::multiplexConfigurationIdsProperty(),
+        PropertyDeclaration::StringList,
+        QString(),
+        PropertyDeclaration::ReadOnlyFlag);
     insert(item);
 }
 
@@ -258,7 +261,6 @@ void BuiltinDeclarations::addExportItem()
     item << PropertyDeclaration(StringConstants::prefixMappingProperty(),
                                 PropertyDeclaration::Variant);
     auto allowedChildTypes = item.allowedChildTypes();
-    allowedChildTypes.insert(ItemType::Parameters);
     allowedChildTypes.insert(ItemType::Properties);
     item.setAllowedChildTypes(allowedChildTypes);
     insert(item);
@@ -326,25 +328,28 @@ void BuiltinDeclarations::addModuleProviderItem()
     ItemDeclaration item(ItemType::ModuleProvider);
     item << nameProperty()
          << PropertyDeclaration(QStringLiteral("outputBaseDir"), PropertyDeclaration::String)
+         << PropertyDeclaration(StringConstants::isEagerProperty(),
+                                PropertyDeclaration::Boolean,
+                                StringConstants::trueValue())
+         << PropertyDeclaration(StringConstants::moduleNameProperty(), PropertyDeclaration::String)
          << PropertyDeclaration(QStringLiteral("relativeSearchPaths"),
                                 PropertyDeclaration::StringList);
+    item.setAllowedChildTypes({ItemType::PropertyOptions, ItemType::Probe});
     insert(item);
 }
 
 ItemDeclaration BuiltinDeclarations::moduleLikeItem(ItemType type)
 {
     ItemDeclaration item(type);
-    item.setAllowedChildTypes(ItemDeclaration::TypeNames()
-            << ItemType::Group
-            << ItemType::Depends
-            << ItemType::FileTagger
-            << ItemType::JobLimit
-            << ItemType::Rule
-            << ItemType::Parameter
-            << ItemType::Probe
-            << ItemType::PropertyOptions
-            << ItemType::Scanner);
-    item << nameProperty();
+    item.setAllowedChildTypes({ItemType::Depends, ItemType::FileTagger, ItemType::Group,
+                               ItemType::JobLimit, ItemType::Parameter, ItemType::Parameters,
+                               ItemType::Probe, ItemType::PropertyOptions,
+                               ItemType::Rule, ItemType::Scanner});
+    PropertyDeclaration nameDecl = nameProperty();
+    PropertyDeclaration::Flags nameFlags = nameDecl.flags();
+    nameFlags |= PropertyDeclaration::ReadOnlyFlag;
+    nameDecl.setFlags(nameFlags);
+    item << nameDecl;
     item << conditionProperty();
     PropertyDeclaration setupBuildEnvDecl(StringConstants::setupBuildEnvironmentProperty(),
                                           PropertyDeclaration::Variant, QString(),
diff --git a/src/lib/corelib/language/deprecationinfo.h b/src/lib/corelib/language/deprecationinfo.h
index 89cd07f4a..2f9bfc103 100644
--- a/src/lib/corelib/language/deprecationinfo.h
+++ b/src/lib/corelib/language/deprecationinfo.h
@@ -39,6 +39,11 @@
 #ifndef QBS_DEPRECATIONINFO_H
 #define QBS_DEPRECATIONINFO_H
 
+#include <api/languageinfo.h>
+#include <logging/logger.h>
+#include <logging/translator.h>
+#include <tools/deprecationwarningmode.h>
+#include <tools/error.h>
 #include <tools/version.h>
 
 #include <QtCore/qstring.h>
@@ -58,7 +63,46 @@ public:
 
     bool isValid() const { return m_removalVersion.isValid(); }
     Version removalVersion() const { return m_removalVersion; }
-    QString additionalUserInfo() const { return m_additionalUserInfo; }
+
+    ErrorInfo checkForDeprecation(DeprecationWarningMode mode, const QString &name,
+                                  const CodeLocation &loc, bool isItem, Logger &logger) const
+    {
+        if (!isValid())
+            return {};
+        const Version qbsVersion = LanguageInfo::qbsVersion();
+        if (removalVersion() <= qbsVersion) {
+            const QString msgTemplate = isItem
+                    ? Tr::tr("The item '%1' can no longer be used. It was removed in Qbs %2.")
+                    : Tr::tr("The property '%1' can no longer be used. It was removed in Qbs %2.");
+            ErrorInfo error(msgTemplate.arg(name, removalVersion().toString()), loc);
+            if (!m_additionalUserInfo.isEmpty())
+                error.append(m_additionalUserInfo);
+            return error;
+        }
+        const QString msgTemplate = isItem
+                ? Tr::tr("The item '%1' is deprecated and will be removed in Qbs %2.")
+                : Tr::tr("The property '%1' is deprecated and will be removed in Qbs %2.");
+        ErrorInfo error(msgTemplate.arg(name, removalVersion().toString()), loc);
+        if (!m_additionalUserInfo.isEmpty())
+            error.append(m_additionalUserInfo);
+        switch (mode) {
+        case DeprecationWarningMode::Error:
+            return error;
+        case DeprecationWarningMode::On:
+            logger.printWarning(error);
+            break;
+        case DeprecationWarningMode::BeforeRemoval: {
+            const Version next(qbsVersion.majorVersion(), qbsVersion.minorVersion() + 1);
+            if (removalVersion() == next || removalVersion().minorVersion() == 0)
+                logger.printWarning(error);
+            break;
+        }
+        case DeprecationWarningMode::Off:
+            break;
+        }
+
+        return {};
+    }
 
 private:
     Version m_removalVersion;
diff --git a/src/lib/corelib/language/evaluator.cpp b/src/lib/corelib/language/evaluator.cpp
index b6fa06c8c..084f2f4a9 100644
--- a/src/lib/corelib/language/evaluator.cpp
+++ b/src/lib/corelib/language/evaluator.cpp
@@ -39,18 +39,19 @@
 
 #include "evaluator.h"
 
-#include "evaluationdata.h"
-#include "evaluatorscriptclass.h"
 #include "filecontext.h"
 #include "filetags.h"
 #include "item.h"
 #include "scriptengine.h"
 #include "value.h"
 
+#include <quickjs.h>
+
 #include <buildgraph/buildgraph.h>
 #include <jsextensions/jsextensions.h>
 #include <logging/translator.h>
 #include <tools/error.h>
+#include <tools/fileinfo.h>
 #include <tools/scripttools.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
@@ -61,27 +62,63 @@
 namespace qbs {
 namespace Internal {
 
+class EvaluationData
+{
+public:
+    Evaluator *evaluator = nullptr;
+    const Item *item = nullptr;
+    mutable QHash<QString, JSValue> valueCache;
+};
+
+static void convertToPropertyType_impl(
+    ScriptEngine *engine, const QString &pathPropertiesBaseDir, const Item *item,
+    const PropertyDeclaration& decl, const Value *value, const CodeLocation &location, JSValue &v);
+static int getEvalPropertyNames(JSContext *ctx, JSPropertyEnum **ptab, uint32_t *plen,
+                                JSValueConst obj);
+static int getEvalProperty(JSContext *ctx, JSPropertyDescriptor *desc,
+                           JSValueConst obj, JSAtom prop);
+static int getEvalPropertySafe(JSContext *ctx, JSPropertyDescriptor *desc,
+                               JSValueConst obj, JSAtom prop);
+
+static bool debugProperties = false;
+
 Evaluator::Evaluator(ScriptEngine *scriptEngine)
     : m_scriptEngine(scriptEngine)
-    , m_scriptClass(new EvaluatorScriptClass(scriptEngine))
+    , m_scriptClass(scriptEngine->registerClass("Evaluator", nullptr, nullptr, JS_UNDEFINED,
+                                                getEvalPropertyNames, getEvalPropertySafe))
 {
+    scriptEngine->registerEvaluator(this);
 }
 
 Evaluator::~Evaluator()
 {
-    for (const auto &data : qAsConst(m_scriptValueMap))
-        delete attachedPointer<EvaluationData>(data);
-    delete m_scriptClass;
+    Set<JSValue> valuesToFree;
+    for (const auto &data : std::as_const(m_scriptValueMap)) {
+        const auto evalData = attachedPointer<EvaluationData>(data, m_scriptClass);
+        valuesToFree << data;
+        for (const JSValue cachedValue : evalData->valueCache)
+            JS_FreeValue(m_scriptEngine->context(), cachedValue);
+        evalData->item->removeObserver(this);
+        delete evalData;
+    }
+    for (const auto &scopes : std::as_const(m_fileContextScopesMap)) {
+        valuesToFree << scopes.fileScope;
+        valuesToFree << scopes.importScope;
+    }
+    for (const JSValue v : std::as_const(valuesToFree)) {
+        JS_FreeValue(m_scriptEngine->context(), v);
+    }
+    m_scriptEngine->unregisterEvaluator(this);
 }
 
-QScriptValue Evaluator::property(const Item *item, const QString &name)
+JSValue Evaluator::property(const Item *item, const QString &name)
 {
-    return scriptValue(item).property(name);
+    return getJsProperty(m_scriptEngine->context(), scriptValue(item), name);
 }
 
-QScriptValue Evaluator::value(const Item *item, const QString &name, bool *propertyWasSet)
+JSValue Evaluator::value(const Item *item, const QString &name, bool *propertyWasSet)
 {
-    QScriptValue v;
+    JSValue v;
     evaluateProperty(&v, item, name, propertyWasSet);
     return v;
 }
@@ -89,16 +126,19 @@ QScriptValue Evaluator::value(const Item *item, const QString &name, bool *prope
 bool Evaluator::boolValue(const Item *item, const QString &name,
                           bool *propertyWasSet)
 {
-    return value(item, name, propertyWasSet).toBool();
+    const ScopedJsValue sv(m_scriptEngine->context(), value(item, name, propertyWasSet));
+    return JS_ToBool(m_scriptEngine->context(), sv);
 }
 
 int Evaluator::intValue(const Item *item, const QString &name, int defaultValue,
                         bool *propertyWasSet)
 {
-    QScriptValue v;
+    JSValue v;
     if (!evaluateProperty(&v, item, name, propertyWasSet))
         return defaultValue;
-    return v.toInt32();
+    qint32 n;
+    JS_ToInt32(m_scriptEngine->context(), &n, v);
+    return n;
 }
 
 FileTags Evaluator::fileTagsValue(const Item *item, const QString &name, bool *propertySet)
@@ -109,24 +149,27 @@ FileTags Evaluator::fileTagsValue(const Item *item, const QString &name, bool *p
 QString Evaluator::stringValue(const Item *item, const QString &name,
                                const QString &defaultValue, bool *propertyWasSet)
 {
-    QScriptValue v;
+    JSValue v;
     if (!evaluateProperty(&v, item, name, propertyWasSet))
         return defaultValue;
-    return v.toString();
+    QString str = getJsString(m_scriptEngine->context(), v);
+    JS_FreeValue(m_scriptEngine->context(), v);
+    return str;
 }
 
-static QStringList toStringList(const QScriptValue &scriptValue)
+static QStringList toStringList(ScriptEngine *engine, const JSValue &scriptValue)
 {
-    if (scriptValue.isString()) {
-        return {scriptValue.toString()};
-    } else if (scriptValue.isArray()) {
+    if (JS_IsString(scriptValue))
+        return {getJsString(engine->context(), scriptValue)};
+    if (JS_IsArray(engine->context(), scriptValue)) {
         QStringList lst;
         int i = 0;
-        forever {
-            QScriptValue elem = scriptValue.property(i++);
-            if (!elem.isValid())
+        for (;;) {
+            JSValue elem = JS_GetPropertyUint32(engine->context(), scriptValue, i++);
+            if (JS_IsUndefined(elem))
                 break;
-            lst.push_back(elem.toString());
+            lst.push_back(getJsString(engine->context(), elem));
+            JS_FreeValue(engine->context(), elem);
         }
         return lst;
     }
@@ -142,13 +185,22 @@ QStringList Evaluator::stringListValue(const Item *item, const QString &name, bo
 std::optional<QStringList> Evaluator::optionalStringListValue(
         const Item *item, const QString &name, bool *propertyWasSet)
 {
-    QScriptValue v = property(item, name);
-    handleEvaluationError(item, name, v);
+    const ScopedJsValue v(m_scriptEngine->context(), property(item, name));
+    handleEvaluationError(item, name);
     if (propertyWasSet)
         *propertyWasSet = isNonDefaultValue(item, name);
-    if (v.isUndefined())
+    if (JS_IsUndefined(v))
         return std::nullopt;
-    return toStringList(v);
+    return toStringList(m_scriptEngine, v);
+}
+
+QVariant Evaluator::variantValue(const Item *item, const QString &name, bool *propertySet)
+{
+    const ScopedJsValue jsValue(m_scriptEngine->context(), property(item, name));
+    handleEvaluationError(item, name);
+    if (propertySet)
+        *propertySet = isNonDefaultValue(item, name);
+    return getJsVariant(m_scriptEngine->context(), jsValue);
 }
 
 bool Evaluator::isNonDefaultValue(const Item *item, const QString &name) const
@@ -159,15 +211,15 @@ bool Evaluator::isNonDefaultValue(const Item *item, const QString &name) const
 }
 
 void Evaluator::convertToPropertyType(const PropertyDeclaration &decl, const CodeLocation &loc,
-                                      QScriptValue &v)
+                                      JSValue &v)
 {
-    m_scriptClass->convertToPropertyType(decl, loc, v);
+    convertToPropertyType_impl(engine(), QString(), nullptr, decl, nullptr, loc, v);
 }
 
-QScriptValue Evaluator::scriptValue(const Item *item)
+JSValue Evaluator::scriptValue(const Item *item)
 {
-    QScriptValue &scriptValue = m_scriptValueMap[item];
-    if (scriptValue.isObject()) {
+    JSValue &scriptValue = m_scriptValueMap[item];
+    if (JS_IsObject(scriptValue)) {
         // already initialized
         return scriptValue;
     }
@@ -175,111 +227,783 @@ QScriptValue Evaluator::scriptValue(const Item *item)
     const auto edata = new EvaluationData;
     edata->evaluator = this;
     edata->item = item;
-    edata->item->setObserver(this);
+    edata->item->addObserver(this);
 
-    scriptValue = m_scriptEngine->newObject(m_scriptClass);
+    scriptValue = JS_NewObjectClass(m_scriptEngine->context(), m_scriptClass);
     attachPointerTo(scriptValue, edata);
     return scriptValue;
 }
 
-void Evaluator::onItemPropertyChanged(Item *item)
+void Evaluator::handleEvaluationError(const Item *item, const QString &name)
 {
-    auto data = attachedPointer<EvaluationData>(m_scriptValueMap.value(item));
-    if (data)
-        data->valueCache.clear();
-}
-
-void Evaluator::handleEvaluationError(const Item *item, const QString &name,
-        const QScriptValue &scriptValue)
-{
-    throwOnEvaluationError(m_scriptEngine, scriptValue, [&item, &name] () {
+    throwOnEvaluationError(m_scriptEngine, [&item, &name] () {
         const ValueConstPtr &value = item->property(name);
         return value ? value->location() : CodeLocation();
     });
 }
 
-void Evaluator::setPathPropertiesBaseDir(const QString &dirPath)
-{
-    m_scriptClass->setPathPropertiesBaseDir(dirPath);
-}
-
-void Evaluator::clearPathPropertiesBaseDir()
-{
-    m_scriptClass->clearPathPropertiesBaseDir();
-}
-
-bool Evaluator::evaluateProperty(QScriptValue *result, const Item *item, const QString &name,
+bool Evaluator::evaluateProperty(JSValue *result, const Item *item, const QString &name,
         bool *propertyWasSet)
 {
     *result = property(item, name);
-    handleEvaluationError(item, name, *result);
+    ScopedJsValue valMgr(m_scriptEngine->context(), *result);
+    handleEvaluationError(item, name);
+    valMgr.release();
     if (propertyWasSet)
         *propertyWasSet = isNonDefaultValue(item, name);
-    return result->isValid() && !result->isUndefined();
+    return !JS_IsUndefined(*result);
 }
 
 Evaluator::FileContextScopes Evaluator::fileContextScopes(const FileContextConstPtr &file)
 {
     FileContextScopes &result = m_fileContextScopesMap[file];
-    if (!result.fileScope.isObject()) {
+    if (!JS_IsObject(result.fileScope)) {
         if (file->idScope())
             result.fileScope = scriptValue(file->idScope());
         else
             result.fileScope = m_scriptEngine->newObject();
-        result.fileScope.setProperty(StringConstants::filePathGlobalVar(), file->filePath());
-        result.fileScope.setProperty(StringConstants::pathGlobalVar(), file->dirPath());
+        setJsProperty(m_scriptEngine->context(), result.fileScope,
+                      StringConstants::filePathGlobalVar(), file->filePath());
+        setJsProperty(m_scriptEngine->context(), result.fileScope,
+                      StringConstants::pathGlobalVar(), file->dirPath());
     }
-    if (!result.importScope.isObject()) {
+    if (!JS_IsObject(result.importScope)) {
         try {
-            result.importScope = m_scriptEngine->newObject();
-            setupScriptEngineForFile(m_scriptEngine, file, result.importScope,
-                                     ObserveMode::Enabled);
+            ScopedJsValue importScope(m_scriptEngine->context(), m_scriptEngine->newObject());
+            setupScriptEngineForFile(m_scriptEngine, file, importScope, ObserveMode::Enabled);
+            result.importScope = importScope.release();
         } catch (const ErrorInfo &e) {
-            result.importScope = m_scriptEngine->currentContext()->throwError(e.toString());
+            result.importScope = throwError(m_scriptEngine->context(), e.toString());
         }
     }
     return result;
 }
 
-void Evaluator::setCachingEnabled(bool enabled)
+// This is the only function in this class that can be called from a thread that is not
+// the evaluating one. For this reason, we do not clear the cache here, as that would
+// incur enourmous synchronization overhead. Instead, we mark the item's cache as invalidated
+// and do the actual clearing only at the very few places where the cache is actually accessed.
+void Evaluator::invalidateCache(const Item *item)
 {
-    m_scriptClass->setValueCacheEnabled(enabled);
+    std::lock_guard lock(m_cacheInvalidationMutex);
+    m_invalidatedCaches << item;
 }
 
-PropertyDependencies Evaluator::propertyDependencies() const
+void Evaluator::clearCache(const Item *item)
 {
-    return m_scriptClass->propertyDependencies();
+    std::lock_guard lock(m_cacheInvalidationMutex);
+    if (const auto data = attachedPointer<EvaluationData>(m_scriptValueMap.value(item),
+                                                          m_scriptEngine->dataWithPtrClass())) {
+        clearCache(*data);
+        m_invalidatedCaches.remove(data->item);
+    }
+}
+
+void Evaluator::clearCacheIfInvalidated(EvaluationData &edata)
+{
+    std::lock_guard lock(m_cacheInvalidationMutex);
+    if (const auto it = m_invalidatedCaches.find(edata.item); it != m_invalidatedCaches.end()) {
+        clearCache(edata);
+        m_invalidatedCaches.erase(it);
+    }
 }
 
-void Evaluator::clearPropertyDependencies()
+void Evaluator::clearCache(EvaluationData &edata)
 {
-    m_scriptClass->clearPropertyDependencies();
+    for (const auto value : std::as_const(edata.valueCache))
+        JS_FreeValue(m_scriptEngine->context(), value);
+    edata.valueCache.clear();
 }
 
-void throwOnEvaluationError(ScriptEngine *engine, const QScriptValue &scriptValue,
+void throwOnEvaluationError(ScriptEngine *engine,
                             const std::function<CodeLocation()> &provideFallbackCodeLocation)
 {
-    if (Q_LIKELY(!engine->hasErrorOrException(scriptValue)))
+    if (JsException ex = engine->checkAndClearException(provideFallbackCodeLocation()))
+        throw ex.toErrorInfo();
+}
+
+static void makeTypeError(ScriptEngine *engine, const ErrorInfo &error, JSValue &v)
+{
+    v = throwError(engine->context(), error.toString());
+}
+
+static void makeTypeError(ScriptEngine *engine, const PropertyDeclaration &decl,
+                          const CodeLocation &location, JSValue &v)
+{
+    const ErrorInfo error(Tr::tr("Value assigned to property '%1' does not have type '%2'.")
+                          .arg(decl.name(), decl.typeString()), location);
+    makeTypeError(engine, error, v);
+}
+
+static QString overriddenSourceDirectory(const Item *item, const QString &defaultValue)
+{
+    const VariantValuePtr v = item->variantProperty
+            (StringConstants::qbsSourceDirPropertyInternal());
+    return v ? v->value().toString() : defaultValue;
+}
+
+static void convertToPropertyType_impl(ScriptEngine *engine,
+                                       const QString &pathPropertiesBaseDir, const Item *item,
+                                       const PropertyDeclaration& decl,
+                                       const Value *value, const CodeLocation &location, JSValue &v)
+{
+    JSContext * const ctx = engine->context();
+    if (JS_IsUndefined(v) || JS_IsError(ctx, v) || JS_IsException(v))
         return;
-    QString message;
-    QString filePath;
-    int line = -1;
-    const QScriptValue value = scriptValue.isError() ? scriptValue
-                                                     : engine->uncaughtException();
-    if (value.isError()) {
-        QScriptValue v = value.property(QStringLiteral("message"));
-        if (v.isString())
-            message = v.toString();
-        v = value.property(StringConstants::fileNameProperty());
-        if (v.isString())
-            filePath = v.toString();
-        v = value.property(QStringLiteral("lineNumber"));
-        if (v.isNumber())
-            line = v.toInt32();
-        throw ErrorInfo(message, CodeLocation(filePath, line, -1, false));
+    QString srcDir;
+    QString actualBaseDir;
+    const Item * const srcDirItem = value && value->scope() ? value->scope() : item;
+    if (item && !pathPropertiesBaseDir.isEmpty()) {
+        const VariantValueConstPtr itemSourceDir
+                = item->variantProperty(QStringLiteral("sourceDirectory"));
+        actualBaseDir = itemSourceDir ? itemSourceDir->value().toString() : pathPropertiesBaseDir;
+    }
+    switch (decl.type()) {
+    case PropertyDeclaration::UnknownType:
+    case PropertyDeclaration::Variant:
+        break;
+    case PropertyDeclaration::Boolean:
+        if (!JS_IsBool(v))
+            v = JS_NewBool(ctx, JS_ToBool(ctx, v));
+        break;
+    case PropertyDeclaration::Integer:
+        if (!JS_IsNumber(v))
+            makeTypeError(engine, decl, location, v);
+        break;
+    case PropertyDeclaration::Path:
+    {
+        if (!JS_IsString(v)) {
+            makeTypeError(engine, decl, location, v);
+            break;
+        }
+        const QString srcDir = srcDirItem ? overriddenSourceDirectory(srcDirItem, actualBaseDir)
+                                          : pathPropertiesBaseDir;
+        if (!srcDir.isEmpty()) {
+            v = engine->toScriptValue(QDir::cleanPath(FileInfo::resolvePath(srcDir,
+                                                                            getJsString(ctx, v))));
+            JS_FreeValue(ctx, v);
+        }
+        break;
+    }
+    case PropertyDeclaration::String:
+        if (!JS_IsString(v))
+            makeTypeError(engine, decl, location, v);
+        break;
+    case PropertyDeclaration::PathList:
+        srcDir = srcDirItem ? overriddenSourceDirectory(srcDirItem, actualBaseDir)
+                            : pathPropertiesBaseDir;
+        // Fall-through.
+    case PropertyDeclaration::StringList:
+    {
+        if (!JS_IsArray(ctx, v)) {
+            JSValue x = engine->newArray(1, JsValueOwner::ScriptEngine);
+            JS_SetPropertyUint32(ctx, x, 0, JS_DupValue(ctx, v));
+            v = x;
+        }
+        const quint32 c = getJsIntProperty(ctx, v, StringConstants::lengthProperty());
+        for (quint32 i = 0; i < c; ++i) {
+            const ScopedJsValue elem(ctx, JS_GetPropertyUint32(ctx, v, i));
+            if (JS_IsUndefined(elem)) {
+                ErrorInfo error(Tr::tr("Element at index %1 of list property '%2' is undefined. "
+                                       "String expected.").arg(i).arg(decl.name()), location);
+                makeTypeError(engine, error, v);
+                break;
+            }
+            if (JS_IsNull(elem)) {
+                ErrorInfo error(Tr::tr("Element at index %1 of list property '%2' is null. "
+                                       "String expected.").arg(i).arg(decl.name()), location);
+                makeTypeError(engine, error, v);
+                break;
+            }
+            if (!JS_IsString(elem)) {
+                ErrorInfo error(Tr::tr("Element at index %1 of list property '%2' does not have "
+                                       "string type.").arg(i).arg(decl.name()), location);
+                makeTypeError(engine, error, v);
+                break;
+            }
+            if (srcDir.isEmpty())
+                continue;
+            const JSValue newElem = engine->toScriptValue(
+                        QDir::cleanPath(FileInfo::resolvePath(srcDir, getJsString(ctx, elem))));
+            JS_SetPropertyUint32(ctx, v, i, newElem);
+        }
+        break;
+    }
+    case PropertyDeclaration::VariantList:
+        if (!JS_IsArray(ctx, v)) {
+            JSValue x = engine->newArray(1, JsValueOwner::ScriptEngine);
+            JS_SetPropertyUint32(ctx, x, 0, JS_DupValue(ctx, v));
+            v = x;
+        }
+        break;
+    }
+}
+
+static int getEvalPropertyNames(JSContext *ctx, JSPropertyEnum **ptab, uint32_t *plen, JSValue obj)
+{
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    const Evaluator * const evaluator = engine->evaluator();
+    const auto data = attachedPointer<EvaluationData>(obj, evaluator->classId());
+    if (!data)
+        return -1;
+    const Item::PropertyMap &map = data->item->properties();
+    *plen = map.size();
+    if (!map.isEmpty()) {
+        *ptab = reinterpret_cast<JSPropertyEnum *>(js_malloc(ctx, *plen * sizeof **ptab));
+        JSPropertyEnum *entry = *ptab;
+        for (auto it = map.cbegin(); it != map.cend(); ++it, ++entry) {
+            entry->atom = JS_NewAtom(ctx, it.key().toUtf8().constData());
+            entry->is_enumerable = 1;
+        }
     } else {
-        message = value.toString();
-        throw ErrorInfo(message, provideFallbackCodeLocation());
+        *ptab = nullptr;
+    }
+    return 0;
+}
+
+class PropertyStackManager
+{
+public:
+    PropertyStackManager(const Item *itemOfProperty, const QString &name, const Value *value,
+                         std::stack<QualifiedId> &requestedProperties,
+                         PropertyDependencies &propertyDependencies)
+        : m_requestedProperties(requestedProperties)
+    {
+        if (value->type() == Value::JSSourceValueType
+                && (itemOfProperty->type() == ItemType::ModuleInstance
+                    || itemOfProperty->type() == ItemType::Module
+                    || itemOfProperty->type() == ItemType::Export)) {
+            const VariantValueConstPtr varValue
+                    = itemOfProperty->variantProperty(StringConstants::nameProperty());
+            if (!varValue)
+                return;
+            m_stackUpdate = true;
+            const QualifiedId fullPropName
+                    = QualifiedId::fromString(varValue->value().toString()) << name;
+            if (!requestedProperties.empty())
+                propertyDependencies[fullPropName].insert(requestedProperties.top());
+            m_requestedProperties.push(fullPropName);
+        }
+    }
+
+    ~PropertyStackManager()
+    {
+        if (m_stackUpdate)
+            m_requestedProperties.pop();
+    }
+
+private:
+    std::stack<QualifiedId> &m_requestedProperties;
+    bool m_stackUpdate = false;
+};
+
+class SVConverter : ValueHandler
+{
+    ScriptEngine * const engine;
+    const JSValue * const object;
+    Value * const valuePtr;
+    const Item * const itemOfProperty;
+    const QString * const propertyName;
+    const EvaluationData * const data;
+    JSValue * const result;
+    JSValueList scopeChain;
+    char pushedScopesCount;
+
+public:
+
+    SVConverter(ScriptEngine *engine, const JSValue *obj, const ValuePtr &v,
+                const Item *_itemOfProperty, const QString *propertyName,
+                const EvaluationData *data, JSValue *result)
+        : engine(engine)
+        , object(obj)
+        , valuePtr(v.get())
+        , itemOfProperty(_itemOfProperty)
+        , propertyName(propertyName)
+        , data(data)
+        , result(result)
+        , pushedScopesCount(0)
+    {
+    }
+
+    void start()
+    {
+        valuePtr->apply(this);
+    }
+
+private:
+    friend class AutoScopePopper;
+
+    class AutoScopePopper
+    {
+    public:
+        AutoScopePopper(SVConverter *converter)
+            : m_converter(converter)
+        {
+        }
+
+        ~AutoScopePopper()
+        {
+            m_converter->popScopes();
+        }
+
+    private:
+        SVConverter *m_converter;
+    };
+
+    void setupConvenienceProperty(const QString &conveniencePropertyName, JSValue *extraScope,
+                                  const JSValue &scriptValue)
+    {
+        if (!JS_IsObject(*extraScope))
+            *extraScope = engine->newObject();
+        const PropertyDeclaration::Type type
+                = itemOfProperty->propertyDeclaration(*propertyName).type();
+        const bool isArray = type == PropertyDeclaration::StringList
+                || type == PropertyDeclaration::PathList
+                || type == PropertyDeclaration::Variant // TODO: Why?
+                || type == PropertyDeclaration::VariantList;
+        JSValue valueToSet = JS_DupValue(engine->context(), scriptValue);
+        if (isArray && JS_IsUndefined(valueToSet))
+            valueToSet = engine->newArray(0, JsValueOwner::Caller);
+        setJsProperty(engine->context(), *extraScope, conveniencePropertyName, valueToSet);
+    }
+
+    std::pair<JSValue, bool> createExtraScope(const JSSourceValue *value, Item *outerItem,
+                                              JSValue *outerScriptValue)
+    {
+        std::pair<JSValue, bool> result;
+        auto &extraScope = result.first;
+        result.second = true;
+        if (value->sourceUsesBase()) {
+            JSValue baseValue = JS_UNDEFINED;
+            if (value->baseValue()) {
+                SVConverter converter(engine, object, value->baseValue(), itemOfProperty,
+                                      propertyName, data, &baseValue);
+                converter.start();
+            }
+            setupConvenienceProperty(StringConstants::baseVar(), &extraScope, baseValue);
+        }
+        if (value->sourceUsesOuter()) {
+            JSValue v = JS_UNDEFINED;
+            bool doSetup = false;
+            if (outerItem) {
+                v = data->evaluator->property(outerItem, *propertyName);
+                if (JsException ex = engine->checkAndClearException({})) {
+                    extraScope = engine->throwError(ex.toErrorInfo().toString());
+                    result.second = false;
+                    return result;
+                }
+                doSetup = true;
+                JS_FreeValue(engine->context(), v);
+            } else if (outerScriptValue) {
+                doSetup = true;
+                v = *outerScriptValue;
+            }
+            if (doSetup)
+                setupConvenienceProperty(StringConstants::outerVar(), &extraScope, v);
+        }
+        if (value->sourceUsesOriginal()) {
+            JSValue originalJs = JS_UNDEFINED;
+            ScopedJsValue originalMgr(engine->context(), JS_UNDEFINED);
+            if (data->item->propertyDeclaration(*propertyName).isScalar()) {
+                const Item *item = itemOfProperty;
+
+                if (item->type() != ItemType::ModuleInstance
+                    && item->type() != ItemType::ModuleInstancePlaceholder) {
+                    const QString errorMessage = Tr::tr("The special value 'original' can only "
+                                                        "be used with module properties.");
+                    extraScope = throwError(engine->context(), errorMessage);
+                    result.second = false;
+                    return result;
+                }
+
+                if (!value->scope()) {
+                    const QString errorMessage = Tr::tr("The special value 'original' cannot "
+                        "be used on the right-hand side of a property declaration.");
+                    extraScope = throwError(engine->context(), errorMessage);
+                    result.second = false;
+                    return result;
+                }
+
+                ValuePtr original;
+                for (const ValuePtr &v : value->candidates()) {
+                    if (!v->scope()) {
+                        original = v;
+                        break;
+                    }
+                }
+
+                // This can happen when resolving shadow products. The error will be ignored
+                // in that case.
+                if (!original) {
+                    const QString errorMessage = Tr::tr("Error setting up 'original'.");
+                    extraScope = throwError(engine->context(), errorMessage);
+                    result.second = false;
+                    return result;
+                }
+
+                SVConverter converter(engine, object, original, item, propertyName, data,
+                                      &originalJs);
+                converter.start();
+            } else {
+                originalJs = engine->newArray(0, JsValueOwner::Caller);
+                originalMgr.setValue(originalJs);
+            }
+            setupConvenienceProperty(StringConstants::originalVar(), &extraScope, originalJs);
+        }
+        return result;
+    }
+
+    void pushScope(const JSValue &scope)
+    {
+        if (JS_IsObject(scope)) {
+            scopeChain << scope;
+            ++pushedScopesCount;
+        }
+    }
+
+    void pushScopeRecursively(const Item *scope)
+    {
+        if (scope) {
+            pushScopeRecursively(scope->scope());
+            pushScope(data->evaluator->scriptValue(scope));
+        }
+    }
+    void pushItemScopes(const Item *item)
+    {
+        const Item *scope = item->scope();
+        if (scope) {
+            pushItemScopes(scope);
+            pushScope(data->evaluator->scriptValue(scope));
+        }
+    }
+
+    void popScopes()
+    {
+        for (; pushedScopesCount; --pushedScopesCount)
+            scopeChain.pop_back();
+    }
+
+    void handle(JSSourceValue *value) override
+    {
+        JSValue outerScriptValue = JS_UNDEFINED;
+        for (const JSSourceValue::Alternative &alternative : value->alternatives()) {
+            if (alternative.value->sourceUsesOuter()
+                    && !data->item->outerItem()
+                    && JS_IsUndefined(outerScriptValue)) {
+                JSSourceValueEvaluationResult sver = evaluateJSSourceValue(value, nullptr);
+                if (sver.hasError) {
+                    *result = sver.scriptValue;
+                    return;
+                }
+                outerScriptValue = sver.scriptValue;
+            }
+            JSSourceValueEvaluationResult sver = evaluateJSSourceValue(alternative.value.get(),
+                                                                       data->item->outerItem(),
+                                                                       &alternative,
+                                                                       value, &outerScriptValue);
+            if (!sver.tryNextAlternative || sver.hasError) {
+                *result = sver.scriptValue;
+                return;
+            }
+        }
+        *result = evaluateJSSourceValue(value, data->item->outerItem()).scriptValue;
+    }
+
+    struct JSSourceValueEvaluationResult
+    {
+        JSValue scriptValue = JS_UNDEFINED;
+        bool tryNextAlternative = true;
+        bool hasError = false;
+    };
+
+    JSSourceValueEvaluationResult evaluateJSSourceValue(const JSSourceValue *value, Item *outerItem,
+            const JSSourceValue::Alternative *alternative = nullptr,
+            JSSourceValue *elseCaseValue = nullptr, JSValue *outerScriptValue = nullptr)
+    {
+        JSSourceValueEvaluationResult result;
+        QBS_ASSERT(!alternative || value == alternative->value.get(), return result);
+        AutoScopePopper autoScopePopper(this);
+        auto maybeExtraScope = createExtraScope(value, outerItem, outerScriptValue);
+        if (!maybeExtraScope.second) {
+            result.scriptValue = maybeExtraScope.first;
+            result.hasError = true;
+            return result;
+        }
+        const ScopedJsValue extraScopeMgr(engine->context(), maybeExtraScope.first);
+        const Evaluator::FileContextScopes fileCtxScopes
+                = data->evaluator->fileContextScopes(value->file());
+        if (JsException ex = engine->checkAndClearException({})) {
+            result.scriptValue = engine->throwError(ex.toErrorInfo().toString());
+            result.hasError = true;
+            return result;
+        }
+        pushScope(fileCtxScopes.fileScope);
+        pushItemScopes(data->item);
+        if ((itemOfProperty->type() != ItemType::ModuleInstance
+             && itemOfProperty->type() != ItemType::ModuleInstancePlaceholder) || !value->scope()) {
+            pushScope(*object);
+        }
+        pushScopeRecursively(value->scope());
+        pushScope(maybeExtraScope.first);
+        pushScope(fileCtxScopes.importScope);
+        if (alternative) {
+            ScopedJsValue sv(engine->context(), engine->evaluate(JsValueOwner::Caller,
+                    alternative->condition.value, {}, 1, scopeChain));
+            if (JsException ex = engine->checkAndClearException(alternative->condition.location)) {
+
+                // This handles cases like the following:
+                //   Depends { name: "cpp" }
+                //   Properties {
+                //     condition: qbs.targetOS.contains("darwin")
+                //     bundle.isBundle: false
+                //   }
+                // On non-Darwin platforms, bundle never gets instantiated, and thus bundle.isBundle
+                // has no scope, so the qbs item in the condition is not found.
+                // TODO: Ideally, we would never evaluate values in placeholder items, but
+                //       there are currently several contexts where we do that, e.g. Export
+                //       and Group items. Perhaps change that, or try to collect all such
+                //       exceptions and don't try to evaluate other cases.
+                if (itemOfProperty->type() == ItemType::ModuleInstancePlaceholder) {
+                    result.scriptValue = JS_UNDEFINED;
+                    result.tryNextAlternative = false;
+                    return result;
+                }
+
+                result.scriptValue = engine->throwError(ex.toErrorInfo().toString());
+                //result.scriptValue = JS_Throw(engine->context(), ex.takeValue());
+                //result.scriptValue = ex.takeValue();
+                result.hasError = true;
+                return result;
+            }
+            if (JS_ToBool(engine->context(), sv)) {
+                // The condition is true. Continue evaluating the value.
+                result.tryNextAlternative = false;
+            } else {
+                // The condition is false. Try the next alternative or the else value.
+                result.tryNextAlternative = true;
+                return result;
+            }
+            sv.reset(engine->evaluate(JsValueOwner::Caller,
+                                  alternative->overrideListProperties.value, {}, 1, scopeChain));
+            if (JsException ex = engine->checkAndClearException(
+                        alternative->overrideListProperties.location)) {
+                result.scriptValue = engine->throwError(ex.toErrorInfo().toString());
+                //result.scriptValue = JS_Throw(engine->context(), ex.takeValue());
+                result.hasError = true;
+                return result;
+            }
+            if (JS_ToBool(engine->context(), sv))
+                elseCaseValue->setIsExclusiveListValue();
+        }
+        result.scriptValue = engine->evaluate(JsValueOwner::ScriptEngine,
+                value->sourceCodeForEvaluation(), value->file()->filePath(), value->line(),
+                scopeChain);
+        return result;
+    }
+
+    void handle(ItemValue *value) override
+    {
+        *result = data->evaluator->scriptValue(value->item());
+        if (JS_IsUninitialized(*result))
+            qDebug() << "SVConverter returned invalid script value.";
+    }
+
+    void handle(VariantValue *variantValue) override
+    {
+        *result = engine->toScriptValue(variantValue->value(), variantValue->id());
+        engine->takeOwnership(*result);
+    }
+};
+
+static void convertToPropertyType(ScriptEngine *engine, const Item *item,
+                                  const PropertyDeclaration& decl, const Value *value, JSValue &v)
+{
+    if (value->type() == Value::VariantValueType && JS_IsUndefined(v) && !decl.isScalar()) {
+        v = engine->newArray(0, JsValueOwner::ScriptEngine); // QTBUG-51237
+        return;
+    }
+    convertToPropertyType_impl(engine, engine->evaluator()->pathPropertiesBaseDir(), item, decl,
+                               value, value->location(), v);
+}
+
+static QString resultToString(JSContext *ctx, const JSValue &scriptValue)
+{
+    if (JS_IsUndefined(scriptValue))
+        return QLatin1String("undefined");
+    if (JS_IsArray(ctx, scriptValue))
+        return getJsStringList(ctx, scriptValue).join(QLatin1Char(','));
+    if (JS_IsObject(scriptValue)) {
+        return QStringLiteral("[Object: ")
+                + QString::number(jsObjectId(scriptValue)) + QLatin1Char(']');
+    }
+    return getJsVariant(ctx, scriptValue).toString();
+}
+
+static void collectValuesFromNextChain(
+        ScriptEngine *engine, JSValue obj, const ValuePtr &value, const Item *itemOfProperty, const QString &name,
+        const EvaluationData *data, JSValue *result)
+{
+    JSValueList lst;
+    for (ValuePtr next = value; next; next = next->next()) {
+        JSValue v = JS_UNDEFINED;
+        SVConverter svc(engine, &obj, next, itemOfProperty, &name, data, &v);
+        svc.start();
+        if (JsException ex = engine->checkAndClearException({})) {
+            const ScopedJsValueList l(engine->context(), lst);
+            *result = engine->throwError(ex.toErrorInfo().toString());
+            return;
+        }
+        if (JS_IsUndefined(v))
+            continue;
+        const PropertyDeclaration decl = data->item->propertyDeclaration(name);
+        convertToPropertyType(engine, data->item, decl, next.get(), v);
+        lst.push_back(JS_DupValue(engine->context(), v));
+        if (next->type() == Value::JSSourceValueType
+                && std::static_pointer_cast<JSSourceValue>(next)->isExclusiveListValue()) {
+            // TODO: Why on earth do we keep the last _2_ elements?
+            auto keepIt = lst.rbegin();
+            for (int i = 0; i < 2 && keepIt != lst.rend(); ++i)
+                ++keepIt;
+            for (auto it = lst.begin(); it < keepIt.base(); ++it)
+                JS_FreeValue(engine->context(), *it);
+            lst.erase(lst.begin(), keepIt.base());
+            break;
+        }
+    }
+
+    *result = engine->newArray(int(lst.size()), JsValueOwner::ScriptEngine);
+    quint32 k = 0;
+    JSContext * const ctx = engine->context();
+    for (const JSValue &v : std::as_const(lst)) {
+        QBS_ASSERT(!JS_IsError(ctx, v), continue);
+        if (JS_IsArray(ctx, v)) {
+            const quint32 vlen = getJsIntProperty(ctx, v, StringConstants::lengthProperty());
+            for (quint32 j = 0; j < vlen; ++j)
+                JS_SetPropertyUint32(ctx, *result, k++, JS_GetPropertyUint32(ctx, v, j));
+            JS_FreeValue(ctx, v);
+        } else {
+            JS_SetPropertyUint32(ctx, *result, k++, v);
+        }
+    }
+    setJsProperty(ctx, *result, StringConstants::lengthProperty(), JS_NewInt32(ctx, k));
+}
+
+struct EvalResult { JSValue v = JS_UNDEFINED; bool found = false; };
+static EvalResult getEvalProperty(ScriptEngine *engine, JSValue obj, const Item *item,
+                                  const QString &name, EvaluationData *data)
+{
+    Evaluator * const evaluator = data->evaluator;
+    const bool isModuleInstance = item->type() == ItemType::ModuleInstance
+            || item->type() == ItemType::ModuleInstancePlaceholder;
+    for (; item; item = item->prototype()) {
+        if (isModuleInstance
+            && (item->type() == ItemType::Module || item->type() == ItemType::Export)) {
+            break; // There's no property in a prototype that's not also in the instance.
+        }
+        const ValuePtr value = item->ownProperty(name);
+        if (!value)
+            continue;
+        const Item * const itemOfProperty = item;     // The item that owns the property.
+        PropertyStackManager propStackmanager(itemOfProperty, name, value.get(),
+                                              evaluator->requestedProperties(),
+                                              evaluator->propertyDependencies());
+        JSValue result;
+        if (evaluator->cachingEnabled()) {
+            data->evaluator->clearCacheIfInvalidated(*data);
+            const auto result = data->valueCache.constFind(name);
+            if (result != data->valueCache.constEnd()) {
+                if (debugProperties)
+                    qDebug() << "[SC] cache hit " << name << ": "
+                             << resultToString(engine->context(), *result);
+                return {*result, true};
+            }
+        }
+
+        if (value->next()) {
+            collectValuesFromNextChain(engine, obj, value, itemOfProperty, name, data, &result);
+        } else {
+            SVConverter converter(engine, &obj, value, itemOfProperty, &name, data, &result);
+            converter.start();
+            const PropertyDeclaration decl = data->item->propertyDeclaration(name);
+            convertToPropertyType(engine, data->item, decl, value.get(), result);
+        }
+
+        if (debugProperties)
+            qDebug() << "[SC] cache miss " << name << ": "
+                     << resultToString(engine->context(), result);
+        if (evaluator->cachingEnabled()) {
+            data->evaluator->clearCacheIfInvalidated(*data);
+            const auto it = data->valueCache.find(name);
+            if (it != data->valueCache.end()) {
+                JS_FreeValue(engine->context(), it.value());
+                it.value() = JS_DupValue(engine->context(), result);
+            } else {
+                data->valueCache.insert(name, JS_DupValue(engine->context(), result));
+            }
+        }
+        return {result, true};
+    }
+    return {JS_UNDEFINED, false};
+}
+
+static int getEvalProperty(JSContext *ctx, JSPropertyDescriptor *desc, JSValue obj, JSAtom prop)
+{
+    if (desc) {
+        desc->getter = desc->setter = desc->value = JS_UNDEFINED;
+        desc->flags = JS_PROP_ENUMERABLE;
+    }
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    Evaluator * const evaluator = engine->evaluator();
+    const auto data = attachedPointer<EvaluationData>(obj, evaluator->classId());
+    const QString name = getJsString(ctx, prop);
+    if (debugProperties)
+        qDebug() << "[SC] queryProperty " << jsObjectId(obj) << " " << name;
+
+    if (name == QStringLiteral("parent")) {
+        if (desc) {
+            Item * const parent = data->item->parent();
+            desc->value = parent
+                    ? JS_DupValue(ctx, data->evaluator->scriptValue(data->item->parent()))
+                    : JS_UNDEFINED;
+        }
+        return 1;
+    }
+
+    if (!data) {
+        if (debugProperties)
+            qDebug() << "[SC] queryProperty: no data attached";
+        engine->setLastLookupStatus(false);
+        return -1;
+    }
+
+    EvalResult result = getEvalProperty(engine, obj, data->item, name, data);
+    if (!result.found && data->item->parent()) {
+        if (debugProperties)
+            qDebug() << "[SC] queryProperty: query parent";
+        const Item * const parentItem = data->item->parent();
+        result = getEvalProperty(engine, evaluator->scriptValue(parentItem), parentItem,
+                                 name, data);
+    }
+    if (result.found) {
+        if (desc)
+            desc->value = JS_DupValue(ctx, result.v);
+        engine->setLastLookupStatus(true);
+        return 1;
+    }
+
+    if (debugProperties)
+        qDebug() << "[SC] queryProperty: no such property";
+    engine->setLastLookupStatus(false);
+    return 0;
+}
+
+static int getEvalPropertySafe(JSContext *ctx, JSPropertyDescriptor *desc, JSValue obj, JSAtom prop)
+{
+    try {
+        return getEvalProperty(ctx, desc, obj, prop);
+    } catch (const ErrorInfo &e) {
+        ScopedJsValue error(ctx, throwError(ctx, e.toString()));
+        return -1;
     }
 }
 
diff --git a/src/lib/corelib/language/evaluator.h b/src/lib/corelib/language/evaluator.h
index 1e21391dc..d86e08eb1 100644
--- a/src/lib/corelib/language/evaluator.h
+++ b/src/lib/corelib/language/evaluator.h
@@ -44,16 +44,18 @@
 #include "itemobserver.h"
 #include "qualifiedid.h"
 
-#include <QtCore/qhash.h>
+#include <quickjs.h>
 
-#include <QtScript/qscriptvalue.h>
+#include <QtCore/qhash.h>
 
 #include <functional>
+#include <mutex>
 #include <optional>
+#include <stack>
 
 namespace qbs {
 namespace Internal {
-class EvaluatorScriptClass;
+class EvaluationData;
 class FileTags;
 class Logger;
 class PropertyDeclaration;
@@ -68,9 +70,10 @@ public:
     ~Evaluator() override;
 
     ScriptEngine *engine() const { return m_scriptEngine; }
-    QScriptValue property(const Item *item, const QString &name);
+    JSClassID classId() const { return m_scriptClass; }
+    JSValue property(const Item *item, const QString &name);
 
-    QScriptValue value(const Item *item, const QString &name, bool *propertySet = nullptr);
+    JSValue value(const Item *item, const QString &name, bool *propertySet = nullptr);
     bool boolValue(const Item *item, const QString &name, bool *propertyWasSet = nullptr);
     int intValue(const Item *item, const QString &name, int defaultValue = 0,
                  bool *propertyWasSet = nullptr);
@@ -82,54 +85,76 @@ public:
     std::optional<QStringList> optionalStringListValue(const Item *item, const QString &name,
                                 bool *propertyWasSet = nullptr);
 
+    QVariant variantValue(const Item *item, const QString &name, bool *propertySet = nullptr);
+
     void convertToPropertyType(const PropertyDeclaration& decl, const CodeLocation &loc,
-                               QScriptValue &v);
+                               JSValue &v);
 
-    QScriptValue scriptValue(const Item *item);
+    JSValue scriptValue(const Item *item);
 
     struct FileContextScopes
     {
-        QScriptValue fileScope;
-        QScriptValue importScope;
+        JSValue fileScope = JS_UNDEFINED;
+        JSValue importScope = JS_UNDEFINED;
     };
 
     FileContextScopes fileContextScopes(const FileContextConstPtr &file);
 
-    void setCachingEnabled(bool enabled);
+    void setCachingEnabled(bool enabled) { m_valueCacheEnabled = enabled; }
+    bool cachingEnabled() const { return m_valueCacheEnabled; }
+    void clearCache(const Item *item);
+    void invalidateCache(const Item *item);
+    void clearCacheIfInvalidated(EvaluationData &edata);
+
+    PropertyDependencies &propertyDependencies() { return m_propertyDependencies; }
+    void clearPropertyDependencies() { m_propertyDependencies.clear(); }
 
-    PropertyDependencies propertyDependencies() const;
-    void clearPropertyDependencies();
+    std::stack<QualifiedId> &requestedProperties() { return m_requestedProperties; }
 
-    void handleEvaluationError(const Item *item, const QString &name,
-            const QScriptValue &scriptValue);
+    void handleEvaluationError(const Item *item, const QString &name);
 
-    void setPathPropertiesBaseDir(const QString &dirPath);
-    void clearPathPropertiesBaseDir();
+    QString pathPropertiesBaseDir() const { return m_pathPropertiesBaseDir; }
+    void setPathPropertiesBaseDir(const QString &dirPath) { m_pathPropertiesBaseDir = dirPath; }
+    void clearPathPropertiesBaseDir() { m_pathPropertiesBaseDir.clear(); }
 
     bool isNonDefaultValue(const Item *item, const QString &name) const;
 private:
-    void onItemPropertyChanged(Item *item) override;
-    bool evaluateProperty(QScriptValue *result, const Item *item, const QString &name,
+    void onItemPropertyChanged(Item *item) override { invalidateCache(item); }
+    bool evaluateProperty(JSValue *result, const Item *item, const QString &name,
             bool *propertyWasSet);
+    void clearCache(EvaluationData &edata);
 
-    ScriptEngine *m_scriptEngine;
-    EvaluatorScriptClass *m_scriptClass;
-    mutable QHash<const Item *, QScriptValue> m_scriptValueMap;
+    ScriptEngine * const m_scriptEngine;
+    const JSClassID m_scriptClass;
+    mutable QHash<const Item *, JSValue> m_scriptValueMap;
     mutable QHash<FileContextConstPtr, FileContextScopes> m_fileContextScopesMap;
+    QString m_pathPropertiesBaseDir;
+    PropertyDependencies m_propertyDependencies;
+    std::stack<QualifiedId> m_requestedProperties;
+    std::mutex m_cacheInvalidationMutex;
+    Set<const Item *> m_invalidatedCaches;
+    bool m_valueCacheEnabled = false;
 };
 
-void throwOnEvaluationError(ScriptEngine *engine, const QScriptValue &scriptValue,
+void throwOnEvaluationError(ScriptEngine *engine,
                             const std::function<CodeLocation()> &provideFallbackCodeLocation);
 
 class EvalCacheEnabler
 {
 public:
-    EvalCacheEnabler(Evaluator *evaluator) : m_evaluator(evaluator)
+    EvalCacheEnabler(Evaluator *evaluator, const QString &baseDir) : m_evaluator(evaluator)
     {
         m_evaluator->setCachingEnabled(true);
+        m_evaluator->setPathPropertiesBaseDir(baseDir);
     }
 
-    ~EvalCacheEnabler() { m_evaluator->setCachingEnabled(false); }
+    ~EvalCacheEnabler() { reset(); }
+
+    void reset()
+    {
+        m_evaluator->setCachingEnabled(false);
+        m_evaluator->clearPathPropertiesBaseDir();
+    }
 
 private:
     Evaluator * const m_evaluator;
diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp
deleted file mode 100644
index 375954133..000000000
--- a/src/lib/corelib/language/evaluatorscriptclass.cpp
+++ /dev/null
@@ -1,776 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "evaluatorscriptclass.h"
-
-#include "evaluationdata.h"
-#include "evaluator.h"
-#include "filecontext.h"
-#include "item.h"
-#include "scriptengine.h"
-#include "propertydeclaration.h"
-#include "value.h"
-#include <logging/translator.h>
-#include <tools/fileinfo.h>
-#include <tools/qbsassert.h>
-#include <tools/qttools.h>
-#include <tools/scripttools.h>
-#include <tools/stringconstants.h>
-
-#include <QtCore/qbytearray.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qsettings.h>
-
-#include <QtScript/qscriptclasspropertyiterator.h>
-#include <QtScript/qscriptstring.h>
-#include <QtScript/qscriptvalue.h>
-
-#include <utility>
-
-namespace qbs {
-namespace Internal {
-
-class SVConverter : ValueHandler
-{
-    EvaluatorScriptClass * const scriptClass;
-    ScriptEngine * const engine;
-    QScriptContext * const scriptContext;
-    const QScriptValue * const object;
-    Value * const valuePtr;
-    const Item * const itemOfProperty;
-    const QScriptString * const propertyName;
-    const EvaluationData * const data;
-    QScriptValue * const result;
-    char pushedScopesCount;
-
-public:
-
-    SVConverter(EvaluatorScriptClass *esc, const QScriptValue *obj, const ValuePtr &v,
-                const Item *_itemOfProperty, const QScriptString *propertyName, const EvaluationData *data,
-                QScriptValue *result)
-        : scriptClass(esc)
-        , engine(static_cast<ScriptEngine *>(esc->engine()))
-        , scriptContext(esc->engine()->currentContext())
-        , object(obj)
-        , valuePtr(v.get())
-        , itemOfProperty(_itemOfProperty)
-        , propertyName(propertyName)
-        , data(data)
-        , result(result)
-        , pushedScopesCount(0)
-    {
-    }
-
-    void start()
-    {
-        valuePtr->apply(this);
-    }
-
-private:
-    friend class AutoScopePopper;
-
-    class AutoScopePopper
-    {
-    public:
-        AutoScopePopper(SVConverter *converter)
-            : m_converter(converter)
-        {
-        }
-
-        ~AutoScopePopper()
-        {
-            m_converter->popScopes();
-        }
-
-    private:
-        SVConverter *m_converter;
-    };
-
-    void setupConvenienceProperty(const QString &conveniencePropertyName, QScriptValue *extraScope,
-                                  const QScriptValue &scriptValue)
-    {
-        if (!extraScope->isObject())
-            *extraScope = engine->newObject();
-        const PropertyDeclaration::Type type
-                = itemOfProperty->propertyDeclaration(propertyName->toString()).type();
-        const bool isArray = type == PropertyDeclaration::StringList
-                || type == PropertyDeclaration::PathList
-                || type == PropertyDeclaration::Variant // TODO: Why?
-                || type == PropertyDeclaration::VariantList;
-        QScriptValue valueToSet = scriptValue;
-        if (isArray) {
-            if (!valueToSet.isValid() || valueToSet.isUndefined())
-                valueToSet = engine->newArray();
-        } else if (!valueToSet.isValid()) {
-            valueToSet = engine->undefinedValue();
-        }
-        extraScope->setProperty(conveniencePropertyName, valueToSet);
-    }
-
-    std::pair<QScriptValue, bool> createExtraScope(const JSSourceValue *value, Item *outerItem,
-                                                   QScriptValue *outerScriptValue)
-    {
-        std::pair<QScriptValue, bool> result;
-        auto &extraScope = result.first;
-        result.second = true;
-        if (value->sourceUsesBase()) {
-            QScriptValue baseValue;
-            if (value->baseValue()) {
-                SVConverter converter(scriptClass, object, value->baseValue(), itemOfProperty,
-                                      propertyName, data, &baseValue);
-                converter.start();
-            }
-            setupConvenienceProperty(StringConstants::baseVar(), &extraScope, baseValue);
-        }
-        if (value->sourceUsesOuter()) {
-            QScriptValue v;
-            if (outerItem) {
-                v = data->evaluator->property(outerItem, *propertyName);
-                if (engine->hasErrorOrException(v)) {
-                    extraScope = engine->lastErrorValue(v);
-                    result.second = false;
-                    return result;
-                }
-            } else if (outerScriptValue) {
-                v = *outerScriptValue;
-            }
-            if (v.isValid())
-                setupConvenienceProperty(StringConstants::outerVar(), &extraScope, v);
-        }
-        if (value->sourceUsesOriginal()) {
-            QScriptValue originalValue;
-            if (data->item->propertyDeclaration(propertyName->toString()).isScalar()) {
-                const Item *item = itemOfProperty;
-                if (item->type() == ItemType::Module || item->type() == ItemType::Export) {
-                    const QString errorMessage = Tr::tr("The special value 'original' cannot "
-                            "be used on the right-hand side of a property declaration.");
-                    extraScope = engine->currentContext()->throwError(errorMessage);
-                    result.second = false;
-                    return result;
-                }
-
-                // TODO: Provide a dedicated item type for not-yet-instantiated things that
-                //       look like module instances in the AST visitor.
-                if (item->type() == ItemType::ModuleInstance
-                        && !item->hasProperty(StringConstants::presentProperty())) {
-                    const QString errorMessage = Tr::tr("Trying to assign property '%1' "
-                            "on something that is not a module.").arg(propertyName->toString());
-                    extraScope = engine->currentContext()->throwError(errorMessage);
-                    result.second = false;
-                    return result;
-                }
-
-                while (item->type() == ItemType::ModuleInstance)
-                    item = item->prototype();
-                if (item->type() != ItemType::Module && item->type() != ItemType::Export) {
-                    const QString errorMessage = Tr::tr("The special value 'original' can only "
-                                                        "be used with module properties.");
-                    extraScope = engine->currentContext()->throwError(errorMessage);
-                    result.second = false;
-                    return result;
-                }
-                const ValuePtr v = item->property(*propertyName);
-
-                // This can happen when resolving shadow products. The error will be ignored
-                // in that case.
-                if (!v) {
-                    const QString errorMessage = Tr::tr("Error setting up 'original'.");
-                    extraScope = engine->currentContext()->throwError(errorMessage);
-                    result.second = false;
-                    return result;
-                }
-
-                SVConverter converter(scriptClass, object, v, item,
-                                      propertyName, data, &originalValue);
-                converter.start();
-            } else {
-                originalValue = engine->newArray(0);
-            }
-            setupConvenienceProperty(StringConstants::originalVar(), &extraScope, originalValue);
-        }
-        return result;
-    }
-
-    void pushScope(const QScriptValue &scope)
-    {
-        if (scope.isObject()) {
-            scriptContext->pushScope(scope);
-            ++pushedScopesCount;
-        }
-    }
-
-    void pushItemScopes(const Item *item)
-    {
-        const Item *scope = item->scope();
-        if (scope) {
-            pushItemScopes(scope);
-            pushScope(data->evaluator->scriptValue(scope));
-        }
-    }
-
-    void popScopes()
-    {
-        for (; pushedScopesCount; --pushedScopesCount)
-            scriptContext->popScope();
-    }
-
-    void handle(JSSourceValue *value) override
-    {
-        QScriptValue outerScriptValue;
-        for (const JSSourceValue::Alternative &alternative : value->alternatives()) {
-            if (alternative.value->sourceUsesOuter()
-                    && !data->item->outerItem()
-                    && !outerScriptValue.isValid()) {
-                JSSourceValueEvaluationResult sver = evaluateJSSourceValue(value, nullptr);
-                if (sver.hasError) {
-                    *result = sver.scriptValue;
-                    return;
-                }
-                outerScriptValue = sver.scriptValue;
-            }
-            JSSourceValueEvaluationResult sver = evaluateJSSourceValue(alternative.value.get(),
-                                                                       data->item->outerItem(),
-                                                                       &alternative,
-                                                                       value, &outerScriptValue);
-            if (!sver.tryNextAlternative || sver.hasError) {
-                *result = sver.scriptValue;
-                return;
-            }
-        }
-        *result = evaluateJSSourceValue(value, data->item->outerItem()).scriptValue;
-    }
-
-    struct JSSourceValueEvaluationResult
-    {
-        QScriptValue scriptValue;
-        bool tryNextAlternative = true;
-        bool hasError = false;
-    };
-
-    void injectErrorLocation(QScriptValue &sv, const CodeLocation &loc)
-    {
-        if (sv.isError() && !engine->lastErrorLocation(sv).isValid())
-            sv = engine->currentContext()->throwError(engine->lastError(sv, loc).toString());
-    }
-
-    JSSourceValueEvaluationResult evaluateJSSourceValue(const JSSourceValue *value, Item *outerItem,
-            const JSSourceValue::Alternative *alternative = nullptr,
-            JSSourceValue *elseCaseValue = nullptr, QScriptValue *outerScriptValue = nullptr)
-    {
-        JSSourceValueEvaluationResult result;
-        QBS_ASSERT(!alternative || value == alternative->value.get(), return result);
-        AutoScopePopper autoScopePopper(this);
-        auto maybeExtraScope = createExtraScope(value, outerItem, outerScriptValue);
-        if (!maybeExtraScope.second) {
-            result.scriptValue = maybeExtraScope.first;
-            result.hasError = true;
-            return result;
-        }
-        const Evaluator::FileContextScopes fileCtxScopes
-                = data->evaluator->fileContextScopes(value->file());
-        if (fileCtxScopes.importScope.isError()) {
-            result.scriptValue = fileCtxScopes.importScope;
-            result.hasError = true;
-            return result;
-        }
-        pushScope(fileCtxScopes.fileScope);
-        pushItemScopes(data->item);
-        if (itemOfProperty->type() != ItemType::ModuleInstance) {
-            // Own properties of module instances must not have the instance itself in the scope.
-            pushScope(*object);
-        }
-        if (value->definingItem())
-            pushItemScopes(value->definingItem());
-        pushScope(maybeExtraScope.first);
-        pushScope(fileCtxScopes.importScope);
-        if (alternative) {
-            QScriptValue sv = engine->evaluate(alternative->condition.value);
-            if (engine->hasErrorOrException(sv)) {
-                result.scriptValue = sv;
-                result.hasError = true;
-                injectErrorLocation(result.scriptValue, alternative->condition.location);
-                return result;
-            }
-            if (sv.toBool()) {
-                // The condition is true. Continue evaluating the value.
-                result.tryNextAlternative = false;
-            } else {
-                // The condition is false. Try the next alternative or the else value.
-                result.tryNextAlternative = true;
-                return result;
-            }
-            sv = engine->evaluate(alternative->overrideListProperties.value);
-            if (engine->hasErrorOrException(sv)) {
-                result.scriptValue = sv;
-                result.hasError = true;
-                injectErrorLocation(result.scriptValue,
-                                    alternative->overrideListProperties.location);
-                return result;
-            }
-            if (sv.toBool())
-                elseCaseValue->setIsExclusiveListValue();
-        }
-        result.scriptValue = engine->evaluate(value->sourceCodeForEvaluation(),
-                                              value->file()->filePath(), value->line());
-        return result;
-    }
-
-    void handle(ItemValue *value) override
-    {
-        *result = data->evaluator->scriptValue(value->item());
-        if (!result->isValid())
-            qDebug() << "SVConverter returned invalid script value.";
-    }
-
-    void handle(VariantValue *variantValue) override
-    {
-        *result = engine->toScriptValue(variantValue->value());
-    }
-};
-
-bool debugProperties = false;
-
-enum QueryPropertyType
-{
-    QPTDefault,
-    QPTParentProperty
-};
-
-EvaluatorScriptClass::EvaluatorScriptClass(ScriptEngine *scriptEngine)
-    : QScriptClass(scriptEngine)
-    , m_valueCacheEnabled(false)
-{
-}
-
-QScriptClass::QueryFlags EvaluatorScriptClass::queryProperty(const QScriptValue &object,
-                                                             const QScriptString &name,
-                                                             QScriptClass::QueryFlags flags,
-                                                             uint *id)
-{
-    Q_UNUSED(flags);
-
-    // We assume that it's safe to save the result of the query in a member of the scriptclass.
-    // It must be cleared in the property method before doing any further lookup.
-    QBS_ASSERT(m_queryResult.isNull(), return {});
-
-    if (debugProperties)
-        qDebug() << "[SC] queryProperty " << object.objectId() << " " << name;
-
-    auto const data = attachedPointer<EvaluationData>(object);
-    const QString nameString = name.toString();
-    if (nameString == QStringLiteral("parent")) {
-        *id = QPTParentProperty;
-        m_queryResult.data = data;
-        return QScriptClass::HandlesReadAccess;
-    }
-
-    *id = QPTDefault;
-    if (!data) {
-        if (debugProperties)
-            qDebug() << "[SC] queryProperty: no data attached";
-        return {};
-    }
-
-    return queryItemProperty(data, nameString);
-}
-
-QScriptClass::QueryFlags EvaluatorScriptClass::queryItemProperty(const EvaluationData *data,
-                                                                 const QString &name,
-                                                                 bool ignoreParent)
-{
-    for (const Item *item = data->item; item; item = item->prototype()) {
-        m_queryResult.value = item->ownProperty(name);
-        if (m_queryResult.value) {
-            m_queryResult.data = data;
-            m_queryResult.itemOfProperty = item;
-            return HandlesReadAccess;
-        }
-    }
-
-    if (!ignoreParent && data->item && data->item->parent()) {
-        if (debugProperties)
-            qDebug() << "[SC] queryProperty: query parent";
-        EvaluationData parentdata = *data;
-        parentdata.item = data->item->parent();
-        const QueryFlags qf = queryItemProperty(&parentdata, name, true);
-        if (qf.testFlag(HandlesReadAccess)) {
-            m_queryResult.foundInParent = true;
-            m_queryResult.data = data;
-            return qf;
-        }
-    }
-
-    if (debugProperties)
-        qDebug() << "[SC] queryProperty: no such property";
-    return {};
-}
-
-QString EvaluatorScriptClass::resultToString(const QScriptValue &scriptValue)
-{
-    return (scriptValue.isObject()
-        ? QStringLiteral("[Object: ")
-            + QString::number(scriptValue.objectId()) + QLatin1Char(']')
-        : scriptValue.toVariant().toString());
-}
-
-void EvaluatorScriptClass::collectValuesFromNextChain(const EvaluationData *data, QScriptValue *result,
-        const QString &propertyName, const ValuePtr &value)
-{
-    QScriptValueList lst;
-    Set<Value *> oldNextChain = m_currentNextChain;
-    for (ValuePtr next = value; next; next = next->next())
-        m_currentNextChain.insert(next.get());
-
-    for (ValuePtr next = value; next; next = next->next()) {
-        QScriptValue v = data->evaluator->property(next->definingItem(), propertyName);
-        const auto se = static_cast<const ScriptEngine *>(engine());
-        if (se->hasErrorOrException(v)) {
-            *result = se->lastErrorValue(v);
-            return;
-        }
-        if (v.isUndefined())
-            continue;
-        lst << v;
-        if (next->type() == Value::JSSourceValueType
-                && std::static_pointer_cast<JSSourceValue>(next)->isExclusiveListValue()) {
-            lst = lst.mid(lst.length() - 2);
-            break;
-        }
-    }
-    m_currentNextChain = oldNextChain;
-
-    *result = engine()->newArray();
-    quint32 k = 0;
-    for (const QScriptValue &v : qAsConst(lst)) {
-        QBS_ASSERT(!v.isError(), continue);
-        if (v.isArray()) {
-            const quint32 vlen = v.property(StringConstants::lengthProperty()).toInt32();
-            for (quint32 j = 0; j < vlen; ++j)
-                result->setProperty(k++, v.property(j));
-        } else {
-            result->setProperty(k++, v);
-        }
-    }
-}
-
-static QString overriddenSourceDirectory(const Item *item, const QString &defaultValue)
-{
-    const VariantValuePtr v = item->variantProperty
-            (StringConstants::qbsSourceDirPropertyInternal());
-    return v ? v->value().toString() : defaultValue;
-}
-
-static void makeTypeError(const ErrorInfo &error, QScriptValue &v)
-{
-    v = v.engine()->currentContext()->throwError(QScriptContext::TypeError,
-                                                 error.toString());
-}
-
-static void makeTypeError(const PropertyDeclaration &decl, const CodeLocation &location,
-                          QScriptValue &v)
-{
-    const ErrorInfo error(Tr::tr("Value assigned to property '%1' does not have type '%2'.")
-                          .arg(decl.name(), decl.typeString()), location);
-    makeTypeError(error, v);
-}
-
-static void convertToPropertyType_impl(const QString &pathPropertiesBaseDir, const Item *item,
-                                       const PropertyDeclaration& decl,
-                                       const CodeLocation &location, QScriptValue &v)
-{
-    if (v.isUndefined() || v.isError())
-        return;
-    QString srcDir;
-    QString actualBaseDir;
-    if (item && !pathPropertiesBaseDir.isEmpty()) {
-        const VariantValueConstPtr itemSourceDir
-                = item->variantProperty(QStringLiteral("sourceDirectory"));
-        actualBaseDir = itemSourceDir ? itemSourceDir->value().toString() : pathPropertiesBaseDir;
-    }
-    switch (decl.type()) {
-    case PropertyDeclaration::UnknownType:
-    case PropertyDeclaration::Variant:
-        break;
-    case PropertyDeclaration::Boolean:
-        if (!v.isBool())
-            v = v.toBool();
-        break;
-    case PropertyDeclaration::Integer:
-        if (!v.isNumber())
-            makeTypeError(decl, location, v);
-        break;
-    case PropertyDeclaration::Path:
-    {
-        if (!v.isString()) {
-            makeTypeError(decl, location, v);
-            break;
-        }
-        const QString srcDir = item ? overriddenSourceDirectory(item, actualBaseDir)
-                                    : pathPropertiesBaseDir;
-        if (!srcDir.isEmpty())
-            v = v.engine()->toScriptValue(QDir::cleanPath(
-                                              FileInfo::resolvePath(srcDir, v.toString())));
-        break;
-    }
-    case PropertyDeclaration::String:
-        if (!v.isString())
-            makeTypeError(decl, location, v);
-        break;
-    case PropertyDeclaration::PathList:
-        srcDir = item ? overriddenSourceDirectory(item, actualBaseDir)
-                      : pathPropertiesBaseDir;
-        // Fall-through.
-    case PropertyDeclaration::StringList:
-    {
-        if (!v.isArray()) {
-            QScriptValue x = v.engine()->newArray(1);
-            x.setProperty(0, v);
-            v = x;
-        }
-        const quint32 c = v.property(StringConstants::lengthProperty()).toUInt32();
-        for (quint32 i = 0; i < c; ++i) {
-            QScriptValue elem = v.property(i);
-            if (elem.isUndefined()) {
-                ErrorInfo error(Tr::tr("Element at index %1 of list property '%2' is undefined. "
-                                       "String expected.").arg(i).arg(decl.name()), location);
-                makeTypeError(error, v);
-                break;
-            }
-            if (elem.isNull()) {
-                ErrorInfo error(Tr::tr("Element at index %1 of list property '%2' is null. "
-                                       "String expected.").arg(i).arg(decl.name()), location);
-                makeTypeError(error, v);
-                break;
-            }
-            if (!elem.isString()) {
-                ErrorInfo error(Tr::tr("Element at index %1 of list property '%2' does not have "
-                                       "string type.").arg(i).arg(decl.name()), location);
-                makeTypeError(error, v);
-                break;
-            }
-            if (srcDir.isEmpty())
-                continue;
-            elem = v.engine()->toScriptValue(
-                        QDir::cleanPath(FileInfo::resolvePath(srcDir, elem.toString())));
-            v.setProperty(i, elem);
-        }
-        break;
-    }
-    case PropertyDeclaration::VariantList:
-        if (!v.isArray()) {
-            QScriptValue x = v.engine()->newArray(1);
-            x.setProperty(0, v);
-            v = x;
-        }
-        break;
-    }
-}
-
-void EvaluatorScriptClass::convertToPropertyType(const PropertyDeclaration &decl,
-                                                 const CodeLocation &loc, QScriptValue &v)
-{
-    convertToPropertyType_impl(QString(), nullptr, decl, loc, v);
-}
-
-void EvaluatorScriptClass::convertToPropertyType(const Item *item, const PropertyDeclaration& decl,
-                                                 const Value *value, QScriptValue &v)
-{
-    if (value->type() == Value::VariantValueType && v.isUndefined() && !decl.isScalar()) {
-        v = v.engine()->newArray(); // QTBUG-51237
-        return;
-    }
-    convertToPropertyType_impl(m_pathPropertiesBaseDir, item, decl, value->location(), v);
-}
-
-class PropertyStackManager
-{
-public:
-    PropertyStackManager(const Item *itemOfProperty, const QScriptString &name, const Value *value,
-                         std::stack<QualifiedId> &requestedProperties,
-                         PropertyDependencies &propertyDependencies)
-        : m_requestedProperties(requestedProperties)
-    {
-        if (value->type() == Value::JSSourceValueType
-                && (itemOfProperty->type() == ItemType::ModuleInstance
-                    || itemOfProperty->type() == ItemType::Module
-                    || itemOfProperty->type() == ItemType::Export)) {
-            const VariantValueConstPtr varValue
-                    = itemOfProperty->variantProperty(StringConstants::nameProperty());
-            if (!varValue)
-                return;
-            m_stackUpdate = true;
-            const QualifiedId fullPropName
-                    = QualifiedId::fromString(varValue->value().toString()) << name.toString();
-            if (!requestedProperties.empty())
-                propertyDependencies[fullPropName].insert(requestedProperties.top());
-            m_requestedProperties.push(fullPropName);
-        }
-    }
-
-    ~PropertyStackManager()
-    {
-        if (m_stackUpdate)
-            m_requestedProperties.pop();
-    }
-
-private:
-    std::stack<QualifiedId> &m_requestedProperties;
-    bool m_stackUpdate = false;
-};
-
-QScriptValue EvaluatorScriptClass::property(const QScriptValue &object, const QScriptString &name,
-                                            uint id)
-{
-    const bool foundInParent = m_queryResult.foundInParent;
-    const EvaluationData *data = m_queryResult.data;
-    const Item * const itemOfProperty = m_queryResult.itemOfProperty;
-    m_queryResult.foundInParent = false;
-    m_queryResult.data = nullptr;
-    m_queryResult.itemOfProperty = nullptr;
-    QBS_ASSERT(data, {});
-
-    const auto qpt = static_cast<QueryPropertyType>(id);
-    if (qpt == QPTParentProperty) {
-        return data->item->parent()
-                ? data->evaluator->scriptValue(data->item->parent())
-                : engine()->undefinedValue();
-    }
-
-    ValuePtr value;
-    m_queryResult.value.swap(value);
-    QBS_ASSERT(value, return {});
-    QBS_ASSERT(m_queryResult.isNull(), return {});
-
-    if (debugProperties)
-        qDebug() << "[SC] property " << name;
-
-    PropertyStackManager propStackmanager(itemOfProperty, name, value.get(),
-                                          m_requestedProperties, m_propertyDependencies);
-
-    QScriptValue result;
-    if (m_valueCacheEnabled) {
-        result = data->valueCache.value(name);
-        if (result.isValid()) {
-            if (debugProperties)
-                qDebug() << "[SC] cache hit " << name << ": " << resultToString(result);
-            return result;
-        }
-    }
-
-    if (value->next() && !m_currentNextChain.contains(value.get())) {
-        collectValuesFromNextChain(data, &result, name.toString(), value);
-    } else {
-        QScriptValue parentObject;
-        if (foundInParent)
-            parentObject = data->evaluator->scriptValue(data->item->parent());
-        SVConverter converter(this, foundInParent ? &parentObject : &object, value, itemOfProperty,
-                              &name, data, &result);
-        converter.start();
-
-        const PropertyDeclaration decl = data->item->propertyDeclaration(name.toString());
-        convertToPropertyType(data->item, decl, value.get(), result);
-    }
-
-    if (debugProperties)
-        qDebug() << "[SC] cache miss " << name << ": " << resultToString(result);
-    if (m_valueCacheEnabled)
-        data->valueCache.insert(name, result);
-    return result;
-}
-
-class EvaluatorScriptClassPropertyIterator : public QScriptClassPropertyIterator
-{
-public:
-    EvaluatorScriptClassPropertyIterator(const QScriptValue &object, EvaluationData *data)
-        : QScriptClassPropertyIterator(object), m_it(data->item->properties())
-    {
-    }
-
-    bool hasNext() const override
-    {
-        return m_it.hasNext();
-    }
-
-    void next() override
-    {
-        m_it.next();
-    }
-
-    bool hasPrevious() const override
-    {
-        return m_it.hasPrevious();
-    }
-
-    void previous() override
-    {
-        m_it.previous();
-    }
-
-    void toFront() override
-    {
-        m_it.toFront();
-    }
-
-    void toBack() override
-    {
-        m_it.toBack();
-    }
-
-    QScriptString name() const override
-    {
-        return object().engine()->toStringHandle(m_it.key());
-    }
-
-private:
-    QMapIterator<QString, ValuePtr> m_it;
-};
-
-QScriptClassPropertyIterator *EvaluatorScriptClass::newIterator(const QScriptValue &object)
-{
-    auto const data = attachedPointer<EvaluationData>(object);
-    return data ? new EvaluatorScriptClassPropertyIterator(object, data) : nullptr;
-}
-
-void EvaluatorScriptClass::setValueCacheEnabled(bool enabled)
-{
-    m_valueCacheEnabled = enabled;
-}
-
-} // namespace Internal
-} // namespace qbs
diff --git a/src/lib/corelib/language/evaluatorscriptclass.h b/src/lib/corelib/language/evaluatorscriptclass.h
deleted file mode 100755
index c234c17fa..000000000
--- a/src/lib/corelib/language/evaluatorscriptclass.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBS_EVALUATORSCRIPTCLASS_H
-#define QBS_EVALUATORSCRIPTCLASS_H
-
-#include "forward_decls.h"
-#include "qualifiedid.h"
-
-#include <tools/set.h>
-
-#include <QtScript/qscriptclass.h>
-
-#include <stack>
-
-QT_BEGIN_NAMESPACE
-class QScriptContext;
-QT_END_NAMESPACE
-
-namespace qbs {
-namespace Internal {
-class EvaluationData;
-class Item;
-class PropertyDeclaration;
-class ScriptEngine;
-
-class EvaluatorScriptClass : public QScriptClass
-{
-public:
-    EvaluatorScriptClass(ScriptEngine *scriptEngine);
-
-    QueryFlags queryProperty(const QScriptValue &object,
-                             const QScriptString &name,
-                             QueryFlags flags, uint *id) override;
-    QScriptValue property(const QScriptValue &object,
-                          const QScriptString &name, uint id) override;
-    QScriptClassPropertyIterator *newIterator(const QScriptValue &object) override;
-
-    void setValueCacheEnabled(bool enabled);
-
-    void convertToPropertyType(const PropertyDeclaration& decl, const CodeLocation &loc,
-                               QScriptValue &v);
-
-    PropertyDependencies propertyDependencies() const { return m_propertyDependencies; }
-    void clearPropertyDependencies() { m_propertyDependencies.clear(); }
-
-    void setPathPropertiesBaseDir(const QString &dirPath) { m_pathPropertiesBaseDir = dirPath; }
-    void clearPathPropertiesBaseDir() { m_pathPropertiesBaseDir.clear(); }
-
-private:
-    QueryFlags queryItemProperty(const EvaluationData *data,
-                                 const QString &name,
-                                 bool ignoreParent = false);
-    static QString resultToString(const QScriptValue &scriptValue);
-    void collectValuesFromNextChain(const EvaluationData *data, QScriptValue *result, const QString &propertyName, const ValuePtr &value);
-
-    void convertToPropertyType(const Item *item,
-                               const PropertyDeclaration& decl, const Value *value,
-                               QScriptValue &v);
-
-    struct QueryResult
-    {
-        QueryResult()
-            : data(nullptr), itemOfProperty(nullptr)
-        {}
-
-        bool isNull() const
-        {
-            static const QueryResult pristine;
-            return *this == pristine;
-        }
-
-        bool operator==(const QueryResult &rhs) const
-        {
-            return foundInParent == rhs.foundInParent
-                    && data == rhs.data
-                    && itemOfProperty == rhs.itemOfProperty
-                    && value == rhs.value;
-        }
-
-        bool foundInParent = false;
-        const EvaluationData *data;
-        const Item *itemOfProperty;     // The item that owns the property.
-        ValuePtr value;
-    };
-    QueryResult m_queryResult;
-    bool m_valueCacheEnabled;
-    Set<Value *> m_currentNextChain;
-    PropertyDependencies m_propertyDependencies;
-    std::stack<QualifiedId> m_requestedProperties;
-    QString m_pathPropertiesBaseDir;
-};
-
-} // namespace Internal
-} // namespace qbs
-
-#endif // QBS_EVALUATORSCRIPTCLASS_H
diff --git a/src/lib/corelib/language/forward_decls.h b/src/lib/corelib/language/forward_decls.h
index 6697ac8c9..6ee22a5a6 100644
--- a/src/lib/corelib/language/forward_decls.h
+++ b/src/lib/corelib/language/forward_decls.h
@@ -142,12 +142,14 @@ class PersistentPool;
 } // namespace qbs
 
 #ifdef QT_CORE_LIB
+#include "../tools/porting.h"
+
 #include <QtCore/qhash.h>
 
 namespace qbs {
 namespace Internal {
 
-template <typename T> inline static uint qHash(const std::shared_ptr<T> &p, uint seed = 0)
+template <typename T> inline static QHashValueType qHash(const std::shared_ptr<T> &p, QHashValueType seed = 0)
 {
     return ::qHash(p.get(), seed);
 }
diff --git a/src/lib/corelib/language/item.cpp b/src/lib/corelib/language/item.cpp
index 2f23de210..e5de8f195 100644
--- a/src/lib/corelib/language/item.cpp
+++ b/src/lib/corelib/language/item.cpp
@@ -40,13 +40,14 @@
 #include "item.h"
 
 #include "builtindeclarations.h"
-#include "deprecationinfo.h"
 #include "filecontext.h"
 #include "itemobserver.h"
 #include "itempool.h"
 #include "value.h"
 
 #include <api/languageinfo.h>
+#include <loader/loaderutils.h>
+#include <logging/categories.h>
 #include <logging/logger.h>
 #include <logging/translator.h>
 #include <tools/error.h>
@@ -59,27 +60,19 @@
 namespace qbs {
 namespace Internal {
 
-Item::Item(ItemPool *pool, ItemType type)
-    : m_pool(pool)
-    , m_observer(nullptr)
-    , m_prototype(nullptr)
-    , m_scope(nullptr)
-    , m_outerItem(nullptr)
-    , m_parent(nullptr)
-    , m_type(type)
-{
-}
-
 Item *Item::create(ItemPool *pool, ItemType type)
 {
     return pool->allocateItem(type);
 }
 
-Item *Item::clone() const
+Item *Item::clone(ItemPool &pool) const
 {
-    Item *dup = create(pool(), type());
+    assertModuleLocked();
+
+    Item *dup = create(&pool, type());
     dup->m_id = m_id;
     dup->m_location = m_location;
+    dup->m_endPosition = m_endPosition;
     dup->m_prototype = m_prototype;
     dup->m_scope = m_scope;
     dup->m_outerItem = m_outerItem;
@@ -89,25 +82,34 @@ Item *Item::clone() const
     dup->m_modules = m_modules;
 
     dup->m_children.reserve(m_children.size());
-    for (const Item * const child : qAsConst(m_children)) {
-        Item *clonedChild = child->clone();
+    for (const Item * const child : std::as_const(m_children)) {
+        Item *clonedChild = child->clone(pool);
         clonedChild->m_parent = dup;
         dup->m_children.push_back(clonedChild);
     }
 
     for (PropertyMap::const_iterator it = m_properties.constBegin(); it != m_properties.constEnd();
          ++it) {
-        dup->m_properties.insert(it.key(), it.value()->clone());
+        dup->m_properties.insert(it.key(), it.value()->clone(pool));
     }
 
     return dup;
 }
 
+Item *Item::rootPrototype()
+{
+    Item *proto = this;
+    while (proto->prototype())
+        proto = proto->prototype();
+    return proto;
+}
+
 QString Item::typeName() const
 {
     switch (type()) {
     case ItemType::IdScope: return QStringLiteral("[IdScope]");
     case ItemType::ModuleInstance: return QStringLiteral("[ModuleInstance]");
+    case ItemType::ModuleInstancePlaceholder: return QStringLiteral("[ModuleInstancePlaceholder]");
     case ItemType::ModuleParameters: return QStringLiteral("[ModuleParametersInstance]");
     case ItemType::ModulePrefix: return QStringLiteral("[ModulePrefix]");
     case ItemType::Outer: return QStringLiteral("[Outer]");
@@ -118,6 +120,7 @@ QString Item::typeName() const
 
 bool Item::hasProperty(const QString &name) const
 {
+    assertModuleLocked();
     const Item *item = this;
     do {
         if (item->m_properties.contains(name))
@@ -129,15 +132,18 @@ bool Item::hasProperty(const QString &name) const
 
 bool Item::hasOwnProperty(const QString &name) const
 {
+    assertModuleLocked();
     return m_properties.contains(name);
 }
 
 ValuePtr Item::property(const QString &name) const
 {
+    assertModuleLocked();
     ValuePtr value;
     const Item *item = this;
     do {
-        if ((value = item->m_properties.value(name)))
+        value = item->m_properties.value(name);
+        if (value)
             break;
         item = item->m_prototype;
     } while (item);
@@ -146,30 +152,31 @@ ValuePtr Item::property(const QString &name) const
 
 ValuePtr Item::ownProperty(const QString &name) const
 {
+    assertModuleLocked();
     return m_properties.value(name);
 }
 
-ItemValuePtr Item::itemProperty(const QString &name, const Item *itemTemplate)
+ItemValuePtr Item::itemProperty(const QString &name, ItemPool &pool, const Item *itemTemplate)
 {
-    return itemProperty(name, itemTemplate, ItemValueConstPtr());
+    return itemProperty(name, itemTemplate, ItemValueConstPtr(), pool);
 }
 
-ItemValuePtr Item::itemProperty(const QString &name, const ItemValueConstPtr &value)
+ItemValuePtr Item::itemProperty(const QString &name, const ItemValueConstPtr &value, ItemPool &pool)
 {
-    return itemProperty(name, value->item(), value);
+    return itemProperty(name, value->item(), value, pool);
 }
 
 ItemValuePtr Item::itemProperty(const QString &name, const Item *itemTemplate,
-                                const ItemValueConstPtr &itemValue)
+                                const ItemValueConstPtr &itemValue, ItemPool &pool)
 {
     const ValuePtr v = property(name);
     if (v && v->type() == Value::ItemValueType)
         return std::static_pointer_cast<ItemValue>(v);
     if (!itemTemplate)
-        return ItemValuePtr();
+        return {};
     const bool createdByPropertiesBlock = itemValue && itemValue->createdByPropertiesBlock();
-    const ItemValuePtr result = ItemValue::create(Item::create(m_pool, itemTemplate->type()),
-                                                 createdByPropertiesBlock);
+    ItemValuePtr result = ItemValue::create(Item::create(&pool, itemTemplate->type()),
+                                            createdByPropertiesBlock);
     setProperty(name, result);
     return result;
 }
@@ -178,7 +185,7 @@ JSSourceValuePtr Item::sourceProperty(const QString &name) const
 {
     ValuePtr v = property(name);
     if (!v || v->type() != Value::JSSourceValueType)
-        return JSSourceValuePtr();
+        return {};
     return std::static_pointer_cast<JSSourceValue>(v);
 }
 
@@ -186,7 +193,7 @@ VariantValuePtr Item::variantProperty(const QString &name) const
 {
     ValuePtr v = property(name);
     if (!v || v->type() != Value::VariantValueType)
-        return VariantValuePtr();
+        return {};
     return std::static_pointer_cast<VariantValue>(v);
 }
 
@@ -201,6 +208,28 @@ bool Item::isOfTypeOrhasParentOfType(ItemType type) const
     return false;
 }
 
+void Item::addObserver(ItemObserver *observer) const
+{
+    // Cached Module properties never change.
+    if (m_type == ItemType::Module)
+        return;
+
+    std::lock_guard lock(m_observersMutex);
+    if (!qEnvironmentVariableIsEmpty("QBS_SANITY_CHECKS"))
+        QBS_CHECK(!contains(m_observers, observer));
+    m_observers << observer;
+}
+
+void Item::removeObserver(ItemObserver *observer) const
+{
+    if (m_type == ItemType::Module)
+        return;
+    std::lock_guard lock(m_observersMutex);
+    const auto it = std::find(m_observers.begin(), m_observers.end(), observer);
+    QBS_CHECK(it != m_observers.end());
+    m_observers.erase(it);
+}
+
 PropertyDeclaration Item::propertyDeclaration(const QString &name, bool allowExpired) const
 {
     auto it = m_propertyDeclarations.find(name);
@@ -216,22 +245,32 @@ PropertyDeclaration Item::propertyDeclaration(const QString &name, bool allowExp
 
 void Item::addModule(const Item::Module &module)
 {
-    const auto it = std::lower_bound(m_modules.begin(), m_modules.end(), module);
-    QBS_CHECK(it == m_modules.end() || (module.name != it->name && module.item != it->item));
-    m_modules.insert(it, module);
-}
+    if (!qEnvironmentVariableIsEmpty("QBS_SANITY_CHECKS")) {
+        QBS_CHECK(none_of(m_modules, [&](const Module &m) {
+            if (m.name != module.name)
+                return false;
+            if (!!module.product != !!m.product)
+                return true;
+            if (!module.product)
+                return true;
+            if (module.product->multiplexConfigurationId == m.product->multiplexConfigurationId
+                    && module.product->profileName == m.product->profileName) {
+                return true;
+            }
+            return false;
+        }));
+    }
 
-void Item::setObserver(ItemObserver *observer) const
-{
-    QBS_ASSERT(!observer || !m_observer, return);   // warn if accidentally overwritten
-    m_observer = observer;
+    m_modules.push_back(module);
 }
 
 void Item::setProperty(const QString &name, const ValuePtr &value)
 {
+    assertModuleLocked();
     m_properties.insert(name, value);
-    if (m_observer)
-        m_observer->onItemPropertyChanged(this);
+    std::lock_guard lock(m_observersMutex);
+    for (ItemObserver * const observer : m_observers)
+        observer->onItemPropertyChanged(this);
 }
 
 void Item::dump() const
@@ -246,8 +285,14 @@ bool Item::isPresentModule() const
     return v && v->type() == Value::JSSourceValueType;
 }
 
-void Item::setupForBuiltinType(Logger &logger)
+bool Item::isFallbackModule() const
 {
+    return hasProperty(QLatin1String("__fallback"));
+}
+
+void Item::setupForBuiltinType(DeprecationWarningMode deprecationMode, Logger &logger)
+{
+    assertModuleLocked();
     const BuiltinDeclarations &builtins = BuiltinDeclarations::instance();
     const auto properties = builtins.declarationsForType(type()).properties();
     for (const PropertyDeclaration &pd : properties) {
@@ -263,23 +308,9 @@ void Item::setupForBuiltinType(Logger &logger)
                                        ? StringConstants::undefinedValue()
                                        : pd.initialValueSource());
             m_properties.insert(pd.name(), sourceValue);
-        } else if (pd.isDeprecated()) {
-            const DeprecationInfo &di = pd.deprecationInfo();
-            if (di.removalVersion() <= LanguageInfo::qbsVersion()) {
-                QString message = Tr::tr("The property '%1' is no longer valid for %2 items. "
-                        "It was removed in qbs %3.")
-                        .arg(pd.name(), typeName(), di.removalVersion().toString());
-                ErrorInfo error(message, value->location());
-                if (!di.additionalUserInfo().isEmpty())
-                    error.append(di.additionalUserInfo());
-                throw error;
-            }
-            QString warning = Tr::tr("The property '%1' is deprecated and will be removed in "
-                                     "qbs %2.").arg(pd.name(), di.removalVersion().toString());
-            ErrorInfo error(warning, value->location());
-            if (!di.additionalUserInfo().isEmpty())
-                error.append(di.additionalUserInfo());
-            logger.printWarning(error);
+        } else if (ErrorInfo error = pd.checkForDeprecation(deprecationMode, value->location(),
+                                                            logger); error.hasError()) {
+            throw error;
         }
     }
 }
@@ -289,6 +320,15 @@ void Item::copyProperty(const QString &propertyName, Item *target) const
     target->setProperty(propertyName, property(propertyName));
 }
 
+void Item::overrideProperties(const QVariantMap &config, const QString &key,
+                              const SetupProjectParameters &parameters, Logger &logger)
+{
+    const QVariant configMap = config.value(key);
+    if (configMap.isNull())
+        return;
+    overrideProperties(configMap.toMap(), QualifiedId(key), parameters, logger);
+}
+
 static const char *valueType(const Value *v)
 {
     switch (v->type()) {
@@ -326,7 +366,7 @@ void Item::dump(int indentation) const
     }
     if (!m_children.empty())
         qDebug("%schildren:", indent.constData());
-    for (const Item * const child : qAsConst(m_children))
+    for (const Item * const child : std::as_const(m_children))
         child->dump(indentation + 4);
     if (prototype()) {
         qDebug("%sprototype:", indent.constData());
@@ -334,8 +374,39 @@ void Item::dump(int indentation) const
     }
 }
 
+void Item::lockModule() const
+{
+    QBS_CHECK(m_type == ItemType::Module);
+    m_moduleMutex.lock();
+#ifndef NDEBUG
+    QBS_CHECK(!m_moduleLocked);
+    m_moduleLocked = true;
+#endif
+}
+
+void Item::unlockModule() const
+{
+    QBS_CHECK(m_type == ItemType::Module);
+#ifndef NDEBUG
+    QBS_CHECK(m_moduleLocked);
+    m_moduleLocked = false;
+#endif
+    m_moduleMutex.unlock();
+}
+
+// This safeguard verifies that all contexts which access Module properties have really
+// acquired the lock via ModuleItemLocker, as they must.
+void Item::assertModuleLocked() const
+{
+#ifndef NDEBUG
+    if (m_type == ItemType::Module)
+        QBS_CHECK(m_moduleLocked);
+#endif
+}
+
 void Item::removeProperty(const QString &name)
 {
+    assertModuleLocked();
     m_properties.remove(name);
 }
 
@@ -404,10 +475,43 @@ void Item::overrideProperties(
             handlePropertyError(error, parameters, logger);
             continue;
         }
-        setProperty(it.key(),
-                VariantValue::create(PropertyDeclaration::convertToPropertyType(
-                        it.value(), decl.type(), namePrefix, it.key())));
+        const auto overridenValue = VariantValue::create(PropertyDeclaration::convertToPropertyType(
+            it.value(), decl.type(), namePrefix, it.key()));
+        overridenValue->markAsSetByCommandLine();
+        setProperty(it.key(), overridenValue);
+    }
+}
+
+void Item::setModules(const Modules &modules)
+{
+    m_modules = modules;
+}
+
+Item *createNonPresentModule(ItemPool &pool, const QString &name, const QString &reason, Item *module)
+{
+    qCDebug(lcModuleLoader) << "Non-required module '" << name << "' not loaded (" << reason << ")."
+                            << "Creating dummy module for presence check.";
+    if (!module) {
+        module = Item::create(&pool, ItemType::ModuleInstance);
+        module->setFile(FileContext::create());
+        module->setProperty(StringConstants::nameProperty(), VariantValue::create(name));
     }
+    module->setType(ItemType::ModuleInstance);
+    module->setProperty(StringConstants::presentProperty(), VariantValue::falseValue());
+    return module;
+}
+
+void setScopeForDescendants(Item *item, Item *scope)
+{
+    for (Item * const child : item->children()) {
+        child->setScope(scope);
+        setScopeForDescendants(child, scope);
+    }
+}
+
+CodeRange Item::codeRange() const
+{
+    return {{m_location.line(), m_location.column()}, m_endPosition};
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/language/item.h b/src/lib/corelib/language/item.h
index 22cf6b810..d0dde98c4 100644
--- a/src/lib/corelib/language/item.h
+++ b/src/lib/corelib/language/item.h
@@ -46,12 +46,16 @@
 #include "qualifiedid.h"
 #include <parser/qmljsmemorypool_p.h>
 #include <tools/codelocation.h>
+#include <tools/deprecationwarningmode.h>
 #include <tools/error.h>
 #include <tools/version.h>
 
 #include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
 
+#include <atomic>
+#include <mutex>
+#include <utility>
 #include <vector>
 
 namespace qbs {
@@ -62,55 +66,87 @@ namespace Internal {
 class ItemObserver;
 class ItemPool;
 class Logger;
+class ModuleItemLocker;
+class ProductContext;
 
 class QBS_AUTOTEST_EXPORT Item : public QbsQmlJS::Managed
 {
     friend class ASTPropertiesItemHandler;
     friend class ItemPool;
     friend class ItemReaderASTVisitor;
+    friend class ModuleItemLocker;
     Q_DISABLE_COPY(Item)
-    Item(ItemPool *pool, ItemType type);
+    Item(ItemType type) : m_type(type) {}
 
 public:
     struct Module
     {
-        Module()
-            : item(nullptr), isProduct(false), required(true)
-        {}
-
         QualifiedId name;
-        Item *item;
-        bool isProduct;
-        bool requiredValue = true; // base value of the required prop
-        bool required;
-        bool fallbackEnabled = true;
+        Item *item = nullptr;
+        ProductContext *product = nullptr; // Set if and only if the dep is a product.
+
+        // All the sites that declared an explicit dependency on this module. Can contain any
+        // number of module instances and at most one product.
+        using ParametersWithPriority = std::pair<QVariantMap, int>;
+        struct LoadContext {
+            LoadContext(Item *dependsItem,
+                        const ParametersWithPriority &parameters)
+                : dependsItem(dependsItem), parameters(parameters) {}
+            LoadContext(Item *dependsItem, ParametersWithPriority &&parameters)
+                : dependsItem(dependsItem), parameters(std::move(parameters)) {}
+
+            LoadContext(const LoadContext &) = default;
+            LoadContext(LoadContext &&) = default;
+            LoadContext &operator=(const LoadContext &) = default;
+            LoadContext &operator=(LoadContext &&) = default;
+
+            Item *loadingItem() const { return dependsItem ? dependsItem->parent() : nullptr; }
+            Item *dependsItem;
+            ParametersWithPriority parameters;
+        };
+        std::vector<LoadContext> loadContexts;
+
         QVariantMap parameters;
         VersionRange versionRange;
+
+        // The shorter this value, the "closer to the product" we consider the module,
+        // and the higher its precedence is when merging property values.
+        int maxDependsChainLength = 0;
+
+        bool required = true;
     };
     using Modules = std::vector<Module>;
     using PropertyDeclarationMap = QMap<QString, PropertyDeclaration>;
     using PropertyMap = QMap<QString, ValuePtr>;
 
     static Item *create(ItemPool *pool, ItemType type);
-    Item *clone() const;
-    ItemPool *pool() const { return m_pool; }
+    Item *clone(ItemPool &pool) const;
 
     const QString &id() const { return m_id; }
     const CodeLocation &location() const { return m_location; }
+    CodeRange codeRange() const;
     Item *prototype() const { return m_prototype; }
+    Item *rootPrototype();
     Item *scope() const { return m_scope; }
     Item *outerItem() const { return m_outerItem; }
     Item *parent() const { return m_parent; }
     const FileContextPtr &file() const { return m_file; }
     const QList<Item *> &children() const { return m_children; }
+    QList<Item *> &children() { return m_children; }
     Item *child(ItemType type, bool checkForMultiple = true) const;
-    const PropertyMap &properties() const { return m_properties; }
+    const PropertyMap &properties() const { assertModuleLocked(); return m_properties; }
+    PropertyMap &properties() { assertModuleLocked(); return m_properties; }
     const PropertyDeclarationMap &propertyDeclarations() const { return m_propertyDeclarations; }
     PropertyDeclaration propertyDeclaration(const QString &name, bool allowExpired = true) const;
+
+    // The list of modules is ordered such that dependencies appear before the modules
+    // depending on them.
     const Modules &modules() const { return m_modules; }
+    Modules &modules() { return m_modules; }
+
     void addModule(const Module &module);
     void removeModules() { m_modules.clear(); }
-    void setModules(const Modules &modules) { m_modules = modules; }
+    void setModules(const Modules &modules);
 
     ItemType type() const { return m_type; }
     void setType(ItemType type) { m_type = type; }
@@ -120,18 +156,20 @@ public:
     bool hasOwnProperty(const QString &name) const;
     ValuePtr property(const QString &name) const;
     ValuePtr ownProperty(const QString &name) const;
-    ItemValuePtr itemProperty(const QString &name, const Item *itemTemplate = nullptr);
-    ItemValuePtr itemProperty(const QString &name, const ItemValueConstPtr &value);
+    ItemValuePtr itemProperty(const QString &name, ItemPool &pool, const Item *itemTemplate = nullptr);
+    ItemValuePtr itemProperty(const QString &name, const ItemValueConstPtr &value, ItemPool &pool);
     JSSourceValuePtr sourceProperty(const QString &name) const;
     VariantValuePtr variantProperty(const QString &name) const;
     bool isOfTypeOrhasParentOfType(ItemType type) const;
-    void setObserver(ItemObserver *observer) const;
+    void addObserver(ItemObserver *observer) const;
+    void removeObserver(ItemObserver *observer) const;
     void setProperty(const QString &name, const ValuePtr &value);
-    void setProperties(const PropertyMap &props) { m_properties = props; }
+    void setProperties(const PropertyMap &props) { assertModuleLocked(); m_properties = props; }
     void removeProperty(const QString &name);
     void setPropertyDeclaration(const QString &name, const PropertyDeclaration &declaration);
     void setPropertyDeclarations(const PropertyDeclarationMap &decls);
     void setLocation(const CodeLocation &location) { m_location = location; }
+    void setEndPosition(const CodePosition &position) { m_endPosition = position; }
     void setPrototype(Item *prototype) { m_prototype = prototype; }
     void setFile(const FileContextPtr &file) { m_file = file; }
     void setId(const QString &id) { m_id = id; }
@@ -144,28 +182,39 @@ public:
     static void removeChild(Item *parent, Item *child);
     void dump() const;
     bool isPresentModule() const;
-    void setupForBuiltinType(Logger &logger);
+    bool isFallbackModule() const;
+    void setupForBuiltinType(DeprecationWarningMode deprecationMode, Logger &logger);
     void copyProperty(const QString &propertyName, Item *target) const;
     void overrideProperties(
         const QVariantMap &config,
+        const QString &key,
+        const SetupProjectParameters &parameters,
+        Logger &logger);
+    void overrideProperties(
+        const QVariantMap &config,
         const QualifiedId &namePrefix,
         const SetupProjectParameters &parameters,
         Logger &logger);
 
 private:
     ItemValuePtr itemProperty(const QString &name, const Item *itemTemplate,
-                              const ItemValueConstPtr &itemValue);
+                              const ItemValueConstPtr &itemValue, ItemPool &pool);
 
     void dump(int indentation) const;
 
-    ItemPool *m_pool;
-    mutable ItemObserver *m_observer;
+    void lockModule() const;
+    void unlockModule() const;
+    void assertModuleLocked() const;
+
+    mutable std::vector<ItemObserver *> m_observers;
+    mutable std::mutex m_observersMutex;
     QString m_id;
     CodeLocation m_location;
-    Item *m_prototype;
-    Item *m_scope;
-    Item *m_outerItem;
-    Item *m_parent;
+    CodePosition m_endPosition;
+    Item *m_prototype = nullptr;
+    Item *m_scope = nullptr;
+    Item *m_outerItem = nullptr;
+    Item *m_parent = nullptr;
     QList<Item *> m_children;
     FileContextPtr m_file;
     PropertyMap m_properties;
@@ -173,10 +222,34 @@ private:
     PropertyDeclarationMap m_expiredPropertyDeclarations;
     Modules m_modules;
     ItemType m_type;
+    mutable std::mutex m_moduleMutex;
+#ifndef NDEBUG
+    mutable std::atomic_bool m_moduleLocked = false;
+#endif
 };
 
 inline bool operator<(const Item::Module &m1, const Item::Module &m2) { return m1.name < m2.name; }
 
+Item *createNonPresentModule(ItemPool &pool, const QString &name, const QString &reason,
+                             Item *module);
+void setScopeForDescendants(Item *item, Item *scope);
+
+// This mechanism is needed because Module items are shared between products (not doing so
+// would be prohibitively expensive).
+// The competing accesses are between
+//  - Attaching a temporary qbs module for evaluating the Module condition.
+//  - Cloning the module when creating an instance.
+//  - Directly accessing Module properties, which happens rarely (as opposed to properties of
+//    an instance).
+class ModuleItemLocker
+{
+public:
+    ModuleItemLocker(const Item &item) : m_item(item) { item.lockModule(); }
+    ~ModuleItemLocker() { m_item.unlockModule(); }
+private:
+    const Item &m_item;
+};
+
 } // namespace Internal
 } // namespace qbs
 
diff --git a/src/lib/corelib/language/itemdeclaration.cpp b/src/lib/corelib/language/itemdeclaration.cpp
index d7230e9d6..eb9fd84a6 100644
--- a/src/lib/corelib/language/itemdeclaration.cpp
+++ b/src/lib/corelib/language/itemdeclaration.cpp
@@ -60,5 +60,11 @@ bool ItemDeclaration::isChildTypeAllowed(ItemType type) const
     return m_allowedChildTypes.contains(type);
 }
 
+ErrorInfo ItemDeclaration::checkForDeprecation(DeprecationWarningMode mode, const QString &name,
+                                               const CodeLocation &loc, Logger &logger) const
+{
+    return deprecationInfo().checkForDeprecation(mode, name, loc, true, logger);
+}
+
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/language/itemdeclaration.h b/src/lib/corelib/language/itemdeclaration.h
index 6da699d28..1fbd7e456 100644
--- a/src/lib/corelib/language/itemdeclaration.h
+++ b/src/lib/corelib/language/itemdeclaration.h
@@ -71,6 +71,9 @@ public:
     const TypeNames &allowedChildTypes() const { return m_allowedChildTypes; }
     bool isChildTypeAllowed(ItemType type) const;
 
+    ErrorInfo checkForDeprecation(DeprecationWarningMode mode, const QString &name,
+                                  const CodeLocation &loc, Logger &logger) const;
+
 private:
     ItemType m_type;
     Properties m_properties;
diff --git a/src/lib/corelib/language/itempool.cpp b/src/lib/corelib/language/itempool.cpp
index ccd22fe2e..6552f92ef 100644
--- a/src/lib/corelib/language/itempool.cpp
+++ b/src/lib/corelib/language/itempool.cpp
@@ -53,7 +53,7 @@ ItemPool::~ItemPool()
 
 Item *ItemPool::allocateItem(const ItemType &type)
 {
-    const auto item = new (&m_pool) Item(this, type);
+    const auto item = new (&m_pool) Item(type);
     m_items.push_back(item);
     return item;
 }
diff --git a/src/lib/corelib/language/itemreader.cpp b/src/lib/corelib/language/itemreader.cpp
deleted file mode 100644
index afa768a06..000000000
--- a/src/lib/corelib/language/itemreader.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "itemreader.h"
-
-#include "itemreadervisitorstate.h"
-
-#include <tools/profiling.h>
-
-#include <QtCore/qfileinfo.h>
-
-#include <algorithm>
-
-namespace qbs {
-namespace Internal {
-
-static void makePathsCanonical(QStringList &paths)
-{
-    auto it = std::remove_if(paths.begin(), paths.end(), [](QString &p) {
-        p = QFileInfo(p).canonicalFilePath();
-        return p.isEmpty();
-    });
-    auto e = paths.end();
-    if (it != e)
-        paths.erase(it, e);
-}
-
-ItemReader::ItemReader(Logger &logger)
-    : m_visitorState(std::make_unique<ItemReaderVisitorState>(logger))
-{
-}
-
-ItemReader::~ItemReader() = default;
-
-void ItemReader::setSearchPaths(const QStringList &searchPaths)
-{
-    m_searchPaths = searchPaths;
-    makePathsCanonical(m_searchPaths);
-    m_allSearchPaths.clear();
-}
-
-void ItemReader::pushExtraSearchPaths(const QStringList &extraSearchPaths)
-{
-    m_extraSearchPaths.push_back(extraSearchPaths);
-    makePathsCanonical(m_extraSearchPaths.back());
-    m_allSearchPaths.clear();
-}
-
-void ItemReader::popExtraSearchPaths()
-{
-    m_extraSearchPaths.pop_back();
-    m_allSearchPaths.clear();
-}
-
-const std::vector<QStringList> &ItemReader::extraSearchPathsStack() const
-{
-    return m_extraSearchPaths;
-}
-
-void ItemReader::setExtraSearchPathsStack(const std::vector<QStringList> &s)
-{
-    m_extraSearchPaths = s;
-    m_allSearchPaths.clear();
-}
-
-void ItemReader::clearExtraSearchPathsStack()
-{
-    m_extraSearchPaths.clear();
-    m_allSearchPaths.clear();
-}
-
-const QStringList &ItemReader::allSearchPaths() const
-{
-    if (m_allSearchPaths.empty()) {
-        std::for_each(m_extraSearchPaths.crbegin(), m_extraSearchPaths.crend(),
-                      [this] (const QStringList &paths) {
-            m_allSearchPaths += paths;
-        });
-        m_allSearchPaths += m_searchPaths;
-        m_allSearchPaths.removeDuplicates();
-    }
-    return m_allSearchPaths;
-}
-
-Item *ItemReader::readFile(const QString &filePath)
-{
-    AccumulatingTimer readFileTimer(m_elapsedTime != -1 ? &m_elapsedTime : nullptr);
-    return m_visitorState->readFile(filePath, allSearchPaths(), m_pool);
-}
-
-Item *ItemReader::readFile(const QString &filePath, const CodeLocation &referencingLocation)
-{
-    try {
-        return readFile(filePath);
-    } catch (const ErrorInfo &e) {
-        if (e.hasLocation())
-            throw;
-        throw ErrorInfo(e.toString(), referencingLocation);
-    }
-}
-
-Set<QString> ItemReader::filesRead() const
-{
-    return m_visitorState->filesRead();
-}
-
-void ItemReader::setEnableTiming(bool on)
-{
-    m_elapsedTime = on ? 0 : -1;
-}
-
-} // namespace Internal
-} // namespace qbs
diff --git a/src/lib/corelib/language/itemtype.h b/src/lib/corelib/language/itemtype.h
index 724666cb4..7e9900a5b 100644
--- a/src/lib/corelib/language/itemtype.h
+++ b/src/lib/corelib/language/itemtype.h
@@ -74,6 +74,7 @@ enum class ItemType {
     // Internal items created mainly by the module loader.
     IdScope,
     ModuleInstance,
+    ModuleInstancePlaceholder,
     ModuleParameters,
     ModulePrefix,
     Outer,
@@ -82,7 +83,7 @@ enum class ItemType {
     Unknown
 };
 
-inline uint qHash(ItemType t) { return QT_PREPEND_NAMESPACE(qHash)(uint(t)); }
+inline auto qHash(ItemType t) { return QT_PREPEND_NAMESPACE(qHash)(uint(t)); }
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/language/jsimports.h b/src/lib/corelib/language/jsimports.h
index a892e0ec0..a4a045f2b 100644
--- a/src/lib/corelib/language/jsimports.h
+++ b/src/lib/corelib/language/jsimports.h
@@ -71,7 +71,7 @@ public:
         pool.serializationOp<opType>(scopeName, filePaths, location);
     }
 };
-inline uint qHash(const JsImport &jsi) { return qHash(jsi.scopeName); }
+inline auto qHash(const JsImport &jsi) { return qHash(jsi.scopeName); }
 
 inline bool operator<(const JsImport &lhs, const JsImport &rhs)
 {
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index f0b6d3e27..b3f4b2a64 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -51,15 +51,19 @@
 #include <buildgraph/rulegraph.h> // TODO: Move to language?
 #include <buildgraph/transformer.h>
 #include <jsextensions/jsextensions.h>
+#include <language/value.h>
+#include <loader/loaderutils.h>
 #include <logging/categories.h>
 #include <logging/translator.h>
 #include <tools/buildgraphlocker.h>
 #include <tools/hostosinfo.h>
 #include <tools/error.h>
 #include <tools/fileinfo.h>
-#include <tools/scripttools.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
+#include <tools/scripttools.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qcryptographichash.h>
@@ -67,8 +71,6 @@
 #include <QtCore/qdiriterator.h>
 #include <QtCore/qmap.h>
 
-#include <QtScript/qscriptvalue.h>
-
 #include <algorithm>
 #include <memory>
 #include <mutex>
@@ -113,9 +115,15 @@ bool Probe::needsReconfigure(const FileTime &referenceTime) const
         FileInfo fi(filePath);
         return !fi.exists() || fi.lastModified() > referenceTime;
     };
-    return std::any_of(m_importedFilesUsed.cbegin(), m_importedFilesUsed.cend(), criterion);
+    return Internal::any_of(m_importedFilesUsed, criterion);
 }
 
+void Probe::restoreValues()
+{
+    for (auto it = m_properties.begin(), end = m_properties.end(); it != end; ++it) {
+        m_values[it.key()] = VariantValue::createStored(it.value());
+    }
+}
 
 /*!
  * \class SourceArtifact
@@ -136,41 +144,16 @@ bool Probe::needsReconfigure(const FileTime &referenceTime) const
  /*!
   * \variable ResolvedGroup::files
   * \brief The files listed in the group item's "files" binding.
-  * Note that these do not include expanded wildcards.
   */
 
 /*!
  * \variable ResolvedGroup::wildcards
- * \brief Represents the wildcard elements in this group's "files" binding.
+ * \brief Represents the wildcard patterns in this group's "files" binding.
  *  If no wildcards are specified there, this variable is null.
  * \sa SourceWildCards
  */
 
 /*!
- * \brief Returns all files specified in the group item as source artifacts.
- * This includes the expanded list of wildcards.
- */
-std::vector<SourceArtifactPtr> ResolvedGroup::allFiles() const
-{
-    std::vector<SourceArtifactPtr> lst = files;
-    if (wildcards)
-        lst << wildcards->files;
-    return lst;
-}
-
-void ResolvedGroup::load(PersistentPool &pool)
-{
-    serializationOp<PersistentPool::Load>(pool);
-    if (wildcards)
-        wildcards->group = this;
-}
-
-void ResolvedGroup::store(PersistentPool &pool)
-{
-    serializationOp<PersistentPool::Store>(pool);
-}
-
-/*!
  * \class RuleArtifact
  * \brief The \c RuleArtifact class represents an Artifact item encountered in the context
  *        of a Rule item.
@@ -312,7 +295,7 @@ void ResolvedProduct::accept(BuildGraphVisitor *visitor) const
 {
     if (!buildData)
         return;
-    for (BuildGraphNode * const node : qAsConst(buildData->rootNodes()))
+    for (BuildGraphNode * const node : std::as_const(buildData->rootNodes()))
         node->accept(visitor);
 }
 
@@ -324,7 +307,7 @@ std::vector<SourceArtifactPtr> ResolvedProduct::allFiles() const
 {
     std::vector<SourceArtifactPtr> lst;
     for (const auto &group : groups)
-        lst << group->allFiles();
+        lst << group->files;
     return lst;
 }
 
@@ -337,7 +320,7 @@ std::vector<SourceArtifactPtr> ResolvedProduct::allEnabledFiles() const
     std::vector<SourceArtifactPtr> lst;
     for (const auto &group : groups) {
         if (group->enabled)
-            lst << group->allFiles();
+            lst << group->files;
     }
     return lst;
 }
@@ -346,7 +329,7 @@ FileTags ResolvedProduct::fileTagsForFileName(const QString &fileName) const
 {
     FileTags result;
     std::unique_ptr<int> priority;
-    for (const FileTaggerConstPtr &tagger : qAsConst(fileTaggers)) {
+    for (const FileTaggerConstPtr &tagger : std::as_const(fileTaggers)) {
         for (const QRegularExpression &pattern : tagger->patterns()) {
             if (pattern.match(fileName).hasMatch()) {
                 if (priority) {
@@ -373,6 +356,8 @@ void ResolvedProduct::load(PersistentPool &pool)
         rule->product = this;
     for (const ResolvedModulePtr &module : modules)
         module->product = this;
+    for (const auto &group: groups)
+        group->restoreWildcards(buildDirectory());
 }
 
 void ResolvedProduct::store(PersistentPool &pool)
@@ -424,18 +409,9 @@ QString ResolvedProduct::uniqueName() const
     return uniqueName(name, multiplexConfigurationId);
 }
 
-QString ResolvedProduct::fullDisplayName(const QString &name,
-                                         const QString &multiplexConfigurationId)
-{
-    QString result = name;
-    if (!multiplexConfigurationId.isEmpty())
-        result.append(QLatin1Char(' ')).append(multiplexIdToString(multiplexConfigurationId));
-    return result;
-}
-
 QString ResolvedProduct::fullDisplayName() const
 {
-    return fullDisplayName(name, multiplexConfigurationId);
+    return fullProductDisplayName(name, multiplexConfigurationId);
 }
 
 QString ResolvedProduct::profile() const
@@ -511,6 +487,19 @@ QString ResolvedProduct::cachedExecutablePath(const QString &origFilePath) const
     return m_executablePathCache.value(origFilePath);
 }
 
+void ResolvedGroup::restoreWildcards(const QString &buildDir)
+{
+    if (wildcards) {
+        wildcards->buildDir = buildDir;
+        wildcards->prefix = prefix;
+        wildcards->baseDir = FileInfo::path(location.filePath());
+        for (const auto &sourceArtifact : files) {
+            if (sourceArtifact->fromWildcard)
+                wildcards->expandedFiles += sourceArtifact->absoluteFilePath;
+        }
+    }
+}
+
 
 ResolvedProject::ResolvedProject() : enabled(true), m_topLevelProject(nullptr)
 {
@@ -522,7 +511,7 @@ void ResolvedProject::accept(BuildGraphVisitor *visitor) const
 {
     for (const ResolvedProductPtr &product : products)
         product->accept(visitor);
-    for (const ResolvedProjectPtr &subProject : qAsConst(subProjects))
+    for (const ResolvedProjectPtr &subProject : std::as_const(subProjects))
         subProject->accept(visitor);
 }
 
@@ -549,7 +538,7 @@ std::vector<ResolvedProjectPtr> ResolvedProject::allSubProjects() const
 std::vector<ResolvedProductPtr> ResolvedProject::allProducts() const
 {
     std::vector<ResolvedProductPtr> productList = products;
-    for (const auto &subProject : qAsConst(subProjects))
+    for (const auto &subProject : std::as_const(subProjects))
         productList << subProject->allProducts();
     return productList;
 }
@@ -561,11 +550,11 @@ void ResolvedProject::load(PersistentPool &pool)
                   [](const ResolvedProductPtr &p) {
         if (!p->buildData)
             return;
-        for (BuildGraphNode * const node : qAsConst(p->buildData->allNodes())) {
+        for (BuildGraphNode * const node : std::as_const(p->buildData->allNodes())) {
             node->product = p;
 
             // restore parent links
-            for (BuildGraphNode * const child : qAsConst(node->children))
+            for (BuildGraphNode * const child : std::as_const(node->children))
                 child->parents.insert(node);
         }
     });
@@ -591,7 +580,7 @@ TopLevelProject::~TopLevelProject()
 QString TopLevelProject::deriveId(const QVariantMap &config)
 {
     const QVariantMap qbsProperties = config.value(StringConstants::qbsModule()).toMap();
-    const QString configurationName = qbsProperties.value(
+    QString configurationName = qbsProperties.value(
                 StringConstants::configurationNameProperty()).toString();
     return configurationName;
 }
@@ -618,6 +607,16 @@ void TopLevelProject::makeModuleProvidersNonTransient()
         m.transientOutput = false;
 }
 
+QVariantMap TopLevelProject::fullProfileConfigsTree() const
+{
+    QVariantMap tree;
+    for (auto it = profileConfigs.cbegin(); it != profileConfigs.cend(); ++it) {
+        tree.insert(it.key(), SetupProjectParameters::finalBuildConfigurationTree(
+                                  it.value().toMap(), overriddenValues));
+    }
+    return tree;
+}
+
 QString TopLevelProject::buildGraphFilePath() const
 {
     return ProjectBuildData::deriveBuildGraphFilePath(buildDirectory, id());
@@ -664,7 +663,7 @@ void TopLevelProject::store(PersistentPool &pool)
 void TopLevelProject::cleanupModuleProviderOutput()
 {
     QString error;
-    for (const ModuleProviderInfo &m : moduleProviderInfo.providers) {
+    for (const ModuleProviderInfo &m : std::as_const(moduleProviderInfo.providers)) {
         if (m.transientOutput) {
             if (!removeDirectoryWithContents(m.outputDirPath(buildDirectory), &error))
                 qCWarning(lcBuildGraph) << "Error removing module provider output:" << error;
@@ -708,25 +707,22 @@ void TopLevelProject::cleanupModuleProviderOutput()
  * \brief The \c SourceArtifacts resulting from the expanded list of matching files.
  */
 
-Set<QString> SourceWildCards::expandPatterns(const GroupConstPtr &group,
-                                              const QString &baseDir, const QString &buildDir)
+void SourceWildCards::expandPatterns()
 {
-    Set<QString> files = expandPatterns(group, patterns, baseDir, buildDir);
-    files -= expandPatterns(group, excludePatterns, baseDir, buildDir);
-    return files;
+    dirTimeStamps.clear();
+    expandedFiles = expandPatterns(patterns) - expandPatterns(excludePatterns);
 }
 
-Set<QString> SourceWildCards::expandPatterns(const GroupConstPtr &group,
-        const QStringList &patterns, const QString &baseDir, const QString &buildDir)
+Set<QString> SourceWildCards::expandPatterns(const QStringList &patterns)
 {
     Set<QString> files;
-    QString expandedPrefix = group->prefix;
+    QString expandedPrefix = prefix;
     if (expandedPrefix.startsWith(StringConstants::tildeSlash()))
         expandedPrefix.replace(0, 1, QDir::homePath());
     for (QString pattern : patterns) {
         pattern.prepend(expandedPrefix);
         pattern.replace(QLatin1Char('\\'), QLatin1Char('/'));
-        QStringList parts = pattern.split(QLatin1Char('/'), QBS_SKIP_EMPTY_PARTS);
+        QStringList parts = pattern.split(QLatin1Char('/'), Qt::SkipEmptyParts);
         if (FileInfo::isAbsolute(pattern)) {
             QString rootDir;
             if (HostOsInfo::isWindowsHost() && pattern.at(0) != QLatin1Char('/')) {
@@ -736,18 +732,17 @@ Set<QString> SourceWildCards::expandPatterns(const GroupConstPtr &group,
             } else {
                 rootDir = QLatin1Char('/');
             }
-            expandPatterns(files, group, parts, rootDir, buildDir);
+            expandPatterns(files, parts, rootDir);
         } else {
-            expandPatterns(files, group, parts, baseDir, buildDir);
+            expandPatterns(files, parts, baseDir);
         }
     }
 
     return files;
 }
 
-void SourceWildCards::expandPatterns(Set<QString> &result, const GroupConstPtr &group,
-                                     const QStringList &parts,
-                                     const QString &baseDir, const QString &buildDir)
+void SourceWildCards::expandPatterns(Set<QString> &result, const QStringList &parts,
+                                     const QString &baseDir)
 {
     // People might build directly in the project source directory. This is okay, since
     // we keep the build data in a "container" directory. However, we must make sure we don't
@@ -755,8 +750,6 @@ void SourceWildCards::expandPatterns(Set<QString> &result, const GroupConstPtr &
     if (baseDir.startsWith(buildDir))
         return;
 
-    dirTimeStamps.emplace_back(baseDir, FileInfo(baseDir).lastModified());
-
     QStringList changed_parts = parts;
     bool recursive = false;
     QString part = changed_parts.takeFirst();
@@ -783,8 +776,12 @@ void SourceWildCards::expandPatterns(Set<QString> &result, const GroupConstPtr &
             : QDir::Files | QDir::System
               | QDir::Dirs; // This one is needed to get symbolic links to directories
 
-    if (isDir && !FileInfo::isPattern(filePattern))
+    if (FileInfo::isPattern(filePattern)) {
+        if (!recursive)
+            dirTimeStamps.emplace_back(baseDir, FileInfo(baseDir).lastModified());
+    } else if (isDir) {
         itFilters |= QDir::Hidden;
+    }
     if (filePattern != StringConstants::dotDot() && filePattern != StringConstants::dot())
         itFilters |= QDir::NoDotAndDotDot;
 
@@ -796,16 +793,28 @@ void SourceWildCards::expandPatterns(Set<QString> &result, const GroupConstPtr &
             continue; // See above.
         if (!isDir && it.fileInfo().isDir() && !it.fileInfo().isSymLink())
             continue;
-        if (isDir) {
-            expandPatterns(result, group, changed_parts, filePath, buildDir);
-        } else {
-            if (parentDir != baseDir)
-                dirTimeStamps.emplace_back(parentDir, FileInfo(baseDir).lastModified());
+        if (isDir)
+            expandPatterns(result, changed_parts, filePath);
+        else
             result += QDir::cleanPath(filePath);
-        }
     }
 }
 
+bool SourceWildCards::hasChangedSinceExpansion() const
+{
+    const bool reExpansionRequired =
+        Internal::any_of(dirTimeStamps,
+                         [](const std::pair<QString, FileTime> &pair) {
+                             return FileInfo(pair.first).lastModified() > pair.second;
+                         });
+    if (reExpansionRequired)
+        return true;
+
+    auto wc = *this;
+    wc.expandPatterns();
+    return this->expandedFiles != wc.expandedFiles;
+}
+
 template<typename L>
 QMap<QString, typename L::value_type> listToMap(const L &list)
 {
@@ -824,14 +833,13 @@ bool listsAreEqual(const L &l1, const L &l2)
     using V = typename L::value_type;
     const QMap<QString, V> map1 = listToMap(l1);
     const QMap<QString, V> map2 = listToMap(l2);
-    for (const QString &key : map1.keys()) {
+    const auto keys = map1.keys();
+    return Internal::all_of(keys, [&map1, &map2](const auto &key) {
         const V &value2 = map2.value(key);
         if (!value2)
             return false;
-        if (!equals(map1.value(key).get(), value2.get()))
-            return false;
-    }
-    return true;
+        return equals(map1.value(key).get(), value2.get());
+    });
 }
 
 QString keyFromElem(const SourceArtifactPtr &sa) { return sa->absoluteFilePath; }
@@ -904,7 +912,7 @@ bool operator==(const RuleArtifact::Binding &b1, const RuleArtifact::Binding &b2
     return b1.code == b2.code && b1.name == b2.name;
 }
 
-uint qHash(const RuleArtifact::Binding &b)
+QHashValueType qHash(const RuleArtifact::Binding &b)
 {
     return qHash(std::make_pair(b.code, b.name.join(QLatin1Char(','))));
 }
@@ -915,11 +923,6 @@ bool artifactPropertyListsAreEqual(const std::vector<ArtifactPropertiesPtr> &l1,
     return listsAreEqual(l1, l2);
 }
 
-QString multiplexIdToString(const QString &id)
-{
-    return QString::fromUtf8(QByteArray::fromBase64(id.toUtf8()));
-}
-
 bool operator==(const PrivateScriptFunction &a, const PrivateScriptFunction &b)
 {
     return equals(a.m_sharedData.get(), b.m_sharedData.get());
@@ -935,7 +938,7 @@ bool operator==(const ExportedProperty &p1, const ExportedProperty &p2)
 
 bool operator==(const ExportedModuleDependency &d1, const ExportedModuleDependency &d2)
 {
-    return d1.name == d2.name && d1.moduleProperties == d2.moduleProperties;
+    return d1.name == d2.name && qVariantMapsEqual(d1.moduleProperties, d2.moduleProperties);
 }
 
 bool equals(const std::vector<ExportedItemPtr> &l1, const std::vector<ExportedItemPtr> &l2)
@@ -962,20 +965,35 @@ bool operator==(const ExportedModule &m1, const ExportedModule &m2)
         for (auto it1 = m1.cbegin(), it2 = m2.cbegin(); it1 != m1.cend(); ++it1, ++it2) {
             if (it1.key()->name != it2.key()->name)
                 return false;
-            if (it1.value() != it2.value())
+            if (!qVariantMapsEqual(it1.value(), it2.value()))
                 return false;
         }
         return true;
     };
 
-    return m1.propertyValues == m2.propertyValues
-            && m1.modulePropertyValues == m2.modulePropertyValues
-            && equals(m1.children, m2.children)
-            && m1.m_properties == m2.m_properties
-            && m1.importStatements == m2.importStatements
-            && m1.productDependencies.size() == m2.productDependencies.size()
-            && m1.productDependencies == m2.productDependencies
-            && depMapsEqual(m1.dependencyParameters, m2.dependencyParameters);
+    return qVariantMapsEqual(m1.propertyValues, m2.propertyValues)
+           && qVariantMapsEqual(m1.modulePropertyValues, m2.modulePropertyValues)
+           && equals(m1.children, m2.children) && m1.m_properties == m2.m_properties
+           && m1.importStatements == m2.importStatements
+           && m1.productDependencies.size() == m2.productDependencies.size()
+           && m1.productDependencies == m2.productDependencies
+           && depMapsEqual(m1.dependencyParameters, m2.dependencyParameters);
+}
+
+JSValue PrivateScriptFunction::getFunction(ScriptEngine *engine, const QString &errorMessage) const
+{
+    if (JS_IsUndefined(scriptFunction)) {
+        ScopedJsValue val(engine->context(),
+                          engine->evaluate(JsValueOwner::Caller, sourceCode(),
+                                           location().filePath(), location().line()));
+        if (Q_UNLIKELY(!JS_IsFunction(engine->context(), val)))
+            throw ErrorInfo(errorMessage, location());
+        scriptFunction = val.release();
+        engine->addExternallyCachedValue(&scriptFunction);
+    } else {
+        QBS_CHECK(JS_IsFunction(engine->context(), scriptFunction));
+    }
+    return scriptFunction;
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index e50691560..774d703d0 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -49,9 +49,11 @@
 
 #include <buildgraph/forward_decls.h>
 #include <tools/codelocation.h>
+#include <tools/fileinfo.h>
 #include <tools/filetime.h>
 #include <tools/joblimits.h>
 #include <tools/persistence.h>
+#include <tools/porting.h>
 #include <tools/set.h>
 #include <tools/weakpointer.h>
 
@@ -63,21 +65,18 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qvariant.h>
 
-#include <QtScript/qscriptvalue.h>
+#include <quickjs.h>
 
 #include <memory>
 #include <mutex>
 #include <vector>
 
-QT_BEGIN_NAMESPACE
-class QScriptEngine;
-QT_END_NAMESPACE
-
 namespace qbs {
 namespace Internal {
 class BuildGraphLocker;
 class BuildGraphLoader;
 class BuildGraphVisitor;
+class ScriptEngine;
 
 class FileTagger
 {
@@ -118,17 +117,20 @@ public:
                                 const QString &configureScript,
                                 const QVariantMap &properties,
                                 const QVariantMap &initialProperties,
+                                const QMap<QString, VariantValuePtr> &values,
                                 const std::vector<QString> &importedFilesUsed)
     {
         return ProbeConstPtr(new Probe(globalId, location, condition, configureScript, properties,
-                                       initialProperties, importedFilesUsed));
+                                       initialProperties, values, importedFilesUsed));
     }
 
     const QString &globalId() const { return m_globalId; }
     bool condition() const { return m_condition; }
+    const CodeLocation &location() const { return m_location; }
     const QString &configureScript() const { return m_configureScript; }
     const QVariantMap &properties() const { return m_properties; }
     const QVariantMap &initialProperties() const { return m_initialProperties; }
+    const QMap<QString, VariantValuePtr> &values() const { return m_values; }
     const std::vector<QString> &importedFilesUsed() const { return m_importedFilesUsed; }
     bool needsReconfigure(const FileTime &referenceTime) const;
 
@@ -136,6 +138,8 @@ public:
     {
         pool.serializationOp<opType>(m_globalId, m_location, m_condition, m_configureScript,
                                      m_properties, m_initialProperties, m_importedFilesUsed);
+        if constexpr (opType == PersistentPool::OpType::Load)
+            restoreValues();
     }
 
 private:
@@ -146,21 +150,27 @@ private:
           QString configureScript,
           QVariantMap properties,
           QVariantMap initialProperties,
+          QMap<QString, VariantValuePtr> values,
           std::vector<QString> importedFilesUsed)
         : m_globalId(std::move(globalId))
         , m_location(location)
         , m_configureScript(std::move(configureScript))
         , m_properties(std::move(properties))
         , m_initialProperties(std::move(initialProperties))
+        , m_values(std::move(values))
         , m_importedFilesUsed(std::move(importedFilesUsed))
         , m_condition(condition)
-    {}
+    {
+    }
+
+    void restoreValues();
 
     QString m_globalId;
     CodeLocation m_location;
     QString m_configureScript;
     QVariantMap m_properties;
     QVariantMap m_initialProperties;
+    QMap<QString, VariantValuePtr> m_values;
     std::vector<QString> m_importedFilesUsed;
     bool m_condition = false;
 };
@@ -212,7 +222,7 @@ private:
         : alwaysUpdated(true)
     {}
 };
-uint qHash(const RuleArtifact::Binding &b);
+QHashValueType qHash(const RuleArtifact::Binding &b);
 bool operator==(const RuleArtifact::Binding &b1, const RuleArtifact::Binding &b2);
 inline bool operator!=(const RuleArtifact::Binding &b1, const RuleArtifact::Binding &b2) {
     return !(b1 == b2);
@@ -232,11 +242,12 @@ public:
     bool overrideFileTags;
     QString targetOfModule;
     PropertyMapPtr properties;
+    bool fromWildcard;
 
     template<PersistentPool::OpType opType> void completeSerializationOp(PersistentPool &pool)
     {
         pool.serializationOp<opType>(absoluteFilePath, fileTags, overrideFileTags, properties,
-                                     targetOfModule);
+                                     targetOfModule, fromWildcard);
     }
 
 private:
@@ -250,26 +261,28 @@ inline bool operator!=(const SourceArtifactInternal &sa1, const SourceArtifactIn
 class SourceWildCards
 {
 public:
-    Set<QString> expandPatterns(const GroupConstPtr &group, const QString &baseDir,
-                                 const QString &buildDir);
+    void expandPatterns();
+    bool hasChangedSinceExpansion() const;
+
+    // to be restored by the owning class
+    QString prefix;
+    QString baseDir;
+    QString buildDir;
+    Set<QString> expandedFiles;
 
-    const ResolvedGroup *group = nullptr;       // The owning group.
+    // stored
     QStringList patterns;
     QStringList excludePatterns;
     std::vector<std::pair<QString, FileTime>> dirTimeStamps;
-    std::vector<SourceArtifactPtr> files;
 
     template<PersistentPool::OpType opType> void completeSerializationOp(PersistentPool &pool)
     {
-        pool.serializationOp<opType>(patterns, excludePatterns, dirTimeStamps, files);
+        pool.serializationOp<opType>(patterns, excludePatterns, dirTimeStamps);
     }
 
 private:
-    Set<QString> expandPatterns(const GroupConstPtr &group, const QStringList &patterns,
-                                 const QString &baseDir, const QString &buildDir);
-    void expandPatterns(Set<QString> &result, const GroupConstPtr &group,
-                        const QStringList &parts, const QString &baseDir,
-                        const QString &buildDir);
+    Set<QString> expandPatterns(const QStringList &patterns);
+    void expandPatterns(Set<QString> &result, const QStringList &parts, const QString &baseDir);
 };
 
 class QBS_AUTOTEST_EXPORT ResolvedGroup
@@ -289,13 +302,9 @@ public:
     QString targetOfModule;
     bool overrideTags = false;
 
-    std::vector<SourceArtifactPtr> allFiles() const;
-
-    void load(PersistentPool &pool);
-    void store(PersistentPool &pool);
+    void restoreWildcards(const QString &buildDir);
 
-private:
-    template<PersistentPool::OpType opType> void serializationOp(PersistentPool &pool)
+    template<PersistentPool::OpType opType> void completeSerializationOp(PersistentPool &pool)
     {
         pool.serializationOp<opType>(name, enabled, location, prefix, files, wildcards, properties,
                                      fileTags, targetOfModule, overrideTags);
@@ -334,8 +343,8 @@ class PrivateScriptFunction
     friend bool operator==(const PrivateScriptFunction &a, const PrivateScriptFunction &b);
 public:
     void initialize(const ScriptFunctionPtr &sharedData) { m_sharedData = sharedData; }
-    mutable QScriptValue scriptFunction; // not stored
 
+    JSValue getFunction(ScriptEngine *engine, const QString &errorMessage) const;
     QString &sourceCode() const { return m_sharedData->sourceCode; }
     CodeLocation &location()  const { return m_sharedData->location; }
     ResolvedFileContextConstPtr &fileContext() const { return m_sharedData->fileContext; }
@@ -348,6 +357,7 @@ public:
 
 private:
     ScriptFunctionPtr m_sharedData;
+    mutable JSValue scriptFunction = JS_UNDEFINED; // not stored
 };
 
 bool operator==(const PrivateScriptFunction &a, const PrivateScriptFunction &b);
@@ -362,7 +372,7 @@ public:
     static ResolvedModulePtr create() { return ResolvedModulePtr(new ResolvedModule); }
 
     QString name;
-    QStringList moduleDependencies;
+    QStringList moduleDependencies; // TODO: Still needed?
     PrivateScriptFunction setupBuildEnvironmentScript;
     PrivateScriptFunction setupRunEnvironmentScript;
     ResolvedProduct *product = nullptr;
@@ -598,7 +608,6 @@ public:
     static QString uniqueName(const QString &name,
                               const QString &multiplexConfigurationId);
     QString uniqueName() const;
-    static QString fullDisplayName(const QString &name, const QString &multiplexConfigurationId);
     QString fullDisplayName() const;
     QString profile() const;
 
@@ -694,6 +703,7 @@ public:
     QHash<QString, bool> fileExistsResults; // Results of calls to "File.exists()".
     QHash<std::pair<QString, quint32>, QStringList> directoryEntriesResults; // Results of calls to "File.directoryEntries()".
     QHash<QString, FileTime> fileLastModifiedResults; // Results of calls to "File.lastModified()".
+    CodeLinks codeLinks;
     std::unique_ptr<ProjectBuildData> buildData;
     BuildGraphLocker *bgLocker; // This holds the system-wide build graph file lock.
     bool locked; // This is the API-level lock for the project instance.
@@ -708,6 +718,7 @@ public:
     QString id() const { return m_id; }
     QString profile() const;
     void makeModuleProvidersNonTransient();
+    QVariantMap fullProfileConfigsTree() const; // Tree-ified + overridden values
 
     QVariantMap profileConfigs;
     QVariantMap overriddenValues;
@@ -724,7 +735,7 @@ private:
                                      directoryEntriesResults, fileLastModifiedResults, environment,
                                      probes, profileConfigs, overriddenValues, buildSystemFiles,
                                      lastStartResolveTime, lastEndResolveTime, warningsEncountered,
-                                     buildData, moduleProviderInfo);
+                                     buildData, moduleProviderInfo, codeLinks);
     }
     void load(PersistentPool &pool) override;
     void store(PersistentPool &pool) override;
@@ -738,8 +749,6 @@ private:
 bool artifactPropertyListsAreEqual(const std::vector<ArtifactPropertiesPtr> &l1,
                                    const std::vector<ArtifactPropertiesPtr> &l2);
 
-QString multiplexIdToString(const QString &id);
-
 } // namespace Internal
 } // namespace qbs
 
diff --git a/src/lib/corelib/language/language.pri b/src/lib/corelib/language/language.pri
deleted file mode 100644
index 249093e61..000000000
--- a/src/lib/corelib/language/language.pri
+++ /dev/null
@@ -1,84 +0,0 @@
-include(../../../install_prefix.pri)
-
-HEADERS += \
-    $$PWD/artifactproperties.h \
-    $$PWD/astimportshandler.h \
-    $$PWD/astpropertiesitemhandler.h \
-    $$PWD/asttools.h \
-    $$PWD/builtindeclarations.h \
-    $$PWD/deprecationinfo.h \
-    $$PWD/evaluationdata.h \
-    $$PWD/evaluator.h \
-    $$PWD/evaluatorscriptclass.h \
-    $$PWD/filecontext.h \
-    $$PWD/filecontextbase.h \
-    $$PWD/filetags.h \
-    $$PWD/forward_decls.h \
-    $$PWD/identifiersearch.h \
-    $$PWD/item.h \
-    $$PWD/itemdeclaration.h \
-    $$PWD/itemobserver.h \
-    $$PWD/itempool.h \
-    $$PWD/itemreader.h \
-    $$PWD/itemreaderastvisitor.h \
-    $$PWD/itemreadervisitorstate.h \
-    $$PWD/itemtype.h \
-    $$PWD/jsimports.h \
-    $$PWD/language.h \
-    $$PWD/loader.h \
-    $$PWD/moduleloader.h \
-    $$PWD/modulemerger.h \
-    $$PWD/moduleproviderinfo.h \
-    $$PWD/moduleproviderloader.h \
-    $$PWD/preparescriptobserver.h \
-    $$PWD/projectresolver.h \
-    $$PWD/property.h \
-    $$PWD/propertydeclaration.h \
-    $$PWD/propertymapinternal.h \
-    $$PWD/qualifiedid.h \
-    $$PWD/resolvedfilecontext.h \
-    $$PWD/scriptengine.h \
-    $$PWD/scriptimporter.h \
-    $$PWD/scriptpropertyobserver.h \
-    $$PWD/value.h
-
-SOURCES += \
-    $$PWD/artifactproperties.cpp \
-    $$PWD/astimportshandler.cpp \
-    $$PWD/astpropertiesitemhandler.cpp \
-    $$PWD/asttools.cpp \
-    $$PWD/builtindeclarations.cpp \
-    $$PWD/evaluator.cpp \
-    $$PWD/evaluatorscriptclass.cpp \
-    $$PWD/filecontext.cpp \
-    $$PWD/filecontextbase.cpp \
-    $$PWD/filetags.cpp \
-    $$PWD/identifiersearch.cpp \
-    $$PWD/item.cpp \
-    $$PWD/itemdeclaration.cpp \
-    $$PWD/itempool.cpp \
-    $$PWD/itemreader.cpp \
-    $$PWD/itemreaderastvisitor.cpp \
-    $$PWD/itemreadervisitorstate.cpp \
-    $$PWD/language.cpp \
-    $$PWD/loader.cpp \
-    $$PWD/moduleloader.cpp \
-    $$PWD/modulemerger.cpp \
-    $$PWD/moduleproviderloader.cpp \
-    $$PWD/preparescriptobserver.cpp \
-    $$PWD/scriptpropertyobserver.cpp \
-    $$PWD/projectresolver.cpp \
-    $$PWD/property.cpp \
-    $$PWD/propertydeclaration.cpp \
-    $$PWD/propertymapinternal.cpp \
-    $$PWD/qualifiedid.cpp \
-    $$PWD/resolvedfilecontext.cpp \
-    $$PWD/scriptengine.cpp \
-    $$PWD/scriptimporter.cpp \
-    $$PWD/value.cpp
-
-!qbs_no_dev_install {
-    language_headers.files = $$PWD/forward_decls.h
-    language_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/language
-    INSTALLS += language_headers
-}
diff --git a/src/lib/corelib/language/loader.cpp b/src/lib/corelib/language/loader.cpp
deleted file mode 100644
index 1de84da63..000000000
--- a/src/lib/corelib/language/loader.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "loader.h"
-
-#include "evaluator.h"
-#include "language.h"
-#include "moduleloader.h"
-#include "projectresolver.h"
-#include "scriptengine.h"
-
-#include <logging/translator.h>
-#include <tools/fileinfo.h>
-#include <tools/profile.h>
-#include <tools/progressobserver.h>
-#include <tools/qbsassert.h>
-#include <tools/settings.h>
-#include <tools/setupprojectparameters.h>
-#include <tools/stringconstants.h>
-
-#include <QtCore/qdir.h>
-#include <QtCore/qobject.h>
-#include <QtCore/qtimer.h>
-
-namespace qbs {
-namespace Internal {
-
-Loader::Loader(ScriptEngine *engine, Logger logger)
-    : m_logger(std::move(logger))
-    , m_progressObserver(nullptr)
-    , m_engine(engine)
-{
-    m_logger.storeWarnings();
-}
-
-void Loader::setProgressObserver(ProgressObserver *observer)
-{
-    m_progressObserver = observer;
-}
-
-void Loader::setSearchPaths(const QStringList &_searchPaths)
-{
-    QStringList searchPaths;
-    for (const QString &searchPath : _searchPaths) {
-        if (!FileInfo::exists(searchPath)) {
-            m_logger.qbsWarning() << Tr::tr("Search path '%1' does not exist.")
-                    .arg(QDir::toNativeSeparators(searchPath));
-        } else {
-            searchPaths += searchPath;
-        }
-    }
-
-    m_searchPaths = searchPaths;
-}
-
-void Loader::setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes)
-{
-    m_oldProjectProbes = oldProbes;
-}
-
-void Loader::setOldProductProbes(const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes)
-{
-    m_oldProductProbes = oldProbes;
-}
-
-void Loader::setStoredProfiles(const QVariantMap &profiles)
-{
-    m_storedProfiles = profiles;
-}
-
-void Loader::setStoredModuleProviderInfo(const StoredModuleProviderInfo &providerInfo)
-{
-    m_storedModuleProviderInfo = providerInfo;
-}
-
-TopLevelProjectPtr Loader::loadProject(const SetupProjectParameters &_parameters)
-{
-    SetupProjectParameters parameters = _parameters;
-
-    if (parameters.topLevelProfile().isEmpty()) {
-        Settings settings(parameters.settingsDirectory());
-        QString profileName = settings.defaultProfile();
-        if (profileName.isEmpty()) {
-            m_logger.qbsDebug() << Tr::tr("No profile specified and no default profile exists. "
-                                          "Using default property values.");
-            profileName = Profile::fallbackName();
-        }
-        parameters.setTopLevelProfile(profileName);
-        parameters.expandBuildConfiguration();
-    }
-
-    setupProjectFilePath(parameters);
-    QBS_CHECK(QFileInfo(parameters.projectFilePath()).isAbsolute());
-    m_logger.qbsDebug() << "Using project file '"
-                        << QDir::toNativeSeparators(parameters.projectFilePath()) << "'.";
-
-    m_engine->setEnvironment(parameters.adjustedEnvironment());
-    m_engine->clearExceptions();
-    m_engine->clearImportsCache();
-    m_engine->clearRequestedProperties();
-    m_engine->enableProfiling(parameters.logElapsedTime());
-    m_logger.clearWarnings();
-    EvalContextSwitcher evalContextSwitcher(m_engine, EvalContext::PropertyEvaluation);
-
-    QTimer cancelationTimer;
-
-    // At this point, we cannot set a sensible total effort, because we know nothing about
-    // the project yet. That's why we use a placeholder here, so the user at least
-    // sees that an operation is starting. The real total effort will be set later when
-    // we have enough information.
-    if (m_progressObserver) {
-        m_progressObserver->initialize(Tr::tr("Resolving project for configuration %1")
-                .arg(TopLevelProject::deriveId(parameters.finalBuildConfigurationTree())), 1);
-        cancelationTimer.setSingleShot(false);
-        QObject::connect(&cancelationTimer, &QTimer::timeout, [this]() {
-            QBS_ASSERT(m_progressObserver, return);
-            if (m_progressObserver->canceled())
-                m_engine->cancel();
-        });
-        cancelationTimer.start(1000);
-    }
-
-    const FileTime resolveTime = FileTime::currentTime();
-    Evaluator evaluator(m_engine);
-    ModuleLoader moduleLoader(&evaluator, m_logger);
-    moduleLoader.setProgressObserver(m_progressObserver);
-    moduleLoader.setSearchPaths(m_searchPaths);
-    moduleLoader.setOldProjectProbes(m_oldProjectProbes);
-    moduleLoader.setOldProductProbes(m_oldProductProbes);
-    moduleLoader.setLastResolveTime(m_lastResolveTime);
-    moduleLoader.setStoredProfiles(m_storedProfiles);
-    moduleLoader.setStoredModuleProviderInfo(m_storedModuleProviderInfo);
-    const ModuleLoaderResult loadResult = moduleLoader.load(parameters);
-    ProjectResolver resolver(&evaluator, loadResult, std::move(parameters), m_logger);
-    resolver.setProgressObserver(m_progressObserver);
-    const TopLevelProjectPtr project = resolver.resolve();
-    project->lastStartResolveTime = resolveTime;
-    project->lastEndResolveTime = FileTime::currentTime();
-
-    // E.g. if the top-level project is disabled.
-    if (m_progressObserver)
-        m_progressObserver->setFinished();
-
-    return project;
-}
-
-void Loader::setupProjectFilePath(SetupProjectParameters &parameters)
-{
-    QString projectFilePath = parameters.projectFilePath();
-    if (projectFilePath.isEmpty())
-        projectFilePath = QDir::currentPath();
-    const QFileInfo projectFileInfo(projectFilePath);
-    if (!projectFileInfo.exists())
-        throw ErrorInfo(Tr::tr("Project file '%1' cannot be found.").arg(projectFilePath));
-    if (projectFileInfo.isRelative())
-        projectFilePath = projectFileInfo.absoluteFilePath();
-    if (projectFileInfo.isFile()) {
-        parameters.setProjectFilePath(projectFilePath);
-        return;
-    }
-    if (!projectFileInfo.isDir())
-        throw ErrorInfo(Tr::tr("Project file '%1' has invalid type.").arg(projectFilePath));
-
-    const QStringList &actualFileNames
-            = QDir(projectFilePath).entryList(StringConstants::qbsFileWildcards(), QDir::Files);
-    if (actualFileNames.empty()) {
-        QString error;
-        if (parameters.projectFilePath().isEmpty())
-            error = Tr::tr("No project file given and none found in current directory.\n");
-        else
-            error = Tr::tr("No project file found in directory '%1'.").arg(projectFilePath);
-        throw ErrorInfo(error);
-    }
-    if (actualFileNames.size() > 1) {
-        throw ErrorInfo(Tr::tr("More than one project file found in directory '%1'.")
-                .arg(projectFilePath));
-    }
-    projectFilePath.append(QLatin1Char('/')).append(actualFileNames.front());
-
-    projectFilePath = QDir::current().filePath(projectFilePath);
-    projectFilePath = QDir::cleanPath(projectFilePath);
-    parameters.setProjectFilePath(projectFilePath);
-}
-
-} // namespace Internal
-} // namespace qbs
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
deleted file mode 100644
index 6b800fa0b..000000000
--- a/src/lib/corelib/language/moduleloader.cpp
+++ /dev/null
@@ -1,4044 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "moduleloader.h"
-
-#include "builtindeclarations.h"
-#include "evaluator.h"
-#include "filecontext.h"
-#include "item.h"
-#include "itemreader.h"
-#include "language.h"
-#include "modulemerger.h"
-#include "moduleproviderloader.h"
-#include "qualifiedid.h"
-#include "scriptengine.h"
-#include "value.h"
-
-#include <api/languageinfo.h>
-#include <language/language.h>
-#include <logging/categories.h>
-#include <logging/logger.h>
-#include <logging/translator.h>
-#include <tools/error.h>
-#include <tools/fileinfo.h>
-#include <tools/preferences.h>
-#include <tools/profile.h>
-#include <tools/profiling.h>
-#include <tools/progressobserver.h>
-#include <tools/qbsassert.h>
-#include <tools/qttools.h>
-#include <tools/scripttools.h>
-#include <tools/settings.h>
-#include <tools/stlutils.h>
-#include <tools/stringconstants.h>
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qglobalstatic.h>
-#include <QtCore/qdiriterator.h>
-#include <QtCore/qjsondocument.h>
-#include <QtCore/qjsonobject.h>
-#include <QtCore/qtextstream.h>
-#include <QtCore/qthreadstorage.h>
-#include <QtScript/qscriptvalueiterator.h>
-
-#include <algorithm>
-#include <memory>
-#include <utility>
-
-namespace qbs {
-namespace Internal {
-
-using MultiplexConfigurationByIdTable = QThreadStorage<QHash<QString, QVariantMap> >;
-Q_GLOBAL_STATIC(MultiplexConfigurationByIdTable, multiplexConfigurationsById);
-
-static bool multiplexConfigurationIntersects(const QVariantMap &lhs, const QVariantMap &rhs)
-{
-    QBS_CHECK(!lhs.isEmpty() && !rhs.isEmpty());
-
-    for (auto lhsProperty = lhs.constBegin(); lhsProperty != lhs.constEnd(); lhsProperty++) {
-        const auto rhsProperty = rhs.find(lhsProperty.key());
-        const bool isCommonProperty = rhsProperty != rhs.constEnd();
-        if (isCommonProperty && lhsProperty.value() != rhsProperty.value())
-            return false;
-    }
-
-    return true;
-}
-
-class ModuleLoader::ItemModuleList : public QList<Item::Module> {};
-
-static QString probeGlobalId(Item *probe)
-{
-    QString id;
-
-    for (Item *obj = probe; obj; obj = obj->prototype()) {
-        if (!obj->id().isEmpty()) {
-            id = obj->id();
-            break;
-        }
-    }
-
-    if (id.isEmpty())
-        return {};
-
-    QBS_CHECK(probe->file());
-    return id + QLatin1Char('_') + probe->file()->filePath();
-}
-
-class ModuleLoader::ProductSortByDependencies
-{
-public:
-    ProductSortByDependencies(TopLevelProjectContext &tlp) : m_tlp(tlp)
-    {
-    }
-
-    void apply()
-    {
-        QHash<QString, std::vector<ProductContext *>> productsMap;
-        QList<ProductContext *> allProducts;
-        for (ProjectContext * const projectContext : qAsConst(m_tlp.projects)) {
-            for (auto &product : projectContext->products) {
-                allProducts.push_back(&product);
-                productsMap[product.name].push_back(&product);
-            }
-        }
-        Set<ProductContext *> allDependencies;
-        for (auto productContext : qAsConst(allProducts)) {
-            auto &productDependencies = m_dependencyMap[productContext];
-            for (const auto &dep : qAsConst(productContext->info.usedProducts)) {
-                QBS_CHECK(!dep.name.isEmpty());
-                const auto &deps = productsMap.value(dep.name);
-                if (dep.profile == StringConstants::star()) {
-                    QBS_CHECK(!deps.empty());
-                    for (ProductContext *depProduct : deps) {
-                        if (depProduct == productContext)
-                            continue;
-                        productDependencies.push_back(depProduct);
-                        allDependencies << depProduct;
-                    }
-                } else {
-                    auto it = std::find_if(deps.begin(), deps.end(), [&dep] (ProductContext *p) {
-                            return p->multiplexConfigurationId == dep.multiplexConfigurationId;
-                        });
-                    if (it == deps.end()) {
-                        QBS_CHECK(!productContext->multiplexConfigurationId.isEmpty());
-                        const QString productName = ResolvedProduct::fullDisplayName(
-                                    productContext->name, productContext->multiplexConfigurationId);
-                        const QString depName = ResolvedProduct::fullDisplayName(
-                                    dep.name, dep.multiplexConfigurationId);
-                        throw ErrorInfo(Tr::tr("Dependency from product '%1' to product '%2' not "
-                                               "fulfilled.").arg(productName, depName),
-                                        productContext->item->location());
-                    }
-                    productDependencies.push_back(*it);
-                    allDependencies << *it;
-                }
-            }
-        }
-        const Set<ProductContext *> rootProducts
-                = rangeTo<Set<ProductContext *>>(allProducts) - allDependencies;
-        for (ProductContext * const rootProduct : rootProducts)
-            traverse(rootProduct);
-        if (m_sortedProducts.size() < allProducts.size()) {
-            for (auto const product : qAsConst(allProducts)) {
-                QList<ModuleLoader::ProductContext *> path;
-                findCycle(product, path);
-            }
-        }
-        QBS_CHECK(m_sortedProducts.size() == allProducts.size());
-    }
-
-    // No product at position i has dependencies to a product at position j > i.
-    const QList<ProductContext *> &sortedProducts() const
-    {
-        return m_sortedProducts;
-    }
-
-private:
-    void traverse(ModuleLoader::ProductContext *product)
-    {
-        if (!m_seenProducts.insert(product).second)
-            return;
-        for (const auto &dependency : m_dependencyMap.value(product))
-            traverse(dependency);
-        m_sortedProducts << product;
-    }
-
-    void findCycle(ModuleLoader::ProductContext *product,
-                   QList<ModuleLoader::ProductContext *> &path)
-    {
-        if (path.contains(product)) {
-            ErrorInfo error(Tr::tr("Cyclic dependencies detected."));
-            for (const auto * const p : path)
-                error.append(p->name, p->item->location());
-            error.append(product->name, product->item->location());
-            throw error;
-        }
-        path << product;
-        for (auto const dep : m_dependencyMap.value(product))
-            findCycle(dep, path);
-        path.removeLast();
-    }
-
-    TopLevelProjectContext &m_tlp;
-    QHash<ProductContext *, std::vector<ProductContext *>> m_dependencyMap;
-    Set<ProductContext *> m_seenProducts;
-    QList<ProductContext *> m_sortedProducts;
-};
-
-class SearchPathsManager {
-public:
-    explicit SearchPathsManager(ItemReader *itemReader)
-        : m_itemReader(itemReader)
-        , m_oldSize(itemReader->extraSearchPathsStack().size())
-    {
-    }
-    SearchPathsManager(ItemReader *itemReader, const QStringList &extraSearchPaths)
-        : SearchPathsManager(itemReader)
-    {
-        m_itemReader->pushExtraSearchPaths(extraSearchPaths);
-    }
-    ~SearchPathsManager()
-    {
-        reset();
-    }
-    void reset()
-    {
-        while (m_itemReader->extraSearchPathsStack().size() > m_oldSize)
-            m_itemReader->popExtraSearchPaths();
-    }
-
-private:
-    ItemReader * const m_itemReader;
-    size_t m_oldSize{0};
-};
-
-ModuleLoader::ModuleLoader(Evaluator *evaluator, Logger &logger)
-    : m_pool(nullptr)
-    , m_logger(logger)
-    , m_progressObserver(nullptr)
-    , m_reader(std::make_unique<ItemReader>(logger))
-    , m_evaluator(evaluator)
-    , m_moduleProviderLoader(
-        std::make_unique<ModuleProviderLoader>(m_reader.get(), m_evaluator, m_logger))
-{
-}
-
-ModuleLoader::~ModuleLoader() = default;
-
-void ModuleLoader::setProgressObserver(ProgressObserver *progressObserver)
-{
-    m_progressObserver = progressObserver;
-}
-
-void ModuleLoader::setSearchPaths(const QStringList &searchPaths)
-{
-    m_reader->setSearchPaths(searchPaths);
-    qCDebug(lcModuleLoader) << "initial search paths:" << searchPaths;
-}
-
-void ModuleLoader::setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes)
-{
-    m_oldProjectProbes.clear();
-    for (const ProbeConstPtr& probe : oldProbes)
-        m_oldProjectProbes[probe->globalId()] << probe;
-}
-
-void ModuleLoader::setOldProductProbes(const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes)
-{
-    m_oldProductProbes = oldProbes;
-}
-
-void ModuleLoader::setStoredProfiles(const QVariantMap &profiles)
-{
-    m_storedProfiles = profiles;
-}
-
-void ModuleLoader::setStoredModuleProviderInfo(const StoredModuleProviderInfo &moduleProviderInfo)
-{
-    m_moduleProviderLoader->setStoredModuleProviderInfo(moduleProviderInfo);
-}
-
-ModuleLoaderResult ModuleLoader::load(const SetupProjectParameters &parameters)
-{
-    TimedActivityLogger moduleLoaderTimer(m_logger, Tr::tr("ModuleLoader"),
-                                          parameters.logElapsedTime());
-    qCDebug(lcModuleLoader) << "load" << parameters.projectFilePath();
-    m_parameters = parameters;
-    m_modulePrototypes.clear();
-    m_modulePrototypeEnabledInfo.clear();
-    m_parameterDeclarations.clear();
-    m_disabledItems.clear();
-    m_reader->clearExtraSearchPathsStack();
-    m_reader->setEnableTiming(parameters.logElapsedTime());
-    m_moduleProviderLoader->setProjectParameters(m_parameters);
-    m_elapsedTimeProbes = m_elapsedTimePrepareProducts = m_elapsedTimeHandleProducts
-            = m_elapsedTimeProductDependencies = m_elapsedTimeTransitiveDependencies
-            = m_elapsedTimePropertyChecking = 0;
-    m_elapsedTimeModuleProviders = 0;
-    m_elapsedTimeProbes = 0;
-    m_probesEncountered = m_probesRun = m_probesCachedCurrent = m_probesCachedOld = 0;
-    m_settings = std::make_unique<Settings>(parameters.settingsDirectory());
-
-    const auto keys = m_parameters.overriddenValues().keys();
-    for (const QString &key : keys) {
-        static const QStringList prefixes({ StringConstants::projectPrefix(),
-                                            QStringLiteral("projects"),
-                                            QStringLiteral("products"), QStringLiteral("modules"),
-                                            StringConstants::moduleProviders(),
-                                            StringConstants::qbsModule()});
-        bool ok = false;
-        for (const auto &prefix : prefixes) {
-            if (key.startsWith(prefix + QLatin1Char('.'))) {
-                ok = true;
-                break;
-            }
-        }
-        if (ok) {
-            collectNameFromOverride(key);
-            continue;
-        }
-        ErrorInfo e(Tr::tr("Property override key '%1' not understood.").arg(key));
-        e.append(Tr::tr("Please use one of the following:"));
-        e.append(QLatin1Char('\t') + Tr::tr("projects.<project-name>.<property-name>:value"));
-        e.append(QLatin1Char('\t') + Tr::tr("products.<product-name>.<property-name>:value"));
-        e.append(QLatin1Char('\t') + Tr::tr("modules.<module-name>.<property-name>:value"));
-        e.append(QLatin1Char('\t') + Tr::tr("products.<product-name>.<module-name>."
-                                            "<property-name>:value"));
-        e.append(QLatin1Char('\t') + Tr::tr("moduleProviders.<provider-name>."
-                                            "<property-name>:value"));
-        handlePropertyError(e, m_parameters, m_logger);
-    }
-
-    ModuleLoaderResult result;
-    result.profileConfigs = m_storedProfiles;
-    m_pool = result.itemPool.get();
-    m_reader->setPool(m_pool);
-
-    const QStringList topLevelSearchPaths = parameters.finalBuildConfigurationTree()
-            .value(StringConstants::projectPrefix()).toMap()
-            .value(StringConstants::qbsSearchPathsProperty()).toStringList();
-    Item *root;
-    {
-        SearchPathsManager searchPathsManager(m_reader.get(), topLevelSearchPaths);
-        root = loadItemFromFile(parameters.projectFilePath(), CodeLocation());
-        if (!root)
-            return ModuleLoaderResult();
-    }
-
-    switch (root->type()) {
-    case ItemType::Product:
-        root = wrapInProjectIfNecessary(root);
-        break;
-    case ItemType::Project:
-        break;
-    default:
-        throw ErrorInfo(Tr::tr("The top-level item must be of type 'Project' or 'Product', but it"
-                               " is of type '%1'.").arg(root->typeName()), root->location());
-    }
-
-    const QString buildDirectory = TopLevelProject::deriveBuildDirectory(parameters.buildRoot(),
-            TopLevelProject::deriveId(parameters.finalBuildConfigurationTree()));
-    root->setProperty(StringConstants::sourceDirectoryProperty(),
-                      VariantValue::create(QFileInfo(root->file()->filePath()).absolutePath()));
-    root->setProperty(StringConstants::buildDirectoryProperty(),
-                      VariantValue::create(buildDirectory));
-    root->setProperty(StringConstants::profileProperty(),
-                      VariantValue::create(m_parameters.topLevelProfile()));
-    handleTopLevelProject(&result, root, buildDirectory,
-                  Set<QString>() << QDir::cleanPath(parameters.projectFilePath()));
-    result.root = root;
-    result.qbsFiles = m_reader->filesRead() - m_moduleProviderLoader->tempQbsFiles();
-    for (auto it = m_localProfiles.cbegin(); it != m_localProfiles.cend(); ++it)
-        result.profileConfigs.remove(it.key());
-    printProfilingInfo();
-    return result;
-}
-
-class PropertyDeclarationCheck : public ValueHandler
-{
-    const Set<Item *> &m_disabledItems;
-    Set<Item *> m_handledItems;
-    std::vector<Item *> m_parentItems;
-    Item *m_currentModuleInstance = nullptr;
-    QualifiedId m_currentModuleName;
-    QString m_currentName;
-    SetupProjectParameters m_params;
-    Logger &m_logger;
-public:
-    PropertyDeclarationCheck(const Set<Item *> &disabledItems,
-                             SetupProjectParameters params, Logger &logger)
-        : m_disabledItems(disabledItems)
-        , m_params(std::move(params))
-        , m_logger(logger)
-    {
-    }
-
-    void operator()(Item *item)
-    {
-        handleItem(item);
-    }
-
-private:
-    void handle(JSSourceValue *value) override
-    {
-        if (!value->createdByPropertiesBlock()) {
-            const ErrorInfo error(Tr::tr("Property '%1' is not declared.")
-                                  .arg(m_currentName), value->location());
-            handlePropertyError(error, m_params, m_logger);
-        }
-    }
-
-    void handle(ItemValue *value) override
-    {
-        if (checkItemValue(value))
-            handleItem(value->item());
-    }
-
-    bool checkItemValue(ItemValue *value)
-    {
-        // TODO: Remove once QBS-1030 is fixed.
-        if (parentItem()->type() == ItemType::Artifact)
-            return false;
-
-        if (parentItem()->type() == ItemType::Properties)
-            return false;
-
-        if (parentItem()->isOfTypeOrhasParentOfType(ItemType::Export)) {
-            // Export item prototypes do not have instantiated modules.
-            // The module instances are where the Export is used.
-            QBS_ASSERT(m_currentModuleInstance, return false);
-            auto hasCurrentModuleName = [this](const Item::Module &m) {
-                return m.name == m_currentModuleName;
-            };
-            if (any_of(m_currentModuleInstance->modules(), hasCurrentModuleName))
-                return true;
-        }
-
-        // TODO: We really should have a dedicated item type for "pre-instantiated" item values
-        //       and only use ModuleInstance for actual module instances.
-        const bool itemIsModuleInstance = value->item()->type() == ItemType::ModuleInstance
-                && value->item()->hasProperty(StringConstants::presentProperty());
-
-        if (!itemIsModuleInstance
-                && value->item()->type() != ItemType::ModulePrefix
-                && (!parentItem()->file() || !parentItem()->file()->idScope()
-                    || !parentItem()->file()->idScope()->hasProperty(m_currentName))
-                && !value->createdByPropertiesBlock()) {
-            CodeLocation location = value->location();
-            for (int i = int(m_parentItems.size() - 1); !location.isValid() && i >= 0; --i)
-                location = m_parentItems.at(i)->location();
-            const ErrorInfo error(Tr::tr("Item '%1' is not declared. "
-                                         "Did you forget to add a Depends item?")
-                                  .arg(m_currentModuleName.toString()), location);
-            handlePropertyError(error, m_params, m_logger);
-            return false;
-        }
-
-        return true;
-    }
-
-    void handleItem(Item *item)
-    {
-        if (!m_handledItems.insert(item).second)
-            return;
-        if (m_disabledItems.contains(item)
-                || (item->type() == ItemType::ModuleInstance && !item->isPresentModule())
-                || item->type() == ItemType::Properties
-
-                // The Properties child of a SubProject item is not a regular item.
-                || item->type() == ItemType::PropertiesInSubProject) {
-            return;
-        }
-
-        // If a module was found but its validate script failed, only the canonical
-        // module instance will have the "non-present" flag set, so we need to locate it.
-        if (item->type() == ItemType::ModuleInstance) {
-            const Item *productItem = nullptr;
-            for (auto it = m_parentItems.rbegin(); it != m_parentItems.rend(); ++it) {
-                if ((*it)->type() == ItemType::Product) {
-                    productItem = *it;
-                    break;
-                }
-            }
-            if (productItem) {
-                for (const Item::Module &m : productItem->modules()) {
-                    if (m.name == m_currentModuleName) {
-                        if (!m.item->isPresentModule())
-                            return;
-                        break;
-                    }
-                }
-            }
-        }
-
-        m_parentItems.push_back(item);
-        for (Item::PropertyMap::const_iterator it = item->properties().constBegin();
-                it != item->properties().constEnd(); ++it) {
-            if (item->type() == ItemType::Product && it.key() == StringConstants::moduleProviders()
-                    && it.value()->type() == Value::ItemValueType)
-                continue;
-            const PropertyDeclaration decl = item->propertyDeclaration(it.key());
-            if (decl.isValid()) {
-                if (!decl.isDeprecated())
-                    continue;
-                const DeprecationInfo &di = decl.deprecationInfo();
-                QString message;
-                bool warningOnly;
-                if (decl.isExpired()) {
-                    message = Tr::tr("The property '%1' can no longer be used. "
-                                     "It was removed in Qbs %2.")
-                            .arg(decl.name(), di.removalVersion().toString());
-                    warningOnly = false;
-                } else {
-                    message = Tr::tr("The property '%1' is deprecated and will be removed "
-                                     "in Qbs %2.").arg(decl.name(), di.removalVersion().toString());
-                    warningOnly = true;
-                }
-                ErrorInfo error(message, it.value()->location());
-                if (!di.additionalUserInfo().isEmpty())
-                    error.append(di.additionalUserInfo());
-                if (warningOnly)
-                    m_logger.printWarning(error);
-                else
-                    handlePropertyError(error, m_params, m_logger);
-                continue;
-            }
-            m_currentName = it.key();
-            const QualifiedId oldModuleName = m_currentModuleName;
-            if (parentItem()->type() != ItemType::ModulePrefix)
-                m_currentModuleName.clear();
-            m_currentModuleName.push_back(m_currentName);
-            it.value()->apply(this);
-            m_currentModuleName = oldModuleName;
-        }
-        m_parentItems.pop_back();
-        for (Item * const child : item->children()) {
-            switch (child->type()) {
-            case ItemType::Export:
-            case ItemType::Depends:
-            case ItemType::Parameter:
-            case ItemType::Parameters:
-                break;
-            case ItemType::Group:
-                if (item->type() == ItemType::Module || item->type() == ItemType::ModuleInstance)
-                    break;
-                Q_FALLTHROUGH();
-            default:
-                handleItem(child);
-            }
-        }
-
-        // Properties that don't refer to an existing module with a matching Depends item
-        // only exist in the prototype of an Export item, not in the instance.
-        // Example 1 - setting a property of an unknown module: Export { abc.def: true }
-        // Example 2 - setting a non-existing Export property: Export { blubb: true }
-        if (item->type() == ItemType::ModuleInstance && item->prototype()) {
-            Item *oldInstance = m_currentModuleInstance;
-            m_currentModuleInstance = item;
-            handleItem(item->prototype());
-            m_currentModuleInstance = oldInstance;
-        }
-    }
-
-    void handle(VariantValue *) override { /* only created internally - no need to check */ }
-
-    Item *parentItem() const { return m_parentItems.back(); }
-};
-
-void ModuleLoader::handleTopLevelProject(ModuleLoaderResult *loadResult, Item *projectItem,
-        const QString &buildDirectory, const Set<QString> &referencedFilePaths)
-{
-    TopLevelProjectContext tlp;
-    tlp.buildDirectory = buildDirectory;
-    handleProject(loadResult, &tlp, projectItem, referencedFilePaths);
-    checkProjectNamesInOverrides(tlp);
-    collectProductsByName(tlp);
-    checkProductNamesInOverrides();
-
-    adjustDependenciesForMultiplexing(tlp);
-
-    m_dependencyResolvingPass = 1;
-    for (ProjectContext * const projectContext : qAsConst(tlp.projects)) {
-        m_reader->setExtraSearchPathsStack(projectContext->searchPathsStack);
-        for (ProductContext &productContext : projectContext->products) {
-            try {
-                setupProductDependencies(&productContext, Set<DeferredDependsContext>());
-            } catch (const ErrorInfo &err) {
-                if (productContext.name.isEmpty())
-                    throw err;
-                handleProductError(err, &productContext);
-            }
-            // extraSearchPathsStack is changed during dependency resolution, check
-            // that we've rolled back all the changes
-            QBS_CHECK(m_reader->extraSearchPathsStack() == projectContext->searchPathsStack);
-        }
-    }
-    if (!m_productsWithDeferredDependsItems.empty() || !m_exportsWithDeferredDependsItems.empty()) {
-        collectProductsByType(tlp);
-        m_dependencyResolvingPass = 2;
-
-        // Doing the normalization for the Export items themselves (as opposed to doing it only
-        // for the corresponding module instances) serves two purposes:
-        // (1) It makes recursive use of Depends.productTypes via Export items work; otherwise,
-        //     we'd need an additional dependency resolving pass for every export level.
-        // (2) The "expanded" Depends items are available to the Exporter.qbs module.
-        for (Item * const exportItem : m_exportsWithDeferredDependsItems)
-            normalizeDependencies(nullptr, DeferredDependsContext(nullptr, exportItem));
-
-        for (const auto &deferredDependsData : m_productsWithDeferredDependsItems) {
-            ProductContext * const productContext = deferredDependsData.first;
-            m_reader->setExtraSearchPathsStack(productContext->project->searchPathsStack);
-            try {
-                setupProductDependencies(productContext, deferredDependsData.second);
-            } catch (const ErrorInfo &err) {
-                handleProductError(err, productContext);
-            }
-        }
-    }
-
-    ProductSortByDependencies productSorter(tlp);
-    productSorter.apply();
-    for (ProductContext * const p : productSorter.sortedProducts()) {
-        try {
-            handleProduct(p);
-            if (p->name.startsWith(StringConstants::shadowProductPrefix()))
-                tlp.probes << p->info.probes;
-        } catch (const ErrorInfo &err) {
-            handleProductError(err, p);
-        }
-    }
-
-    loadResult->projectProbes = tlp.probes;
-    loadResult->storedModuleProviderInfo = m_moduleProviderLoader->storedModuleProviderInfo();
-
-    m_reader->clearExtraSearchPathsStack();
-    AccumulatingTimer timer(m_parameters.logElapsedTime()
-                            ? &m_elapsedTimePropertyChecking : nullptr);
-    PropertyDeclarationCheck check(m_disabledItems, m_parameters, m_logger);
-    check(projectItem);
-}
-
-void ModuleLoader::handleProject(ModuleLoaderResult *loadResult,
-        TopLevelProjectContext *topLevelProjectContext, Item *projectItem,
-        const Set<QString> &referencedFilePaths)
-{
-    auto p = std::make_unique<ProjectContext>();
-    auto &projectContext = *p;
-    projectContext.topLevelProject = topLevelProjectContext;
-    projectContext.result = loadResult;
-    ItemValuePtr itemValue = ItemValue::create(projectItem);
-    projectContext.scope = Item::create(m_pool, ItemType::Scope);
-    projectContext.scope->setFile(projectItem->file());
-    projectContext.scope->setProperty(StringConstants::projectVar(), itemValue);
-    ProductContext dummyProductContext;
-    dummyProductContext.project = &projectContext;
-    dummyProductContext.moduleProperties = m_parameters.finalBuildConfigurationTree();
-    projectItem->addModule(loadBaseModule(&dummyProductContext, projectItem));
-    overrideItemProperties(projectItem, StringConstants::projectPrefix(),
-                           m_parameters.overriddenValuesTree());
-    projectContext.name = m_evaluator->stringValue(projectItem,
-                                                   StringConstants::nameProperty());
-    if (projectContext.name.isEmpty()) {
-        projectContext.name = FileInfo::baseName(projectItem->location().filePath());
-        projectItem->setProperty(StringConstants::nameProperty(),
-                                 VariantValue::create(projectContext.name));
-    }
-    overrideItemProperties(projectItem,
-                           StringConstants::projectsOverridePrefix() + projectContext.name,
-                           m_parameters.overriddenValuesTree());
-    if (!checkItemCondition(projectItem)) {
-        m_disabledProjects.insert(projectContext.name);
-        return;
-    }
-    topLevelProjectContext->projects.push_back(p.release());
-    SearchPathsManager searchPathsManager(m_reader.get(), readExtraSearchPaths(projectItem)
-                                          << projectItem->file()->dirPath());
-    projectContext.searchPathsStack = m_reader->extraSearchPathsStack();
-    projectContext.item = projectItem;
-
-    const QString minVersionStr
-            = m_evaluator->stringValue(projectItem, StringConstants::minimumQbsVersionProperty(),
-                                       QStringLiteral("1.3.0"));
-    const Version minVersion = Version::fromString(minVersionStr);
-    if (!minVersion.isValid()) {
-        throw ErrorInfo(Tr::tr("The value '%1' of Project.minimumQbsVersion "
-                "is not a valid version string.").arg(minVersionStr), projectItem->location());
-    }
-    if (!m_qbsVersion.isValid())
-        m_qbsVersion = Version::fromString(QLatin1String(QBS_VERSION));
-    if (m_qbsVersion < minVersion) {
-        throw ErrorInfo(Tr::tr("The project requires at least qbs version %1, but "
-                               "this is qbs version %2.").arg(minVersion.toString(),
-                                                              m_qbsVersion.toString()));
-    }
-
-    for (Item * const child : projectItem->children())
-        child->setScope(projectContext.scope);
-
-    resolveProbes(&dummyProductContext, projectItem);
-    projectContext.topLevelProject->probes << dummyProductContext.info.probes;
-
-    handleProfileItems(projectItem, &projectContext);
-
-    QList<Item *> multiplexedProducts;
-    for (Item * const child : projectItem->children()) {
-        if (child->type() == ItemType::Product)
-            multiplexedProducts << multiplexProductItem(&dummyProductContext, child);
-    }
-    for (Item * const additionalProductItem : qAsConst(multiplexedProducts))
-        Item::addChild(projectItem, additionalProductItem);
-
-    const QList<Item *> originalChildren = projectItem->children();
-    for (Item * const child : originalChildren) {
-        switch (child->type()) {
-        case ItemType::Product:
-            prepareProduct(&projectContext, child);
-            break;
-        case ItemType::SubProject:
-            handleSubProject(&projectContext, child, referencedFilePaths);
-            break;
-        case ItemType::Project:
-            copyProperties(projectItem, child);
-            handleProject(loadResult, topLevelProjectContext, child, referencedFilePaths);
-            break;
-        default:
-            break;
-        }
-    }
-
-    const QStringList refs = m_evaluator->stringListValue(
-                projectItem, StringConstants::referencesProperty());
-    const CodeLocation referencingLocation
-            = projectItem->property(StringConstants::referencesProperty())->location();
-    QList<Item *> additionalProjectChildren;
-    for (const QString &filePath : refs) {
-        try {
-            additionalProjectChildren << loadReferencedFile(filePath, referencingLocation,
-                    referencedFilePaths, dummyProductContext);
-        } catch (const ErrorInfo &error) {
-            if (m_parameters.productErrorMode() == ErrorHandlingMode::Strict)
-                throw;
-            m_logger.printWarning(error);
-        }
-    }
-    for (Item * const subItem : qAsConst(additionalProjectChildren)) {
-        Item::addChild(projectContext.item, subItem);
-        switch (subItem->type()) {
-        case ItemType::Product:
-            prepareProduct(&projectContext, subItem);
-            break;
-        case ItemType::Project:
-            copyProperties(projectItem, subItem);
-            handleProject(loadResult, topLevelProjectContext, subItem,
-                          Set<QString>(referencedFilePaths) << subItem->file()->filePath());
-            break;
-        default:
-            break;
-        }
-    }
-}
-
-QString ModuleLoader::MultiplexInfo::toIdString(size_t row) const
-{
-    const auto &mprow = table.at(row);
-    QVariantMap multiplexConfiguration;
-    for (size_t column = 0; column < mprow.size(); ++column) {
-        const QString &propertyName = properties.at(column);
-        const VariantValuePtr &mpvalue = mprow.at(column);
-        multiplexConfiguration.insert(propertyName, mpvalue->value());
-    }
-    QString id = QString::fromUtf8(QJsonDocument::fromVariant(multiplexConfiguration)
-                                   .toJson(QJsonDocument::Compact)
-                                   .toBase64());
-    // Cache for later use in:multiplexIdToVariantMap()
-    multiplexConfigurationsById->localData().insert(id, multiplexConfiguration);
-    return id;
-}
-
-QVariantMap ModuleLoader::MultiplexInfo::multiplexIdToVariantMap(const QString &multiplexId)
-{
-    if (multiplexId.isEmpty())
-        return QVariantMap();
-
-    QVariantMap result = multiplexConfigurationsById->localData().value(multiplexId);
-    // We assume that MultiplexInfo::toIdString() has been called for this
-    // particular multiplex configuration.
-    QBS_CHECK(!result.isEmpty());
-    return result;
-}
-
-void qbs::Internal::ModuleLoader::ModuleLoader::dump(const ModuleLoader::MultiplexInfo &mpi)
-{
-    QStringList header;
-    for (const auto &str : mpi.properties)
-        header << str;
-    qDebug() << header;
-
-    for (const auto &row : mpi.table) {
-        QVariantList values;
-        for (const auto &elem : row) {
-            values << elem->value();
-        }
-        qDebug() << values;
-    }
-}
-
-ModuleLoader::MultiplexTable ModuleLoader::combine(const MultiplexTable &table,
-                                                   const MultiplexRow &values)
-{
-    MultiplexTable result;
-    if (table.empty()) {
-        result.resize(values.size());
-        for (size_t i = 0; i < values.size(); ++i) {
-            MultiplexRow row;
-            row.resize(1);
-            row[0] = values.at(i);
-            result[i] = row;
-        }
-    } else {
-        for (const auto &row : table) {
-            for (const auto &value : values) {
-                MultiplexRow newRow = row;
-                newRow.push_back(value);
-                result.push_back(newRow);
-            }
-        }
-    }
-    return result;
-}
-
-ModuleLoader::MultiplexInfo ModuleLoader::extractMultiplexInfo(Item *productItem,
-                                                               Item *qbsModuleItem)
-{
-    static const QString mpmKey = QStringLiteral("multiplexMap");
-
-    const QScriptValue multiplexMap = m_evaluator->value(qbsModuleItem, mpmKey);
-    const QStringList multiplexByQbsProperties = m_evaluator->stringListValue(
-                productItem, StringConstants::multiplexByQbsPropertiesProperty());
-
-    MultiplexInfo multiplexInfo;
-    multiplexInfo.aggregate = m_evaluator->boolValue(
-                productItem, StringConstants::aggregateProperty());
-
-    const QString multiplexedType = m_evaluator->stringValue(
-                productItem, StringConstants::multiplexedTypeProperty());
-    if (!multiplexedType.isEmpty())
-        multiplexInfo.multiplexedType = VariantValue::create(multiplexedType);
-
-    Set<QString> uniqueMultiplexByQbsProperties;
-    for (const QString &key : multiplexByQbsProperties) {
-        const QString mappedKey = multiplexMap.property(key).toString();
-        if (mappedKey.isEmpty())
-            throw ErrorInfo(Tr::tr("There is no entry for '%1' in 'qbs.multiplexMap'.").arg(key));
-
-        if (!uniqueMultiplexByQbsProperties.insert(mappedKey).second) {
-            throw ErrorInfo(Tr::tr("Duplicate entry '%1' in Product.%2.")
-                            .arg(mappedKey, StringConstants::multiplexByQbsPropertiesProperty()),
-                            productItem->location());
-        }
-
-        const QScriptValue arr = m_evaluator->value(qbsModuleItem, key);
-        if (arr.isUndefined())
-            continue;
-        if (!arr.isArray())
-            throw ErrorInfo(Tr::tr("Property '%1' must be an array.").arg(key));
-
-        const quint32 arrlen = arr.property(StringConstants::lengthProperty()).toUInt32();
-        if (arrlen == 0)
-            continue;
-
-        MultiplexRow mprow;
-        mprow.resize(arrlen);
-        QVariantList entriesForKey;
-        for (quint32 i = 0; i < arrlen; ++i) {
-            const QVariant value = arr.property(i).toVariant();
-            if (entriesForKey.contains(value)) {
-                throw ErrorInfo(Tr::tr("Duplicate entry '%1' in qbs.%2.")
-                                .arg(value.toString(), key), productItem->location());
-            }
-            entriesForKey << value;
-            mprow[i] = VariantValue::create(value);
-        }
-        multiplexInfo.table = combine(multiplexInfo.table, mprow);
-        multiplexInfo.properties.push_back(mappedKey);
-    }
-    return multiplexInfo;
-}
-
-template <typename T, typename F>
-T ModuleLoader::callWithTemporaryBaseModule(ProductContext *productContext, const F &func)
-{
-    // Temporarily attach the qbs module here, in case we need to access one of its properties
-    // to evaluate properties.
-    const QString &qbsKey = StringConstants::qbsModule();
-    Item *productItem = productContext->item;
-    ValuePtr qbsValue = productItem->property(qbsKey); // Retrieve now to restore later.
-    if (qbsValue)
-        qbsValue = qbsValue->clone();
-    const Item::Module qbsModule = loadBaseModule(productContext, productItem);
-    productItem->addModule(qbsModule);
-
-    auto &&result = func(qbsModule);
-
-    // "Unload" the qbs module again.
-    if (qbsValue)
-        productItem->setProperty(qbsKey, qbsValue);
-    else
-        productItem->removeProperty(qbsKey);
-    productItem->removeModules();
-
-    return std::forward<T>(result);
-}
-
-QList<Item *> ModuleLoader::multiplexProductItem(ProductContext *dummyContext, Item *productItem)
-{
-    QString productName;
-    dummyContext->item = productItem;
-    auto extractMultiplexInfoFromProduct
-            = [this, productItem, &productName](const Item::Module &qbsModule) {
-        // Overriding the product item properties must be done here already, because multiplexing
-        // properties might depend on product properties.
-        const QString &nameKey = StringConstants::nameProperty();
-        productName = m_evaluator->stringValue(productItem, nameKey);
-        if (productName.isEmpty()) {
-            productName = FileInfo::completeBaseName(productItem->file()->filePath());
-            productItem->setProperty(nameKey, VariantValue::create(productName));
-        }
-        overrideItemProperties(productItem, StringConstants::productsOverridePrefix() + productName,
-                               m_parameters.overriddenValuesTree());
-
-        return extractMultiplexInfo(productItem, qbsModule.item);
-    };
-    const auto multiplexInfo
-            = callWithTemporaryBaseModule<const MultiplexInfo>(dummyContext,
-                                                               extractMultiplexInfoFromProduct);
-
-    if (multiplexInfo.table.size() > 1)
-        productItem->setProperty(StringConstants::multiplexedProperty(), VariantValue::trueValue());
-
-    VariantValuePtr productNameValue = VariantValue::create(productName);
-
-    Item *aggregator = multiplexInfo.aggregate ? productItem->clone() : nullptr;
-    QList<Item *> additionalProductItems;
-    std::vector<VariantValuePtr> multiplexConfigurationIdValues;
-    for (size_t row = 0; row < multiplexInfo.table.size(); ++row) {
-        Item *item = productItem;
-        const auto &mprow = multiplexInfo.table.at(row);
-        QBS_CHECK(mprow.size() == multiplexInfo.properties.size());
-        if (row > 0) {
-            item = productItem->clone();
-            additionalProductItems.push_back(item);
-        }
-        const QString multiplexConfigurationId = multiplexInfo.toIdString(row);
-        const VariantValuePtr multiplexConfigurationIdValue
-            = VariantValue::create(multiplexConfigurationId);
-        if (multiplexInfo.table.size() > 1 || aggregator) {
-            multiplexConfigurationIdValues.push_back(multiplexConfigurationIdValue);
-            item->setProperty(StringConstants::multiplexConfigurationIdProperty(),
-                              multiplexConfigurationIdValue);
-        }
-        if (multiplexInfo.multiplexedType)
-            item->setProperty(StringConstants::typeProperty(), multiplexInfo.multiplexedType);
-        for (size_t column = 0; column < mprow.size(); ++column) {
-            Item *qbsItem = moduleInstanceItem(item, StringConstants::qbsModule());
-            const QString &propertyName = multiplexInfo.properties.at(column);
-            const VariantValuePtr &mpvalue = mprow.at(column);
-            qbsItem->setProperty(propertyName, mpvalue);
-        }
-    }
-
-    if (aggregator) {
-        additionalProductItems << aggregator;
-
-        // Add dependencies to all multiplexed instances.
-        for (const auto &v : multiplexConfigurationIdValues) {
-            Item *dependsItem = Item::create(aggregator->pool(), ItemType::Depends);
-            dependsItem->setProperty(StringConstants::nameProperty(), productNameValue);
-            dependsItem->setProperty(StringConstants::multiplexConfigurationIdProperty(), v);
-            dependsItem->setProperty(StringConstants::profilesProperty(),
-                                     VariantValue::create(QStringList()));
-            dependsItem->setFile(aggregator->file());
-            dependsItem->setupForBuiltinType(m_logger);
-            Item::addChild(aggregator, dependsItem);
-        }
-    }
-
-    return additionalProductItems;
-}
-
-void ModuleLoader::normalizeDependencies(ProductContext *product,
-                                         const DeferredDependsContext &dependsContext)
-{
-    std::vector<Item *> dependsItemsToAdd;
-    std::vector<Item *> dependsItemsToRemove;
-    std::vector<Item *> deferredDependsItems;
-    for (Item *dependsItem : dependsContext.parentItem->children()) {
-        if (dependsItem->type() != ItemType::Depends)
-            continue;
-        bool productTypesIsSet;
-        const FileTags productTypes = m_evaluator->fileTagsValue(dependsItem,
-                StringConstants::productTypesProperty(), &productTypesIsSet);
-        if (productTypesIsSet) {
-            bool nameIsSet;
-            m_evaluator->stringValue(dependsItem, StringConstants::nameProperty(), QString(),
-                                     &nameIsSet);
-
-            // The second condition is for the case where the dependency comes from an Export item
-            // that has itself been normalized in the mean time.
-            if (nameIsSet && !dependsItem->variantProperty(StringConstants::nameProperty())) {
-                throw ErrorInfo(Tr::tr("The 'productTypes' and 'name' properties are mutually "
-                                       "exclusive."), dependsItem->location());
-            }
-
-            bool submodulesPropertySet;
-            m_evaluator->stringListValue( dependsItem, StringConstants::submodulesProperty(),
-                                          &submodulesPropertySet);
-            if (submodulesPropertySet) {
-                throw ErrorInfo(Tr::tr("The 'productTypes' and 'subModules' properties are "
-                                       "mutually exclusive."), dependsItem->location());
-            }
-
-            // We ignore the "limitToSubProject" property for dependencies from Export items,
-            // because we cannot make it work consistently, as the importing product is not
-            // yet known when normalizing via an Export item.
-            const bool limitToSubProject = dependsContext.parentItem->type() == ItemType::Product
-                    && m_evaluator->boolValue(dependsItem,
-                                              StringConstants::limitToSubProjectProperty());
-            static const auto hasSameSubProject
-                    = [](const ProductContext &product, const ProductContext &other) {
-                for (const Item *otherParent = other.item->parent(); otherParent;
-                     otherParent = otherParent->parent()) {
-                    if (otherParent == product.item->parent())
-                        return true;
-                }
-                return false;
-            };
-            std::vector<const ProductContext *> matchingProducts;
-            for (const FileTag &typeTag : productTypes) {
-                const auto range = m_productsByType.equal_range(typeTag);
-                for (auto it = range.first; it != range.second; ++it) {
-                    if (it->second != product
-                            && (!product || it->second->name != product->name)
-                            && (!limitToSubProject || hasSameSubProject(*product, *it->second))) {
-                        matchingProducts.push_back(it->second);
-                    }
-                }
-            }
-            if (matchingProducts.empty()) {
-                qCDebug(lcModuleLoader) << "Depends.productTypes does not match anything."
-                                        << dependsItem->location();
-                dependsItemsToRemove.push_back(dependsItem);
-                continue;
-            }
-            if (dependsContext.parentItem->type() != ItemType::Export)
-                deferredDependsItems.push_back(dependsItem);
-            for (std::size_t i = 1; i < matchingProducts.size(); ++i) {
-                Item * const dependsClone = dependsItem->clone();
-                dependsClone->setProperty(StringConstants::nameProperty(),
-                                         VariantValue::create(matchingProducts.at(i)->name));
-                dependsItemsToAdd.push_back(dependsClone);
-                if (dependsContext.parentItem->type() != ItemType::Export)
-                    deferredDependsItems.push_back(dependsClone);
-
-            }
-            dependsItem->setProperty(StringConstants::nameProperty(),
-                                     VariantValue::create(matchingProducts.front()->name));
-        }
-    }
-    for (Item * const newDependsItem : dependsItemsToAdd)
-        Item::addChild(dependsContext.parentItem, newDependsItem);
-    for (Item * const dependsItem : dependsItemsToRemove)
-        Item::removeChild(dependsContext.parentItem, dependsItem);
-    if (!deferredDependsItems.empty()) {
-        auto &allDeferredDependsItems
-                = product->deferredDependsItems[dependsContext.exportingProductItem];
-        allDeferredDependsItems.insert(allDeferredDependsItems.end(), deferredDependsItems.cbegin(),
-                                       deferredDependsItems.cend());
-    }
-}
-
-void ModuleLoader::adjustDependenciesForMultiplexing(const TopLevelProjectContext &tlp)
-{
-    for (const ProjectContext * const project : tlp.projects) {
-        for (const ProductContext &product : project->products)
-            adjustDependenciesForMultiplexing(product);
-    }
-}
-
-void ModuleLoader::adjustDependenciesForMultiplexing(const ModuleLoader::ProductContext &product)
-{
-    for (Item *dependsItem : product.item->children()) {
-        if (dependsItem->type() == ItemType::Depends)
-            adjustDependenciesForMultiplexing(product, dependsItem);
-    }
-}
-
-void ModuleLoader::adjustDependenciesForMultiplexing(const ProductContext &product,
-                                                     Item *dependsItem)
-{
-    const QString name = m_evaluator->stringValue(dependsItem, StringConstants::nameProperty());
-    const bool productIsMultiplexed = !product.multiplexConfigurationId.isEmpty();
-    if (name == product.name) {
-        QBS_CHECK(!productIsMultiplexed); // This product must be an aggregator.
-        return;
-    }
-
-    bool profilesPropertyIsSet;
-    const QStringList profiles = m_evaluator->stringListValue(dependsItem,
-            StringConstants::profilesProperty(), &profilesPropertyIsSet);
-
-    const auto productRange = m_productsByName.equal_range(name);
-    if (productRange.first == productRange.second) {
-        // Dependency is a module. Nothing to adjust.
-        return;
-    }
-
-    std::vector<const ProductContext *> multiplexedDependencies;
-    bool hasNonMultiplexedDependency = false;
-    for (auto it = productRange.first; it != productRange.second; ++it) {
-        if (!it->second->multiplexConfigurationId.isEmpty())
-            multiplexedDependencies.push_back(it->second);
-        else
-            hasNonMultiplexedDependency = true;
-    }
-    bool hasMultiplexedDependencies = !multiplexedDependencies.empty();
-
-    // These are the allowed cases:
-    // (1) Normal dependency with no multiplexing whatsoever.
-    // (2) Both product and dependency are multiplexed.
-    //     (2a) The profiles property is not set, we want to depend on the best
-    //          matching variant.
-    //     (2b) The profiles property is set, we want to depend on all variants
-    //          with a matching profile.
-    // (3) The product is not multiplexed, but the dependency is.
-    //     (3a) The profiles property is not set, the dependency has an aggregator.
-    //          We want to depend on the aggregator.
-    //     (3b) The profiles property is not set, the dependency does not have an
-    //          aggregator. We want to depend on all the multiplexed variants.
-    //     (3c) The profiles property is set, we want to depend on all variants
-    //          with a matching profile regardless of whether an aggregator exists or not.
-    // (4) The product is multiplexed, but the dependency is not. We don't have to adapt
-    //     any Depends items.
-    // (5) The product is a "shadow product". In that case, we know which product
-    //     it should have a dependency on, and we make sure we depend on that.
-
-    // (1) and (4)
-    if (!hasMultiplexedDependencies)
-        return;
-
-    // (3a)
-    if (!productIsMultiplexed && hasNonMultiplexedDependency && !profilesPropertyIsSet)
-        return;
-
-    QStringList multiplexIds;
-    const ShadowProductInfo shadowProductInfo = getShadowProductInfo(product);
-    const bool isShadowProduct = shadowProductInfo.first && shadowProductInfo.second == name;
-    const auto productMultiplexConfig =
-            MultiplexInfo::multiplexIdToVariantMap(product.multiplexConfigurationId);
-
-    for (const ProductContext *dependency : multiplexedDependencies) {
-        const bool depMatchesShadowProduct = isShadowProduct
-                && dependency->item == product.item->parent();
-        const QString depMultiplexId = dependency->multiplexConfigurationId;
-        if (depMatchesShadowProduct) { // (5)
-            dependsItem->setProperty(StringConstants::multiplexConfigurationIdsProperty(),
-                                     VariantValue::create(depMultiplexId));
-            return;
-        }
-        if (productIsMultiplexed && !profilesPropertyIsSet) { // 2a
-            if (dependency->multiplexConfigurationId == product.multiplexConfigurationId) {
-                const ValuePtr &multiplexId = product.item->property(
-                            StringConstants::multiplexConfigurationIdProperty());
-                dependsItem->setProperty(StringConstants::multiplexConfigurationIdsProperty(),
-                                         multiplexId);
-                return;
-
-            } else {
-                // Otherwise collect partial matches and decide later
-                const auto dependencyMultiplexConfig =
-                        MultiplexInfo::multiplexIdToVariantMap(dependency->multiplexConfigurationId);
-
-                if (multiplexConfigurationIntersects(dependencyMultiplexConfig, productMultiplexConfig))
-                    multiplexIds << dependency->multiplexConfigurationId;
-            }
-        } else {
-            // (2b), (3b) or (3c)
-            const bool profileMatch = !profilesPropertyIsSet || profiles.empty()
-                    || profiles.contains(dependency->profileName);
-            if (profileMatch)
-                multiplexIds << depMultiplexId;
-        }
-    }
-    if (multiplexIds.empty()) {
-        const QString productName = ResolvedProduct::fullDisplayName(
-                    product.name, product.multiplexConfigurationId);
-        throw ErrorInfo(Tr::tr("Dependency from product '%1' to product '%2' not fulfilled. "
-                               "There are no eligible multiplex candidates.").arg(productName,
-                                                                                  name),
-                        dependsItem->location());
-    }
-
-    // In case of (2a), at most 1 match is allowed
-    if (productIsMultiplexed && !profilesPropertyIsSet && multiplexIds.size() > 1) {
-        const QString productName = ResolvedProduct::fullDisplayName(
-                    product.name, product.multiplexConfigurationId);
-        QStringList candidateNames;
-        for (const auto &id : qAsConst(multiplexIds))
-            candidateNames << ResolvedProduct::fullDisplayName(name, id);
-        throw ErrorInfo(Tr::tr("Dependency from product '%1' to product '%2' is ambiguous. "
-                               "Eligible multiplex candidates: %3.").arg(
-                            productName, name, candidateNames.join(QLatin1String(", "))),
-                        dependsItem->location());
-    }
-
-    dependsItem->setProperty(StringConstants::multiplexConfigurationIdsProperty(),
-                             VariantValue::create(multiplexIds));
-}
-
-void ModuleLoader::prepareProduct(ProjectContext *projectContext, Item *productItem)
-{
-    AccumulatingTimer timer(m_parameters.logElapsedTime()
-                            ? &m_elapsedTimePrepareProducts : nullptr);
-    checkCancelation();
-    qCDebug(lcModuleLoader) << "prepareProduct" << productItem->file()->filePath();
-
-    ProductContext productContext;
-    productContext.item = productItem;
-    productContext.project = projectContext;
-    productContext.name = m_evaluator->stringValue(productItem, StringConstants::nameProperty());
-    QBS_CHECK(!productContext.name.isEmpty());
-    const ItemValueConstPtr qbsItemValue = productItem->itemProperty(StringConstants::qbsModule());
-    if (!!qbsItemValue && qbsItemValue->item()->hasProperty(StringConstants::profileProperty())) {
-        qbsItemValue->item()->setProperty(StringConstants::nameProperty(),
-                                          VariantValue::create(StringConstants::nameProperty()));
-        auto evaluateQbsProfileProperty = [this](const Item::Module &qbsModule) {
-            return m_evaluator->stringValue(qbsModule.item,
-                                            StringConstants::profileProperty(), QString());
-        };
-        productContext.profileName
-                = callWithTemporaryBaseModule<QString>(&productContext,
-                                                       evaluateQbsProfileProperty);
-    } else {
-        productContext.profileName = m_parameters.topLevelProfile();
-    }
-    productContext.multiplexConfigurationId = m_evaluator->stringValue(
-                productItem, StringConstants::multiplexConfigurationIdProperty());
-    QBS_CHECK(!productContext.profileName.isEmpty());
-    const auto it = projectContext->result->profileConfigs.constFind(productContext.profileName);
-    if (it == projectContext->result->profileConfigs.constEnd()) {
-        const Profile profile(productContext.profileName, m_settings.get(), m_localProfiles);
-        if (!profile.exists()) {
-            ErrorInfo error(Tr::tr("Profile '%1' does not exist.").arg(profile.name()),
-                             productItem->location());
-            handleProductError(error, &productContext);
-            return;
-        }
-        const QVariantMap buildConfig = SetupProjectParameters::expandedBuildConfiguration(
-                    profile, m_parameters.configurationName());
-        productContext.moduleProperties = SetupProjectParameters::finalBuildConfigurationTree(
-                    buildConfig, m_parameters.overriddenValues());
-        projectContext->result->profileConfigs.insert(productContext.profileName,
-                                                      productContext.moduleProperties);
-    } else {
-        productContext.moduleProperties = it.value().toMap();
-    }
-    initProductProperties(productContext);
-
-    ItemValuePtr itemValue = ItemValue::create(productItem);
-    productContext.scope = Item::create(m_pool, ItemType::Scope);
-    productContext.scope->setProperty(StringConstants::productVar(), itemValue);
-    productContext.scope->setFile(productItem->file());
-    productContext.scope->setScope(productContext.project->scope);
-
-    const bool hasExportItems = mergeExportItems(productContext);
-
-    setScopeForDescendants(productItem, productContext.scope);
-
-    projectContext->products.push_back(productContext);
-
-    if (!hasExportItems || getShadowProductInfo(productContext).first)
-        return;
-
-    // This "shadow product" exists only to pull in a dependency on the actual product
-    // and nothing else, thus providing us with the pure environment that we need to
-    // evaluate the product's exported properties in isolation in the project resolver.
-    Item * const importer = Item::create(productItem->pool(), ItemType::Product);
-    importer->setProperty(QStringLiteral("name"),
-                          VariantValue::create(StringConstants::shadowProductPrefix()
-                                               + productContext.name));
-    importer->setFile(productItem->file());
-    importer->setLocation(productItem->location());
-    importer->setScope(projectContext->scope);
-    importer->setupForBuiltinType(m_logger);
-    Item * const dependsItem = Item::create(productItem->pool(), ItemType::Depends);
-    dependsItem->setProperty(QStringLiteral("name"), VariantValue::create(productContext.name));
-    dependsItem->setProperty(QStringLiteral("required"), VariantValue::create(false));
-    dependsItem->setFile(importer->file());
-    dependsItem->setLocation(importer->location());
-    dependsItem->setupForBuiltinType(m_logger);
-    Item::addChild(importer, dependsItem);
-    Item::addChild(productItem, importer);
-    prepareProduct(projectContext, importer);
-}
-
-void ModuleLoader::setupProductDependencies(ProductContext *productContext,
-        const Set<DeferredDependsContext> &deferredDependsContext)
-{
-    if (m_dependencyResolvingPass == 2) {
-        for (const DeferredDependsContext &ctx : deferredDependsContext)
-            normalizeDependencies(productContext, ctx);
-        for (const auto &deferralData : productContext->deferredDependsItems) {
-            for (Item * const deferredDependsItem : deferralData.second) {
-
-                // Dependencies from Export items are handled in addProductModuleDependencies().
-                if (deferredDependsItem->parent() == productContext->item)
-                    adjustDependenciesForMultiplexing(*productContext, deferredDependsItem);
-            }
-        }
-    }
-    AccumulatingTimer timer(m_parameters.logElapsedTime()
-                            ? &m_elapsedTimeProductDependencies : nullptr);
-    checkCancelation();
-    Item *item = productContext->item;
-    qCDebug(lcModuleLoader) << "setupProductDependencies" << productContext->name
-                            << productContext->item->location();
-
-    if (m_dependencyResolvingPass == 1)
-        setSearchPathsForProduct(productContext);
-
-    // Module providers may push some extra search paths which we will be cleared
-    // by this SearchPathsManager. However, they will be also added to productContext->searchPaths
-    // so second pass will take that into account
-    SearchPathsManager searchPathsManager(m_reader.get(), productContext->searchPaths);
-
-    DependsContext dependsContext;
-    dependsContext.product = productContext;
-    dependsContext.productDependencies = &productContext->info.usedProducts;
-    resolveDependencies(&dependsContext, item, productContext);
-    if (m_dependencyResolvingPass == 2
-            || !containsKey(m_productsWithDeferredDependsItems, productContext)) {
-        addProductModuleDependencies(productContext);
-    }
-    productContext->project->result->productInfos[item] = productContext->info;
-}
-
-// Leaf modules first.
-// TODO: Can this be merged with addTransitiveDependencies? Looks suspiciously similar.
-void ModuleLoader::createSortedModuleList(const Item::Module &parentModule, Item::Modules &modules)
-{
-    if (std::find_if(modules.cbegin(), modules.cend(),
-                     [parentModule](const Item::Module &m) { return m.name == parentModule.name;})
-            != modules.cend()) {
-        return;
-    }
-    for (const Item::Module &dep : parentModule.item->modules())
-        createSortedModuleList(dep, modules);
-    modules.push_back(parentModule);
-}
-
-Item::Modules ModuleLoader::modulesSortedByDependency(const Item *productItem)
-{
-    QBS_CHECK(productItem->type() == ItemType::Product);
-    Item::Modules sortedModules;
-    const Item::Modules &unsortedModules = productItem->modules();
-    for (const Item::Module &module : unsortedModules)
-        createSortedModuleList(module, sortedModules);
-    QBS_CHECK(sortedModules.size() == unsortedModules.size());
-
-    // Make sure the top-level items stay the same.
-    for (Item::Module &s : sortedModules) {
-        for (const Item::Module &u : unsortedModules) {
-            if (s.name == u.name) {
-                s.item = u.item;
-                break;
-            }
-        }
-    }
-    return sortedModules;
-}
-
-
-template<typename T> bool insertIntoSet(Set<T> &set, const T &value)
-{
-    const auto insertionResult = set.insert(value);
-    return insertionResult.second;
-}
-
-void ModuleLoader::setupReverseModuleDependencies(const Item::Module &module,
-                                                  ModuleDependencies &deps,
-                                                  QualifiedIdSet &seenModules)
-{
-    if (!insertIntoSet(seenModules, module.name))
-        return;
-    for (const Item::Module &m : module.item->modules()) {
-        deps[m.name].insert(module.name);
-        setupReverseModuleDependencies(m, deps, seenModules);
-    }
-}
-
-ModuleLoader::ModuleDependencies ModuleLoader::setupReverseModuleDependencies(const Item *product)
-{
-    ModuleDependencies deps;
-    QualifiedIdSet seenModules;
-    for (const Item::Module &m : product->modules())
-        setupReverseModuleDependencies(m, deps, seenModules);
-    return deps;
-}
-
-void ModuleLoader::handleProduct(ModuleLoader::ProductContext *productContext)
-{
-    AccumulatingTimer timer(m_parameters.logElapsedTime() ? &m_elapsedTimeHandleProducts : nullptr);
-    if (productContext->info.delayedError.hasError())
-        return;
-
-    Item * const item = productContext->item;
-
-    m_reader->setExtraSearchPathsStack(productContext->project->searchPathsStack);
-    SearchPathsManager searchPathsManager(m_reader.get(), productContext->searchPaths);
-    addTransitiveDependencies(productContext);
-
-    // It is important that dependent modules are merged after their dependency, because
-    // the dependent module's merger potentially needs to replace module items that were
-    // set by the dependency module's merger (namely, scopes of defining items; see
-    // ModuleMerger::replaceItemInScopes()).
-    Item::Modules topSortedModules = modulesSortedByDependency(item);
-    ModuleMerger::merge(m_logger, item, productContext->name, &topSortedModules);
-
-    // Re-sort the modules by name. This is more stable; see QBS-818.
-    // The list of modules in the product now has the same order as before,
-    // only the items have been replaced by their merged counterparts.
-    Item::Modules lexicographicallySortedModules = topSortedModules;
-    std::sort(lexicographicallySortedModules.begin(), lexicographicallySortedModules.end());
-    item->setModules(lexicographicallySortedModules);
-
-    for (const Item::Module &module : topSortedModules) {
-        if (!module.item->isPresentModule())
-            continue;
-        try {
-            resolveProbes(productContext, module.item);
-            if (module.versionRange.minimum.isValid()
-                    || module.versionRange.maximum.isValid()) {
-                if (module.versionRange.maximum.isValid()
-                        && module.versionRange.minimum >= module.versionRange.maximum) {
-                    throw ErrorInfo(Tr::tr("Impossible version constraint [%1,%2) set for module "
-                                           "'%3'").arg(module.versionRange.minimum.toString(),
-                                                       module.versionRange.maximum.toString(),
-                                                       module.name.toString()));
-                }
-                const Version moduleVersion = Version::fromString(
-                            m_evaluator->stringValue(module.item,
-                                                     StringConstants::versionProperty()));
-                if (moduleVersion < module.versionRange.minimum) {
-                    throw ErrorInfo(Tr::tr("Module '%1' has version %2, but it needs to be "
-                            "at least %3.").arg(module.name.toString(),
-                                                moduleVersion.toString(),
-                                                module.versionRange.minimum.toString()));
-                }
-                if (module.versionRange.maximum.isValid()
-                        && moduleVersion >= module.versionRange.maximum) {
-                    throw ErrorInfo(Tr::tr("Module '%1' has version %2, but it needs to be "
-                            "lower than %3.").arg(module.name.toString(),
-                                               moduleVersion.toString(),
-                                               module.versionRange.maximum.toString()));
-                }
-            }
-        } catch (const ErrorInfo &error) {
-            handleModuleSetupError(productContext, module, error);
-            if (productContext->info.delayedError.hasError())
-                return;
-        }
-    }
-
-    resolveProbes(productContext, item);
-
-    // Module validation must happen in an extra pass, after all Probes have been resolved.
-    EvalCacheEnabler cacheEnabler(m_evaluator);
-    for (const Item::Module &module : topSortedModules) {
-        if (!module.item->isPresentModule())
-            continue;
-        try {
-            m_evaluator->boolValue(module.item, StringConstants::validateProperty());
-            for (const auto &dep : module.item->modules()) {
-                if (dep.requiredValue && !dep.item->isPresentModule()) {
-                    throw ErrorInfo(Tr::tr("Module '%1' depends on module '%2', which was not "
-                                           "loaded successfully")
-                                    .arg(module.name.toString(), dep.name.toString()));
-                }
-            }
-        } catch (const ErrorInfo &error) {
-            handleModuleSetupError(productContext, module, error);
-            if (productContext->info.delayedError.hasError())
-                return;
-        }
-    }
-
-    if (!checkItemCondition(item)) {
-        const auto &exportsData = productContext->project->topLevelProject->productModules;
-        for (auto it = exportsData.find(productContext->name);
-             it != exportsData.end() && it.key() == productContext->name; ++it) {
-            if (it.value().multiplexId == productContext->multiplexConfigurationId) {
-                createNonPresentModule(productContext->name, QStringLiteral("disabled"),
-                                       it.value().exportItem);
-                break;
-            }
-        }
-    }
-
-    checkDependencyParameterDeclarations(productContext);
-    copyGroupsFromModulesToProduct(*productContext);
-
-    ModuleDependencies reverseModuleDeps;
-    for (Item * const child : item->children()) {
-        if (child->type() == ItemType::Group) {
-            if (reverseModuleDeps.empty())
-                reverseModuleDeps = setupReverseModuleDependencies(item);
-            handleGroup(productContext, child, reverseModuleDeps);
-        }
-    }
-    productContext->project->result->productInfos[item] = productContext->info;
-}
-
-static Item *rootPrototype(Item *item)
-{
-    Item *modulePrototype = item;
-    while (modulePrototype->prototype())
-        modulePrototype = modulePrototype->prototype();
-    return modulePrototype;
-}
-
-class DependencyParameterDeclarationCheck
-{
-public:
-    DependencyParameterDeclarationCheck(const QString &productName, const Item *productItem,
-            const QHash<const Item *, Item::PropertyDeclarationMap> &decls)
-        : m_productName(productName), m_productItem(productItem), m_parameterDeclarations(decls)
-    {
-    }
-
-    void operator()(const QVariantMap &parameters) const
-    {
-        check(parameters, QualifiedId());
-    }
-
-private:
-    void check(const QVariantMap &parameters, const QualifiedId &moduleName) const
-    {
-        for (auto it = parameters.begin(); it != parameters.end(); ++it) {
-            if (it.value().userType() == QMetaType::QVariantMap) {
-                check(it.value().toMap(), QualifiedId(moduleName) << it.key());
-            } else {
-                const auto &deps = m_productItem->modules();
-                auto m = std::find_if(deps.begin(), deps.end(),
-                                      [&moduleName] (const Item::Module &module) {
-                    return module.name == moduleName;
-                });
-
-                if (m == deps.end()) {
-                    const QualifiedId fullName = QualifiedId(moduleName) << it.key();
-                    throw ErrorInfo(Tr::tr("Cannot set parameter '%1', "
-                                           "because '%2' does not have a dependency on '%3'.")
-                                    .arg(fullName.toString(), m_productName, moduleName.toString()),
-                                    m_productItem->location());
-                }
-
-                auto decls = m_parameterDeclarations.value(rootPrototype(m->item));
-
-                if (!decls.contains(it.key())) {
-                    const QualifiedId fullName = QualifiedId(moduleName) << it.key();
-                    throw ErrorInfo(Tr::tr("Parameter '%1' is not declared.")
-                                    .arg(fullName.toString()), m_productItem->location());
-                }
-            }
-        }
-    }
-
-    bool moduleExists(const QualifiedId &name) const
-    {
-        const auto &deps = m_productItem->modules();
-        return any_of(deps, [&name](const Item::Module &module) {
-            return module.name == name;
-        });
-    }
-
-    const QString &m_productName;
-    const Item *m_productItem;
-    const QHash<const Item *, Item::PropertyDeclarationMap> &m_parameterDeclarations;
-};
-
-void ModuleLoader::checkDependencyParameterDeclarations(const ProductContext *productContext) const
-{
-    DependencyParameterDeclarationCheck dpdc(productContext->name, productContext->item,
-                                             m_parameterDeclarations);
-    for (const Item::Module &dep : productContext->item->modules()) {
-        if (!dep.parameters.empty())
-            dpdc(dep.parameters);
-    }
-}
-
-void ModuleLoader::handleModuleSetupError(ModuleLoader::ProductContext *productContext,
-                                          const Item::Module &module, const ErrorInfo &error)
-{
-    if (module.required) {
-        handleProductError(error, productContext);
-    } else {
-        qCDebug(lcModuleLoader()) << "non-required module" << module.name.toString()
-                                  << "found, but not usable in product" << productContext->name
-                                  << error.toString();
-        createNonPresentModule(module.name.toString(), QStringLiteral("failed validation"),
-                               module.item);
-    }
-}
-
-void ModuleLoader::initProductProperties(const ProductContext &product)
-{
-    QString buildDir = ResolvedProduct::deriveBuildDirectoryName(product.name,
-                                                                 product.multiplexConfigurationId);
-    buildDir = FileInfo::resolvePath(product.project->topLevelProject->buildDirectory, buildDir);
-    product.item->setProperty(StringConstants::buildDirectoryProperty(),
-                              VariantValue::create(buildDir));
-    const QString sourceDir = QFileInfo(product.item->file()->filePath()).absolutePath();
-    product.item->setProperty(StringConstants::sourceDirectoryProperty(),
-                              VariantValue::create(sourceDir));
-}
-
-void ModuleLoader::handleSubProject(ModuleLoader::ProjectContext *projectContext, Item *projectItem,
-        const Set<QString> &referencedFilePaths)
-{
-    qCDebug(lcModuleLoader) << "handleSubProject" << projectItem->file()->filePath();
-
-    Item * const propertiesItem = projectItem->child(ItemType::PropertiesInSubProject);
-    if (!checkItemCondition(projectItem))
-        return;
-    if (propertiesItem) {
-        propertiesItem->setScope(projectItem);
-        if (!checkItemCondition(propertiesItem))
-            return;
-    }
-
-    Item *loadedItem;
-    QString subProjectFilePath;
-    try {
-        const QString projectFileDirPath = FileInfo::path(projectItem->file()->filePath());
-        const QString relativeFilePath
-                = m_evaluator->stringValue(projectItem, StringConstants::filePathProperty());
-        subProjectFilePath = FileInfo::resolvePath(projectFileDirPath, relativeFilePath);
-        if (referencedFilePaths.contains(subProjectFilePath))
-            throw ErrorInfo(Tr::tr("Cycle detected while loading subproject file '%1'.")
-                            .arg(relativeFilePath), projectItem->location());
-        loadedItem = loadItemFromFile(subProjectFilePath, projectItem->location());
-    } catch (const ErrorInfo &error) {
-        if (m_parameters.productErrorMode() == ErrorHandlingMode::Strict)
-            throw;
-        m_logger.printWarning(error);
-        return;
-    }
-
-    loadedItem = wrapInProjectIfNecessary(loadedItem);
-    const bool inheritProperties = m_evaluator->boolValue(
-                projectItem, StringConstants::inheritPropertiesProperty());
-
-    if (inheritProperties)
-        copyProperties(projectItem->parent(), loadedItem);
-    if (propertiesItem) {
-        const Item::PropertyMap &overriddenProperties = propertiesItem->properties();
-        for (Item::PropertyMap::ConstIterator it = overriddenProperties.constBegin();
-             it != overriddenProperties.constEnd(); ++it) {
-            loadedItem->setProperty(it.key(), it.value());
-        }
-    }
-
-    Item::addChild(projectItem, loadedItem);
-    projectItem->setScope(projectContext->scope);
-    handleProject(projectContext->result, projectContext->topLevelProject, loadedItem,
-                  Set<QString>(referencedFilePaths) << subProjectFilePath);
-}
-
-QList<Item *> ModuleLoader::loadReferencedFile(const QString &relativePath,
-                                               const CodeLocation &referencingLocation,
-                                               const Set<QString> &referencedFilePaths,
-                                               ModuleLoader::ProductContext &dummyContext)
-{
-    QString absReferencePath = FileInfo::resolvePath(FileInfo::path(referencingLocation.filePath()),
-                                                     relativePath);
-    if (FileInfo(absReferencePath).isDir()) {
-        QString qbsFilePath;
-
-        QDirIterator dit(absReferencePath, StringConstants::qbsFileWildcards());
-        while (dit.hasNext()) {
-            if (!qbsFilePath.isEmpty()) {
-                throw ErrorInfo(Tr::tr("Referenced directory '%1' contains more than one "
-                                       "qbs file.").arg(absReferencePath), referencingLocation);
-            }
-            qbsFilePath = dit.next();
-        }
-        if (qbsFilePath.isEmpty()) {
-            throw ErrorInfo(Tr::tr("Referenced directory '%1' does not contain a qbs file.")
-                            .arg(absReferencePath), referencingLocation);
-        }
-        absReferencePath = qbsFilePath;
-    }
-    if (referencedFilePaths.contains(absReferencePath))
-        throw ErrorInfo(Tr::tr("Cycle detected while referencing file '%1'.").arg(relativePath),
-                        referencingLocation);
-    Item * const subItem = loadItemFromFile(absReferencePath, referencingLocation);
-    if (subItem->type() != ItemType::Project && subItem->type() != ItemType::Product) {
-        ErrorInfo error(Tr::tr("Item type should be 'Product' or 'Project', but is '%1'.")
-                        .arg(subItem->typeName()));
-        error.append(Tr::tr("Item is defined here."), subItem->location());
-        error.append(Tr::tr("File is referenced here."), referencingLocation);
-        throw  error;
-    }
-    subItem->setScope(dummyContext.project->scope);
-    subItem->setParent(dummyContext.project->item);
-    QList<Item *> loadedItems;
-    loadedItems << subItem;
-    if (subItem->type() == ItemType::Product) {
-        handleProfileItems(subItem, dummyContext.project);
-        loadedItems << multiplexProductItem(&dummyContext, subItem);
-    }
-    return loadedItems;
-}
-
-void ModuleLoader::handleGroup(ProductContext *productContext, Item *groupItem,
-                               const ModuleDependencies &reverseDepencencies)
-{
-    checkCancelation();
-    propagateModulesFromParent(productContext, groupItem, reverseDepencencies);
-    checkItemCondition(groupItem);
-    for (Item * const child : groupItem->children()) {
-        if (child->type() == ItemType::Group)
-            handleGroup(productContext, child, reverseDepencencies);
-    }
-}
-
-void ModuleLoader::handleAllPropertyOptionsItems(Item *item)
-{
-    QList<Item *> childItems = item->children();
-    auto childIt = childItems.begin();
-    while (childIt != childItems.end()) {
-        Item * const child = *childIt;
-        if (child->type() == ItemType::PropertyOptions) {
-            handlePropertyOptions(child);
-            childIt = childItems.erase(childIt);
-        } else {
-            handleAllPropertyOptionsItems(child);
-            ++childIt;
-        }
-    }
-    item->setChildren(childItems);
-}
-
-void ModuleLoader::handlePropertyOptions(Item *optionsItem)
-{
-    const QString name = m_evaluator->stringValue(optionsItem, StringConstants::nameProperty());
-    if (name.isEmpty()) {
-        throw ErrorInfo(Tr::tr("PropertyOptions item needs a name property"),
-                        optionsItem->location());
-    }
-    const QString description = m_evaluator->stringValue(
-                optionsItem, StringConstants::descriptionProperty());
-    const auto removalVersion = Version::fromString(m_evaluator->stringValue(optionsItem,
-            StringConstants::removalVersionProperty()));
-    const auto allowedValues = m_evaluator->stringListValue(
-                optionsItem, StringConstants::allowedValuesProperty());
-
-    PropertyDeclaration decl = optionsItem->parent()->propertyDeclaration(name);
-    if (!decl.isValid()) {
-        decl.setName(name);
-        decl.setType(PropertyDeclaration::Variant);
-    }
-    decl.setDescription(description);
-    if (removalVersion.isValid()) {
-        DeprecationInfo di(removalVersion, description);
-        decl.setDeprecationInfo(di);
-    }
-    decl.setAllowedValues(allowedValues);
-    const ValuePtr property = optionsItem->parent()->property(name);
-    if (!property && !decl.isExpired()) {
-        throw ErrorInfo(Tr::tr("PropertyOptions item refers to non-existing property '%1'")
-                        .arg(name), optionsItem->location());
-    }
-    if (property && decl.isExpired()) {
-        ErrorInfo e(Tr::tr("Property '%1' was scheduled for removal in version %2, but "
-                           "is still present.")
-                    .arg(name).arg(removalVersion.toString()),
-                    property->location());
-        e.append(Tr::tr("Removal version for '%1' specified here.").arg(name),
-                 optionsItem->location());
-        m_logger.printWarning(e);
-    }
-    optionsItem->parent()->setPropertyDeclaration(name, decl);
-}
-
-static void mergeProperty(Item *dst, const QString &name, const ValuePtr &value)
-{
-    if (value->type() == Value::ItemValueType) {
-        const ItemValueConstPtr itemValue = std::static_pointer_cast<ItemValue>(value);
-        const Item * const valueItem = itemValue->item();
-        Item * const subItem = dst->itemProperty(name, itemValue)->item();
-        for (QMap<QString, ValuePtr>::const_iterator it = valueItem->properties().constBegin();
-                it != valueItem->properties().constEnd(); ++it)
-            mergeProperty(subItem, it.key(), it.value());
-    } else {
-        // If the property already exists set up the base value.
-        if (value->type() == Value::JSSourceValueType) {
-            const auto jsValue = static_cast<JSSourceValue *>(value.get());
-            if (jsValue->isBuiltinDefaultValue())
-                return;
-            const ValuePtr baseValue = dst->property(name);
-            if (baseValue) {
-                QBS_CHECK(baseValue->type() == Value::JSSourceValueType);
-                const JSSourceValuePtr jsBaseValue = std::static_pointer_cast<JSSourceValue>(
-                            baseValue->clone());
-                jsValue->setBaseValue(jsBaseValue);
-                std::vector<JSSourceValue::Alternative> alternatives = jsValue->alternatives();
-                jsValue->clearAlternatives();
-                for (JSSourceValue::Alternative &a : alternatives) {
-                    a.value->setBaseValue(jsBaseValue);
-                    jsValue->addAlternative(a);
-                }
-            }
-        }
-        dst->setProperty(name, value);
-    }
-}
-
-bool ModuleLoader::checkExportItemCondition(Item *exportItem, const ProductContext &productContext)
-{
-    class ScopeHandler {
-    public:
-        ScopeHandler(Item *exportItem, const ProductContext &productContext, Item **cachedScopeItem)
-            : m_exportItem(exportItem)
-        {
-            if (!*cachedScopeItem)
-                *cachedScopeItem = Item::create(exportItem->pool(), ItemType::Scope);
-            Item * const scope = *cachedScopeItem;
-            QBS_CHECK(productContext.item->file());
-            scope->setFile(productContext.item->file());
-            scope->setScope(productContext.item);
-            productContext.project->scope->copyProperty(StringConstants::projectVar(), scope);
-            productContext.scope->copyProperty(StringConstants::productVar(), scope);
-            QBS_CHECK(!exportItem->scope());
-            exportItem->setScope(scope);
-        }
-        ~ScopeHandler() { m_exportItem->setScope(nullptr); }
-
-    private:
-        Item * const m_exportItem;
-    } scopeHandler(exportItem, productContext, &m_tempScopeItem);
-    return checkItemCondition(exportItem);
-}
-
-ProbeConstPtr ModuleLoader::findOldProjectProbe(
-        const QString &globalId,
-        bool condition,
-        const QVariantMap &initialProperties,
-        const QString &sourceCode) const
-{
-    if (m_parameters.forceProbeExecution())
-        return {};
-
-    for (const ProbeConstPtr &oldProbe : m_oldProjectProbes.value(globalId)) {
-        if (probeMatches(oldProbe, condition, initialProperties, sourceCode, CompareScript::Yes))
-            return oldProbe;
-    }
-
-    return {};
-}
-
-ProbeConstPtr ModuleLoader::findOldProductProbe(
-        const QString &productName,
-        bool condition,
-        const QVariantMap &initialProperties,
-        const QString &sourceCode) const
-{
-    if (m_parameters.forceProbeExecution())
-        return {};
-
-    for (const ProbeConstPtr &oldProbe : m_oldProductProbes.value(productName)) {
-        if (probeMatches(oldProbe, condition, initialProperties, sourceCode, CompareScript::Yes))
-            return oldProbe;
-    }
-
-    return {};
-}
-
-ProbeConstPtr ModuleLoader::findCurrentProbe(
-        const CodeLocation &location,
-        bool condition,
-        const QVariantMap &initialProperties) const
-{
-    const std::vector<ProbeConstPtr> &cachedProbes = m_currentProbes.value(location);
-    for (const ProbeConstPtr &probe : cachedProbes) {
-        if (probeMatches(probe, condition, initialProperties, QString(), CompareScript::No))
-            return probe;
-    }
-    return {};
-}
-
-bool ModuleLoader::probeMatches(const ProbeConstPtr &probe, bool condition,
-        const QVariantMap &initialProperties, const QString &configureScript,
-        CompareScript compareScript) const
-{
-    return probe->condition() == condition
-            && probe->initialProperties() == initialProperties
-            && (compareScript == CompareScript::No
-                || (probe->configureScript() == configureScript
-                    && !probe->needsReconfigure(m_lastResolveTime)));
-}
-
-void ModuleLoader::printProfilingInfo()
-{
-    if (!m_parameters.logElapsedTime())
-        return;
-    m_logger.qbsLog(LoggerInfo, true) << "\t"
-                                      << Tr::tr("Project file loading and parsing took %1.")
-                                         .arg(elapsedTimeString(m_reader->elapsedTime()));
-    m_logger.qbsLog(LoggerInfo, true) << "\t"
-                                      << Tr::tr("Preparing products took %1.")
-                                         .arg(elapsedTimeString(m_elapsedTimePrepareProducts));
-    m_logger.qbsLog(LoggerInfo, true) << "\t"
-                                      << Tr::tr("Setting up product dependencies took %1.")
-                                         .arg(elapsedTimeString(m_elapsedTimeProductDependencies));
-    m_logger.qbsLog(LoggerInfo, true) << "\t\t"
-                                      << Tr::tr("Running module providers took %1.")
-                                         .arg(elapsedTimeString(m_elapsedTimeModuleProviders));
-    m_logger.qbsLog(LoggerInfo, true) << "\t\t"
-            << Tr::tr("Setting up transitive product dependencies took %1.")
-               .arg(elapsedTimeString(m_elapsedTimeTransitiveDependencies));
-    m_logger.qbsLog(LoggerInfo, true) << "\t"
-                                      << Tr::tr("Handling products took %1.")
-                                      .arg(elapsedTimeString(m_elapsedTimeHandleProducts));
-    m_logger.qbsLog(LoggerInfo, true) << "\t\t"
-                                      << Tr::tr("Running Probes took %1.")
-                                         .arg(elapsedTimeString(m_elapsedTimeProbes));
-    m_logger.qbsLog(LoggerInfo, true) << "\t\t"
-            << Tr::tr("%1 probes encountered, %2 configure scripts executed, "
-                      "%3 re-used from current run, %4 re-used from earlier run.")
-               .arg(m_probesEncountered).arg(m_probesRun).arg(m_probesCachedCurrent)
-               .arg(m_probesCachedOld);
-    m_logger.qbsLog(LoggerInfo, true) << "\t"
-                                      << Tr::tr("Property checking took %1.")
-                                         .arg(elapsedTimeString(m_elapsedTimePropertyChecking));
-}
-
-static void mergeParameters(QVariantMap &dst, const QVariantMap &src)
-{
-    for (auto it = src.begin(); it != src.end(); ++it) {
-        if (it.value().userType() == QMetaType::QVariantMap) {
-            QVariant &vdst = dst[it.key()];
-            QVariantMap mdst = vdst.toMap();
-            mergeParameters(mdst, it.value().toMap());
-            vdst = mdst;
-        } else {
-            dst[it.key()] = it.value();
-        }
-    }
-}
-
-static void adjustParametersScopes(Item *item, Item *scope)
-{
-    if (item->type() == ItemType::ModuleParameters) {
-        item->setScope(scope);
-        return;
-    }
-
-    for (const auto &value : item->properties()) {
-        if (value->type() != Value::ItemValueType)
-            continue;
-        adjustParametersScopes(std::static_pointer_cast<ItemValue>(value)->item(), scope);
-    }
-}
-
-bool ModuleLoader::mergeExportItems(const ProductContext &productContext)
-{
-    std::vector<Item *> exportItems;
-    QList<Item *> children = productContext.item->children();
-
-    auto isExport = [](Item *item) { return item->type() == ItemType::Export; };
-    std::copy_if(children.cbegin(), children.cend(), std::back_inserter(exportItems), isExport);
-    qbs::Internal::removeIf(children, isExport);
-
-    // Note that we do not return if there are no Export items: The "merged" item becomes the
-    // "product module", which always needs to exist, regardless of whether the product sources
-    // actually contain an Export item or not.
-    if (!exportItems.empty())
-        productContext.item->setChildren(children);
-
-    Item *merged = Item::create(productContext.item->pool(), ItemType::Export);
-    const QString &nameKey = StringConstants::nameProperty();
-    const ValuePtr nameValue = VariantValue::create(productContext.name);
-    merged->setProperty(nameKey, nameValue);
-    Set<FileContextConstPtr> filesWithExportItem;
-    ProductModuleInfo pmi;
-    bool hasDependenciesOnProductType = false;
-    for (Item * const exportItem : qAsConst(exportItems)) {
-        checkCancelation();
-        if (Q_UNLIKELY(filesWithExportItem.contains(exportItem->file())))
-            throw ErrorInfo(Tr::tr("Multiple Export items in one product are prohibited."),
-                        exportItem->location());
-        exportItem->setProperty(nameKey, nameValue);
-        if (!checkExportItemCondition(exportItem, productContext))
-            continue;
-        filesWithExportItem += exportItem->file();
-        for (Item * const child : exportItem->children()) {
-            if (child->type() == ItemType::Parameters) {
-                adjustParametersScopes(child, child);
-                mergeParameters(pmi.defaultParameters,
-                                m_evaluator->scriptValue(child).toVariant().toMap());
-            } else {
-                if (child->type() == ItemType::Depends) {
-                    bool productTypesIsSet;
-                    m_evaluator->stringValue(child, StringConstants::productTypesProperty(),
-                                             QString(), &productTypesIsSet);
-                    if (productTypesIsSet)
-                        hasDependenciesOnProductType = true;
-                }
-                Item::addChild(merged, child);
-            }
-        }
-        const Item::PropertyDeclarationMap &decls = exportItem->propertyDeclarations();
-        for (auto it = decls.constBegin(); it != decls.constEnd(); ++it) {
-            const PropertyDeclaration &newDecl = it.value();
-            const PropertyDeclaration &existingDecl = merged->propertyDeclaration(it.key());
-            if (existingDecl.isValid() && existingDecl.type() != newDecl.type()) {
-                ErrorInfo error(Tr::tr("Export item in inherited item redeclares property "
-                        "'%1' with different type.").arg(it.key()), exportItem->location());
-                handlePropertyError(error, m_parameters, m_logger);
-            }
-            merged->setPropertyDeclaration(newDecl.name(), newDecl);
-        }
-        for (QMap<QString, ValuePtr>::const_iterator it = exportItem->properties().constBegin();
-                it != exportItem->properties().constEnd(); ++it) {
-            mergeProperty(merged, it.key(), it.value());
-        }
-    }
-    merged->setFile(exportItems.empty()
-            ? productContext.item->file() : exportItems.back()->file());
-    merged->setLocation(exportItems.empty()
-            ? productContext.item->location() : exportItems.back()->location());
-    Item::addChild(productContext.item, merged);
-    merged->setupForBuiltinType(m_logger);
-    pmi.exportItem = merged;
-    pmi.multiplexId = productContext.multiplexConfigurationId;
-    productContext.project->topLevelProject->productModules.insert(productContext.name, pmi);
-    if (hasDependenciesOnProductType)
-        m_exportsWithDeferredDependsItems.insert(merged);
-    return !exportItems.empty();
-}
-
-Item *ModuleLoader::loadItemFromFile(const QString &filePath,
-                                     const CodeLocation &referencingLocation)
-{
-    Item *item = m_reader->readFile(filePath, referencingLocation);
-    handleAllPropertyOptionsItems(item);
-    return item;
-}
-
-void ModuleLoader::handleProfileItems(Item *item, ProjectContext *projectContext)
-{
-    const std::vector<Item *> profileItems = collectProfileItems(item, projectContext);
-    for (Item * const profileItem : profileItems) {
-        try {
-            handleProfile(profileItem);
-        } catch (const ErrorInfo &e) {
-            handlePropertyError(e, m_parameters, m_logger);
-        }
-    }
-}
-
-std::vector<Item *> ModuleLoader::collectProfileItems(Item *item, ProjectContext *projectContext)
-{
-    QList<Item *> childItems = item->children();
-    std::vector<Item *> profileItems;
-    Item * scope = item->type() == ItemType::Project ? projectContext->scope : nullptr;
-    for (auto it = childItems.begin(); it != childItems.end();) {
-        Item * const childItem = *it;
-        if (childItem->type() == ItemType::Profile) {
-            if (!scope) {
-                const ItemValuePtr itemValue = ItemValue::create(item);
-                scope = Item::create(m_pool, ItemType::Scope);
-                scope->setProperty(StringConstants::productVar(), itemValue);
-                scope->setFile(item->file());
-                scope->setScope(projectContext->scope);
-            }
-            childItem->setScope(scope);
-            profileItems.push_back(childItem);
-            it = childItems.erase(it);
-        } else {
-            if (childItem->type() == ItemType::Product) {
-                for (Item * const profileItem : collectProfileItems(childItem, projectContext))
-                    profileItems.push_back(profileItem);
-            }
-            ++it;
-        }
-    }
-    if (!profileItems.empty())
-        item->setChildren(childItems);
-    return profileItems;
-}
-
-void ModuleLoader::evaluateProfileValues(const QualifiedId &namePrefix, Item *item,
-                                         Item *profileItem, QVariantMap &values)
-{
-    const Item::PropertyMap &props = item->properties();
-    for (auto it = props.begin(); it != props.end(); ++it) {
-        QualifiedId name = namePrefix;
-        name << it.key();
-        switch (it.value()->type()) {
-        case Value::ItemValueType:
-            evaluateProfileValues(name, std::static_pointer_cast<ItemValue>(it.value())->item(),
-                                  profileItem, values);
-            break;
-        case Value::VariantValueType:
-            values.insert(name.join(QLatin1Char('.')),
-                          std::static_pointer_cast<VariantValue>(it.value())->value());
-            break;
-        case Value::JSSourceValueType:
-            item->setType(ItemType::ModulePrefix); // TODO: Introduce new item type
-            if (item != profileItem)
-                item->setScope(profileItem);
-            values.insert(name.join(QLatin1Char('.')),
-                          m_evaluator->value(item, it.key()).toVariant());
-            break;
-        }
-    }
-}
-
-void ModuleLoader::handleProfile(Item *profileItem)
-{
-    QVariantMap values;
-    evaluateProfileValues(QualifiedId(), profileItem, profileItem, values);
-    const bool condition = values.take(StringConstants::conditionProperty()).toBool();
-    if (!condition)
-        return;
-    const QString profileName = values.take(StringConstants::nameProperty()).toString();
-    if (profileName.isEmpty())
-        throw ErrorInfo(Tr::tr("Every Profile item must have a name"), profileItem->location());
-    if (profileName == Profile::fallbackName()) {
-        throw ErrorInfo(Tr::tr("Reserved name '%1' cannot be used for an actual profile.")
-                        .arg(profileName), profileItem->location());
-    }
-    if (m_localProfiles.contains(profileName)) {
-        throw ErrorInfo(Tr::tr("Local profile '%1' redefined.").arg(profileName),
-                        profileItem->location());
-    }
-    m_localProfiles.insert(profileName, values);
-}
-
-void ModuleLoader::collectNameFromOverride(const QString &overrideString)
-{
-    static const auto extract = [](const QString &prefix, const QString &overrideString) {
-        if (!overrideString.startsWith(prefix))
-            return QString();
-        const int startPos = prefix.length();
-        const int endPos = overrideString.lastIndexOf(StringConstants::dot());
-        if (endPos == -1)
-            return QString();
-        return overrideString.mid(startPos, endPos - startPos);
-    };
-    const QString &projectName = extract(StringConstants::projectsOverridePrefix(), overrideString);
-    if (!projectName.isEmpty()) {
-        m_projectNamesUsedInOverrides.insert(projectName);
-        return;
-    }
-    const QString &productName = extract(StringConstants::productsOverridePrefix(), overrideString);
-    if (!productName.isEmpty()) {
-        m_productNamesUsedInOverrides.insert(productName.left(
-                                                 productName.indexOf(StringConstants::dot())));
-        return;
-    }
-}
-
-void ModuleLoader::checkProjectNamesInOverrides(const ModuleLoader::TopLevelProjectContext &tlp)
-{
-    for (const QString &projectNameInOverride : m_projectNamesUsedInOverrides) {
-        if (m_disabledProjects.contains(projectNameInOverride))
-            continue;
-        bool found = false;
-        for (const ProjectContext * const p : tlp.projects) {
-            if (p->name == projectNameInOverride) {
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            handlePropertyError(Tr::tr("Unknown project '%1' in property override.")
-                                .arg(projectNameInOverride), m_parameters, m_logger);
-        }
-    }
-}
-
-void ModuleLoader::checkProductNamesInOverrides()
-{
-    for (const QString &productNameInOverride : m_productNamesUsedInOverrides) {
-        if (m_erroneousProducts.contains(productNameInOverride))
-            continue;
-        bool found = false;
-        for (const auto &kv : m_productsByName) {
-            // In an override string such as "a.b.c:d, we cannot tell whether we have a product
-            // "a" and a module "b.c" or a product "a.b" and a module "c", so we need to take
-            // care not to emit false positives here.
-            if (kv.first == productNameInOverride
-                    || kv.first.startsWith(productNameInOverride + StringConstants::dot())) {
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            handlePropertyError(Tr::tr("Unknown product '%1' in property override.")
-                                .arg(productNameInOverride), m_parameters, m_logger);
-        }
-    }
-}
-
-void ModuleLoader::setSearchPathsForProduct(ModuleLoader::ProductContext *product)
-{
-    product->searchPaths = readExtraSearchPaths(product->item);
-    Settings settings(m_parameters.settingsDirectory());
-    const QVariantMap profileContents = product->project->result->profileConfigs
-            .value(product->profileName).toMap();
-    const QStringList prefsSearchPaths = Preferences(&settings, profileContents).searchPaths();
-    const QStringList &currentSearchPaths = m_reader->allSearchPaths();
-    for (const QString &p : prefsSearchPaths) {
-        if (!currentSearchPaths.contains(p) && FileInfo(p).exists())
-            product->searchPaths << p;
-    }
-}
-
-ModuleLoader::ShadowProductInfo ModuleLoader::getShadowProductInfo(
-        const ModuleLoader::ProductContext &product) const
-{
-    const bool isShadowProduct = product.name.startsWith(StringConstants::shadowProductPrefix());
-    return std::make_pair(isShadowProduct, isShadowProduct
-                          ? product.name.mid(StringConstants::shadowProductPrefix().size())
-                          : QString());
-}
-
-void ModuleLoader::collectProductsByName(const TopLevelProjectContext &topLevelProject)
-{
-    for (ProjectContext * const project : topLevelProject.projects) {
-        for (ProductContext &product : project->products)
-            m_productsByName.insert({ product.name, &product });
-    }
-}
-
-void ModuleLoader::collectProductsByType(const ModuleLoader::TopLevelProjectContext &topLevelProject)
-{
-    for (ProjectContext * const project : topLevelProject.projects) {
-        for (ProductContext &product : project->products) {
-            try {
-                const FileTags productTags
-                        = m_evaluator->fileTagsValue(product.item, StringConstants::typeProperty());
-                for (const FileTag &tag : productTags)
-                    m_productsByType.insert({ tag, &product});
-            } catch (const ErrorInfo &) {
-                qCDebug(lcModuleLoader) << "product" << product.name << "has complex type "
-                                           " and won't get an entry in the type map";
-            }
-        }
-    }
-}
-
-void ModuleLoader::propagateModulesFromParent(ProductContext *productContext, Item *groupItem,
-                                              const ModuleDependencies &reverseDepencencies)
-{
-    QBS_CHECK(groupItem->type() == ItemType::Group);
-    QHash<QualifiedId, Item *> moduleInstancesForGroup;
-
-    // Step 1: Instantiate the product's modules for the group.
-    for (Item::Module m : groupItem->parent()->modules()) {
-        Item *targetItem = moduleInstanceItem(groupItem, m.name);
-        targetItem->setPrototype(m.item);
-
-        Item * const moduleScope = Item::create(targetItem->pool(), ItemType::Scope);
-        moduleScope->setFile(groupItem->file());
-        moduleScope->setProperties(m.item->scope()->properties()); // "project", "product", ids
-        moduleScope->setScope(groupItem);
-        targetItem->setScope(moduleScope);
-
-        targetItem->setFile(m.item->file());
-
-        // "parent" should point to the group/artifact parent
-        targetItem->setParent(groupItem->parent());
-
-        targetItem->setOuterItem(m.item);
-
-        m.item = targetItem;
-        groupItem->addModule(m);
-        moduleInstancesForGroup.insert(m.name, targetItem);
-    }
-
-    // Step 2: Make the inter-module references point to the instances created in step 1.
-    for (const Item::Module &module : groupItem->modules()) {
-        Item::Modules adaptedModules;
-        const Item::Modules &oldModules = module.item->prototype()->modules();
-        for (Item::Module depMod : oldModules) {
-            depMod.item = moduleInstancesForGroup.value(depMod.name);
-            adaptedModules << depMod;
-            if (depMod.name.front() == module.name.front())
-                continue;
-            const ItemValuePtr &modulePrefix = groupItem->itemProperty(depMod.name.front());
-            QBS_CHECK(modulePrefix);
-            module.item->setProperty(depMod.name.front(), modulePrefix);
-        }
-        module.item->setModules(adaptedModules);
-    }
-
-    const QualifiedIdSet &propsSetInGroup = gatherModulePropertiesSetInGroup(groupItem);
-    if (propsSetInGroup.empty())
-        return;
-    productContext->info.modulePropertiesSetInGroups
-            .insert(std::make_pair(groupItem, propsSetInGroup));
-
-    // Step 3: Adapt defining items in values. This is potentially necessary if module properties
-    //         get assigned on the group level.
-    for (const Item::Module &module : groupItem->modules()) {
-        const QualifiedIdSet &dependents = reverseDepencencies.value(module.name);
-        Item::Modules dependentModules;
-        dependentModules.reserve(int(dependents.size()));
-        for (const QualifiedId &depName : dependents) {
-            Item * const itemOfDependent = moduleInstancesForGroup.value(depName);
-            QBS_CHECK(itemOfDependent);
-            Item::Module depMod;
-            depMod.name = depName;
-            depMod.item = itemOfDependent;
-            dependentModules << depMod;
-        }
-        adjustDefiningItemsInGroupModuleInstances(module, dependentModules);
-    }
-}
-
-static Item *createReplacementForDefiningItem(const Item *definingItem, ItemType type)
-{
-    Item *replacement = Item::create(definingItem->pool(), type);
-    replacement->setLocation(definingItem->location());
-    definingItem->copyProperty(StringConstants::nameProperty(), replacement);
-    return replacement;
-}
-
-void ModuleLoader::adjustDefiningItemsInGroupModuleInstances(const Item::Module &module,
-        const Item::Modules &dependentModules)
-{
-    if (!module.item->isPresentModule())
-        return;
-
-    // There are three cases:
-    //     a) The defining item is the "main" module instance, i.e. the one instantiated in the
-    //        product directly (or a parent group).
-    //     b) The defining item refers to the module prototype (or the replacement of it
-    //        created in the module merger [for products] or in this function [for parent groups]).
-    //     c) The defining item is a different instance of the module, i.e. it was instantiated
-    //        in some other module.
-
-    std::unordered_map<Item *, Item *> definingItemReplacements;
-
-    Item *modulePrototype = rootPrototype(module.item->prototype());
-    QBS_CHECK(modulePrototype->type() == ItemType::Module
-              || modulePrototype->type() == ItemType::Export);
-
-    const Item::PropertyDeclarationMap &propDecls = modulePrototype->propertyDeclarations();
-    for (const auto &decl : propDecls) {
-        const QString &propName = decl.name();
-
-        // Module properties assigned in the group are not relevant here, as nothing
-        // gets inherited in that case. In particular, setting a list property
-        // overwrites the value from the product's (or parent group's) instance completely,
-        // rather than appending to it (concatenation happens via outer.concat()).
-        ValueConstPtr propValue = module.item->ownProperty(propName);
-        if (propValue)
-            continue;
-
-        // Find the nearest prototype instance that has the value assigned.
-        // The result is either an instance of a parent group (or the parent group's
-        // parent group and so on) or the instance of the product or the module prototype.
-        // In the latter case, we don't have to do anything.
-        const Item *instanceWithProperty = module.item;
-        int prototypeChainLen = 0;
-        do {
-            instanceWithProperty = instanceWithProperty->prototype();
-            QBS_CHECK(instanceWithProperty);
-            ++prototypeChainLen;
-            propValue = instanceWithProperty->ownProperty(propName);
-        } while (!propValue);
-        QBS_CHECK(propValue);
-
-        if (propValue->type() != Value::JSSourceValueType)
-            continue;
-
-        bool hasDefiningItem = false;
-        for (ValueConstPtr v = propValue; v && !hasDefiningItem; v = v->next())
-            hasDefiningItem = v->definingItem();
-        if (!hasDefiningItem)
-            continue;
-
-        const ValuePtr clonedValue = propValue->clone();
-        for (ValuePtr v = clonedValue; v; v = v->next()) {
-            QBS_CHECK(v->definingItem());
-
-            Item *& replacement = definingItemReplacements[v->definingItem()];
-            static const QString caseA = QStringLiteral("__group_case_a");
-            if (v->definingItem() == instanceWithProperty
-                    || v->definingItem()->variantProperty(caseA)) {
-                // Case a)
-                // For values whose defining item is the product's (or parent group's) instance,
-                // we take its scope and replace references to module instances with those from the
-                // group's instance. This handles cases like the following:
-                // Product {
-                //    name: "theProduct"
-                //    aModule.listProp: [name, otherModule.stringProp]
-                //    Group { name: "theGroup"; otherModule.stringProp: name }
-                //    ...
-                // }
-                // In the above example, aModule.listProp is set to ["theProduct", "theGroup"]
-                // (plus potential values from the prototype and other module instances,
-                // which are different Value objects in the "next chain").
-                if (!replacement) {
-                    replacement = createReplacementForDefiningItem(v->definingItem(),
-                                                                   v->definingItem()->type());
-                    Item * const scope = Item::create(v->definingItem()->pool(), ItemType::Scope);
-                    scope->setProperties(module.item->scope()->properties());
-                    Item * const scopeScope
-                            = Item::create(v->definingItem()->pool(), ItemType::Scope);
-                    scopeScope->setProperties(v->definingItem()->scope()->scope()->properties());
-                    scope->setScope(scopeScope);
-                    replacement->setScope(scope);
-                    const Item::PropertyMap &groupScopeProperties
-                            = module.item->scope()->scope()->properties();
-                    for (auto propIt = groupScopeProperties.begin();
-                         propIt != groupScopeProperties.end(); ++propIt) {
-                        if (propIt.value()->type() == Value::ItemValueType)
-                            scopeScope->setProperty(propIt.key(), propIt.value());
-                    }
-                }
-                replacement->setPropertyDeclaration(propName, decl);
-                replacement->setProperty(propName, v);
-                replacement->setProperty(caseA, VariantValue::invalidValue());
-            }  else if (v->definingItem()->type() == ItemType::Module) {
-                // Case b)
-                // For values whose defining item is the module prototype, we change the scope to
-                // the group's instance, analogous to what we do in
-                // ModuleMerger::appendPrototypeValueToNextChain().
-                QBS_CHECK(!decl.isScalar());
-                QBS_CHECK(!v->next());
-                Item *& replacement = definingItemReplacements[v->definingItem()];
-                if (!replacement) {
-                    replacement = createReplacementForDefiningItem(v->definingItem(),
-                                                                   ItemType::Module);
-                    replacement->setScope(module.item);
-                }
-                QBS_CHECK(!replacement->hasOwnProperty(caseA));
-                qCDebug(lcModuleLoader).noquote().nospace()
-                        << "replacing defining item for prototype; module is "
-                        << module.name.toString() << module.item
-                        << ", property is " << propName
-                        << ", old defining item was " << v->definingItem()
-                        << " with scope" << v->definingItem()->scope()
-                        << ", new defining item is" << replacement
-                        << " with scope" << replacement->scope();
-                if (v->type() == Value::JSSourceValueType) {
-                    qCDebug(lcModuleLoader) << "value source code is"
-                        << std::static_pointer_cast<JSSourceValue>(v)->sourceCode().toString();
-                }
-                replacement->setPropertyDeclaration(propName, decl);
-                replacement->setProperty(propName, v);
-            } else {
-                // Look for instance scopes of other module instances in defining items and
-                // replace the affected values.
-                // This is case c) as introduced above. See ModuleMerger::replaceItemInScopes()
-                // for a detailed explanation.
-
-                QBS_CHECK(v->definingItem()->scope() && v->definingItem()->scope()->scope());
-                bool found = false;
-                for (const Item::Module &depMod : dependentModules) {
-                    const Item *depModPrototype = depMod.item->prototype();
-                    for (int i = 1; i < prototypeChainLen; ++i)
-                        depModPrototype = depModPrototype->prototype();
-                    if (v->definingItem()->scope()->scope() != depModPrototype)
-                        continue;
-
-                    found = true;
-                    Item *& replacement = definingItemReplacements[v->definingItem()];
-                    if (!replacement) {
-                        replacement = createReplacementForDefiningItem(v->definingItem(),
-                                                                       v->definingItem()->type());
-                        replacement->setProperties(v->definingItem()->properties());
-                        for (const auto &decl : v->definingItem()->propertyDeclarations())
-                            replacement->setPropertyDeclaration(decl.name(), decl);
-                        replacement->setPrototype(v->definingItem()->prototype());
-                        replacement->setScope(Item::create(v->definingItem()->pool(),
-                                                           ItemType::Scope));
-                        replacement->scope()->setScope(depMod.item);
-                    }
-                    QBS_CHECK(!replacement->hasOwnProperty(caseA));
-                    qCDebug(lcModuleLoader) << "reset instance scope of module"
-                            << depMod.name.toString() << "in property"
-                            << propName << "of module" << module.name;
-                }
-                QBS_CHECK(found);
-            }
-            QBS_CHECK(replacement);
-            v->setDefiningItem(replacement);
-        }
-        module.item->setProperty(propName, clonedValue);
-    }
-}
-
-void ModuleLoader::resolveDependencies(DependsContext *dependsContext, Item *item,
-                                       ProductContext *productContext)
-{
-    QBS_CHECK(m_dependencyResolvingPass == 1 || m_dependencyResolvingPass == 2);
-
-    if (!productContext || m_dependencyResolvingPass == 1) {
-        const Item::Module baseModule = loadBaseModule(dependsContext->product, item);
-        item->addModule(baseModule);
-    }
-
-    // Resolve all Depends items.
-    ItemModuleList loadedModules;
-    QList<Item *> dependsItemPerLoadedModule;
-    ProductDependencies productDependencies;
-    const auto handleDependsItem = [&](Item *child) {
-        if (child->type() != ItemType::Depends)
-            return;
-
-        int lastModulesCount = loadedModules.size();
-        try {
-            resolveDependsItem(dependsContext, child->parent(), child, &loadedModules,
-                               &productDependencies);
-        } catch (const ErrorInfo &e) {
-            if (!productContext)
-                throw;
-            handleProductError(e, productContext);
-        }
-        for (int i = lastModulesCount; i < loadedModules.size(); ++i)
-            dependsItemPerLoadedModule.push_back(child);
-
-    };
-    if (productContext && m_dependencyResolvingPass == 2) {
-        for (const auto &deferData : productContext->deferredDependsItems) {
-            dependsContext->exportingProductItem = deferData.first;
-            for (Item * const dependsItem : deferData.second)
-                handleDependsItem(dependsItem);
-        }
-    } else {
-        for (Item * const child : item->children())
-            handleDependsItem(child);
-    }
-    QBS_CHECK(loadedModules.size() == dependsItemPerLoadedModule.size());
-
-    Item *lastDependsItem = nullptr;
-    for (Item * const dependsItem : dependsItemPerLoadedModule) {
-        if (dependsItem == lastDependsItem)
-            continue;
-        adjustParametersScopes(dependsItem, dependsItem);
-        forwardParameterDeclarations(dependsItem, loadedModules);
-        lastDependsItem = dependsItem;
-    }
-
-    for (int i = 0; i < loadedModules.size(); ++i) {
-        Item::Module &module = loadedModules[i];
-        mergeParameters(module.parameters, extractParameters(dependsItemPerLoadedModule.at(i)));
-        item->addModule(module);
-
-        const QString moduleName = module.name.toString();
-        std::for_each(productDependencies.begin(), productDependencies.end(),
-                      [&module, &moduleName] (ModuleLoaderResult::ProductInfo::Dependency &dep) {
-            if (dep.name == moduleName)
-                dep.parameters = module.parameters;
-        });
-    }
-
-    dependsContext->productDependencies->insert(
-                dependsContext->productDependencies->end(),
-                productDependencies.cbegin(), productDependencies.cend());
-}
-
-class RequiredChainManager
-{
-public:
-    RequiredChainManager(std::vector<bool> &requiredChain, bool required)
-        : m_requiredChain(requiredChain)
-    {
-        m_requiredChain.push_back(required);
-    }
-
-    ~RequiredChainManager() { m_requiredChain.pop_back(); }
-
-private:
-    std::vector<bool> &m_requiredChain;
-};
-
-void ModuleLoader::resolveDependsItem(DependsContext *dependsContext, Item *parentItem,
-        Item *dependsItem, ItemModuleList *moduleResults,
-        ProductDependencies *productResults)
-{
-    checkCancelation();
-    if (!checkItemCondition(dependsItem)) {
-        qCDebug(lcModuleLoader) << "Depends item disabled, ignoring.";
-        return;
-    }
-    bool nameIsSet;
-    const QString name = m_evaluator->stringValue(dependsItem, StringConstants::nameProperty(),
-                                                  QString(), &nameIsSet);
-    bool submodulesPropertySet;
-    const QStringList submodules = m_evaluator->stringListValue(
-                dependsItem, StringConstants::submodulesProperty(), &submodulesPropertySet);
-    if (submodules.empty() && submodulesPropertySet) {
-        qCDebug(lcModuleLoader) << "Ignoring Depends item with empty submodules list.";
-        return;
-    }
-    if (Q_UNLIKELY(submodules.size() > 1 && !dependsItem->id().isEmpty())) {
-        QString msg = Tr::tr("A Depends item with more than one module cannot have an id.");
-        throw ErrorInfo(msg, dependsItem->location());
-    }
-    const FallbackMode fallbackMode = m_parameters.fallbackProviderEnabled()
-            && m_evaluator->boolValue(dependsItem, StringConstants::enableFallbackProperty())
-            ? FallbackMode::Enabled : FallbackMode::Disabled;
-
-    QList<QualifiedId> moduleNames;
-    const QualifiedId nameParts = QualifiedId::fromString(name);
-    if (submodules.empty()) {
-        // Ignore explicit dependencies on the base module, which has already been loaded.
-        if (name == StringConstants::qbsModule())
-            return;
-
-        moduleNames << nameParts;
-    } else {
-        for (const QString &submodule : submodules)
-            moduleNames << nameParts + QualifiedId::fromString(submodule);
-    }
-
-    Item::Module result;
-    bool productTypesIsSet;
-    m_evaluator->stringValue(dependsItem, StringConstants::productTypesProperty(),
-                             QString(), &productTypesIsSet);
-    if (m_dependencyResolvingPass == 1 && productTypesIsSet) {
-        qCDebug(lcModuleLoader) << "queuing product" << dependsContext->product->name
-                                << "for a second dependencies resolving pass";
-        m_productsWithDeferredDependsItems[dependsContext->product].insert(
-                    DeferredDependsContext(dependsContext->exportingProductItem, parentItem));
-        return;
-    }
-
-    const bool isRequiredValue =
-            m_evaluator->boolValue(dependsItem, StringConstants::requiredProperty());
-    const bool isRequired = !productTypesIsSet
-            && isRequiredValue
-            && !contains(m_requiredChain, false);
-    const Version minVersion = Version::fromString(
-                m_evaluator->stringValue(dependsItem,
-                                         StringConstants::versionAtLeastProperty()));
-    const Version maxVersion = Version::fromString(
-                m_evaluator->stringValue(dependsItem, StringConstants::versionBelowProperty()));
-    const VersionRange versionRange(minVersion, maxVersion);
-    QStringList multiplexConfigurationIds = m_evaluator->stringListValue(
-                dependsItem,
-                StringConstants::multiplexConfigurationIdsProperty());
-    if (multiplexConfigurationIds.empty())
-        multiplexConfigurationIds << QString();
-
-    for (const QualifiedId &moduleName : qAsConst(moduleNames)) {
-        // Don't load the same module twice. Duplicate Depends statements can easily
-        // happen due to inheritance.
-        const auto it = std::find_if(moduleResults->begin(), moduleResults->end(),
-                [moduleName](const Item::Module &m) { return m.name == moduleName; });
-        if (it != moduleResults->end()) {
-            it->required = it->required || isRequired;
-            it->requiredValue = it->requiredValue || isRequiredValue;
-            it->fallbackEnabled = it->fallbackEnabled && fallbackMode == FallbackMode::Enabled;
-            it->versionRange.narrowDown(versionRange);
-            continue;
-        }
-
-        QVariantMap defaultParameters;
-        Item *moduleItem = loadModule(dependsContext->product, dependsContext->exportingProductItem,
-                                      parentItem, dependsItem->location(), dependsItem->id(),
-                                      moduleName, multiplexConfigurationIds.first(), fallbackMode,
-                                      isRequired, &result.isProduct, &defaultParameters);
-        if (!moduleItem) {
-            const QString productName = ResolvedProduct::fullDisplayName(
-                        dependsContext->product->name,
-                        dependsContext->product->multiplexConfigurationId);
-            if (!multiplexConfigurationIds.first().isEmpty()) {
-                const QString depName = ResolvedProduct::fullDisplayName(
-                            moduleName.toString(), multiplexConfigurationIds.first());
-                throw ErrorInfo(Tr::tr("Dependency from product '%1' to product '%2' not "
-                                       "fulfilled.").arg(productName, depName));
-            }
-            ErrorInfo e(Tr::tr("Dependency '%1' not found for product '%2'.")
-                        .arg(moduleName.toString(), productName), dependsItem->location());
-            throw e;
-        }
-        if (result.isProduct && !m_dependsChain.empty() && !m_dependsChain.back().isProduct) {
-            throw ErrorInfo(Tr::tr("Invalid dependency on product '%1': Modules cannot depend on "
-                                   "products. You may want to turn your module into a product and "
-                                   "add the dependency in that product's Export item.")
-                            .arg(moduleName.toString()), dependsItem->location());
-        }
-        qCDebug(lcModuleLoader) << "module loaded:" << moduleName.toString();
-        result.name = moduleName;
-        result.item = moduleItem;
-        result.requiredValue = isRequiredValue;
-        result.required = isRequired;
-        result.fallbackEnabled = fallbackMode == FallbackMode::Enabled;
-        result.parameters = defaultParameters;
-        result.versionRange = versionRange;
-        moduleResults->push_back(result);
-        if (result.isProduct) {
-            qCDebug(lcModuleLoader) << "product dependency loaded:" << moduleName.toString();
-            bool profilesPropertyWasSet = false;
-            QStringList profiles = m_evaluator->stringListValue(dependsItem,
-                                                                StringConstants::profilesProperty(),
-                                                                &profilesPropertyWasSet);
-            if (profiles.empty()) {
-                if (profilesPropertyWasSet)
-                    profiles.push_back(StringConstants::star());
-                else
-                    profiles.push_back(QString());
-            }
-            for (const QString &profile : qAsConst(profiles)) {
-                for (const QString &multiplexId : qAsConst(multiplexConfigurationIds)) {
-                    ModuleLoaderResult::ProductInfo::Dependency dependency;
-                    dependency.name = moduleName.toString();
-                    dependency.profile = profile;
-                    dependency.multiplexConfigurationId = multiplexId;
-                    dependency.isRequired = isRequired;
-                    productResults->push_back(dependency);
-                }
-            }
-        }
-    }
-}
-
-void ModuleLoader::forwardParameterDeclarations(const Item *dependsItem,
-                                                const ItemModuleList &modules)
-{
-    for (auto it = dependsItem->properties().begin(); it != dependsItem->properties().end(); ++it) {
-        if (it.value()->type() != Value::ItemValueType)
-            continue;
-        forwardParameterDeclarations(it.key(),
-                                     std::static_pointer_cast<ItemValue>(it.value())->item(),
-                                     modules);
-    }
-}
-
-void ModuleLoader::forwardParameterDeclarations(const QualifiedId &moduleName, Item *item,
-                                                const ItemModuleList &modules)
-{
-    auto it = std::find_if(modules.begin(), modules.end(), [&moduleName] (const Item::Module &m) {
-        return m.name == moduleName;
-    });
-    if (it != modules.end()) {
-        item->setPropertyDeclarations(m_parameterDeclarations.value(rootPrototype(it->item)));
-    } else {
-        for (auto it = item->properties().begin(); it != item->properties().end(); ++it) {
-            if (it.value()->type() != Value::ItemValueType)
-                continue;
-            forwardParameterDeclarations(QualifiedId(moduleName) << it.key(),
-                                         std::static_pointer_cast<ItemValue>(it.value())->item(),
-                                         modules);
-        }
-    }
-}
-
-void ModuleLoader::resolveParameterDeclarations(const Item *module)
-{
-    Item::PropertyDeclarationMap decls;
-    const auto &moduleChildren = module->children();
-    for (Item *param : moduleChildren) {
-        if (param->type() != ItemType::Parameter)
-            continue;
-        const auto &paramDecls = param->propertyDeclarations();
-        for (auto it = paramDecls.begin(); it != paramDecls.end(); ++it)
-            decls.insert(it.key(), it.value());
-    }
-    m_parameterDeclarations.insert(module, decls);
-}
-
-static bool isItemValue(const ValuePtr &v)
-{
-    return v->type() == Value::ItemValueType;
-}
-
-static Item::PropertyMap filterItemProperties(const Item::PropertyMap &properties)
-{
-    Item::PropertyMap result;
-    auto itEnd = properties.end();
-    for (auto it = properties.begin(); it != itEnd; ++it) {
-        if (isItemValue(it.value()))
-            result.insert(it.key(), it.value());
-    }
-    return result;
-}
-
-static QVariantMap safeToVariant(const QScriptValue &v)
-{
-    QVariantMap result;
-    QScriptValueIterator it(v);
-    while (it.hasNext()) {
-        it.next();
-        QScriptValue u = it.value();
-        if (u.isError())
-            throw ErrorInfo(u.toString());
-        result[it.name()] = (u.isObject() && !u.isArray() && !u.isRegExp())
-                ? safeToVariant(u) : it.value().toVariant();
-    }
-    return result;
-}
-
-QVariantMap ModuleLoader::extractParameters(Item *dependsItem) const
-{
-    QVariantMap result;
-    const Item::PropertyMap &itemProperties = filterItemProperties(
-                rootPrototype(dependsItem)->properties());
-    if (itemProperties.empty())
-        return result;
-
-    auto origProperties = dependsItem->properties();
-    dependsItem->setProperties(itemProperties);
-    QScriptValue sv = m_evaluator->scriptValue(dependsItem);
-    try {
-        result = safeToVariant(sv);
-    } catch (const ErrorInfo &exception) {
-        auto ei = exception;
-        ei.prepend(Tr::tr("Error in dependency parameter."), dependsItem->location());
-        throw ei;
-    }
-    dependsItem->setProperties(origProperties);
-    return result;
-}
-
-[[noreturn]] static void throwModuleNamePrefixError(const QualifiedId &shortName,
-        const QualifiedId &longName, const CodeLocation &codeLocation)
-{
-    throw ErrorInfo(Tr::tr("The name of module '%1' is equal to the first component of the "
-                           "name of module '%2', which is not allowed")
-                    .arg(shortName.toString(), longName.toString()), codeLocation);
-}
-
-Item *ModuleLoader::moduleInstanceItem(Item *containerItem, const QualifiedId &moduleName)
-{
-    QBS_CHECK(!moduleName.empty());
-    Item *instance = containerItem;
-    for (int i = 0; i < moduleName.size(); ++i) {
-        const QString &moduleNameSegment = moduleName.at(i);
-        const ValuePtr v = instance->ownProperty(moduleName.at(i));
-        if (v && v->type() == Value::ItemValueType) {
-            instance = std::static_pointer_cast<ItemValue>(v)->item();
-        } else {
-            const ItemType itemType = i < moduleName.size() - 1 ? ItemType::ModulePrefix
-                                                                : ItemType::ModuleInstance;
-            auto newItem = Item::create(m_pool, itemType);
-            instance->setProperty(moduleNameSegment, ItemValue::create(newItem));
-            instance = newItem;
-        }
-        if (i < moduleName.size() - 1) {
-            if (instance->type() == ItemType::ModuleInstance) {
-                QualifiedId conflictingName = QStringList(moduleName.mid(0, i + 1));
-                throwModuleNamePrefixError(conflictingName, moduleName, CodeLocation());
-            }
-            QBS_CHECK(instance->type() == ItemType::ModulePrefix);
-        }
-    }
-    QBS_CHECK(instance != containerItem);
-    return instance;
-}
-
-ModuleLoader::ProductModuleInfo *ModuleLoader::productModule(ProductContext *productContext,
-        const QString &name, const QString &multiplexId, bool &productNameMatch)
-{
-    auto &exportsData = productContext->project->topLevelProject->productModules;
-    const auto firstIt = exportsData.find(name);
-    productNameMatch = firstIt != exportsData.end();
-    for (auto it = firstIt; it != exportsData.end() && it.key() == name; ++it) {
-        if (it.value().multiplexId == multiplexId)
-            return &it.value();
-    }
-    if (multiplexId.isEmpty() && firstIt != exportsData.end())
-        return &firstIt.value();
-    return nullptr;
-}
-
-ModuleLoader::ProductContext *ModuleLoader::product(ProjectContext *projectContext,
-                                                    const QString &name)
-{
-    auto itEnd = projectContext->products.end();
-    auto it = std::find_if(projectContext->products.begin(), itEnd,
-                           [&name] (const ProductContext &ctx) {
-        return ctx.name == name;
-    });
-    return it == itEnd ? nullptr : &*it;
-}
-
-ModuleLoader::ProductContext *ModuleLoader::product(TopLevelProjectContext *tlpContext,
-                                                    const QString &name)
-{
-    ProductContext *result = nullptr;
-    for (auto prj : tlpContext->projects) {
-        result = product(prj, name);
-        if (result)
-            break;
-    }
-    return result;
-}
-
-class ModuleLoader::DependsChainManager
-{
-public:
-    DependsChainManager(std::vector<DependsChainEntry> &dependsChain, const QualifiedId &module,
-                        const CodeLocation &dependsLocation)
-        : m_dependsChain(dependsChain)
-    {
-        const bool alreadyInChain = std::any_of(dependsChain.cbegin(), dependsChain.cend(),
-                                                [&module](const DependsChainEntry &e) {
-            return e.name == module;
-        });
-        if (alreadyInChain) {
-            ErrorInfo error;
-            error.append(Tr::tr("Cyclic dependencies detected:"));
-            for (const DependsChainEntry &e : qAsConst(m_dependsChain))
-                error.append(e.name.toString(), e.location);
-            error.append(module.toString(), dependsLocation);
-            throw error;
-        }
-        m_dependsChain.emplace_back(module, dependsLocation);
-    }
-
-    ~DependsChainManager() { m_dependsChain.pop_back(); }
-
-private:
-    std::vector<DependsChainEntry> &m_dependsChain;
-};
-
-static bool isBaseModule(QStringView fullModuleName)
-{
-    return fullModuleName == StringConstants::qbsModule();
-}
-
-class DelayedPropertyChanger
-{
-public:
-    ~DelayedPropertyChanger()
-    {
-        applyNow();
-    }
-
-    void setLater(Item *item, const QString &name, const ValuePtr &value)
-    {
-        QBS_CHECK(m_item == nullptr);
-        m_item = item;
-        m_name = name;
-        m_value = value;
-    }
-
-    void removeLater(Item *item, const QString &name)
-    {
-        QBS_CHECK(m_item == nullptr);
-        m_item = item;
-        m_name = name;
-    }
-
-    void applyNow()
-    {
-        if (!m_item || m_name.isEmpty())
-            return;
-        if (m_value)
-            m_item->setProperty(m_name, m_value);
-        else
-            m_item->removeProperty(m_name);
-        m_item = nullptr;
-        m_name.clear();
-        m_value.reset();
-    }
-
-private:
-    Item *m_item = nullptr;
-    QString m_name;
-    ValuePtr m_value;
-};
-
-Item *ModuleLoader::loadModule(ProductContext *productContext, Item *exportingProductItem,
-                               Item *item, const CodeLocation &dependsItemLocation,
-                               const QString &moduleId, const QualifiedId &moduleName,
-                               const QString &multiplexId, FallbackMode fallbackMode,
-                               bool isRequired, bool *isProductDependency,
-                               QVariantMap *defaultParameters)
-{
-    qCDebug(lcModuleLoader) << "loadModule name:" << moduleName.toString() << "id:" << moduleId;
-
-    RequiredChainManager requiredChainManager(m_requiredChain, isRequired);
-    DependsChainManager dependsChainManager(m_dependsChain, moduleName, dependsItemLocation);
-
-    Item *moduleInstance = moduleId.isEmpty()
-            ? moduleInstanceItem(item, moduleName)
-            : moduleInstanceItem(item, QStringList(moduleId));
-    if (moduleInstance->scope())
-        return moduleInstance; // already handled
-
-    if (Q_UNLIKELY(moduleInstance->type() == ItemType::ModulePrefix)) {
-        for (const Item::Module &m : item->modules()) {
-            if (m.name.front() == moduleName.front())
-                throwModuleNamePrefixError(moduleName, m.name, dependsItemLocation);
-        }
-    }
-    QBS_CHECK(moduleInstance->type() == ItemType::ModuleInstance);
-
-    // Prepare module instance for evaluating Module.condition.
-    DelayedPropertyChanger delayedPropertyChanger;
-    const QString &qbsModuleName = StringConstants::qbsModule();
-    const auto fullName = moduleName.toString();
-    if (!isBaseModule(fullName)) {
-        ItemValuePtr qbsProp = productContext->item->itemProperty(qbsModuleName);
-        if (qbsProp) {
-            ValuePtr qbsModuleValue = moduleInstance->ownProperty(qbsModuleName);
-            if (qbsModuleValue)
-                delayedPropertyChanger.setLater(moduleInstance, qbsModuleName, qbsModuleValue);
-            else
-                delayedPropertyChanger.removeLater(moduleInstance, qbsModuleName);
-            moduleInstance->setProperty(qbsModuleName, qbsProp);
-        }
-    }
-
-    SearchPathsManager searchPathsManager(m_reader.get()); // paths can be added by providers
-    Item *modulePrototype = nullptr;
-    ProductModuleInfo * const pmi = productModule(productContext, fullName,
-                                                  multiplexId, *isProductDependency);
-    if (pmi) {
-        m_dependsChain.back().isProduct = true;
-        modulePrototype = pmi->exportItem;
-        if (defaultParameters)
-            *defaultParameters = pmi->defaultParameters;
-    } else if (!*isProductDependency) {
-        modulePrototype = searchAndLoadModuleFile(productContext, dependsItemLocation,
-                moduleName, fallbackMode, isRequired, moduleInstance);
-    }
-    delayedPropertyChanger.applyNow();
-    if (!modulePrototype)
-        return nullptr;
-
-    searchPathsManager.reset(); // deps must be processed in a clean state
-
-    instantiateModule(productContext, exportingProductItem, item, moduleInstance, modulePrototype,
-                      moduleName, pmi);
-    return moduleInstance;
-}
-
-struct PrioritizedItem
-{
-    PrioritizedItem(Item *item, int priority, int searchPathIndex)
-        : item(item), priority(priority), searchPathIndex(searchPathIndex)
-    {
-    }
-
-    Item *item = nullptr;
-    int priority = 0;
-    int searchPathIndex = 0;
-};
-
-static Item *chooseModuleCandidate(const std::vector<PrioritizedItem> &candidates,
-                                   const QString &moduleName)
-{
-    auto maxIt = std::max_element(candidates.begin(), candidates.end(),
-            [] (const PrioritizedItem &a, const PrioritizedItem &b) {
-        if (a.priority < b.priority)
-            return true;
-        if (a.priority > b.priority)
-            return false;
-        return a.searchPathIndex > b.searchPathIndex;
-    });
-
-    size_t nmax = std::count_if(candidates.begin(), candidates.end(),
-            [maxIt] (const PrioritizedItem &i) {
-        return i.priority == maxIt->priority && i.searchPathIndex == maxIt->searchPathIndex;
-    });
-
-    if (nmax > 1) {
-        ErrorInfo e(Tr::tr("There is more than one equally prioritized candidate for module '%1'.")
-                    .arg(moduleName));
-        for (size_t i = 0; i < candidates.size(); ++i) {
-            const auto candidate = candidates.at(i);
-            if (candidate.priority == maxIt->priority) {
-                //: The %1 denotes the number of the candidate.
-                e.append(Tr::tr("candidate %1").arg(i + 1), candidates.at(i).item->location());
-            }
-        }
-        throw e;
-    }
-
-    return maxIt->item;
-}
-
-Item *ModuleLoader::searchAndLoadModuleFile(ProductContext *productContext,
-        const CodeLocation &dependsItemLocation, const QualifiedId &moduleName,
-        FallbackMode fallbackMode, bool isRequired, Item *moduleInstance)
-{
-    auto existingPaths = findExistingModulePaths(m_reader->allSearchPaths(), moduleName);
-
-    if (existingPaths.isEmpty()) { // no suitable names found, try to use providers
-        AccumulatingTimer providersTimer(
-                m_parameters.logElapsedTime() ? &m_elapsedTimeModuleProviders : nullptr);
-        auto result = m_moduleProviderLoader->executeModuleProvider(
-                    *productContext,
-                    dependsItemLocation,
-                    moduleName,
-                    fallbackMode);
-        if (result.providerAddedSearchPaths) {
-            qCDebug(lcModuleLoader) << "Re-checking for module" << moduleName.toString()
-                                    << "with newly added search paths from module provider";
-            existingPaths = findExistingModulePaths(m_reader->allSearchPaths(), moduleName);
-        }
-    }
-
-    const QString fullName = moduleName.toString();
-    bool triedToLoadModule = false;
-    std::vector<PrioritizedItem> candidates;
-    candidates.reserve(size_t(existingPaths.size()));
-    for (int i = 0; i < existingPaths.size(); ++i) {
-        const QString &dirPath = existingPaths.at(i);
-        QStringList &moduleFileNames = getModuleFileNames(dirPath);
-        for (auto it = moduleFileNames.begin(); it != moduleFileNames.end(); ) {
-            const QString &filePath = *it;
-            const auto [module, triedToLoad] = loadModuleFile(
-                    productContext, fullName, filePath, moduleInstance);
-            if (module)
-                candidates.emplace_back(module, 0, i);
-            if (!triedToLoad)
-                it = moduleFileNames.erase(it);
-            else
-                ++it;
-            triedToLoadModule = triedToLoadModule || triedToLoad;
-        }
-    }
-
-    if (candidates.empty()) {
-        if (!isRequired)
-            return createNonPresentModule(fullName, QStringLiteral("not found"), nullptr);
-        if (Q_UNLIKELY(triedToLoadModule)) {
-            throw ErrorInfo(Tr::tr("Module %1 could not be loaded.").arg(fullName),
-                        dependsItemLocation);
-        }
-        return nullptr;
-    }
-
-    Item *moduleItem;
-    if (candidates.size() == 1) {
-        moduleItem = candidates.at(0).item;
-    } else {
-        for (auto &candidate : candidates) {
-            candidate.priority = m_evaluator->intValue(candidate.item,
-                                                       StringConstants::priorityProperty(),
-                                                       candidate.priority);
-        }
-        moduleItem = chooseModuleCandidate(candidates, fullName);
-    }
-
-    const auto it = productContext->unknownProfilePropertyErrors.find(moduleItem);
-    if (it != productContext->unknownProfilePropertyErrors.cend()) {
-        const QString fullProductName = ResolvedProduct::fullDisplayName
-                (productContext->name, productContext->multiplexConfigurationId);
-        ErrorInfo error(Tr::tr("Loading module '%1' for product '%2' failed due to invalid values "
-                               "in profile '%3':").arg(fullName, fullProductName,
-                                                       productContext->profileName));
-        for (const ErrorInfo &e : it->second)
-            error.append(e.toString());
-        handlePropertyError(error, m_parameters, m_logger);
-    }
-    return moduleItem;
-}
-
-QStringList &ModuleLoader::getModuleFileNames(const QString &dirPath)
-{
-    QStringList &moduleFileNames = m_moduleDirListCache[dirPath];
-    if (moduleFileNames.empty()) {
-        QDirIterator dirIter(dirPath, StringConstants::qbsFileWildcards());
-        while (dirIter.hasNext())
-            moduleFileNames += dirIter.next();
-    }
-    return moduleFileNames;
-}
-
-static Item *findDeepestModuleInstance(Item *instance)
-{
-    while (instance->prototype() && instance->prototype()->type() == ItemType::ModuleInstance)
-        instance = instance->prototype();
-    return instance;
-}
-
-std::pair<Item *, bool> ModuleLoader::loadModuleFile(
-        ProductContext *productContext, const QString &fullModuleName,
-        const QString &filePath, Item *moduleInstance)
-{
-    checkCancelation();
-
-    qCDebug(lcModuleLoader) << "loadModuleFile" << fullModuleName << "from" << filePath;
-
-    const auto [module, triedToLoad] =
-            getModulePrototype(productContext, fullModuleName, filePath);
-    if (!module)
-        return {nullptr, triedToLoad};
-
-    const auto key = std::make_pair(module, productContext);
-    const auto it = m_modulePrototypeEnabledInfo.find(key);
-    if (it != m_modulePrototypeEnabledInfo.end()) {
-        qCDebug(lcModuleLoader) << "prototype cache hit (level 2)";
-        return {it.value() ? module : nullptr, triedToLoad};
-    }
-
-    // Set the name before evaluating any properties. EvaluatorScriptClass reads the module name.
-    module->setProperty(StringConstants::nameProperty(), VariantValue::create(fullModuleName));
-
-    Item *deepestModuleInstance = findDeepestModuleInstance(moduleInstance);
-    Item *origDeepestModuleInstancePrototype = deepestModuleInstance->prototype();
-    deepestModuleInstance->setPrototype(module);
-    bool enabled = checkItemCondition(moduleInstance, module);
-    deepestModuleInstance->setPrototype(origDeepestModuleInstancePrototype);
-    if (!enabled) {
-        qCDebug(lcModuleLoader) << "condition of module" << fullModuleName << "is false";
-        m_modulePrototypeEnabledInfo.insert(key, false);
-        return {nullptr, triedToLoad};
-    }
-
-    if (isBaseModule(fullModuleName))
-        setupBaseModulePrototype(module);
-    else
-        resolveParameterDeclarations(module);
-
-    m_modulePrototypeEnabledInfo.insert(key, true);
-    return {module, triedToLoad};
-}
-
-// Returns the module prototype item and a boolean indicating if we tried to load it from the file
-std::pair<Item *, bool> ModuleLoader::getModulePrototype(ProductContext *productContext,
-        const QString &fullModuleName, const QString &filePath)
-{
-    auto &prototypeList = m_modulePrototypes[filePath];
-    for (const auto &prototype : prototypeList) {
-        if (prototype.second == productContext->profileName) {
-            qCDebug(lcModuleLoader) << "prototype cache hit (level 1)";
-            return {prototype.first, true};
-        }
-    }
-    Item * const module = loadItemFromFile(filePath, CodeLocation());
-    if (module->type() != ItemType::Module) {
-        qCDebug(lcModuleLoader).nospace()
-                            << "Alleged module " << fullModuleName << " has type '"
-                            << module->typeName() << "', so it's not a module after all.";
-        return {nullptr, false};
-    }
-    prototypeList.emplace_back(module, productContext->profileName);
-
-    // Module properties that are defined in the profile are used as default values.
-    // This is the reason we need to have different items per profile.
-    const QVariantMap profileModuleProperties
-            = productContext->moduleProperties.value(fullModuleName).toMap();
-    for (auto it = profileModuleProperties.cbegin(); it != profileModuleProperties.cend(); ++it) {
-        if (Q_UNLIKELY(!module->hasProperty(it.key()))) {
-            productContext->unknownProfilePropertyErrors[module].emplace_back
-                    (Tr::tr("Unknown property: %1.%2").arg(fullModuleName, it.key()));
-            continue;
-        }
-        const PropertyDeclaration decl = module->propertyDeclaration(it.key());
-        VariantValuePtr v = VariantValue::create(
-                PropertyDeclaration::convertToPropertyType(it.value(), decl.type(),
-                        QStringList(fullModuleName), it.key()));
-        module->setProperty(it.key(), v);
-    }
-
-    return {module, true};
-}
-
-Item::Module ModuleLoader::loadBaseModule(ProductContext *productContext, Item *item)
-{
-    const QualifiedId baseModuleName(StringConstants::qbsModule());
-    Item::Module baseModuleDesc;
-    baseModuleDesc.name = baseModuleName;
-    baseModuleDesc.item = loadModule(productContext, nullptr, item, CodeLocation(), QString(),
-                                     baseModuleName, QString(), FallbackMode::Disabled, true,
-                                     &baseModuleDesc.isProduct, nullptr);
-    if (productContext->item) {
-        const Item * const qbsInstanceItem
-                = moduleInstanceItem(productContext->item, baseModuleName);
-        const Item::PropertyMap &props = qbsInstanceItem->properties();
-        for (auto it = props.cbegin(); it != props.cend(); ++it) {
-            if (it.value()->type() == Value::VariantValueType)
-                baseModuleDesc.item->setProperty(it.key(), it.value());
-        }
-    }
-    QBS_CHECK(!baseModuleDesc.isProduct);
-    if (Q_UNLIKELY(!baseModuleDesc.item))
-        throw ErrorInfo(Tr::tr("Cannot load base qbs module."));
-    return baseModuleDesc;
-}
-
-void ModuleLoader::setupBaseModulePrototype(Item *prototype)
-{
-    prototype->setProperty(QStringLiteral("hostPlatform"),
-                           VariantValue::create(QString::fromStdString(
-                                                    HostOsInfo::hostOSIdentifier())));
-    prototype->setProperty(QStringLiteral("hostArchitecture"),
-                           VariantValue::create(QString::fromStdString(
-                                                    HostOsInfo::hostOSArchitecture())));
-    prototype->setProperty(QStringLiteral("libexecPath"),
-                           VariantValue::create(m_parameters.libexecPath()));
-
-    const Version qbsVersion = LanguageInfo::qbsVersion();
-    prototype->setProperty(QStringLiteral("versionMajor"),
-                           VariantValue::create(qbsVersion.majorVersion()));
-    prototype->setProperty(QStringLiteral("versionMinor"),
-                           VariantValue::create(qbsVersion.minorVersion()));
-    prototype->setProperty(QStringLiteral("versionPatch"),
-                           VariantValue::create(qbsVersion.patchLevel()));
-}
-
-static void collectItemsWithId_impl(Item *item, QList<Item *> *result)
-{
-    if (!item->id().isEmpty())
-        result->push_back(item);
-    for (Item * const child : item->children())
-        collectItemsWithId_impl(child, result);
-}
-
-static QList<Item *> collectItemsWithId(Item *item)
-{
-    QList<Item *> result;
-    collectItemsWithId_impl(item, &result);
-    return result;
-}
-
-static std::vector<std::pair<QualifiedId, ItemValuePtr>> instanceItemProperties(Item *item)
-{
-    std::vector<std::pair<QualifiedId, ItemValuePtr>> result;
-    QualifiedId name;
-    const auto func = [&] (Item *item, const auto &f) -> void {
-        for (auto it = item->properties().begin(), end = item->properties().end();
-                it != end; ++it) {
-            if (it.value()->type() != Value::ItemValueType)
-                continue;
-            ItemValuePtr itemValue = std::static_pointer_cast<ItemValue>(it.value());
-            if (!itemValue->item())
-                continue;
-            name.push_back(it.key());
-            if (itemValue->item()->type() == ItemType::ModulePrefix)
-                f(itemValue->item(), f);
-            else
-                result.emplace_back(name, itemValue);
-            name.removeLast();
-        }
-    };
-    func(item, func);
-    return result;
-}
-
-void ModuleLoader::instantiateModule(ProductContext *productContext, Item *exportingProduct,
-        Item *instanceScope, Item *moduleInstance, Item *modulePrototype,
-        const QualifiedId &moduleName, ProductModuleInfo *productModuleInfo)
-{
-    Item *deepestModuleInstance = findDeepestModuleInstance(moduleInstance);
-    deepestModuleInstance->setPrototype(modulePrototype);
-    const QString fullName = moduleName.toString();
-    const QString generalOverrideKey = QStringLiteral("modules.") + fullName;
-    const QString perProductOverrideKey = StringConstants::productsOverridePrefix()
-            + productContext->name + QLatin1Char('.') + fullName;
-    for (Item *instance = moduleInstance; instance; instance = instance->prototype()) {
-        overrideItemProperties(instance, generalOverrideKey, m_parameters.overriddenValuesTree());
-        if (fullName == QStringLiteral("qbs"))
-            overrideItemProperties(instance, fullName, m_parameters.overriddenValuesTree());
-        overrideItemProperties(instance, perProductOverrideKey,
-                               m_parameters.overriddenValuesTree());
-        if (instance == deepestModuleInstance)
-            break;
-    }
-
-    moduleInstance->setFile(modulePrototype->file());
-    moduleInstance->setLocation(modulePrototype->location());
-    QBS_CHECK(moduleInstance->type() == ItemType::ModuleInstance);
-
-    // create module scope
-    Item *moduleScope = Item::create(m_pool, ItemType::Scope);
-    QBS_CHECK(instanceScope->file());
-    moduleScope->setFile(instanceScope->file());
-    moduleScope->setScope(instanceScope);
-    QBS_CHECK(productContext->project->scope);
-    productContext->project->scope->copyProperty(StringConstants::projectVar(), moduleScope);
-    if (productContext->scope)
-        productContext->scope->copyProperty(StringConstants::productVar(), moduleScope);
-    else
-        QBS_CHECK(fullName == StringConstants::qbsModule()); // Dummy product.
-
-    if (productModuleInfo) {
-        exportingProduct = productModuleInfo->exportItem->parent();
-        QBS_CHECK(exportingProduct);
-        QBS_CHECK(exportingProduct->type() == ItemType::Product);
-    }
-
-    if (exportingProduct) {
-        const auto exportingProductItemValue = ItemValue::create(exportingProduct);
-        moduleScope->setProperty(QStringLiteral("exportingProduct"), exportingProductItemValue);
-
-        const auto importingProductItemValue = ItemValue::create(productContext->item);
-        moduleScope->setProperty(QStringLiteral("importingProduct"), importingProductItemValue);
-
-        // TODO: Remove in 1.21.
-        moduleScope->setProperty(StringConstants::productVar(), exportingProductItemValue);
-
-        moduleScope->setProperty(StringConstants::projectVar(),
-                                 ItemValue::create(exportingProduct->parent()));
-
-        PropertyDeclaration pd(StringConstants::qbsSourceDirPropertyInternal(),
-                               PropertyDeclaration::String, QString(),
-                               PropertyDeclaration::PropertyNotAvailableInConfig);
-        moduleInstance->setPropertyDeclaration(pd.name(), pd);
-        ValuePtr v = exportingProduct
-                ->property(StringConstants::sourceDirectoryProperty())->clone();
-        moduleInstance->setProperty(pd.name(), v);
-    }
-    moduleInstance->setScope(moduleScope);
-
-    QHash<Item *, Item *> prototypeInstanceMap;
-    prototypeInstanceMap[modulePrototype] = moduleInstance;
-
-    // create instances for every child of the prototype
-    createChildInstances(moduleInstance, modulePrototype, &prototypeInstanceMap);
-
-    // create ids from from the prototype in the instance
-    if (modulePrototype->file()->idScope()) {
-        const auto items = collectItemsWithId(modulePrototype);
-        for (Item * const itemWithId : items) {
-            Item *idProto = itemWithId;
-            Item *idInstance = prototypeInstanceMap.value(idProto);
-            QBS_ASSERT(idInstance, continue);
-            ItemValuePtr idInstanceValue = ItemValue::create(idInstance);
-            moduleScope->setProperty(itemWithId->id(), idInstanceValue);
-        }
-    }
-
-    // For foo.bar in modulePrototype create an item foo in moduleInstance.
-    for (const auto &[propertyName, itemValue] : instanceItemProperties(modulePrototype)) {
-        if (itemValue->item()->properties().empty())
-            continue;
-        qCDebug(lcModuleLoader) << "The prototype of " << moduleName
-                            << " sets properties on " << propertyName.toString();
-        Item *item = moduleInstanceItem(moduleInstance, propertyName);
-        item->setPrototype(itemValue->item());
-        if (itemValue->createdByPropertiesBlock()) {
-            ItemValuePtr itemValue = moduleInstance->itemProperty(propertyName.front());
-            for (int i = 1; i < propertyName.size(); ++i)
-                itemValue = itemValue->item()->itemProperty(propertyName.at(i));
-            itemValue->setCreatedByPropertiesBlock(true);
-        }
-    }
-
-    // Resolve dependencies of this module instance.
-    DependsContext dependsContext;
-    dependsContext.product = productContext;
-    dependsContext.exportingProductItem = exportingProduct;
-    QBS_ASSERT(moduleInstance->modules().empty(), moduleInstance->removeModules());
-    if (productModuleInfo) {
-        dependsContext.productDependencies = &productContext->productModuleDependencies[fullName];
-        resolveDependencies(&dependsContext, moduleInstance);
-    } else if (!isBaseModule(fullName)) {
-        dependsContext.productDependencies = &productContext->info.usedProducts;
-        resolveDependencies(&dependsContext, moduleInstance);
-    }
-
-    // Check readonly properties.
-    const auto end = moduleInstance->properties().cend();
-    for (auto it = moduleInstance->properties().cbegin(); it != end; ++it) {
-        const PropertyDeclaration &pd = moduleInstance->propertyDeclaration(it.key());
-        if (!pd.flags().testFlag(PropertyDeclaration::ReadOnlyFlag))
-            continue;
-        throw ErrorInfo(Tr::tr("Cannot set read-only property '%1'.").arg(pd.name()),
-                        moduleInstance->property(pd.name())->location());
-    }
-}
-
-void ModuleLoader::createChildInstances(Item *instance, Item *prototype,
-                                        QHash<Item *, Item *> *prototypeInstanceMap) const
-{
-    instance->childrenReserve(instance->children().size() + prototype->children().size());
-
-    for (Item * const childPrototype : prototype->children()) {
-        Item *childInstance = Item::create(m_pool, childPrototype->type());
-        prototypeInstanceMap->insert(childPrototype, childInstance);
-        childInstance->setPrototype(childPrototype);
-        childInstance->setFile(childPrototype->file());
-        childInstance->setId(childPrototype->id());
-        childInstance->setLocation(childPrototype->location());
-        childInstance->setScope(instance->scope());
-        Item::addChild(instance, childInstance);
-        createChildInstances(childInstance, childPrototype, prototypeInstanceMap);
-    }
-}
-
-void ModuleLoader::resolveProbes(ProductContext *productContext, Item *item)
-{
-    AccumulatingTimer probesTimer(m_parameters.logElapsedTime() ? &m_elapsedTimeProbes : nullptr);
-    EvalContextSwitcher evalContextSwitcher(m_evaluator->engine(), EvalContext::ProbeExecution);
-    for (Item * const child : item->children())
-        if (child->type() == ItemType::Probe)
-            resolveProbe(productContext, item, child);
-}
-
-void ModuleLoader::resolveProbe(ProductContext *productContext, Item *parent, Item *probe)
-{
-    qCDebug(lcModuleLoader) << "Resolving Probe at " << probe->location().toString();
-    ++m_probesEncountered;
-    const QString &probeId = probeGlobalId(probe);
-    if (Q_UNLIKELY(probeId.isEmpty()))
-        throw ErrorInfo(Tr::tr("Probe.id must be set."), probe->location());
-    const JSSourceValueConstPtr configureScript
-            = probe->sourceProperty(StringConstants::configureProperty());
-    QBS_CHECK(configureScript);
-    if (Q_UNLIKELY(configureScript->sourceCode() == StringConstants::undefinedValue()))
-        throw ErrorInfo(Tr::tr("Probe.configure must be set."), probe->location());
-    using ProbeProperty = std::pair<QString, QScriptValue>;
-    std::vector<ProbeProperty> probeBindings;
-    QVariantMap initialProperties;
-    for (Item *obj = probe; obj; obj = obj->prototype()) {
-        const Item::PropertyMap &props = obj->properties();
-        for (auto it = props.cbegin(); it != props.cend(); ++it) {
-            const QString &name = it.key();
-            if (name == StringConstants::configureProperty())
-                continue;
-            const QScriptValue value = m_evaluator->value(probe, name);
-            probeBindings << ProbeProperty(name, value);
-            if (name != StringConstants::conditionProperty())
-                initialProperties.insert(name, value.toVariant());
-        }
-    }
-    ScriptEngine * const engine = m_evaluator->engine();
-    QScriptValue configureScope;
-    const bool condition = m_evaluator->boolValue(probe, StringConstants::conditionProperty());
-    const QString &sourceCode = configureScript->sourceCode().toString();
-    ProbeConstPtr resolvedProbe;
-    if (parent->type() == ItemType::Project
-            || productContext->name.startsWith(StringConstants::shadowProductPrefix())) {
-        resolvedProbe = findOldProjectProbe(probeId, condition, initialProperties, sourceCode);
-    } else {
-        const QString &uniqueProductName = productContext->uniqueName();
-        resolvedProbe
-                = findOldProductProbe(uniqueProductName, condition, initialProperties, sourceCode);
-    }
-    if (!resolvedProbe) {
-        resolvedProbe = findCurrentProbe(probe->location(), condition, initialProperties);
-        if (resolvedProbe) {
-            qCDebug(lcModuleLoader) << "probe results cached from current run";
-            ++m_probesCachedCurrent;
-        }
-    } else {
-        qCDebug(lcModuleLoader) << "probe results cached from earlier run";
-        ++m_probesCachedOld;
-    }
-    std::vector<QString> importedFilesUsedInConfigure;
-    if (!condition) {
-        qCDebug(lcModuleLoader) << "Probe disabled; skipping";
-    } else if (!resolvedProbe) {
-        ++m_probesRun;
-        qCDebug(lcModuleLoader) << "configure script needs to run";
-        const Evaluator::FileContextScopes fileCtxScopes
-                = m_evaluator->fileContextScopes(configureScript->file());
-        engine->currentContext()->pushScope(fileCtxScopes.fileScope);
-        engine->currentContext()->pushScope(fileCtxScopes.importScope);
-        configureScope = engine->newObject();
-        for (const ProbeProperty &b : probeBindings)
-            configureScope.setProperty(b.first, b.second);
-        engine->currentContext()->pushScope(configureScope);
-        engine->clearRequestedProperties();
-        QScriptValue sv = engine->evaluate(configureScript->sourceCodeForEvaluation());
-        engine->currentContext()->popScope();
-        engine->currentContext()->popScope();
-        engine->currentContext()->popScope();
-        engine->releaseResourcesOfScriptObjects();
-        if (Q_UNLIKELY(engine->hasErrorOrException(sv)))
-            throw ErrorInfo(engine->lastErrorString(sv), configureScript->location());
-        importedFilesUsedInConfigure = engine->importedFilesUsedInScript();
-    } else {
-        importedFilesUsedInConfigure = resolvedProbe->importedFilesUsed();
-    }
-    QVariantMap properties;
-    for (const ProbeProperty &b : probeBindings) {
-        QVariant newValue;
-        if (resolvedProbe) {
-            newValue = resolvedProbe->properties().value(b.first);
-        } else {
-            if (condition) {
-                QScriptValue v = configureScope.property(b.first);
-                m_evaluator->convertToPropertyType(probe->propertyDeclaration(
-                                                   b.first), probe->location(), v);
-                if (Q_UNLIKELY(engine->hasErrorOrException(v)))
-                    throw ErrorInfo(engine->lastError(v));
-                newValue = v.toVariant();
-            } else {
-                newValue = initialProperties.value(b.first);
-            }
-        }
-        if (newValue != b.second.toVariant())
-            probe->setProperty(b.first, VariantValue::create(newValue));
-        if (!resolvedProbe)
-            properties.insert(b.first, newValue);
-    }
-    if (!resolvedProbe) {
-        resolvedProbe = Probe::create(probeId, probe->location(), condition,
-                                      sourceCode, properties, initialProperties,
-                                      importedFilesUsedInConfigure);
-        m_currentProbes[probe->location()] << resolvedProbe;
-    }
-    productContext->info.probes << resolvedProbe;
-}
-
-void ModuleLoader::checkCancelation() const
-{
-    if (m_progressObserver && m_progressObserver->canceled()) {
-        throw ErrorInfo(Tr::tr("Project resolving canceled for configuration %1.")
-                    .arg(TopLevelProject::deriveId(m_parameters.finalBuildConfigurationTree())));
-    }
-}
-
-bool ModuleLoader::checkItemCondition(Item *item, Item *itemToDisable)
-{
-    if (m_evaluator->boolValue(item, StringConstants::conditionProperty()))
-        return true;
-    m_disabledItems += itemToDisable ? itemToDisable : item;
-    return false;
-}
-
-QStringList ModuleLoader::readExtraSearchPaths(Item *item, bool *wasSet)
-{
-    QStringList result;
-    const QStringList paths = m_evaluator->stringListValue(
-                item, StringConstants::qbsSearchPathsProperty(), wasSet);
-    const JSSourceValueConstPtr prop = item->sourceProperty(
-                StringConstants::qbsSearchPathsProperty());
-
-    // Value can come from within a project file or as an overridden value from the user
-    // (e.g command line).
-    const QString basePath = FileInfo::path(prop ? prop->file()->filePath()
-                                                 : m_parameters.projectFilePath());
-    for (const QString &path : paths)
-        result += FileInfo::resolvePath(basePath, path);
-    return result;
-}
-
-void ModuleLoader::copyProperties(const Item *sourceProject, Item *targetProject)
-{
-    if (!sourceProject)
-        return;
-    const QList<PropertyDeclaration> builtinProjectProperties = BuiltinDeclarations::instance()
-            .declarationsForType(ItemType::Project).properties();
-    Set<QString> builtinProjectPropertyNames;
-    for (const PropertyDeclaration &p : builtinProjectProperties)
-        builtinProjectPropertyNames << p.name();
-
-    for (Item::PropertyDeclarationMap::ConstIterator it
-         = sourceProject->propertyDeclarations().constBegin();
-         it != sourceProject->propertyDeclarations().constEnd(); ++it) {
-
-        // We must not inherit built-in properties such as "name",
-        // but there are exceptions.
-        if (it.key() == StringConstants::qbsSearchPathsProperty()
-                || it.key() == StringConstants::profileProperty()
-                || it.key() == StringConstants::buildDirectoryProperty()
-                || it.key() == StringConstants::sourceDirectoryProperty()
-                || it.key() == StringConstants::minimumQbsVersionProperty()) {
-            const JSSourceValueConstPtr &v = targetProject->sourceProperty(it.key());
-            QBS_ASSERT(v, continue);
-            if (v->sourceCode() == StringConstants::undefinedValue())
-                sourceProject->copyProperty(it.key(), targetProject);
-            continue;
-        }
-
-        if (builtinProjectPropertyNames.contains(it.key()))
-            continue;
-
-        if (targetProject->hasOwnProperty(it.key()))
-            continue; // Ignore stuff the target project already has.
-
-        targetProject->setPropertyDeclaration(it.key(), it.value());
-        sourceProject->copyProperty(it.key(), targetProject);
-    }
-}
-
-Item *ModuleLoader::wrapInProjectIfNecessary(Item *item)
-{
-    if (item->type() == ItemType::Project)
-        return item;
-    Item *prj = Item::create(item->pool(), ItemType::Project);
-    Item::addChild(prj, item);
-    prj->setFile(item->file());
-    prj->setLocation(item->location());
-    prj->setupForBuiltinType(m_logger);
-    return prj;
-}
-
-QString ModuleLoader::findExistingModulePath(const QString &searchPath,
-        const QualifiedId &moduleName)
-{
-    // isFileCaseCorrect is a very expensive call on macOS, so we cache the value for the
-    // modules and search paths we've already processed
-    auto &moduleInfo = m_existingModulePathCache[{searchPath, moduleName}];
-    if (moduleInfo)
-        return *moduleInfo;
-
-    QString dirPath = searchPath + QStringLiteral("/modules");
-
-    for (const QString &moduleNamePart : moduleName) {
-        dirPath = FileInfo::resolvePath(dirPath, moduleNamePart);
-        if (!FileInfo::exists(dirPath) || !FileInfo::isFileCaseCorrect(dirPath)) {
-            return *(moduleInfo = QString());
-        }
-    }
-
-    return *(moduleInfo = dirPath);
-}
-
-QStringList ModuleLoader::findExistingModulePaths(
-        const QStringList &searchPaths, const QualifiedId &moduleName)
-{
-    QStringList result;
-    result.reserve(searchPaths.size());
-    for (const auto &path: searchPaths) {
-        const QString dirPath = findExistingModulePath(path, moduleName);
-        if (!dirPath.isEmpty())
-            result.append(dirPath);
-    }
-    return result;
-}
-
-void ModuleLoader::setScopeForDescendants(Item *item, Item *scope)
-{
-    for (Item * const child : item->children()) {
-        child->setScope(scope);
-        setScopeForDescendants(child, scope);
-    }
-}
-
-void ModuleLoader::overrideItemProperties(Item *item, const QString &buildConfigKey,
-        const QVariantMap &buildConfig)
-{
-    const QVariant buildConfigValue = buildConfig.value(buildConfigKey);
-    if (buildConfigValue.isNull())
-        return;
-    item->overrideProperties(buildConfigValue.toMap(), buildConfigKey, m_parameters, m_logger);
-}
-
-void ModuleLoader::collectAllModules(Item *item, std::vector<Item::Module> *modules)
-{
-    for (const Item::Module &m : item->modules()) {
-        if (moduleRepresentsDisabledProduct(m))
-            m.item->removeModules();
-        auto it = std::find_if(modules->begin(), modules->end(),
-                               [m] (const Item::Module &m2) { return m.name == m2.name; });
-        if (it != modules->end()) {
-            // If a module is required somewhere, it is required in the top-level item.
-            if (m.required)
-                it->required = true;
-            it->versionRange.narrowDown(m.versionRange);
-            it->fallbackEnabled = it->fallbackEnabled && m.fallbackEnabled;
-            continue;
-        }
-        modules->push_back(m);
-        collectAllModules(m.item, modules);
-    }
-}
-
-std::vector<Item::Module> ModuleLoader::allModules(Item *item)
-{
-    std::vector<Item::Module> lst;
-    collectAllModules(item, &lst);
-    return lst;
-}
-
-bool ModuleLoader::moduleRepresentsDisabledProduct(const Item::Module &module)
-{
-    if (!module.isProduct)
-        return false;
-    const Item *exportItem = module.item->prototype();
-    while (exportItem && exportItem->type() != ItemType::Export)
-        exportItem = exportItem->prototype();
-    QBS_CHECK(exportItem);
-    Item * const productItem = exportItem->parent();
-    QBS_CHECK(productItem->type() == ItemType::Product);
-    return m_disabledItems.contains(productItem) || !checkItemCondition(productItem);
-}
-
-void ModuleLoader::addProductModuleDependencies(ProductContext *productContext, const QString &name)
-{
-    auto deps = productContext->productModuleDependencies.at(name);
-    QList<ModuleLoaderResult::ProductInfo::Dependency> depsToAdd;
-    const bool productIsMultiplexed = !productContext->multiplexConfigurationId.isEmpty();
-    for (auto &dep : deps) {
-        const auto productRange = m_productsByName.equal_range(dep.name);
-        std::vector<const ProductContext *> dependencies;
-        bool hasNonMultiplexedDependency = false;
-        for (auto it = productRange.first; it != productRange.second; ++it) {
-            if (!it->second->multiplexConfigurationId.isEmpty()) {
-                dependencies.push_back(it->second);
-                if (productIsMultiplexed && dep.profile.isEmpty())
-                    break;
-            } else {
-                hasNonMultiplexedDependency = true;
-                break;
-            }
-        }
-
-        if (hasNonMultiplexedDependency) {
-            depsToAdd.push_back(dep);
-            continue;
-        }
-
-        for (std::size_t i = 0; i < dependencies.size(); ++i) {
-            const bool profileMatch = dep.profile.isEmpty()
-                    || dep.profile == StringConstants::star()
-                    || dep.profile == dependencies.at(i)->profileName;
-            if (i == 0) {
-                if (productIsMultiplexed && dep.profile.isEmpty()) {
-                    const ValuePtr &multiplexConfigIdProp = productContext->item->property(
-                                StringConstants::multiplexConfigurationIdProperty());
-                    dep.multiplexConfigurationId = std::static_pointer_cast<VariantValue>(
-                                multiplexConfigIdProp)->value().toString();
-                    depsToAdd.push_back(dep);
-                    break;
-                } else if (profileMatch) {
-                    dep.multiplexConfigurationId = dependencies.at(i)->multiplexConfigurationId;
-                    depsToAdd.push_back(dep);
-                }
-            } else if (profileMatch) {
-                ModuleLoaderResult::ProductInfo::Dependency newDependency = dep;
-                newDependency.multiplexConfigurationId
-                        = dependencies.at(i)->multiplexConfigurationId;
-                depsToAdd << newDependency;
-            }
-        }
-    }
-    productContext->info.usedProducts.insert(productContext->info.usedProducts.end(),
-                depsToAdd.cbegin(), depsToAdd.cend());
-}
-
-static void collectProductModuleDependencies(Item *item, Set<QualifiedId> &allDeps)
-{
-    for (const Item::Module &m : item->modules()) {
-        if (m.isProduct && allDeps.insert(m.name).second)
-            collectProductModuleDependencies(m.item, allDeps);
-    }
-}
-
-void ModuleLoader::addProductModuleDependencies(ModuleLoader::ProductContext *ctx)
-{
-    Set<QualifiedId> deps;
-    collectProductModuleDependencies(ctx->item, deps);
-    for (const QualifiedId &dep : deps)
-        addProductModuleDependencies(ctx, dep.toString());
-}
-
-void ModuleLoader::addTransitiveDependencies(ProductContext *ctx)
-{
-    AccumulatingTimer timer(m_parameters.logElapsedTime()
-                            ? &m_elapsedTimeTransitiveDependencies : nullptr);
-    qCDebug(lcModuleLoader) << "addTransitiveDependencies";
-
-    std::vector<Item::Module> transitiveDeps = allModules(ctx->item);
-    std::sort(transitiveDeps.begin(), transitiveDeps.end());
-    for (const Item::Module &m : ctx->item->modules()) {
-        auto it = std::lower_bound(transitiveDeps.begin(), transitiveDeps.end(), m);
-        QBS_CHECK(it != transitiveDeps.end() && it->name == m.name);
-        transitiveDeps.erase(it);
-    }
-    for (const Item::Module &module : qAsConst(transitiveDeps)) {
-        if (module.isProduct) {
-            ctx->item->addModule(module);
-        } else {
-            const FallbackMode fallbackMode = module.fallbackEnabled
-                    ? FallbackMode::Enabled : FallbackMode::Disabled;
-            Item::Module dep;
-            dep.item = loadModule(ctx, nullptr, ctx->item, ctx->item->location(), QString(),
-                                  module.name, QString(), fallbackMode,
-                                  module.required, &dep.isProduct, &dep.parameters);
-            if (!dep.item) {
-                throw ErrorInfo(Tr::tr("Module '%1' not found when setting up transitive "
-                                       "dependencies for product '%2'.").arg(module.name.toString(),
-                                                                             ctx->name),
-                                ctx->item->location());
-            }
-            dep.name = module.name;
-            dep.required = module.required;
-            dep.versionRange = module.versionRange;
-            dep.fallbackEnabled = fallbackMode == FallbackMode::Enabled;
-            ctx->item->addModule(dep);
-        }
-    }
-}
-
-Item *ModuleLoader::createNonPresentModule(const QString &name, const QString &reason, Item *module)
-{
-    qCDebug(lcModuleLoader) << "Non-required module '" << name << "' not loaded (" << reason << ")."
-                        << "Creating dummy module for presence check.";
-    if (!module) {
-        module = Item::create(m_pool, ItemType::ModuleInstance);
-        module->setFile(FileContext::create());
-        module->setProperty(StringConstants::nameProperty(), VariantValue::create(name));
-    }
-    module->setProperty(StringConstants::presentProperty(), VariantValue::falseValue());
-    return module;
-}
-
-void ModuleLoader::handleProductError(const ErrorInfo &error,
-                                      ModuleLoader::ProductContext *productContext)
-{
-    const bool alreadyHadError = productContext->info.delayedError.hasError();
-    if (!alreadyHadError) {
-        productContext->info.delayedError.append(Tr::tr("Error while handling product '%1':")
-                                                 .arg(productContext->name),
-                                                 productContext->item->location());
-    }
-    if (error.isInternalError()) {
-        if (alreadyHadError) {
-            qCDebug(lcModuleLoader()) << "ignoring subsequent internal error" << error.toString()
-                                      << "in product" << productContext->name;
-            return;
-        }
-        for (const auto &kv : productContext->productModuleDependencies) {
-            const auto rangeForName = m_productsByName.equal_range(kv.first);
-            for (auto rangeIt = rangeForName.first; rangeIt != rangeForName.second; ++rangeIt) {
-                const ProductContext * const dep = rangeIt->second;
-                if (dep->info.delayedError.hasError()) {
-                    qCDebug(lcModuleLoader()) << "ignoring internal error" << error.toString()
-                                              << "in product" << productContext->name
-                                              << "assumed to be caused by erroneous dependency"
-                                              << dep->name;
-                    return;
-                }
-            }
-        }
-    }
-    const auto errorItems = error.items();
-    for (const ErrorItem &ei : errorItems)
-        productContext->info.delayedError.append(ei.description(), ei.codeLocation());
-    productContext->project->result->productInfos[productContext->item] = productContext->info;
-    m_disabledItems << productContext->item;
-    m_erroneousProducts.insert(productContext->name);
-}
-
-static void gatherAssignedProperties(ItemValue *iv, const QualifiedId &prefix,
-                                     QualifiedIdSet &properties)
-{
-    const Item::PropertyMap &props = iv->item()->properties();
-    for (auto it = props.cbegin(); it != props.cend(); ++it) {
-        switch (it.value()->type()) {
-        case Value::JSSourceValueType:
-            properties << (QualifiedId(prefix) << it.key());
-            break;
-        case Value::ItemValueType:
-            if (iv->item()->type() == ItemType::ModulePrefix) {
-                gatherAssignedProperties(std::static_pointer_cast<ItemValue>(it.value()).get(),
-                                         QualifiedId(prefix) << it.key(), properties);
-            }
-            break;
-        default:
-            break;
-        }
-    }
-}
-
-QualifiedIdSet ModuleLoader::gatherModulePropertiesSetInGroup(const Item *group)
-{
-    QualifiedIdSet propsSetInGroup;
-    const Item::PropertyMap &props = group->properties();
-    for (auto it = props.cbegin(); it != props.cend(); ++it) {
-        if (it.value()->type() == Value::ItemValueType) {
-            gatherAssignedProperties(std::static_pointer_cast<ItemValue>(it.value()).get(),
-                                     QualifiedId(it.key()), propsSetInGroup);
-        }
-    }
-    return propsSetInGroup;
-}
-
-void ModuleLoader::markModuleTargetGroups(Item *group, const Item::Module &module)
-{
-    QBS_CHECK(group->type() == ItemType::Group);
-    if (m_evaluator->boolValue(group, StringConstants::filesAreTargetsProperty())) {
-        group->setProperty(StringConstants::modulePropertyInternal(),
-                           VariantValue::create(module.name.toString()));
-    }
-    for (Item * const child : group->children())
-        markModuleTargetGroups(child, module);
-}
-
-void ModuleLoader::copyGroupsFromModuleToProduct(const ProductContext &productContext,
-                                                 const Item::Module &module,
-                                                 const Item *modulePrototype)
-{
-    for (Item * const child : modulePrototype->children()) {
-        if (child->type() == ItemType::Group) {
-            Item * const clonedGroup = child->clone();
-            clonedGroup->setScope(productContext.scope);
-            setScopeForDescendants(clonedGroup, productContext.scope);
-            Item::addChild(productContext.item, clonedGroup);
-            markModuleTargetGroups(clonedGroup, module);
-        }
-    }
-}
-
-void ModuleLoader::copyGroupsFromModulesToProduct(const ProductContext &productContext)
-{
-    for (const Item::Module &module : productContext.item->modules()) {
-        Item *prototype = module.item;
-        bool modulePassedValidation;
-        while ((modulePassedValidation = prototype->isPresentModule()) && prototype->prototype())
-            prototype = prototype->prototype();
-        if (modulePassedValidation)
-            copyGroupsFromModuleToProduct(productContext, module, prototype);
-    }
-}
-
-QString ModuleLoaderResult::ProductInfo::Dependency::uniqueName() const
-{
-    return ResolvedProduct::uniqueName(name, multiplexConfigurationId);
-}
-
-QString ModuleLoader::ProductContext::uniqueName() const
-{
-    return ResolvedProduct::uniqueName(name, multiplexConfigurationId);
-}
-
-} // namespace Internal
-} // namespace qbs
diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
deleted file mode 100644
index cea3be518..000000000
--- a/src/lib/corelib/language/moduleloader.h
+++ /dev/null
@@ -1,478 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QBS_MODULELOADER_H
-#define QBS_MODULELOADER_H
-
-#include "filetags.h"
-#include "forward_decls.h"
-#include "item.h"
-#include "itempool.h"
-#include "moduleproviderinfo.h"
-#include <logging/logger.h>
-#include <tools/filetime.h>
-#include <tools/qttools.h>
-#include <tools/set.h>
-#include <tools/setupprojectparameters.h>
-#include <tools/version.h>
-
-#include <QtCore/qmap.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qvariant.h>
-
-#include <map>
-#include <memory>
-#include <optional>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-namespace qbs {
-
-class CodeLocation;
-class Settings;
-
-namespace Internal {
-
-class Evaluator;
-class Item;
-class ItemReader;
-class ModuleProviderLoader;
-class ProgressObserver;
-class QualifiedId;
-class SearchPathsManager;
-
-using ModulePropertiesPerGroup = std::unordered_map<const Item *, QualifiedIdSet>;
-
-struct ModuleLoaderResult
-{
-    ModuleLoaderResult()
-        : itemPool(new ItemPool), root(nullptr)
-    {}
-
-    struct ProductInfo
-    {
-        struct Dependency
-        {
-            QString name;
-            QString profile; // "*" <=> Match all profiles.
-            QString multiplexConfigurationId;
-            QVariantMap parameters;
-            bool limitToSubProject = false;
-            bool isRequired = true;
-
-            QString uniqueName() const;
-        };
-
-        std::vector<ProbeConstPtr> probes;
-        std::vector<Dependency> usedProducts;
-        ModulePropertiesPerGroup modulePropertiesSetInGroups;
-        ErrorInfo delayedError;
-    };
-
-    std::shared_ptr<ItemPool> itemPool;
-    Item *root;
-    std::unordered_map<Item *, ProductInfo> productInfos;
-    std::vector<ProbeConstPtr> projectProbes;
-    StoredModuleProviderInfo storedModuleProviderInfo;
-    Set<QString> qbsFiles;
-    QVariantMap profileConfigs;
-};
-
-/*
- * Loader stage II. Responsible for
- *      - loading modules and module dependencies,
- *      - project references,
- *      - Probe items.
- */
-class ModuleLoader
-{
-public:
-    ModuleLoader(Evaluator *evaluator, Logger &logger);
-    ~ModuleLoader();
-
-    void setProgressObserver(ProgressObserver *progressObserver);
-    void setSearchPaths(const QStringList &searchPaths);
-    void setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes);
-    void setOldProductProbes(const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes);
-    void setLastResolveTime(const FileTime &time) { m_lastResolveTime = time; }
-    void setStoredProfiles(const QVariantMap &profiles);
-    void setStoredModuleProviderInfo(const StoredModuleProviderInfo &moduleProviderInfo);
-    Evaluator *evaluator() const { return m_evaluator; }
-
-    ModuleLoaderResult load(const SetupProjectParameters &parameters);
-
-private:
-    friend class ModuleProviderLoader;
-    class ProductSortByDependencies;
-
-    class ContextBase
-    {
-    public:
-        ContextBase()
-            : item(nullptr), scope(nullptr)
-        {}
-
-        Item *item;
-        Item *scope;
-        QString name;
-    };
-
-    class ProjectContext;
-
-    using ProductDependencies = std::vector<ModuleLoaderResult::ProductInfo::Dependency>;
-
-    // This is the data we need to store at the point where a dependency is deferred
-    // in order to properly resolve the dependency in pass 2.
-    struct DeferredDependsContext {
-        DeferredDependsContext(Item *exportingProduct, Item *parent)
-            : exportingProductItem(exportingProduct), parentItem(parent) {}
-        Item *exportingProductItem = nullptr;
-        Item *parentItem = nullptr;
-        bool operator==(const DeferredDependsContext &other) const
-        {
-            return exportingProductItem == other.exportingProductItem
-                    && parentItem == other.parentItem;
-        }
-        bool operator<(const DeferredDependsContext &other) const
-        {
-            return parentItem < other.parentItem;
-        }
-    };
-
-    class ProductContext : public ContextBase
-    {
-    public:
-        ProjectContext *project = nullptr;
-        ModuleLoaderResult::ProductInfo info;
-        QString profileName;
-        QString multiplexConfigurationId;
-        QVariantMap moduleProperties;
-        std::map<QString, ProductDependencies> productModuleDependencies;
-        std::unordered_map<const Item *, std::vector<ErrorInfo>> unknownProfilePropertyErrors;
-        QStringList searchPaths;
-
-        std::optional<QVariantMap> theModuleProviderConfig;
-
-        // The key corresponds to DeferredDependsContext.exportingProductItem, which is the
-        // only value from that data structure that we still need here.
-        std::unordered_map<Item *, std::vector<Item *>> deferredDependsItems;
-
-        QString uniqueName() const;
-    };
-
-    class TopLevelProjectContext;
-
-    class ProjectContext : public ContextBase
-    {
-    public:
-        TopLevelProjectContext *topLevelProject = nullptr;
-        ModuleLoaderResult *result = nullptr;
-        std::vector<ProductContext> products;
-        std::vector<QStringList> searchPathsStack;
-    };
-
-    struct ProductModuleInfo
-    {
-        Item *exportItem = nullptr;
-        QString multiplexId;
-        QVariantMap defaultParameters;
-    };
-
-    class TopLevelProjectContext
-    {
-        Q_DISABLE_COPY(TopLevelProjectContext)
-    public:
-        TopLevelProjectContext() = default;
-        ~TopLevelProjectContext() { qDeleteAll(projects); }
-
-        std::vector<ProjectContext *> projects;
-        QMultiHash<QString, ProductModuleInfo> productModules;
-        std::vector<ProbeConstPtr> probes;
-        QString buildDirectory;
-    };
-
-    class DependsContext
-    {
-    public:
-        ProductContext *product = nullptr;
-        Item *exportingProductItem = nullptr;
-        ProductDependencies *productDependencies = nullptr;
-    };
-
-    void handleTopLevelProject(ModuleLoaderResult *loadResult, Item *projectItem,
-            const QString &buildDirectory, const Set<QString> &referencedFilePaths);
-    void handleProject(ModuleLoaderResult *loadResult,
-            TopLevelProjectContext *topLevelProjectContext, Item *projectItem,
-            const Set<QString> &referencedFilePaths);
-
-    using MultiplexRow = std::vector<VariantValuePtr>;
-    using MultiplexTable = std::vector<MultiplexRow>;
-
-    struct MultiplexInfo
-    {
-        std::vector<QString> properties;
-        MultiplexTable table;
-        bool aggregate = false;
-        VariantValuePtr multiplexedType;
-
-        QString toIdString(size_t row) const;
-        static QVariantMap multiplexIdToVariantMap(const QString &multiplexId);
-    };
-
-    void dump(const MultiplexInfo &mpi);
-    static MultiplexTable combine(const MultiplexTable &table, const MultiplexRow &values);
-    MultiplexInfo extractMultiplexInfo(Item *productItem, Item *qbsModuleItem);
-    QList<Item *> multiplexProductItem(ProductContext *dummyContext, Item *productItem);
-    void normalizeDependencies(ProductContext *product,
-                               const DeferredDependsContext &dependsContext);
-    void adjustDependenciesForMultiplexing(const TopLevelProjectContext &tlp);
-    void adjustDependenciesForMultiplexing(const ProductContext &product);
-    void adjustDependenciesForMultiplexing(const ProductContext &product, Item *dependsItem);
-
-    void prepareProduct(ProjectContext *projectContext, Item *productItem);
-    void setupProductDependencies(ProductContext *productContext,
-                                  const Set<DeferredDependsContext> &deferredDependsContext);
-    void handleProduct(ProductContext *productContext);
-    void checkDependencyParameterDeclarations(const ProductContext *productContext) const;
-    void handleModuleSetupError(ProductContext *productContext, const Item::Module &module,
-                                const ErrorInfo &error);
-    void initProductProperties(const ProductContext &product);
-    void handleSubProject(ProjectContext *projectContext, Item *projectItem,
-            const Set<QString> &referencedFilePaths);
-    QList<Item *> loadReferencedFile(const QString &relativePath,
-                                     const CodeLocation &referencingLocation,
-                                     const Set<QString> &referencedFilePaths,
-                                     ProductContext &dummyContext);
-    void handleAllPropertyOptionsItems(Item *item);
-    void handlePropertyOptions(Item *optionsItem);
-
-    using ModuleDependencies = QHash<QualifiedId, QualifiedIdSet>;
-    void setupReverseModuleDependencies(const Item::Module &module, ModuleDependencies &deps,
-                                        QualifiedIdSet &seenModules);
-    ModuleDependencies setupReverseModuleDependencies(const Item *product);
-    void handleGroup(ProductContext *productContext, Item *groupItem,
-                     const ModuleDependencies &reverseDepencencies);
-    void propagateModulesFromParent(ProductContext *productContext, Item *groupItem,
-                                    const ModuleDependencies &reverseDepencencies);
-    void adjustDefiningItemsInGroupModuleInstances(const Item::Module &module,
-                                                   const Item::Modules &dependentModules);
-
-    bool mergeExportItems(const ProductContext &productContext);
-    void resolveDependencies(DependsContext *dependsContext, Item *item,
-                             ProductContext *productContext = nullptr);
-    class ItemModuleList;
-    void resolveDependsItem(DependsContext *dependsContext, Item *parentItem, Item *dependsItem,
-                            ItemModuleList *moduleResults, ProductDependencies *productResults);
-    void forwardParameterDeclarations(const Item *dependsItem, const ItemModuleList &modules);
-    void forwardParameterDeclarations(const QualifiedId &moduleName, Item *item,
-                                      const ItemModuleList &modules);
-    void resolveParameterDeclarations(const Item *module);
-    QVariantMap extractParameters(Item *dependsItem) const;
-    Item *moduleInstanceItem(Item *containerItem, const QualifiedId &moduleName);
-    static ProductModuleInfo *productModule(ProductContext *productContext, const QString &name,
-                                            const QString &multiplexId, bool &productNameMatch);
-    static ProductContext *product(ProjectContext *projectContext, const QString &name);
-    static ProductContext *product(TopLevelProjectContext *tlpContext, const QString &name);
-
-    enum class FallbackMode { Enabled, Disabled };
-    Item *loadModule(ProductContext *productContext, Item *exportingProductItem, Item *item,
-            const CodeLocation &dependsItemLocation, const QString &moduleId,
-            const QualifiedId &moduleName, const QString &multiplexId, FallbackMode fallbackMode,
-            bool isRequired, bool *isProductDependency, QVariantMap *defaultParameters);
-    Item *searchAndLoadModuleFile(ProductContext *productContext,
-            const CodeLocation &dependsItemLocation, const QualifiedId &moduleName,
-            FallbackMode fallbackMode, bool isRequired, Item *moduleInstance);
-    QStringList &getModuleFileNames(const QString &dirPath);
-    std::pair<Item *, bool> loadModuleFile(
-            ProductContext *productContext, const QString &fullModuleName,
-            const QString &filePath, Item *moduleInstance);
-    std::pair<Item *, bool> getModulePrototype(ProductContext *productContext,
-            const QString &fullModuleName, const QString &filePath);
-    Item::Module loadBaseModule(ProductContext *productContext, Item *item);
-    void setupBaseModulePrototype(Item *prototype);
-    template <typename T, typename F>
-    T callWithTemporaryBaseModule(ProductContext *productContext, const F &func);
-    void instantiateModule(ProductContext *productContext, Item *exportingProductItem,
-            Item *instanceScope, Item *moduleInstance, Item *modulePrototype,
-            const QualifiedId &moduleName, ProductModuleInfo *productModuleInfo);
-    void createChildInstances(Item *instance, Item *prototype,
-                              QHash<Item *, Item *> *prototypeInstanceMap) const;
-    void resolveProbes(ProductContext *productContext, Item *item);
-    void resolveProbe(ProductContext *productContext, Item *parent, Item *probe);
-    void checkCancelation() const;
-    bool checkItemCondition(Item *item, Item *itemToDisable = nullptr);
-    QStringList readExtraSearchPaths(Item *item, bool *wasSet = nullptr);
-    void copyProperties(const Item *sourceProject, Item *targetProject);
-    Item *wrapInProjectIfNecessary(Item *item);
-    QString findExistingModulePath(const QString &searchPath, const QualifiedId &moduleName);
-    QStringList findExistingModulePaths(
-            const QStringList &searchPaths, const QualifiedId &moduleName);
-
-    static void setScopeForDescendants(Item *item, Item *scope);
-    void overrideItemProperties(Item *item, const QString &buildConfigKey,
-                                const QVariantMap &buildConfig);
-    void addProductModuleDependencies(ProductContext *ctx, const QString &name);
-    void addProductModuleDependencies(ProductContext *ctx);
-    void addTransitiveDependencies(ProductContext *ctx);
-    Item *createNonPresentModule(const QString &name, const QString &reason, Item *module);
-    void copyGroupsFromModuleToProduct(const ProductContext &productContext,
-                                       const Item::Module &module, const Item *modulePrototype);
-    void copyGroupsFromModulesToProduct(const ProductContext &productContext);
-    void markModuleTargetGroups(Item *group, const Item::Module &module);
-    bool checkExportItemCondition(Item *exportItem, const ProductContext &productContext);
-    ProbeConstPtr findOldProjectProbe(const QString &globalId, bool condition,
-                                      const QVariantMap &initialProperties,
-                                      const QString &sourceCode) const;
-    ProbeConstPtr findOldProductProbe(const QString &productName, bool condition,
-                                      const QVariantMap &initialProperties,
-                                      const QString &sourceCode) const;
-    ProbeConstPtr findCurrentProbe(const CodeLocation &location, bool condition,
-                                   const QVariantMap &initialProperties) const;
-
-    enum class CompareScript { No, Yes };
-    bool probeMatches(const ProbeConstPtr &probe, bool condition,
-                      const QVariantMap &initialProperties, const QString &configureScript,
-                      CompareScript compareScript) const;
-
-    void printProfilingInfo();
-    void handleProductError(const ErrorInfo &error, ProductContext *productContext);
-    QualifiedIdSet gatherModulePropertiesSetInGroup(const Item *group);
-    Item *loadItemFromFile(const QString &filePath, const CodeLocation &referencingLocation);
-    void collectProductsByName(const TopLevelProjectContext &topLevelProject);
-    void collectProductsByType(const TopLevelProjectContext &topLevelProject);
-
-    void handleProfileItems(Item *item, ProjectContext *projectContext);
-    std::vector<Item *> collectProfileItems(Item *item, ProjectContext *projectContext);
-    void evaluateProfileValues(const QualifiedId &namePrefix, Item *item, Item *profileItem,
-                               QVariantMap &values);
-    void handleProfile(Item *profileItem);
-    void collectNameFromOverride(const QString &overrideString);
-    void checkProjectNamesInOverrides(const TopLevelProjectContext &tlp);
-    void checkProductNamesInOverrides();
-    void setSearchPathsForProduct(ProductContext *product);
-
-    Item::Modules modulesSortedByDependency(const Item *productItem);
-    void createSortedModuleList(const Item::Module &parentModule, Item::Modules &modules);
-    void collectAllModules(Item *item, std::vector<Item::Module> *modules);
-    std::vector<Item::Module> allModules(Item *item);
-    bool moduleRepresentsDisabledProduct(const Item::Module &module);
-
-    using ShadowProductInfo = std::pair<bool, QString>;
-    ShadowProductInfo getShadowProductInfo(const ProductContext &product) const;
-
-    ItemPool *m_pool;
-    Logger &m_logger;
-    ProgressObserver *m_progressObserver;
-    const std::unique_ptr<ItemReader> m_reader;
-    Evaluator *m_evaluator;
-    const std::unique_ptr<ModuleProviderLoader> m_moduleProviderLoader;
-    QMap<QString, QStringList> m_moduleDirListCache;
-    QHash<std::pair<QString, QualifiedId>, std::optional<QString>> m_existingModulePathCache;
-
-    // The keys are file paths, the values are module prototype items accompanied by a profile.
-    std::unordered_map<QString, std::vector<std::pair<Item *, QString>>> m_modulePrototypes;
-
-    // The keys are module prototypes and products, the values specify whether the module's
-    // condition is true for that product.
-    QHash<std::pair<Item *, ProductContext *>, bool> m_modulePrototypeEnabledInfo;
-
-    QHash<const Item *, Item::PropertyDeclarationMap> m_parameterDeclarations;
-    Set<Item *> m_disabledItems;
-    std::vector<bool> m_requiredChain;
-
-    struct DependsChainEntry
-    {
-        DependsChainEntry(QualifiedId name, const CodeLocation &location)
-            : name(std::move(name)), location(location)
-        {
-        }
-
-        QualifiedId name;
-        CodeLocation location;
-        bool isProduct = false;
-    };
-    class DependsChainManager;
-    std::vector<DependsChainEntry> m_dependsChain;
-
-    QHash<QString, std::vector<ProbeConstPtr>> m_oldProjectProbes;
-    QHash<QString, std::vector<ProbeConstPtr>> m_oldProductProbes;
-    FileTime m_lastResolveTime;
-    QHash<CodeLocation, std::vector<ProbeConstPtr>> m_currentProbes;
-    QVariantMap m_storedProfiles;
-    QVariantMap m_localProfiles;
-    std::multimap<QString, const ProductContext *> m_productsByName;
-    std::multimap<FileTag, const ProductContext *> m_productsByType;
-
-    std::unordered_map<ProductContext *, Set<DeferredDependsContext>> m_productsWithDeferredDependsItems;
-    Set<Item *> m_exportsWithDeferredDependsItems;
-
-    SetupProjectParameters m_parameters;
-    std::unique_ptr<Settings> m_settings;
-    Version m_qbsVersion;
-    Item *m_tempScopeItem = nullptr;
-
-    qint64 m_elapsedTimeProbes = 0;
-    qint64 m_elapsedTimePrepareProducts = 0;
-    qint64 m_elapsedTimeProductDependencies = 0;
-    qint64 m_elapsedTimeModuleProviders = 0;
-    qint64 m_elapsedTimeTransitiveDependencies = 0;
-    qint64 m_elapsedTimeHandleProducts = 0;
-    qint64 m_elapsedTimePropertyChecking = 0;
-    quint64 m_probesEncountered = 0;
-    quint64 m_probesRun = 0;
-    quint64 m_probesCachedCurrent = 0;
-    quint64 m_probesCachedOld = 0;
-    Set<QString> m_projectNamesUsedInOverrides;
-    Set<QString> m_productNamesUsedInOverrides;
-    Set<QString> m_disabledProjects;
-    Set<QString> m_erroneousProducts;
-
-    int m_dependencyResolvingPass = 0;
-};
-
-} // namespace Internal
-} // namespace qbs
-
-QT_BEGIN_NAMESPACE
-Q_DECLARE_TYPEINFO(qbs::Internal::ModuleLoaderResult::ProductInfo, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(qbs::Internal::ModuleLoaderResult::ProductInfo::Dependency, Q_MOVABLE_TYPE);
-QT_END_NAMESPACE
-
-#endif // QBS_MODULELOADER_H
diff --git a/src/lib/corelib/language/modulemerger.cpp b/src/lib/corelib/language/modulemerger.cpp
deleted file mode 100644
index 6ad8e2259..000000000
--- a/src/lib/corelib/language/modulemerger.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "modulemerger.h"
-
-#include "value.h"
-
-#include <logging/translator.h>
-#include <tools/qbsassert.h>
-#include <tools/qttools.h>
-#include <tools/stlutils.h>
-#include <tools/stringconstants.h>
-
-namespace qbs {
-namespace Internal {
-
-ModuleMerger::ModuleMerger(Logger &logger, Item *productItem, const QString &productName,
-                           const Item::Modules::iterator &modulesBegin,
-                           const Item::Modules::iterator &modulesEnd)
-    : m_logger(logger)
-    , m_productItem(productItem)
-    , m_mergedModule(*modulesBegin)
-    , m_isBaseModule(m_mergedModule.name.first() == StringConstants::qbsModule())
-    , m_isShadowProduct(productName.startsWith(StringConstants::shadowProductPrefix()))
-    , m_modulesBegin(std::next(modulesBegin))
-    , m_modulesEnd(modulesEnd)
-{
-    QBS_CHECK(modulesBegin->item->type() == ItemType::ModuleInstance);
-}
-
-void ModuleMerger::replaceItemInValues(QualifiedId moduleName, Item *containerItem, Item *toReplace)
-{
-    QBS_CHECK(!moduleName.empty());
-    QBS_CHECK(containerItem != m_mergedModule.item);
-    const QString moduleNamePrefix = moduleName.takeFirst();
-    const Item::PropertyMap &properties = containerItem->properties();
-    for (auto it = properties.begin(); it != properties.end(); ++it) {
-        if (it.key() != moduleNamePrefix)
-            continue;
-        Value * const val = it.value().get();
-        QBS_CHECK(val);
-        QBS_CHECK(val->type() == Value::ItemValueType);
-        const auto itemVal = static_cast<ItemValue *>(val);
-        if (moduleName.empty()) {
-            QBS_CHECK(itemVal->item() == toReplace);
-            itemVal->setItem(m_mergedModule.item);
-        } else {
-            replaceItemInValues(moduleName, itemVal->item(), toReplace);
-        }
-    }
-}
-
-void ModuleMerger::start()
-{
-    // Iterate over any module that our product depends on. These modules
-    // may depend on m_mergedModule and contribute property assignments.
-    Item::PropertyMap props;
-    for (auto module = m_modulesBegin; module != m_modulesEnd; module++)
-        mergeModule(&props, *module);
-
-    // Module property assignments in the product have the highest priority
-    // and are thus prepended.
-    Item::Module m;
-    m.item = m_productItem;
-    mergeModule(&props, m);
-
-    // The module's prototype is the essential unmodified module as loaded
-    // from the cache.
-    Item *moduleProto = m_mergedModule.item->prototype();
-    while (moduleProto->prototype())
-        moduleProto = moduleProto->prototype();
-
-    // The prototype item might contain default values which get appended in
-    // case of list properties. Scalar properties will only be set if not
-    // already specified above.
-    Item::PropertyMap mergedProps = m_mergedModule.item->properties();
-    for (auto it = props.constBegin(); it != props.constEnd(); ++it) {
-        appendPrototypeValueToNextChain(moduleProto, it.key(), it.value());
-        mergedProps[it.key()] = it.value();
-    }
-
-    m_mergedModule.item->setProperties(mergedProps);
-
-    // Update all sibling instances of the to-be-merged module to behave identical
-    // to the merged module.
-    for (Item *moduleInstanceContainer : qAsConst(m_moduleInstanceContainers)) {
-        Item::Modules modules;
-        for (const Item::Module &dep : moduleInstanceContainer->modules()) {
-            const bool isTheModule = dep.name == m_mergedModule.name;
-            Item::Module m = dep;
-            if (isTheModule && m.item != m_mergedModule.item) {
-                QBS_CHECK(m.item->type() == ItemType::ModuleInstance);
-                replaceItemInValues(m.name, moduleInstanceContainer, m.item);
-                m.item = m_mergedModule.item;
-                m.required = m_mergedModule.required;
-                m.versionRange = m_mergedModule.versionRange;
-                m.fallbackEnabled = m_mergedModule.fallbackEnabled;
-            }
-            modules << m;
-        }
-        moduleInstanceContainer->setModules(modules);
-    }
-}
-
-void ModuleMerger::mergeModule(Item::PropertyMap *dstProps, const Item::Module &module)
-{
-    const Item::Module *dep = findModule(module.item, m_mergedModule.name);
-    if (!dep)
-        return;
-
-    const bool mergingProductItem = (module.item == m_productItem);
-    Item *srcItem = dep->item;
-    Item *origSrcItem = srcItem;
-    do {
-        if (m_seenInstances.insert(srcItem).second) {
-            for (auto it = srcItem->properties().constBegin();
-                    it != srcItem->properties().constEnd(); ++it) {
-                const ValuePtr &srcVal = it.value();
-                if (srcVal->type() == Value::ItemValueType)
-                    continue;
-                if (it.key() == StringConstants::qbsSourceDirPropertyInternal())
-                    continue;
-                const PropertyDeclaration srcDecl = srcItem->propertyDeclaration(it.key());
-                if (!srcDecl.isValid())
-                    continue;
-
-                // Scalar variant values could stem from product multiplexing, in which case
-                // the merged qbs module instance needs to get that value.
-                if (srcVal->type() == Value::VariantValueType
-                        && (!srcDecl.isScalar() || !m_isBaseModule)) {
-                    continue;
-                }
-
-                ValuePtr clonedSrcVal = srcVal->clone();
-                clonedSrcVal->setDefiningItem(origSrcItem);
-
-                ValuePtr &dstVal = (*dstProps)[it.key()];
-                if (dstVal) {
-                    if (srcDecl.isScalar()) {
-                        // Scalar properties get replaced.
-                        if ((dstVal->type() == Value::JSSourceValueType)
-                                && (srcVal->type() == Value::JSSourceValueType)) {
-                            // Warn only about conflicting source code values
-                            const JSSourceValuePtr dstJsVal =
-                                    std::static_pointer_cast<JSSourceValue>(dstVal);
-                            const JSSourceValuePtr srcJsVal =
-                                    std::static_pointer_cast<JSSourceValue>(srcVal);
-                            const bool overriddenInProduct =
-                                    m_mergedModule.item->properties().contains(it.key());
-
-                            if (dstJsVal->sourceCode() != srcJsVal->sourceCode()
-                                    && !mergingProductItem && !overriddenInProduct
-                                    && !m_isShadowProduct) {
-                                m_logger.qbsWarning()
-                                        << Tr::tr("Conflicting scalar values at %1 and %2.").arg(
-                                           dstJsVal->location().toString(),
-                                           srcJsVal->location().toString());
-                            }
-                        }
-                    } else {
-                        // List properties get prepended
-                        QBS_CHECK(!clonedSrcVal->next());
-                        clonedSrcVal->setNext(dstVal);
-                    }
-                }
-                dstVal = clonedSrcVal;
-            }
-        }
-        srcItem = srcItem->prototype();
-    } while (srcItem && srcItem->type() == ItemType::ModuleInstance);
-
-    // Update dependency constraints
-    if (dep->required)
-        m_mergedModule.required = true;
-    // if one dep has fallback disabled, disable it for the merged module
-    m_mergedModule.fallbackEnabled = m_mergedModule.fallbackEnabled && dep->fallbackEnabled;
-    m_mergedModule.versionRange.narrowDown(dep->versionRange);
-
-    // We need to touch the unmerged module instances later once more
-    m_moduleInstanceContainers << module.item;
-}
-
-void ModuleMerger::appendPrototypeValueToNextChain(Item *moduleProto, const QString &propertyName,
-        const ValuePtr &sv)
-{
-    const PropertyDeclaration pd = m_mergedModule.item->propertyDeclaration(propertyName);
-    if (pd.isScalar())
-        return;
-    if (!m_clonedModulePrototype) {
-        m_clonedModulePrototype = Item::create(moduleProto->pool(), ItemType::Module);
-        m_clonedModulePrototype->setScope(m_mergedModule.item);
-        m_clonedModulePrototype->setLocation(moduleProto->location());
-        moduleProto->copyProperty(StringConstants::nameProperty(), m_clonedModulePrototype);
-    }
-    const ValuePtr &protoValue = moduleProto->property(propertyName);
-    QBS_CHECK(protoValue);
-    const ValuePtr clonedValue = protoValue->clone();
-    lastInNextChain(sv)->setNext(clonedValue);
-    clonedValue->setDefiningItem(m_clonedModulePrototype);
-    m_clonedModulePrototype->setPropertyDeclaration(propertyName, pd);
-    m_clonedModulePrototype->setProperty(propertyName, clonedValue);
-}
-
-ValuePtr ModuleMerger::lastInNextChain(const ValuePtr &v)
-{
-    ValuePtr n = v;
-    while (n->next())
-        n = n->next();
-    return n;
-}
-
-const Item::Module *ModuleMerger::findModule(const Item *item, const QualifiedId &name)
-{
-    for (const auto &module : item->modules()) {
-        if (module.name == name)
-            return &module;
-    }
-    return nullptr;
-}
-
-void ModuleMerger::merge(Logger &logger, Item *product, const QString &productName,
-                         Item::Modules *topSortedModules)
-{
-    for (auto it = topSortedModules->begin(); it != topSortedModules->end(); ++it)
-        ModuleMerger(logger, product, productName, it, topSortedModules->end()).start();
-}
-
-
-
-} // namespace Internal
-} // namespace qbs
diff --git a/src/lib/corelib/language/moduleproviderinfo.h b/src/lib/corelib/language/moduleproviderinfo.h
index 8ed6f008d..c35ed220a 100644
--- a/src/lib/corelib/language/moduleproviderinfo.h
+++ b/src/lib/corelib/language/moduleproviderinfo.h
@@ -83,18 +83,25 @@ public:
     QualifiedId name;
     QVariantMap config;
     QString providerFile;
+    bool isEager{true};
     QStringList searchPaths;
+    QHash<QString, QStringList> searchPathsByModule;
     bool transientOutput = false; // Not to be serialized.
 };
 
-using ModuleProviderInfoList = std::vector<ModuleProviderInfo>;
+using ModuleProvidersCacheKey = std::tuple<
+    QString /*name*/,
+    QString /*moduleName*/,
+    QVariantMap /*config*/,
+    QVariantMap /*qbsModule*/,
+    int /*lookup*/
+>;
+using ModuleProvidersCache = QHash<ModuleProvidersCacheKey, ModuleProviderInfo>;
 
 // Persistent info stored between sessions
-struct StoredModuleProviderInfo
+class StoredModuleProviderInfo
 {
-    using CacheKey = std::tuple<QString /*name*/, QVariantMap /*config*/, int /*lookup*/>;
-    using ModuleProvidersCache = QHash<CacheKey, ModuleProviderInfo>;
-
+public:
     ModuleProvidersCache providers;
 
     template<PersistentPool::OpType opType> void completeSerializationOp(PersistentPool &pool)
diff --git a/src/lib/corelib/language/moduleproviderloader.cpp b/src/lib/corelib/language/moduleproviderloader.cpp
deleted file mode 100644
index 86246b0d6..000000000
--- a/src/lib/corelib/language/moduleproviderloader.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Copyright (C) 2021 Ivan Komissarov (abbapoh@gmail.com)
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "moduleproviderloader.h"
-
-#include "builtindeclarations.h"
-#include "evaluator.h"
-#include "itemreader.h"
-#include "moduleloader.h"
-
-#include <language/scriptengine.h>
-#include <language/value.h>
-
-#include <logging/categories.h>
-#include <logging/translator.h>
-
-#include <tools/fileinfo.h>
-#include <tools/jsliterals.h>
-#include <tools/stringconstants.h>
-
-#include <QtCore/qtemporaryfile.h>
-
-namespace qbs {
-namespace Internal {
-
-ModuleProviderLoader::ModuleProviderLoader(ItemReader *reader, Evaluator *evaluator, Logger &logger)
-    : m_reader(reader)
-    , m_evaluator(evaluator)
-    , m_logger(logger)
-{
-}
-
-ModuleProviderLoader::ModuleProviderResult ModuleProviderLoader::executeModuleProvider(
-        ProductContext &productContext,
-        const CodeLocation &dependsItemLocation,
-        const QualifiedId &moduleName,
-        FallbackMode fallbackMode)
-{
-    ModuleProviderLoader::ModuleProviderResult result;
-    std::vector<Provider> providersToRun;
-    qCDebug(lcModuleLoader) << "Module" << moduleName.toString()
-                            << "not found, checking for module providers";
-    const auto providerNames = getModuleProviders(productContext.item);
-    if (providerNames) {
-        for (const auto &providerName : *providerNames)
-            providersToRun.push_back({providerName, ModuleProviderLookup::Named});
-    } else {
-        for (QualifiedId providerName = moduleName; !providerName.empty();
-            providerName.pop_back()) {
-                providersToRun.push_back({providerName, ModuleProviderLookup::Scoped});
-        }
-    }
-    result = findModuleProvider(providersToRun, productContext, dependsItemLocation);
-
-    if (fallbackMode == FallbackMode::Enabled
-            && !result.providerFound
-            && !providerNames) {
-            qCDebug(lcModuleLoader) << "Specific module provider not found for"
-                                << moduleName.toString()  << ", setting up fallback.";
-        result = findModuleProvider(
-                {{moduleName, ModuleProviderLookup::Fallback}},
-                productContext,
-                dependsItemLocation);
-    }
-
-    return result;
-}
-
-ModuleProviderLoader::ModuleProviderResult ModuleProviderLoader::findModuleProvider(
-        const std::vector<Provider> &providers,
-        ProductContext &product,
-        const CodeLocation &dependsItemLocation)
-{
-    if (providers.empty())
-        return {};
-    QStringList allSearchPaths;
-    ModuleProviderResult result;
-    for (const auto &[name, lookupType] : providers) {
-        const QVariantMap config = moduleProviderConfig(product).value(name.toString()).toMap();
-        ModuleProviderInfo &info =
-                m_storedModuleProviderInfo.providers[{name.toString(), config, int(lookupType)}];
-        const bool fromCache = !info.name.isEmpty();
-        if (!fromCache) {
-            info.name = name;
-            info.config = config;
-            info.providerFile = findModuleProviderFile(name, lookupType);
-            if (!info.providerFile.isEmpty()) {
-                qCDebug(lcModuleLoader) << "Running provider" << name << "at" << info.providerFile;
-                info.searchPaths = getProviderSearchPaths(
-                        name, info.providerFile, product, config, dependsItemLocation);
-                info.transientOutput = m_parameters.dryRun();
-            }
-        }
-        if (info.providerFile.isEmpty()) {
-            if (lookupType == ModuleProviderLookup::Named)
-                throw ErrorInfo(Tr::tr("Unknown provider '%1'").arg(name.toString()));
-            continue;
-        }
-        if (fromCache)
-            qCDebug(lcModuleLoader) << "Re-using provider" << name << "from cache";
-
-        result.providerFound = true;
-        if (info.searchPaths.empty()) {
-            qCDebug(lcModuleLoader)
-                    << "Module provider did run, but did not set up any modules.";
-            continue;
-        }
-        qCDebug(lcModuleLoader) << "Module provider added" << info.searchPaths.size()
-                                << "new search path(s)";
-
-        allSearchPaths << info.searchPaths;
-    }
-    if (allSearchPaths.isEmpty())
-        return result;
-
-    m_reader->pushExtraSearchPaths(allSearchPaths);
-    result.providerAddedSearchPaths = true;
-
-    return result;
-}
-
-QVariantMap ModuleProviderLoader::moduleProviderConfig(
-        ProductContext &product)
-{
-    if (product.theModuleProviderConfig)
-        return *product.theModuleProviderConfig;
-    QVariantMap providerConfig;
-    const ItemValueConstPtr configItemValue =
-            product.item->itemProperty(StringConstants::moduleProviders());
-    if (configItemValue) {
-        const std::function<void(const Item *, QualifiedId)> collectMap
-                = [this, &providerConfig, &collectMap](const Item *item, const QualifiedId &name) {
-            const Item::PropertyMap &props = item->properties();
-            for (auto it = props.begin(); it != props.end(); ++it) {
-                QVariant value;
-                switch (it.value()->type()) {
-                case Value::ItemValueType: {
-                    const auto childItem = static_cast<ItemValue *>(it.value().get())->item();
-                    childItem->setScope(item->scope());
-                    collectMap(childItem, QualifiedId(name) << it.key());
-                    continue;
-                }
-                case Value::JSSourceValueType:
-                    value = m_evaluator->value(item, it.key()).toVariant();
-                    break;
-                case Value::VariantValueType:
-                    value = static_cast<VariantValue *>(it.value().get())->value();
-                    break;
-                }
-                QVariantMap m = providerConfig.value(name.toString()).toMap();
-                m.insert(it.key(), value);
-                providerConfig.insert(name.toString(), m);
-            }
-        };
-        configItemValue->item()->setScope(product.item);
-        collectMap(configItemValue->item(), QualifiedId());
-    }
-    for (auto it = product.moduleProperties.begin(); it != product.moduleProperties.end(); ++it) {
-        if (!it.key().startsWith(QStringLiteral("moduleProviders.")))
-            continue;
-        const QString provider = it.key().mid(QStringLiteral("moduleProviders.").size());
-        const QVariantMap providerConfigFromBuildConfig = it.value().toMap();
-        if (providerConfigFromBuildConfig.empty())
-            continue;
-        QVariantMap currentMapForProvider = providerConfig.value(provider).toMap();
-        for (auto propIt = providerConfigFromBuildConfig.begin();
-             propIt != providerConfigFromBuildConfig.end(); ++propIt) {
-            currentMapForProvider.insert(propIt.key(), propIt.value());
-        }
-        providerConfig.insert(provider, currentMapForProvider);
-    }
-    return *(product.theModuleProviderConfig = std::move(providerConfig));
-}
-
-std::optional<std::vector<QualifiedId>> ModuleProviderLoader::getModuleProviders(Item *item)
-{
-    while (item) {
-        const auto providers =
-                m_evaluator->optionalStringListValue(item, StringConstants::qbsModuleProviders());
-        if (providers) {
-            std::vector<QualifiedId> result;
-            result.reserve(providers->size());
-            for (const auto &provider : *providers)
-                result.push_back(QualifiedId::fromString(provider));
-            return result;
-        }
-        item = item->parent();
-    }
-    return std::nullopt;
-}
-
-QString ModuleProviderLoader::findModuleProviderFile(
-            const QualifiedId &name, ModuleProviderLookup lookupType)
-{
-    for (const QString &path : m_reader->allSearchPaths()) {
-        QString fullPath = FileInfo::resolvePath(path, QStringLiteral("module-providers"));
-        switch (lookupType) {
-        case ModuleProviderLookup::Named: {
-            const auto result =
-                    FileInfo::resolvePath(fullPath, name.toString() + QStringLiteral(".qbs"));
-            if (FileInfo::exists(result)) {
-                fullPath = result;
-                break;
-            }
-            [[fallthrough]];
-        }
-        case ModuleProviderLookup::Scoped:
-            for (const QString &component : name)
-                fullPath = FileInfo::resolvePath(fullPath, component);
-            fullPath = FileInfo::resolvePath(fullPath, QStringLiteral("provider.qbs"));
-            break;
-        case ModuleProviderLookup::Fallback:
-            fullPath = FileInfo::resolvePath(fullPath, QStringLiteral("__fallback/provider.qbs"));
-            break;
-        }
-        if (!FileInfo::exists(fullPath)) {
-            qCDebug(lcModuleLoader) << "No module provider found at" << fullPath;
-            continue;
-        }
-        return fullPath;
-    }
-    return {};
-}
-
-QStringList ModuleProviderLoader::getProviderSearchPaths(
-        const QualifiedId &name,
-        const QString &providerFile,
-        ProductContext &product,
-        const QVariantMap &moduleConfig,
-        const CodeLocation &location)
-{
-    QTemporaryFile dummyItemFile;
-    if (!dummyItemFile.open()) {
-        throw ErrorInfo(Tr::tr("Failed to create temporary file for running module provider "
-                               "for dependency '%1': %2").arg(name.toString(),
-                                                              dummyItemFile.errorString()));
-    }
-    m_tempQbsFiles << dummyItemFile.fileName();
-    qCDebug(lcModuleLoader) << "Instantiating module provider at" << providerFile;
-    const QString projectBuildDir = product.project->item->variantProperty(
-                StringConstants::buildDirectoryProperty())->value().toString();
-    const QString searchPathBaseDir = ModuleProviderInfo::outputDirPath(projectBuildDir, name);
-    QTextStream stream(&dummyItemFile);
-    using Qt::endl;
-    setupDefaultCodec(stream);
-    stream << "import qbs.FileInfo" << endl;
-    stream << "import qbs.Utilities" << endl;
-    stream << "import '" << providerFile << "' as Provider" << endl;
-    stream << "Provider {" << endl;
-    stream << "    name: " << toJSLiteral(name.toString()) << endl;
-    stream << "    property var config: (" << toJSLiteral(moduleConfig) << ')' << endl;
-    stream << "    outputBaseDir: FileInfo.joinPaths(baseDirPrefix, "
-              "        Utilities.getHash(JSON.stringify(config)))" << endl;
-    stream << "    property string baseDirPrefix: " << toJSLiteral(searchPathBaseDir) << endl;
-    stream << "    property stringList searchPaths: (relativeSearchPaths || [])"
-              "        .map(function(p) { return FileInfo.joinPaths(outputBaseDir, p); })"
-           << endl;
-    stream << "}" << endl;
-    stream.flush();
-    Item * const providerItem =
-            m_reader->readFile(dummyItemFile.fileName(), location);
-    if (providerItem->type() != ItemType::ModuleProvider) {
-        throw ErrorInfo(Tr::tr("File '%1' declares an item of type '%2', "
-                               "but '%3' was expected.")
-            .arg(providerFile, providerItem->typeName(),
-                 BuiltinDeclarations::instance().nameForType(ItemType::ModuleProvider)));
-    }
-    providerItem->setParent(product.item);
-    providerItem->overrideProperties(moduleConfig, name.toString(), m_parameters, m_logger);
-    EvalContextSwitcher contextSwitcher(m_evaluator->engine(), EvalContext::ModuleProvider);
-    return m_evaluator->stringListValue(providerItem, QStringLiteral("searchPaths"));
-}
-
-} // namespace Internal
-} // namespace qbs
diff --git a/src/lib/corelib/language/preparescriptobserver.cpp b/src/lib/corelib/language/preparescriptobserver.cpp
index 632cbfb51..11536e74d 100644
--- a/src/lib/corelib/language/preparescriptobserver.cpp
+++ b/src/lib/corelib/language/preparescriptobserver.cpp
@@ -48,8 +48,6 @@
 #include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
-#include <QtScript/qscriptvalue.h>
-
 namespace qbs {
 namespace Internal {
 
@@ -58,22 +56,23 @@ PrepareScriptObserver::PrepareScriptObserver(ScriptEngine *engine, UnobserveMode
 {
 }
 
-void PrepareScriptObserver::onPropertyRead(const QScriptValue &object, const QString &name,
-                                           const QScriptValue &value)
+void PrepareScriptObserver::onPropertyRead(const JSValue &object, const QString &name,
+                                           const JSValue &value)
 {
-    const auto objectId = object.objectId();
+    JSContext * const ctx = engine()->context();
+    const auto objectId = jsObjectId(object);
     const auto projectIt = m_projectObjectIds.find(objectId);
     if (projectIt != m_projectObjectIds.cend()) {
         engine()->addPropertyRequestedInScript(
-                    Property(projectIt->second, QString(), name, value.toVariant(),
+                    Property(projectIt->second, QString(), name, getJsVariant(ctx, value),
                              Property::PropertyInProject));
         return;
     }
     if (m_importIds.contains(objectId)) {
-        engine()->addImportRequestedInScript(object.objectId());
+        engine()->addImportRequestedInScript(jsObjectId(object));
         return;
     }
-    const auto exportsIt = m_exportsObjectIds.find(value.objectId());
+    const auto exportsIt = m_exportsObjectIds.find(jsObjectId(object));
     if (exportsIt != m_exportsObjectIds.cend()) {
         engine()->addRequestedExport(exportsIt->second);
         return;
@@ -81,13 +80,14 @@ void PrepareScriptObserver::onPropertyRead(const QScriptValue &object, const QSt
     const auto it = m_parameterObjects.find(objectId);
     if (it != m_parameterObjects.cend()) {
         engine()->addPropertyRequestedInScript(
-                    Property(it->second.first, it->second.second, name, value.toVariant(),
+                    Property(it->second.first, it->second.second, name, getJsVariant(ctx, value),
                              Property::PropertyInParameters));
     }
     if (name == StringConstants::fileTagsProperty() && m_artifactIds.contains(objectId)) {
-        const Artifact * const artifact = attachedPointer<Artifact>(object);
+        const Artifact * const artifact = attachedPointer<Artifact>(object,
+                                                                    engine()->dataWithPtrClass());
         QBS_CHECK(artifact);
-        const Property p(artifact->product->uniqueName(), QString(), name, value.toVariant(),
+        const Property p(artifact->product->uniqueName(), QString(), name, getJsVariant(ctx, value),
                          Property::PropertyInArtifact);
         engine()->addPropertyRequestedFromArtifact(artifact, p);
     }
diff --git a/src/lib/corelib/language/preparescriptobserver.h b/src/lib/corelib/language/preparescriptobserver.h
index 36e395efc..5dc54cbb6 100644
--- a/src/lib/corelib/language/preparescriptobserver.h
+++ b/src/lib/corelib/language/preparescriptobserver.h
@@ -44,6 +44,8 @@
 
 #include <tools/set.h>
 
+#include <quickjs.h>
+
 #include <QtCore/qstring.h>
 
 #include <unordered_map>
@@ -69,7 +71,7 @@ public:
     }
 
     void addArtifactId(qint64 artifactId) { m_artifactIds.insert(artifactId); }
-    bool addImportId(qint64 importId) { return m_importIds.insert(importId).second; }
+    bool addImportId(quintptr importId) { return m_importIds.insert(importId).second; }
     void clearImportIds() { m_importIds.clear(); }
     void addParameterObjectId(qint64 id, const QString &productName, const QString &depName,
                               const QualifiedId &moduleName)
@@ -79,14 +81,13 @@ public:
         m_parameterObjects.insert(std::make_pair(id, value));
     }
 
-private:
-    void onPropertyRead(const QScriptValue &object, const QString &name,
-                        const QScriptValue &value) override;
+    void onPropertyRead(const JSValue &object, const QString &name, const JSValue &value) override;
 
+private:
     std::unordered_map<qint64, QString> m_projectObjectIds;
     std::unordered_map<qint64, std::pair<QString, QString>> m_parameterObjects;
     std::unordered_map<qint64, const ResolvedProduct *> m_exportsObjectIds;
-    Set<qint64> m_importIds;
+    Set<quintptr> m_importIds;
     Set<qint64> m_artifactIds;
 };
 
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
deleted file mode 100644
index 83f42e4e2..000000000
--- a/src/lib/corelib/language/projectresolver.cpp
+++ /dev/null
@@ -1,1915 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "projectresolver.h"
-
-#include "artifactproperties.h"
-#include "builtindeclarations.h"
-#include "evaluator.h"
-#include "filecontext.h"
-#include "item.h"
-#include "language.h"
-#include "propertymapinternal.h"
-#include "resolvedfilecontext.h"
-#include "scriptengine.h"
-#include "value.h"
-
-#include <jsextensions/jsextensions.h>
-#include <jsextensions/moduleproperties.h>
-#include <logging/categories.h>
-#include <logging/translator.h>
-#include <tools/error.h>
-#include <tools/fileinfo.h>
-#include <tools/joblimits.h>
-#include <tools/jsliterals.h>
-#include <tools/profiling.h>
-#include <tools/progressobserver.h>
-#include <tools/scripttools.h>
-#include <tools/qbsassert.h>
-#include <tools/qttools.h>
-#include <tools/setupprojectparameters.h>
-#include <tools/stlutils.h>
-#include <tools/stringconstants.h>
-
-#include <QtCore/qdir.h>
-#include <QtCore/qregularexpression.h>
-
-#include <algorithm>
-#include <memory>
-#include <queue>
-
-namespace qbs {
-namespace Internal {
-
-extern bool debugProperties;
-
-static const FileTag unknownFileTag()
-{
-    static const FileTag tag("unknown-file-tag");
-    return tag;
-}
-
-struct ProjectResolver::ProjectContext
-{
-    ProjectContext *parentContext = nullptr;
-    ResolvedProjectPtr project;
-    std::vector<FileTaggerConstPtr> fileTaggers;
-    std::vector<RulePtr> rules;
-    JobLimits jobLimits;
-    ResolvedModulePtr dummyModule;
-};
-
-struct ProjectResolver::ProductContext
-{
-    ResolvedProductPtr product;
-    QString buildDirectory;
-    Item *item = nullptr;
-    using ArtifactPropertiesInfo = std::pair<ArtifactPropertiesPtr, std::vector<CodeLocation>>;
-    QHash<QStringList, ArtifactPropertiesInfo> artifactPropertiesPerFilter;
-    ProjectResolver::FileLocations sourceArtifactLocations;
-    GroupConstPtr currentGroup;
-};
-
-struct ProjectResolver::ModuleContext
-{
-    ResolvedModulePtr module;
-    JobLimits jobLimits;
-};
-
-class CancelException { };
-
-
-ProjectResolver::ProjectResolver(Evaluator *evaluator, ModuleLoaderResult loadResult,
-        SetupProjectParameters setupParameters, Logger &logger)
-    : m_evaluator(evaluator)
-    , m_logger(logger)
-    , m_engine(m_evaluator->engine())
-    , m_progressObserver(nullptr)
-    , m_setupParams(std::move(setupParameters))
-    , m_loadResult(std::move(loadResult))
-{
-    QBS_CHECK(FileInfo::isAbsolute(m_setupParams.buildRoot()));
-}
-
-ProjectResolver::~ProjectResolver() = default;
-
-void ProjectResolver::setProgressObserver(ProgressObserver *observer)
-{
-    m_progressObserver = observer;
-}
-
-static void checkForDuplicateProductNames(const TopLevelProjectConstPtr &project)
-{
-    const std::vector<ResolvedProductPtr> allProducts = project->allProducts();
-    for (size_t i = 0; i < allProducts.size(); ++i) {
-        const ResolvedProductConstPtr product1 = allProducts.at(i);
-        const QString productName = product1->uniqueName();
-        for (size_t j = i + 1; j < allProducts.size(); ++j) {
-            const ResolvedProductConstPtr product2 = allProducts.at(j);
-            if (product2->uniqueName() == productName) {
-                ErrorInfo error;
-                error.append(Tr::tr("Duplicate product name '%1'.").arg(product1->name));
-                error.append(Tr::tr("First product defined here."), product1->location);
-                error.append(Tr::tr("Second product defined here."), product2->location);
-                throw error;
-            }
-        }
-    }
-}
-
-TopLevelProjectPtr ProjectResolver::resolve()
-{
-    TimedActivityLogger projectResolverTimer(m_logger, Tr::tr("ProjectResolver"),
-                                             m_setupParams.logElapsedTime());
-    qCDebug(lcProjectResolver) << "resolving" << m_loadResult.root->file()->filePath();
-
-    m_productContext = nullptr;
-    m_moduleContext = nullptr;
-    m_elapsedTimeModPropEval = m_elapsedTimeAllPropEval = m_elapsedTimeGroups = 0;
-    TopLevelProjectPtr tlp;
-    try {
-        tlp = resolveTopLevelProject();
-        printProfilingInfo();
-    } catch (const CancelException &) {
-        throw ErrorInfo(Tr::tr("Project resolving canceled for configuration '%1'.")
-                    .arg(TopLevelProject::deriveId(m_setupParams.finalBuildConfigurationTree())));
-    }
-    return tlp;
-}
-
-void ProjectResolver::checkCancelation() const
-{
-    if (m_progressObserver && m_progressObserver->canceled())
-        throw CancelException();
-}
-
-QString ProjectResolver::verbatimValue(const ValueConstPtr &value, bool *propertyWasSet) const
-{
-    QString result;
-    if (value && value->type() == Value::JSSourceValueType) {
-        const JSSourceValueConstPtr sourceValue = std::static_pointer_cast<const JSSourceValue>(
-                    value);
-        result = sourceCodeForEvaluation(sourceValue);
-        if (propertyWasSet)
-            *propertyWasSet = !sourceValue->isBuiltinDefaultValue();
-    } else {
-        if (propertyWasSet)
-            *propertyWasSet = false;
-    }
-    return result;
-}
-
-QString ProjectResolver::verbatimValue(Item *item, const QString &name, bool *propertyWasSet) const
-{
-    return verbatimValue(item->property(name), propertyWasSet);
-}
-
-void ProjectResolver::ignoreItem(Item *item, ProjectContext *projectContext)
-{
-    Q_UNUSED(item);
-    Q_UNUSED(projectContext);
-}
-
-static void makeSubProjectNamesUniqe(const ResolvedProjectPtr &parentProject)
-{
-    Set<QString> subProjectNames;
-    Set<ResolvedProjectPtr> projectsInNeedOfNameChange;
-    for (const ResolvedProjectPtr &p : qAsConst(parentProject->subProjects)) {
-        if (!subProjectNames.insert(p->name).second)
-            projectsInNeedOfNameChange << p;
-        makeSubProjectNamesUniqe(p);
-    }
-    while (!projectsInNeedOfNameChange.empty()) {
-        auto it = projectsInNeedOfNameChange.begin();
-        while (it != projectsInNeedOfNameChange.end()) {
-            const ResolvedProjectPtr p = *it;
-            p->name += QLatin1Char('_');
-            if (subProjectNames.insert(p->name).second) {
-                it = projectsInNeedOfNameChange.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
-}
-
-TopLevelProjectPtr ProjectResolver::resolveTopLevelProject()
-{
-    if (m_progressObserver)
-        m_progressObserver->setMaximum(int(m_loadResult.productInfos.size()));
-    const TopLevelProjectPtr project = TopLevelProject::create();
-    project->buildDirectory = TopLevelProject::deriveBuildDirectory(m_setupParams.buildRoot(),
-            TopLevelProject::deriveId(m_setupParams.finalBuildConfigurationTree()));
-    project->buildSystemFiles = m_loadResult.qbsFiles;
-    project->profileConfigs = m_loadResult.profileConfigs;
-    project->probes = m_loadResult.projectProbes;
-    project->moduleProviderInfo = m_loadResult.storedModuleProviderInfo;
-    ProjectContext projectContext;
-    projectContext.project = project;
-
-    resolveProject(m_loadResult.root, &projectContext);
-    ErrorInfo accumulatedErrors;
-    for (const ErrorInfo &e : m_queuedErrors)
-        appendError(accumulatedErrors, e);
-    if (accumulatedErrors.hasError())
-        throw accumulatedErrors;
-
-    project->setBuildConfiguration(m_setupParams.finalBuildConfigurationTree());
-    project->overriddenValues = m_setupParams.overriddenValues();
-    project->canonicalFilePathResults = m_engine->canonicalFilePathResults();
-    project->fileExistsResults = m_engine->fileExistsResults();
-    project->directoryEntriesResults = m_engine->directoryEntriesResults();
-    project->fileLastModifiedResults = m_engine->fileLastModifiedResults();
-    project->environment = m_engine->environment();
-    project->buildSystemFiles.unite(m_engine->imports());
-    makeSubProjectNamesUniqe(project);
-    resolveProductDependencies(projectContext);
-    collectExportedProductDependencies();
-    checkForDuplicateProductNames(project);
-
-    for (const ResolvedProductPtr &product : project->allProducts()) {
-        if (!product->enabled)
-            continue;
-
-        applyFileTaggers(product);
-        matchArtifactProperties(product, product->allEnabledFiles());
-
-        // Let a positive value of qbs.install imply the file tag "installable".
-        for (const SourceArtifactPtr &artifact : product->allFiles()) {
-            if (artifact->properties->qbsPropertyValue(StringConstants::installProperty()).toBool())
-                artifact->fileTags += "installable";
-        }
-    }
-    project->warningsEncountered = m_logger.warnings();
-    return project;
-}
-
-void ProjectResolver::resolveProject(Item *item, ProjectContext *projectContext)
-{
-    checkCancelation();
-
-    if (projectContext->parentContext)
-        projectContext->project->enabled = projectContext->parentContext->project->enabled;
-    projectContext->project->location = item->location();
-    try {
-        resolveProjectFully(item, projectContext);
-    } catch (const ErrorInfo &error) {
-        if (!projectContext->project->enabled) {
-            qCDebug(lcProjectResolver) << "error resolving project"
-                                       << projectContext->project->location << error.toString();
-            return;
-        }
-        if (m_setupParams.productErrorMode() == ErrorHandlingMode::Strict)
-            throw;
-        m_logger.printWarning(error);
-    }
-}
-
-void ProjectResolver::resolveProjectFully(Item *item, ProjectResolver::ProjectContext *projectContext)
-{
-    projectContext->project->enabled = projectContext->project->enabled
-            && m_evaluator->boolValue(item, StringConstants::conditionProperty());
-    projectContext->project->name = m_evaluator->stringValue(item, StringConstants::nameProperty());
-    if (projectContext->project->name.isEmpty())
-        projectContext->project->name = FileInfo::baseName(item->location().filePath()); // FIXME: Must also be changed in item?
-    QVariantMap projectProperties;
-    if (!projectContext->project->enabled) {
-        projectProperties.insert(StringConstants::profileProperty(),
-                                 m_evaluator->stringValue(item,
-                                                          StringConstants::profileProperty()));
-        projectContext->project->setProjectProperties(projectProperties);
-        return;
-    }
-
-    projectContext->dummyModule = ResolvedModule::create();
-
-    for (Item::PropertyDeclarationMap::const_iterator it
-                = item->propertyDeclarations().constBegin();
-            it != item->propertyDeclarations().constEnd(); ++it) {
-        if (it.value().flags().testFlag(PropertyDeclaration::PropertyNotAvailableInConfig))
-            continue;
-        const ValueConstPtr v = item->property(it.key());
-        QBS_ASSERT(v && v->type() != Value::ItemValueType, continue);
-        projectProperties.insert(it.key(), m_evaluator->value(item, it.key()).toVariant());
-    }
-    projectContext->project->setProjectProperties(projectProperties);
-
-    static const ItemFuncMap mapping = {
-        { ItemType::Project, &ProjectResolver::resolveProject },
-        { ItemType::SubProject, &ProjectResolver::resolveSubProject },
-        { ItemType::Product, &ProjectResolver::resolveProduct },
-        { ItemType::Probe, &ProjectResolver::ignoreItem },
-        { ItemType::FileTagger, &ProjectResolver::resolveFileTagger },
-        { ItemType::JobLimit, &ProjectResolver::resolveJobLimit },
-        { ItemType::Rule, &ProjectResolver::resolveRule },
-        { ItemType::PropertyOptions, &ProjectResolver::ignoreItem }
-    };
-
-    for (Item * const child : item->children()) {
-        try {
-            callItemFunction(mapping, child, projectContext);
-        } catch (const ErrorInfo &e) {
-            m_queuedErrors.push_back(e);
-        }
-    }
-
-    for (const ResolvedProductPtr &product : projectContext->project->products)
-        postProcess(product, projectContext);
-}
-
-void ProjectResolver::resolveSubProject(Item *item, ProjectResolver::ProjectContext *projectContext)
-{
-    ProjectContext subProjectContext = createProjectContext(projectContext);
-
-    Item * const projectItem = item->child(ItemType::Project);
-    if (projectItem) {
-        resolveProject(projectItem, &subProjectContext);
-        return;
-    }
-
-    // No project item was found, which means the project was disabled.
-    subProjectContext.project->enabled = false;
-    Item * const propertiesItem = item->child(ItemType::PropertiesInSubProject);
-    if (propertiesItem) {
-        subProjectContext.project->name
-                = m_evaluator->stringValue(propertiesItem, StringConstants::nameProperty());
-    }
-}
-
-class ProjectResolver::ProductContextSwitcher
-{
-public:
-    ProductContextSwitcher(ProjectResolver *resolver, ProductContext *newContext,
-                           ProgressObserver *progressObserver)
-        : m_resolver(resolver), m_progressObserver(progressObserver)
-    {
-        QBS_CHECK(!m_resolver->m_productContext);
-        m_resolver->m_productContext = newContext;
-    }
-
-    ~ProductContextSwitcher()
-    {
-        if (m_progressObserver)
-            m_progressObserver->incrementProgressValue();
-        m_resolver->m_productContext = nullptr;
-    }
-
-private:
-    ProjectResolver * const m_resolver;
-    ProgressObserver * const m_progressObserver;
-};
-
-void ProjectResolver::resolveProduct(Item *item, ProjectContext *projectContext)
-{
-    checkCancelation();
-    m_evaluator->clearPropertyDependencies();
-    ProductContext productContext;
-    productContext.item = item;
-    ResolvedProductPtr product = ResolvedProduct::create();
-    product->enabled = projectContext->project->enabled;
-    product->moduleProperties = PropertyMapInternal::create();
-    product->project = projectContext->project;
-    productContext.product = product;
-    product->location = item->location();
-    ProductContextSwitcher contextSwitcher(this, &productContext, m_progressObserver);
-    try {
-        resolveProductFully(item, projectContext);
-    } catch (const ErrorInfo &e) {
-        QString mainErrorString = !product->name.isEmpty()
-                ? Tr::tr("Error while handling product '%1':").arg(product->name)
-                : Tr::tr("Error while handling product:");
-        ErrorInfo fullError(mainErrorString, item->location());
-        appendError(fullError, e);
-        if (!product->enabled) {
-            qCDebug(lcProjectResolver) << fullError.toString();
-            return;
-        }
-        if (m_setupParams.productErrorMode() == ErrorHandlingMode::Strict)
-            throw fullError;
-        m_logger.printWarning(fullError);
-        m_logger.printWarning(ErrorInfo(Tr::tr("Product '%1' had errors and was disabled.")
-                                        .arg(product->name), item->location()));
-        product->enabled = false;
-    }
-}
-
-void ProjectResolver::resolveProductFully(Item *item, ProjectContext *projectContext)
-{
-    const ResolvedProductPtr product = m_productContext->product;
-    m_productItemMap.insert(product, item);
-    projectContext->project->products.push_back(product);
-    product->name = m_evaluator->stringValue(item, StringConstants::nameProperty());
-
-    // product->buildDirectory() isn't valid yet, because the productProperties map is not ready.
-    m_productContext->buildDirectory
-            = m_evaluator->stringValue(item, StringConstants::buildDirectoryProperty());
-    product->multiplexConfigurationId
-            = m_evaluator->stringValue(item, StringConstants::multiplexConfigurationIdProperty());
-    qCDebug(lcProjectResolver) << "resolveProduct" << product->uniqueName();
-    m_productsByName.insert(product->uniqueName(), product);
-    product->enabled = product->enabled
-            && m_evaluator->boolValue(item, StringConstants::conditionProperty());
-    ModuleLoaderResult::ProductInfo &pi = m_loadResult.productInfos[item];
-    if (pi.delayedError.hasError()) {
-        ErrorInfo errorInfo;
-
-        // First item is "main error", gets prepended again in the catch clause.
-        const QList<ErrorItem> &items = pi.delayedError.items();
-        for (int i = 1; i < items.size(); ++i)
-            errorInfo.append(items.at(i));
-
-        pi.delayedError.clear();
-        throw errorInfo;
-    }
-    gatherProductTypes(product.get(), item);
-    product->targetName = m_evaluator->stringValue(item, StringConstants::targetNameProperty());
-    product->sourceDirectory = m_evaluator->stringValue(
-                item, StringConstants::sourceDirectoryProperty());
-    product->destinationDirectory = m_evaluator->stringValue(
-                item, StringConstants::destinationDirProperty());
-
-    if (product->destinationDirectory.isEmpty()) {
-        product->destinationDirectory = m_productContext->buildDirectory;
-    } else {
-        product->destinationDirectory = FileInfo::resolvePath(
-                    product->topLevelProject()->buildDirectory,
-                    product->destinationDirectory);
-    }
-    product->probes = pi.probes;
-    createProductConfig(product.get());
-    product->productProperties.insert(StringConstants::destinationDirProperty(),
-                                      product->destinationDirectory);
-    ModuleProperties::init(m_evaluator->scriptValue(item), product.get());
-
-    QList<Item *> subItems = item->children();
-    const ValuePtr filesProperty = item->property(StringConstants::filesProperty());
-    if (filesProperty) {
-        Item *fakeGroup = Item::create(item->pool(), ItemType::Group);
-        fakeGroup->setFile(item->file());
-        fakeGroup->setLocation(item->location());
-        fakeGroup->setScope(item);
-        fakeGroup->setProperty(StringConstants::nameProperty(), VariantValue::create(product->name));
-        fakeGroup->setProperty(StringConstants::filesProperty(), filesProperty);
-        fakeGroup->setProperty(StringConstants::excludeFilesProperty(),
-                               item->property(StringConstants::excludeFilesProperty()));
-        fakeGroup->setProperty(StringConstants::overrideTagsProperty(),
-                               VariantValue::falseValue());
-        fakeGroup->setupForBuiltinType(m_logger);
-        subItems.prepend(fakeGroup);
-    }
-
-    static const ItemFuncMap mapping = {
-        { ItemType::Depends, &ProjectResolver::ignoreItem },
-        { ItemType::Rule, &ProjectResolver::resolveRule },
-        { ItemType::FileTagger, &ProjectResolver::resolveFileTagger },
-        { ItemType::JobLimit, &ProjectResolver::resolveJobLimit },
-        { ItemType::Group, &ProjectResolver::resolveGroup },
-        { ItemType::Product, &ProjectResolver::resolveShadowProduct },
-        { ItemType::Export, &ProjectResolver::resolveExport },
-        { ItemType::Probe, &ProjectResolver::ignoreItem },
-        { ItemType::PropertyOptions, &ProjectResolver::ignoreItem }
-    };
-
-    for (Item * const child : qAsConst(subItems))
-        callItemFunction(mapping, child, projectContext);
-
-    for (const ProjectContext *p = projectContext; p; p = p->parentContext) {
-        JobLimits tempLimits = p->jobLimits;
-        product->jobLimits = tempLimits.update(product->jobLimits);
-    }
-
-    resolveModules(item, projectContext);
-
-    for (const FileTag &t : qAsConst(product->fileTags))
-        m_productsByType[t].push_back(product);
-}
-
-void ProjectResolver::resolveModules(const Item *item, ProjectContext *projectContext)
-{
-    JobLimits jobLimits;
-    for (const Item::Module &m : item->modules())
-        resolveModule(m.name, m.item, m.isProduct, m.parameters, jobLimits, projectContext);
-    for (int i = 0; i < jobLimits.count(); ++i) {
-        const JobLimit &moduleJobLimit = jobLimits.jobLimitAt(i);
-        if (m_productContext->product->jobLimits.getLimit(moduleJobLimit.pool()) == -1)
-            m_productContext->product->jobLimits.setJobLimit(moduleJobLimit);
-    }
-}
-
-void ProjectResolver::resolveModule(const QualifiedId &moduleName, Item *item, bool isProduct,
-                                    const QVariantMap &parameters, JobLimits &jobLimits,
-                                    ProjectContext *projectContext)
-{
-    checkCancelation();
-    if (!item->isPresentModule())
-        return;
-
-    ModuleContext * const oldModuleContext = m_moduleContext;
-    ModuleContext moduleContext;
-    moduleContext.module = ResolvedModule::create();
-    m_moduleContext = &moduleContext;
-
-    const ResolvedModulePtr &module = moduleContext.module;
-    module->name = moduleName.toString();
-    module->isProduct = isProduct;
-    module->product = m_productContext->product.get();
-    module->setupBuildEnvironmentScript.initialize(
-                scriptFunctionValue(item, StringConstants::setupBuildEnvironmentProperty()));
-    module->setupRunEnvironmentScript.initialize(
-                scriptFunctionValue(item, StringConstants::setupRunEnvironmentProperty()));
-
-    for (const Item::Module &m : item->modules()) {
-        if (m.item->isPresentModule())
-            module->moduleDependencies += m.name.toString();
-    }
-
-    m_productContext->product->modules.push_back(module);
-    if (!parameters.empty())
-        m_productContext->product->moduleParameters[module] = parameters;
-
-    static const ItemFuncMap mapping {
-        { ItemType::Group, &ProjectResolver::ignoreItem },
-        { ItemType::Rule, &ProjectResolver::resolveRule },
-        { ItemType::FileTagger, &ProjectResolver::resolveFileTagger },
-        { ItemType::JobLimit, &ProjectResolver::resolveJobLimit },
-        { ItemType::Scanner, &ProjectResolver::resolveScanner },
-        { ItemType::PropertyOptions, &ProjectResolver::ignoreItem },
-        { ItemType::Depends, &ProjectResolver::ignoreItem },
-        { ItemType::Parameter, &ProjectResolver::ignoreItem },
-        { ItemType::Properties, &ProjectResolver::ignoreItem },
-        { ItemType::Probe, &ProjectResolver::ignoreItem }
-    };
-    for (Item *child : item->children())
-        callItemFunction(mapping, child, projectContext);
-    for (int i = 0; i < moduleContext.jobLimits.count(); ++i) {
-        const JobLimit &newJobLimit = moduleContext.jobLimits.jobLimitAt(i);
-        const int oldLimit = jobLimits.getLimit(newJobLimit.pool());
-        if (oldLimit == -1 || oldLimit > newJobLimit.limit())
-            jobLimits.setJobLimit(newJobLimit);
-    }
-
-    m_moduleContext = oldModuleContext;
-}
-
-void ProjectResolver::gatherProductTypes(ResolvedProduct *product, Item *item)
-{
-    product->fileTags = m_evaluator->fileTagsValue(item, StringConstants::typeProperty());
-    for (const Item::Module &m : item->modules()) {
-        if (m.item->isPresentModule()) {
-            product->fileTags += m_evaluator->fileTagsValue(m.item,
-                    StringConstants::additionalProductTypesProperty());
-        }
-    }
-    item->setProperty(StringConstants::typeProperty(),
-                      VariantValue::create(sorted(product->fileTags.toStringList())));
-}
-
-SourceArtifactPtr ProjectResolver::createSourceArtifact(const ResolvedProductPtr &rproduct,
-        const QString &fileName, const GroupPtr &group, bool wildcard,
-        const CodeLocation &filesLocation, FileLocations *fileLocations,
-        ErrorInfo *errorInfo)
-{
-    const QString &baseDir = FileInfo::path(group->location.filePath());
-    const QString absFilePath = QDir::cleanPath(FileInfo::resolvePath(baseDir, fileName));
-    if (!wildcard && !FileInfo(absFilePath).exists()) {
-        if (errorInfo)
-            errorInfo->append(Tr::tr("File '%1' does not exist.").arg(absFilePath), filesLocation);
-        rproduct->missingSourceFiles << absFilePath;
-        return {};
-    }
-    if (group->enabled && fileLocations) {
-        CodeLocation &loc = (*fileLocations)[std::make_pair(group->targetOfModule, absFilePath)];
-        if (loc.isValid()) {
-            if (errorInfo) {
-                errorInfo->append(Tr::tr("Duplicate source file '%1'.").arg(absFilePath));
-                errorInfo->append(Tr::tr("First occurrence is here."), loc);
-                errorInfo->append(Tr::tr("Next occurrence is here."), filesLocation);
-            }
-            return {};
-        }
-        loc = filesLocation;
-    }
-    SourceArtifactPtr artifact = SourceArtifactInternal::create();
-    artifact->absoluteFilePath = absFilePath;
-    artifact->fileTags = group->fileTags;
-    artifact->overrideFileTags = group->overrideTags;
-    artifact->properties = group->properties;
-    artifact->targetOfModule = group->targetOfModule;
-    (wildcard ? group->wildcards->files : group->files).push_back(artifact);
-    return artifact;
-}
-
-static QualifiedIdSet propertiesToEvaluate(std::deque<QualifiedId> initialProps,
-                                           const PropertyDependencies &deps)
-{
-    std::deque<QualifiedId> remainingProps = std::move(initialProps);
-    QualifiedIdSet allProperties;
-    while (!remainingProps.empty()) {
-        const QualifiedId prop = remainingProps.front();
-        remainingProps.pop_front();
-        const auto insertResult = allProperties.insert(prop);
-        if (!insertResult.second)
-            continue;
-        for (const QualifiedId &directDep : deps.value(prop))
-            remainingProps.push_back(directDep);
-    }
-    return allProperties;
-}
-
-QVariantMap ProjectResolver::resolveAdditionalModuleProperties(const Item *group,
-                                                               const QVariantMap &currentValues)
-{
-    // Step 1: Retrieve the properties directly set in the group
-    const ModulePropertiesPerGroup &mp = mapValue(
-            m_loadResult.productInfos, m_productContext->item).modulePropertiesSetInGroups;
-    const auto it = mp.find(group);
-    if (it == mp.end())
-        return {};
-    const QualifiedIdSet &propsSetInGroup = it->second;
-
-    // Step 2: Gather all properties that depend on these properties.
-    const QualifiedIdSet &propsToEval = propertiesToEvaluate(
-            rangeTo<std::deque<QualifiedId>>(propsSetInGroup),
-            m_evaluator->propertyDependencies());
-
-    // Step 3: Evaluate all these properties and replace their values in the map
-    QVariantMap modulesMap = currentValues;
-    QHash<QString, QStringList> propsPerModule;
-    for (auto fullPropName : propsToEval) {
-        const QString moduleName
-                = QualifiedId(fullPropName.mid(0, fullPropName.size() - 1)).toString();
-        propsPerModule[moduleName] << fullPropName.last();
-    }
-    EvalCacheEnabler cachingEnabler(m_evaluator);
-    m_evaluator->setPathPropertiesBaseDir(m_productContext->product->sourceDirectory);
-    for (const Item::Module &module : group->modules()) {
-        const QString &fullModName = module.name.toString();
-        const QStringList propsForModule = propsPerModule.take(fullModName);
-        if (propsForModule.empty())
-            continue;
-        QVariantMap reusableValues = modulesMap.value(fullModName).toMap();
-        for (const QString &prop : qAsConst(propsForModule))
-            reusableValues.remove(prop);
-        modulesMap.insert(fullModName,
-                          evaluateProperties(module.item, module.item, reusableValues, true, true));
-    }
-    m_evaluator->clearPathPropertiesBaseDir();
-    return modulesMap;
-}
-
-void ProjectResolver::resolveGroup(Item *item, ProjectContext *projectContext)
-{
-    checkCancelation();
-    const bool parentEnabled = m_productContext->currentGroup
-            ? m_productContext->currentGroup->enabled
-            : m_productContext->product->enabled;
-    const bool isEnabled = parentEnabled
-            && m_evaluator->boolValue(item, StringConstants::conditionProperty());
-    try {
-        resolveGroupFully(item, projectContext, isEnabled);
-    } catch (const ErrorInfo &error) {
-        if (!isEnabled) {
-            qCDebug(lcProjectResolver) << "error resolving group at" << item->location()
-                                       << error.toString();
-            return;
-        }
-        if (m_setupParams.productErrorMode() == ErrorHandlingMode::Strict)
-            throw;
-        m_logger.printWarning(error);
-    }
-}
-
-void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectContext *projectContext,
-                                        bool isEnabled)
-{
-    AccumulatingTimer groupTimer(m_setupParams.logElapsedTime()
-                                       ? &m_elapsedTimeGroups : nullptr);
-
-    const auto getGroupPropertyMap = [this, item](const ArtifactProperties *existingProps) {
-        PropertyMapPtr moduleProperties;
-        bool newPropertyMapRequired = false;
-        if (existingProps)
-            moduleProperties = existingProps->propertyMap();
-        if (!moduleProperties) {
-            newPropertyMapRequired = true;
-            moduleProperties = m_productContext->currentGroup
-                    ? m_productContext->currentGroup->properties
-                    : m_productContext->product->moduleProperties;
-        }
-        const QVariantMap newModuleProperties
-                = resolveAdditionalModuleProperties(item, moduleProperties->value());
-        if (!newModuleProperties.empty()) {
-            if (newPropertyMapRequired)
-                moduleProperties = PropertyMapInternal::create();
-            moduleProperties->setValue(newModuleProperties);
-        }
-        return moduleProperties;
-    };
-
-    QStringList files = m_evaluator->stringListValue(item, StringConstants::filesProperty());
-    bool fileTagsSet;
-    const FileTags fileTags = m_evaluator->fileTagsValue(item, StringConstants::fileTagsProperty(),
-                                                         &fileTagsSet);
-    const QStringList fileTagsFilter
-            = m_evaluator->stringListValue(item, StringConstants::fileTagsFilterProperty());
-    if (!fileTagsFilter.empty()) {
-        if (Q_UNLIKELY(!files.empty()))
-            throw ErrorInfo(Tr::tr("Group.files and Group.fileTagsFilters are exclusive."),
-                        item->location());
-
-        if (!isEnabled)
-            return;
-
-        ProductContext::ArtifactPropertiesInfo &apinfo
-                = m_productContext->artifactPropertiesPerFilter[fileTagsFilter];
-        if (apinfo.first) {
-            const auto it = std::find_if(apinfo.second.cbegin(), apinfo.second.cend(),
-                                         [item](const CodeLocation &loc) {
-                return item->location().filePath() == loc.filePath();
-            });
-            if (it != apinfo.second.cend()) {
-                ErrorInfo error(Tr::tr("Conflicting fileTagsFilter in Group items."));
-                error.append(Tr::tr("First item"), *it);
-                error.append(Tr::tr("Second item"), item->location());
-                throw error;
-            }
-        } else {
-            apinfo.first = ArtifactProperties::create();
-            apinfo.first->setFileTagsFilter(FileTags::fromStringList(fileTagsFilter));
-            m_productContext->product->artifactProperties.push_back(apinfo.first);
-        }
-        apinfo.second.push_back(item->location());
-        apinfo.first->setPropertyMapInternal(getGroupPropertyMap(apinfo.first.get()));
-        apinfo.first->addExtraFileTags(fileTags);
-        return;
-    }
-    QStringList patterns;
-    for (int i = files.size(); --i >= 0;) {
-        if (FileInfo::isPattern(files[i]))
-            patterns.push_back(files.takeAt(i));
-    }
-    GroupPtr group = ResolvedGroup::create();
-    bool prefixWasSet = false;
-    group->prefix = m_evaluator->stringValue(item, StringConstants::prefixProperty(), QString(),
-                                             &prefixWasSet);
-    if (!prefixWasSet && m_productContext->currentGroup)
-        group->prefix = m_productContext->currentGroup->prefix;
-    if (!group->prefix.isEmpty()) {
-        for (auto it = files.rbegin(), end = files.rend(); it != end; ++it)
-            it->prepend(group->prefix);
-    }
-    group->location = item->location();
-    group->enabled = isEnabled;
-    group->properties = getGroupPropertyMap(nullptr);
-    group->fileTags = fileTags;
-    group->overrideTags = m_evaluator->boolValue(item, StringConstants::overrideTagsProperty());
-    if (group->overrideTags && fileTagsSet) {
-        if (group->fileTags.empty() )
-            group->fileTags.insert(unknownFileTag());
-    } else if (m_productContext->currentGroup) {
-        group->fileTags.unite(m_productContext->currentGroup->fileTags);
-    }
-
-    const CodeLocation filesLocation = item->property(StringConstants::filesProperty())->location();
-    const VariantValueConstPtr moduleProp = item->variantProperty(
-                StringConstants::modulePropertyInternal());
-    if (moduleProp)
-        group->targetOfModule = moduleProp->value().toString();
-    ErrorInfo fileError;
-    if (!patterns.empty()) {
-        group->wildcards = std::make_unique<SourceWildCards>();
-        SourceWildCards *wildcards = group->wildcards.get();
-        wildcards->group = group.get();
-        wildcards->excludePatterns = m_evaluator->stringListValue(
-                    item, StringConstants::excludeFilesProperty());
-        wildcards->patterns = patterns;
-        const Set<QString> files = wildcards->expandPatterns(group,
-                FileInfo::path(item->file()->filePath()),
-                projectContext->project->topLevelProject()->buildDirectory);
-        for (const QString &fileName : files)
-            createSourceArtifact(m_productContext->product, fileName, group, true, filesLocation,
-                                 &m_productContext->sourceArtifactLocations, &fileError);
-    }
-
-    for (const QString &fileName : qAsConst(files)) {
-        createSourceArtifact(m_productContext->product, fileName, group, false, filesLocation,
-                             &m_productContext->sourceArtifactLocations, &fileError);
-    }
-    if (fileError.hasError()) {
-        if (group->enabled) {
-            if (m_setupParams.productErrorMode() == ErrorHandlingMode::Strict)
-                throw ErrorInfo(fileError);
-            m_logger.printWarning(fileError);
-        } else {
-            qCDebug(lcProjectResolver) << "error for disabled group:" << fileError.toString();
-        }
-    }
-    group->name = m_evaluator->stringValue(item, StringConstants::nameProperty());
-    if (group->name.isEmpty())
-        group->name = Tr::tr("Group %1").arg(m_productContext->product->groups.size());
-    m_productContext->product->groups.push_back(group);
-
-    class GroupContextSwitcher {
-    public:
-        GroupContextSwitcher(ProductContext &context, const GroupConstPtr &newGroup)
-            : m_context(context), m_oldGroup(context.currentGroup) {
-            m_context.currentGroup = newGroup;
-        }
-        ~GroupContextSwitcher() { m_context.currentGroup = m_oldGroup; }
-    private:
-        ProductContext &m_context;
-        const GroupConstPtr m_oldGroup;
-    };
-    GroupContextSwitcher groupSwitcher(*m_productContext, group);
-    for (Item * const childItem : item->children())
-        resolveGroup(childItem, projectContext);
-}
-
-void ProjectResolver::adaptExportedPropertyValues(const Item *shadowProductItem)
-{
-    ExportedModule &m = m_productContext->product->exportedModule;
-    const QVariantList prefixList = m.propertyValues.take(
-                StringConstants::prefixMappingProperty()).toList();
-    const QString shadowProductName = m_evaluator->stringValue(
-                shadowProductItem, StringConstants::nameProperty());
-    const QString shadowProductBuildDir = m_evaluator->stringValue(
-                shadowProductItem, StringConstants::buildDirectoryProperty());
-    QVariantMap prefixMap;
-    for (const QVariant &v : prefixList) {
-        const QVariantMap o = v.toMap();
-        prefixMap.insert(o.value(QStringLiteral("prefix")).toString(),
-                         o.value(QStringLiteral("replacement")).toString());
-    }
-    const auto valueRefersToImportingProduct
-            = [shadowProductName, shadowProductBuildDir](const QString &value) {
-        return value.toLower().contains(shadowProductName.toLower())
-                || value.contains(shadowProductBuildDir);
-    };
-    static const auto stringMapper = [](const QVariantMap &mappings, const QString &value)
-            -> QString {
-        for (auto it = mappings.cbegin(); it != mappings.cend(); ++it) {
-            if (value.startsWith(it.key()))
-                return it.value().toString() + value.mid(it.key().size());
-        }
-        return value;
-    };
-    const auto stringListMapper = [&valueRefersToImportingProduct](
-            const QVariantMap &mappings, const QStringList &value)  -> QStringList {
-        QStringList result;
-        result.reserve(value.size());
-        for (const QString &s : value) {
-            if (!valueRefersToImportingProduct(s))
-                result.push_back(stringMapper(mappings, s));
-        }
-        return result;
-    };
-    const std::function<QVariant(const QVariantMap &, const QVariant &)> mapper
-            = [&stringListMapper, &mapper](
-            const QVariantMap &mappings, const QVariant &value) -> QVariant {
-        switch (static_cast<QMetaType::Type>(value.userType())) {
-        case QMetaType::QString:
-            return stringMapper(mappings, value.toString());
-        case QMetaType::QStringList:
-            return stringListMapper(mappings, value.toStringList());
-        case QMetaType::QVariantMap: {
-            QVariantMap m = value.toMap();
-            for (auto it = m.begin(); it != m.end(); ++it)
-                it.value() = mapper(mappings, it.value());
-            return m;
-        }
-        default:
-            return value;
-        }
-    };
-    for (auto it = m.propertyValues.begin(); it != m.propertyValues.end(); ++it)
-        it.value() = mapper(prefixMap, it.value());
-    for (auto it = m.modulePropertyValues.begin(); it != m.modulePropertyValues.end(); ++it)
-        it.value() = mapper(prefixMap, it.value());
-    for (ExportedModuleDependency &dep : m.moduleDependencies) {
-        for (auto it = dep.moduleProperties.begin(); it != dep.moduleProperties.end(); ++it)
-            it.value() = mapper(prefixMap, it.value());
-    }
-}
-
-void ProjectResolver::collectExportedProductDependencies()
-{
-    ResolvedProductPtr dummyProduct = ResolvedProduct::create();
-    dummyProduct->enabled = false;
-    for (const auto &exportingProductInfo : qAsConst(m_productExportInfo)) {
-        const ResolvedProductPtr exportingProduct = exportingProductInfo.first;
-        if (!exportingProduct->enabled)
-            continue;
-        Item * const importingProductItem = exportingProductInfo.second;
-        std::vector<QString> directDepNames;
-        for (const Item::Module &m : importingProductItem->modules()) {
-            if (m.name.toString() == exportingProduct->name) {
-                for (const Item::Module &dep : m.item->modules()) {
-                    if (dep.isProduct)
-                        directDepNames.push_back(dep.name.toString());
-                }
-                break;
-            }
-        }
-        const ModuleLoaderResult::ProductInfo &importingProductInfo
-                = mapValue(m_loadResult.productInfos, importingProductItem);
-        const ProductDependencyInfos &depInfos
-                = getProductDependencies(dummyProduct, importingProductInfo);
-        for (const auto &dep : depInfos.dependencies) {
-            if (dep.product == exportingProduct)
-                continue;
-
-            // Filter out indirect dependencies.
-            // TODO: Depends items using "profile" or "productTypes" will not work.
-            if (!contains(directDepNames, dep.product->name))
-                continue;
-
-            if (!contains(exportingProduct->exportedModule.productDependencies,
-                          dep.product->uniqueName())) {
-                exportingProduct->exportedModule.productDependencies.push_back(
-                            dep.product->uniqueName());
-            }
-            if (!dep.parameters.isEmpty()) {
-                exportingProduct->exportedModule.dependencyParameters.insert(dep.product,
-                                                                             dep.parameters);
-            }
-        }
-        auto &productDeps = exportingProduct->exportedModule.productDependencies;
-        std::sort(productDeps.begin(), productDeps.end());
-    }
-}
-
-void ProjectResolver::resolveShadowProduct(Item *item, ProjectResolver::ProjectContext *)
-{
-    if (!m_productContext->product->enabled)
-        return;
-    for (const auto &m : item->modules()) {
-        if (m.name.toString() != m_productContext->product->name)
-            continue;
-        collectPropertiesForExportItem(m.item);
-        for (const auto &dep : m.item->modules())
-            collectPropertiesForModuleInExportItem(dep);
-        break;
-    }
-    try {
-        adaptExportedPropertyValues(item);
-    } catch (const ErrorInfo &) {}
-    m_productExportInfo.emplace_back(m_productContext->product, item);
-}
-
-void ProjectResolver::setupExportedProperties(const Item *item, const QString &namePrefix,
-                                              std::vector<ExportedProperty> &properties)
-{
-    const auto &props = item->properties();
-    for (auto it = props.cbegin(); it != props.cend(); ++it) {
-        const QString qualifiedName = namePrefix.isEmpty()
-                ? it.key() : namePrefix + QLatin1Char('.') + it.key();
-        if ((item->type() == ItemType::Export || item->type() == ItemType::Properties)
-                && qualifiedName == StringConstants::prefixMappingProperty()) {
-            continue;
-        }
-        const ValuePtr &v = it.value();
-        if (v->type() == Value::ItemValueType) {
-            setupExportedProperties(std::static_pointer_cast<ItemValue>(v)->item(),
-                                    qualifiedName, properties);
-            continue;
-        }
-        ExportedProperty exportedProperty;
-        exportedProperty.fullName = qualifiedName;
-        exportedProperty.type = item->propertyDeclaration(it.key()).type();
-        if (v->type() == Value::VariantValueType) {
-            exportedProperty.sourceCode = toJSLiteral(
-                        std::static_pointer_cast<VariantValue>(v)->value());
-        } else {
-            QBS_CHECK(v->type() == Value::JSSourceValueType);
-            const JSSourceValue * const sv = static_cast<JSSourceValue *>(v.get());
-            exportedProperty.sourceCode = sv->sourceCode().toString();
-        }
-        const ItemDeclaration itemDecl
-                = BuiltinDeclarations::instance().declarationsForType(item->type());
-        PropertyDeclaration propertyDecl;
-        const auto itemProperties = itemDecl.properties();
-        for (const PropertyDeclaration &decl : itemProperties) {
-            if (decl.name() == it.key()) {
-                propertyDecl = decl;
-                exportedProperty.isBuiltin = true;
-                break;
-            }
-        }
-
-        // Do not add built-in properties that were left at their default value.
-        if (!exportedProperty.isBuiltin || m_evaluator->isNonDefaultValue(item, it.key()))
-            properties.push_back(exportedProperty);
-    }
-
-    // Order the list of properties, so the output won't look so random.
-    static const auto less = [](const ExportedProperty &p1, const ExportedProperty &p2) -> bool {
-        const int p1ComponentCount = p1.fullName.count(QLatin1Char('.'));
-        const int p2ComponentCount = p2.fullName.count(QLatin1Char('.'));
-        if (p1.isBuiltin && !p2.isBuiltin)
-            return true;
-        if (!p1.isBuiltin && p2.isBuiltin)
-            return false;
-        if (p1ComponentCount < p2ComponentCount)
-            return true;
-        if (p1ComponentCount > p2ComponentCount)
-            return false;
-        return p1.fullName < p2.fullName;
-    };
-    std::sort(properties.begin(), properties.end(), less);
-}
-
-static bool usesImport(const ExportedProperty &prop, const QRegularExpression &regex)
-{
-    return prop.sourceCode.indexOf(regex) != -1;
-}
-
-static bool usesImport(const ExportedItem &item, const QRegularExpression &regex)
-{
-    return any_of(item.properties,
-                  [regex](const ExportedProperty &p) { return usesImport(p, regex); })
-            || any_of(item.children,
-                      [regex](const ExportedItemPtr &child) { return usesImport(*child, regex); });
-}
-
-static bool usesImport(const ExportedModule &module, const QString &name)
-{
-    // Imports are used in three ways:
-    // (1) var f = new TextFile(...);
-    // (2) var path = FileInfo.joinPaths(...)
-    // (3) var obj = DataCollection;
-    const QString pattern = QStringLiteral("\\b%1\\b");
-
-    const QRegularExpression regex(pattern.arg(name)); // std::regex is much slower
-    return any_of(module.m_properties,
-                  [regex](const ExportedProperty &p) { return usesImport(p, regex); })
-            || any_of(module.children,
-                      [regex](const ExportedItemPtr &child) { return usesImport(*child, regex); });
-}
-
-static QString getLineAtLocation(const CodeLocation &loc, const QString &content)
-{
-    int pos = 0;
-    int currentLine = 1;
-    while (currentLine < loc.line()) {
-        while (content.at(pos++) != QLatin1Char('\n'))
-            ;
-        ++currentLine;
-    }
-    const int eolPos = content.indexOf(QLatin1Char('\n'), pos);
-    return content.mid(pos, eolPos - pos);
-}
-
-void ProjectResolver::resolveExport(Item *exportItem, ProjectContext *)
-{
-    ExportedModule &exportedModule = m_productContext->product->exportedModule;
-    setupExportedProperties(exportItem, QString(), exportedModule.m_properties);
-    static const auto cmpFunc = [](const ExportedProperty &p1, const ExportedProperty &p2) {
-        return p1.fullName < p2.fullName;
-    };
-    std::sort(exportedModule.m_properties.begin(), exportedModule.m_properties.end(), cmpFunc);
-    for (const Item * const child : exportItem->children())
-        exportedModule.children.push_back(resolveExportChild(child, exportedModule));
-    for (const JsImport &jsImport : exportItem->file()->jsImports()) {
-        if (usesImport(exportedModule, jsImport.scopeName)) {
-            exportedModule.importStatements << getLineAtLocation(jsImport.location,
-                                                                 exportItem->file()->content());
-        }
-    }
-    const auto builtInImports = JsExtensions::extensionNames();
-    for (const QString &builtinImport: builtInImports) {
-        if (usesImport(exportedModule, builtinImport))
-            exportedModule.importStatements << QStringLiteral("import qbs.") + builtinImport;
-    }
-    exportedModule.importStatements.sort();
-}
-
-// TODO: This probably wouldn't be necessary if we had item serialization.
-std::unique_ptr<ExportedItem> ProjectResolver::resolveExportChild(const Item *item,
-                                                                  const ExportedModule &module)
-{
-    std::unique_ptr<ExportedItem> exportedItem(new ExportedItem);
-
-    // This is the type of the built-in base item. It may turn out that we need to support
-    // derived items under Export. In that case, we probably need a new Item member holding
-    // the original type name.
-    exportedItem->name = item->typeName();
-
-    for (const Item * const child : item->children())
-        exportedItem->children.push_back(resolveExportChild(child, module));
-    setupExportedProperties(item, QString(), exportedItem->properties);
-    return exportedItem;
-}
-
-
-QString ProjectResolver::sourceCodeAsFunction(const JSSourceValueConstPtr &value,
-                                              const PropertyDeclaration &decl) const
-{
-    QString &scriptFunction = m_scriptFunctions[std::make_pair(value->sourceCode(),
-                                                          decl.functionArgumentNames())];
-    if (!scriptFunction.isNull())
-        return scriptFunction;
-    const QString args = decl.functionArgumentNames().join(QLatin1Char(','));
-    if (value->hasFunctionForm()) {
-        // Insert the argument list.
-        scriptFunction = value->sourceCodeForEvaluation();
-        scriptFunction.insert(10, args);
-        // Remove the function application "()" that has been
-        // added in ItemReaderASTVisitor::visitStatement.
-        scriptFunction.chop(2);
-    } else {
-        scriptFunction = QLatin1String("(function(") + args + QLatin1String("){return ")
-                + value->sourceCode().toString() + QLatin1String(";})");
-    }
-    return scriptFunction;
-}
-
-QString ProjectResolver::sourceCodeForEvaluation(const JSSourceValueConstPtr &value) const
-{
-    QString &code = m_sourceCode[value->sourceCode()];
-    if (!code.isNull())
-        return code;
-    code = value->sourceCodeForEvaluation();
-    return code;
-}
-
-ScriptFunctionPtr ProjectResolver::scriptFunctionValue(Item *item, const QString &name) const
-{
-    JSSourceValuePtr value = item->sourceProperty(name);
-    ScriptFunctionPtr &script = m_scriptFunctionMap[value ? value->location() : CodeLocation()];
-    if (!script.get()) {
-        script = ScriptFunction::create();
-        const PropertyDeclaration decl = item->propertyDeclaration(name);
-        script->sourceCode = sourceCodeAsFunction(value, decl);
-        script->location = value->location();
-        script->fileContext = resolvedFileContext(value->file());
-    }
-    return script;
-}
-
-ResolvedFileContextPtr ProjectResolver::resolvedFileContext(const FileContextConstPtr &ctx) const
-{
-    ResolvedFileContextPtr &result = m_fileContextMap[ctx];
-    if (!result)
-        result = ResolvedFileContext::create(*ctx);
-    return result;
-}
-
-void ProjectResolver::resolveRule(Item *item, ProjectContext *projectContext)
-{
-    checkCancelation();
-
-    if (!m_evaluator->boolValue(item, StringConstants::conditionProperty()))
-        return;
-
-    RulePtr rule = Rule::create();
-
-    // read artifacts
-    bool hasArtifactChildren = false;
-    for (Item * const child : item->children()) {
-        if (Q_UNLIKELY(child->type() != ItemType::Artifact)) {
-            throw ErrorInfo(Tr::tr("'Rule' can only have children of type 'Artifact'."),
-                               child->location());
-        }
-        hasArtifactChildren = true;
-        resolveRuleArtifact(rule, child);
-    }
-
-    rule->name = m_evaluator->stringValue(item, StringConstants::nameProperty());
-    rule->prepareScript.initialize(scriptFunctionValue(item, StringConstants::prepareProperty()));
-    rule->outputArtifactsScript.initialize(scriptFunctionValue(
-                                               item, StringConstants::outputArtifactsProperty()));
-    rule->outputFileTags = m_evaluator->fileTagsValue(
-                item, StringConstants::outputFileTagsProperty());
-    if (rule->outputArtifactsScript.isValid()) {
-        if (hasArtifactChildren)
-            throw ErrorInfo(Tr::tr("The Rule.outputArtifacts script is not allowed in rules "
-                                   "that contain Artifact items."),
-                        item->location());
-    }
-    if (!hasArtifactChildren && rule->outputFileTags.empty()) {
-        throw ErrorInfo(Tr::tr("A rule needs to have Artifact items or a non-empty "
-                               "outputFileTags property."), item->location());
-    }
-    rule->multiplex = m_evaluator->boolValue(item, StringConstants::multiplexProperty());
-    rule->alwaysRun = m_evaluator->boolValue(item, StringConstants::alwaysRunProperty());
-    rule->inputs = m_evaluator->fileTagsValue(item, StringConstants::inputsProperty());
-    rule->inputsFromDependencies
-            = m_evaluator->fileTagsValue(item, StringConstants::inputsFromDependenciesProperty());
-    bool requiresInputsSet = false;
-    rule->requiresInputs = m_evaluator->boolValue(item, StringConstants::requiresInputsProperty(),
-                                                  &requiresInputsSet);
-    if (!requiresInputsSet)
-        rule->requiresInputs = rule->declaresInputs();
-    rule->auxiliaryInputs
-            = m_evaluator->fileTagsValue(item, StringConstants::auxiliaryInputsProperty());
-    rule->excludedInputs
-            = m_evaluator->fileTagsValue(item, StringConstants::excludedInputsProperty());
-    if (rule->excludedInputs.empty()) {
-        rule->excludedInputs = m_evaluator->fileTagsValue(
-                    item, StringConstants::excludedAuxiliaryInputsProperty());
-    }
-    rule->explicitlyDependsOn
-            = m_evaluator->fileTagsValue(item, StringConstants::explicitlyDependsOnProperty());
-    rule->explicitlyDependsOnFromDependencies = m_evaluator->fileTagsValue(
-                item, StringConstants::explicitlyDependsOnFromDependenciesProperty());
-    rule->module = m_moduleContext ? m_moduleContext->module : projectContext->dummyModule;
-    if (!rule->multiplex && !rule->declaresInputs()) {
-        throw ErrorInfo(Tr::tr("Rule has no inputs, but is not a multiplex rule."),
-                        item->location());
-    }
-    if (!rule->multiplex && !rule->requiresInputs) {
-        throw ErrorInfo(Tr::tr("Rule.requiresInputs is false for non-multiplex rule."),
-                        item->location());
-    }
-    if (!rule->declaresInputs() && rule->requiresInputs) {
-        throw ErrorInfo(Tr::tr("Rule.requiresInputs is true, but the rule "
-                               "does not declare any input tags."), item->location());
-    }
-    if (m_productContext) {
-        rule->product = m_productContext->product.get();
-        m_productContext->product->rules.push_back(rule);
-    } else {
-        projectContext->rules.push_back(rule);
-    }
-}
-
-void ProjectResolver::resolveRuleArtifact(const RulePtr &rule, Item *item)
-{
-    RuleArtifactPtr artifact = RuleArtifact::create();
-    rule->artifacts.push_back(artifact);
-    artifact->location = item->location();
-
-    if (const auto sourceProperty = item->sourceProperty(StringConstants::filePathProperty()))
-        artifact->filePathLocation = sourceProperty->location();
-
-    artifact->filePath = verbatimValue(item, StringConstants::filePathProperty());
-    artifact->fileTags = m_evaluator->fileTagsValue(item, StringConstants::fileTagsProperty());
-    artifact->alwaysUpdated = m_evaluator->boolValue(item,
-                                                     StringConstants::alwaysUpdatedProperty());
-
-    QualifiedIdSet seenBindings;
-    for (Item *obj = item; obj; obj = obj->prototype()) {
-        for (QMap<QString, ValuePtr>::const_iterator it = obj->properties().constBegin();
-             it != obj->properties().constEnd(); ++it)
-        {
-            if (it.value()->type() != Value::ItemValueType)
-                continue;
-            resolveRuleArtifactBinding(artifact,
-                                       std::static_pointer_cast<ItemValue>(it.value())->item(),
-                 QStringList(it.key()), &seenBindings);
-        }
-    }
-}
-
-void ProjectResolver::resolveRuleArtifactBinding(const RuleArtifactPtr &ruleArtifact,
-                                                 Item *item,
-                                                 const QStringList &namePrefix,
-                                                 QualifiedIdSet *seenBindings)
-{
-    for (QMap<QString, ValuePtr>::const_iterator it = item->properties().constBegin();
-         it != item->properties().constEnd(); ++it)
-    {
-        const QStringList name = QStringList(namePrefix) << it.key();
-        if (it.value()->type() == Value::ItemValueType) {
-            resolveRuleArtifactBinding(ruleArtifact,
-                                       std::static_pointer_cast<ItemValue>(it.value())->item(), name,
-                                       seenBindings);
-        } else if (it.value()->type() == Value::JSSourceValueType) {
-            const auto insertResult = seenBindings->insert(name);
-            if (!insertResult.second)
-                continue;
-            JSSourceValuePtr sourceValue = std::static_pointer_cast<JSSourceValue>(it.value());
-            RuleArtifact::Binding rab;
-            rab.name = name;
-            rab.code = sourceCodeForEvaluation(sourceValue);
-            rab.location = sourceValue->location();
-            ruleArtifact->bindings.push_back(rab);
-        } else {
-            QBS_ASSERT(!"unexpected value type", continue);
-        }
-    }
-}
-
-void ProjectResolver::resolveFileTagger(Item *item, ProjectContext *projectContext)
-{
-    checkCancelation();
-    if (!m_evaluator->boolValue(item, StringConstants::conditionProperty()))
-        return;
-    std::vector<FileTaggerConstPtr> &fileTaggers = m_productContext
-            ? m_productContext->product->fileTaggers
-            : projectContext->fileTaggers;
-    const QStringList patterns = m_evaluator->stringListValue(item,
-                                                              StringConstants::patternsProperty());
-    if (patterns.empty())
-        throw ErrorInfo(Tr::tr("FileTagger.patterns must be a non-empty list."), item->location());
-
-    const FileTags fileTags = m_evaluator->fileTagsValue(item, StringConstants::fileTagsProperty());
-    if (fileTags.empty())
-        throw ErrorInfo(Tr::tr("FileTagger.fileTags must not be empty."), item->location());
-
-    for (const QString &pattern : patterns) {
-        if (pattern.isEmpty())
-            throw ErrorInfo(Tr::tr("A FileTagger pattern must not be empty."), item->location());
-    }
-
-    const int priority = m_evaluator->intValue(item, StringConstants::priorityProperty());
-    fileTaggers.push_back(FileTagger::create(patterns, fileTags, priority));
-}
-
-void ProjectResolver::resolveJobLimit(Item *item, ProjectResolver::ProjectContext *projectContext)
-{
-    if (!m_evaluator->boolValue(item, StringConstants::conditionProperty()))
-        return;
-    const QString jobPool = m_evaluator->stringValue(item, StringConstants::jobPoolProperty());
-    if (jobPool.isEmpty())
-        throw ErrorInfo(Tr::tr("A JobLimit item needs to have a non-empty '%1' property.")
-                        .arg(StringConstants::jobPoolProperty()), item->location());
-    bool jobCountWasSet;
-    const int jobCount = m_evaluator->intValue(item, StringConstants::jobCountProperty(), -1,
-                                               &jobCountWasSet);
-    if (!jobCountWasSet) {
-        throw ErrorInfo(Tr::tr("A JobLimit item needs to have a '%1' property.")
-                        .arg(StringConstants::jobCountProperty()), item->location());
-    }
-    if (jobCount < 0) {
-        throw ErrorInfo(Tr::tr("A JobLimit item must have a non-negative '%1' property.")
-                        .arg(StringConstants::jobCountProperty()), item->location());
-    }
-    JobLimits &jobLimits = m_moduleContext
-            ? m_moduleContext->jobLimits
-            : m_productContext ? m_productContext->product->jobLimits
-            : projectContext->jobLimits;
-    JobLimit jobLimit(jobPool, jobCount);
-    const int oldLimit = jobLimits.getLimit(jobPool);
-    if (oldLimit == -1 || oldLimit > jobCount)
-        jobLimits.setJobLimit(jobLimit);
-}
-
-void ProjectResolver::resolveScanner(Item *item, ProjectResolver::ProjectContext *projectContext)
-{
-    checkCancelation();
-    if (!m_evaluator->boolValue(item, StringConstants::conditionProperty())) {
-        qCDebug(lcProjectResolver) << "scanner condition is false";
-        return;
-    }
-
-    ResolvedScannerPtr scanner = ResolvedScanner::create();
-    scanner->module = m_moduleContext ? m_moduleContext->module : projectContext->dummyModule;
-    scanner->inputs = m_evaluator->fileTagsValue(item, StringConstants::inputsProperty());
-    scanner->recursive = m_evaluator->boolValue(item, StringConstants::recursiveProperty());
-    scanner->searchPathsScript.initialize(scriptFunctionValue(
-                                              item, StringConstants::searchPathsProperty()));
-    scanner->scanScript.initialize(scriptFunctionValue(item, StringConstants::scanProperty()));
-    m_productContext->product->scanners.push_back(scanner);
-}
-
-ProjectResolver::ProductDependencyInfos ProjectResolver::getProductDependencies(
-        const ResolvedProductConstPtr &product, const ModuleLoaderResult::ProductInfo &productInfo)
-{
-    ProductDependencyInfos result;
-    result.dependencies.reserve(productInfo.usedProducts.size());
-    for (const auto &dependency : productInfo.usedProducts) {
-        QBS_CHECK(!dependency.name.isEmpty());
-        if (dependency.profile == StringConstants::star()) {
-            for (const ResolvedProductPtr &p : qAsConst(m_productsByName)) {
-                if (p->name != dependency.name || p == product || !p->enabled
-                        || (dependency.limitToSubProject && !product->isInParentProject(p))) {
-                    continue;
-                }
-                result.dependencies.emplace_back(p, dependency.parameters);
-            }
-        } else {
-            ResolvedProductPtr usedProduct = m_productsByName.value(dependency.uniqueName());
-            const QString depDisplayName = ResolvedProduct::fullDisplayName(dependency.name,
-                    dependency.multiplexConfigurationId);
-            if (!usedProduct) {
-                throw ErrorInfo(Tr::tr("Product '%1' depends on '%2', which does not exist.")
-                                .arg(product->fullDisplayName(), depDisplayName),
-                                product->location);
-            }
-            if (!dependency.profile.isEmpty() && usedProduct->profile() != dependency.profile) {
-                usedProduct.reset();
-                for (const ResolvedProductPtr &p : qAsConst(m_productsByName)) {
-                    if (p->name == dependency.name && p->profile() == dependency.profile) {
-                        usedProduct = p;
-                        break;
-                    }
-                }
-                if (!usedProduct) {
-                    throw ErrorInfo(Tr::tr("Product '%1' depends on '%2', which does not exist "
-                                           "for the requested profile '%3'.")
-                                    .arg(product->fullDisplayName(), depDisplayName,
-                                         dependency.profile),
-                                    product->location);
-                }
-            }
-            if (!usedProduct->enabled) {
-                if (!dependency.isRequired)
-                    continue;
-                ErrorInfo e;
-                e.append(Tr::tr("Product '%1' depends on '%2',")
-                         .arg(product->name, usedProduct->name), product->location);
-                e.append(Tr::tr("but product '%1' is disabled.").arg(usedProduct->name),
-                             usedProduct->location);
-                if (m_setupParams.productErrorMode() == ErrorHandlingMode::Strict)
-                    throw e;
-                result.hasDisabledDependency = true;
-            }
-            result.dependencies.emplace_back(usedProduct, dependency.parameters);
-        }
-    }
-    return result;
-}
-
-void ProjectResolver::matchArtifactProperties(const ResolvedProductPtr &product,
-        const std::vector<SourceArtifactPtr> &artifacts)
-{
-    for (const SourceArtifactPtr &artifact : artifacts) {
-        for (const auto &artifactProperties : product->artifactProperties) {
-            if (!artifact->isTargetOfModule()
-                    && artifact->fileTags.intersects(artifactProperties->fileTagsFilter())) {
-                artifact->properties = artifactProperties->propertyMap();
-            }
-        }
-    }
-}
-
-void ProjectResolver::printProfilingInfo()
-{
-    if (!m_setupParams.logElapsedTime())
-        return;
-    m_logger.qbsLog(LoggerInfo, true) << "\t" << Tr::tr("All property evaluation took %1.")
-                                         .arg(elapsedTimeString(m_elapsedTimeAllPropEval));
-    m_logger.qbsLog(LoggerInfo, true) << "\t" << Tr::tr("Module property evaluation took %1.")
-                                         .arg(elapsedTimeString(m_elapsedTimeModPropEval));
-    m_logger.qbsLog(LoggerInfo, true) << "\t"
-                                      << Tr::tr("Resolving groups (without module property "
-                                                "evaluation) took %1.")
-                                         .arg(elapsedTimeString(m_elapsedTimeGroups));
-}
-
-class TempScopeSetter
-{
-public:
-    TempScopeSetter(Item * item, Item *newScope) : m_item(item), m_oldScope(item->scope())
-    {
-        item->setScope(newScope);
-    }
-    ~TempScopeSetter() { m_item->setScope(m_oldScope); }
-private:
-    Item * const m_item;
-    Item * const m_oldScope;
-};
-
-void ProjectResolver::collectPropertiesForExportItem(Item *productModuleInstance)
-{
-    if (!productModuleInstance->isPresentModule())
-        return;
-    Item * const exportItem = productModuleInstance->prototype();
-    QBS_CHECK(exportItem && exportItem->type() == ItemType::Export);
-    TempScopeSetter tempScopeSetter(exportItem, productModuleInstance->scope());
-    const ItemDeclaration::Properties exportDecls = BuiltinDeclarations::instance()
-            .declarationsForType(ItemType::Export).properties();
-    ExportedModule &exportedModule = m_productContext->product->exportedModule;
-    const auto &props = exportItem->properties();
-    for (auto it = props.begin(); it != props.end(); ++it) {
-        const auto match
-                = [it](const PropertyDeclaration &decl) { return decl.name() == it.key(); };
-        if (it.key() != StringConstants::prefixMappingProperty() &&
-                std::find_if(exportDecls.begin(), exportDecls.end(), match) != exportDecls.end()) {
-            continue;
-        }
-        if (it.value()->type() == Value::ItemValueType) {
-            collectPropertiesForExportItem(it.key(), it.value(), productModuleInstance,
-                                           exportedModule.modulePropertyValues);
-        } else {
-            evaluateProperty(exportItem, it.key(), it.value(), exportedModule.propertyValues,
-                             false);
-        }
-    }
-}
-
-// Collects module properties assigned to in other (higher-level) modules.
-void ProjectResolver::collectPropertiesForModuleInExportItem(const Item::Module &module)
-{
-    if (!module.item->isPresentModule())
-        return;
-    ExportedModule &exportedModule = m_productContext->product->exportedModule;
-    if (module.isProduct || module.name.first() == StringConstants::qbsModule())
-        return;
-    const auto checkName = [module](const ExportedModuleDependency &d) {
-        return module.name.toString() == d.name;
-    };
-    if (any_of(exportedModule.moduleDependencies, checkName))
-        return;
-
-    Item *modulePrototype = module.item->prototype();
-    while (modulePrototype && modulePrototype->type() != ItemType::Module)
-        modulePrototype = modulePrototype->prototype();
-    if (!modulePrototype) // Can happen for broken products in relaxed mode.
-        return;
-    TempScopeSetter tempScopeSetter(modulePrototype, module.item->scope());
-    const Item::PropertyMap &props = modulePrototype->properties();
-    ExportedModuleDependency dep;
-    dep.name = module.name.toString();
-    for (auto it = props.begin(); it != props.end(); ++it) {
-        if (it.value()->type() == Value::ItemValueType)
-            collectPropertiesForExportItem(it.key(), it.value(), module.item, dep.moduleProperties);
-    }
-    exportedModule.moduleDependencies.push_back(dep);
-
-    for (const auto &dep : module.item->modules())
-        collectPropertiesForModuleInExportItem(dep);
-}
-
-static bool hasDependencyCycle(Set<ResolvedProduct *> *checked,
-                               Set<ResolvedProduct *> *branch,
-                               const ResolvedProductPtr &product,
-                               ErrorInfo *error)
-{
-    if (branch->contains(product.get()))
-        return true;
-    if (checked->contains(product.get()))
-        return false;
-    checked->insert(product.get());
-    branch->insert(product.get());
-    for (const ResolvedProductPtr &dep : qAsConst(product->dependencies)) {
-        if (hasDependencyCycle(checked, branch, dep, error)) {
-            error->prepend(dep->name, dep->location);
-            return true;
-        }
-    }
-    branch->remove(product.get());
-    return false;
-}
-
-using DependencyMap = QHash<ResolvedProduct *, Set<ResolvedProduct *>>;
-void gatherDependencies(ResolvedProduct *product, DependencyMap &dependencies)
-{
-    if (dependencies.contains(product))
-        return;
-    Set<ResolvedProduct *> &productDeps = dependencies[product];
-    for (const ResolvedProductPtr &dep : qAsConst(product->dependencies)) {
-        productDeps << dep.get();
-        gatherDependencies(dep.get(), dependencies);
-        productDeps += dependencies.value(dep.get());
-    }
-}
-
-
-
-static DependencyMap allDependencies(const std::vector<ResolvedProductPtr> &products)
-{
-    DependencyMap dependencies;
-    for (const ResolvedProductPtr &product : products)
-        gatherDependencies(product.get(), dependencies);
-    return dependencies;
-}
-
-void ProjectResolver::resolveProductDependencies(const ProjectContext &projectContext)
-{
-    // Resolve all inter-product dependencies.
-    const std::vector<ResolvedProductPtr> allProducts = projectContext.project->allProducts();
-    bool disabledDependency = false;
-    for (const ResolvedProductPtr &rproduct : allProducts) {
-        if (!rproduct->enabled)
-            continue;
-        Item *productItem = m_productItemMap.value(rproduct);
-        const ModuleLoaderResult::ProductInfo &productInfo
-                = mapValue(m_loadResult.productInfos, productItem);
-        const ProductDependencyInfos &depInfos = getProductDependencies(rproduct, productInfo);
-        if (depInfos.hasDisabledDependency)
-            disabledDependency = true;
-        for (const auto &dep : depInfos.dependencies) {
-            if (!contains(rproduct->dependencies, dep.product))
-                rproduct->dependencies.push_back(dep.product);
-            if (!dep.parameters.empty())
-                rproduct->dependencyParameters.insert(dep.product, dep.parameters);
-        }
-    }
-
-    // Check for cyclic dependencies.
-    Set<ResolvedProduct *> checked;
-    for (const ResolvedProductPtr &rproduct : allProducts) {
-        Set<ResolvedProduct *> branch;
-        ErrorInfo error;
-        if (hasDependencyCycle(&checked, &branch, rproduct, &error)) {
-            error.prepend(rproduct->name, rproduct->location);
-            error.prepend(Tr::tr("Cyclic dependencies detected."));
-            throw error;
-        }
-    }
-
-    // Mark all products as disabled that have a disabled dependency.
-    if (disabledDependency && m_setupParams.productErrorMode() == ErrorHandlingMode::Relaxed) {
-        const DependencyMap allDeps = allDependencies(allProducts);
-        DependencyMap allDepsReversed;
-        for (auto it = allDeps.constBegin(); it != allDeps.constEnd(); ++it) {
-            for (ResolvedProduct *dep : qAsConst(it.value()))
-                allDepsReversed[dep] << it.key();
-        }
-        for (auto it = allDepsReversed.constBegin(); it != allDepsReversed.constEnd(); ++it) {
-            if (it.key()->enabled)
-                continue;
-            for (ResolvedProduct * const dependingProduct : qAsConst(it.value())) {
-                if (dependingProduct->enabled) {
-                    m_logger.qbsWarning() << Tr::tr("Disabling product '%1', because it depends on "
-                                                    "disabled product '%2'.")
-                                             .arg(dependingProduct->name, it.key()->name);
-                    dependingProduct->enabled = false;
-                }
-            }
-        }
-    }
-}
-
-void ProjectResolver::postProcess(const ResolvedProductPtr &product,
-                                  ProjectContext *projectContext) const
-{
-    product->fileTaggers << projectContext->fileTaggers;
-    std::sort(std::begin(product->fileTaggers), std::end(product->fileTaggers),
-              [] (const FileTaggerConstPtr &a, const FileTaggerConstPtr &b) {
-        return a->priority() > b->priority();
-    });
-    for (const RulePtr &rule : projectContext->rules) {
-        RulePtr clonedRule = rule->clone();
-        clonedRule->product = product.get();
-        product->rules.push_back(clonedRule);
-    }
-}
-
-void ProjectResolver::applyFileTaggers(const ResolvedProductPtr &product) const
-{
-    for (const SourceArtifactPtr &artifact : product->allEnabledFiles())
-        applyFileTaggers(artifact, product);
-}
-
-void ProjectResolver::applyFileTaggers(const SourceArtifactPtr &artifact,
-        const ResolvedProductConstPtr &product)
-{
-    if (!artifact->overrideFileTags || artifact->fileTags.empty()) {
-        const QString fileName = FileInfo::fileName(artifact->absoluteFilePath);
-        const FileTags fileTags = product->fileTagsForFileName(fileName);
-        artifact->fileTags.unite(fileTags);
-        if (artifact->fileTags.empty())
-            artifact->fileTags.insert(unknownFileTag());
-        qCDebug(lcProjectResolver) << "adding file tags" << artifact->fileTags
-                                   << "to" << fileName;
-    }
-}
-
-QVariantMap ProjectResolver::evaluateModuleValues(Item *item, bool lookupPrototype)
-{
-    AccumulatingTimer modPropEvalTimer(m_setupParams.logElapsedTime()
-                                       ? &m_elapsedTimeModPropEval : nullptr);
-    QVariantMap moduleValues;
-    for (const Item::Module &module : item->modules()) {
-        if (!module.item->isPresentModule())
-            continue;
-        const QString fullName = module.name.toString();
-        moduleValues[fullName] = evaluateProperties(module.item, lookupPrototype, true);
-    }
-
-    return moduleValues;
-}
-
-QVariantMap ProjectResolver::evaluateProperties(Item *item, bool lookupPrototype, bool checkErrors)
-{
-    const QVariantMap tmplt;
-    return evaluateProperties(item, item, tmplt, lookupPrototype, checkErrors);
-}
-
-QVariantMap ProjectResolver::evaluateProperties(const Item *item, const Item *propertiesContainer,
-        const QVariantMap &tmplt, bool lookupPrototype, bool checkErrors)
-{
-    AccumulatingTimer propEvalTimer(m_setupParams.logElapsedTime()
-                                    ? &m_elapsedTimeAllPropEval : nullptr);
-    QVariantMap result = tmplt;
-    for (QMap<QString, ValuePtr>::const_iterator it = propertiesContainer->properties().begin();
-         it != propertiesContainer->properties().end(); ++it) {
-        checkCancelation();
-        evaluateProperty(item, it.key(), it.value(), result, checkErrors);
-    }
-    return lookupPrototype && propertiesContainer->prototype()
-            ? evaluateProperties(item, propertiesContainer->prototype(), result, true, checkErrors)
-            : result;
-}
-
-void ProjectResolver::evaluateProperty(const Item *item, const QString &propName,
-        const ValuePtr &propValue, QVariantMap &result, bool checkErrors)
-{
-    switch (propValue->type()) {
-    case Value::ItemValueType:
-    {
-        // Ignore items. Those point to module instances
-        // and are handled in evaluateModuleValues().
-        break;
-    }
-    case Value::JSSourceValueType:
-    {
-        if (result.contains(propName))
-            break;
-        const PropertyDeclaration pd = item->propertyDeclaration(propName);
-        if (pd.flags().testFlag(PropertyDeclaration::PropertyNotAvailableInConfig)) {
-            break;
-        }
-        const QScriptValue scriptValue = m_evaluator->property(item, propName);
-        if (checkErrors && Q_UNLIKELY(m_evaluator->engine()->hasErrorOrException(scriptValue))) {
-            throw ErrorInfo(m_evaluator->engine()->lastError(scriptValue,
-                                                             propValue->location()));
-        }
-
-        // NOTE: Loses type information if scriptValue.isUndefined == true,
-        //       as such QScriptValues become invalid QVariants.
-        QVariant v;
-        if (scriptValue.isFunction()) {
-            v = scriptValue.toString();
-        } else {
-            v = scriptValue.toVariant();
-            QVariantMap m = v.toMap();
-            if (m.contains(StringConstants::importScopeNamePropertyInternal())) {
-                QVariantMap tmp = m;
-                m = scriptValue.prototype().toVariant().toMap();
-                for (auto it = tmp.begin(); it != tmp.end(); ++it)
-                    m.insert(it.key(), it.value());
-                v = m;
-            }
-        }
-
-        if (pd.type() == PropertyDeclaration::Path && v.isValid()) {
-            v = v.toString();
-        } else if (pd.type() == PropertyDeclaration::PathList
-                   || pd.type() == PropertyDeclaration::StringList) {
-            v = v.toStringList();
-        } else if (pd.type() == PropertyDeclaration::VariantList) {
-            v = v.toList();
-        }
-        checkAllowedValues(v, propValue->location(), pd, propName);
-        result[propName] = v;
-        break;
-    }
-    case Value::VariantValueType:
-    {
-        if (result.contains(propName))
-            break;
-        VariantValuePtr vvp = std::static_pointer_cast<VariantValue>(propValue);
-        QVariant v = vvp->value();
-
-        const PropertyDeclaration pd = item->propertyDeclaration(propName);
-        if (v.isNull() && !pd.isScalar()) // QTBUG-51237
-            v = QStringList();
-
-        checkAllowedValues(v, propValue->location(), pd, propName);
-        result[propName] = v;
-        break;
-    }
-    }
-}
-
-void ProjectResolver::checkAllowedValues(
-        const QVariant &value, const CodeLocation &loc, const PropertyDeclaration &decl,
-        const QString &key) const
-{
-    const auto type = decl.type();
-    if (type != PropertyDeclaration::String && type != PropertyDeclaration::StringList)
-        return;
-
-    if (value.isNull())
-        return;
-
-    const auto &allowedValues = decl.allowedValues();
-    if (allowedValues.isEmpty())
-        return;
-
-    const auto checkValue = [this, &loc, &allowedValues, &key](const QString &value)
-    {
-        if (!allowedValues.contains(value)) {
-            const auto message = Tr::tr("Value '%1' is not allowed for property '%2'.")
-                    .arg(value, key);
-            ErrorInfo error(message, loc);
-            handlePropertyError(error, m_setupParams, m_logger);
-        }
-    };
-
-    if (type == PropertyDeclaration::StringList) {
-        const auto strings = value.toStringList();
-        for (const auto &string: strings) {
-            checkValue(string);
-        }
-    } else if (type == PropertyDeclaration::String) {
-        checkValue(value.toString());
-    }
-}
-
-void ProjectResolver::collectPropertiesForExportItem(const QualifiedId &moduleName,
-         const ValuePtr &value, Item *moduleInstance, QVariantMap &moduleProps)
-{
-    QBS_CHECK(value->type() == Value::ItemValueType);
-    Item * const itemValueItem = std::static_pointer_cast<ItemValue>(value)->item();
-    if (itemValueItem->type() == ItemType::ModuleInstance) {
-        struct EvalPreparer {
-            EvalPreparer(Item *valueItem, Item *moduleInstance, const QualifiedId &moduleName)
-                : valueItem(valueItem), oldScope(valueItem->scope()),
-                  hadName(!!valueItem->variantProperty(StringConstants::nameProperty()))
-            {
-                valueItem->setScope(moduleInstance);
-                if (!hadName) {
-                    // EvaluatorScriptClass expects a name here.
-                    valueItem->setProperty(StringConstants::nameProperty(),
-                                           VariantValue::create(moduleName.toString()));
-                }
-            }
-            ~EvalPreparer()
-            {
-                valueItem->setScope(oldScope);
-                if (!hadName)
-                    valueItem->setProperty(StringConstants::nameProperty(), VariantValuePtr());
-            }
-            Item * const valueItem;
-            Item * const oldScope;
-            const bool hadName;
-        };
-        EvalPreparer ep(itemValueItem, moduleInstance, moduleName);
-        moduleProps.insert(moduleName.toString(), evaluateProperties(itemValueItem, false, false));
-        return;
-    }
-    QBS_CHECK(itemValueItem->type() == ItemType::ModulePrefix);
-    const Item::PropertyMap &props = itemValueItem->properties();
-    for (auto it = props.begin(); it != props.end(); ++it) {
-        QualifiedId fullModuleName = moduleName;
-        fullModuleName << it.key();
-        collectPropertiesForExportItem(fullModuleName, it.value(), moduleInstance, moduleProps);
-    }
-}
-
-void ProjectResolver::createProductConfig(ResolvedProduct *product)
-{
-    EvalCacheEnabler cachingEnabler(m_evaluator);
-    m_evaluator->setPathPropertiesBaseDir(m_productContext->product->sourceDirectory);
-    product->moduleProperties->setValue(evaluateModuleValues(m_productContext->item));
-    product->productProperties = evaluateProperties(m_productContext->item, m_productContext->item,
-                                                    QVariantMap(), true, true);
-    m_evaluator->clearPathPropertiesBaseDir();
-}
-
-void ProjectResolver::callItemFunction(const ItemFuncMap &mappings, Item *item,
-                                       ProjectContext *projectContext)
-{
-    const ItemFuncPtr f = mappings.value(item->type());
-    QBS_CHECK(f);
-    if (item->type() == ItemType::Project) {
-        ProjectContext subProjectContext = createProjectContext(projectContext);
-        (this->*f)(item, &subProjectContext);
-    } else {
-        (this->*f)(item, projectContext);
-    }
-}
-
-ProjectResolver::ProjectContext ProjectResolver::createProjectContext(ProjectContext *parentProjectContext) const
-{
-    ProjectContext subProjectContext;
-    subProjectContext.parentContext = parentProjectContext;
-    subProjectContext.project = ResolvedProject::create();
-    parentProjectContext->project->subProjects.push_back(subProjectContext.project);
-    subProjectContext.project->parentProject = parentProjectContext->project;
-    return subProjectContext;
-}
-
-} // namespace Internal
-} // namespace qbs
diff --git a/src/lib/corelib/language/projectresolver.h b/src/lib/corelib/language/projectresolver.h
deleted file mode 100644
index 52d835535..000000000
--- a/src/lib/corelib/language/projectresolver.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qbs.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef PROJECTRESOLVER_H
-#define PROJECTRESOLVER_H
-
-#include "filetags.h"
-#include "itemtype.h"
-#include "moduleloader.h"
-#include "qualifiedid.h"
-
-#include <logging/logger.h>
-#include <tools/set.h>
-
-#include <QtCore/qhash.h>
-#include <QtCore/qmap.h>
-#include <QtCore/qstringlist.h>
-
-#include <utility>
-#include <vector>
-
-namespace qbs {
-class JobLimits;
-namespace Internal {
-
-class Evaluator;
-class Item;
-class ProgressObserver;
-class ScriptEngine;
-
-class ProjectResolver
-{
-public:
-    ProjectResolver(Evaluator *evaluator, ModuleLoaderResult loadResult,
-                    SetupProjectParameters setupParameters, Logger &logger);
-    ~ProjectResolver();
-
-    void setProgressObserver(ProgressObserver *observer);
-    TopLevelProjectPtr resolve();
-
-    static void applyFileTaggers(const SourceArtifactPtr &artifact,
-            const ResolvedProductConstPtr &product);
-
-    using FileLocations = QHash<std::pair<QString, QString>, CodeLocation>;
-    static SourceArtifactPtr createSourceArtifact(const ResolvedProductPtr &rproduct,
-            const QString &fileName, const GroupPtr &group, bool wildcard,
-            const CodeLocation &filesLocation = CodeLocation(),
-            FileLocations *fileLocations = nullptr, ErrorInfo *errorInfo = nullptr);
-
-private:
-    struct ProjectContext;
-    struct ProductContext;
-    struct ModuleContext;
-    class ProductContextSwitcher;
-
-    void checkCancelation() const;
-    QString verbatimValue(const ValueConstPtr &value, bool *propertyWasSet = nullptr) const;
-    QString verbatimValue(Item *item, const QString &name, bool *propertyWasSet = nullptr) const;
-    ScriptFunctionPtr scriptFunctionValue(Item *item, const QString &name) const;
-    ResolvedFileContextPtr resolvedFileContext(const FileContextConstPtr &ctx) const;
-    void ignoreItem(Item *item, ProjectContext *projectContext);
-    TopLevelProjectPtr resolveTopLevelProject();
-    void resolveProject(Item *item, ProjectContext *projectContext);
-    void resolveProjectFully(Item *item, ProjectContext *projectContext);
-    void resolveSubProject(Item *item, ProjectContext *projectContext);
-    void resolveProduct(Item *item, ProjectContext *projectContext);
-    void resolveProductFully(Item *item, ProjectContext *projectContext);
-    void resolveModules(const Item *item, ProjectContext *projectContext);
-    void resolveModule(const QualifiedId &moduleName, Item *item, bool isProduct,
-                       const QVariantMap &parameters, JobLimits &jobLimits,
-                       ProjectContext *projectContext);
-    void gatherProductTypes(ResolvedProduct *product, Item *item);
-    QVariantMap resolveAdditionalModuleProperties(const Item *group,
-                                                  const QVariantMap &currentValues);
-    void resolveGroup(Item *item, ProjectContext *projectContext);
-    void resolveGroupFully(Item *item, ProjectContext *projectContext, bool isEnabled);
-    void resolveShadowProduct(Item *item, ProjectContext *);
-    void resolveExport(Item *exportItem, ProjectContext *);
-    std::unique_ptr<ExportedItem> resolveExportChild(const Item *item,
-                                                     const ExportedModule &module);
-    void resolveRule(Item *item, ProjectContext *projectContext);
-    void resolveRuleArtifact(const RulePtr &rule, Item *item);
-    void resolveRuleArtifactBinding(const RuleArtifactPtr &ruleArtifact, Item *item,
-                                    const QStringList &namePrefix,
-                                    QualifiedIdSet *seenBindings);
-    void resolveFileTagger(Item *item, ProjectContext *projectContext);
-    void resolveJobLimit(Item *item, ProjectContext *projectContext);
-    void resolveScanner(Item *item, ProjectContext *projectContext);
-    void resolveProductDependencies(const ProjectContext &projectContext);
-    void postProcess(const ResolvedProductPtr &product, ProjectContext *projectContext) const;
-    void applyFileTaggers(const ResolvedProductPtr &product) const;
-    QVariantMap evaluateModuleValues(Item *item, bool lookupPrototype = true);
-    QVariantMap evaluateProperties(Item *item, bool lookupPrototype, bool checkErrors);
-    QVariantMap evaluateProperties(const Item *item, const Item *propertiesContainer,
-                                   const QVariantMap &tmplt, bool lookupPrototype,
-                                   bool checkErrors);
-    void evaluateProperty(const Item *item, const QString &propName, const ValuePtr &propValue,
-                          QVariantMap &result, bool checkErrors);
-    void checkAllowedValues(
-            const QVariant &v, const CodeLocation &loc, const PropertyDeclaration &decl,
-            const QString &key) const;
-    void createProductConfig(ResolvedProduct *product);
-    ProjectContext createProjectContext(ProjectContext *parentProjectContext) const;
-    void adaptExportedPropertyValues(const Item *shadowProductItem);
-    void collectExportedProductDependencies();
-
-    struct ProductDependencyInfo
-    {
-        ProductDependencyInfo(ResolvedProductPtr product,
-                              QVariantMap parameters = QVariantMap())
-            : product(std::move(product)), parameters(std::move(parameters))
-        {
-        }
-
-        ResolvedProductPtr product;
-        QVariantMap parameters;
-    };
-
-    struct ProductDependencyInfos
-    {
-        std::vector<ProductDependencyInfo> dependencies;
-        bool hasDisabledDependency = false;
-    };
-
-    ProductDependencyInfos getProductDependencies(const ResolvedProductConstPtr &product,
-            const ModuleLoaderResult::ProductInfo &productInfo);
-    QString sourceCodeAsFunction(const JSSourceValueConstPtr &value,
-                                 const PropertyDeclaration &decl) const;
-    QString sourceCodeForEvaluation(const JSSourceValueConstPtr &value) const;
-    static void matchArtifactProperties(const ResolvedProductPtr &product,
-            const std::vector<SourceArtifactPtr> &artifacts);
-    void printProfilingInfo();
-
-    void collectPropertiesForExportItem(Item *productModuleInstance);
-    void collectPropertiesForModuleInExportItem(const Item::Module &module);
-
-    void collectPropertiesForExportItem(const QualifiedId &moduleName,
-            const ValuePtr &value, Item *moduleInstance, QVariantMap &moduleProps);
-    void setupExportedProperties(const Item *item, const QString &namePrefix,
-                                 std::vector<ExportedProperty> &properties);
-
-    Evaluator *m_evaluator = nullptr;
-    Logger &m_logger;
-    ScriptEngine *m_engine = nullptr;
-    ProgressObserver *m_progressObserver = nullptr;
-    ProductContext *m_productContext = nullptr;
-    ModuleContext *m_moduleContext = nullptr;
-    QMap<QString, ResolvedProductPtr> m_productsByName;
-    QHash<FileTag, QList<ResolvedProductPtr> > m_productsByType;
-    QHash<ResolvedProductPtr, Item *> m_productItemMap;
-    mutable QHash<FileContextConstPtr, ResolvedFileContextPtr> m_fileContextMap;
-    mutable QHash<CodeLocation, ScriptFunctionPtr> m_scriptFunctionMap;
-    mutable QHash<std::pair<QStringView, QStringList>, QString> m_scriptFunctions;
-    mutable QHash<QStringView, QString> m_sourceCode;
-    const SetupProjectParameters m_setupParams;
-    ModuleLoaderResult m_loadResult;
-    Set<CodeLocation> m_groupLocationWarnings;
-    std::vector<std::pair<ResolvedProductPtr, Item *>> m_productExportInfo;
-    std::vector<ErrorInfo> m_queuedErrors;
-    qint64 m_elapsedTimeModPropEval = 0;
-    qint64 m_elapsedTimeAllPropEval = 0;
-    qint64 m_elapsedTimeGroups = 0;
-
-    typedef void (ProjectResolver::*ItemFuncPtr)(Item *item, ProjectContext *projectContext);
-    using ItemFuncMap = QMap<ItemType, ItemFuncPtr>;
-    void callItemFunction(const ItemFuncMap &mappings, Item *item, ProjectContext *projectContext);
-};
-
-} // namespace Internal
-} // namespace qbs
-
-#endif // PROJECTRESOLVER_H
diff --git a/src/lib/corelib/language/property.h b/src/lib/corelib/language/property.h
index 78061bf6f..302973d19 100644
--- a/src/lib/corelib/language/property.h
+++ b/src/lib/corelib/language/property.h
@@ -94,7 +94,7 @@ inline bool operator==(const Property &p1, const Property &p2)
 }
 bool operator<(const Property &p1, const Property &p2);
 
-inline uint qHash(const Property &p)
+inline auto qHash(const Property &p)
 {
     return QT_PREPEND_NAMESPACE(qHash)(p.productName + p.moduleName + p.propertyName);
 }
diff --git a/src/lib/corelib/language/propertydeclaration.cpp b/src/lib/corelib/language/propertydeclaration.cpp
index 2dbe41afd..d56ab3bb0 100644
--- a/src/lib/corelib/language/propertydeclaration.cpp
+++ b/src/lib/corelib/language/propertydeclaration.cpp
@@ -40,11 +40,16 @@
 #include "propertydeclaration.h"
 
 #include "deprecationinfo.h"
-#include <api/languageinfo.h>
+#include "filecontext.h"
+#include "item.h"
+#include "qualifiedid.h"
+#include "value.h"
 
+#include <api/languageinfo.h>
+#include <loader/loaderutils.h>
 #include <logging/translator.h>
-
 #include <tools/error.h>
+#include <tools/setupprojectparameters.h>
 #include <tools/qttools.h>
 #include <tools/stringconstants.h>
 
@@ -101,7 +106,6 @@ public:
     DeprecationInfo deprecationInfo;
 };
 
-
 PropertyDeclaration::PropertyDeclaration()
     : d(new PropertyDeclarationData)
 {
@@ -275,7 +279,12 @@ void PropertyDeclaration::setDeprecationInfo(const DeprecationInfo &deprecationI
     d->deprecationInfo = deprecationInfo;
 }
 
-// see also: EvaluatorScriptClass::convertToPropertyType()
+ErrorInfo PropertyDeclaration::checkForDeprecation(DeprecationWarningMode mode,
+                                                   const CodeLocation &loc, Logger &logger) const
+{
+    return deprecationInfo().checkForDeprecation(mode, name(), loc, false, logger);
+}
+
 QVariant PropertyDeclaration::convertToPropertyType(const QVariant &v, Type t,
     const QStringList &namePrefix, const QString &key)
 {
@@ -299,5 +308,207 @@ QVariant PropertyDeclaration::convertToPropertyType(const QVariant &v, Type t,
     return c;
 }
 
+QVariant PropertyDeclaration::typedNullValue() const
+{
+    switch (type()) {
+    case PropertyDeclaration::Boolean:
+        return typedNullVariant<bool>();
+    case PropertyDeclaration::Integer:
+        return typedNullVariant<int>();
+    case PropertyDeclaration::VariantList:
+        return typedNullVariant<QVariantList>();
+    case PropertyDeclaration::String:
+    case PropertyDeclaration::Path:
+        return typedNullVariant<QString>();
+    case PropertyDeclaration::StringList:
+    case PropertyDeclaration::PathList:
+        return typedNullVariant<QStringList>();
+    default:
+        return {};
+    }
+}
+
+bool PropertyDeclaration::shouldCheckAllowedValues() const
+{
+    return isValid()
+           && (d->type == PropertyDeclaration::String || d->type == PropertyDeclaration::StringList)
+           && !d->allowedValues.empty();
+}
+
+void PropertyDeclaration::checkAllowedValues(
+    const QVariant &value,
+    const CodeLocation &loc,
+    const QString &key,
+    LoaderState &loaderState) const
+{
+    const auto type = d->type;
+    if (!shouldCheckAllowedValues())
+        return;
+
+    if (value.isNull())
+        return;
+
+    const auto &allowedValues = d->allowedValues;
+
+    const auto checkValue = [&loc, &allowedValues, &key, &loaderState](const QString &value)
+    {
+        if (!allowedValues.contains(value)) {
+            const auto message = Tr::tr("Value '%1' is not allowed for property '%2'.")
+                                     .arg(value, key);
+            ErrorInfo error(message, loc);
+            handlePropertyError(error, loaderState.parameters(), loaderState.logger());
+        }
+    };
+
+    if (type == PropertyDeclaration::StringList) {
+        const auto strings = value.toStringList();
+        for (const auto &string: strings) {
+            checkValue(string);
+        }
+    } else if (type == PropertyDeclaration::String) {
+        checkValue(value.toString());
+    }
+}
+
+namespace {
+class PropertyDeclarationCheck : public ValueHandler
+{
+public:
+    PropertyDeclarationCheck(LoaderState &loaderState) : m_loaderState(loaderState) {}
+    void operator()(Item *item)
+    {
+        m_checkingProject = item->type() == ItemType::Project;
+        handleItem(item);
+    }
+
+private:
+    void handle(JSSourceValue *value) override
+    {
+        if (!value->createdByPropertiesBlock()) {
+            const ErrorInfo error(Tr::tr("Property '%1' is not declared.")
+                                      .arg(m_currentName), value->location());
+            handlePropertyError(error, m_loaderState.parameters(), m_loaderState.logger());
+        }
+    }
+    void handle(ItemValue *value) override
+    {
+        if (checkItemValue(value))
+            handleItem(value->item());
+    }
+    bool checkItemValue(ItemValue *value)
+    {
+        // TODO: Remove once QBS-1030 is fixed.
+        if (parentItem()->type() == ItemType::Artifact)
+            return false;
+
+        if (parentItem()->type() == ItemType::Properties)
+            return false;
+
+        // TODO: Check where the in-between module instances come from.
+        if (value->item()->type() == ItemType::ModuleInstancePlaceholder) {
+            for (auto it = m_parentItems.rbegin(); it != m_parentItems.rend(); ++it) {
+                if ((*it)->type() == ItemType::Group)
+                    return false;
+                if ((*it)->type() == ItemType::ModulePrefix)
+                    continue;
+                break;
+            }
+        }
+
+        if (value->item()->type() != ItemType::ModuleInstance
+            && value->item()->type() != ItemType::ModulePrefix
+            && (!parentItem()->file() || !parentItem()->file()->idScope()
+                || !parentItem()->file()->idScope()->hasProperty(m_currentName))
+            && !value->createdByPropertiesBlock()) {
+            CodeLocation location = value->location();
+            for (int i = int(m_parentItems.size() - 1); !location.isValid() && i >= 0; --i)
+                location = m_parentItems.at(i)->location();
+            const ErrorInfo error(Tr::tr("Item '%1' is not declared. "
+                                         "Did you forget to add a Depends item?")
+                                      .arg(m_currentModuleName.toString()), location);
+            handlePropertyError(error, m_loaderState.parameters(), m_loaderState.logger());
+            return false;
+        }
+
+        return true;
+    }
+    void handleItem(Item *item)
+    {
+        if (m_checkingProject && item->type() == ItemType::Product)
+            return;
+        if (!m_handledItems.insert(item).second)
+            return;
+        if (item->type() == ItemType::Module
+            || item->type() == ItemType::Export
+            || (item->type() == ItemType::ModuleInstance && !item->isPresentModule())
+            || item->type() == ItemType::Properties
+
+            // The Properties child of a SubProject item is not a regular item.
+            || item->type() == ItemType::PropertiesInSubProject
+
+            || m_loaderState.topLevelProject().isDisabledItem(item)) {
+            return;
+        }
+
+        m_parentItems.push_back(item);
+        for (Item::PropertyMap::const_iterator it = item->properties().constBegin();
+             it != item->properties().constEnd(); ++it) {
+            if (item->type() == ItemType::Product && it.key() == StringConstants::moduleProviders()
+                && it.value()->type() == Value::ItemValueType)
+                continue;
+            const PropertyDeclaration decl = item->propertyDeclaration(it.key());
+            if (decl.isValid()) {
+                const ErrorInfo deprecationError = decl.checkForDeprecation(
+                    m_loaderState.parameters().deprecationWarningMode(), it.value()->location(),
+                            m_loaderState.logger());
+                if (deprecationError.hasError()) {
+                    handlePropertyError(deprecationError, m_loaderState.parameters(),
+                                        m_loaderState.logger());
+                }
+                continue;
+            }
+            m_currentName = it.key();
+            const QualifiedId oldModuleName = m_currentModuleName;
+            if (parentItem()->type() != ItemType::ModulePrefix)
+                m_currentModuleName.clear();
+            m_currentModuleName.push_back(m_currentName);
+            it.value()->apply(this);
+            m_currentModuleName = oldModuleName;
+        }
+        m_parentItems.pop_back();
+        for (Item * const child : item->children()) {
+            switch (child->type()) {
+            case ItemType::Export:
+            case ItemType::Depends:
+            case ItemType::Parameter:
+            case ItemType::Parameters:
+                break;
+            case ItemType::Group:
+                if (item->type() == ItemType::Module || item->type() == ItemType::ModuleInstance)
+                    break;
+                Q_FALLTHROUGH();
+            default:
+                handleItem(child);
+            }
+        }
+    }
+    void handle(VariantValue *) override { /* only created internally - no need to check */ }
+
+    Item *parentItem() const { return m_parentItems.back(); }
+
+    LoaderState &m_loaderState;
+    Set<Item *> m_handledItems;
+    std::vector<Item *> m_parentItems;
+    QualifiedId m_currentModuleName;
+    QString m_currentName;
+    bool m_checkingProject = false;
+};
+} // namespace
+
+void checkPropertyDeclarations(Item *topLevelItem, LoaderState &loaderState)
+{
+    (PropertyDeclarationCheck(loaderState))(topLevelItem);
+}
+
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/language/propertydeclaration.h b/src/lib/corelib/language/propertydeclaration.h
index 137315d14..79a39ecbd 100644
--- a/src/lib/corelib/language/propertydeclaration.h
+++ b/src/lib/corelib/language/propertydeclaration.h
@@ -40,6 +40,8 @@
 #ifndef QBS_PROPERTYDECLARATION_H
 #define QBS_PROPERTYDECLARATION_H
 
+#include <tools/deprecationwarningmode.h>
+
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 
@@ -48,9 +50,14 @@ class QVariant;
 QT_END_NAMESPACE
 
 namespace qbs {
+class CodeLocation;
+class ErrorInfo;
 namespace Internal {
 class DeprecationInfo;
 class PropertyDeclarationData;
+class Item;
+class LoaderState;
+class Logger;
 
 class PropertyDeclaration
 {
@@ -116,14 +123,27 @@ public:
     bool isExpired() const;
     const DeprecationInfo &deprecationInfo() const;
     void setDeprecationInfo(const DeprecationInfo &deprecationInfo);
+    ErrorInfo checkForDeprecation(DeprecationWarningMode mode, const CodeLocation &loc,
+                                  Logger &logger) const;
 
     static QVariant convertToPropertyType(
             const QVariant &v, Type t, const QStringList &namePrefix, const QString &key);
+    QVariant typedNullValue() const;
+
+    bool shouldCheckAllowedValues() const;
+    void checkAllowedValues(
+        const QVariant &value,
+        const CodeLocation &loc,
+        const QString &key,
+        LoaderState &loaderState) const;
 
 private:
     QSharedDataPointer<PropertyDeclarationData> d;
 };
 
+void checkPropertyDeclarations(Item *topLevelItem, LoaderState &loaderState);
+
+
 } // namespace Internal
 } // namespace qbs
 
diff --git a/src/lib/corelib/language/propertymapinternal.h b/src/lib/corelib/language/propertymapinternal.h
index 83e18ba48..af551cf6f 100644
--- a/src/lib/corelib/language/propertymapinternal.h
+++ b/src/lib/corelib/language/propertymapinternal.h
@@ -77,7 +77,7 @@ private:
 
 inline bool operator==(const PropertyMapInternal &lhs, const PropertyMapInternal &rhs)
 {
-    return lhs.m_value == rhs.m_value;
+    return qVariantsEqual(lhs.m_value, rhs.m_value);
 }
 
 QVariant QBS_AUTOTEST_EXPORT moduleProperty(const QVariantMap &properties,
diff --git a/src/lib/corelib/language/qualifiedid.cpp b/src/lib/corelib/language/qualifiedid.cpp
index 9eb0e9463..87248ac21 100644
--- a/src/lib/corelib/language/qualifiedid.cpp
+++ b/src/lib/corelib/language/qualifiedid.cpp
@@ -58,7 +58,7 @@ QualifiedId::QualifiedId(const QStringList &nameParts)
 
 QualifiedId QualifiedId::fromString(const QString &str)
 {
-    return QualifiedId(str.split(QLatin1Char('.')));
+    return {str.split(QLatin1Char('.'))};
 }
 
 QString QualifiedId::toString() const
diff --git a/src/lib/corelib/language/qualifiedid.h b/src/lib/corelib/language/qualifiedid.h
index 2b4c9d286..7e8b388d3 100644
--- a/src/lib/corelib/language/qualifiedid.h
+++ b/src/lib/corelib/language/qualifiedid.h
@@ -60,7 +60,7 @@ public:
     QString toString() const;
 };
 
-inline uint qHash(const QualifiedId &qid) { return qHash(qid.toString()); }
+inline auto qHash(const QualifiedId &qid) { return qHash(qid.toString()); }
 
 using QualifiedIdSet = Set<QualifiedId>;
 
diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp
index 1533bd210..d5f95aa83 100644
--- a/src/lib/corelib/language/scriptengine.cpp
+++ b/src/lib/corelib/language/scriptengine.cpp
@@ -46,16 +46,19 @@
 #include "preparescriptobserver.h"
 
 #include <buildgraph/artifact.h>
+#include <buildgraph/rulenode.h>
 #include <jsextensions/jsextensions.h>
 #include <logging/translator.h>
 #include <tools/error.h>
 #include <tools/fileinfo.h>
 #include <tools/profiling.h>
 #include <tools/qbsassert.h>
+#include <tools/scripttools.h>
 #include <tools/qttools.h>
 #include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
+#include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qdiriterator.h>
 #include <QtCore/qfile.h>
@@ -63,18 +66,15 @@
 #include <QtCore/qtextstream.h>
 #include <QtCore/qtimer.h>
 
-#include <QtScript/qscriptclass.h>
-#include <QtScript/qscriptvalueiterator.h>
-
+#include <cstring>
 #include <functional>
 #include <set>
 #include <utility>
+#include <vector>
 
 namespace qbs {
 namespace Internal {
 
-static QString getterFuncHelperProperty() { return QStringLiteral("qbsdata"); }
-
 const bool debugJSImports = false;
 
 bool operator==(const ScriptEngine::PropertyCacheKey &lhs,
@@ -85,133 +85,229 @@ bool operator==(const ScriptEngine::PropertyCacheKey &lhs,
             && lhs.m_propertyName == rhs.m_propertyName;
 }
 
-static inline uint combineHash(uint h1, uint h2, uint seed)
+static QHashValueType combineHash(QHashValueType h1, QHashValueType h2, QHashValueType seed)
 {
     // stolen from qHash(QPair)
     return ((h1 << 16) | (h1 >> 16)) ^ h2 ^ seed;
 }
 
-uint qHash(const ScriptEngine::PropertyCacheKey &k, uint seed = 0)
+QHashValueType qHash(const ScriptEngine::PropertyCacheKey &k, QHashValueType seed = 0)
 {
     return combineHash(qHash(k.m_moduleName),
                        combineHash(qHash(k.m_propertyName), qHash(k.m_propertyMap), seed), seed);
 }
 
-std::mutex ScriptEngine::m_creationDestructionMutex;
-
 ScriptEngine::ScriptEngine(Logger &logger, EvalContext evalContext, PrivateTag)
     : m_scriptImporter(new ScriptImporter(this)),
-      m_modulePropertyScriptClass(nullptr),
-      m_propertyCacheEnabled(true), m_active(false), m_logger(logger), m_evalContext(evalContext),
+      m_logger(logger), m_evalContext(evalContext),
       m_observer(new PrepareScriptObserver(this, UnobserveMode::Disabled))
 {
-    setProcessEventsInterval(1000); // For the cancelation mechanism to work.
-    m_cancelationError = currentContext()->throwValue(tr("Execution canceled"));
-    QScriptValue objectProto = globalObject().property(QStringLiteral("Object"));
-    m_definePropertyFunction = objectProto.property(QStringLiteral("defineProperty"));
-    QBS_ASSERT(m_definePropertyFunction.isFunction(), /* ignore */);
-    m_emptyFunction = evaluate(QStringLiteral("(function(){})"));
-    QBS_ASSERT(m_emptyFunction.isFunction(), /* ignore */);
-    // Initially push a new context to turn off scope chain insanity mode.
-    QScriptEngine::pushContext();
+    setMaxStackSize();
+    JS_SetRuntimeOpaque(m_jsRuntime, this);
+    JS_SetInterruptHandler(m_jsRuntime, interruptor, this);
+    setScopeLookup(m_context, &ScriptEngine::doExtraScopeLookup);
+    setFoundUndefinedHandler(m_context, &ScriptEngine::handleUndefinedFound);
+    setFunctionEnteredHandler(m_context, &ScriptEngine::handleFunctionEntered);
+    setFunctionExitedHandler(m_context, &ScriptEngine::handleFunctionExited);
+    m_dataWithPtrClass = registerClass("__data", nullptr, nullptr, JS_UNDEFINED);
     installQbsBuiltins();
     extendJavaScriptBuiltins();
 }
 
 std::unique_ptr<ScriptEngine> ScriptEngine::create(Logger &logger, EvalContext evalContext)
 {
-    std::lock_guard<std::mutex> lock(m_creationDestructionMutex);
     return std::make_unique<ScriptEngine>(logger, evalContext, PrivateTag());
 }
 
-ScriptEngine::~ScriptEngine()
+ScriptEngine *ScriptEngine::engineForRuntime(const JSRuntime *runtime)
+{
+    return static_cast<ScriptEngine *>(JS_GetRuntimeOpaque(const_cast<JSRuntime *>(runtime)));
+
+}
+
+ScriptEngine *ScriptEngine::engineForContext(const JSContext *ctx)
+{
+    return engineForRuntime(JS_GetRuntime(const_cast<JSContext *>(ctx)));
+}
+
+LookupResult ScriptEngine::doExtraScopeLookup(JSContext *ctx, JSAtom prop)
 {
-    m_creationDestructionMutex.lock();
-    connect(this, &QObject::destroyed, std::bind(&std::mutex::unlock, &m_creationDestructionMutex));
+    static const LookupResult fail{JS_UNDEFINED, JS_UNDEFINED, false};
+
+    ScriptEngine * const engine = engineForContext(ctx);
+    engine->m_lastLookupWasSuccess = false;
+
+    auto handleScope = [ctx, prop, engine](const JSValue &scope) -> LookupResult {
+        const JSValue v = JS_GetProperty(ctx, scope, prop);
+        if (!JS_IsUndefined(v) || engine->m_lastLookupWasSuccess) {
+            engine->m_lastLookupWasSuccess = false;
+            return {v, scope, true};
+        }
+        return fail;
+    };
+
+    if (!engine->m_scopeChains.empty()) {
+        const JSValueList &scopes = engine->m_scopeChains.back().get();
+        for (auto it = scopes.rbegin(); it != scopes.rend(); ++it) {
+            const auto res = handleScope(*it);
+            if (res.useResult)
+                return res;
+        }
+    }
+    if (JS_IsObject(engine->m_globalObject))
+        return handleScope(engine->m_globalObject);
+    return fail;
+}
+
+void ScriptEngine::handleUndefinedFound(JSContext *ctx)
+{
+    engineForContext(ctx)->setLastLookupStatus(true);
+}
+
+void ScriptEngine::handleFunctionEntered(JSContext *ctx, JSValue this_obj)
+{
+    ScriptEngine::engineForContext(ctx)->m_contextStack.push_back(this_obj);
+}
 
-    releaseResourcesOfScriptObjects();
-    delete (m_scriptImporter);
+void ScriptEngine::handleFunctionExited(JSContext *ctx)
+{
+    ScriptEngine::engineForContext(ctx)->m_contextStack.pop_back();
+}
+
+ScriptEngine::~ScriptEngine()
+{
+    reset();
+    delete m_scriptImporter;
     if (m_elapsedTimeImporting != -1) {
         m_logger.qbsLog(LoggerInfo, true) << Tr::tr("Setting up imports took %1.")
                                              .arg(elapsedTimeString(m_elapsedTimeImporting));
     }
-    delete m_modulePropertyScriptClass;
-    delete m_productPropertyScriptClass;
+    for (const auto &ext : std::as_const(m_internalExtensions))
+        JS_FreeValue(m_context, ext);
+    for (const JSValue &s : std::as_const(m_stringCache))
+        JS_FreeValue(m_context, s);
+    for (JSValue * const externalRef : std::as_const(m_externallyCachedValues)) {
+        JS_FreeValue(m_context, *externalRef);
+        *externalRef = JS_UNDEFINED;
+    }
+    setPropertyOnGlobalObject(QLatin1String("console"), JS_UNDEFINED);
+    JS_FreeContext(m_context);
+    JS_FreeRuntime(m_jsRuntime);
 }
 
-void ScriptEngine::import(const FileContextBaseConstPtr &fileCtx, QScriptValue &targetObject,
-                          ObserveMode observeMode)
+void ScriptEngine::reset()
 {
-    installImportFunctions();
-    m_currentDirPathStack.push(FileInfo::path(fileCtx->filePath()));
-    m_extensionSearchPathsStack.push(fileCtx->searchPaths());
-    m_observeMode = observeMode;
-
-    for (const JsImport &jsImport : fileCtx->jsImports())
-        import(jsImport, targetObject);
-    if (m_observeMode == ObserveMode::Enabled) {
-        for (QScriptValue &sv : m_requireResults)
-            observeImport(sv);
-        m_requireResults.clear();
+    // TODO: Check whether we can keep file and imports cache.
+    //       We'd have to find a solution for the scope name problem then.
+    clearImportsCache();
+    for (const auto &e : std::as_const(m_jsFileCache))
+        JS_FreeValue(m_context, e.second);
+    m_jsFileCache.clear();
+
+    for (const JSValue &s : std::as_const(m_jsValueCache))
+        JS_FreeValue(m_context, s);
+    m_jsValueCache.clear();
+
+    for (auto it = m_evalResults.cbegin(); it != m_evalResults.cend(); ++it) {
+        for (int i = 0; i < it.value(); ++i)
+            JS_FreeValue(m_context, it.key());
+    }
+    m_evalResults.clear();
+    for (const auto &e : std::as_const(m_projectScriptValues))
+        JS_FreeValue(m_context, e.second);
+    m_projectScriptValues.clear();
+    for (const auto &e : std::as_const(m_baseProductScriptValues))
+        JS_FreeValue(m_context, e.second);
+    m_baseProductScriptValues.clear();
+    for (const auto &e : std::as_const(m_productArtifactsMapScriptValues))
+        JS_FreeValue(m_context, e.second);
+    m_productArtifactsMapScriptValues.clear();
+    for (const auto &e : std::as_const(m_moduleArtifactsMapScriptValues))
+        JS_FreeValue(m_context, e.second);
+    m_moduleArtifactsMapScriptValues.clear();
+    for (const auto &e : std::as_const(m_baseModuleScriptValues))
+        JS_FreeValue(m_context, e.second);
+    m_baseModuleScriptValues.clear();
+    for (auto it = m_artifactsScriptValues.cbegin(); it != m_artifactsScriptValues.cend(); ++it) {
+        it.key().first->setDeregister({});
+        JS_FreeValue(m_context, it.value());
     }
+    m_artifactsScriptValues.clear();
+}
 
-    m_currentDirPathStack.pop();
-    m_extensionSearchPathsStack.pop();
-    uninstallImportFunctions();
+void ScriptEngine::import(const FileContextBaseConstPtr &fileCtx, JSValue &targetObject,
+                          ObserveMode observeMode)
+{
+    Importer(*this, fileCtx, targetObject, observeMode).run();
 }
 
-void ScriptEngine::import(const JsImport &jsImport, QScriptValue &targetObject)
+void ScriptEngine::import(const JsImport &jsImport, JSValue &targetObject)
 {
-    QBS_ASSERT(targetObject.isObject(), return);
-    QBS_ASSERT(targetObject.engine() == this, return);
+    QBS_ASSERT(JS_IsObject(targetObject), return);
 
     if (debugJSImports)
         qDebug() << "[ENGINE] import into " << jsImport.scopeName;
 
-    QScriptValue jsImportValue = m_jsImportCache.value(jsImport);
-    if (jsImportValue.isValid()) {
+    JSValue jsImportValue = m_jsImportCache.value(jsImport);
+    if (JS_IsObject(jsImportValue)) {
         if (debugJSImports)
             qDebug() << "[ENGINE] " << jsImport.filePaths << " (cache hit)";
     } else {
         if (debugJSImports)
             qDebug() << "[ENGINE] " << jsImport.filePaths << " (cache miss)";
-        jsImportValue = newObject();
+
+        ScopedJsValue scopedImportValue(m_context, JS_NewObject(m_context));
         for (const QString &filePath : jsImport.filePaths)
-            importFile(filePath, jsImportValue);
+            importFile(filePath, scopedImportValue);
+        jsImportValue = scopedImportValue.release();
         m_jsImportCache.insert(jsImport, jsImportValue);
         std::vector<QString> &filePathsForScriptValue
-                = m_filePathsPerImport[jsImportValue.objectId()];
-        for (const QString &fp : jsImport.filePaths)
-            filePathsForScriptValue.push_back(fp);
+                = m_filePathsPerImport[jsObjectId(jsImportValue)];
+        transform(jsImport.filePaths, filePathsForScriptValue, [](const auto &fp) {
+            return fp; });
     }
 
-    QScriptValue sv = newObject();
-    sv.setPrototype(jsImportValue);
-    sv.setProperty(StringConstants::importScopeNamePropertyInternal(), jsImport.scopeName);
-    targetObject.setProperty(jsImport.scopeName, sv);
+    JSValue sv = JS_NewObjectProto(m_context, jsImportValue);
+    setJsProperty(m_context, sv, StringConstants::importScopeNamePropertyInternal(),
+                  jsImport.scopeName);
+    setJsProperty(m_context, targetObject, jsImport.scopeName, sv);
     if (m_observeMode == ObserveMode::Enabled)
         observeImport(jsImportValue);
 }
 
-void ScriptEngine::observeImport(QScriptValue &jsImport)
+void ScriptEngine::observeImport(JSValue &jsImport)
 {
-    if (!m_observer->addImportId(jsImport.objectId()))
+    if (!m_observer->addImportId(quintptr((JS_VALUE_GET_OBJ(jsImport)))))
         return;
-    QScriptValueIterator it(jsImport);
-    while (it.hasNext()) {
-        it.next();
-        if (it.flags() & QScriptValue::PropertyGetter)
-            continue;
-        QScriptValue property = it.value();
-        if (!property.isFunction())
-            continue;
-        setObservedProperty(jsImport, it.name(), property);
-    }
+    handleJsProperties(jsImport, [this, &jsImport](const JSAtom &name,
+                       const JSPropertyDescriptor &desc) {
+        if (!JS_IsFunction(m_context, desc.value))
+            return;
+        const char *const nameStr = JS_AtomToCString(m_context, name);
+        setObservedProperty(jsImport, QString::fromUtf8(nameStr, std::strlen(nameStr)), desc.value);
+        JS_FreeCString(m_context, nameStr);
+    });
 }
 
 void ScriptEngine::clearImportsCache()
 {
+    for (const auto &jsImport : std::as_const(m_jsImportCache))
+        JS_FreeValue(m_context, jsImport);
     m_jsImportCache.clear();
+    m_filePathsPerImport.clear();
+    m_observer->clearImportIds();
+}
+
+void ScriptEngine::registerEvaluator(Evaluator *evaluator)
+{
+    QBS_ASSERT(!m_evaluator, return);
+    m_evaluator = evaluator;
+}
+
+void ScriptEngine::unregisterEvaluator(const Evaluator *evaluator)
+{
+    QBS_ASSERT(m_evaluator == evaluator, return);
+    m_evaluator = nullptr;
 }
 
 void ScriptEngine::checkContext(const QString &operation,
@@ -240,7 +336,15 @@ void ScriptEngine::checkContext(const QString &operation,
             QBS_ASSERT(false, continue);
             break;
         }
-        m_logger.printWarning(ErrorInfo(warning, currentContext()->backtrace()));
+        if (!m_evalPositions.empty()) {
+            const JSValue exVal = JS_NewObject(m_context);
+            const auto &[file, line] = m_evalPositions.top();
+            build_backtrace(m_context, exVal, file.toUtf8().constData(), line, 0);
+            const JsException ex(m_context, exVal, {});
+            m_logger.printWarning(ErrorInfo(warning, ex.stackTrace()));
+        } else {
+            m_logger.printWarning(ErrorInfo(warning));
+        }
         return;
     }
 }
@@ -251,7 +355,7 @@ void ScriptEngine::addPropertyRequestedFromArtifact(const Artifact *artifact,
     m_propertiesRequestedFromArtifact[artifact->filePath()] << property;
 }
 
-void ScriptEngine::addImportRequestedInScript(qint64 importValueId)
+void ScriptEngine::addImportRequestedInScript(quintptr importValueId)
 {
     // Import list is assumed to be small, so let's not use a set.
     if (!contains(m_importsRequestedInScript, importValueId))
@@ -289,37 +393,21 @@ QVariant ScriptEngine::retrieveFromPropertyCache(const QString &moduleName,
     return m_propertyCache.value(PropertyCacheKey(moduleName, propertyName, propertyMap));
 }
 
-void ScriptEngine::defineProperty(QScriptValue &object, const QString &name,
-                                  const QScriptValue &descriptor)
-{
-    QScriptValue arguments = newArray();
-    arguments.setProperty(0, object);
-    arguments.setProperty(1, name);
-    arguments.setProperty(2, descriptor);
-    QScriptValue result = m_definePropertyFunction.call(QScriptValue(), arguments);
-    QBS_ASSERT(!hasErrorOrException(result), qDebug() << name << result.toString());
-}
-
-static QScriptValue js_observedGet(QScriptContext *context, QScriptEngine *,
-                                   ScriptPropertyObserver * const observer)
+static JSValue js_observedGet(JSContext *ctx, JSValueConst, int, JSValueConst *, int, JSValue *data)
 {
-    const QScriptValue data = context->callee().property(getterFuncHelperProperty());
-    const QScriptValue value = data.property(2);
-    observer->onPropertyRead(data.property(0), data.property(1).toVariant().toString(), value);
-    return value;
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    engine->observer()->onPropertyRead(data[0], getJsString(ctx, data[1]), data[2]);
+    return JS_DupValue(engine->context(), data[2]);
 }
 
-void ScriptEngine::setObservedProperty(QScriptValue &object, const QString &name,
-                                       const QScriptValue &value)
+void ScriptEngine::setObservedProperty(JSValue &object, const QString &name,
+                                       const JSValue &value)
 {
-    QScriptValue data = newArray();
-    data.setProperty(0, object);
-    data.setProperty(1, name);
-    data.setProperty(2, value);
-    QScriptValue getterFunc = newFunction(js_observedGet,
-                                          static_cast<ScriptPropertyObserver *>(m_observer.get()));
-    getterFunc.setProperty(getterFuncHelperProperty(), data);
-    object.setProperty(name, getterFunc, QScriptValue::PropertyGetter);
+    ScopedJsValue jsName(m_context, makeJsString(m_context, name));
+    JSValueList funcData{object, jsName, value};
+    JSValue getterFunc = JS_NewCFunctionData(m_context, &js_observedGet, 0, 0, 3, funcData.data());
+    const ScopedJsAtom nameAtom(m_context, name);
+    JS_DefinePropertyGetSet(m_context, object, nameAtom, getterFunc, JS_UNDEFINED, JS_PROP_HAS_GET | JS_PROP_ENUMERABLE);
     if (m_observer->unobserveMode() == UnobserveMode::Enabled)
         m_observedProperties.emplace_back(object, name, value);
 }
@@ -327,38 +415,16 @@ void ScriptEngine::setObservedProperty(QScriptValue &object, const QString &name
 void ScriptEngine::unobserveProperties()
 {
     for (auto &elem : m_observedProperties) {
-        QScriptValue &object = std::get<0>(elem);
+        JSValue &object = std::get<0>(elem);
         const QString &name = std::get<1>(elem);
-        const QScriptValue &value = std::get<2>(elem);
-        object.setProperty(name, QScriptValue(), QScriptValue::PropertyGetter);
-        object.setProperty(name, value, QScriptValue::PropertyFlags());
+        const JSValue &value = std::get<2>(elem);
+        const ScopedJsAtom jsName(m_context, name);
+        JS_DefineProperty(m_context, object, jsName, value, JS_UNDEFINED, JS_UNDEFINED,
+                          JS_PROP_HAS_VALUE);
     }
     m_observedProperties.clear();
 }
 
-static QScriptValue js_deprecatedGet(QScriptContext *context, QScriptEngine *qtengine)
-{
-    const auto engine = static_cast<const ScriptEngine *>(qtengine);
-    const QScriptValue data = context->callee().property(getterFuncHelperProperty());
-    engine->logger().qbsWarning()
-            << ScriptEngine::tr("Property %1 is deprecated. Please use %2 instead.").arg(
-                   data.property(0).toString(), data.property(1).toString());
-    return data.property(2);
-}
-
-void ScriptEngine::setDeprecatedProperty(QScriptValue &object, const QString &oldName,
-        const QString &newName, const QScriptValue &value)
-{
-    QScriptValue data = newArray();
-    data.setProperty(0, oldName);
-    data.setProperty(1, newName);
-    data.setProperty(2, value);
-    QScriptValue getterFunc = newFunction(js_deprecatedGet);
-    getterFunc.setProperty(getterFuncHelperProperty(), data);
-    object.setProperty(oldName, getterFunc, QScriptValue::PropertyGetter
-                       | QScriptValue::SkipInEnumeration);
-}
-
 QProcessEnvironment ScriptEngine::environment() const
 {
     return m_environment;
@@ -369,17 +435,17 @@ void ScriptEngine::setEnvironment(const QProcessEnvironment &env)
     m_environment = env;
 }
 
-void ScriptEngine::importFile(const QString &filePath, QScriptValue &targetObject)
+void ScriptEngine::importFile(const QString &filePath, JSValue targetObject)
 {
     AccumulatingTimer importTimer(m_elapsedTimeImporting != -1 ? &m_elapsedTimeImporting : nullptr);
-    QScriptValue &evaluationResult = m_jsFileCache[filePath];
-    if (evaluationResult.isValid()) {
-        ScriptImporter::copyProperties(evaluationResult, targetObject);
+    JSValue &evaluationResult = m_jsFileCache[filePath];
+    if (JS_IsObject(evaluationResult)) {
+        ScriptImporter::copyProperties(m_context, evaluationResult, targetObject);
         return;
     }
     QFile file(filePath);
     if (Q_UNLIKELY(!file.open(QFile::ReadOnly)))
-        throw ErrorInfo(tr("Cannot open '%1'.").arg(filePath));
+        throw ErrorInfo(Tr::tr("Cannot open '%1'.").arg(filePath));
     QTextStream stream(&file);
     setupDefaultCodec(stream);
     const QString sourceCode = stream.readAll();
@@ -392,7 +458,7 @@ void ScriptEngine::importFile(const QString &filePath, QScriptValue &targetObjec
 static QString findExtensionDir(const QStringList &searchPaths, const QString &extensionPath)
 {
     for (const QString &searchPath : searchPaths) {
-        const QString dirPath = searchPath + QStringLiteral("/imports/") + extensionPath;
+        QString dirPath = searchPath + QStringLiteral("/imports/") + extensionPath;
         QFileInfo fi(dirPath);
         if (fi.exists() && fi.isDir())
             return dirPath;
@@ -400,83 +466,160 @@ static QString findExtensionDir(const QStringList &searchPaths, const QString &e
     return {};
 }
 
-static QScriptValue mergeExtensionObjects(const QScriptValueList &lst)
+JSValue ScriptEngine::mergeExtensionObjects(const JSValueList &lst)
 {
-    QScriptValue result;
-    for (const QScriptValue &v : lst) {
-        if (!result.isValid()) {
+    JSValue result = JS_UNDEFINED;
+    for (const JSValue &v : lst) {
+        if (!JS_IsObject(result)) {
             result = v;
             continue;
         }
-        QScriptValueIterator svit(v);
-        while (svit.hasNext()) {
-            svit.next();
-            result.setProperty(svit.name(), svit.value());
-        }
+        ScriptImporter::copyProperties(m_context, v, result);
+        JS_FreeValue(m_context, v);
     }
     return result;
 }
 
-static QScriptValue loadInternalExtension(QScriptContext *context, ScriptEngine *engine,
-        const QString &uri)
+JSValue ScriptEngine::getInternalExtension(const char *name) const
 {
-    const QString name = uri.mid(4);  // remove the "qbs." part
-    QScriptValue extensionObj = JsExtensions::loadExtension(engine, name);
-    if (!extensionObj.isValid()) {
-        return context->throwError(ScriptEngine::tr("loadExtension: "
-                                                    "cannot load extension '%1'.").arg(uri));
-    }
-    return extensionObj;
+    const auto cached = m_internalExtensions.constFind(QLatin1String(name));
+    if (cached != m_internalExtensions.constEnd())
+        return JS_DupValue(m_context, cached.value());
+    return JS_UNDEFINED;
 }
 
-QScriptValue ScriptEngine::js_loadExtension(QScriptContext *context, QScriptEngine *qtengine)
+void ScriptEngine::addInternalExtension(const char *name, JSValue ext)
 {
-    if (context->argumentCount() < 1) {
-        return context->throwError(
-                    ScriptEngine::tr("The loadExtension function requires "
-                                     "an extension name."));
+    m_internalExtensions.insert(QLatin1String(name), JS_DupValue(m_context, ext));
+}
+
+JSValue ScriptEngine::asJsValue(const QVariant &v, quintptr id, bool frozen)
+{
+    if (v.isNull())
+        return JS_UNDEFINED;
+    switch (static_cast<QMetaType::Type>(v.userType())) {
+    case QMetaType::QByteArray:
+        return asJsValue(v.toByteArray());
+    case QMetaType::QString:
+        return asJsValue(v.toString());
+    case QMetaType::QStringList:
+        return asJsValue(v.toStringList());
+    case QMetaType::QVariantList:
+        return asJsValue(v.toList(), id, frozen);
+    case QMetaType::Int:
+    case QMetaType::UInt:
+        return JS_NewInt32(m_context, v.toInt());
+    case QMetaType::Long:
+    case QMetaType::ULong:
+    case QMetaType::LongLong:
+    case QMetaType::ULongLong:
+        return JS_NewInt64(m_context, v.toInt());
+    case QMetaType::Bool:
+        return JS_NewBool(m_context, v.toBool());
+    case QMetaType::QDateTime:
+        return JS_NewDate(m_context, v.toDateTime().toMSecsSinceEpoch());
+    case QMetaType::QVariantMap:
+        return asJsValue(v.toMap(), id, frozen);
+    default:
+        return JS_UNDEFINED;
     }
+}
+
+JSValue ScriptEngine::asJsValue(const QByteArray &s)
+{
+    return JS_NewArrayBufferCopy(
+        m_context, reinterpret_cast<const uint8_t *>(s.constData()), s.size());
+}
 
-    const auto engine = static_cast<const ScriptEngine *>(qtengine);
-    ErrorInfo deprWarning(Tr::tr("The loadExtension() function is deprecated and will be "
-                                 "removed in a future version of Qbs. Use require() "
-                                 "instead."), context->backtrace());
-    engine->logger().printWarning(deprWarning);
+JSValue ScriptEngine::asJsValue(const QString &s)
+{
+    const auto it = m_stringCache.constFind(s);
+    if (it != m_stringCache.constEnd())
+        return JS_DupValue(m_context, it.value());
+    const JSValue sv = JS_NewString(m_context, s.toUtf8().constData());
+    m_stringCache.insert(s, sv);
+    return JS_DupValue(m_context, sv);
+}
 
-    return js_require(context, qtengine);
+JSValue ScriptEngine::asJsValue(const QStringList &l)
+{
+    JSValue array = JS_NewArray(m_context);
+    setJsProperty(m_context, array, QLatin1String("length"), JS_NewInt32(m_context, l.size()));
+    for (int i = 0; i < l.size(); ++i)
+        JS_SetPropertyUint32(m_context, array, i, asJsValue(l.at(i)));
+    return array;
 }
 
-QScriptValue ScriptEngine::js_loadFile(QScriptContext *context, QScriptEngine *qtengine)
+JSValue ScriptEngine::asJsValue(const QVariantMap &m, quintptr id, bool frozen)
 {
-    if (context->argumentCount() < 1) {
-        return context->throwError(
-                    ScriptEngine::tr("The loadFile function requires a file path."));
-    }
+    const auto it = id ? m_jsValueCache.constFind(id) : m_jsValueCache.constEnd();
+    if (it != m_jsValueCache.constEnd())
+        return JS_DupValue(m_context, it.value());
+    frozen = id || frozen;
+    JSValue obj = JS_NewObject(m_context);
+    for (auto it = m.begin(); it != m.end(); ++it)
+        setJsProperty(m_context, obj, it.key(), asJsValue(it.value(), 0, frozen));
+    if (frozen)
+        JS_ObjectSeal(m_context, obj, true);
+    if (!id)
+        return obj;
+    m_jsValueCache[id] = obj;
+    return JS_DupValue(m_context, obj);
+}
 
-    const auto engine = static_cast<const ScriptEngine *>(qtengine);
-    ErrorInfo deprWarning(Tr::tr("The loadFile() function is deprecated and will be "
-                                 "removed in a future version of Qbs. Use require() "
-                                 "instead."), context->backtrace());
-    engine->logger().printWarning(deprWarning);
+void ScriptEngine::setPropertyOnGlobalObject(const QString &property, JSValue value)
+{
+    const ScopedJsValue globalObject(m_context, JS_GetGlobalObject(m_context));
+    setJsProperty(m_context, globalObject, property, value);
+}
 
-    return js_require(context, qtengine);
+JSValue ScriptEngine::asJsValue(const QVariantList &l, quintptr id, bool frozen)
+{
+    const auto it = id ? m_jsValueCache.constFind(id) : m_jsValueCache.constEnd();
+    if (it != m_jsValueCache.constEnd())
+        return JS_DupValue(m_context, it.value());
+    frozen = id || frozen;
+    JSValue array = JS_NewArray(m_context);
+    setJsProperty(m_context, array, QLatin1String("length"), JS_NewInt32(m_context, l.size()));
+    for (int i = 0; i < l.size(); ++i)
+        JS_SetPropertyUint32(m_context, array, i, asJsValue(l.at(i), 0, frozen));
+    if (frozen)
+        JS_ObjectSeal(m_context, array, true);
+    if (!id)
+        return array;
+    m_jsValueCache[id] = array;
+    return JS_DupValue(m_context, array);
 }
 
-QScriptValue ScriptEngine::js_require(QScriptContext *context, QScriptEngine *qtengine)
+JSValue ScriptEngine::loadInternalExtension(const QString &uri)
 {
-    const auto engine = static_cast<ScriptEngine *>(qtengine);
-    if (context->argumentCount() < 1) {
-        return context->throwError(
-                    ScriptEngine::tr("The require function requires a module name or path."));
-    }
+    const QString name = uri.mid(4);  // remove the "qbs." part
+    const auto cached = m_internalExtensions.constFind(name);
+    if (cached != m_internalExtensions.constEnd())
+        return cached.value();
+    JSValue extensionObj = JsExtensions::loadExtension(this, name);
+    if (!JS_IsObject(extensionObj))
+        return throwError(Tr::tr("loadExtension: cannot load extension '%1'.").arg(uri));
+    m_internalExtensions.insert(name, extensionObj);
+    return extensionObj;
+}
+
+JSValue ScriptEngine::js_require(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int, JSValue *func_data)
+{
+    Q_UNUSED(this_val)
 
-    const QString moduleName = context->argument(0).toString();
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    QBS_ASSERT(engine, return JS_EXCEPTION);
+    if (argc < 1)
+        return engine->throwError(Tr::tr("The require function requires a module name or path."));
+
+    const QString moduleName = getJsString(ctx, argv[0]);
 
     // First try to load a named module if the argument doesn't look like a file path
     if (!moduleName.contains(QLatin1Char('/'))) {
         if (engine->m_extensionSearchPathsStack.empty())
-            return context->throwError(
-                        ScriptEngine::tr("require: internal error. No search paths."));
+            return engine->throwError(Tr::tr("require: internal error. No search paths."));
 
         if (engine->m_logger.debugEnabled()) {
             engine->m_logger.qbsDebug()
@@ -489,11 +632,11 @@ QScriptValue ScriptEngine::js_require(QScriptContext *context, QScriptEngine *qt
         const QString dirPath = findExtensionDir(searchPaths, moduleNameAsPath);
         if (dirPath.isEmpty()) {
             if (moduleName.startsWith(QStringLiteral("qbs.")))
-                return loadInternalExtension(context, engine, moduleName);
+                return JS_DupValue(ctx, engine->loadInternalExtension(moduleName));
         } else {
             QDirIterator dit(dirPath, StringConstants::jsFileWildcards(),
                              QDir::Files | QDir::Readable);
-            QScriptValueList values;
+            JSValueList values;
             std::vector<QString> filePaths;
             try {
                 while (dit.hasNext()) {
@@ -502,19 +645,19 @@ QScriptValue ScriptEngine::js_require(QScriptContext *context, QScriptEngine *qt
                         engine->m_logger.qbsDebug()
                                 << "[require] importing file " << filePath;
                     }
-                    QScriptValue obj = engine->newObject();
+                    ScopedJsValue obj(engine->context(), engine->newObject());
                     engine->importFile(filePath, obj);
-                    values << obj;
+                    values << obj.release();
                     filePaths.push_back(filePath);
                 }
             } catch (const ErrorInfo &e) {
-                return context->throwError(e.toString());
+                return engine->throwError(e.toString());
             }
 
             if (!values.empty()) {
-                const QScriptValue mergedValue = mergeExtensionObjects(values);
+                const JSValue mergedValue = engine->mergeExtensionObjects(values);
                 engine->m_requireResults.push_back(mergedValue);
-                engine->m_filePathsPerImport[mergedValue.objectId()] = filePaths;
+                engine->m_filePathsPerImport[jsObjectId(mergedValue)] = filePaths;
                 return mergedValue;
             }
         }
@@ -523,52 +666,88 @@ QScriptValue ScriptEngine::js_require(QScriptContext *context, QScriptEngine *qt
         // file located in the current directory search path; try that next
     }
 
-    if (engine->m_currentDirPathStack.empty()) {
-        return context->throwError(
-            ScriptEngine::tr("require: internal error. No current directory."));
-    }
+    if (engine->m_currentDirPathStack.empty())
+        return engine->throwError(Tr::tr("require: internal error. No current directory."));
 
-    QScriptValue result;
+    JSValue result;
     try {
         const QString filePath = FileInfo::resolvePath(engine->m_currentDirPathStack.top(),
                                                        moduleName);
-        result = engine->newObject();
-        engine->importFile(filePath, result);
         static const QString scopeNamePrefix = QStringLiteral("_qbs_scope_");
         const QString scopeName = scopeNamePrefix + QString::number(qHash(filePath), 16);
-        result.setProperty(StringConstants::importScopeNamePropertyInternal(), scopeName);
-        context->thisObject().setProperty(scopeName, result);
+        result = getJsProperty(ctx, func_data[0], scopeName);
+        if (JS_IsObject(result))
+            return result; // Same JS file imported from same qbs file via different JS files (e.g. codesign.js from DarwinGCC.qbs via gcc.js and darwin.js).
+        ScopedJsValue scopedResult(engine->context(), engine->newObject());
+        engine->importFile(filePath, scopedResult);
+        result = scopedResult.release();
+        setJsProperty(ctx, result, StringConstants::importScopeNamePropertyInternal(), scopeName);
+        setJsProperty(ctx, func_data[0], scopeName, result);
         engine->m_requireResults.push_back(result);
-        engine->m_filePathsPerImport[result.objectId()] = { filePath };
+        engine->m_filePathsPerImport[jsObjectId(JS_DupValue(ctx, result))] = { filePath };
     } catch (const ErrorInfo &e) {
-        result = context->throwError(e.toString());
+        result = engine->throwError(e.toString());
     }
 
     return result;
 }
 
-QScriptClass *ScriptEngine::modulePropertyScriptClass() const
+JSClassID ScriptEngine::modulePropertyScriptClass() const
 {
     return m_modulePropertyScriptClass;
 }
 
-void ScriptEngine::setModulePropertyScriptClass(QScriptClass *modulePropertyScriptClass)
+void ScriptEngine::setModulePropertyScriptClass(JSClassID modulePropertyScriptClass)
 {
     m_modulePropertyScriptClass = modulePropertyScriptClass;
 }
 
-void ScriptEngine::addResourceAcquiringScriptObject(ResourceAcquiringScriptObject *obj)
+template<typename T> JSValue getScriptValue(JSContext *ctx, const T *t,
+                                            const std::unordered_map<const T *, JSValue> &map)
 {
-    m_resourceAcquiringScriptObjects.push_back(obj);
+    const auto it = map.find(t);
+    return it == map.end() ? JS_UNDEFINED : JS_DupValue(ctx, it->second);
 }
 
-void ScriptEngine::releaseResourcesOfScriptObjects()
+template<typename T> void setScriptValue(JSContext *ctx, const T *t, JSValue value,
+                                         std::unordered_map<const T *, JSValue> &map)
 {
-    if (m_resourceAcquiringScriptObjects.empty())
+    value = JS_DupValue(ctx, value);
+    const auto it = map.find(t);
+    if (it == map.end()) {
+        map.insert(std::make_pair(t, value));
         return;
-    std::for_each(m_resourceAcquiringScriptObjects.begin(), m_resourceAcquiringScriptObjects.end(),
-                  std::mem_fn(&ResourceAcquiringScriptObject::releaseResources));
-    m_resourceAcquiringScriptObjects.clear();
+    }
+    JS_FreeValue(ctx, it->second);
+    it->second = value;
+}
+
+JSValue ScriptEngine::artifactsMapScriptValue(const ResolvedProduct *product)
+{
+    return getScriptValue(m_context, product, m_productArtifactsMapScriptValues);
+}
+
+void ScriptEngine::setArtifactsMapScriptValue(const ResolvedProduct *product, JSValue value)
+{
+    setScriptValue(m_context, product, value, m_productArtifactsMapScriptValues);
+}
+
+JSValue ScriptEngine::artifactsMapScriptValue(const ResolvedModule *module)
+{
+    return getScriptValue(m_context, module, m_moduleArtifactsMapScriptValues);
+}
+
+void ScriptEngine::setArtifactsMapScriptValue(const ResolvedModule *module, JSValue value)
+{
+    setScriptValue(m_context, module, value, m_moduleArtifactsMapScriptValues);
+}
+
+JSValue ScriptEngine::getArtifactProperty(JSValue obj,
+                                          const std::function<JSValue (const Artifact *)> &propGetter)
+{
+    std::lock_guard lock(m_artifactsMutex);
+    const Artifact * const a = attachedPointer<Artifact>(obj, dataWithPtrClass());
+    return a ? propGetter(a) : JS_EXCEPTION;
 }
 
 void ScriptEngine::addCanonicalFilePathResult(const QString &filePath,
@@ -615,49 +794,100 @@ Set<QString> ScriptEngine::imports() const
     return filePaths;
 }
 
-QScriptValueList ScriptEngine::argumentList(const QStringList &argumentNames,
-        const QScriptValue &context)
+JSValue ScriptEngine::newObject() const
 {
-    QScriptValueList result;
-    for (const auto &name : argumentNames)
-        result += context.property(name);
-    return result;
+    return JS_NewObject(m_context);
 }
 
-CodeLocation ScriptEngine::lastErrorLocation(const QScriptValue &v,
-                                             const CodeLocation &fallbackLocation) const
+JSValue ScriptEngine::newArray(int length, JsValueOwner owner)
 {
-    const QScriptValue &errorVal = lastErrorValue(v);
-    const CodeLocation errorLoc(errorVal.property(StringConstants::fileNameProperty()).toString(),
-            errorVal.property(QStringLiteral("lineNumber")).toInt32(),
-            errorVal.property(QStringLiteral("expressionCaretOffset")).toInt32(),
-            false);
-    return errorLoc.isValid() ? errorLoc : fallbackLocation;
+    JSValue arr = JS_NewArray(m_context);
+    JS_SetPropertyStr(m_context, arr, "length", JS_NewInt32(m_context, length));
+    if (owner == JsValueOwner::ScriptEngine)
+        ++m_evalResults[arr];
+    return arr;
 }
 
-ErrorInfo ScriptEngine::lastError(const QScriptValue &v, const CodeLocation &fallbackLocation) const
+JSValue ScriptEngine::evaluate(JsValueOwner resultOwner, const QString &code,
+                               const QString &filePath, int line, const JSValueList &scopeChain)
 {
-    const QString msg = lastErrorString(v);
-    CodeLocation errorLocation = lastErrorLocation(v);
-    if (errorLocation.isValid())
-        return ErrorInfo(msg, errorLocation);
-    const QStringList backtrace = uncaughtExceptionBacktraceOrEmpty();
-    if (!backtrace.empty()) {
-        ErrorInfo e(msg, backtrace);
-        if (e.hasLocation())
-            return e;
+    m_scopeChains.emplace_back(scopeChain);
+    const QByteArray &codeStr = code.toUtf8();
+
+    m_evalPositions.emplace(filePath, line);
+    const JSValue v = JS_EvalThis(m_context, globalObject(), codeStr.constData(), codeStr.length(),
+                                  filePath.toUtf8().constData(), line, JS_EVAL_TYPE_GLOBAL);
+    m_evalPositions.pop();
+    m_scopeChains.pop_back();
+    if (resultOwner == JsValueOwner::ScriptEngine && JS_VALUE_HAS_REF_COUNT(v))
+        ++m_evalResults[v];
+    return v;
+}
+
+void ScriptEngine::handleJsProperties(JSValue obj, const PropertyHandler &handler)
+{
+    qbs::Internal::handleJsProperties(m_context, obj, handler);
+}
+
+ScopedJsValueList ScriptEngine::argumentList(const QStringList &argumentNames,
+                                             const JSValue &context) const
+{
+    JSValueList result;
+    for (const auto &name : argumentNames)
+        result.push_back(getJsProperty(m_context, context, name));
+    return {m_context, result};
+}
+
+JSClassID ScriptEngine::registerClass(const char *name, JSClassCall *constructor,
+                                      JSClassFinalizer *finalizer, JSValue scope,
+                                      GetPropertyNames getPropertyNames, GetProperty getProperty)
+{
+    JSClassID id = 0;
+    const auto classIt = m_classes.constFind(QLatin1String(name));
+    if (classIt == m_classes.constEnd()) {
+        JS_NewClassID(&id);
+        const auto it = getProperty
+                ? m_exoticMethods.insert(id, JSClassExoticMethods{getProperty, getPropertyNames})
+                : m_exoticMethods.end();
+        JSClassDef jsClass{name, finalizer, nullptr, constructor,
+                    it != m_exoticMethods.end() ? &it.value() : nullptr};
+        const int status = JS_NewClass(m_jsRuntime, id, &jsClass);
+        QBS_ASSERT(status == 0, return 0);
+                       m_classes.insert(QLatin1String(name), id);
+    } else {
+        id = classIt.value();
     }
-    return ErrorInfo(msg, fallbackLocation);
+    if (!JS_IsUndefined(scope)) {
+        const JSValue classObj = JS_NewObjectClass(m_context, id);
+        JS_SetConstructorBit(m_context, classObj, constructor != nullptr);
+        JS_SetPropertyStr(m_context, scope, name, classObj);
+    }
+    return id;
+}
+
+JSClassID ScriptEngine::getClassId(const char *name) const
+{
+    return m_classes.value(QLatin1String(name));
+}
+
+JSValue ScriptEngine::throwError(const QString &message) const
+{
+    return qbs::Internal::throwError(m_context, message);
 }
 
 void ScriptEngine::cancel()
 {
-    QTimer::singleShot(0, this, [this] { abort(); });
+    m_canceling = true;
 }
 
-void ScriptEngine::abort()
+int ScriptEngine::interruptor(JSRuntime *, void *opaqueEngine)
 {
-    abortEvaluation(m_cancelationError);
+    const auto engine = reinterpret_cast<ScriptEngine *>(opaqueEngine);
+    if (engine->m_canceling) {
+        engine->m_canceling = false;
+        return 1;
+    }
+    return 0;
 }
 
 bool ScriptEngine::gatherFileResults() const
@@ -666,83 +896,105 @@ bool ScriptEngine::gatherFileResults() const
             || evalContext() == EvalContext::ProbeExecution;
 }
 
+void ScriptEngine::setMaxStackSize()
+{
+    size_t stackSize = 0; // Turn check off by default.
+    bool ok;
+    const int stackSizeFromEnv = qEnvironmentVariableIntValue("QBS_MAX_JS_STACK_SIZE", &ok);
+    if (ok && stackSizeFromEnv >= 0)
+        stackSize = stackSizeFromEnv;
+    JS_SetMaxStackSize(m_jsRuntime, stackSize);
+}
+
+JSValue ScriptEngine::getArtifactScriptValue(Artifact *a, const QString &moduleName,
+                                             const std::function<void(JSValue obj)> &setup)
+{
+    std::lock_guard lock(m_artifactsMutex);
+    const auto it = m_artifactsScriptValues.constFind(qMakePair(a, moduleName));
+    if (it != m_artifactsScriptValues.constEnd())
+        return JS_DupValue(m_context, *it);
+    a->setDeregister([this](const Artifact *a) {
+        const std::lock_guard lock(m_artifactsMutex);
+        for (auto it = m_artifactsScriptValues.begin(); it != m_artifactsScriptValues.end(); ) {
+            if (it.key().first == a) {
+                JS_SetOpaque(it.value(), nullptr);
+                JS_FreeValue(m_context, it.value());
+                it = m_artifactsScriptValues.erase(it);
+            } else {
+                ++it;
+            }
+        }
+    });
+    JSValue obj = JS_NewObjectClass(context(), dataWithPtrClass());
+    attachPointerTo(obj, a);
+    setup(obj);
+    m_artifactsScriptValues.insert(qMakePair(a, moduleName), JS_DupValue(m_context, obj));
+    return obj;
+}
+
+void ScriptEngine::releaseInputArtifactScriptValues(const RuleNode *ruleNode)
+{
+    for (auto it = m_artifactsScriptValues.begin(); it != m_artifactsScriptValues.end();) {
+        Artifact * const a = it.key().first;
+        if (ruleNode->children.contains(a)) {
+            a->setDeregister({});
+            JS_FreeValue(m_context, it.value());
+            it = m_artifactsScriptValues.erase(it);
+        } else {
+            ++it;
+        }
+    }
+}
+
 class JSTypeExtender
 {
 public:
-    JSTypeExtender(ScriptEngine *engine, const QString &typeName)
-        : m_engine(engine)
+    JSTypeExtender(ScriptEngine *engine, const QString &typeName) : m_engine(engine)
     {
-        m_proto = engine->globalObject().property(typeName)
-                .property(QStringLiteral("prototype"));
-        QBS_ASSERT(m_proto.isObject(), return);
-        m_descriptor = engine->newObject();
+        const ScopedJsValue globalObject(engine->context(), JS_GetGlobalObject(engine->context()));
+        const ScopedJsValue type(engine->context(), getJsProperty(engine->context(),
+                                                                  globalObject, typeName));
+        m_proto = getJsProperty(engine->context(), type, QStringLiteral("prototype"));
+        QBS_ASSERT(JS_IsObject(m_proto), return);
+    }
+
+    ~JSTypeExtender()
+    {
+        JS_FreeValue(m_engine->context(), m_proto);
     }
 
     void addFunction(const QString &name, const QString &code)
     {
-        QScriptValue f = m_engine->evaluate(code);
-        QBS_ASSERT(f.isFunction(), return);
-        m_descriptor.setProperty(QStringLiteral("value"), f);
-        m_engine->defineProperty(m_proto, name, m_descriptor);
+        const JSValue f = m_engine->evaluate(JsValueOwner::Caller, code);
+        QBS_ASSERT(JS_IsFunction(m_engine->context(), f), return);
+        JS_DefinePropertyValueStr(m_engine->context(), m_proto, name.toUtf8().constData(), f, 0);
     }
 
 private:
-    ScriptEngine *const m_engine;
-    QScriptValue m_proto;
-    QScriptValue m_descriptor;
+    ScriptEngine * const m_engine;
+    JSValue m_proto = JS_UNDEFINED;
 };
 
-static QScriptValue js_consoleError(QScriptContext *context, QScriptEngine *engine, Logger *logger)
-{
-    if (Q_UNLIKELY(context->argumentCount() != 1))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("console.error() expects 1 argument"));
-    logger->qbsLog(LoggerError) << context->argument(0).toString();
-    return engine->undefinedValue();
-}
-
-static QScriptValue js_consoleWarn(QScriptContext *context, QScriptEngine *engine, Logger *logger)
-{
-    if (Q_UNLIKELY(context->argumentCount() != 1))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("console.warn() expects 1 argument"));
-    logger->qbsWarning() << context->argument(0).toString();
-    return engine->undefinedValue();
-}
-
-static QScriptValue js_consoleInfo(QScriptContext *context, QScriptEngine *engine, Logger *logger)
+static JSValue js_consoleFunc(JSContext *ctx, JSValueConst, int argc, JSValueConst *argv,
+                              int level)
 {
-    if (Q_UNLIKELY(context->argumentCount() != 1))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("console.info() expects 1 argument"));
-    logger->qbsInfo() << context->argument(0).toString();
+    ScriptEngine * const engine = ScriptEngine::engineForContext(ctx);
+    QBS_ASSERT(engine, return JS_EXCEPTION);
+    if (Q_UNLIKELY(argc != 1))
+        return engine->throwError(Tr::tr("The console functions expect 1 argument."));
+    engine->logger().qbsLog(static_cast<LoggerLevel>(level)) << getJsString(ctx, argv[0]);
     return engine->undefinedValue();
 }
 
-static QScriptValue js_consoleDebug(QScriptContext *context, QScriptEngine *engine, Logger *logger)
-{
-    if (Q_UNLIKELY(context->argumentCount() != 1))
-        return context->throwError(QScriptContext::SyntaxError,
-                                   QStringLiteral("console.debug() expects 1 argument"));
-    logger->qbsDebug() << context->argument(0).toString();
-    return engine->undefinedValue();
-}
-
-static QScriptValue js_consoleLog(QScriptContext *context, QScriptEngine *engine, Logger *logger)
-{
-    return js_consoleDebug(context, engine, logger);
-}
-
 void ScriptEngine::installQbsBuiltins()
 {
-    globalObject().setProperty(StringConstants::qbsModule(), m_qbsObject = newObject());
-
-    globalObject().setProperty(QStringLiteral("console"), m_consoleObject = newObject());
-    installConsoleFunction(QStringLiteral("debug"), &js_consoleDebug);
-    installConsoleFunction(QStringLiteral("error"), &js_consoleError);
-    installConsoleFunction(QStringLiteral("info"), &js_consoleInfo);
-    installConsoleFunction(QStringLiteral("log"), &js_consoleLog);
-    installConsoleFunction(QStringLiteral("warn"), &js_consoleWarn);
+    const JSValue consoleObj = newObject();
+    setPropertyOnGlobalObject(QLatin1String("console"), consoleObj);
+    installConsoleFunction(consoleObj, QStringLiteral("debug"), LoggerDebug);
+    installConsoleFunction(consoleObj, QStringLiteral("error"), LoggerError);
+    installConsoleFunction(consoleObj, QStringLiteral("info"), LoggerInfo);
+    installConsoleFunction(consoleObj, QStringLiteral("log"), LoggerDebug);
+    installConsoleFunction(consoleObj, QStringLiteral("warn"), LoggerWarning);
 }
 
 void ScriptEngine::extendJavaScriptBuiltins()
@@ -772,48 +1024,27 @@ void ScriptEngine::extendJavaScriptBuiltins()
     JSTypeExtender stringExtender(this, QStringLiteral("String"));
     stringExtender.addFunction(QStringLiteral("contains"),
         QStringLiteral("(function(e){return this.indexOf(e) !== -1;})"));
-    stringExtender.addFunction(QStringLiteral("startsWith"),
-        QStringLiteral("(function(e){return this.slice(0, e.length) === e;})"));
-    stringExtender.addFunction(QStringLiteral("endsWith"),
-                               QStringLiteral("(function(e){return this.slice(-e.length) === e;})"));
-}
-
-void ScriptEngine::installFunction(const QString &name, int length, QScriptValue *functionValue,
-        FunctionSignature f, QScriptValue *targetObject = nullptr)
-{
-    if (!functionValue->isValid())
-        *functionValue = newFunction(f, length);
-    (targetObject ? *targetObject : globalObject()).setProperty(name, *functionValue);
 }
 
-void ScriptEngine::installQbsFunction(const QString &name, int length, FunctionSignature f)
+void ScriptEngine::installConsoleFunction(JSValue consoleObj, const QString &name,
+                                          LoggerLevel level)
 {
-    QScriptValue functionValue;
-    installFunction(name, length, &functionValue, f, &m_qbsObject);
+    JS_SetPropertyStr(m_context, consoleObj, name.toUtf8().constData(),
+            JS_NewCFunctionMagic(m_context, js_consoleFunc, name.toUtf8().constData(), 1,
+                                 JS_CFUNC_generic_magic, level));
 }
 
-void ScriptEngine::installConsoleFunction(const QString &name,
-        QScriptValue (*f)(QScriptContext *, QScriptEngine *, Logger *))
-{
-    m_consoleObject.setProperty(name, newFunction(f, &m_logger));
-}
-
-static QString loadFileString() { return QStringLiteral("loadFile"); }
-static QString loadExtensionString() { return QStringLiteral("loadExtension"); }
 static QString requireString() { return QStringLiteral("require"); }
 
-void ScriptEngine::installImportFunctions()
+void ScriptEngine::installImportFunctions(JSValue importScope)
 {
-    installFunction(loadFileString(), 1, &m_loadFileFunction, js_loadFile);
-    installFunction(loadExtensionString(), 1, &m_loadExtensionFunction, js_loadExtension);
-    installFunction(requireString(), 1, &m_requireFunction, js_require);
+    const JSValue require = JS_NewCFunctionData(m_context, js_require, 1, 0, 1, &importScope);
+    setPropertyOnGlobalObject(requireString(), require);
 }
 
 void ScriptEngine::uninstallImportFunctions()
 {
-    globalObject().setProperty(loadFileString(), QScriptValue());
-    globalObject().setProperty(loadExtensionString(), QScriptValue());
-    globalObject().setProperty(requireString(), QScriptValue());
+    setPropertyOnGlobalObject(requireString(), JS_UNDEFINED);
 }
 
 ScriptEngine::PropertyCacheKey::PropertyCacheKey(QString moduleName,
@@ -824,5 +1055,54 @@ ScriptEngine::PropertyCacheKey::PropertyCacheKey(QString moduleName,
 {
 }
 
+JsException ScriptEngine::checkAndClearException(const CodeLocation &fallbackLocation) const
+{
+    return {m_context, JS_GetException(m_context), fallbackLocation};
+}
+
+void ScriptEngine::clearRequestedProperties()
+{
+    m_propertiesRequestedInScript.clear();
+    m_propertiesRequestedFromArtifact.clear();
+    m_importsRequestedInScript.clear();
+    m_productsWithRequestedDependencies.clear();
+    m_requestedArtifacts.clear();
+    m_requestedExports.clear();
+};
+
+void ScriptEngine::takeOwnership(JSValue v)
+{
+    ++m_evalResults[v];
+}
+
+ScriptEngine::Importer::Importer(
+            ScriptEngine &engine, const FileContextBaseConstPtr &fileCtx, JSValue &targetObject,
+            ObserveMode observeMode)
+    : m_engine(engine), m_fileCtx(fileCtx), m_targetObject(targetObject)
+{
+    m_engine.installImportFunctions(targetObject);
+    m_engine.m_currentDirPathStack.push(FileInfo::path(fileCtx->filePath()));
+    m_engine.m_extensionSearchPathsStack.push(fileCtx->searchPaths());
+    m_engine.m_observeMode = observeMode;
+}
+
+ScriptEngine::Importer::~Importer()
+{
+    m_engine.m_requireResults.clear();
+    m_engine.m_currentDirPathStack.pop();
+    m_engine.m_extensionSearchPathsStack.pop();
+    m_engine.uninstallImportFunctions();
+}
+
+void ScriptEngine::Importer::run()
+{
+    for (const JsImport &jsImport : m_fileCtx->jsImports())
+        m_engine.import(jsImport, m_targetObject);
+    if (m_engine.m_observeMode == ObserveMode::Enabled) {
+        for (JSValue &sv : m_engine.m_requireResults)
+            m_engine.observeImport(sv);
+    }
+}
+
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/language/scriptengine.h b/src/lib/corelib/language/scriptengine.h
index 2c8aca241..8efa2d482 100644
--- a/src/lib/corelib/language/scriptengine.h
+++ b/src/lib/corelib/language/scriptengine.h
@@ -45,8 +45,11 @@
 #include <buildgraph/requestedartifacts.h>
 #include <buildgraph/requesteddependencies.h>
 #include <logging/logger.h>
+#include <quickjs.h>
 #include <tools/codelocation.h>
 #include <tools/filetime.h>
+#include <tools/porting.h>
+#include <tools/scripttools.h>
 #include <tools/set.h>
 
 #include <QtCore/qdir.h>
@@ -55,8 +58,8 @@
 #include <QtCore/qprocess.h>
 #include <QtCore/qstring.h>
 
-#include <QtScript/qscriptengine.h>
-
+#include <atomic>
+#include <functional>
 #include <memory>
 #include <mutex>
 #include <stack>
@@ -67,8 +70,10 @@
 namespace qbs {
 namespace Internal {
 class Artifact;
+class Evaluator;
 class JsImport;
 class PrepareScriptObserver;
+class RuleNode;
 class ScriptImporter;
 class ScriptPropertyObserver;
 
@@ -85,35 +90,33 @@ public:
 };
 using DubiousContextList = std::vector<DubiousContext>;
 
-
-/*
- * ScriptObject that acquires resources, for example a file handle.
- * The ScriptObject should have QtOwnership and deleteLater() itself in releaseResources.
- */
-class ResourceAcquiringScriptObject
-{
-public:
-    virtual ~ResourceAcquiringScriptObject() = default;
-    virtual void releaseResources() = 0;
-};
+enum class JsValueOwner { Caller, ScriptEngine }; // TODO: This smells like cheating. Should always be Caller.
 
 enum class ObserveMode { Enabled, Disabled };
 
-class QBS_AUTOTEST_EXPORT ScriptEngine : public QScriptEngine
+class QBS_AUTOTEST_EXPORT ScriptEngine
 {
-    Q_OBJECT
     struct PrivateTag {};
 public:
     ScriptEngine(Logger &logger, EvalContext evalContext, PrivateTag);
-    ~ScriptEngine() override;
+    ~ScriptEngine();
 
     static std::unique_ptr<ScriptEngine> create(Logger &logger, EvalContext evalContext);
+    static ScriptEngine *engineForRuntime(const JSRuntime *runtime);
+    static ScriptEngine *engineForContext(const JSContext *ctx);
+    static LookupResult doExtraScopeLookup(JSContext *ctx, JSAtom prop);
+
+    void reset();
 
     Logger &logger() const { return m_logger; }
-    void import(const FileContextBaseConstPtr &fileCtx, QScriptValue &targetObject,
+    void import(const FileContextBaseConstPtr &fileCtx, JSValue &targetObject,
                 ObserveMode observeMode);
     void clearImportsCache();
 
+    void registerEvaluator(Evaluator *evaluator);
+    void unregisterEvaluator(const Evaluator *evaluator);
+    Evaluator *evaluator() const { return m_evaluator; }
+
     void setEvalContext(EvalContext c) { m_evalContext = c; }
     EvalContext evalContext() const { return m_evalContext; }
     void checkContext(const QString &operation, const DubiousContextList &dubiousContexts);
@@ -143,14 +146,7 @@ public:
     }
     void addPropertyRequestedFromArtifact(const Artifact *artifact, const Property &property);
     void addRequestedExport(const ResolvedProduct *product) { m_requestedExports.insert(product); }
-    void clearRequestedProperties() {
-        m_propertiesRequestedInScript.clear();
-        m_propertiesRequestedFromArtifact.clear();
-        m_importsRequestedInScript.clear();
-        m_productsWithRequestedDependencies.clear();
-        m_requestedArtifacts.clear();
-        m_requestedExports.clear();
-    }
+    void clearRequestedProperties();
     PropertySet propertiesRequestedInScript() const { return m_propertiesRequestedInScript; }
     QHash<QString, PropertySet> propertiesRequestedFromArtifact() const {
         return m_propertiesRequestedFromArtifact;
@@ -166,9 +162,11 @@ public:
     RequestedArtifacts requestedArtifacts() const { return m_requestedArtifacts; }
     Set<const ResolvedProduct *> requestedExports() const { return m_requestedExports; }
 
-    void addImportRequestedInScript(qint64 importValueId);
+    void addImportRequestedInScript(quintptr importValueId);
     std::vector<QString> importedFilesUsedInScript() const;
 
+    void addExternallyCachedValue(JSValue *v) { m_externallyCachedValues.push_back(v); }
+
     void setUsesIo() { m_usesIo = true; }
     void clearUsesIo() { m_usesIo = false; }
     bool usesIo() const { return m_usesIo; }
@@ -182,11 +180,8 @@ public:
     QVariant retrieveFromPropertyCache(const QString &moduleName, const QString &propertyName,
                                        const PropertyMapConstPtr &propertyMap);
 
-    void defineProperty(QScriptValue &object, const QString &name, const QScriptValue &descriptor);
-    void setObservedProperty(QScriptValue &object, const QString &name, const QScriptValue &value);
+    void setObservedProperty(JSValue &object, const QString &name, const JSValue &value);
     void unobserveProperties();
-    void setDeprecatedProperty(QScriptValue &object, const QString &name, const QString &newName,
-            const QScriptValue &value);
     PrepareScriptObserver *observer() const { return m_observer.get(); }
 
     QProcessEnvironment environment() const;
@@ -205,23 +200,34 @@ public:
 
     QHash<QString, FileTime> fileLastModifiedResults() const { return m_fileLastModifiedResult; }
     Set<QString> imports() const;
-    static QScriptValueList argumentList(const QStringList &argumentNames,
-            const QScriptValue &context);
 
-    QStringList uncaughtExceptionBacktraceOrEmpty() const {
-        return hasUncaughtException() ? uncaughtExceptionBacktrace() : QStringList();
-    }
-    bool hasErrorOrException(const QScriptValue &v) const {
-        return v.isError() || hasUncaughtException();
-    }
-    QScriptValue lastErrorValue(const QScriptValue &v) const {
-        return v.isError() ? v : uncaughtException();
-    }
-    QString lastErrorString(const QScriptValue &v) const { return lastErrorValue(v).toString(); }
-    CodeLocation lastErrorLocation(const QScriptValue &v,
-                                   const CodeLocation &fallbackLocation = CodeLocation()) const;
-    ErrorInfo lastError(const QScriptValue &v,
-                        const CodeLocation &fallbackLocation = CodeLocation()) const;
+    JSValue newObject() const;
+    JSValue newArray(int length, JsValueOwner owner);
+    void takeOwnership(JSValue v);
+    JSValue undefinedValue() const { return JS_UNDEFINED; }
+    JSValue toScriptValue(const QVariant &v, quintptr id = 0) { return asJsValue(v, id); }
+    JSValue evaluate(JsValueOwner resultOwner, const QString &code,
+                     const QString &filePath = QString(), int line = 1,
+                     const JSValueList &scopeChain = {});
+    void setLastLookupStatus(bool success) { m_lastLookupWasSuccess = success; }
+    JSContext *context() const { return m_context; }
+    JSValue globalObject() const { return m_globalObject; }
+    void setGlobalObject(JSValue obj) { m_globalObject = obj; }
+    void handleJsProperties(JSValueConst obj, const  PropertyHandler &handler);
+    ScopedJsValueList argumentList(const QStringList &argumentNames, const JSValue &context) const;
+
+    using GetProperty = int (*)(JSContext *ctx, JSPropertyDescriptor *desc,
+                                JSValueConst obj, JSAtom prop);
+    using GetPropertyNames = int (*)(JSContext *ctx, JSPropertyEnum **ptab, uint32_t *plen,
+                                     JSValueConst obj);
+    JSClassID registerClass(const char *name, JSClassCall *constructor, JSClassFinalizer *finalizer,
+                            JSValue scope,
+                            GetPropertyNames getPropertyNames = nullptr,
+                            GetProperty getProperty = nullptr);
+    JSClassID getClassId(const char *name) const;
+
+    JsException checkAndClearException(const CodeLocation &fallbackLocation) const;
+    JSValue throwError(const QString &message) const;
 
     void cancel();
 
@@ -230,77 +236,100 @@ public:
     bool isActive() const { return m_active; }
     void setActive(bool on) { m_active = on; }
 
-    using QScriptEngine::newFunction;
-
-    template <typename T, typename E,
-              typename = std::enable_if_t<std::is_pointer_v<T>>,
-              typename = std::enable_if_t<std::is_pointer_v<E>>,
-              typename = std::enable_if_t<std::is_base_of_v<
-                QScriptEngine, std::remove_pointer_t<E>>>
-              > QScriptValue newFunction(QScriptValue (*signature)(QScriptContext *, E, T), T arg) {
-        return QScriptEngine::newFunction(
-                    reinterpret_cast<FunctionWithArgSignature>(signature),
-                    reinterpret_cast<void *>(const_cast<
-                                             std::add_pointer_t<
-                                             std::remove_const_t<
-                                             std::remove_pointer_t<T>>>>(arg)));
-    }
-
-    QScriptClass *modulePropertyScriptClass() const;
-    void setModulePropertyScriptClass(QScriptClass *modulePropertyScriptClass);
+    JSClassID modulePropertyScriptClass() const;
+    void setModulePropertyScriptClass(JSClassID modulePropertyScriptClass);
 
-    QScriptClass *productPropertyScriptClass() const { return m_productPropertyScriptClass; }
-    void setProductPropertyScriptClass(QScriptClass *productPropertyScriptClass)
+    JSClassID productPropertyScriptClass() const { return m_productPropertyScriptClass; }
+    void setProductPropertyScriptClass(JSClassID productPropertyScriptClass)
     {
         m_productPropertyScriptClass = productPropertyScriptClass;
     }
 
-    QScriptClass *artifactsScriptClass() const { return m_artifactsScriptClass; }
-    void setArtifactsScriptClass(QScriptClass *artifactsScriptClass)
+    JSClassID artifactsScriptClass(int index) const { return m_artifactsScriptClass[index]; }
+    void setArtifactsScriptClass(int index, JSClassID artifactsScriptClass)
     {
-        m_artifactsScriptClass = artifactsScriptClass;
+        m_artifactsScriptClass[index] = artifactsScriptClass;
     }
 
-    void addResourceAcquiringScriptObject(ResourceAcquiringScriptObject *obj);
-    void releaseResourcesOfScriptObjects();
+    JSValue artifactsMapScriptValue(const ResolvedProduct *product);
+    void setArtifactsMapScriptValue(const ResolvedProduct *product, JSValue value);
+    JSValue artifactsMapScriptValue(const ResolvedModule *module);
+    void setArtifactsMapScriptValue(const ResolvedModule *module, JSValue value);
+
+    JSValue getArtifactProperty(JSValue obj,
+                                const std::function<JSValue(const Artifact *)> &propGetter);
 
-    QScriptValue &productScriptValuePrototype(const ResolvedProduct *product)
+    JSValue& baseProductScriptValue(const ResolvedProduct *product)
     {
-        return m_productScriptValues[product];
+        return m_baseProductScriptValues[product];
     }
 
-    QScriptValue &projectScriptValue(const ResolvedProject *project)
+    JSValue &projectScriptValue(const ResolvedProject *project)
     {
         return m_projectScriptValues[project];
     }
 
-    QScriptValue &moduleScriptValuePrototype(const ResolvedModule *module)
+    JSValue &baseModuleScriptValue(const ResolvedModule *module)
     {
-        return m_moduleScriptValues[module];
+        return m_baseModuleScriptValues[module];
     }
 
+    JSValue getArtifactScriptValue(Artifact *a, const QString &moduleName,
+                                   const std::function<void(JSValue obj)> &setup);
+    void releaseInputArtifactScriptValues(const RuleNode *ruleNode);
+
+    const JSValueList &contextStack() const { return m_contextStack; }
+
+    JSClassID dataWithPtrClass() const { return m_dataWithPtrClass; }
+
+    JSValue getInternalExtension(const char *name) const;
+    void addInternalExtension(const char *name, JSValue ext);
+    JSValue asJsValue(const QVariant &v, quintptr id = 0, bool frozen = false);
+    JSValue asJsValue(const QByteArray &s);
+    JSValue asJsValue(const QString &s);
+    JSValue asJsValue(const QStringList &l);
+    JSValue asJsValue(const QVariantList &l, quintptr id = 0, bool frozen = false);
+    JSValue asJsValue(const QVariantMap &m, quintptr id = 0, bool frozen = false);
+
+    QVariant property(const char *name) const { return m_properties.value(QLatin1String(name)); }
+    void setProperty(const char *k, const QVariant &v) { m_properties.insert(QLatin1String(k), v); }
+
 private:
-    QScriptValue newFunction(FunctionWithArgSignature signature, void *arg) Q_DECL_EQ_DELETE;
+    class Importer {
+    public:
+        Importer(ScriptEngine &engine, const FileContextBaseConstPtr &fileCtx,
+                 JSValue &targetObject, ObserveMode observeMode);
+        ~Importer();
+        void run();
+
+    private:
+        ScriptEngine &m_engine;
+        const FileContextBaseConstPtr &m_fileCtx;
+        JSValue &m_targetObject;
+    };
 
-    void abort();
+    static int interruptor(JSRuntime *rt, void *opaqueEngine);
 
     bool gatherFileResults() const;
 
+    void setMaxStackSize();
+    void setPropertyOnGlobalObject(const QString &property, JSValue value);
     void installQbsBuiltins();
     void extendJavaScriptBuiltins();
-    void installFunction(const QString &name, int length, QScriptValue *functionValue,
-                         FunctionSignature f, QScriptValue *targetObject);
-    void installQbsFunction(const QString &name, int length, FunctionSignature f);
-    void installConsoleFunction(const QString &name,
-                                QScriptValue (*f)(QScriptContext *, QScriptEngine *, Logger *));
-    void installImportFunctions();
+    void installConsoleFunction(JSValue consoleObj, const QString &name, LoggerLevel level);
+    void installImportFunctions(JSValue importScope);
     void uninstallImportFunctions();
-    void import(const JsImport &jsImport, QScriptValue &targetObject);
-    void observeImport(QScriptValue &jsImport);
-    void importFile(const QString &filePath, QScriptValue &targetObject);
-    static QScriptValue js_loadExtension(QScriptContext *context, QScriptEngine *qtengine);
-    static QScriptValue js_loadFile(QScriptContext *context, QScriptEngine *qtengine);
-    static QScriptValue js_require(QScriptContext *context, QScriptEngine *qtengine);
+    void import(const JsImport &jsImport, JSValue &targetObject);
+    void observeImport(JSValue &jsImport);
+    void importFile(const QString &filePath, JSValue targetObject);
+    static JSValue js_require(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic, JSValue *func_data);
+    JSValue mergeExtensionObjects(const JSValueList &lst);
+    JSValue loadInternalExtension(const QString &uri);
+
+    static void handleUndefinedFound(JSContext *ctx);
+    static void handleFunctionEntered(JSContext *ctx, JSValue this_obj);
+    static void handleFunctionExited(JSContext *ctx);
 
     class PropertyCacheKey
     {
@@ -313,27 +342,30 @@ private:
         const PropertyMapConstPtr m_propertyMap;
 
         friend bool operator==(const PropertyCacheKey &lhs, const PropertyCacheKey &rhs);
-        friend uint qHash(const ScriptEngine::PropertyCacheKey &k, uint seed);
+        friend QHashValueType qHash(const ScriptEngine::PropertyCacheKey &k, QHashValueType seed);
     };
 
     friend bool operator==(const PropertyCacheKey &lhs, const PropertyCacheKey &rhs);
-    friend uint qHash(const ScriptEngine::PropertyCacheKey &k, uint seed);
+    friend QHashValueType qHash(const ScriptEngine::PropertyCacheKey &k, QHashValueType seed);
 
-    static std::mutex m_creationDestructionMutex;
+    JSRuntime * const m_jsRuntime = JS_NewRuntime();
+    JSContext * const m_context = JS_NewContext(m_jsRuntime);
+    JSValue m_globalObject = JS_NULL;
     ScriptImporter *m_scriptImporter;
-    QScriptClass *m_modulePropertyScriptClass;
-    QScriptClass *m_productPropertyScriptClass = nullptr;
-    QScriptClass *m_artifactsScriptClass = nullptr;
-    QHash<JsImport, QScriptValue> m_jsImportCache;
-    std::unordered_map<QString, QScriptValue> m_jsFileCache;
-    bool m_propertyCacheEnabled;
-    bool m_active;
+    JSClassID m_modulePropertyScriptClass = 0;
+    JSClassID m_productPropertyScriptClass = 0;
+    JSClassID m_artifactsScriptClass[2] = {0, 0};
+    JSClassID m_dataWithPtrClass = 0;
+    Evaluator *m_evaluator = nullptr;
+    QHash<JsImport, JSValue> m_jsImportCache;
+    std::unordered_map<QString, JSValue> m_jsFileCache;
+    bool m_propertyCacheEnabled = true;
+    bool m_active = false;
+    std::atomic_bool m_canceling = false;
     QHash<PropertyCacheKey, QVariant> m_propertyCache;
     PropertySet m_propertiesRequestedInScript;
     QHash<QString, PropertySet> m_propertiesRequestedFromArtifact;
     Logger &m_logger;
-    QScriptValue m_definePropertyFunction;
-    QScriptValue m_emptyFunction;
     QProcessEnvironment m_environment;
     QHash<QString, QString> m_canonicalFilePathResult;
     QHash<QString, bool> m_fileExistsResult;
@@ -341,28 +373,38 @@ private:
     QHash<QString, FileTime> m_fileLastModifiedResult;
     std::stack<QString> m_currentDirPathStack;
     std::stack<QStringList> m_extensionSearchPathsStack;
-    QScriptValue m_loadFileFunction;
-    QScriptValue m_loadExtensionFunction;
-    QScriptValue m_requireFunction;
-    QScriptValue m_qbsObject;
-    QScriptValue m_consoleObject;
-    QScriptValue m_cancelationError;
+    std::stack<std::pair<QString, int>> m_evalPositions;
+    JSValue m_qbsObject = JS_UNDEFINED;
     qint64 m_elapsedTimeImporting = -1;
     bool m_usesIo = false;
     EvalContext m_evalContext;
-    std::vector<ResourceAcquiringScriptObject *> m_resourceAcquiringScriptObjects;
     const std::unique_ptr<PrepareScriptObserver> m_observer;
-    std::vector<std::tuple<QScriptValue, QString, QScriptValue>> m_observedProperties;
-    std::vector<QScriptValue> m_requireResults;
-    std::unordered_map<qint64, std::vector<QString>> m_filePathsPerImport;
+    std::vector<std::tuple<JSValue, QString, JSValue>> m_observedProperties;
+    JSValueList m_requireResults;
+    std::unordered_map<quintptr, std::vector<QString>> m_filePathsPerImport;
     std::vector<qint64> m_importsRequestedInScript;
     Set<const ResolvedProduct *> m_productsWithRequestedDependencies;
     RequestedArtifacts m_requestedArtifacts;
     Set<const ResolvedProduct *> m_requestedExports;
     ObserveMode m_observeMode = ObserveMode::Disabled;
-    std::unordered_map<const ResolvedProduct *, QScriptValue> m_productScriptValues;
-    std::unordered_map<const ResolvedProject *, QScriptValue> m_projectScriptValues;
-    std::unordered_map<const ResolvedModule *, QScriptValue> m_moduleScriptValues;
+    std::unordered_map<const ResolvedProduct *, JSValue> m_baseProductScriptValues;
+    std::unordered_map<const ResolvedProduct *, JSValue> m_productArtifactsMapScriptValues;
+    std::unordered_map<const ResolvedModule *, JSValue> m_moduleArtifactsMapScriptValues;
+    std::unordered_map<const ResolvedProject *, JSValue> m_projectScriptValues;
+    std::unordered_map<const ResolvedModule *, JSValue> m_baseModuleScriptValues;
+    std::vector<std::reference_wrapper<const JSValueList>> m_scopeChains;
+    JSValueList m_contextStack;
+    QHash<JSClassID, JSClassExoticMethods> m_exoticMethods;
+    QHash<QString, JSClassID> m_classes;
+    QHash<QString, JSValue> m_internalExtensions;
+    QHash<QString, JSValue> m_stringCache;
+    QHash<quintptr, JSValue> m_jsValueCache;
+    QHash<JSValue, int> m_evalResults;
+    std::vector<JSValue *> m_externallyCachedValues;
+    QHash<QPair<Artifact *, QString>, JSValue> m_artifactsScriptValues;
+    QVariantMap m_properties;
+    std::recursive_mutex m_artifactsMutex;
+    bool m_lastLookupWasSuccess = false;
 };
 
 class EvalContextSwitcher
diff --git a/src/lib/corelib/language/scriptimporter.cpp b/src/lib/corelib/language/scriptimporter.cpp
index 40162eb12..fdb0689ad 100644
--- a/src/lib/corelib/language/scriptimporter.cpp
+++ b/src/lib/corelib/language/scriptimporter.cpp
@@ -48,8 +48,6 @@
 #include <parser/qmljsparser_p.h>
 #include <tools/error.h>
 
-#include <QtScript/qscriptvalueiterator.h>
-
 namespace qbs {
 namespace Internal {
 
@@ -121,10 +119,10 @@ ScriptImporter::ScriptImporter(ScriptEngine *scriptEngine)
 {
 }
 
-QScriptValue ScriptImporter::importSourceCode(const QString &sourceCode, const QString &filePath,
-        QScriptValue &targetObject)
+JSValue ScriptImporter::importSourceCode(const QString &sourceCode, const QString &filePath,
+        JSValue &targetObject)
 {
-    Q_ASSERT(targetObject.isObject());
+    Q_ASSERT(JS_IsObject(targetObject));
     // The targetObject doesn't get overwritten but enhanced by the contents of the .js file.
     // This is necessary for library imports that consist of multiple js files.
 
@@ -144,19 +142,18 @@ QScriptValue ScriptImporter::importSourceCode(const QString &sourceCode, const Q
         code = QLatin1String("(function(){\n") + sourceCode + extractor.suffix();
     }
 
-    QScriptValue result = m_engine->evaluate(code, filePath, 0);
-    throwOnEvaluationError(m_engine, result, [&filePath] () { return CodeLocation(filePath, 0); });
-    copyProperties(result, targetObject);
-    return result;
+    ScopedJsValue result(m_engine->context(),
+                         m_engine->evaluate(JsValueOwner::Caller, code, filePath, 0));
+    throwOnEvaluationError(m_engine, [&filePath] () { return CodeLocation(filePath, 0); });
+    copyProperties(m_engine->context(), result, targetObject);
+    return result.release();
 }
 
-void ScriptImporter::copyProperties(const QScriptValue &src, QScriptValue &dst)
+void ScriptImporter::copyProperties(JSContext *ctx, const JSValue &src, JSValue &dst)
 {
-    QScriptValueIterator it(src);
-    while (it.hasNext()) {
-        it.next();
-        dst.setProperty(it.name(), it.value());
-    }
+    handleJsProperties(ctx, src, [ctx, &dst](const JSAtom &name, const JSPropertyDescriptor &desc) {
+        JS_SetProperty(ctx, dst, name, JS_DupValue(ctx, desc.value));
+    });
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/language/scriptimporter.h b/src/lib/corelib/language/scriptimporter.h
index 8cff09382..6bec9b088 100644
--- a/src/lib/corelib/language/scriptimporter.h
+++ b/src/lib/corelib/language/scriptimporter.h
@@ -40,9 +40,9 @@
 #ifndef SCRIPTIMPORTER_H
 #define SCRIPTIMPORTER_H
 
-#include <QtCore/qhash.h>
+#include <quickjs.h>
 
-#include <QtScript/qscriptvalue.h>
+#include <QtCore/qhash.h>
 
 namespace qbs {
 namespace Internal {
@@ -53,9 +53,10 @@ class ScriptImporter
 {
 public:
     ScriptImporter(ScriptEngine *scriptEngine);
-    QScriptValue importSourceCode(const QString &sourceCode, const QString &filePath, QScriptValue &targetObject);
+    JSValue importSourceCode(const QString &sourceCode, const QString &filePath,
+                             JSValue &targetObject);
 
-    static void copyProperties(const QScriptValue &src, QScriptValue &dst);
+    static void copyProperties(JSContext *ctx, const JSValue &src, JSValue &dst);
 
 private:
     ScriptEngine *m_engine;
diff --git a/src/lib/corelib/language/scriptpropertyobserver.h b/src/lib/corelib/language/scriptpropertyobserver.h
index 7fb362b95..80da705ee 100644
--- a/src/lib/corelib/language/scriptpropertyobserver.h
+++ b/src/lib/corelib/language/scriptpropertyobserver.h
@@ -40,10 +40,11 @@
 #ifndef QBS_SCRIPTPROPERTYOBSERVER_H
 #define QBS_SCRIPTPROPERTYOBSERVER_H
 
+#include <quickjs.h>
+
 #include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
-class QScriptValue;
 class QString;
 QT_END_NAMESPACE
 
@@ -64,8 +65,8 @@ public:
 
     virtual ~ScriptPropertyObserver();
 
-    virtual void onPropertyRead(const QScriptValue &object, const QString &name,
-                                const QScriptValue &value) = 0;
+    virtual void onPropertyRead(const JSValue &object, const QString &name,
+                                const JSValue &value) = 0;
 
 protected:
     ScriptEngine * engine() const { return m_engine; }
diff --git a/src/lib/corelib/language/value.cpp b/src/lib/corelib/language/value.cpp
index 16326f521..634f54faf 100644
--- a/src/lib/corelib/language/value.cpp
+++ b/src/lib/corelib/language/value.cpp
@@ -48,29 +48,65 @@
 namespace qbs {
 namespace Internal {
 
-Value::Value(Type t, bool createdByPropertiesBlock)
-    : m_type(t), m_definingItem(nullptr), m_createdByPropertiesBlock(createdByPropertiesBlock)
+Value::Value(Type t, bool createdByPropertiesBlock) : m_type(t)
 {
+    if (createdByPropertiesBlock)
+        m_flags |= OriginPropertiesBlock;
 }
 
-Value::Value(const Value &other)
+Value::Value(const Value &other, ItemPool &pool)
     : m_type(other.m_type),
-      m_definingItem(other.m_definingItem),
-      m_next(other.m_next ? other.m_next->clone() : ValuePtr()),
-      m_createdByPropertiesBlock(other.m_createdByPropertiesBlock)
+      m_scope(other.m_scope),
+      m_scopeName(other.m_scopeName),
+      m_next(other.m_next ? other.m_next->clone(pool) : ValuePtr()),
+      m_candidates(other.m_candidates),
+      m_flags(other.m_flags)
 {
 }
 
 Value::~Value() = default;
 
-Item *Value::definingItem() const
+void Value::setScope(Item *scope, const QString &scopeName)
 {
-    return m_definingItem;
+    m_scope = scope;
+    m_scopeName = scopeName;
 }
 
-void Value::setDefiningItem(Item *item)
+int Value::priority(const Item *productItem) const
 {
-    m_definingItem = item;
+    if (m_priority == -1)
+        m_priority = calculatePriority(productItem);
+    return m_priority;
+}
+
+int Value::calculatePriority(const Item *productItem) const
+{
+    if (setInternally())
+        return INT_MAX;
+    if (setByCommandLine())
+        return INT_MAX - 1;
+    if (setByProfile())
+        return 2;
+    if (!scope())
+        return 1;
+    if (scope()->type() == ItemType::Product)
+        return INT_MAX - 2;
+    if (!scope()->isPresentModule())
+        return 0;
+    const auto it = std::find_if(
+        productItem->modules().begin(), productItem->modules().end(),
+        [this](const Item::Module &m) { return m.item == scope(); });
+    QBS_CHECK(it != productItem->modules().end());
+    return INT_MAX - 3 - it->maxDependsChainLength;
+}
+
+void Value::resetPriority()
+{
+    m_priority = -1;
+    if (m_next)
+        m_next->resetPriority();
+    for (const ValuePtr &v : m_candidates)
+        v->resetPriority();
 }
 
 ValuePtr Value::next() const
@@ -85,6 +121,11 @@ void Value::setNext(const ValuePtr &next)
     m_next = next;
 }
 
+bool Value::setInternally() const
+{
+    return type() == VariantValueType && !setByProfile() && !setByCommandLine();
+}
+
 
 JSSourceValue::JSSourceValue(bool createdByPropertiesBlock)
     : Value(JSSourceValueType, createdByPropertiesBlock)
@@ -93,19 +134,18 @@ JSSourceValue::JSSourceValue(bool createdByPropertiesBlock)
 {
 }
 
-JSSourceValue::JSSourceValue(const JSSourceValue &other) : Value(other)
+JSSourceValue::JSSourceValue(const JSSourceValue &other, ItemPool &pool) : Value(other, pool)
 {
     m_sourceCode = other.m_sourceCode;
     m_line = other.m_line;
     m_column = other.m_column;
     m_file = other.m_file;
-    m_flags = other.m_flags;
     m_baseValue = other.m_baseValue
-            ? std::static_pointer_cast<JSSourceValue>(other.m_baseValue->clone())
+            ? std::static_pointer_cast<JSSourceValue>(other.m_baseValue->clone(pool))
             : JSSourceValuePtr();
-    m_alternatives.reserve(other.m_alternatives.size());
-    for (const Alternative &otherAlt : other.m_alternatives)
-        m_alternatives.push_back(otherAlt.clone());
+    m_alternatives = transformed<std::vector<Alternative>>(
+        other.m_alternatives, [&pool](const auto &alternative) {
+        return alternative.clone(pool); });
 }
 
 JSSourceValuePtr JSSourceValue::create(bool createdByPropertiesBlock)
@@ -115,9 +155,9 @@ JSSourceValuePtr JSSourceValue::create(bool createdByPropertiesBlock)
 
 JSSourceValue::~JSSourceValue() = default;
 
-ValuePtr JSSourceValue::clone() const
+ValuePtr JSSourceValue::clone(ItemPool &pool) const
 {
-    return std::make_shared<JSSourceValue>(*this);
+    return std::make_shared<JSSourceValue>(*this, pool);
 }
 
 QString JSSourceValue::sourceCodeForEvaluation() const
@@ -142,24 +182,45 @@ CodeLocation JSSourceValue::location() const
     return CodeLocation(m_file->filePath(), m_line, m_column);
 }
 
-void JSSourceValue::setHasFunctionForm(bool b)
+void JSSourceValue::clearAlternatives()
 {
-    if (b)
-        m_flags |= HasFunctionForm;
-    else
-        m_flags &= ~HasFunctionForm;
+    m_alternatives.clear();
 }
 
-void JSSourceValue::clearAlternatives()
+void JSSourceValue::setScope(Item *scope, const QString &scopeName)
 {
-    m_alternatives.clear();
+    Value::setScope(scope, scopeName);
+    if (m_baseValue)
+        m_baseValue->setScope(scope, scopeName);
+    for (const JSSourceValue::Alternative &a : m_alternatives)
+        a.value->setScope(scope, scopeName);
+}
+
+void JSSourceValue::resetPriority()
+{
+    Value::resetPriority();
+    if (m_baseValue)
+        m_baseValue->resetPriority();
+    for (const JSSourceValue::Alternative &a : m_alternatives)
+        a.value->resetPriority();
+}
+
+void JSSourceValue::addCandidate(const ValuePtr &v)
+{
+    Value::addCandidate(v);
+    if (m_baseValue)
+        m_baseValue->addCandidate(v);
+    for (const JSSourceValue::Alternative &a : m_alternatives)
+        a.value->addCandidate(v);
 }
 
-void JSSourceValue::setDefiningItem(Item *item)
+void JSSourceValue::setCandidates(const std::vector<ValuePtr> &candidates)
 {
-    Value::setDefiningItem(item);
+    Value::setCandidates(candidates);
+    if (m_baseValue)
+        m_baseValue->setCandidates(candidates);
     for (const JSSourceValue::Alternative &a : m_alternatives)
-        a.value->setDefiningItem(item);
+        a.value->setCandidates(candidates);
 }
 
 ItemValue::ItemValue(Item *item, bool createdByPropertiesBlock)
@@ -174,29 +235,51 @@ ItemValuePtr ItemValue::create(Item *item, bool createdByPropertiesBlock)
     return std::make_shared<ItemValue>(item, createdByPropertiesBlock);
 }
 
-ValuePtr ItemValue::clone() const
+ValuePtr ItemValue::clone(ItemPool &pool) const
 {
-    return create(m_item->clone(), createdByPropertiesBlock());
+    return create(m_item->clone(pool), createdByPropertiesBlock());
 }
 
+class StoredVariantValue : public VariantValue
+{
+public:
+    explicit StoredVariantValue(QVariant v) : VariantValue(std::move(v)) {}
+
+    quintptr id() const override { return quintptr(this); }
+};
+
 VariantValue::VariantValue(QVariant v)
     : Value(VariantValueType, false)
     , m_value(std::move(v))
 {
 }
 
-VariantValuePtr VariantValue::create(const QVariant &v)
+VariantValue::VariantValue(const VariantValue &other, ItemPool &pool)
+    : Value(other, pool), m_value(other.m_value) {}
+
+template<typename T>
+VariantValuePtr createImpl(const QVariant &v)
 {
     if (!v.isValid())
-        return invalidValue();
+        return VariantValue::invalidValue();
     if (static_cast<QMetaType::Type>(v.userType()) == QMetaType::Bool)
         return v.toBool() ? VariantValue::trueValue() : VariantValue::falseValue();
-    return std::make_shared<VariantValue>(v);
+    return std::make_shared<T>(v);
+}
+
+VariantValuePtr VariantValue::create(const QVariant &v)
+{
+    return createImpl<VariantValue>(v);
+}
+
+VariantValuePtr VariantValue::createStored(const QVariant &v)
+{
+    return createImpl<StoredVariantValue>(v);
 }
 
-ValuePtr VariantValue::clone() const
+ValuePtr VariantValue::clone(ItemPool &pool) const
 {
-    return std::make_shared<VariantValue>(*this);
+    return std::make_shared<VariantValue>(*this, pool);
 }
 
 const VariantValuePtr &VariantValue::falseValue()
diff --git a/src/lib/corelib/language/value.h b/src/lib/corelib/language/value.h
index 5f6b5ca16..1a6746e24 100644
--- a/src/lib/corelib/language/value.h
+++ b/src/lib/corelib/language/value.h
@@ -42,6 +42,7 @@
 
 #include "forward_decls.h"
 #include <tools/codelocation.h>
+#include <QtCore/qstring.h>
 #include <QtCore/qvariant.h>
 
 #include <vector>
@@ -49,42 +50,86 @@
 namespace qbs {
 namespace Internal {
 class Item;
+class ItemPool;
 class ValueHandler;
 
 class Value
 {
 public:
-    enum Type
-    {
+    enum Type {
         JSSourceValueType,
         ItemValueType,
         VariantValueType
     };
 
+    enum Flag {
+        NoFlags = 0x00,
+        SourceUsesBase = 0x01,
+        SourceUsesOuter = 0x02,
+        SourceUsesOriginal = 0x04,
+        HasFunctionForm = 0x08,
+        ExclusiveListValue = 0x10,
+        BuiltinDefaultValue = 0x20,
+        OriginPropertiesBlock = 0x40,
+        OriginProfile = 0x80,
+        OriginCommandLine = 0x100,
+    };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
     Value(Type t, bool createdByPropertiesBlock);
-    Value(const Value &other);
+    Value(const Value &other) = delete;
+    Value(const Value &other, ItemPool &pool);
     virtual ~Value();
 
     Type type() const { return m_type; }
     virtual void apply(ValueHandler *) = 0;
-    virtual ValuePtr clone() const = 0;
+    virtual ValuePtr clone(ItemPool &) const = 0;
     virtual CodeLocation location() const { return {}; }
 
-    Item *definingItem() const;
-    virtual void setDefiningItem(Item *item);
+    Item *scope() const { return m_scope; }
+    virtual void setScope(Item *scope, const QString &scopeName);
+    QString scopeName() const { return m_scopeName; }
+    int priority(const Item *productItem) const;
+    virtual void resetPriority();
 
     ValuePtr next() const;
     void setNext(const ValuePtr &next);
 
-    bool createdByPropertiesBlock() const { return m_createdByPropertiesBlock; }
-    void setCreatedByPropertiesBlock(bool b) { m_createdByPropertiesBlock = b; }
-    void clearCreatedByPropertiesBlock() { m_createdByPropertiesBlock = false; }
+    virtual void addCandidate(const ValuePtr &v) { m_candidates.push_back(v); }
+    const std::vector<ValuePtr> &candidates() const { return m_candidates; }
+    virtual void setCandidates(const std::vector<ValuePtr> &candidates) { m_candidates = candidates; }
+
+    bool createdByPropertiesBlock() const { return m_flags & OriginPropertiesBlock; }
+    void markAsSetByProfile() { m_flags |= OriginProfile; }
+    bool setByProfile() const { return m_flags & OriginProfile; }
+    void markAsSetByCommandLine() { m_flags |= OriginCommandLine; }
+    bool setByCommandLine() const { return m_flags & OriginCommandLine; }
+    bool setInternally() const;
+    bool expired(const Item *productItem) const { return priority(productItem) == 0; }
+
+    void setSourceUsesBase() { m_flags |= SourceUsesBase; }
+    bool sourceUsesBase() const { return m_flags.testFlag(SourceUsesBase); }
+    void setSourceUsesOuter() { m_flags |= SourceUsesOuter; }
+    bool sourceUsesOuter() const { return m_flags.testFlag(SourceUsesOuter); }
+    void setSourceUsesOriginal() { m_flags |= SourceUsesOriginal; }
+    bool sourceUsesOriginal() const { return m_flags.testFlag(SourceUsesOriginal); }
+    void setHasFunctionForm() { m_flags |= HasFunctionForm; }
+    bool hasFunctionForm() const { return m_flags.testFlag(HasFunctionForm); }
+    void setIsExclusiveListValue() { m_flags |= ExclusiveListValue; }
+    bool isExclusiveListValue() { return m_flags.testFlag(ExclusiveListValue); }
+    void setIsBuiltinDefaultValue() { m_flags |= BuiltinDefaultValue; }
+    bool isBuiltinDefaultValue() const { return m_flags.testFlag(BuiltinDefaultValue); }
 
 private:
+    int calculatePriority(const Item *productItem) const;
+
     Type m_type;
-    Item *m_definingItem;
+    Item *m_scope = nullptr;
+    QString m_scopeName;
     ValuePtr m_next;
-    bool m_createdByPropertiesBlock;
+    std::vector<ValuePtr> m_candidates;
+    Flags m_flags;
+    mutable int m_priority = -1;
 };
 
 class ValueHandler
@@ -99,27 +144,15 @@ class JSSourceValue : public Value
 {
     friend class ItemReaderASTVisitor;
 
-    enum Flag
-    {
-        NoFlags = 0x00,
-        SourceUsesBase = 0x01,
-        SourceUsesOuter = 0x02,
-        SourceUsesOriginal = 0x04,
-        HasFunctionForm = 0x08,
-        ExclusiveListValue = 0x10,
-        BuiltinDefaultValue = 0x20,
-    };
-    Q_DECLARE_FLAGS(Flags, Flag)
-
 public:
     explicit JSSourceValue(bool createdByPropertiesBlock);
-    JSSourceValue(const JSSourceValue &other);
+    JSSourceValue(const JSSourceValue &other, ItemPool &pool);
 
     static JSSourceValuePtr QBS_AUTOTEST_EXPORT create(bool createdByPropertiesBlock = false);
     ~JSSourceValue() override;
 
     void apply(ValueHandler *handler) override { handler->handle(this); }
-    ValuePtr clone() const override;
+    ValuePtr clone(ItemPool &pool) const override;
 
     void setSourceCode(QStringView sourceCode) { m_sourceCode = sourceCode; }
     QStringView sourceCode() const { return m_sourceCode; }
@@ -133,17 +166,6 @@ public:
     void setFile(const FileContextPtr &file) { m_file = file; }
     const FileContextPtr &file() const { return m_file; }
 
-    void setSourceUsesBaseFlag() { m_flags |= SourceUsesBase; }
-    bool sourceUsesBase() const { return m_flags.testFlag(SourceUsesBase); }
-    bool sourceUsesOuter() const { return m_flags.testFlag(SourceUsesOuter); }
-    bool sourceUsesOriginal() const { return m_flags.testFlag(SourceUsesOriginal); }
-    bool hasFunctionForm() const { return m_flags.testFlag(HasFunctionForm); }
-    void setHasFunctionForm(bool b);
-    void setIsExclusiveListValue() { m_flags |= ExclusiveListValue; }
-    bool isExclusiveListValue() { return m_flags.testFlag(ExclusiveListValue); }
-    void setIsBuiltinDefaultValue() { m_flags |= BuiltinDefaultValue; }
-    bool isBuiltinDefaultValue() const { return m_flags.testFlag(BuiltinDefaultValue); }
-
     const JSSourceValuePtr &baseValue() const { return m_baseValue; }
     void setBaseValue(const JSSourceValuePtr &v) { m_baseValue = v; }
 
@@ -160,10 +182,10 @@ public:
         Alternative() = default;
         Alternative(PropertyData c, PropertyData o, JSSourceValuePtr v)
             : condition(std::move(c)), overrideListProperties(std::move(o)), value(std::move(v)) {}
-        Alternative clone() const
+        Alternative clone(ItemPool &pool) const
         {
             return Alternative(condition, overrideListProperties,
-                               std::static_pointer_cast<JSSourceValue>(value->clone()));
+                               std::static_pointer_cast<JSSourceValue>(value->clone(pool)));
         }
 
         PropertyData condition;
@@ -176,14 +198,16 @@ public:
     void addAlternative(const Alternative &alternative) { m_alternatives.push_back(alternative); }
     void clearAlternatives();
 
-    void setDefiningItem(Item *item) override;
+    void setScope(Item *scope, const QString &scopeName) override;
+    void resetPriority() override;
+    void addCandidate(const ValuePtr &v) override;
+    void setCandidates(const std::vector<ValuePtr> &candidates) override;
 
 private:
     QStringView m_sourceCode;
     int m_line;
     int m_column;
     FileContextPtr m_file;
-    Flags m_flags;
     JSSourceValuePtr m_baseValue;
     std::vector<Alternative> m_alternatives;
 };
@@ -200,7 +224,7 @@ public:
 
 private:
     void apply(ValueHandler *handler) override { handler->handle(this); }
-    ValuePtr clone() const override;
+    ValuePtr clone(ItemPool &pool) const override;
 
     Item *m_item;
 };
@@ -210,12 +234,15 @@ class VariantValue : public Value
 {
 public:
     explicit VariantValue(QVariant v);
+    VariantValue(const VariantValue &v, ItemPool &pool);
     static VariantValuePtr create(const QVariant &v = QVariant());
+    static VariantValuePtr createStored(const QVariant &v = QVariant());
 
     void apply(ValueHandler *handler) override { handler->handle(this); }
-    ValuePtr clone() const override;
+    ValuePtr clone(ItemPool &pool) const override;
 
     const QVariant &value() const { return m_value; }
+    virtual quintptr id() const { return 0; }
 
     static const VariantValuePtr &falseValue();
     static const VariantValuePtr &trueValue();
diff --git a/src/lib/corelib/language/astimportshandler.cpp b/src/lib/corelib/loader/astimportshandler.cpp
index d634af7e4..c0281ca24 100644
--- a/src/lib/corelib/language/astimportshandler.cpp
+++ b/src/lib/corelib/loader/astimportshandler.cpp
@@ -38,12 +38,12 @@
 ****************************************************************************/
 #include "astimportshandler.h"
 
-#include "asttools.h"
-#include "builtindeclarations.h"
-#include "filecontext.h"
 #include "itemreadervisitorstate.h"
-#include "jsextensions/jsextensions.h"
 
+#include <jsextensions/jsextensions.h>
+#include <language/asttools.h>
+#include <language/builtindeclarations.h>
+#include <language/filecontext.h>
 #include <logging/logger.h>
 #include <logging/translator.h>
 #include <parser/qmljsast_p.h>
@@ -268,21 +268,9 @@ void ASTImportsHandler::checkImportVersion(const QbsQmlJS::AST::SourceLocation &
 void ASTImportsHandler::collectPrototypes(const QString &path, const QString &as)
 {
     QStringList fileNames; // Yes, file *names*.
-    if (m_visitorState.findDirectoryEntries(path, &fileNames)) {
-        for (const QString &fileName : qAsConst(fileNames))
-            addPrototype(fileName, path + QLatin1Char('/') + fileName, as, false);
-        return;
-    }
-
-    QDirIterator dirIter(path, StringConstants::qbsFileWildcards());
-    while (dirIter.hasNext()) {
-        const QString filePath = dirIter.next();
-        const QString fileName = dirIter.fileName();
-        if (addPrototype(fileName, filePath, as, true))
-            fileNames << fileName;
-    }
-    m_visitorState.cacheDirectoryEntries(path, fileNames);
-
+    m_visitorState.findDirectoryEntries(path, &fileNames);
+    for (const QString &fileName : std::as_const(fileNames))
+        addPrototype(fileName, path + QLatin1Char('/') + fileName, as, false);
 }
 
 void ASTImportsHandler::collectPrototypesAndJsCollections(const QString &path, const QString &as,
diff --git a/src/lib/corelib/language/astimportshandler.h b/src/lib/corelib/loader/astimportshandler.h
index e9c2b6c27..582e1c698 100644
--- a/src/lib/corelib/language/astimportshandler.h
+++ b/src/lib/corelib/loader/astimportshandler.h
@@ -39,7 +39,7 @@
 #ifndef QBS_ASTIMPORTSHANDLER_H
 #define QBS_ASTIMPORTSHANDLER_H
 
-#include "forward_decls.h"
+#include <language/forward_decls.h>
 
 #include <parser/qmljsastfwd_p.h>
 #include <tools/set.h>
diff --git a/src/lib/corelib/language/astpropertiesitemhandler.cpp b/src/lib/corelib/loader/astpropertiesitemhandler.cpp
index b28fe7d76..8183e6b79 100644
--- a/src/lib/corelib/language/astpropertiesitemhandler.cpp
+++ b/src/lib/corelib/loader/astpropertiesitemhandler.cpp
@@ -38,8 +38,8 @@
 ****************************************************************************/
 #include "astpropertiesitemhandler.h"
 
-#include "item.h"
-#include "value.h"
+#include <language/item.h>
+#include <language/value.h>
 
 #include <logging/translator.h>
 #include <tools/error.h>
@@ -49,7 +49,8 @@
 namespace qbs {
 namespace Internal {
 
-ASTPropertiesItemHandler::ASTPropertiesItemHandler(Item *parentItem) : m_parentItem(parentItem)
+ASTPropertiesItemHandler::ASTPropertiesItemHandler(Item *parentItem, ItemPool &itemPool)
+    : m_parentItem(parentItem), m_itemPool(itemPool)
 {
 }
 
@@ -82,9 +83,11 @@ class PropertiesBlockConverter
 public:
     PropertiesBlockConverter(const JSSourceValue::AltProperty &condition,
                              const JSSourceValue::AltProperty &overrideListProperties,
-                             Item *propertiesBlockContainer, const Item *propertiesBlock)
+                             Item *propertiesBlockContainer, const Item *propertiesBlock,
+                             ItemPool &pool)
         : m_propertiesBlockContainer(propertiesBlockContainer)
         , m_propertiesBlock(propertiesBlock)
+        , m_itemPool(pool)
     {
         m_alternative.condition = condition;
         m_alternative.overrideListProperties = overrideListProperties;
@@ -99,6 +102,7 @@ private:
     JSSourceValue::Alternative m_alternative;
     Item * const m_propertiesBlockContainer;
     const Item * const m_propertiesBlock;
+    ItemPool &m_itemPool;
 
     void doApply(Item *outer, const Item *inner)
     {
@@ -111,9 +115,9 @@ private:
             }
             if (it.value()->type() == Value::ItemValueType) {
                 Item * const innerVal = std::static_pointer_cast<ItemValue>(it.value())->item();
-                ItemValuePtr outerVal = outer->itemProperty(it.key());
+                ItemValuePtr outerVal = outer->itemProperty(it.key(), m_itemPool);
                 if (!outerVal) {
-                    outerVal = ItemValue::create(Item::create(outer->pool(), innerVal->type()),
+                    outerVal = ItemValue::create(Item::create(&m_itemPool, innerVal->type()),
                                                  true);
                     outer->setProperty(it.key(), outerVal);
                 }
@@ -140,7 +144,7 @@ private:
             value->setFile(conditionalValue->file());
             item->setProperty(propertyName, value);
             value->setSourceCode(StringConstants::baseVar());
-            value->setSourceUsesBaseFlag();
+            value->setSourceUsesBase();
         }
         m_alternative.value = conditionalValue;
         value->addAlternative(m_alternative);
@@ -155,8 +159,7 @@ static JSSourceValue::AltProperty getPropertyData(const Item *propertiesItem, co
             throw ErrorInfo(Tr::tr("Properties.condition must be provided."),
                             propertiesItem->location());
         }
-        return JSSourceValue::AltProperty(StringConstants::falseValue(),
-                                          propertiesItem->location());
+        return {StringConstants::falseValue(), propertiesItem->location()};
     }
     if (Q_UNLIKELY(value->type() != Value::JSSourceValueType)) {
         throw ErrorInfo(Tr::tr("Properties.%1 must be a value binding.").arg(name),
@@ -176,7 +179,7 @@ static JSSourceValue::AltProperty getPropertyData(const Item *propertiesItem, co
 
     }
     const JSSourceValuePtr srcval = std::static_pointer_cast<JSSourceValue>(value);
-    return JSSourceValue::AltProperty(srcval->sourceCodeForEvaluation(), srcval->location());
+    return {srcval->sourceCodeForEvaluation(), srcval->location()};
 }
 
 void ASTPropertiesItemHandler::handlePropertiesBlock(const Item *propertiesItem)
@@ -185,7 +188,7 @@ void ASTPropertiesItemHandler::handlePropertiesBlock(const Item *propertiesItem)
     const auto overrideListProperties = getPropertyData(propertiesItem,
             StringConstants::overrideListPropertiesProperty());
     PropertiesBlockConverter(condition, overrideListProperties, m_parentItem,
-                             propertiesItem).apply();
+                             propertiesItem, m_itemPool).apply();
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/language/astpropertiesitemhandler.h b/src/lib/corelib/loader/astpropertiesitemhandler.h
index 413512ee5..804abb8a1 100644
--- a/src/lib/corelib/language/astpropertiesitemhandler.h
+++ b/src/lib/corelib/loader/astpropertiesitemhandler.h
@@ -42,11 +42,12 @@
 namespace qbs {
 namespace Internal {
 class Item;
+class ItemPool;
 
 class ASTPropertiesItemHandler
 {
 public:
-    ASTPropertiesItemHandler(Item *parentItem);
+    ASTPropertiesItemHandler(Item *parentItem, ItemPool &itemPool);
 
     void handlePropertiesItems();
 
@@ -55,6 +56,7 @@ private:
     void handlePropertiesBlock(const Item *propertiesItem);
 
     Item * const m_parentItem;
+    ItemPool &m_itemPool;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/loader/dependenciesresolver.cpp b/src/lib/corelib/loader/dependenciesresolver.cpp
new file mode 100644
index 000000000..059592e9c
--- /dev/null
+++ b/src/lib/corelib/loader/dependenciesresolver.cpp
@@ -0,0 +1,1175 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "dependenciesresolver.h"
+
+#include "itemreader.h"
+#include "loaderutils.h"
+#include "moduleinstantiator.h"
+#include "moduleloader.h"
+
+#include <language/scriptengine.h>
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/itempool.h>
+#include <language/value.h>
+#include <logging/categories.h>
+#include <logging/translator.h>
+#include <tools/fileinfo.h>
+#include <tools/preferences.h>
+#include <tools/profiling.h>
+#include <tools/settings.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+#include <optional>
+#include <queue>
+#include <unordered_map>
+
+namespace qbs::Internal {
+namespace {
+enum class HandleDependency { Use, Ignore, Defer };
+
+class LoadModuleResult
+{
+public:
+    Item *moduleItem = nullptr;
+    ProductContext *product = nullptr;
+    HandleDependency handleDependency = HandleDependency::Use;
+};
+
+// Corresponds completely to a Depends item.
+// May result in more than one module, due to "multiplexing" properties such as subModules etc.
+// May also result in no module at all, e.g. if productTypes does not match anything.
+class EvaluatedDependsItem
+{
+public:
+    Item *item = nullptr;
+    QualifiedId name;
+    QStringList subModules;
+    FileTags productTypes;
+    QStringList multiplexIds;
+    std::optional<QStringList> profiles;
+    VersionRange versionRange;
+    QVariantMap parameters;
+    bool limitToSubProject = false;
+    bool requiredLocally = true;
+    bool requiredGlobally = true;
+};
+
+// As opposed to EvaluatedDependsItem, one of these corresponds exactly to one module
+// to be loaded. Such an attempt might still fail, though, which may or may not result
+// in an error, depending on the value of Depends.required and other circumstances.
+class FullyResolvedDependsItem
+{
+public:
+    FullyResolvedDependsItem(ProductContext *product, const EvaluatedDependsItem &dependency);
+    FullyResolvedDependsItem(const EvaluatedDependsItem &dependency, QualifiedId name,
+                             QString profile, QString multiplexId);
+    FullyResolvedDependsItem() = default;
+    static FullyResolvedDependsItem makeBaseDependency();
+
+    QString id() const;
+    CodeLocation location() const;
+    QString displayName() const;
+
+    // If product is non-null, we already know which product the dependency targets.
+    // This happens either if Depends.productTypes was set, or if we tried to load the
+    // dependency before and already identified the product, but could not complete the
+    // procedure because said product had itself not been handled yet.
+    ProductContext *product = nullptr;
+
+    Item *item = nullptr;
+    QualifiedId name;
+    QString profile;
+    QString multiplexId;
+    VersionRange versionRange;
+    QVariantMap parameters;
+    bool limitToSubProject = false;
+    bool requiredLocally = true;
+    bool requiredGlobally = true;
+    bool checkProduct = true;
+};
+
+class DependenciesResolvingState
+{
+public:
+    Item *loadingItem = nullptr;
+    FullyResolvedDependsItem loadingItemOrigin;
+    std::queue<Item *> pendingDependsItems;
+    std::optional<EvaluatedDependsItem> currentDependsItem;
+    std::queue<FullyResolvedDependsItem> pendingResolvedDependencies;
+    bool requiredByLoadingItem = true;
+};
+
+class DependenciesContextImpl : public DependenciesContext
+{
+public:
+    DependenciesContextImpl(ProductContext &product, LoaderState &loaderState);
+
+    std::list<DependenciesResolvingState> stateStack;
+
+private:
+    std::pair<ProductDependency, ProductContext *> pendingDependency() const override;
+
+    void setSearchPathsForProduct(LoaderState &loaderState);
+
+    ProductContext &m_product;
+};
+
+class DependenciesResolver
+{
+public:
+    DependenciesResolver(LoaderState &loaderState, ProductContext &product, Deferral deferral)
+        : m_loaderState(loaderState), m_product(product), m_deferral(deferral) {}
+
+    void resolve();
+    LoadModuleResult loadModule(Item *loadingItem, const FullyResolvedDependsItem &dependency);
+
+private:
+    void evaluateNextDependsItem();
+    HandleDependency handleResolvedDependencies();
+    std::pair<Item::Module *, Item *> findExistingModule(const FullyResolvedDependsItem &dependency,
+                                                         Item *item);
+    void updateModule(Item::Module &module, const FullyResolvedDependsItem &dependency);
+    int dependsChainLength();
+    ProductContext *findMatchingProduct(const FullyResolvedDependsItem &dependency);
+    Item *findMatchingModule(const FullyResolvedDependsItem &dependency);
+    std::pair<bool, HandleDependency> checkProductDependency(
+        const FullyResolvedDependsItem &depSpec, const ProductContext &dep);
+    void checkModule(const FullyResolvedDependsItem &dependency, Item *moduleItem,
+                     ProductContext *productDep);
+    void checkForModuleNamePrefixCollision(const FullyResolvedDependsItem &dependency);
+    Item::Module createModule(const FullyResolvedDependsItem &dependency, Item *item,
+                              ProductContext *productDep);
+    void adjustDependsItemForMultiplexing(Item *dependsItem);
+    std::optional<EvaluatedDependsItem> evaluateDependsItem(Item *item);
+    std::queue<FullyResolvedDependsItem> multiplexDependency(
+        const EvaluatedDependsItem &dependency);
+    QVariantMap extractParameters(Item *dependsItem) const;
+    void forwardParameterDeclarations(const Item *dependsItem, const Item::Modules &modules);
+    void forwardParameterDeclarations(const QualifiedId &moduleName, Item *item,
+                                      const Item::Modules &modules);
+    std::list<DependenciesResolvingState> &stateStack();
+
+    LoaderState &m_loaderState;
+    ProductContext &m_product;
+    Deferral m_deferral;
+};
+
+static bool haveSameSubProject(const ProductContext &p1, const ProductContext &p2);
+static QVariantMap safeToVariant(JSContext *ctx, const JSValue &v);
+
+} // namespace
+
+void resolveDependencies(ProductContext &product, Deferral deferral, LoaderState &loaderState)
+{
+    DependenciesResolver(loaderState, product, deferral).resolve();
+}
+
+Item *loadBaseModule(ProductContext &product, Item *item, LoaderState &loaderState)
+{
+    const auto baseDependency = FullyResolvedDependsItem::makeBaseDependency();
+    Item * const moduleItem = DependenciesResolver(loaderState, product, Deferral::NotAllowed)
+            .loadModule(item, baseDependency).moduleItem;
+    if (Q_UNLIKELY(!moduleItem))
+        throw ErrorInfo(Tr::tr("Cannot load base qbs module."));
+    return moduleItem;
+}
+
+namespace {
+
+void DependenciesResolver::resolve()
+{
+    AccumulatingTimer timer(m_loaderState.parameters().logElapsedTime()
+                            ? &m_product.timingData.dependenciesResolving : nullptr);
+
+    if (!m_product.dependenciesContext) {
+        m_product.dependenciesContext = std::make_unique<DependenciesContextImpl>(
+                    m_product, m_loaderState);
+    } else {
+        QBS_CHECK(!m_product.dependenciesContext->dependenciesResolved);
+    }
+    SearchPathsManager searchPathsMgr(m_loaderState.itemReader(), m_product.searchPaths);
+
+    while (!stateStack().empty()) {
+        auto &state = stateStack().front();
+
+        // If we have pending FullyResolvedDependsItems, then these are handled first.
+        if (handleResolvedDependencies() == HandleDependency::Defer)
+            return;
+
+        // The above procedure might have pushed another state to the stack due to recursive
+        // dependencies (i.e. Depends items in the newly loaded module), in which case we
+        // continue with that one.
+        if (&state != &stateStack().front())
+            continue;
+
+        // If we have a pending EvaluatedDependsItem, we multiplex it and then handle
+        // the resulting FullyResolvedDependsItems, if there were any.
+        if (state.currentDependsItem) {
+            QBS_CHECK(state.pendingResolvedDependencies.empty());
+
+            // We postpone handling Depends.productTypes for as long as possible, because
+            // the full type of a product becomes available only after its modules have been loaded.
+            if (!state.currentDependsItem->productTypes.empty() && m_deferral == Deferral::Allowed)
+                return;
+
+            state.pendingResolvedDependencies = multiplexDependency(*state.currentDependsItem);
+            state.currentDependsItem.reset();
+            m_deferral = Deferral::Allowed; // We made progress.
+
+            continue;
+        }
+
+        // Here we have no resolved/evaluated Depends items of any kind, so we evaluate the next
+        // pending Depends item.
+        evaluateNextDependsItem();
+        if (state.currentDependsItem)
+            continue;
+
+        // No resolved or unresolved Depends items are left, so we're done with the current state.
+        QBS_CHECK(!state.currentDependsItem);
+        QBS_CHECK(state.pendingResolvedDependencies.empty());
+        QBS_CHECK(state.pendingDependsItems.empty());
+
+        // This ensures our invariant: A sorted module list in the product
+        // (dependers after dependencies).
+        if (stateStack().size() > 1) {
+            QBS_CHECK(state.loadingItem->type() == ItemType::ModuleInstance);
+            Item::Modules &modules = m_product.item->modules();
+            const auto loadingItemModule = std::find_if(modules.begin(), modules.end(),
+                                                        [&](const Item::Module &m) {
+                                                            return m.item == state.loadingItem;
+                                                        });
+            QBS_CHECK(loadingItemModule != modules.end());
+            const Item::Module tempModule = *loadingItemModule;
+            modules.erase(loadingItemModule);
+            modules.push_back(tempModule);
+        }
+        stateStack().pop_front();
+    }
+    m_product.dependenciesContext->dependenciesResolved = true;
+}
+
+void DependenciesResolver::evaluateNextDependsItem()
+{
+    auto &state = stateStack().front();
+    while (!state.pendingDependsItems.empty()) {
+        QBS_CHECK(!state.currentDependsItem);
+        QBS_CHECK(state.pendingResolvedDependencies.empty());
+        Item * const dependsItem = state.pendingDependsItems.front();
+        state.pendingDependsItems.pop();
+        adjustDependsItemForMultiplexing(dependsItem);
+        if (auto evaluated = evaluateDependsItem(dependsItem)) {
+            evaluated->requiredGlobally = evaluated->requiredLocally
+                                          && state.loadingItemOrigin.requiredGlobally;
+            state.currentDependsItem = evaluated;
+            return;
+        }
+    }
+}
+
+HandleDependency DependenciesResolver::handleResolvedDependencies()
+{
+    DependenciesResolvingState &state = stateStack().front();
+    while (!state.pendingResolvedDependencies.empty()) {
+        QBS_CHECK(!state.currentDependsItem);
+        const FullyResolvedDependsItem dependency = state.pendingResolvedDependencies.front();
+        try {
+            const LoadModuleResult res = loadModule(state.loadingItem, dependency);
+            switch (res.handleDependency) {
+            case HandleDependency::Defer:
+                QBS_CHECK(m_deferral == Deferral::Allowed);
+
+                // Optimization: We already looked up the product, so let's not do that again
+                // next time.
+                if (res.product)
+                    state.pendingResolvedDependencies.front().product = res.product;
+
+                return HandleDependency::Defer;
+            case HandleDependency::Ignore:
+                // This happens if the dependency was not required or the module was already
+                // loaded via another path.
+                state.pendingResolvedDependencies.pop();
+                continue;
+            case HandleDependency::Use:
+                if (dependency.name.toString() == StringConstants::qbsModule()) {
+                    // Shortcut: No need to look for recursive dependencies in the base module.
+                    state.pendingResolvedDependencies.pop();
+                    continue;
+                }
+                m_deferral = Deferral::Allowed; // We made progress.
+                break;
+            }
+
+            QBS_CHECK(res.moduleItem);
+
+            // Now continue with the dependencies of the just-loaded module.
+            std::queue<Item *> moduleDependsItems;
+            for (Item * const child : res.moduleItem->children()) {
+                if (child->type() == ItemType::Depends)
+                    moduleDependsItems.push(child);
+            }
+            state.pendingResolvedDependencies.pop();
+            stateStack().push_front(
+                {res.moduleItem, dependency, moduleDependsItems, {}, {},
+                 dependency.requiredGlobally || state.requiredByLoadingItem});
+            stateStack().front().pendingResolvedDependencies.push(
+                FullyResolvedDependsItem::makeBaseDependency());
+            break;
+        } catch (const ErrorInfo &e) {
+            if (dependency.name.toString() == StringConstants::qbsModule())
+                throw e;
+
+            // See QBS-1338 for why we do not abort handling the product.
+            state.pendingResolvedDependencies.pop();
+            Item::Modules &modules = m_product.item->modules();
+
+            // Unwind.
+            while (stateStack().size() > 1) {
+                const auto loadingItemModule = std::find_if(
+                    modules.begin(), modules.end(), [&](const Item::Module &m) {
+                        return m.item == stateStack().front().loadingItem;
+                    });
+                for (auto it = loadingItemModule; it != modules.end(); ++it) {
+                    createNonPresentModule(m_loaderState.itemPool(), it->name.toString(),
+                                           QLatin1String("error in Depends chain"), it->item);
+                }
+                modules.erase(loadingItemModule, modules.end());
+                stateStack().pop_front();
+            }
+
+            m_product.handleError(e);
+            return HandleDependency::Ignore;
+        }
+    }
+    return HandleDependency::Ignore;
+}
+
+// Produces an item of type ModuleInstance corresponding to the specified dependency.
+// The instance's prototype item is either of type Export (if the dependency is a product)
+// or of type Module (for an actual module).
+// The loadingItem parameter is either the depending product or another module. The newly
+// created module is added to the module list of the product item and additionally to the
+// loading item's one, if it is not the product. Its name is also injected into the respective
+// scopes.
+LoadModuleResult DependenciesResolver::loadModule(
+    Item *loadingItem, const FullyResolvedDependsItem &dependency)
+{
+    qCDebug(lcModuleLoader) << "loadModule name:" << dependency.name.toString()
+                            << "id:" << dependency.id();
+
+    QBS_CHECK(loadingItem);
+
+    ProductContext *productDep = nullptr;
+    Item *moduleItem = nullptr;
+
+    const auto addLoadContext = [&](Item::Module &module) {
+        module.loadContexts.emplace_back(dependency.item,
+                                         std::make_pair(dependency.parameters,
+                                                        INT_MAX - dependsChainLength()));
+    };
+
+    // The module might already have been loaded for this product (directly or indirectly).
+    const auto &[existingModule, moduleWithSameName]
+            = findExistingModule(dependency, m_product.item);
+    if (existingModule) {
+        // Merge version range and required property. These will be checked again
+        // after probes resolving.
+        if (existingModule->name.toString() != StringConstants::qbsModule())
+            updateModule(*existingModule, dependency);
+
+        QBS_CHECK(existingModule->item);
+        moduleItem = existingModule->item;
+        const auto matcher = [loadingItem](const Item::Module::LoadContext &context) {
+            return context.loadingItem() == loadingItem;
+        };
+        const auto it = std::find_if(existingModule->loadContexts.begin(),
+                                     existingModule->loadContexts.end(), matcher);
+        if (it == existingModule->loadContexts.end())
+            addLoadContext(*existingModule);
+        else
+            it->parameters.first = mergeDependencyParameters(it->parameters.first,
+                                                             dependency.parameters);
+    } else if (dependency.product) {
+        productDep = dependency.product; // We have already done the look-up.
+    } else if (productDep = findMatchingProduct(dependency); !productDep) {
+        moduleItem = findMatchingModule(dependency);
+    }
+
+    if (productDep) {
+        const auto checkResult = checkProductDependency(dependency, *productDep);
+
+        // We found a product dependency, but that product has not been handled yet,
+        // so stop dependency resolving for the current product and resume it later, when the
+        // dependency is ready.
+        if (checkResult.second == HandleDependency::Defer)
+            return {nullptr, productDep, HandleDependency::Defer};
+
+        if (checkResult.first) {
+            QBS_CHECK(productDep->mergedExportItem);
+            moduleItem = productDep->mergedExportItem->clone(m_loaderState.itemPool());
+            moduleItem->setParent(nullptr);
+
+            // Needed for isolated Export item evaluation.
+            moduleItem->setPrototype(productDep->mergedExportItem);
+        } else {
+            // The product dependency is faulty, but Depends.reqired was false.
+            productDep = nullptr;
+        }
+    }
+
+    if (moduleItem)
+        checkModule(dependency, moduleItem, productDep);
+
+    // Can only happen with multiplexing.
+    if (moduleWithSameName && moduleWithSameName != moduleItem)
+        QBS_CHECK(productDep);
+
+    // The loading name is only used to ensure consistent sorting in case of equal
+    // value priorities; see ModulePropertyMerger.
+    QString loadingName;
+    if (loadingItem == m_product.item) {
+        loadingName = m_product.name;
+    } else if (m_product.dependenciesContext && !stateStack().empty()) {
+        const auto &loadingItemOrigin = stateStack().front().loadingItemOrigin;
+        loadingName = loadingItemOrigin.name.toString() + loadingItemOrigin.multiplexId
+                      + loadingItemOrigin.profile;
+    }
+    instantiateModule({m_product, loadingItem, loadingName, moduleItem, moduleWithSameName,
+        productDep ? productDep->item : nullptr, dependency.name, dependency.id(),
+        bool(existingModule)}, m_loaderState);
+
+    // At this point, a null module item is only possible for a non-required dependency.
+    // Note that we still needed to to the instantiation above, as that injects the module
+    // name into the surrounding item for the ".present" check.
+    if (!moduleItem) {
+        QBS_CHECK(!dependency.requiredGlobally);
+        return {nullptr, nullptr, HandleDependency::Ignore};
+    }
+
+    const auto addLocalModule = [&] {
+        if (loadingItem->type() == ItemType::ModuleInstance
+            && !findExistingModule(dependency, loadingItem).first) {
+            loadingItem->addModule(createModule(dependency, moduleItem, productDep));
+        }
+    };
+
+    // The module has already been loaded, so we don't need to add it to the product's list of
+    // modules, nor do we need to handle its dependencies. The only thing we might need to
+    // do is to add it to the "local" list of modules of the loading item, if it isn't in there yet.
+    if (existingModule) {
+        addLocalModule();
+        return {nullptr, nullptr, HandleDependency::Ignore};
+    }
+
+    qCDebug(lcModuleLoader) << "module loaded:" << dependency.name.toString();
+    if (m_product.item) {
+        Item::Module module = createModule(dependency, moduleItem, productDep);
+        module.required = dependency.requiredGlobally;
+        addLoadContext(module);
+        module.maxDependsChainLength = dependsChainLength();
+        m_product.item->addModule(module);
+        addLocalModule();
+    }
+    return {moduleItem, nullptr, HandleDependency::Use};
+}
+
+std::pair<Item::Module *, Item *> DependenciesResolver::findExistingModule(
+    const FullyResolvedDependsItem &dependency, Item *item)
+{
+    if (!item) // Happens if and only if called via loadBaseModule().
+        return {};
+    Item *moduleWithSameName = nullptr;
+    for (Item::Module &m : item->modules()) {
+        if (m.name != dependency.name)
+            continue;
+        if (!m.product) {
+            QBS_CHECK(!dependency.product);
+            return {&m, m.item};
+        }
+        if ((dependency.profile.isEmpty() || (m.product->profileName == dependency.profile))
+            && m.product->multiplexConfigurationId == dependency.multiplexId) {
+            return {&m, m.item};
+        }
+
+        // This can happen if there are dependencies to several variants of a multiplexed
+        // product.
+        moduleWithSameName = m.item;
+    }
+    return {nullptr, moduleWithSameName};
+}
+
+void DependenciesResolver::updateModule(
+    Item::Module &module, const FullyResolvedDependsItem &dependency)
+{
+    forwardParameterDeclarations(dependency.item, m_product.item->modules());
+    module.versionRange.narrowDown(dependency.versionRange);
+    module.required |= dependency.requiredGlobally;
+    if (dependsChainLength() > module.maxDependsChainLength)
+        module.maxDependsChainLength = dependsChainLength();
+}
+
+int DependenciesResolver::dependsChainLength()
+{
+    return m_product.dependenciesContext ? stateStack().size() : 1;
+}
+
+ProductContext *DependenciesResolver::findMatchingProduct(
+    const FullyResolvedDependsItem &dependency)
+{
+    const auto constraint = [this, &dependency](ProductContext &product) {
+        if (product.multiplexConfigurationId != dependency.multiplexId)
+            return false;
+        if (!dependency.profile.isEmpty() && dependency.profile != product.profileName)
+            return false;
+        if (dependency.limitToSubProject && !haveSameSubProject(m_product, product))
+            return false;
+        return true;
+
+    };
+    return m_product.project->topLevelProject->productWithNameAndConstraint(
+                dependency.name.toString(), constraint);
+}
+
+Item *DependenciesResolver::findMatchingModule(
+    const FullyResolvedDependsItem &dependency)
+{
+    // If we can tell that this is supposed to be a product dependency, we can skip
+    // the module look-up.
+    if (!dependency.profile.isEmpty() || !dependency.multiplexId.isEmpty()) {
+        if (dependency.requiredGlobally) {
+            if (!dependency.profile.isEmpty()) {
+                throw ErrorInfo(Tr::tr("Product '%1' depends on '%2', which does not exist "
+                                       "for the requested profile '%3'.")
+                                .arg(m_product.displayName(), dependency.displayName(),
+                                         dependency.profile),
+                                m_product.item->location());
+            }
+            throw ErrorInfo(Tr::tr("Product '%1' depends on '%2', which does not exist.")
+                            .arg(m_product.displayName(), dependency.displayName()),
+                            m_product.item->location());
+        }
+        return nullptr;
+    }
+
+    if (Item *moduleItem = searchAndLoadModuleFile(
+            m_loaderState, m_product, dependency.location(), dependency.name)) {
+        QBS_CHECK(moduleItem->type() == ItemType::Module);
+        Item * const proto = moduleItem;
+        ModuleItemLocker locker(*moduleItem);
+        moduleItem = moduleItem->clone(m_loaderState.itemPool());
+        moduleItem->setPrototype(proto); // For parameter declarations.
+        return moduleItem;
+    }
+
+    if (!dependency.requiredGlobally) {
+        return createNonPresentModule(m_loaderState.itemPool(), dependency.name.toString(),
+                                      QStringLiteral("not found"), nullptr);
+    }
+
+    throw ErrorInfo(Tr::tr("Dependency '%1' not found for product '%2'.")
+                        .arg(dependency.name.toString(), m_product.displayName()),
+                    dependency.location());
+}
+
+std::pair<bool, HandleDependency> DependenciesResolver::checkProductDependency(
+    const FullyResolvedDependsItem &depSpec, const ProductContext &dep)
+{
+    // Optimization: If we already checked the product earlier and then deferred, we don't
+    //               need to check it again.
+    if (!depSpec.checkProduct)
+        return {true, HandleDependency::Use};
+
+    if (&dep == &m_product) {
+        throw ErrorInfo(Tr::tr("Dependency '%1' refers to itself.").arg(depSpec.name.toString()),
+                        depSpec.location());
+    }
+
+    if (m_product.project->topLevelProject->isProductQueuedForHandling(dep)) {
+        if (m_deferral == Deferral::Allowed)
+            return {false, HandleDependency::Defer};
+        ErrorInfo e;
+        e.append(Tr::tr("Cyclic dependencies detected:"));
+        e.append(Tr::tr("First product is '%1'.")
+                 .arg(m_product.displayName()), m_product.item->location());
+        e.append(Tr::tr("Second product is '%1'.")
+                     .arg(dep.displayName()), dep.item->location());
+        e.append(Tr::tr("Requested here."), depSpec.location());
+        throw e;
+    }
+
+    // This covers both the case of user-disabled products and products with errors.
+    // The latter are force-disabled in ProductContext::handleError().
+    if (m_product.project->topLevelProject->isDisabledItem(dep.item)) {
+        if (depSpec.requiredGlobally) {
+            ErrorInfo e;
+            e.append(Tr::tr("Product '%1' depends on '%2',")
+                     .arg(m_product.displayName(), dep.displayName()),
+                     m_product.item->location());
+            e.append(Tr::tr("but product '%1' is disabled.").arg(dep.displayName()),
+                     dep.item->location());
+            throw e;
+        }
+        return {false, HandleDependency::Ignore};
+    }
+    return {true, HandleDependency::Use};
+}
+
+void DependenciesResolver::checkModule(
+    const FullyResolvedDependsItem &dependency, Item *moduleItem, ProductContext *productDep)
+{
+    // When loading a pseudo or temporary qbs module in early setup via loadBaseModule(),
+    // there is no proper state yet.
+    if (!m_product.dependenciesContext)
+        return;
+
+    for (auto it = stateStack().begin(); it != stateStack().end(); ++it) {
+        Item *itemToCheck = moduleItem;
+        if (it->loadingItem != itemToCheck) {
+            if (!productDep)
+                continue;
+            itemToCheck = productDep->item;
+        }
+        if (it->loadingItem != itemToCheck)
+            continue;
+        ErrorInfo e;
+        e.append(Tr::tr("Cyclic dependencies detected:"));
+        while (true) {
+            e.append(it->loadingItemOrigin.name.toString(),
+                     it->loadingItemOrigin.location());
+            if (it->loadingItem->type() == ItemType::ModuleInstance) {
+                createNonPresentModule(m_loaderState.itemPool(),
+                                       it->loadingItemOrigin.name.toString(),
+                                       QLatin1String("cyclic dependency"), it->loadingItem);
+            }
+            if (it == stateStack().begin())
+                break;
+            --it;
+        }
+        e.append(dependency.name.toString(), dependency.location());
+        throw e;
+    }
+    checkForModuleNamePrefixCollision(dependency);
+}
+
+void DependenciesResolver::adjustDependsItemForMultiplexing(Item *dependsItem)
+{
+    if (m_product.name.startsWith(StringConstants::shadowProductPrefix()))
+        return;
+
+    Evaluator &evaluator = m_loaderState.evaluator();
+    const QString name = evaluator.stringValue(dependsItem, StringConstants::nameProperty());
+    const bool productIsMultiplexed = !m_product.multiplexConfigurationId.isEmpty();
+    if (name == m_product.name) {
+        QBS_CHECK(!productIsMultiplexed); // This product must be an aggregator.
+        return;
+    }
+
+    bool hasNonMultiplexedDependency = false;
+    const std::vector<ProductContext *> multiplexedDependencies = m_product.project
+            ->topLevelProject->productsWithNameAndConstraint(name, [&hasNonMultiplexedDependency]
+                                                             (const ProductContext &product) {
+        if (product.multiplexConfigurationId.isEmpty()) {
+            hasNonMultiplexedDependency = true;
+            return false;
+        }
+        return true;
+    });
+    const bool hasMultiplexedDependencies = !multiplexedDependencies.empty();
+
+    // These are the allowed cases:
+    // (1) Normal dependency with no multiplexing whatsoever.
+    // (2) Both product and dependency are multiplexed.
+    //     (2a) The profiles property is not set, we want to depend on the best
+    //          matching variant.
+    //     (2b) The profiles property is set, we want to depend on all variants
+    //          with a matching profile.
+    // (3) The product is not multiplexed, but the dependency is.
+    //     (3a) The profiles property is not set, the dependency has an aggregator.
+    //          We want to depend on the aggregator.
+    //     (3b) The profiles property is not set, the dependency does not have an
+    //          aggregator. We want to depend on all the multiplexed variants.
+    //     (3c) The profiles property is set, we want to depend on all variants
+    //          with a matching profile regardless of whether an aggregator exists or not.
+    // (4) The product is multiplexed, but the dependency is not. We don't have to adapt
+    //     any Depends items.
+    // (1) and (4)
+    if (!hasMultiplexedDependencies)
+        return;
+
+    bool profilesPropertyIsSet;
+    const QStringList profiles = evaluator.stringListValue(
+        dependsItem, StringConstants::profilesProperty(), &profilesPropertyIsSet);
+
+    // (3a)
+    if (!productIsMultiplexed && hasNonMultiplexedDependency && !profilesPropertyIsSet)
+        return;
+
+    static const auto multiplexConfigurationIntersects = [](const QVariantMap &lhs,
+                                                            const QVariantMap &rhs) {
+        QBS_CHECK(!lhs.isEmpty() && !rhs.isEmpty());
+        for (auto lhsProperty = lhs.constBegin(); lhsProperty != lhs.constEnd(); lhsProperty++) {
+            const auto rhsProperty = rhs.find(lhsProperty.key());
+            const bool isCommonProperty = rhsProperty != rhs.constEnd();
+            if (isCommonProperty && !qVariantsEqual(lhsProperty.value(), rhsProperty.value()))
+                return false;
+        }
+        return true;
+    };
+
+    QStringList multiplexIds;
+    const auto productMultiplexConfig = m_loaderState.topLevelProject().multiplexConfiguration(
+                m_product.multiplexConfigurationId);
+
+    for (const ProductContext *dependency : multiplexedDependencies) {
+        if (productIsMultiplexed && !profilesPropertyIsSet) { // 2a
+            if (dependency->multiplexConfigurationId == m_product.multiplexConfigurationId) {
+                const ValuePtr &multiplexId = m_product.item->property(
+                    StringConstants::multiplexConfigurationIdProperty());
+                dependsItem->setProperty(StringConstants::multiplexConfigurationIdsProperty(),
+                                         multiplexId);
+                return;
+
+            }
+            // Otherwise collect partial matches and decide later
+            const auto dependencyMultiplexConfig = m_loaderState.topLevelProject()
+                    .multiplexConfiguration(dependency->multiplexConfigurationId);
+
+            if (multiplexConfigurationIntersects(dependencyMultiplexConfig, productMultiplexConfig))
+                multiplexIds << dependency->multiplexConfigurationId;
+        } else {
+            // (2b), (3b) or (3c)
+            const bool profileMatch = !profilesPropertyIsSet || profiles.empty()
+                                      || profiles.contains(dependency->profileName);
+            if (profileMatch)
+                multiplexIds << dependency->multiplexConfigurationId;
+        }
+    }
+    if (multiplexIds.empty()) {
+        const QString productName = m_product.displayName();
+        throw ErrorInfo(Tr::tr("Dependency from product '%1' to product '%2' not fulfilled. "
+                               "There are no eligible multiplex candidates.").arg(productName,
+                                 name),
+                        dependsItem->location());
+    }
+
+    // In case of (2a), at most 1 match is allowed
+    if (productIsMultiplexed && !profilesPropertyIsSet && multiplexIds.size() > 1) {
+        QStringList candidateNames;
+        for (const auto &id : std::as_const(multiplexIds))
+            candidateNames << fullProductDisplayName(name, id);
+        throw ErrorInfo(
+            Tr::tr("Dependency from product '%1' to product '%2' is ambiguous. "
+                   "Eligible multiplex candidates: %3.").arg(
+                        m_product.displayName(), name, candidateNames.join(QLatin1String(", "))),
+            dependsItem->location());
+    }
+
+    dependsItem->setProperty(StringConstants::multiplexConfigurationIdsProperty(),
+                             VariantValue::create(multiplexIds));
+
+}
+
+std::optional<EvaluatedDependsItem> DependenciesResolver::evaluateDependsItem(Item *item)
+{
+    Evaluator &evaluator = m_loaderState.evaluator();
+    if (!m_product.project->topLevelProject->checkItemCondition(item, evaluator)) {
+        qCDebug(lcModuleLoader) << "Depends item disabled, ignoring.";
+        return {};
+    }
+
+    const QString name = evaluator.stringValue(item, StringConstants::nameProperty());
+    if (name == StringConstants::qbsModule()) // Redundant
+        return {};
+
+    bool submodulesPropertySet;
+    const QStringList submodules = evaluator.stringListValue(
+        item, StringConstants::submodulesProperty(), &submodulesPropertySet);
+    if (submodules.empty() && submodulesPropertySet) {
+        qCDebug(lcModuleLoader) << "Ignoring Depends item with empty submodules list.";
+        return {};
+    }
+    if (Q_UNLIKELY(submodules.size() > 1 && !item->id().isEmpty())) {
+        QString msg = Tr::tr("A Depends item with more than one module cannot have an id.");
+        throw ErrorInfo(msg, item->location());
+    }
+    bool productTypesWasSet;
+    const QStringList productTypes = evaluator.stringListValue(
+        item, StringConstants::productTypesProperty(), &productTypesWasSet);
+    if (!name.isEmpty() && !productTypes.isEmpty()) {
+        throw ErrorInfo(Tr::tr("The name and productTypes are mutually exclusive "
+                               "in a Depends item."), item->location());
+    }
+    if (productTypes.isEmpty() && productTypesWasSet) {
+        qCDebug(lcModuleLoader) << "Ignoring Depends item with empty productTypes list.";
+        return {};
+    }
+    if (name.isEmpty() && !productTypesWasSet) {
+        throw ErrorInfo(Tr::tr("Either name or productTypes must be set in a Depends item"),
+                        item->location());
+    }
+
+    bool profilesPropertyWasSet = false;
+    std::optional<QStringList> profiles;
+    bool required = true;
+    if (productTypes.isEmpty()) {
+        const QStringList profileList = evaluator.stringListValue(
+            item, StringConstants::profilesProperty(), &profilesPropertyWasSet);
+        if (profilesPropertyWasSet)
+            profiles.emplace(profileList);
+        required = evaluator.boolValue(item, StringConstants::requiredProperty());
+    }
+    const Version minVersion = Version::fromString(
+        evaluator.stringValue(item, StringConstants::versionAtLeastProperty()));
+    const Version maxVersion = Version::fromString(
+        evaluator.stringValue(item, StringConstants::versionBelowProperty()));
+    const bool limitToSubProject = evaluator.boolValue(
+        item, StringConstants::limitToSubProjectProperty());
+    const QStringList multiplexIds = evaluator.stringListValue(
+        item, StringConstants::multiplexConfigurationIdsProperty());
+    adjustParametersScopes(item, item);
+    forwardParameterDeclarations(item, m_product.item->modules());
+    const QVariantMap parameters = extractParameters(item);
+
+    const FileTags productTypeTags = FileTags::fromStringList(productTypes);
+    if (!productTypeTags.empty())
+        m_product.bulkDependencies.emplace_back(productTypeTags, item->location());
+    return EvaluatedDependsItem{
+        item,
+        QualifiedId::fromString(name),
+        submodules,
+        productTypeTags,
+        multiplexIds,
+        profiles,
+        {minVersion, maxVersion},
+        parameters,
+        limitToSubProject,
+        required};
+}
+
+// Potentially multiplexes a dependency along Depends.productTypes, Depends.subModules and
+// Depends.profiles, as well as internally set up multiplexing axes.
+// Each entry in the resulting queue corresponds to exactly one product or module to pull in.
+std::queue<FullyResolvedDependsItem>
+DependenciesResolver::multiplexDependency(const EvaluatedDependsItem &dependency)
+{
+    std::queue<FullyResolvedDependsItem> dependencies;
+    if (!dependency.productTypes.empty()) {
+        const auto constraint = [&](const ProductContext &product) {
+            return &product != &m_product && product.name != m_product.name
+                    && (!dependency.limitToSubProject || haveSameSubProject(m_product, product));
+        };
+        const std::vector<ProductContext *> matchingProducts = m_product.project->topLevelProject
+                ->productsWithTypeAndConstraint(dependency.productTypes, constraint);
+        if (matchingProducts.empty()) {
+            qCDebug(lcModuleLoader) << "Depends.productTypes does not match anything."
+                                    << dependency.item->location();
+            return {};
+        }
+        for (ProductContext * const match : matchingProducts)
+            dependencies.emplace(match, dependency);
+        return dependencies;
+    }
+
+    const QStringList profiles = dependency.profiles && !dependency.profiles->isEmpty()
+                                     ? *dependency.profiles : QStringList(QString());
+    const QStringList multiplexIds = !dependency.multiplexIds.isEmpty()
+                                         ? dependency.multiplexIds : QStringList(QString());
+    const QStringList subModules = !dependency.subModules.isEmpty()
+                                       ? dependency.subModules : QStringList(QString());
+    for (const QString &profile : profiles) {
+        for (const QString &multiplexId : multiplexIds) {
+            for (const QString &subModule : subModules) {
+                QualifiedId name = dependency.name;
+                if (!subModule.isEmpty())
+                    name << subModule.split(QLatin1Char('.'));
+                dependencies.emplace(dependency, name, profile, multiplexId);
+            }
+        }
+    }
+    return dependencies;
+}
+
+QVariantMap DependenciesResolver::extractParameters(Item *dependsItem) const
+{
+    try {
+        QVariantMap result;
+        const auto &properties = dependsItem->properties();
+        Evaluator &evaluator = m_loaderState.evaluator();
+        for (auto it = properties.begin(); it != properties.end(); ++it) {
+            if (it.value()->type() != Value::ItemValueType)
+                continue;
+            const JSValue sv = evaluator.scriptValue(
+                        std::static_pointer_cast<ItemValue>(it.value())->item());
+            result.insert(it.key(), safeToVariant(evaluator.engine()->context(), sv));
+        }
+        return result;
+    } catch (const ErrorInfo &exception) {
+        auto ei = exception;
+        ei.prepend(Tr::tr("Error in dependency parameter."), dependsItem->location());
+        throw ei;
+    }
+}
+
+void DependenciesResolver::forwardParameterDeclarations(const Item *dependsItem,
+                                                            const Item::Modules &modules)
+{
+    for (auto it = dependsItem->properties().begin(); it != dependsItem->properties().end(); ++it) {
+        if (it.value()->type() != Value::ItemValueType)
+            continue;
+        forwardParameterDeclarations(it.key(),
+                                     std::static_pointer_cast<ItemValue>(it.value())->item(),
+                                     modules);
+    }
+}
+
+void DependenciesResolver::forwardParameterDeclarations(
+        const QualifiedId &moduleName, Item *item, const Item::Modules &modules)
+{
+    auto it = std::find_if(modules.begin(), modules.end(), [&moduleName] (const Item::Module &m) {
+        return m.name == moduleName;
+    });
+    if (it != modules.end()) {
+        item->setPropertyDeclarations(m_loaderState.topLevelProject().parameterDeclarations(
+                                          it->item->rootPrototype()));
+    } else {
+        for (auto it = item->properties().begin(); it != item->properties().end(); ++it) {
+            if (it.value()->type() != Value::ItemValueType)
+                continue;
+            forwardParameterDeclarations(QualifiedId(moduleName) << it.key(),
+                                         std::static_pointer_cast<ItemValue>(it.value())->item(),
+                                         modules);
+        }
+    }
+}
+
+std::list<DependenciesResolvingState> &DependenciesResolver::stateStack()
+{
+    QBS_CHECK(m_product.dependenciesContext);
+    return static_cast<DependenciesContextImpl *>(m_product.dependenciesContext.get())->stateStack;
+}
+
+void DependenciesResolver::checkForModuleNamePrefixCollision(
+    const FullyResolvedDependsItem &dependency)
+{
+    if (!m_product.item)
+        return;
+
+    for (const Item::Module &m : m_product.item->modules()) {
+        if (m.name.length() == dependency.name.length())
+            continue;
+
+        QualifiedId shortName;
+        QualifiedId longName;
+        if (m.name.length() < dependency.name.length()) {
+            shortName = m.name;
+            longName = dependency.name;
+        } else {
+            shortName = dependency.name;
+            longName = m.name;
+        }
+        const auto isPrefix = [&] {
+            for (int i = 0; i < shortName.length(); ++i) {
+                if (shortName.at(i) != longName.at(i))
+                    return false;
+            }
+            return true;
+        };
+        if (!isPrefix())
+            continue;
+
+        throw ErrorInfo(Tr::tr("The name of module '%1' is a prefix of the name of module '%2', "
+                               "which is not allowed")
+                            .arg(shortName.toString(), longName.toString()), dependency.location());
+    }
+}
+
+Item::Module DependenciesResolver::createModule(
+    const FullyResolvedDependsItem &dependency, Item *item, ProductContext *productDep)
+{
+    Item::Module m;
+    m.item = item;
+    m.product = productDep;
+    m.name = dependency.name;
+    m.required = dependency.requiredLocally;
+    m.versionRange = dependency.versionRange;
+    return m;
+}
+
+FullyResolvedDependsItem::FullyResolvedDependsItem(
+    ProductContext *product, const EvaluatedDependsItem &dependency)
+    : product(product)
+    , item(dependency.item)
+    , name(product->name)
+    , versionRange(dependency.versionRange)
+    , parameters(dependency.parameters)
+    , checkProduct(false)
+{}
+
+FullyResolvedDependsItem FullyResolvedDependsItem::makeBaseDependency()
+{
+    FullyResolvedDependsItem item;
+    item.name = StringConstants::qbsModule();
+    return item;
+}
+
+FullyResolvedDependsItem::FullyResolvedDependsItem(
+    const EvaluatedDependsItem &dependency, QualifiedId name, QString profile, QString multiplexId)
+    : item(dependency.item)
+    , name(std::move(name))
+    , profile(std::move(profile))
+    , multiplexId(std::move(multiplexId))
+    , versionRange(dependency.versionRange)
+    , parameters(dependency.parameters)
+    , limitToSubProject(dependency.limitToSubProject)
+    , requiredLocally(dependency.requiredLocally)
+    , requiredGlobally(dependency.requiredGlobally)
+{}
+
+QString FullyResolvedDependsItem::id() const
+{
+    if (!item) {
+        QBS_CHECK(name.toString() == StringConstants::qbsModule());
+        return {};
+    }
+    return item->id();
+}
+
+CodeLocation FullyResolvedDependsItem::location() const
+{
+    if (!item) {
+        QBS_CHECK(name.toString() == StringConstants::qbsModule());
+        return {};
+    }
+    return item->location();
+}
+
+QString FullyResolvedDependsItem::displayName() const
+{
+    return fullProductDisplayName(name.toString(), multiplexId);
+}
+
+bool haveSameSubProject(const ProductContext &p1, const ProductContext &p2)
+{
+    for (const Item *otherParent = p2.item->parent(); otherParent;
+         otherParent = otherParent->parent()) {
+        if (otherParent == p1.item->parent())
+            return true;
+    }
+    return false;
+}
+
+QVariantMap safeToVariant(JSContext *ctx, const JSValue &v)
+{
+    QVariantMap result;
+    handleJsProperties(ctx, v, [&](const JSAtom &prop, const JSPropertyDescriptor &desc) {
+        const JSValue u = desc.value;
+        if (JS_IsError(ctx, u))
+            throw ErrorInfo(getJsString(ctx, u));
+        const QString name = getJsString(ctx, prop);
+        result[name] = (JS_IsObject(u) && !JS_IsArray(ctx, u) && !JS_IsRegExp(ctx, u))
+                           ? safeToVariant(ctx, u) : getJsVariant(ctx, u);
+    });
+    return result;
+}
+
+DependenciesContextImpl::DependenciesContextImpl(ProductContext &product, LoaderState &loaderState)
+    : m_product(product)
+{
+    setSearchPathsForProduct(loaderState);
+
+    // Initialize the state with the direct Depends items of the product item.
+    DependenciesResolvingState newState{product.item,};
+    for (Item * const child : product.item->children()) {
+        if (child->type() == ItemType::Depends)
+            newState.pendingDependsItems.push(child);
+    }
+    stateStack.push_front(std::move(newState));
+    stateStack.front().pendingResolvedDependencies.push(
+        FullyResolvedDependsItem::makeBaseDependency());
+}
+
+std::pair<ProductDependency, ProductContext *> DependenciesContextImpl::pendingDependency() const
+{
+    QBS_CHECK(!stateStack.empty());
+    if (const auto &currentDependsItem = stateStack.front().currentDependsItem;
+        currentDependsItem && !currentDependsItem->productTypes.empty()) {
+        qCDebug(lcLoaderScheduling) << "product" << m_product.displayName()
+                                    << "to be delayed because of bulk dependency";
+        return {ProductDependency::Bulk, nullptr};
+    }
+    if (!stateStack.front().pendingResolvedDependencies.empty()) {
+        if (ProductContext * const dep = stateStack.front().pendingResolvedDependencies
+                .front().product) {
+            if (m_product.project->topLevelProject->isProductQueuedForHandling(*dep)) {
+                qCDebug(lcLoaderScheduling) << "product" << m_product.displayName()
+                                            << "to be delayed because of dependency "
+                                               "to unfinished product" << dep->displayName();
+                return {ProductDependency::Single, dep};
+            } else {
+                qCDebug(lcLoaderScheduling) << "product" << m_product.displayName()
+                                            << "to be re-scheduled, as dependency "
+                                            << dep->displayName()
+                                            << "appears to have finished in the meantime";
+                return {ProductDependency::None, dep};
+            }
+        }
+    }
+    return {ProductDependency::None, nullptr};
+}
+
+void DependenciesContextImpl::setSearchPathsForProduct(LoaderState &loaderState)
+{
+    QBS_CHECK(m_product.searchPaths.isEmpty());
+
+    m_product.searchPaths = loaderState.itemReader().readExtraSearchPaths(m_product.item);
+    Settings settings(loaderState.parameters().settingsDirectory());
+    const QStringList prefsSearchPaths = Preferences(&settings, m_product.profileModuleProperties)
+            .searchPaths();
+    const QStringList &currentSearchPaths = loaderState.itemReader().allSearchPaths();
+    for (const QString &p : prefsSearchPaths) {
+        if (!currentSearchPaths.contains(p) && FileInfo(p).exists())
+            m_product.searchPaths << p;
+    }
+}
+
+} // namespace
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/dependenciesresolver.h b/src/lib/corelib/loader/dependenciesresolver.h
new file mode 100644
index 000000000..48502adb7
--- /dev/null
+++ b/src/lib/corelib/loader/dependenciesresolver.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+namespace qbs::Internal {
+class Item;
+class LoaderState;
+class ProductContext;
+enum class Deferral;
+
+// Collects the products' dependencies and builds the list of modules from them.
+// Actual loading of module files is offloaded to ModuleLoader.
+void resolveDependencies(ProductContext &product, Deferral deferral, LoaderState &loaderState);
+
+// Note: This function is never called for regular loading of the base module into a product,
+//       but only for the special cases of loading the dummy base module into a project
+//       and temporarily providing a base module for product multiplexing.
+Item *loadBaseModule(ProductContext &product, Item *item, LoaderState &loaderState);
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/groupshandler.cpp b/src/lib/corelib/loader/groupshandler.cpp
new file mode 100644
index 000000000..3dbfad352
--- /dev/null
+++ b/src/lib/corelib/loader/groupshandler.cpp
@@ -0,0 +1,300 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "groupshandler.h"
+
+#include "loaderutils.h"
+#include "moduleinstantiator.h"
+
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/value.h>
+#include <logging/translator.h>
+#include <tools/profiling.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+namespace qbs::Internal {
+class GroupsHandler
+{
+public:
+    GroupsHandler(ProductContext &product, LoaderState &loaderState)
+        : m_product(product), m_loaderState(loaderState) {}
+
+    void run();
+
+private:
+    void gatherAssignedProperties(ItemValue *iv, const QualifiedId &prefix,
+                                  QualifiedIdSet &properties);
+    void markModuleTargetGroups(Item *group, const Item::Module &module);
+    void moveGroupsFromModuleToProduct(const Item::Module &module);
+    void moveGroupsFromModulesToProduct();
+    void propagateModulesFromParent(Item *group);
+    void handleGroup(Item *group);
+    void adjustScopesInGroupModuleInstances(Item *groupItem, const Item::Module &module);
+    QualifiedIdSet gatherModulePropertiesSetInGroup(const Item *group);
+
+    ProductContext &m_product;
+    LoaderState &m_loaderState;
+};
+
+void setupGroups(ProductContext &product, LoaderState &loaderState)
+{
+    GroupsHandler(product, loaderState).run();
+}
+
+void GroupsHandler::run()
+{
+    AccumulatingTimer timer(m_loaderState.parameters().logElapsedTime()
+                            ? &m_product.timingData.groupsSetup : nullptr);
+
+    moveGroupsFromModulesToProduct();
+    for (Item * const child : m_product.item->children()) {
+        if (child->type() == ItemType::Group)
+            handleGroup(child);
+    }
+}
+
+void GroupsHandler::gatherAssignedProperties(ItemValue *iv, const QualifiedId &prefix,
+                                                      QualifiedIdSet &properties)
+{
+    const Item::PropertyMap &props = iv->item()->properties();
+    for (auto it = props.cbegin(); it != props.cend(); ++it) {
+        switch (it.value()->type()) {
+        case Value::JSSourceValueType:
+            properties << (QualifiedId(prefix) << it.key());
+            break;
+        case Value::ItemValueType:
+            if (iv->item()->type() == ItemType::ModulePrefix) {
+                gatherAssignedProperties(std::static_pointer_cast<ItemValue>(it.value()).get(),
+                                         QualifiedId(prefix) << it.key(), properties);
+            }
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+void GroupsHandler::markModuleTargetGroups(Item *group, const Item::Module &module)
+{
+    QBS_CHECK(group->type() == ItemType::Group);
+    if (m_loaderState.evaluator().boolValue(group, StringConstants::filesAreTargetsProperty())) {
+        group->setProperty(StringConstants::modulePropertyInternal(),
+                           VariantValue::create(module.name.toString()));
+    }
+    for (Item * const child : group->children())
+        markModuleTargetGroups(child, module);
+}
+
+void GroupsHandler::moveGroupsFromModuleToProduct(const Item::Module &module)
+{
+    if (!module.item->isPresentModule())
+        return;
+    for (auto it = module.item->children().begin(); it != module.item->children().end();) {
+        Item * const child = *it;
+        if (child->type() != ItemType::Group) {
+            ++it;
+            continue;
+        }
+
+        Item * const scope = Item::create(&m_loaderState.itemPool(), ItemType::Scope);
+        scope->setProperties(module.item->properties());
+        scope->setScope(m_product.scope);
+        child->setScope(scope);
+        setScopeForDescendants(child, scope);
+
+        Item::addChild(m_product.item, child);
+        markModuleTargetGroups(child, module);
+        it = module.item->children().erase(it);
+    }
+}
+
+void GroupsHandler::moveGroupsFromModulesToProduct()
+{
+    for (const Item::Module &module : m_product.item->modules())
+        moveGroupsFromModuleToProduct(module);
+}
+
+// TODO: I don't completely understand this function, and I suspect we do both too much
+//       and too little here. In particular, I'm not sure why we should even have to do anything
+//       with groups that don't attach properties.
+//       Set aside a day or two at some point to fully grasp all the details and rewrite accordingly.
+void GroupsHandler::propagateModulesFromParent(Item *group)
+{
+    QBS_CHECK(group->type() == ItemType::Group);
+    QHash<QualifiedId, Item *> moduleInstancesForGroup;
+
+    // Step 1: "Instantiate" the product's modules for the group.
+    for (Item::Module m : group->parent()->modules()) {
+        Item * const targetItem = retrieveModuleInstanceItem(group, m.name, m_loaderState);
+        QBS_CHECK(targetItem->type() == ItemType::ModuleInstancePlaceholder);
+        targetItem->setPrototype(m.item);
+
+        Item * const moduleScope = Item::create(&m_loaderState.itemPool(), ItemType::Scope);
+        moduleScope->setFile(group->file());
+        moduleScope->setProperties(m.item->scope()->properties()); // "project", "product", ids
+        moduleScope->setScope(group);
+        targetItem->setScope(moduleScope);
+
+        targetItem->setFile(m.item->file());
+
+        // "parent" should point to the group/artifact parent
+        targetItem->setParent(group->parent());
+
+        targetItem->setOuterItem(m.item);
+
+        m.item = targetItem;
+        group->addModule(m);
+        moduleInstancesForGroup.insert(m.name, targetItem);
+    }
+
+    // Step 2: Make the inter-module references point to the instances created in step 1.
+    for (const Item::Module &module : group->modules()) {
+        Item::Modules adaptedModules;
+        const Item::Modules &oldModules = module.item->prototype()->modules();
+        for (Item::Module depMod : oldModules) {
+            depMod.item = moduleInstancesForGroup.value(depMod.name);
+            adaptedModules << depMod;
+            if (depMod.name.front() == module.name.front())
+                continue;
+            const ItemValuePtr &modulePrefix = group->itemProperty(depMod.name.front(),
+                                                                   m_loaderState.itemPool());
+            QBS_CHECK(modulePrefix);
+            module.item->setProperty(depMod.name.front(), modulePrefix);
+        }
+        module.item->setModules(adaptedModules);
+    }
+
+    const QualifiedIdSet &propsSetInGroup = gatherModulePropertiesSetInGroup(group);
+    if (propsSetInGroup.empty())
+        return;
+    m_product.modulePropertiesSetInGroups.insert(std::make_pair(group, propsSetInGroup));
+
+    // Step 3: Adapt scopes in values. This is potentially necessary if module properties
+    //         get assigned on the group level.
+    for (const Item::Module &module : group->modules())
+        adjustScopesInGroupModuleInstances(group, module);
+}
+
+void GroupsHandler::handleGroup(Item *group)
+{
+    propagateModulesFromParent(group);
+    m_loaderState.topLevelProject().checkItemCondition(group, m_loaderState.evaluator());
+    for (Item * const child : group->children()) {
+        if (child->type() == ItemType::Group)
+            handleGroup(child);
+    }
+}
+
+void GroupsHandler::adjustScopesInGroupModuleInstances(Item *groupItem,
+                                                                const Item::Module &module)
+{
+    if (!module.item->isPresentModule())
+        return;
+
+    Item *modulePrototype = module.item->rootPrototype();
+    QBS_CHECK(modulePrototype->type() == ItemType::Module
+              || modulePrototype->type() == ItemType::Export);
+
+    const Item::PropertyDeclarationMap &propDecls = modulePrototype->propertyDeclarations();
+    for (const auto &decl : propDecls) {
+        const QString &propName = decl.name();
+
+        // Nothing gets inherited for module properties assigned directly in the group.
+        // In particular, setting a list property overwrites the value from the product's
+        // (or parent group's) instance completely, rather than appending to it
+        // (concatenation happens via outer.concat()).
+        ValuePtr propValue = module.item->ownProperty(propName);
+        if (propValue) {
+            propValue->setScope(module.item->scope(), {});
+            continue;
+        }
+
+        // Find the nearest prototype instance that has the value assigned.
+        // The result is either an instance of a parent group (or the parent group's
+        // parent group and so on) or the instance of the product or the module prototype.
+        // In the latter case, we don't have to do anything.
+        const Item *instanceWithProperty = module.item;
+        do {
+            instanceWithProperty = instanceWithProperty->prototype();
+            QBS_CHECK(instanceWithProperty);
+            propValue = instanceWithProperty->ownProperty(propName);
+        } while (!propValue);
+        QBS_CHECK(propValue);
+
+        if (propValue->type() != Value::JSSourceValueType)
+            continue;
+
+        if (propValue->scope())
+            module.item->setProperty(propName, propValue->clone(m_loaderState.itemPool()));
+    }
+
+    for (const ValuePtr &prop : module.item->properties()) {
+        if (prop->type() != Value::JSSourceValueType) {
+            QBS_CHECK(!prop->next());
+            continue;
+        }
+        for (ValuePtr v = prop; v; v = v->next()) {
+            if (!v->scope())
+                continue;
+            for (const Item::Module &module : groupItem->modules()) {
+                if (v->scope() == module.item->prototype()) {
+                    v->setScope(module.item, {});
+                    break;
+                }
+            }
+        }
+    }
+}
+
+QualifiedIdSet GroupsHandler::gatherModulePropertiesSetInGroup(const Item *group)
+{
+    QualifiedIdSet propsSetInGroup;
+    const Item::PropertyMap &props = group->properties();
+    for (auto it = props.cbegin(); it != props.cend(); ++it) {
+        if (it.value()->type() == Value::ItemValueType) {
+            gatherAssignedProperties(std::static_pointer_cast<ItemValue>(it.value()).get(),
+                                     QualifiedId(it.key()), propsSetInGroup);
+        }
+    }
+    return propsSetInGroup;
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/groupshandler.h b/src/lib/corelib/loader/groupshandler.h
new file mode 100644
index 000000000..5de94ce7c
--- /dev/null
+++ b/src/lib/corelib/loader/groupshandler.h
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+namespace qbs::Internal {
+class LoaderState;
+class ProductContext;
+
+// Sets up Group items for the actual resolving stage. Responsibilities:
+//   - Moving Group items located in modules over to the product.
+//   - Identifying groups declaring target artifacts and marking them accordingly.
+//   - Setting up group-level module instances to ensure proper resolving of per-group module
+//     properties.
+//   - As a side effect of the above point, collecting all properties set on the Group level
+//     to help the ProjectResolver decide which properties need to be re-evaluated at all,
+//     which is an important optimization (see commit 9cd8653eef).
+void setupGroups(ProductContext &product, LoaderState &loaderState);
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/itemreader.cpp b/src/lib/corelib/loader/itemreader.cpp
new file mode 100644
index 000000000..0638d1af5
--- /dev/null
+++ b/src/lib/corelib/loader/itemreader.cpp
@@ -0,0 +1,274 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "itemreader.h"
+
+#include "itemreadervisitorstate.h"
+#include "loaderutils.h"
+
+#include <language/deprecationinfo.h>
+#include <language/evaluator.h>
+#include <language/filecontext.h>
+#include <language/item.h>
+#include <language/value.h>
+#include <logging/categories.h>
+#include <tools/fileinfo.h>
+#include <tools/profiling.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+#include <tools/stlutils.h>
+
+#include <QtCore/qfileinfo.h>
+
+#include <algorithm>
+
+namespace qbs {
+namespace Internal {
+
+static void makePathsCanonical(QStringList &paths)
+{
+    Internal::removeIf(paths, [](QString &p) {
+        p = QFileInfo(p).canonicalFilePath();
+        return p.isEmpty();
+    });
+}
+
+ItemReader::ItemReader(LoaderState &loaderState) : m_loaderState(loaderState) {}
+
+void ItemReader::init()
+{
+    m_visitorState = std::make_unique<ItemReaderVisitorState>(
+        m_loaderState.topLevelProject().itemReaderCache(), m_loaderState.logger());
+    m_visitorState->setDeprecationWarningMode(m_loaderState.parameters().deprecationWarningMode());
+    m_projectFilePath  = m_loaderState.parameters().projectFilePath();
+    setSearchPaths(m_loaderState.parameters().searchPaths());
+    m_elapsedTime = m_loaderState.parameters().logElapsedTime() ? 0 : -1;
+}
+
+ItemReader::~ItemReader() = default;
+
+void ItemReader::setSearchPaths(const QStringList &searchPaths)
+{
+    qCDebug(lcModuleLoader) << "initial search paths:" << searchPaths;
+    m_searchPaths = searchPaths;
+    makePathsCanonical(m_searchPaths);
+    m_allSearchPaths.clear();
+}
+
+void ItemReader::pushExtraSearchPaths(const QStringList &extraSearchPaths)
+{
+    m_extraSearchPaths.push_back(extraSearchPaths);
+    makePathsCanonical(m_extraSearchPaths.back());
+    m_allSearchPaths.clear();
+}
+
+void ItemReader::popExtraSearchPaths()
+{
+    m_extraSearchPaths.pop_back();
+    m_allSearchPaths.clear();
+}
+
+const std::vector<QStringList> &ItemReader::extraSearchPathsStack() const
+{
+    return m_extraSearchPaths;
+}
+
+void ItemReader::setExtraSearchPathsStack(const std::vector<QStringList> &s)
+{
+    m_extraSearchPaths = s;
+    m_allSearchPaths.clear();
+}
+
+void ItemReader::clearExtraSearchPathsStack()
+{
+    m_extraSearchPaths.clear();
+    m_allSearchPaths.clear();
+}
+
+const QStringList &ItemReader::allSearchPaths() const
+{
+    if (m_allSearchPaths.empty()) {
+        std::for_each(m_extraSearchPaths.crbegin(), m_extraSearchPaths.crend(),
+                      [this] (const QStringList &paths) {
+            m_allSearchPaths += paths;
+        });
+        m_allSearchPaths += m_searchPaths;
+        m_allSearchPaths.removeDuplicates();
+    }
+    return m_allSearchPaths;
+}
+
+Item *ItemReader::readFile(const QString &filePath)
+{
+    AccumulatingTimer readFileTimer(m_elapsedTime != -1 ? &m_elapsedTime : nullptr);
+    return m_visitorState->readFile(filePath, allSearchPaths(), &m_loaderState.itemPool());
+}
+
+Item *ItemReader::readFile(const QString &filePath, const CodeLocation &referencingLocation)
+{
+    try {
+        return readFile(filePath);
+    } catch (const ErrorInfo &e) {
+        if (e.hasLocation())
+            throw;
+        throw ErrorInfo(e.toString(), referencingLocation);
+    }
+}
+
+void ItemReader::handlePropertyOptions(Item *optionsItem)
+{
+    Evaluator &evaluator = m_loaderState.evaluator();
+    const QString name = evaluator.stringValue(optionsItem, StringConstants::nameProperty());
+    if (name.isEmpty()) {
+        throw ErrorInfo(Tr::tr("PropertyOptions item needs a name property"),
+                        optionsItem->location());
+    }
+    const QString description = evaluator.stringValue(
+        optionsItem, StringConstants::descriptionProperty());
+    const auto removalVersion = Version::fromString(
+        evaluator.stringValue(optionsItem, StringConstants::removalVersionProperty()));
+    const auto allowedValues = evaluator.stringListValue(
+        optionsItem, StringConstants::allowedValuesProperty());
+
+    PropertyDeclaration decl = optionsItem->parent()->propertyDeclaration(name);
+    if (!decl.isValid()) {
+        decl.setName(name);
+        decl.setType(PropertyDeclaration::Variant);
+    }
+    decl.setDescription(description);
+    if (removalVersion.isValid()) {
+        DeprecationInfo di(removalVersion, description);
+        decl.setDeprecationInfo(di);
+    }
+    decl.setAllowedValues(allowedValues);
+    const ValuePtr property = optionsItem->parent()->property(name);
+    if (!property && !decl.isExpired()) {
+        throw ErrorInfo(Tr::tr("PropertyOptions item refers to non-existing property '%1'")
+                            .arg(name), optionsItem->location());
+    }
+    if (property && decl.isExpired()) {
+        ErrorInfo e(Tr::tr("Property '%1' was scheduled for removal in version %2, but "
+                           "is still present.")
+                        .arg(name, removalVersion.toString()),
+                    property->location());
+        e.append(Tr::tr("Removal version for '%1' specified here.").arg(name),
+                 optionsItem->location());
+        m_visitorState->logger().printWarning(e);
+    }
+    optionsItem->parent()->setPropertyDeclaration(name, decl);
+}
+
+void ItemReader::handleAllPropertyOptionsItems(Item *item)
+{
+    QList<Item *> childItems = item->children();
+    auto childIt = childItems.begin();
+    while (childIt != childItems.end()) {
+        Item * const child = *childIt;
+        if (child->type() == ItemType::PropertyOptions) {
+            handlePropertyOptions(child);
+            childIt = childItems.erase(childIt);
+        } else {
+            handleAllPropertyOptionsItems(child);
+            ++childIt;
+        }
+    }
+    item->setChildren(childItems);
+}
+
+Item *ItemReader::setupItemFromFile(const QString &filePath, const CodeLocation &referencingLocation)
+{
+    Item *item = readFile(filePath, referencingLocation);
+
+    // This is technically not needed, because files are only set up once and then served
+    // from a cache. But it simplifies the checks in item.cpp if we require the locking invariant
+    // to always hold.
+    std::unique_ptr<ModuleItemLocker> locker;
+    if (item->type() == ItemType::Module)
+        locker = std::make_unique<ModuleItemLocker>(*item);
+
+    handleAllPropertyOptionsItems(item);
+    return item;
+}
+
+Item *ItemReader::wrapInProjectIfNecessary(Item *item)
+{
+    if (item->type() == ItemType::Project)
+        return item;
+    Item *prj = Item::create(&m_loaderState.itemPool(), ItemType::Project);
+    Item::addChild(prj, item);
+    prj->setFile(item->file());
+    prj->setLocation(item->location());
+    prj->setupForBuiltinType(m_loaderState.parameters().deprecationWarningMode(),
+                             m_visitorState->logger());
+    return prj;
+}
+
+QStringList ItemReader::readExtraSearchPaths(Item *item, bool *wasSet)
+{
+    QStringList result;
+    const QStringList paths = m_loaderState.evaluator().stringListValue(
+        item, StringConstants::qbsSearchPathsProperty(), wasSet);
+    const JSSourceValueConstPtr prop = item->sourceProperty(
+        StringConstants::qbsSearchPathsProperty());
+
+    // Value can come from within a project file or as an overridden value from the user
+    // (e.g command line).
+    const QString basePath = FileInfo::path(prop ? prop->file()->filePath()
+                                                 : m_projectFilePath);
+    for (const QString &path : paths)
+        result += FileInfo::resolvePath(basePath, path);
+    return result;
+}
+
+SearchPathsManager::SearchPathsManager(ItemReader &itemReader, const QStringList &extraSearchPaths)
+    : m_itemReader(itemReader),
+      m_oldSize(itemReader.extraSearchPathsStack().size())
+{
+    if (!extraSearchPaths.isEmpty())
+        m_itemReader.pushExtraSearchPaths(extraSearchPaths);
+}
+
+SearchPathsManager::~SearchPathsManager()
+{
+    while (m_itemReader.extraSearchPathsStack().size() > m_oldSize)
+        m_itemReader.popExtraSearchPaths();
+}
+
+} // namespace Internal
+} // namespace qbs
diff --git a/src/lib/corelib/language/itemreader.h b/src/lib/corelib/loader/itemreader.h
index 3dc5329d2..e444db16c 100644
--- a/src/lib/corelib/language/itemreader.h
+++ b/src/lib/corelib/loader/itemreader.h
@@ -40,8 +40,8 @@
 #ifndef QBS_ITEMREADER_H
 #define QBS_ITEMREADER_H
 
-#include "forward_decls.h"
 #include <logging/logger.h>
+#include <tools/deprecationwarningmode.h>
 #include <tools/set.h>
 
 #include <QtCore/qstringlist.h>
@@ -49,11 +49,13 @@
 #include <memory>
 
 namespace qbs {
+class SetupProjectParameters;
 namespace Internal {
-
+class Evaluator;
 class Item;
 class ItemPool;
 class ItemReaderVisitorState;
+class LoaderState;
 
 /*
  * Reads a qbs file and creates a tree of Item objects.
@@ -67,11 +69,10 @@ class ItemReaderVisitorState;
 class ItemReader
 {
 public:
-    ItemReader(Logger &logger);
+    ItemReader(LoaderState &loaderState);
     ~ItemReader();
+    void init();
 
-    void setPool(ItemPool *pool) { m_pool = pool; }
-    void setSearchPaths(const QStringList &searchPaths);
     void pushExtraSearchPaths(const QStringList &extraSearchPaths);
     void popExtraSearchPaths();
     const std::vector<QStringList> &extraSearchPathsStack() const;
@@ -79,23 +80,41 @@ public:
     void clearExtraSearchPathsStack();
     const QStringList &allSearchPaths() const;
 
-    Item *readFile(const QString &filePath);
-    Item *readFile(const QString &filePath, const CodeLocation &referencingLocation);
+    // Parses a file, creates an item for it, generates PropertyDeclarations from
+    // PropertyOptions items and removes said items from the item tree.
+    Item *setupItemFromFile(const QString &filePath, const CodeLocation &referencingLocation);
 
-    Set<QString> filesRead() const;
+    Item *wrapInProjectIfNecessary(Item *item);
+    QStringList readExtraSearchPaths(Item *item, bool *wasSet = nullptr);
 
-    void setEnableTiming(bool on);
     qint64 elapsedTime() const { return m_elapsedTime; }
 
 private:
-    ItemPool *m_pool = nullptr;
+    void setSearchPaths(const QStringList &searchPaths);
+    Item *readFile(const QString &filePath);
+    Item *readFile(const QString &filePath, const CodeLocation &referencingLocation);
+    void handlePropertyOptions(Item *optionsItem);
+    void handleAllPropertyOptionsItems(Item *item);
+
+    LoaderState &m_loaderState;
     QStringList m_searchPaths;
     std::vector<QStringList> m_extraSearchPaths;
     mutable QStringList m_allSearchPaths;
-    const std::unique_ptr<ItemReaderVisitorState> m_visitorState;
+    std::unique_ptr<ItemReaderVisitorState> m_visitorState;
+    QString m_projectFilePath;
     qint64 m_elapsedTime = -1;
 };
 
+class SearchPathsManager {
+public:
+    SearchPathsManager(ItemReader &itemReader, const QStringList &extraSearchPaths = {});
+    ~SearchPathsManager();
+
+private:
+    ItemReader &m_itemReader;
+    size_t m_oldSize{0};
+};
+
 } // namespace Internal
 } // namespace qbs
 
diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/loader/itemreaderastvisitor.cpp
index f22a1c4e8..c3e6b9b89 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.cpp
+++ b/src/lib/corelib/loader/itemreaderastvisitor.cpp
@@ -41,16 +41,16 @@
 
 #include "astimportshandler.h"
 #include "astpropertiesitemhandler.h"
-#include "asttools.h"
-#include "builtindeclarations.h"
-#include "filecontext.h"
-#include "identifiersearch.h"
-#include "item.h"
 #include "itemreadervisitorstate.h"
-#include "value.h"
 
 #include <api/languageinfo.h>
 #include <jsextensions/jsextensions.h>
+#include <language/asttools.h>
+#include <language/builtindeclarations.h>
+#include <language/filecontext.h>
+#include <language/identifiersearch.h>
+#include <language/item.h>
+#include <language/value.h>
 #include <parser/qmljsast_p.h>
 #include <tools/codelocation.h>
 #include <tools/error.h>
@@ -75,6 +75,8 @@ ItemReaderASTVisitor::ItemReaderASTVisitor(ItemReaderVisitorState &visitorState,
 {
 }
 
+ItemReaderASTVisitor::~ItemReaderASTVisitor() = default;
+
 bool ItemReaderASTVisitor::visit(AST::UiProgram *uiProgram)
 {
     ASTImportsHandler importsHandler(m_visitorState, m_logger, m_file);
@@ -106,6 +108,8 @@ bool ItemReaderASTVisitor::visit(AST::UiObjectDefinition *ast)
     Item *item = Item::create(m_itemPool, ItemType::Unknown);
     item->setFile(m_file);
     item->setLocation(itemLocation);
+    const AST::SourceLocation &endLoc = ast->lastSourceLocation();
+    item->setEndPosition(CodePosition(endLoc.startLine, endLoc.startColumn));
 
     // Inheritance resolving, part 1: Find out our actual type name (needed for setting
     // up children and alternatives).
@@ -135,10 +139,15 @@ bool ItemReaderASTVisitor::visit(AST::UiObjectDefinition *ast)
 
     item->m_type = itemType;
 
-    if (m_item)
+    if (m_item) {
         Item::addChild(m_item, item); // Add this item to the children of the parent item.
-    else
+    } else {
         m_item = item; // This is the root item.
+        if (itemType == ItemType::Module) {
+            QBS_CHECK(!m_moduleItemLocker);
+            m_moduleItemLocker = std::make_unique<ModuleItemLocker>(*m_item);
+        }
+    }
 
     if (ast->initializer) {
         Item *mdi = m_visitorState.mostDerivingItem();
@@ -153,7 +162,7 @@ bool ItemReaderASTVisitor::visit(AST::UiObjectDefinition *ast)
         m_visitorState.setMostDerivingItem(mdi);
     }
 
-    ASTPropertiesItemHandler(item).handlePropertiesItems();
+    ASTPropertiesItemHandler(item, *m_itemPool).handlePropertiesItems();
 
     // Inheritance resolving, part 2 (depends on alternatives having been set up).
     if (baseItem) {
@@ -173,7 +182,7 @@ bool ItemReaderASTVisitor::visit(AST::UiObjectDefinition *ast)
         // Only the item at the top of the inheritance chain is a built-in item.
         // We cannot do this in "part 1", because then the visitor would complain about duplicate
         // bindings.
-        item->setupForBuiltinType(m_logger);
+        item->setupForBuiltinType(m_visitorState.deprecationWarningMode(), m_logger);
     }
 
     return false;
@@ -239,9 +248,11 @@ bool ItemReaderASTVisitor::visit(AST::UiScriptBinding *ast)
         const auto * const idExp = AST::cast<AST::IdentifierExpression *>(expStmt->expression);
         if (Q_UNLIKELY(!idExp || idExp->name.isEmpty()))
             throw ErrorInfo(Tr::tr("id: must be followed by identifier"));
+        if (m_item->type() == ItemType::Module)
+            throw ErrorInfo(Tr::tr("Module items cannot have an id property."));
         m_item->m_id = idExp->name.toString();
         m_file->ensureIdScope(m_itemPool);
-        ItemValueConstPtr existingId = m_file->idScope()->itemProperty(m_item->id());
+        ItemValueConstPtr existingId = m_file->idScope()->itemProperty(m_item->id(), *m_itemPool);
         if (existingId) {
             ErrorInfo e(Tr::tr("The id '%1' is not unique.").arg(m_item->id()));
             e.append(Tr::tr("First occurrence is here."), existingId->item()->location());
@@ -268,7 +279,7 @@ bool ItemReaderASTVisitor::handleBindingRhs(AST::Statement *statement,
     QBS_CHECK(value);
 
     if (AST::cast<AST::Block *>(statement))
-        value->m_flags |= JSSourceValue::HasFunctionForm;
+        value->setHasFunctionForm();
 
     value->setFile(m_file);
     value->setSourceCode(textViewOf(m_file->content(), statement));
@@ -282,11 +293,11 @@ bool ItemReaderASTVisitor::handleBindingRhs(AST::Statement *statement,
     idsearch.add(StringConstants::originalVar(), &usesOriginal);
     idsearch.start(statement);
     if (usesBase)
-        value->m_flags |= JSSourceValue::SourceUsesBase;
+        value->setSourceUsesBase();
     if (usesOuter)
-        value->m_flags |= JSSourceValue::SourceUsesOuter;
+        value->setSourceUsesOuter();
     if (usesOriginal)
-        value->m_flags |= JSSourceValue::SourceUsesOriginal;
+        value->setSourceUsesOriginal();
     return false;
 }
 
@@ -321,7 +332,7 @@ Item *ItemReaderASTVisitor::targetItemForBinding(const QStringList &bindingName,
 void ItemReaderASTVisitor::inheritItem(Item *dst, const Item *src)
 {
     int insertPos = 0;
-    for (Item *child : qAsConst(src->m_children)) {
+    for (Item *child : std::as_const(src->m_children)) {
         dst->m_children.insert(insertPos++, child);
         child->m_parent = dst;
     }
@@ -335,6 +346,9 @@ void ItemReaderASTVisitor::inheritItem(Item *dst, const Item *src)
         dst->setPropertyDeclaration(pd.name(), pd);
     }
 
+    std::unique_ptr<ModuleItemLocker> locker;
+    if (src->type() == ItemType::Module)
+        locker = std::make_unique<ModuleItemLocker>(*src);
     for (auto it = src->properties().constBegin(); it != src->properties().constEnd(); ++it) {
         ValuePtr &v = dst->m_properties[it.key()];
         if (!v) {
@@ -369,24 +383,10 @@ void ItemReaderASTVisitor::checkDeprecationStatus(ItemType itemType, const QStri
                                                   const CodeLocation &itemLocation)
 {
     const ItemDeclaration itemDecl = BuiltinDeclarations::instance().declarationsForType(itemType);
-    const DeprecationInfo &di = itemDecl.deprecationInfo();
-    if (!di.isValid())
-        return;
-    if (di.removalVersion() <= LanguageInfo::qbsVersion()) {
-        QString message = Tr::tr("The item '%1' cannot be used anymore. "
-                "It was removed in qbs %2.")
-                .arg(itemName, di.removalVersion().toString());
-        ErrorInfo error(message, itemLocation);
-        if (!di.additionalUserInfo().isEmpty())
-            error.append(di.additionalUserInfo());
+    const ErrorInfo error = itemDecl.checkForDeprecation(m_visitorState.deprecationWarningMode(),
+                                                         itemName, itemLocation, m_logger);
+    if (error.hasError())
         throw error;
-    }
-    QString warning = Tr::tr("The item '%1' is deprecated and will be removed in "
-                             "qbs %2.").arg(itemName, di.removalVersion().toString());
-    ErrorInfo error(warning, itemLocation);
-    if (!di.additionalUserInfo().isEmpty())
-        error.append(di.additionalUserInfo());
-    m_logger.printWarning(error);
 }
 
 void ItemReaderASTVisitor::doCheckItemTypes(const Item *item)
diff --git a/src/lib/corelib/language/itemreaderastvisitor.h b/src/lib/corelib/loader/itemreaderastvisitor.h
index 963b78471..c47501f2f 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.h
+++ b/src/lib/corelib/loader/itemreaderastvisitor.h
@@ -40,8 +40,8 @@
 #ifndef QBS_ITEMREADERASTVISITOR_H
 #define QBS_ITEMREADERASTVISITOR_H
 
-#include "forward_decls.h"
-#include "itemtype.h"
+#include <language/forward_decls.h>
+#include <language/itemtype.h>
 
 #include <logging/logger.h>
 #include <parser/qmljsastvisitor_p.h>
@@ -49,6 +49,8 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qstringlist.h>
 
+#include <memory.h>
+
 namespace qbs {
 class CodeLocation;
 
@@ -56,12 +58,15 @@ namespace Internal {
 class Item;
 class ItemPool;
 class ItemReaderVisitorState;
+class ModuleItemLocker;
 
 class ItemReaderASTVisitor : public QbsQmlJS::AST::Visitor
 {
 public:
     ItemReaderASTVisitor(ItemReaderVisitorState &visitorState, FileContextPtr file,
                          ItemPool *itemPool, Logger &logger);
+    ~ItemReaderASTVisitor();
+
     void checkItemTypes() { doCheckItemTypes(rootItem()); }
 
     Item *rootItem() const { return m_item; }
@@ -88,7 +93,8 @@ private:
     Logger &m_logger;
     QHash<QStringList, QString> m_typeNameToFile;
     Item *m_item = nullptr;
-    ItemType m_instanceItemType = ItemType::ModuleInstance;
+    std::unique_ptr<ModuleItemLocker> m_moduleItemLocker;
+    ItemType m_instanceItemType = ItemType::ModuleInstancePlaceholder;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/language/itemreadervisitorstate.cpp b/src/lib/corelib/loader/itemreadervisitorstate.cpp
index a51b7eab4..6ea23c021 100644
--- a/src/lib/corelib/language/itemreadervisitorstate.cpp
+++ b/src/lib/corelib/loader/itemreadervisitorstate.cpp
@@ -38,98 +38,45 @@
 ****************************************************************************/
 #include "itemreadervisitorstate.h"
 
-#include "asttools.h"
-#include "filecontext.h"
 #include "itemreaderastvisitor.h"
+#include "loaderutils.h"
 
+#include <language/asttools.h>
+#include <language/filecontext.h>
 #include <logging/translator.h>
 #include <parser/qmljsengine_p.h>
 #include <parser/qmljslexer_p.h>
 #include <parser/qmljsparser_p.h>
 #include <tools/error.h>
+#include <tools/stringconstants.h>
 
-#include <QtCore/qshareddata.h>
+#include <QtCore/qdiriterator.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qfileinfo.h>
-#include <QtCore/qshareddata.h>
 #include <QtCore/qtextstream.h>
 
 namespace qbs {
 namespace Internal {
 
-class ASTCacheValueData : public QSharedData
+ItemReaderVisitorState::ItemReaderVisitorState(ItemReaderCache &cache, Logger &logger)
+    : m_cache(cache), m_logger(logger)
 {
-    Q_DISABLE_COPY(ASTCacheValueData)
-public:
-    ASTCacheValueData()
-        : ast(nullptr)
-        , processing(false)
-    {
-    }
-
-    QString code;
-    QbsQmlJS::Engine engine;
-    QbsQmlJS::AST::UiProgram *ast;
-    bool processing;
-};
-
-class ASTCacheValue
-{
-public:
-    ASTCacheValue()
-        : d(new ASTCacheValueData)
-    {
-    }
-
-    ASTCacheValue(const ASTCacheValue &other) = default;
-
-    void setProcessingFlag(bool b) { d->processing = b; }
-    bool isProcessing() const { return d->processing; }
-
-    void setCode(const QString &code) { d->code = code; }
-    QString code() const { return d->code; }
-
-    QbsQmlJS::Engine *engine() const { return &d->engine; }
-
-    void setAst(QbsQmlJS::AST::UiProgram *ast) { d->ast = ast; }
-    QbsQmlJS::AST::UiProgram *ast() const { return d->ast; }
-    bool isValid() const { return d->ast; }
-
-private:
-    QExplicitlySharedDataPointer<ASTCacheValueData> d;
-};
-
-class ItemReaderVisitorState::ASTCache : public std::unordered_map<QString, ASTCacheValue> {};
-
-
-ItemReaderVisitorState::ItemReaderVisitorState(Logger &logger)
-    : m_logger(logger)
-    , m_astCache(std::make_unique<ASTCache>())
-{
-
 }
 
-ItemReaderVisitorState::~ItemReaderVisitorState() = default;
-
 Item *ItemReaderVisitorState::readFile(const QString &filePath, const QStringList &searchPaths,
                                   ItemPool *itemPool)
 {
-    ASTCacheValue &cacheValue = (*m_astCache)[filePath];
-    if (cacheValue.isValid()) {
-        if (Q_UNLIKELY(cacheValue.isProcessing()))
-            throw ErrorInfo(Tr::tr("Loop detected when importing '%1'.").arg(filePath));
-    } else {
+    const auto setupCacheEntry = [&](ItemReaderCache::AstCacheEntry &entry) {
         QFile file(filePath);
         if (Q_UNLIKELY(!file.open(QFile::ReadOnly)))
             throw ErrorInfo(Tr::tr("Cannot open '%1'.").arg(filePath));
 
-        m_filesRead.insert(filePath);
         QTextStream stream(&file);
         setupDefaultCodec(stream);
         const QString &code = stream.readAll();
-        QbsQmlJS::Lexer lexer(cacheValue.engine());
+        QbsQmlJS::Lexer lexer(&entry.engine);
         lexer.setCode(code, 1);
-        QbsQmlJS::Parser parser(cacheValue.engine());
+        QbsQmlJS::Parser parser(&entry.engine);
 
         file.close();
         if (!parser.parse()) {
@@ -142,42 +89,49 @@ Item *ItemReaderVisitorState::readFile(const QString &filePath, const QStringLis
             }
         }
 
-        cacheValue.setCode(code);
-        cacheValue.setAst(parser.ast());
-    }
+        entry.code = code;
+        entry.ast = parser.ast();
+    };
 
+    ItemReaderCache::AstCacheEntry &cacheEntry = m_cache.retrieveOrSetupCacheEntry(
+        filePath, setupCacheEntry);
     const FileContextPtr file = FileContext::create();
     file->setFilePath(QFileInfo(filePath).absoluteFilePath());
-    file->setContent(cacheValue.code());
+    file->setContent(cacheEntry.code);
     file->setSearchPaths(searchPaths);
 
     ItemReaderASTVisitor astVisitor(*this, file, itemPool, m_logger);
     {
         class ProcessingFlagManager {
         public:
-            ProcessingFlagManager(ASTCacheValue &v) : m_cacheValue(v) { v.setProcessingFlag(true); }
-            ~ProcessingFlagManager() { m_cacheValue.setProcessingFlag(false); }
+            ProcessingFlagManager(ItemReaderCache::AstCacheEntry &e, const QString &filePath)
+                : m_cacheEntry(e)
+            {
+                if (!e.addProcessingThread())
+                    throw ErrorInfo(Tr::tr("Loop detected when importing '%1'.").arg(filePath));
+            }
+            ~ProcessingFlagManager() { m_cacheEntry.removeProcessingThread(); }
+
         private:
-            ASTCacheValue &m_cacheValue;
-        } processingFlagManager(cacheValue);
-        cacheValue.ast()->accept(&astVisitor);
+            ItemReaderCache::AstCacheEntry &m_cacheEntry;
+        } processingFlagManager(cacheEntry, filePath);
+        cacheEntry.ast->accept(&astVisitor);
     }
     astVisitor.checkItemTypes();
     return astVisitor.rootItem();
 }
 
-void ItemReaderVisitorState::cacheDirectoryEntries(const QString &dirPath, const QStringList &entries)
-{
-    m_directoryEntries.insert(dirPath, entries);
-}
-
-bool ItemReaderVisitorState::findDirectoryEntries(const QString &dirPath, QStringList *entries) const
+void ItemReaderVisitorState::findDirectoryEntries(const QString &dirPath, QStringList *entries) const
 {
-    const auto it = m_directoryEntries.constFind(dirPath);
-    if (it == m_directoryEntries.constEnd())
-        return false;
-    *entries = it.value();
-    return true;
+    *entries = m_cache.retrieveOrSetDirectoryEntries(dirPath, [&dirPath] {
+        QStringList fileNames;
+        QDirIterator dirIter(dirPath, StringConstants::qbsFileWildcards());
+        while (dirIter.hasNext()) {
+            dirIter.next();
+            fileNames << dirIter.fileName();
+        }
+        return fileNames;
+    });
 }
 
 Item *ItemReaderVisitorState::mostDerivingItem() const
diff --git a/src/lib/corelib/language/itemreadervisitorstate.h b/src/lib/corelib/loader/itemreadervisitorstate.h
index 3901be16e..cbf1966b6 100644
--- a/src/lib/corelib/language/itemreadervisitorstate.h
+++ b/src/lib/corelib/loader/itemreadervisitorstate.h
@@ -39,7 +39,7 @@
 #ifndef QBS_ITEMREADERVISITORSTATE_H
 #define QBS_ITEMREADERVISITORSTATE_H
 
-#include <logging/logger.h>
+#include <tools/deprecationwarningmode.h>
 #include <tools/set.h>
 
 #include <QtCore/qstringlist.h>
@@ -50,31 +50,31 @@ namespace qbs {
 namespace Internal {
 class Item;
 class ItemPool;
+class ItemReaderCache;
+class Logger;
 
 class ItemReaderVisitorState
 {
 public:
-    ItemReaderVisitorState(Logger &logger);
-    ~ItemReaderVisitorState();
+    ItemReaderVisitorState(ItemReaderCache &cache, Logger &logger);
 
-    Set<QString> filesRead() const { return m_filesRead; }
+    Logger &logger() { return m_logger; }
 
     Item *readFile(const QString &filePath, const QStringList &searchPaths, ItemPool *itemPool);
 
-    void cacheDirectoryEntries(const QString &dirPath, const QStringList &entries);
-    bool findDirectoryEntries(const QString &dirPath, QStringList *entries) const;
+    void findDirectoryEntries(const QString &dirPath, QStringList *entries) const;
 
     Item *mostDerivingItem() const;
     void setMostDerivingItem(Item *item);
 
+    void setDeprecationWarningMode(DeprecationWarningMode mode) { m_deprecationWarningMode = mode; }
+    DeprecationWarningMode deprecationWarningMode() const { return m_deprecationWarningMode; }
+
 private:
+    DeprecationWarningMode m_deprecationWarningMode = defaultDeprecationWarningMode();
+    ItemReaderCache &m_cache;
     Logger &m_logger;
-    Set<QString> m_filesRead;
-    QHash<QString, QStringList> m_directoryEntries;
     Item *m_mostDerivingItem = nullptr;
-
-    class ASTCache;
-    const std::unique_ptr<ASTCache> m_astCache;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/loader/loaderutils.cpp b/src/lib/corelib/loader/loaderutils.cpp
new file mode 100644
index 000000000..05a077dbe
--- /dev/null
+++ b/src/lib/corelib/loader/loaderutils.cpp
@@ -0,0 +1,961 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "loaderutils.h"
+
+#include "itemreader.h"
+
+#include <language/evaluator.h>
+#include <language/filecontext.h>
+#include <language/itempool.h>
+#include <language/language.h>
+#include <language/resolvedfilecontext.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
+#include <logging/categories.h>
+#include <logging/translator.h>
+#include <tools/fileinfo.h>
+#include <tools/progressobserver.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+namespace qbs::Internal {
+
+QString fullProductDisplayName(const QString &name, const QString &multiplexId)
+{
+    static const auto multiplexIdToString =[](const QString &id) {
+        return QString::fromUtf8(QByteArray::fromBase64(id.toUtf8()));
+    };
+    QString result = name;
+    if (!multiplexId.isEmpty())
+        result.append(QLatin1Char(' ')).append(multiplexIdToString(multiplexId));
+    return result;
+}
+
+void adjustParametersScopes(Item *item, Item *scope)
+{
+    if (item->type() == ItemType::ModuleParameters) {
+        item->setScope(scope);
+        return;
+    }
+
+    for (const auto &value : item->properties()) {
+        if (value->type() == Value::ItemValueType)
+            adjustParametersScopes(std::static_pointer_cast<ItemValue>(value)->item(), scope);
+    }
+}
+
+QString ProductContext::uniqueName() const
+{
+    return ResolvedProduct::uniqueName(name, multiplexConfigurationId);
+}
+
+QString ProductContext::displayName() const
+{
+    return fullProductDisplayName(name, multiplexConfigurationId);
+}
+
+void ProductContext::handleError(const ErrorInfo &error)
+{
+    const bool alreadyHadError = delayedError.hasError();
+    if (!alreadyHadError) {
+        delayedError.append(Tr::tr("Error while handling product '%1':")
+                                .arg(name), item->location());
+    }
+    if (error.isInternalError()) {
+        if (alreadyHadError) {
+            qCDebug(lcModuleLoader()) << "ignoring subsequent internal error" << error.toString()
+                                      << "in product" << name;
+            return;
+        }
+    }
+    const auto errorItems = error.items();
+    for (const ErrorItem &ei : errorItems)
+        delayedError.append(ei.description(), ei.codeLocation());
+    project->topLevelProject->addDisabledItem(item);
+}
+
+TopLevelProjectContext::~TopLevelProjectContext() { qDeleteAll(m_projects); }
+
+bool TopLevelProjectContext::checkItemCondition(Item *item, Evaluator &evaluator)
+{
+    if (evaluator.boolValue(item, StringConstants::conditionProperty()))
+        return true;
+    addDisabledItem(item);
+    return false;
+}
+
+void TopLevelProjectContext::checkCancelation()
+{
+    if (m_progressObserver && m_progressObserver->canceled())
+        m_canceled = true;
+    if (m_canceled)
+        throw CancelException();
+}
+
+QString TopLevelProjectContext::sourceCodeForEvaluation(const JSSourceValueConstPtr &value)
+{
+    const auto sourceCodeGuard = m_sourceCode.lock();
+    QString &code = sourceCodeGuard.get()[value->sourceCode()];
+    if (!code.isNull())
+        return code;
+    code = value->sourceCodeForEvaluation();
+    return code;
+}
+
+ScriptFunctionPtr TopLevelProjectContext::scriptFunctionValue(Item *item, const QString &name)
+{
+    const JSSourceValuePtr value = item->sourceProperty(name);
+    QBS_CHECK(value);
+    const auto scriptFunctionMapGuard = m_scriptFunctionMap.lock();
+    ScriptFunctionPtr &script = scriptFunctionMapGuard.get()[value->location()];
+    if (!script.get()) {
+        script = ScriptFunction::create();
+        const PropertyDeclaration decl = item->propertyDeclaration(name);
+        script->sourceCode = sourceCodeAsFunction(value, decl);
+        script->location = value->location();
+        script->fileContext = resolvedFileContext(value->file());
+    }
+    return script;
+}
+
+QString TopLevelProjectContext::sourceCodeAsFunction(const JSSourceValueConstPtr &value,
+                                                     const PropertyDeclaration &decl)
+{
+    const auto scriptFunctionMapGuard = m_scriptFunctions.lock();
+    QString &scriptFunction = scriptFunctionMapGuard.get()[std::make_pair(value->sourceCode(),
+                                                           decl.functionArgumentNames())];
+    if (!scriptFunction.isNull())
+        return scriptFunction;
+    const QString args = decl.functionArgumentNames().join(QLatin1Char(','));
+    if (value->hasFunctionForm()) {
+        // Insert the argument list.
+        scriptFunction = value->sourceCodeForEvaluation();
+        scriptFunction.insert(10, args);
+        // Remove the function application "()" that has been
+        // added in ItemReaderASTVisitor::visitStatement.
+        scriptFunction.chop(2);
+    } else {
+        scriptFunction = QLatin1String("(function(") + args + QLatin1String("){return ")
+                + value->sourceCode().toString() + QLatin1String(";})");
+    }
+    return scriptFunction;
+}
+
+const ResolvedFileContextPtr &TopLevelProjectContext::resolvedFileContext(
+        const FileContextConstPtr &ctx)
+{
+    ResolvedFileContextPtr &result = m_fileContextMap[ctx];
+    if (!result)
+        result = ResolvedFileContext::create(*ctx);
+    return result;
+}
+
+void TopLevelProjectContext::removeProductToHandle(const ProductContext &product)
+{
+    std::unique_lock lock(m_productsToHandle.mutex);
+    m_productsToHandle.data.remove(&product);
+}
+
+bool TopLevelProjectContext::isProductQueuedForHandling(const ProductContext &product) const
+{
+    std::shared_lock lock(m_productsToHandle.mutex);
+    return m_productsToHandle.data.contains(&product);
+}
+
+void TopLevelProjectContext::addDisabledItem(Item *item)
+{
+    m_disabledItems.lock().get() << item;
+}
+
+bool TopLevelProjectContext::isDisabledItem(const Item *item) const
+{
+    return m_disabledItems.lock_shared().get().contains(item);
+}
+
+void TopLevelProjectContext::setProgressObserver(ProgressObserver *observer)
+{
+    m_progressObserver = observer;
+}
+
+ProgressObserver *TopLevelProjectContext::progressObserver() const { return m_progressObserver; }
+
+void TopLevelProjectContext::addQueuedError(const ErrorInfo &error)
+{
+    m_queuedErrors.lock().get() << error;
+}
+
+void TopLevelProjectContext::addProfileConfig(const QString &profileName,
+                                              const QVariantMap &profileConfig)
+{
+    m_profileConfigs.insert(profileName, profileConfig);
+}
+
+std::optional<QVariantMap> TopLevelProjectContext::profileConfig(const QString &profileName) const
+{
+    const auto it = m_profileConfigs.constFind(profileName);
+    if (it == m_profileConfigs.constEnd())
+        return {};
+    return it.value().toMap();
+}
+
+void TopLevelProjectContext::addProjectLevelProbe(const ProbeConstPtr &probe)
+{
+    m_probesInfo.projectLevelProbes << probe;
+}
+
+const std::vector<ProbeConstPtr> TopLevelProjectContext::projectLevelProbes() const
+{
+    return m_probesInfo.projectLevelProbes;
+}
+
+void TopLevelProjectContext::addProduct(ProductContext &product)
+{
+    m_productsByName.insert({product.name, &product});
+}
+
+void TopLevelProjectContext::addProductByType(ProductContext &product, const FileTags &tags)
+{
+    const auto productsByTypeGuard = m_productsByType.lock();
+    for (const FileTag &tag : tags)
+        productsByTypeGuard.get().insert({tag, &product});
+}
+
+ProductContext *TopLevelProjectContext::productWithNameAndConstraint(
+        const QString &name, const std::function<bool (ProductContext &)> &constraint)
+{
+    const auto candidates = m_productsByName.equal_range(name);
+    for (auto it = candidates.first; it != candidates.second; ++it) {
+        ProductContext * const candidate = it->second;
+        if (constraint(*candidate))
+            return candidate;
+    }
+    return nullptr;
+}
+
+std::vector<ProductContext *> TopLevelProjectContext::productsWithNameAndConstraint(
+        const QString &name, const std::function<bool (ProductContext &)> &constraint)
+{
+    std::vector<ProductContext *> result;
+    const auto candidates = m_productsByName.equal_range(name);
+    for (auto it = candidates.first; it != candidates.second; ++it) {
+        ProductContext * const candidate = it->second;
+        if (constraint(*candidate))
+            result << candidate;
+    }
+    return result;
+}
+
+std::vector<ProductContext *> TopLevelProjectContext::productsWithTypeAndConstraint(
+        const FileTags &tags, const std::function<bool (ProductContext &)> &constraint)
+{
+    const auto productsByTypeGuard = m_productsByType.lock_shared();
+    std::vector<ProductContext *> matchingProducts;
+    for (const FileTag &typeTag : tags) {
+        const auto range = productsByTypeGuard.get().equal_range(typeTag);
+        for (auto it = range.first; it != range.second; ++it) {
+            if (constraint(*it->second))
+                matchingProducts.push_back(it->second);
+        }
+    }
+    return matchingProducts;
+}
+
+std::vector<std::pair<ProductContext *, CodeLocation>>
+TopLevelProjectContext::finishedProductsWithBulkDependency(const FileTag &tag) const
+{
+    return m_reverseBulkDependencies.value(tag);
+}
+
+void TopLevelProjectContext::registerBulkDependencies(ProductContext &product)
+{
+    for (const auto &tagAndLoc : product.bulkDependencies) {
+        for (const FileTag &tag : tagAndLoc.first)
+            m_reverseBulkDependencies[tag].emplace_back(&product, tagAndLoc.second);
+    }
+}
+
+void TopLevelProjectContext::addProjectNameUsedInOverrides(const QString &name)
+{
+    m_projectNamesUsedInOverrides << name;
+}
+
+const Set<QString> &TopLevelProjectContext::projectNamesUsedInOverrides() const
+{
+    return m_projectNamesUsedInOverrides;
+}
+
+void TopLevelProjectContext::addProductNameUsedInOverrides(const QString &name)
+{
+    m_productNamesUsedInOverrides << name;
+}
+
+const Set<QString> &TopLevelProjectContext::productNamesUsedInOverrides() const
+{
+    return m_productNamesUsedInOverrides;
+}
+
+void TopLevelProjectContext::addMultiplexConfiguration(const QString &id, const QVariantMap &config)
+{
+    m_multiplexConfigsById.insert(std::make_pair(id, config));
+}
+
+QVariantMap TopLevelProjectContext::multiplexConfiguration(const QString &id) const
+{
+    if (id.isEmpty())
+        return {};
+    const auto it = m_multiplexConfigsById.find(id);
+    QBS_CHECK(it != m_multiplexConfigsById.end() && !it->second.isEmpty());
+    return it->second;
+}
+
+std::lock_guard<std::mutex> TopLevelProjectContext::moduleProvidersCacheLock()
+{
+    return std::lock_guard<std::mutex>(m_moduleProvidersCacheMutex);
+}
+
+void TopLevelProjectContext::setModuleProvidersCache(const ModuleProvidersCache &cache)
+{
+    m_moduleProvidersCache = cache;
+}
+
+ModuleProviderInfo *TopLevelProjectContext::moduleProvider(const ModuleProvidersCacheKey &key)
+{
+    if (const auto it = m_moduleProvidersCache.find(key); it != m_moduleProvidersCache.end())
+        return &(*it);
+    return nullptr;
+}
+
+ModuleProviderInfo &TopLevelProjectContext::addModuleProvider(const ModuleProvidersCacheKey &key,
+                                                              const ModuleProviderInfo &provider)
+{
+    return m_moduleProvidersCache[key] = provider;
+}
+
+void TopLevelProjectContext::addParameterDeclarations(const Item *moduleProto,
+                                                      const Item::PropertyDeclarationMap &decls)
+{
+    m_parameterDeclarations.lock().get().insert({moduleProto, decls});
+}
+
+Item::PropertyDeclarationMap TopLevelProjectContext::parameterDeclarations(Item *moduleProto) const
+{
+    const auto parameterDeclarationsGuard = m_parameterDeclarations.lock_shared();
+    const auto &declarations = parameterDeclarationsGuard.get();
+    if (const auto it = declarations.find(moduleProto); it != declarations.end()) {
+        return it->second;
+    }
+    return {};
+}
+
+void TopLevelProjectContext::setParameters(const Item *moduleProto, const QVariantMap &parameters)
+{
+    m_parameters.lock().get().insert({moduleProto, parameters});
+}
+
+QVariantMap TopLevelProjectContext::parameters(Item *moduleProto) const
+{
+    const auto parametersGuard = m_parameters.lock_shared();
+    const auto &parameters = parametersGuard.get();
+    if (const auto it = parameters.find(moduleProto); it != parameters.end()) {
+        return it->second;
+    }
+    return {};
+}
+
+void TopLevelProjectContext::addCodeLink(const QString &sourceFile, const CodeRange &sourceRange,
+                                         const CodeLocation &target)
+{
+    const auto codeLinksGuard = m_codeLinks.lock();
+    QList<CodeLocation> &links = codeLinksGuard.get()[sourceFile][sourceRange];
+    if (!links.contains(target))
+        links << target;
+}
+
+QString TopLevelProjectContext::findModuleDirectory(
+        const QualifiedId &module, const QString &searchPath,
+        const std::function<QString()> &findOnDisk)
+{
+    const auto modulePathCacheGuard = m_modulePathCache.lock();
+    auto &path = modulePathCacheGuard.get()[{searchPath, module}];
+    if (!path)
+        path = findOnDisk();
+    return *path;
+}
+
+QStringList TopLevelProjectContext::getModuleFilesForDirectory(
+        const QString &dir, const std::function<QStringList ()> &findOnDisk)
+{
+    const auto moduleFilesGuard = m_moduleFilesPerDirectory.lock();
+    auto &list = moduleFilesGuard.get()[dir];
+    if (!list)
+        list = findOnDisk();
+    return *list;
+}
+
+void TopLevelProjectContext::removeModuleFileFromDirectoryCache(const QString &filePath)
+{
+    const auto moduleFilesGuard = m_moduleFilesPerDirectory.lock();
+    auto &moduleFiles = moduleFilesGuard.get();
+    const auto it = moduleFiles.find(FileInfo::path(filePath));
+    QBS_CHECK(it != moduleFiles.end());
+    auto &files = it->second;
+    QBS_CHECK(files);
+    files->removeOne(filePath);
+}
+
+void TopLevelProjectContext::addUnknownProfilePropertyError(const Item *moduleProto,
+                                                            const ErrorInfo &error)
+{
+    m_unknownProfilePropertyErrors.lock().get()[moduleProto].push_back(error);
+}
+
+const std::vector<ErrorInfo> &TopLevelProjectContext::unknownProfilePropertyErrors(
+        const Item *moduleProto) const
+{
+    const auto errorsGuard = m_unknownProfilePropertyErrors.lock_shared();
+    const auto &errors = errorsGuard.get();
+    if (const auto it = errors.find(moduleProto); it != errors.end()) {
+        return it->second;
+    }
+    static const std::vector<ErrorInfo> empty;
+    return empty;
+}
+
+Item *TopLevelProjectContext::getModulePrototype(const QString &filePath, const QString &profile,
+                                                 const std::function<Item *()> &produce)
+{
+    const auto modulePrototypesGuard = m_modulePrototypes.lock();
+    auto &prototypeList = modulePrototypesGuard.get()[filePath];
+    for (const auto &prototype : prototypeList) {
+        if (prototype.second == profile)
+            return prototype.first;
+    }
+    Item * const module = produce();
+    if (module)
+        prototypeList.emplace_back(module, profile);
+    return module;
+}
+
+void TopLevelProjectContext::addLocalProfile(const QString &name, const QVariantMap &values,
+                                             const CodeLocation &location)
+{
+    if (m_localProfiles.contains(name))
+        throw ErrorInfo(Tr::tr("Local profile '%1' redefined.").arg(name), location);
+    m_localProfiles.insert(name, values);
+}
+
+void TopLevelProjectContext::checkForLocalProfileAsTopLevelProfile(const QString &topLevelProfile)
+{
+    for (auto it = m_localProfiles.cbegin(); it != m_localProfiles.cend(); ++it) {
+        if (it.key() != topLevelProfile)
+            continue;
+
+        // This covers the edge case that a locally defined profile was specified as the
+        // top-level profile, in which case we must invalidate the qbs module prototype that was
+        // created in early setup before local profiles were handled.
+        const auto prototypesGuard = m_modulePrototypes.lock();
+        auto &modulePrototypes = prototypesGuard.get();
+        QBS_CHECK(modulePrototypes.size() == 1);
+        modulePrototypes.clear();
+        break;
+    }
+}
+
+std::lock_guard<std::mutex> TopLevelProjectContext::probesCacheLock()
+{
+    return std::lock_guard<std::mutex>(m_probesMutex);
+}
+
+void TopLevelProjectContext::setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes)
+{
+    for (const ProbeConstPtr& probe : oldProbes)
+        m_probesInfo.oldProjectProbes[probe->globalId()] << probe;
+}
+
+ProbeConstPtr TopLevelProjectContext::findOldProjectProbe(const QString &id,
+                                                          const ProbeFilter &filter) const
+{
+    for (const ProbeConstPtr &oldProbe : m_probesInfo.oldProjectProbes.value(id)) {
+        if (filter(oldProbe))
+            return oldProbe;
+    }
+    return {};
+}
+
+void TopLevelProjectContext::setOldProductProbes(
+        const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes)
+{
+    m_probesInfo.oldProductProbes = oldProbes;
+}
+
+ProbeConstPtr TopLevelProjectContext::findOldProductProbe(const QString &productName,
+                                                          const ProbeFilter &filter) const
+{
+    for (const ProbeConstPtr &oldProbe : m_probesInfo.oldProductProbes.value(productName)) {
+        if (filter(oldProbe))
+            return oldProbe;
+    }
+    return {};
+}
+
+void TopLevelProjectContext::addNewlyResolvedProbe(const ProbeConstPtr &probe)
+{
+    m_probesInfo.currentProbes[probe->location()] << probe;
+}
+
+ProbeConstPtr TopLevelProjectContext::findCurrentProbe(const CodeLocation &location,
+                                                       const ProbeFilter &filter) const
+{
+    for (const ProbeConstPtr &probe : m_probesInfo.currentProbes.value(location)) {
+        if (filter(probe))
+            return probe;
+    }
+    return {};
+}
+
+void TopLevelProjectContext::collectDataFromEngine(const ScriptEngine &engine)
+{
+    const auto project = dynamic_cast<TopLevelProject *>(m_projects.front()->project.get());
+    QBS_CHECK(project);
+    project->canonicalFilePathResults.insert(engine.canonicalFilePathResults());
+    project->fileExistsResults.insert(engine.fileExistsResults());
+    project->directoryEntriesResults.insert(engine.directoryEntriesResults());
+    project->fileLastModifiedResults.insert(engine.fileLastModifiedResults());
+    project->environment.insert(engine.environment());
+    project->buildSystemFiles.unite(engine.imports());
+}
+
+ItemPool &TopLevelProjectContext::createItemPool()
+{
+    m_itemPools.push_back(std::make_unique<ItemPool>());
+    return *m_itemPools.back();
+}
+
+class LoaderState::Private
+{
+public:
+    Private(LoaderState &q, const SetupProjectParameters &parameters,
+            TopLevelProjectContext &topLevelProject, ItemPool &itemPool, ScriptEngine &engine,
+            Logger &&logger)
+        : parameters(parameters), topLevelProject(topLevelProject), itemPool(itemPool),
+          logger(std::move(logger)), itemReader(q), evaluator(&engine)
+    {
+        this->logger.clearWarnings();
+        this->logger.storeWarnings();
+    }
+
+    const SetupProjectParameters &parameters;
+    TopLevelProjectContext &topLevelProject;
+    ItemPool &itemPool;
+
+    Logger logger;
+    ItemReader itemReader;
+    Evaluator evaluator;
+};
+
+LoaderState::LoaderState(const SetupProjectParameters &parameters,
+                         TopLevelProjectContext &topLevelProject, ItemPool &itemPool,
+                         ScriptEngine &engine, Logger logger)
+    : d(makePimpl<Private>(*this, parameters, topLevelProject, itemPool, engine, std::move(logger)))
+{
+    d->itemReader.init();
+}
+
+LoaderState::~LoaderState() = default;
+const SetupProjectParameters &LoaderState::parameters() const { return d->parameters; }
+ItemPool &LoaderState::itemPool() { return d->itemPool; }
+Evaluator &LoaderState::evaluator() { return d->evaluator; }
+Logger &LoaderState::logger() { return d->logger; }
+ItemReader &LoaderState::itemReader() { return d->itemReader; }
+TopLevelProjectContext &LoaderState::topLevelProject() { return d->topLevelProject; }
+
+static QString verbatimValue(LoaderState &state, const ValueConstPtr &value)
+{
+    QString result;
+    if (value && value->type() == Value::JSSourceValueType) {
+        const JSSourceValueConstPtr sourceValue = std::static_pointer_cast<const JSSourceValue>(
+                    value);
+        result = state.topLevelProject().sourceCodeForEvaluation(sourceValue);
+    }
+    return result;
+}
+
+static void resolveRuleArtifactBinding(
+        LoaderState &state, const RuleArtifactPtr &ruleArtifact, Item *item,
+        const QStringList &namePrefix, QualifiedIdSet *seenBindings)
+{
+    for (auto it = item->properties().constBegin(); it != item->properties().constEnd(); ++it) {
+        const QStringList name = QStringList(namePrefix) << it.key();
+        if (it.value()->type() == Value::ItemValueType) {
+            resolveRuleArtifactBinding(state, ruleArtifact,
+                                       std::static_pointer_cast<ItemValue>(it.value())->item(),
+                                       name, seenBindings);
+        } else if (it.value()->type() == Value::JSSourceValueType) {
+            const auto insertResult = seenBindings->insert(name);
+            if (!insertResult.second)
+                continue;
+            JSSourceValuePtr sourceValue = std::static_pointer_cast<JSSourceValue>(it.value());
+            RuleArtifact::Binding rab;
+            rab.name = name;
+            rab.code = state.topLevelProject().sourceCodeForEvaluation(sourceValue);
+            rab.location = sourceValue->location();
+            ruleArtifact->bindings.push_back(rab);
+        } else {
+            QBS_ASSERT(!"unexpected value type", continue);
+        }
+    }
+}
+
+static void resolveRuleArtifact(LoaderState &state, const RulePtr &rule, Item *item)
+{
+    RuleArtifactPtr artifact = RuleArtifact::create();
+    rule->artifacts.push_back(artifact);
+    artifact->location = item->location();
+
+    if (const auto sourceProperty = item->sourceProperty(StringConstants::filePathProperty()))
+        artifact->filePathLocation = sourceProperty->location();
+
+    artifact->filePath = verbatimValue(state, item->property(StringConstants::filePathProperty()));
+    artifact->fileTags = state.evaluator().fileTagsValue(item, StringConstants::fileTagsProperty());
+    artifact->alwaysUpdated = state.evaluator().boolValue(
+                item, StringConstants::alwaysUpdatedProperty());
+
+    QualifiedIdSet seenBindings;
+    for (Item *obj = item; obj; obj = obj->prototype()) {
+        for (QMap<QString, ValuePtr>::const_iterator it = obj->properties().constBegin();
+             it != obj->properties().constEnd(); ++it)
+        {
+            if (it.value()->type() != Value::ItemValueType)
+                continue;
+            resolveRuleArtifactBinding(
+                        state, artifact, std::static_pointer_cast<ItemValue>(it.value())->item(),
+                        QStringList(it.key()), &seenBindings);
+        }
+    }
+}
+
+void resolveRule(LoaderState &state, Item *item, ProjectContext *projectContext,
+                 ProductContext *productContext, ModuleContext *moduleContext)
+{
+    Evaluator &evaluator = state.evaluator();
+    if (!evaluator.boolValue(item, StringConstants::conditionProperty()))
+        return;
+
+    RulePtr rule = Rule::create();
+
+    // read artifacts
+    bool hasArtifactChildren = false;
+    for (Item * const child : item->children()) {
+        if (Q_UNLIKELY(child->type() != ItemType::Artifact)) {
+            throw ErrorInfo(Tr::tr("'Rule' can only have children of type 'Artifact'."),
+                               child->location());
+        }
+        hasArtifactChildren = true;
+        resolveRuleArtifact(state, rule, child);
+    }
+
+    rule->name = evaluator.stringValue(item, StringConstants::nameProperty());
+    rule->prepareScript.initialize(state.topLevelProject().scriptFunctionValue(
+                                       item, StringConstants::prepareProperty()));
+    rule->outputArtifactsScript.initialize(state.topLevelProject().scriptFunctionValue(
+                                               item, StringConstants::outputArtifactsProperty()));
+    rule->outputFileTags = evaluator.fileTagsValue(item, StringConstants::outputFileTagsProperty());
+    if (rule->outputArtifactsScript.isValid()) {
+        if (hasArtifactChildren)
+            throw ErrorInfo(Tr::tr("The Rule.outputArtifacts script is not allowed in rules "
+                                   "that contain Artifact items."),
+                        item->location());
+    }
+    if (!hasArtifactChildren && rule->outputFileTags.empty()) {
+        throw ErrorInfo(Tr::tr("A rule needs to have Artifact items or a non-empty "
+                               "outputFileTags property."), item->location());
+    }
+    rule->multiplex = evaluator.boolValue(item, StringConstants::multiplexProperty());
+    rule->alwaysRun = evaluator.boolValue(item, StringConstants::alwaysRunProperty());
+    rule->inputs = evaluator.fileTagsValue(item, StringConstants::inputsProperty());
+    rule->inputsFromDependencies
+        = evaluator.fileTagsValue(item, StringConstants::inputsFromDependenciesProperty());
+    bool requiresInputsSet = false;
+    rule->requiresInputs = evaluator.boolValue(item, StringConstants::requiresInputsProperty(),
+                                               &requiresInputsSet);
+    if (!requiresInputsSet)
+        rule->requiresInputs = rule->declaresInputs();
+    rule->auxiliaryInputs
+        = evaluator.fileTagsValue(item, StringConstants::auxiliaryInputsProperty());
+    rule->excludedInputs
+        = evaluator.fileTagsValue(item, StringConstants::excludedInputsProperty());
+    if (rule->excludedInputs.empty()) {
+        rule->excludedInputs = evaluator.fileTagsValue(
+                    item, StringConstants::excludedAuxiliaryInputsProperty());
+    }
+    rule->explicitlyDependsOn
+        = evaluator.fileTagsValue(item, StringConstants::explicitlyDependsOnProperty());
+    rule->explicitlyDependsOnFromDependencies = evaluator.fileTagsValue(
+                item, StringConstants::explicitlyDependsOnFromDependenciesProperty());
+    rule->module = moduleContext ? moduleContext->module : projectContext->dummyModule;
+    if (!rule->multiplex && !rule->declaresInputs()) {
+        throw ErrorInfo(Tr::tr("Rule has no inputs, but is not a multiplex rule."),
+                        item->location());
+    }
+    if (!rule->multiplex && !rule->requiresInputs) {
+        throw ErrorInfo(Tr::tr("Rule.requiresInputs is false for non-multiplex rule."),
+                        item->location());
+    }
+    if (!rule->declaresInputs() && rule->requiresInputs) {
+        throw ErrorInfo(Tr::tr("Rule.requiresInputs is true, but the rule "
+                               "does not declare any input tags."), item->location());
+    }
+    if (productContext) {
+        rule->product = productContext->product.get();
+        productContext->product->rules.push_back(rule);
+    } else {
+        projectContext->rules.push_back(rule);
+    }
+}
+
+void resolveFileTagger(LoaderState &state, Item *item, ProjectContext *projectContext,
+                       ProductContext *productContext)
+{
+    Evaluator &evaluator = state.evaluator();
+    if (!evaluator.boolValue(item, StringConstants::conditionProperty()))
+        return;
+    std::vector<FileTaggerConstPtr> &fileTaggers = productContext
+            ? productContext->product->fileTaggers
+            : projectContext->fileTaggers;
+    const QStringList patterns = evaluator.stringListValue(item,
+                                                           StringConstants::patternsProperty());
+    if (patterns.empty())
+        throw ErrorInfo(Tr::tr("FileTagger.patterns must be a non-empty list."), item->location());
+
+    const FileTags fileTags = evaluator.fileTagsValue(item, StringConstants::fileTagsProperty());
+    if (fileTags.empty())
+        throw ErrorInfo(Tr::tr("FileTagger.fileTags must not be empty."), item->location());
+
+    for (const QString &pattern : patterns) {
+        if (pattern.isEmpty())
+            throw ErrorInfo(Tr::tr("A FileTagger pattern must not be empty."), item->location());
+    }
+
+    const int priority = evaluator.intValue(item, StringConstants::priorityProperty());
+    fileTaggers.push_back(FileTagger::create(patterns, fileTags, priority));
+}
+
+void resolveJobLimit(LoaderState &state, Item *item, ProjectContext *projectContext,
+                     ProductContext *productContext, ModuleContext *moduleContext)
+{
+    Evaluator &evaluator = state.evaluator();
+    if (!evaluator.boolValue(item, StringConstants::conditionProperty()))
+        return;
+    const QString jobPool = evaluator.stringValue(item, StringConstants::jobPoolProperty());
+    if (jobPool.isEmpty())
+        throw ErrorInfo(Tr::tr("A JobLimit item needs to have a non-empty '%1' property.")
+                        .arg(StringConstants::jobPoolProperty()), item->location());
+    bool jobCountWasSet;
+    const int jobCount = evaluator.intValue(item, StringConstants::jobCountProperty(), -1,
+                                            &jobCountWasSet);
+    if (!jobCountWasSet) {
+        throw ErrorInfo(Tr::tr("A JobLimit item needs to have a '%1' property.")
+                        .arg(StringConstants::jobCountProperty()), item->location());
+    }
+    if (jobCount < 0) {
+        throw ErrorInfo(Tr::tr("A JobLimit item must have a non-negative '%1' property.")
+                        .arg(StringConstants::jobCountProperty()), item->location());
+    }
+    JobLimits &jobLimits = moduleContext
+            ? moduleContext->jobLimits
+            : productContext ? productContext->product->jobLimits
+            : projectContext->jobLimits;
+    JobLimit jobLimit(jobPool, jobCount);
+    const int oldLimit = jobLimits.getLimit(jobPool);
+    if (oldLimit == -1 || oldLimit > jobCount)
+        jobLimits.setJobLimit(jobLimit);
+}
+
+const FileTag unknownFileTag()
+{
+    static const FileTag tag("unknown-file-tag");
+    return tag;
+}
+
+bool ProductContext::dependenciesResolvingPending() const
+{
+    return (!dependenciesContext || !dependenciesContext->dependenciesResolved)
+            && !product && !delayedError.hasError();
+}
+
+std::pair<ProductDependency, ProductContext *> ProductContext::pendingDependency() const
+{
+    return dependenciesContext ? dependenciesContext->pendingDependency()
+                               : std::make_pair(ProductDependency::None, nullptr);
+}
+
+TimingData &TimingData::operator+=(const TimingData &other)
+{
+    dependenciesResolving += other.dependenciesResolving;
+    moduleProviders += other.moduleProviders;
+    moduleInstantiation += other.moduleInstantiation;
+    propertyMerging += other.propertyMerging;
+    groupsSetup += other.groupsSetup;
+    groupsResolving += other.groupsResolving;
+    preparingProducts += other.preparingProducts;
+    resolvingProducts += other.resolvingProducts;
+    probes += other.probes;
+    propertyEvaluation += other.propertyEvaluation;
+    propertyChecking += other.propertyChecking;
+    return *this;
+}
+
+DependenciesContext::~DependenciesContext() = default;
+
+ItemReaderCache::AstCacheEntry &ItemReaderCache::retrieveOrSetupCacheEntry(
+    const QString &filePath, const std::function<void (AstCacheEntry &)> &setup)
+{
+    const auto astCacheGuard = m_astCache.lock();
+    AstCacheEntry &entry = astCacheGuard.get()[filePath];
+    if (!entry.ast) {
+        setup(entry);
+        m_filesRead << filePath;
+    }
+    return entry;
+}
+
+const QStringList &ItemReaderCache::retrieveOrSetDirectoryEntries(
+    const QString &dir, const std::function<QStringList ()> &findOnDisk)
+{
+    const auto directoryEntriesGuard = m_directoryEntries.lock();
+    auto &entries = directoryEntriesGuard.get()[dir];
+    if (!entries)
+        entries = findOnDisk();
+    return *entries;
+}
+
+bool ItemReaderCache::AstCacheEntry::addProcessingThread()
+{
+    return m_processingThreads.lock().get().insert(std::this_thread::get_id()).second;
+}
+
+void ItemReaderCache::AstCacheEntry::removeProcessingThread()
+{
+    m_processingThreads.lock().get().remove(std::this_thread::get_id());
+}
+
+class DependencyParametersMerger
+{
+public:
+    DependencyParametersMerger(std::vector<Item::Module::ParametersWithPriority> &&candidates)
+        : m_candidates(std::move(candidates)) { }
+    QVariantMap merge();
+
+private:
+    void merge(QVariantMap &current, const QVariantMap &next, int nextPrio);
+
+    const std::vector<Item::Module::ParametersWithPriority> m_candidates;
+
+    struct Conflict {
+        Conflict(QStringList path, QVariant val1, QVariant val2, int prio)
+            : path(std::move(path)), val1(std::move(val1)), val2(std::move(val2)), priority(prio) {}
+        QStringList path;
+        QVariant val1;
+        QVariant val2;
+        int priority;
+    };
+    std::vector<Conflict> m_conflicts;
+    QVariantMap m_currentValue;
+    int m_currentPrio = INT_MIN;
+    QStringList m_path;
+};
+
+QVariantMap mergeDependencyParameters(std::vector<Item::Module::ParametersWithPriority> &&candidates)
+{
+    return DependencyParametersMerger(std::move(candidates)).merge();
+}
+
+QVariantMap mergeDependencyParameters(const QVariantMap &m1, const QVariantMap &m2)
+{
+    return mergeDependencyParameters({std::make_pair(m1, 0), std::make_pair(m2, 0)});
+}
+
+QVariantMap DependencyParametersMerger::merge()
+{
+    for (const auto &next : m_candidates) {
+        merge(m_currentValue, next.first, next.second);
+        m_currentPrio = next.second;
+    }
+
+    if (!m_conflicts.empty()) {
+        ErrorInfo error(Tr::tr("Conflicting parameter values encountered:"));
+        for (const Conflict &conflict : m_conflicts) {
+            // TODO: Location would be nice ...
+            error.append(Tr::tr("  Parameter '%1' cannot be both '%2' and '%3'.")
+                         .arg(conflict.path.join(QLatin1Char('.')),
+                              conflict.val1.toString(), conflict.val2.toString()));
+        }
+        throw error;
+    }
+
+    return m_currentValue;
+}
+
+void DependencyParametersMerger::merge(QVariantMap &current, const QVariantMap &next, int nextPrio)
+{
+    for (auto it = next.begin(); it != next.end(); ++it) {
+        m_path << it.key();
+        const QVariant &newValue = it.value();
+        QVariant &currentValue = current[it.key()];
+        if (newValue.userType() == QMetaType::QVariantMap) {
+            QVariantMap mdst = currentValue.toMap();
+            merge(mdst, it.value().toMap(), nextPrio);
+            currentValue = mdst;
+        } else {
+            if (m_currentPrio == nextPrio) {
+                if (currentValue.isValid() && !qVariantsEqual(currentValue, newValue))
+                    m_conflicts.emplace_back(m_path, currentValue, newValue, m_currentPrio);
+            } else {
+                removeIf(m_conflicts, [this](const Conflict &conflict) {
+                    return m_path == conflict.path;
+                });
+            }
+            currentValue = newValue;
+        }
+        m_path.removeLast();
+    }
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/loaderutils.h b/src/lib/corelib/loader/loaderutils.h
new file mode 100644
index 000000000..4a4aadfb8
--- /dev/null
+++ b/src/lib/corelib/loader/loaderutils.h
@@ -0,0 +1,464 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <language/filetags.h>
+#include <language/forward_decls.h>
+#include <language/item.h>
+#include <language/moduleproviderinfo.h>
+#include <language/propertydeclaration.h>
+#include <language/qualifiedid.h>
+#include <parser/qmljsengine_p.h>
+#include <tools/codelocation.h>
+#include <tools/filetime.h>
+#include <tools/mutexdata.h>
+#include <tools/joblimits.h>
+#include <tools/pimpl.h>
+#include <tools/set.h>
+#include <tools/version.h>
+
+#include <QHash>
+#include <QStringList>
+#include <QVariant>
+
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <shared_mutex>
+#include <thread>
+#include <utility>
+#include <vector>
+
+namespace qbs {
+class SetupProjectParameters;
+namespace Internal {
+class Evaluator;
+class ItemPool;
+class ItemReader;
+class Logger;
+class ProductContext;
+class ProgressObserver;
+class ProjectContext;
+class ScriptEngine;
+
+using ModulePropertiesPerGroup = std::unordered_map<const Item *, QualifiedIdSet>;
+using FileLocations = QHash<std::pair<QString, QString>, CodeLocation>;
+
+enum class Deferral { Allowed, NotAllowed };
+enum class ProductDependency { None, Single, Bulk };
+
+class CancelException { };
+
+template<typename DataType, typename MutexType = std::shared_mutex>
+struct GuardedData {
+    DataType data;
+    mutable MutexType mutex;
+};
+
+class TimingData
+{
+public:
+    TimingData &operator+=(const TimingData &other);
+
+    qint64 dependenciesResolving = 0;
+    qint64 moduleProviders = 0;
+    qint64 moduleInstantiation = 0;
+    qint64 propertyMerging = 0;
+    qint64 groupsSetup = 0;
+    qint64 groupsResolving = 0;
+    qint64 preparingProducts = 0;
+    qint64 resolvingProducts = 0;
+    qint64 schedulingProducts = 0;
+    qint64 probes = 0;
+    qint64 propertyEvaluation = 0;
+    qint64 propertyChecking = 0;
+};
+
+class ItemReaderCache
+{
+public:
+    class AstCacheEntry
+    {
+    public:
+        QString code;
+        QbsQmlJS::Engine engine;
+        QbsQmlJS::AST::UiProgram *ast = nullptr;
+
+        bool addProcessingThread();
+        void removeProcessingThread();
+
+    private:
+        MutexData<Set<std::thread::id>, std::recursive_mutex> m_processingThreads;
+    };
+
+    const Set<QString> &filesRead() const { return m_filesRead; }
+    AstCacheEntry &retrieveOrSetupCacheEntry(const QString &filePath,
+                                             const std::function<void(AstCacheEntry &)> &setup);
+    const QStringList &retrieveOrSetDirectoryEntries(
+        const QString &dir, const std::function<QStringList()> &findOnDisk);
+
+private:
+    Set<QString> m_filesRead;
+    MutexData<std::unordered_map<QString, std::optional<QStringList>>, std::mutex> m_directoryEntries; // TODO: Merge with module dir entries cache?
+    MutexData<std::unordered_map<QString, AstCacheEntry>, std::mutex> m_astCache;
+};
+
+class DependenciesContext
+{
+public:
+    virtual ~DependenciesContext();
+    virtual std::pair<ProductDependency, ProductContext *> pendingDependency() const = 0;
+
+    bool dependenciesResolved = false;
+};
+
+class ProductContext
+{
+public:
+    QString uniqueName() const;
+    QString displayName() const;
+    void handleError(const ErrorInfo &error);
+    bool dependenciesResolvingPending() const;
+    std::pair<ProductDependency, ProductContext *> pendingDependency() const;
+
+    QString name;
+    QString buildDirectory;
+    Item *item = nullptr;
+    Item *scope = nullptr;
+    ProjectContext *project = nullptr;
+    std::unique_ptr<ProductContext> shadowProduct;
+    Item *mergedExportItem = nullptr;
+    std::vector<ProbeConstPtr> probes;
+    ModulePropertiesPerGroup modulePropertiesSetInGroups;
+    ErrorInfo delayedError;
+    QString profileName;
+    QString multiplexConfigurationId;
+    QVariantMap profileModuleProperties; // Tree-ified module properties from profile.
+    QVariantMap moduleProperties;        // Tree-ified module properties from profile + overridden values.
+    std::optional<QVariantMap> providerConfig;
+    std::optional<QVariantMap> providerQbsModule;
+    QVariantMap defaultParameters; // In Export item.
+    QStringList searchPaths;
+    ResolvedProductPtr product;
+    TimingData timingData;
+    std::unique_ptr<DependenciesContext> dependenciesContext;
+
+    // This is needed because complex cyclic dependencies that involve Depends.productTypes
+    // may only be detected after a product has already been fully resolved.
+    std::vector<std::pair<FileTags, CodeLocation>> bulkDependencies;
+
+    // The keys are module prototypes, the values specify whether the module's
+    // condition is true for this product.
+    std::unordered_map<Item *, bool> modulePrototypeEnabledInfo;
+
+    int dependsItemCount = -1;
+};
+
+class TopLevelProjectContext
+{
+public:
+    TopLevelProjectContext() = default;
+    TopLevelProjectContext(const TopLevelProjectContext &) = delete;
+    TopLevelProjectContext &operator=(const TopLevelProjectContext &) = delete;
+    ~TopLevelProjectContext();
+
+    bool checkItemCondition(Item *item, Evaluator &evaluator);
+    QString sourceCodeForEvaluation(const JSSourceValueConstPtr &value);
+    ScriptFunctionPtr scriptFunctionValue(Item *item, const QString &name);
+    QString sourceCodeAsFunction(const JSSourceValueConstPtr &value,
+                                 const PropertyDeclaration &decl);
+
+    void setCanceled() { m_canceled = true; }
+    void checkCancelation();
+    bool isCanceled() const { return m_canceled; }
+
+    int productCount() const { return m_productsByName.size(); }
+
+    void addProductToHandle(const ProductContext &product) { m_productsToHandle.data << &product; }
+    void removeProductToHandle(const ProductContext &product);
+    bool isProductQueuedForHandling(const ProductContext &product) const;
+    int productsToHandleCount() const { return m_productsToHandle.data.size(); }
+
+    void addDisabledItem(Item *item);
+    bool isDisabledItem(const Item *item) const;
+
+    void setProgressObserver(ProgressObserver *observer);
+    ProgressObserver *progressObserver() const;
+
+    void addProject(ProjectContext *project) { m_projects.push_back(project); }
+    const std::vector<ProjectContext *> &projects() const { return m_projects; }
+
+    using QueuedErrors = MutexData<std::vector<ErrorInfo>, std::mutex>;
+    void addQueuedError(const ErrorInfo &error);
+    QueuedErrors::UniqueConstGuard queuedErrors() const { return m_queuedErrors.lock(); }
+
+    void setProfileConfigs(const QVariantMap &profileConfigs) { m_profileConfigs = profileConfigs; }
+    void addProfileConfig(const QString &profileName, const QVariantMap &profileConfig);
+    const QVariantMap &profileConfigs() const { return m_profileConfigs; }
+    std::optional<QVariantMap> profileConfig(const QString &profileName) const;
+
+    void addProduct(ProductContext &product);
+    void addProductByType(ProductContext &product, const FileTags &tags);
+    ProductContext *productWithNameAndConstraint(
+            const QString &name, const std::function<bool(ProductContext &)> &constraint);
+    std::vector<ProductContext *> productsWithNameAndConstraint(
+            const QString &name, const std::function<bool(ProductContext &)> &constraint);
+    std::vector<ProductContext *> productsWithTypeAndConstraint(
+            const FileTags &tags, const std::function<bool(ProductContext &)> &constraint);
+    std::vector<std::pair<ProductContext *, CodeLocation>>
+    finishedProductsWithBulkDependency(const FileTag &tag) const;
+    void registerBulkDependencies(ProductContext &product);
+
+    void addProjectNameUsedInOverrides(const QString &name);
+    const Set<QString> &projectNamesUsedInOverrides() const;
+
+    void addProductNameUsedInOverrides(const QString &name);
+    const Set<QString> &productNamesUsedInOverrides() const;
+
+    void setBuildDirectory(const QString &buildDir) { m_buildDirectory = buildDir; }
+    const QString &buildDirectory() const { return m_buildDirectory; }
+
+    void addMultiplexConfiguration(const QString &id, const QVariantMap &config);
+    QVariantMap multiplexConfiguration(const QString &id) const;
+
+    void setLastResolveTime(const FileTime &time) { m_lastResolveTime = time; }
+    const FileTime &lastResolveTime() const { return m_lastResolveTime; }
+
+    Set<QString> buildSystemFiles() const { return m_itemReaderCache.filesRead(); }
+
+    std::lock_guard<std::mutex> moduleProvidersCacheLock();
+    void setModuleProvidersCache(const ModuleProvidersCache &cache);
+    const ModuleProvidersCache &moduleProvidersCache() const { return m_moduleProvidersCache; }
+    ModuleProviderInfo *moduleProvider(const ModuleProvidersCacheKey &key);
+    ModuleProviderInfo &addModuleProvider(const ModuleProvidersCacheKey &key,
+                                          const ModuleProviderInfo &provider);
+
+    void addParameterDeclarations(const Item *moduleProto,
+                                  const Item::PropertyDeclarationMap &decls);
+    Item::PropertyDeclarationMap parameterDeclarations(Item *moduleProto) const;
+
+    void setParameters(const Item *moduleProto, const QVariantMap &parameters);
+    QVariantMap parameters(Item *moduleProto) const;
+
+    void addCodeLink(const QString &sourceFile, const CodeRange &sourceRange,
+                     const CodeLocation &target);
+    CodeLinks codeLinks() const { return m_codeLinks.lock().get(); }
+
+    // An empty string means no matching module directory was found.
+    QString findModuleDirectory(const QualifiedId &module, const QString &searchPath,
+                                const std::function<QString()> &findOnDisk);
+
+    QStringList getModuleFilesForDirectory(const QString &dir,
+                                           const std::function<QStringList()> &findOnDisk);
+    void removeModuleFileFromDirectoryCache(const QString &filePath);
+
+    void addUnknownProfilePropertyError(const Item *moduleProto, const ErrorInfo &error);
+    const std::vector<ErrorInfo> &unknownProfilePropertyErrors(const Item *moduleProto) const;
+
+    Item *getModulePrototype(const QString &filePath, const QString &profile,
+                             const std::function<Item *()> &produce);
+
+    void addLocalProfile(const QString &name, const QVariantMap &values,
+                         const CodeLocation &location);
+    const QVariantMap localProfiles() { return m_localProfiles; }
+    void checkForLocalProfileAsTopLevelProfile(const QString &topLevelProfile);
+
+    using ProbeFilter = std::function<bool(const ProbeConstPtr &)>;
+    std::lock_guard<std::mutex> probesCacheLock();
+    void setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes);
+    void setOldProductProbes(const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes);
+    void addNewlyResolvedProbe(const ProbeConstPtr &probe);
+    void addProjectLevelProbe(const ProbeConstPtr &probe);
+    const std::vector<ProbeConstPtr> projectLevelProbes() const;
+    ProbeConstPtr findOldProjectProbe(const QString &id, const ProbeFilter &filter) const;
+    ProbeConstPtr findOldProductProbe(const QString &productName, const ProbeFilter &filter) const;
+    ProbeConstPtr findCurrentProbe(const CodeLocation &location, const ProbeFilter &filter) const;
+    void incrementProbesCount() { ++m_probesInfo.probesEncountered; }
+    void incrementReusedCurrentProbesCount() { ++m_probesInfo.probesCachedCurrent; }
+    void incrementReusedOldProbesCount() { ++m_probesInfo.probesCachedOld; }
+    void incrementRunProbesCount() { ++m_probesInfo.probesRun; }
+    int probesEncounteredCount() const { return m_probesInfo.probesEncountered; }
+    int probesRunCount() const { return m_probesInfo.probesRun; }
+    int reusedOldProbesCount() const { return m_probesInfo.probesCachedOld; }
+    int reusedCurrentProbesCount() const { return m_probesInfo.probesCachedCurrent; }
+
+    TimingData &timingData() { return m_timingData; }
+    ItemReaderCache &itemReaderCache() { return m_itemReaderCache; }
+
+    void incProductDeferrals() { ++m_productDeferrals; }
+    int productDeferrals() const { return m_productDeferrals; }
+
+    void collectDataFromEngine(const ScriptEngine &engine);
+
+    ItemPool &createItemPool();
+
+private:
+    const ResolvedFileContextPtr &resolvedFileContext(const FileContextConstPtr &ctx);
+
+    std::vector<ProjectContext *> m_projects;
+    GuardedData<Set<const ProductContext *>> m_productsToHandle;
+    std::multimap<QString, ProductContext *> m_productsByName;
+    MutexData<std::unordered_map<QStringView, QString>, std::mutex> m_sourceCode;
+    std::unordered_map<QString, QVariantMap> m_multiplexConfigsById;
+    MutexData<QHash<CodeLocation, ScriptFunctionPtr>, std::mutex> m_scriptFunctionMap;
+    MutexData<std::unordered_map<std::pair<QStringView, QStringList>, QString>,
+                std::mutex> m_scriptFunctions;
+    std::unordered_map<FileContextConstPtr, ResolvedFileContextPtr> m_fileContextMap;
+    Set<QString> m_projectNamesUsedInOverrides;
+    Set<QString> m_productNamesUsedInOverrides;
+    MutexData<Set<const Item *>> m_disabledItems;
+    QueuedErrors m_queuedErrors;
+    QString m_buildDirectory;
+    QVariantMap m_profileConfigs;
+    ProgressObserver *m_progressObserver = nullptr;
+    TimingData m_timingData;
+    ModuleProvidersCache m_moduleProvidersCache;
+    std::mutex m_moduleProvidersCacheMutex;
+    QVariantMap m_localProfiles;
+    ItemReaderCache m_itemReaderCache;
+    QHash<FileTag, std::vector<std::pair<ProductContext *, CodeLocation>>> m_reverseBulkDependencies;
+
+    // For fast look-up when resolving Depends.productTypes.
+    // The contract is that it contains fully handled, error-free, enabled products.
+    MutexData<std::multimap<FileTag, ProductContext *>> m_productsByType;
+
+    // The keys are module prototypes.
+    MutexData<std::unordered_map<const Item *,
+                                   Item::PropertyDeclarationMap>> m_parameterDeclarations;
+    MutexData<std::unordered_map<const Item *, QVariantMap>> m_parameters;
+    MutexData<std::unordered_map<const Item *,
+                                   std::vector<ErrorInfo>>> m_unknownProfilePropertyErrors;
+
+    // The keys are search path + module name, the values are directories.
+    MutexData<QHash<std::pair<QString, QualifiedId>, std::optional<QString>>,
+                std::mutex> m_modulePathCache;
+
+    // The keys are file paths, the values are module prototype items accompanied by a profile.
+    MutexData<std::unordered_map<QString, std::vector<std::pair<Item *, QString>>>,
+                std::mutex> m_modulePrototypes;
+
+    MutexData<std::map<QString, std::optional<QStringList>>,
+                std::mutex> m_moduleFilesPerDirectory;
+    MutexData<CodeLinks> m_codeLinks;
+
+    struct {
+        QHash<QString, std::vector<ProbeConstPtr>> oldProjectProbes;
+        QHash<QString, std::vector<ProbeConstPtr>> oldProductProbes;
+        QHash<CodeLocation, std::vector<ProbeConstPtr>> currentProbes;
+        std::vector<ProbeConstPtr> projectLevelProbes;
+
+        quint64 probesEncountered = 0;
+        quint64 probesRun = 0;
+        quint64 probesCachedCurrent = 0;
+        quint64 probesCachedOld = 0;
+    } m_probesInfo;
+    std::mutex m_probesMutex;
+
+    std::vector<std::unique_ptr<ItemPool>> m_itemPools;
+
+    FileTime m_lastResolveTime;
+
+    std::atomic_bool m_canceled = false;
+    int m_productDeferrals = 0;
+};
+
+class ProjectContext
+{
+public:
+    QString name;
+    Item *item = nullptr;
+    Item *scope = nullptr;
+    TopLevelProjectContext *topLevelProject = nullptr;
+    ProjectContext *parent = nullptr;
+    std::vector<ProjectContext *> children;
+    std::vector<ProductContext> products;
+    std::vector<QStringList> searchPathsStack;
+    ResolvedProjectPtr project;
+    std::vector<FileTaggerConstPtr> fileTaggers;
+    std::vector<RulePtr> rules;
+    JobLimits jobLimits;
+    ResolvedModulePtr dummyModule;
+};
+
+class ModuleContext
+{
+public:
+    ResolvedModulePtr module;
+    JobLimits jobLimits;
+};
+
+class LoaderState
+{
+public:
+    LoaderState(const SetupProjectParameters &parameters, TopLevelProjectContext &topLevelProject,
+                ItemPool &itemPool, ScriptEngine &engine, Logger logger);
+    ~LoaderState();
+
+    Evaluator &evaluator();
+    ItemPool &itemPool();
+    ItemReader &itemReader();
+    Logger &logger();
+    const SetupProjectParameters &parameters() const;
+    TopLevelProjectContext &topLevelProject();
+
+private:
+    class Private;
+    Pimpl<Private> d;
+};
+
+// List must be sorted by priority in ascending order.
+[[nodiscard]] QVariantMap mergeDependencyParameters(
+        std::vector<Item::Module::ParametersWithPriority> &&candidates);
+[[nodiscard]] QVariantMap mergeDependencyParameters(const QVariantMap &m1, const QVariantMap &m2);
+
+QString fullProductDisplayName(const QString &name, const QString &multiplexId);
+void adjustParametersScopes(Item *item, Item *scope);
+void resolveRule(LoaderState &state, Item *item, ProjectContext *projectContext,
+                 ProductContext *productContext, ModuleContext *moduleContext);
+void resolveJobLimit(LoaderState &state, Item *item, ProjectContext *projectContext,
+                     ProductContext *productContext, ModuleContext *moduleContext);
+void resolveFileTagger(LoaderState &state, Item *item, ProjectContext *projectContext,
+                       ProductContext *productContext);
+const FileTag unknownFileTag();
+
+} // namespace Internal
+} // namespace qbs
diff --git a/src/lib/corelib/loader/localprofiles.cpp b/src/lib/corelib/loader/localprofiles.cpp
new file mode 100644
index 000000000..e72128fff
--- /dev/null
+++ b/src/lib/corelib/loader/localprofiles.cpp
@@ -0,0 +1,148 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "localprofiles.h"
+
+#include "loaderutils.h"
+
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/qualifiedid.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
+#include <logging/translator.h>
+#include <tools/profile.h>
+#include <tools/scripttools.h>
+#include <tools/stringconstants.h>
+
+namespace qbs::Internal {
+class LocalProfiles
+{
+public:
+    LocalProfiles(LoaderState &loaderState) : m_loaderState(loaderState) {}
+
+    void collectProfiles(Item *productOrProject, Item *projectScope);
+
+private:
+    void handleProfile(Item *profileItem);
+    void evaluateProfileValues(const QualifiedId &namePrefix, Item *item, Item *profileItem,
+                               QVariantMap &values);
+    LoaderState &m_loaderState;
+};
+
+void collectProfilesFromItems(Item *productOrProject, Item *projectScope, LoaderState &loaderState)
+{
+    LocalProfiles(loaderState).collectProfiles(productOrProject, projectScope);
+}
+
+void LocalProfiles::handleProfile(Item *profileItem)
+{
+    QVariantMap values;
+    evaluateProfileValues(QualifiedId(), profileItem, profileItem, values);
+    const bool condition = values.take(StringConstants::conditionProperty()).toBool();
+    if (!condition)
+        return;
+    const QString profileName = values.take(StringConstants::nameProperty()).toString();
+    if (profileName.isEmpty())
+        throw ErrorInfo(Tr::tr("Every Profile item must have a name"), profileItem->location());
+    if (profileName == Profile::fallbackName()) {
+        throw ErrorInfo(Tr::tr("Reserved name '%1' cannot be used for an actual profile.")
+                            .arg(profileName), profileItem->location());
+    }
+    m_loaderState.topLevelProject().addLocalProfile(profileName, values, profileItem->location());
+}
+
+void LocalProfiles::evaluateProfileValues(const QualifiedId &namePrefix, Item *item,
+                                          Item *profileItem, QVariantMap &values)
+{
+    const Item::PropertyMap &props = item->properties();
+    for (auto it = props.begin(); it != props.end(); ++it) {
+        QualifiedId name = namePrefix;
+        name << it.key();
+        switch (it.value()->type()) {
+        case Value::ItemValueType:
+            evaluateProfileValues(name, std::static_pointer_cast<ItemValue>(it.value())->item(),
+                                  profileItem, values);
+            break;
+        case Value::VariantValueType:
+            values.insert(name.join(QLatin1Char('.')),
+                          std::static_pointer_cast<VariantValue>(it.value())->value());
+            break;
+        case Value::JSSourceValueType:
+            if (item != profileItem)
+                item->setScope(profileItem);
+            const ScopedJsValue sv(m_loaderState.evaluator().engine()->context(),
+                                   m_loaderState.evaluator().value(item, it.key()));
+            values.insert(name.join(QLatin1Char('.')),
+                          getJsVariant(m_loaderState.evaluator().engine()->context(), sv));
+            break;
+        }
+    }
+}
+
+void LocalProfiles::collectProfiles(Item *productOrProject, Item *projectScope)
+{
+    Item * scope = productOrProject->type() == ItemType::Project ? projectScope : nullptr;
+    for (auto it = productOrProject->children().begin();
+         it != productOrProject->children().end();) {
+        Item * const childItem = *it;
+        if (childItem->type() == ItemType::Profile) {
+            if (!scope) {
+                const ItemValuePtr itemValue = ItemValue::create(productOrProject);
+                scope = Item::create(&m_loaderState.itemPool(), ItemType::Scope);
+                scope->setProperty(StringConstants::productVar(), itemValue);
+                scope->setFile(productOrProject->file());
+                scope->setScope(projectScope);
+            }
+            childItem->setScope(scope);
+            try {
+                handleProfile(childItem);
+            } catch (const ErrorInfo &e) {
+                handlePropertyError(e, m_loaderState.parameters(), m_loaderState.logger());
+            }
+            it = productOrProject->children().erase(it); // TODO: delete item and scope
+        } else {
+            if (childItem->type() == ItemType::Product)
+                collectProfiles(childItem, projectScope);
+            ++it;
+        }
+    }
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/localprofiles.h b/src/lib/corelib/loader/localprofiles.h
new file mode 100644
index 000000000..7d9eee88e
--- /dev/null
+++ b/src/lib/corelib/loader/localprofiles.h
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+namespace qbs::Internal {
+class Item;
+class LoaderState;
+
+void collectProfilesFromItems(Item *productOrProject, Item *projectScope, LoaderState &loaderState);
+
+} // namespace qbs::Internal
+
diff --git a/src/lib/corelib/loader/moduleinstantiator.cpp b/src/lib/corelib/loader/moduleinstantiator.cpp
new file mode 100644
index 000000000..1c0359217
--- /dev/null
+++ b/src/lib/corelib/loader/moduleinstantiator.cpp
@@ -0,0 +1,340 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "moduleinstantiator.h"
+
+#include "loaderutils.h"
+#include "modulepropertymerger.h"
+
+#include <language/item.h>
+#include <language/itempool.h>
+#include <language/qualifiedid.h>
+#include <language/value.h>
+#include <logging/logger.h>
+#include <logging/translator.h>
+#include <tools/profiling.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+#include <utility>
+
+namespace qbs::Internal {
+
+static std::pair<const Item *, Item *>
+getOrSetModuleInstanceItem(Item *container, Item *moduleItem, const QualifiedId &moduleName,
+                           const QString &id, bool replace, LoaderState &loaderState);
+
+class ModuleInstantiator
+{
+public:
+    ModuleInstantiator(const InstantiationContext &context, LoaderState &loaderState)
+        : context(context), loaderState(loaderState) {}
+
+    void instantiate();
+
+private:
+    void overrideProperties();
+    void setupScope();
+    void exchangePlaceholderItem(Item *loadingItem, Item *moduleItemForItemValues);
+
+    const InstantiationContext &context;
+    LoaderState &loaderState;
+};
+
+void ModuleInstantiator::instantiate()
+{
+    AccumulatingTimer timer(loaderState.parameters().logElapsedTime()
+                            ? &context.product.timingData.moduleInstantiation : nullptr);
+
+    // This part needs to be done only once per module and product, and only if the module
+    // was successfully loaded.
+    if (context.module && !context.alreadyLoaded) {
+        context.module->setType(ItemType::ModuleInstance);
+        overrideProperties();
+        setupScope();
+    }
+
+    // This strange-looking code deals with the fact that our syntax cannot properly handle
+    // dependencies on several multiplexed variants of the same product.
+    // See getOrSetModuleInstanceItem() below for details.
+    Item * const moduleItemForItemValues
+        = context.moduleWithSameName ? context.moduleWithSameName
+                                     : context.module;
+
+    // Now attach the module instance as an item value to the loading item, potentially
+    // evicting a previously attached placeholder item and merging its values into the instance.
+    // Note that we potentially do this twice, once for the actual loading item and once
+    // for the product item, if the two are different. The reason is this:
+    // For convenience, in the product item we allow attaching to properties from indirectly
+    // loaded modules. For instance:
+    // Product {
+    //    Depends { name: "Qt.core" }
+    //    cpp.cxxLanguageVersion: "c++20" // Works even though there is no Depends item for cpp
+    //  }
+    // It's debatable whether that's a good feature, but it has been working (accidentally?)
+    // for a long time, and removing it now would break a lot of existing projects.
+    exchangePlaceholderItem(context.loadingItem, moduleItemForItemValues);
+
+    if (!context.alreadyLoaded && context.product.item
+            && context.product.item != context.loadingItem) {
+        exchangePlaceholderItem(context.product.item, moduleItemForItemValues);
+    }
+}
+
+void ModuleInstantiator::exchangePlaceholderItem(Item *loadingItem, Item *moduleItemForItemValues)
+{
+    // If we have a module item, set an item value pointing to it as a property on the loading item.
+    // Evict a possibly existing placeholder item, and return it to us, so we can merge its values
+    // into the instance.
+    const auto &[oldItem, newItem] = getOrSetModuleInstanceItem(
+        loadingItem, moduleItemForItemValues, context.moduleName, context.id, true, loaderState);
+
+    // The new item always exists, even if we don't have a module item. In that case, the
+    // function created a placeholder item for us, which we then have to turn into a
+    // non-present module.
+    QBS_CHECK(newItem);
+    if (!moduleItemForItemValues) {
+        createNonPresentModule(loaderState.itemPool(), context.moduleName.toString(),
+                               QLatin1String("not found"), newItem);
+        return;
+    }
+
+    if (!moduleItemForItemValues->isPresentModule())
+        return;
+
+    // This will yield false negatives for the case where there is an invalid property attached
+    // for a module that is actually found by pkg-config via the fallback provider.
+    // However, this is extremely rare compared to the case where the presence of the fallback
+    // module simply indicates "not present".
+    if (moduleItemForItemValues->isFallbackModule())
+        return;
+
+    // If the old and the new items are the same, it means the existing item value already
+    // pointed to a module instance (rather than a placeholder).
+    // This can happen in two cases:
+    //   a) Multiple identical Depends items on the same level (easily possible with inheritance).
+    //   b) Dependencies to multiplexed variants of the same product
+    //      (see getOrSetModuleInstanceItem() below for details).
+    if (oldItem == newItem) {
+        QBS_CHECK(oldItem->type() == ItemType::ModuleInstance);
+        QBS_CHECK(context.alreadyLoaded || context.exportingProduct);
+        return;
+    }
+
+    // In all other cases, our request to set the module instance item must have been honored.
+    QBS_CHECK(newItem == moduleItemForItemValues);
+
+    // If there was no placeholder item, we don't have to merge any values and are done.
+    if (!oldItem)
+        return;
+
+    // If an item was replaced, then it must have been a placeholder.
+    QBS_CHECK(oldItem->type() == ItemType::ModuleInstancePlaceholder);
+
+    // Prevent setting read-only properties.
+    for (auto it = oldItem->properties().cbegin(); it != oldItem->properties().cend(); ++it) {
+        const PropertyDeclaration &pd = moduleItemForItemValues->propertyDeclaration(it.key());
+        if (pd.flags().testFlag(PropertyDeclaration::ReadOnlyFlag)) {
+            throw ErrorInfo(Tr::tr("Cannot set read-only property '%1'.").arg(pd.name()),
+                            it.value()->location());
+        }
+    }
+
+    // Now merge the locally attached values into the actual module instance.
+    mergeFromLocalInstance(context.product, loadingItem, context.loadingName, oldItem,
+                           moduleItemForItemValues, loaderState);
+
+    // TODO: We'd like to delete the placeholder item here, because it's not
+    //       being referenced anymore and there's a lot of them. However, this
+    //       is not supported by ItemPool. Investigate the use of std::pmr.
+}
+
+Item *retrieveModuleInstanceItem(Item *containerItem, const QualifiedId &name,
+                                 LoaderState &loaderState)
+{
+    return getOrSetModuleInstanceItem(containerItem, nullptr, name, {}, false, loaderState).second;
+}
+
+Item *retrieveQbsItem(Item *containerItem, LoaderState &loaderState)
+{
+    return retrieveModuleInstanceItem(containerItem, StringConstants::qbsModule(), loaderState);
+}
+
+void ModuleInstantiator::overrideProperties()
+{
+    // Users can override module properties on the command line with the
+    // modules.<module-name>.<property-name>:<value> syntax.
+    // For simplicity and backwards compatibility, qbs properties can also be given without
+    // the "modules." prefix, i.e. just qbs.<property-name>:<value>.
+    // In addition, users can override module properties just for certain products
+    // using the products.<product-name>.<module-name>.<property-name>:<value> syntax.
+    // Such product-specific overrides have higher precedence.
+    const QString fullName = context.moduleName.toString();
+    const QString generalOverrideKey = QStringLiteral("modules.") + fullName;
+    const QString perProductOverrideKey = StringConstants::productsOverridePrefix()
+                                          + context.product.name + QLatin1Char('.') + fullName;
+    const SetupProjectParameters &parameters = loaderState.parameters();
+    Logger &logger = loaderState.logger();
+    context.module->overrideProperties(parameters.overriddenValuesTree(), generalOverrideKey,
+                                       parameters, logger);
+    if (fullName == StringConstants::qbsModule()) {
+        context.module->overrideProperties(parameters.overriddenValuesTree(), fullName, parameters,
+                                           logger);
+    }
+    context.module->overrideProperties(parameters.overriddenValuesTree(), perProductOverrideKey,
+                                       parameters, logger);
+}
+
+void ModuleInstantiator::setupScope()
+{
+    Item * const scope = Item::create(&loaderState.itemPool(), ItemType::Scope);
+    QBS_CHECK(context.module->file());
+    scope->setFile(context.module->file());
+    QBS_CHECK(context.product.project->scope);
+    context.product.project->scope->copyProperty(StringConstants::projectVar(), scope);
+    if (context.product.scope)
+        context.product.scope->copyProperty(StringConstants::productVar(), scope);
+    else
+        QBS_CHECK(context.moduleName.toString() == StringConstants::qbsModule()); // Dummy product.
+
+    if (!context.module->id().isEmpty())
+        scope->setProperty(context.module->id(), ItemValue::create(context.module));
+    for (Item * const child : context.module->children()) {
+        child->setScope(scope);
+        if (!child->id().isEmpty())
+            scope->setProperty(child->id(), ItemValue::create(child));
+    }
+    context.module->setScope(scope);
+
+    if (context.exportingProduct) {
+        QBS_CHECK(context.exportingProduct->type() == ItemType::Product);
+
+        const auto exportingProductItemValue = ItemValue::create(context.exportingProduct);
+        scope->setProperty(QStringLiteral("exportingProduct"), exportingProductItemValue);
+
+        const auto importingProductItemValue = ItemValue::create(context.product.item);
+        scope->setProperty(QStringLiteral("importingProduct"), importingProductItemValue);
+
+        // FIXME: This looks wrong. Introduce exportingProject variable?
+        scope->setProperty(StringConstants::projectVar(),
+                           ItemValue::create(context.exportingProduct->parent()));
+
+        PropertyDeclaration pd(StringConstants::qbsSourceDirPropertyInternal(),
+                               PropertyDeclaration::String, QString(),
+                               PropertyDeclaration::PropertyNotAvailableInConfig);
+        context.module->setPropertyDeclaration(pd.name(), pd);
+        context.module->setProperty(pd.name(), context.exportingProduct->property(
+                                                   StringConstants::sourceDirectoryProperty()));
+    }
+}
+
+void instantiateModule(const InstantiationContext &context, LoaderState &loaderState)
+{
+    ModuleInstantiator(context, loaderState).instantiate();
+}
+
+// This important function deals with retrieving and setting (pseudo-)module instances from/on
+// items.
+// Use case 1: Suppose we resolve the dependency cpp in module Qt.core, which also contains
+//             property bindings for cpp such as "cpp.defines: [...]".
+//             The "cpp" part of this binding is represented by an ItemValue whose
+//             item is of type ModuleInstancePlaceholder, originally set up by ItemReaderASTVisitor.
+//             This function will be called with the actual cpp module item and will
+//             replace the placeholder item in the item value. It will also return
+//             the placeholder item for subsequent merging of its properties with the
+//             ones of the actual module (in ModulePropertyMerger::mergeFromLocalInstance()).
+//             If there were no cpp property bindings defined in Qt.core, then we'd still
+//             have to replace the placeholder item, because references to "cpp" on the
+//             right-hand-side of other properties must refer to the module item.
+//             This is the common use of this function as employed by resolveProdsucDependencies().
+//             Note that if a product has dependencies on more than one variant of a multiplexed
+//             product, these dependencies are competing for the item value property name,
+//             i.e. this case is not properly supported by the syntax. You must therefore not
+//             export properties from multiplexed products that will be different between the
+//             variants. In this function, the condition manifests itself by a module instance
+//             being encountered instead of a module instance placeholder, in which case
+//             nothing is done at all.
+// Use case 2: We inject a fake qbs module into a project item, so qbs properties set in profiles
+//             can be accessed in the project level. Doing this is discouraged, and the
+//             functionality is kept mostly for backwards compatibility. The moduleItem
+//             parameter is null in this case, and the item will be created by the function itself.
+// Use case 3: A temporary qbs module is attached to a product during low-level setup, namely
+//             in product multiplexing and setting qbs.profile.
+// Use case 4: Module propagation to the the Group level.
+// In all cases, the first returned item is the existing one, and the second returned item
+// is the new one. Depending on the use case, they might be null and might also be the same item.
+std::pair<const Item *, Item *> getOrSetModuleInstanceItem(
+    Item *container, Item *moduleItem, const QualifiedId &moduleName, const QString &id,
+    bool replace, LoaderState &loaderState)
+{
+    Item *instance = container;
+    const QualifiedId itemValueName
+        = !id.isEmpty() ? QualifiedId::fromString(id) : moduleName;
+    for (int i = 0; i < itemValueName.size(); ++i) {
+        const QString &moduleNameSegment = itemValueName.at(i);
+        const ValuePtr v = instance->ownProperty(itemValueName.at(i));
+        if (v && v->type() == Value::ItemValueType) {
+            ItemValue * const itemValue = std::static_pointer_cast<ItemValue>(v).get();
+            instance = itemValue->item();
+            if (i == itemValueName.size() - 1) {
+                if (replace && instance != moduleItem
+                    && instance->type() == ItemType::ModuleInstancePlaceholder) {
+                    if (!moduleItem) {
+                        moduleItem = Item::create(&loaderState.itemPool(),
+                                                  ItemType::ModuleInstancePlaceholder);
+                    }
+                    itemValue->setItem(moduleItem);
+                }
+                return {instance, itemValue->item()};
+            }
+        } else {
+            Item *newItem = i < itemValueName.size() - 1
+                                ? Item::create(&loaderState.itemPool(), ItemType::ModulePrefix)
+                                : moduleItem
+                                      ? moduleItem
+                                      : Item::create(&loaderState.itemPool(),
+                                                     ItemType::ModuleInstancePlaceholder);
+            instance->setProperty(moduleNameSegment, ItemValue::create(newItem));
+            instance = newItem;
+        }
+    }
+    return {nullptr, instance};
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/moduleinstantiator.h b/src/lib/corelib/loader/moduleinstantiator.h
new file mode 100644
index 000000000..5e9ad2f44
--- /dev/null
+++ b/src/lib/corelib/loader/moduleinstantiator.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
+class QString;
+QT_END_NAMESPACE
+
+namespace qbs::Internal {
+class Item;
+class LoaderState;
+class ProductContext;
+class QualifiedId;
+
+class InstantiationContext {
+public:
+    ProductContext &product;
+    Item * const loadingItem;
+    const QString &loadingName;
+    Item * const module;
+    Item * const moduleWithSameName;
+    Item * const exportingProduct;
+    const QualifiedId &moduleName;
+    const QString &id;
+    const bool alreadyLoaded;
+};
+
+// This function is responsible for setting up a proper module instance from a bunch of items:
+//    - Set the item type to ItemType::ModuleInstance (from Module or Export).
+//    - Apply possible command-line overrides for module properties.
+//    - Replace a possible module instance placeholder in the loading item with the actual instance
+//      and merge their values employing the ModulePropertyMerger.
+//    - Setting up the module instance scope.
+void instantiateModule(const InstantiationContext &context, LoaderState &loaderState);
+
+// Helper functions for retrieving/setting module instance items for special purposes.
+// Note that these will also create the respective item value if it does not exist yet.
+Item *retrieveModuleInstanceItem(Item *containerItem, const QualifiedId &name,
+                                 LoaderState &loaderState);
+Item *retrieveQbsItem(Item *containerItem, LoaderState &loaderState);
+
+} // namespace qbs::Internal
+
diff --git a/src/lib/corelib/loader/moduleloader.cpp b/src/lib/corelib/loader/moduleloader.cpp
new file mode 100644
index 000000000..d26849655
--- /dev/null
+++ b/src/lib/corelib/loader/moduleloader.cpp
@@ -0,0 +1,410 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "moduleloader.h"
+
+#include "itemreader.h"
+#include "loaderutils.h"
+#include "moduleproviderloader.h"
+
+#include <api/languageinfo.h>
+#include <language/evaluator.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
+#include <logging/categories.h>
+#include <logging/translator.h>
+#include <tools/codelocation.h>
+#include <tools/error.h>
+#include <tools/fileinfo.h>
+#include <tools/hostosinfo.h>
+#include <tools/profiling.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+#include <QDirIterator>
+#include <QHash>
+
+#include <unordered_map>
+#include <utility>
+
+namespace qbs::Internal {
+
+class ModuleLoader
+{
+public:
+    ModuleLoader(
+        LoaderState &loaderState,
+        ProductContext &product,
+        const CodeLocation &dependsItemLocation,
+        const QualifiedId &moduleName)
+        : m_loaderState(loaderState)
+        , m_product(product)
+        , m_dependsItemLocation(dependsItemLocation)
+        , m_moduleName(moduleName)
+    {}
+
+    Item *load();
+
+private:
+    std::pair<Item *, bool> loadModuleFile(const QString &moduleName, const QString &filePath);
+    Item *getModulePrototype(const QString &moduleName, const QString &filePath);
+    Item *createAndInitModuleItem(const QString &moduleName, const QString &filePath);
+    bool evaluateModuleCondition(Item *module, const QString &fullModuleName);
+    void checkForUnknownProfileProperties(const Item *module);
+    QString findModuleDirectory(const QString &searchPath);
+    QStringList findModuleDirectories();
+    QStringList getModuleFilePaths(const QString &dir);
+
+    LoaderState &m_loaderState;
+    ProductContext &m_product;
+    const CodeLocation &m_dependsItemLocation;
+    const QualifiedId &m_moduleName;
+};
+
+struct PrioritizedItem
+{
+    PrioritizedItem(Item *item, int priority, int searchPathIndex)
+        : item(item), priority(priority), searchPathIndex(searchPathIndex) { }
+
+    Item * const item;
+    int priority = 0;
+    const int searchPathIndex;
+};
+
+static Item *chooseModuleCandidate(const std::vector<PrioritizedItem> &candidates,
+                                   const QString &moduleName)
+{
+    // TODO: This should also consider the version requirement.
+
+    auto maxIt = std::max_element(
+        candidates.begin(), candidates.end(),
+        [] (const PrioritizedItem &a, const PrioritizedItem &b) {
+            if (a.priority < b.priority)
+                return true;
+            if (a.priority > b.priority)
+                return false;
+            return a.searchPathIndex > b.searchPathIndex;
+        });
+
+    size_t nmax = std::count_if(
+        candidates.begin(), candidates.end(),
+        [maxIt] (const PrioritizedItem &i) {
+            return i.priority == maxIt->priority && i.searchPathIndex == maxIt->searchPathIndex;
+        });
+
+    if (nmax > 1) {
+        ErrorInfo e(Tr::tr("There is more than one equally prioritized candidate for module '%1'.")
+                        .arg(moduleName));
+        for (size_t i = 0; i < candidates.size(); ++i) {
+            const auto candidate = candidates.at(i);
+            if (candidate.priority == maxIt->priority) {
+                //: The %1 denotes the number of the candidate.
+                e.append(Tr::tr("candidate %1").arg(i + 1), candidates.at(i).item->location());
+            }
+        }
+        throw e;
+    }
+
+    return maxIt->item;
+}
+
+Item *searchAndLoadModuleFile(
+    LoaderState &loaderState,
+    ProductContext &product,
+    const CodeLocation &dependsItemLocation,
+    const QualifiedId &moduleName)
+{
+    return ModuleLoader(loaderState, product, dependsItemLocation, moduleName).load();
+}
+
+Item *ModuleLoader::load()
+{
+    SearchPathsManager searchPathsManager(m_loaderState.itemReader());
+
+    QStringList existingPaths = findModuleDirectories();
+    if (existingPaths.isEmpty()) { // no suitable names found, try to use providers
+        AccumulatingTimer providersTimer(m_loaderState.parameters().logElapsedTime()
+                                         ? &m_product.timingData.moduleProviders : nullptr);
+        auto result = ModuleProviderLoader(m_loaderState)
+                          .executeModuleProviders(m_product, m_dependsItemLocation, m_moduleName);
+        if (result.searchPaths) {
+            qCDebug(lcModuleLoader) << "Re-checking for module" << m_moduleName.toString()
+                                    << "with newly added search paths from module provider";
+            m_loaderState.itemReader().pushExtraSearchPaths(*result.searchPaths);
+            existingPaths = findModuleDirectories();
+        }
+    }
+
+    const QString fullName = m_moduleName.toString();
+    bool triedToLoadModule = false;
+    std::vector<PrioritizedItem> candidates;
+    candidates.reserve(size_t(existingPaths.size()));
+    for (int i = 0; i < existingPaths.size(); ++i) {
+        const QStringList &moduleFileNames = getModuleFilePaths(existingPaths.at(i));
+        for (const QString &filePath : moduleFileNames) {
+            const auto [module, triedToLoad] = loadModuleFile(fullName, filePath);
+            if (module)
+                candidates.emplace_back(module, 0, i);
+            if (!triedToLoad)
+                m_loaderState.topLevelProject().removeModuleFileFromDirectoryCache(filePath);
+            triedToLoadModule = triedToLoadModule || triedToLoad;
+        }
+    }
+
+    if (candidates.empty())
+        return nullptr;
+
+    Item *moduleItem = nullptr;
+    if (candidates.size() == 1) {
+        moduleItem = candidates.at(0).item;
+    } else {
+        for (auto &candidate : candidates) {
+            ModuleItemLocker lock(*candidate.item);
+            candidate.priority = m_loaderState.evaluator()
+                    .intValue(candidate.item, StringConstants::priorityProperty(),
+                              candidate.priority);
+        }
+        moduleItem = chooseModuleCandidate(candidates, fullName);
+    }
+
+    checkForUnknownProfileProperties(moduleItem);
+    return moduleItem;
+}
+
+std::pair<Item *, bool> ModuleLoader::loadModuleFile(const QString &moduleName,
+                                                     const QString &filePath)
+{
+    qCDebug(lcModuleLoader) << "loadModuleFile" << moduleName << "from" << filePath;
+
+    Item * const module = getModulePrototype(moduleName, filePath);
+    if (!module)
+        return {nullptr, false};
+
+    const auto it = m_product.modulePrototypeEnabledInfo.find(module);
+    if (it != m_product.modulePrototypeEnabledInfo.end()) {
+        qCDebug(lcModuleLoader) << "prototype cache hit (level 2)";
+        return {it->second ? module : nullptr, true};
+    }
+
+    if (!evaluateModuleCondition(module, moduleName)) {
+        qCDebug(lcModuleLoader) << "condition of module" << moduleName << "is false";
+        m_product.modulePrototypeEnabledInfo.insert({module, false});
+        return {nullptr, true};
+    }
+
+    m_product.modulePrototypeEnabledInfo.insert({module, true});
+    return {module, true};
+}
+
+Item * ModuleLoader::getModulePrototype(const QString &moduleName, const QString &filePath)
+{
+    bool fromCache = true;
+    Item * const module = m_loaderState.topLevelProject().getModulePrototype(
+                filePath, m_product.profileName, [&] {
+        fromCache = false;
+        return createAndInitModuleItem(moduleName, filePath);
+    });
+
+    if (fromCache)
+        qCDebug(lcModuleLoader) << "prototype cache hit (level 1)";
+    return module;
+}
+
+Item *ModuleLoader::createAndInitModuleItem(const QString &moduleName, const QString &filePath)
+{
+    Item * const module = m_loaderState.itemReader().setupItemFromFile(filePath, {});
+    if (module->type() != ItemType::Module) {
+        qCDebug(lcModuleLoader).nospace()
+            << "Alleged module " << moduleName << " has type '"
+            << module->typeName() << "', so it's not a module after all.";
+        return nullptr;
+    }
+
+    // Not technically needed, but we want to keep the invariant in item.cpp.
+    ModuleItemLocker locker(*module);
+
+    module->setProperty(StringConstants::nameProperty(), VariantValue::create(moduleName));
+    if (moduleName == StringConstants::qbsModule()) {
+        module->setProperty(QStringLiteral("hostPlatform"),
+                            VariantValue::create(HostOsInfo::hostOSIdentifier()));
+        module->setProperty(QStringLiteral("hostArchitecture"),
+                            VariantValue::create(HostOsInfo::hostOSArchitecture()));
+        module->setProperty(QStringLiteral("libexecPath"),
+                            VariantValue::create(m_loaderState.parameters().libexecPath()));
+
+        const Version qbsVersion = LanguageInfo::qbsVersion();
+        module->setProperty(QStringLiteral("versionMajor"),
+                            VariantValue::create(qbsVersion.majorVersion()));
+        module->setProperty(QStringLiteral("versionMinor"),
+                            VariantValue::create(qbsVersion.minorVersion()));
+        module->setProperty(QStringLiteral("versionPatch"),
+                            VariantValue::create(qbsVersion.patchLevel()));
+    } else {
+        Item::PropertyDeclarationMap decls;
+        const auto &moduleChildren = module->children();
+        for (Item *param : moduleChildren) {
+            if (param->type() == ItemType::Parameter) {
+                const auto &paramDecls = param->propertyDeclarations();
+                for (auto it = paramDecls.begin(); it != paramDecls.end(); ++it)
+                    decls.insert(it.key(), it.value());
+            } else if (param->type() == ItemType::Parameters) {
+                adjustParametersScopes(param, param);
+                Evaluator &evaluator = m_loaderState.evaluator();
+                QVariantMap parameters = getJsVariant(evaluator.engine()->context(),
+                                                      evaluator.scriptValue(param)).toMap();
+                m_loaderState.topLevelProject().setParameters(module, parameters);
+            }
+        }
+        m_loaderState.topLevelProject().addParameterDeclarations(module, decls);
+    }
+
+    // Module properties that are defined in the profile are used as default values.
+    // This is the reason we need to have different items per profile.
+    const QVariantMap profileModuleProperties
+        = m_product.profileModuleProperties.value(moduleName).toMap();
+    for (auto it = profileModuleProperties.cbegin(); it != profileModuleProperties.cend(); ++it) {
+        if (Q_UNLIKELY(!module->hasProperty(it.key()))) {
+            m_loaderState.topLevelProject().addUnknownProfilePropertyError(
+                module, {Tr::tr("Unknown property: %1.%2").arg(moduleName, it.key())});
+            continue;
+        }
+        const PropertyDeclaration decl = module->propertyDeclaration(it.key());
+        VariantValuePtr v = VariantValue::create(
+            PropertyDeclaration::convertToPropertyType(it.value(), decl.type(),
+                                                       QStringList(moduleName), it.key()));
+        v->markAsSetByProfile();
+        module->setProperty(it.key(), v);
+    }
+
+    return module;
+}
+
+bool ModuleLoader::evaluateModuleCondition(Item *module, const QString &fullModuleName)
+{
+    ModuleItemLocker locker(*module);
+
+    // Temporarily make the product's qbs module instance available, so the condition
+    // can use qbs.targetOS etc.
+    class TempQbsModuleProvider {
+    public:
+        TempQbsModuleProvider(const ProductContext &product,
+                              Item *module, const QString &moduleName)
+            : m_module(module), m_needsQbsItem(moduleName != StringConstants::qbsModule())
+        {
+            if (m_needsQbsItem) {
+                m_prevQbsItemValue = module->property(StringConstants::qbsModule());
+                module->setProperty(StringConstants::qbsModule(),
+                                    product.item->property(StringConstants::qbsModule()));
+            }
+        }
+        ~TempQbsModuleProvider()
+        {
+            if (!m_needsQbsItem)
+                return;
+            if (m_prevQbsItemValue)
+                m_module->setProperty(StringConstants::qbsModule(), m_prevQbsItemValue);
+            else
+                m_module->removeProperty(StringConstants::qbsModule());
+        }
+    private:
+        Item * const m_module;
+        ValuePtr m_prevQbsItemValue;
+        const bool m_needsQbsItem;
+    };
+
+    const TempQbsModuleProvider tempQbs(m_product, module, fullModuleName);
+    return m_loaderState.evaluator().boolValue(module, StringConstants::conditionProperty());
+}
+
+void ModuleLoader::checkForUnknownProfileProperties(const Item *module)
+{
+    const std::vector<ErrorInfo> &errors
+            = m_loaderState.topLevelProject().unknownProfilePropertyErrors(module);
+    if (errors.empty())
+        return;
+
+    ErrorInfo error(Tr::tr("Loading module '%1' for product '%2' failed due to invalid values "
+                           "in profile '%3':")
+                    .arg(m_moduleName.toString(), m_product.displayName(), m_product.profileName));
+    for (const ErrorInfo &e : errors)
+        error.append(e.toString());
+    handlePropertyError(error, m_loaderState.parameters(), m_loaderState.logger());
+}
+
+QString ModuleLoader::findModuleDirectory(const QString &searchPath)
+{
+    // isFileCaseCorrect is a very expensive call on macOS, so we cache the value for the
+    // modules and search paths we've already processed
+    return m_loaderState.topLevelProject().findModuleDirectory(m_moduleName, searchPath,
+                                                             [&] {
+        QString dirPath = searchPath + QStringLiteral("/modules");
+        for (const QString &moduleNamePart : m_moduleName) {
+            dirPath = FileInfo::resolvePath(dirPath, moduleNamePart);
+            if (!FileInfo::exists(dirPath) || !FileInfo::isFileCaseCorrect(dirPath))
+                return QString();
+        }
+        return dirPath;
+    });
+}
+
+QStringList ModuleLoader::findModuleDirectories()
+{
+    const QStringList &searchPaths = m_loaderState.itemReader().allSearchPaths();
+    QStringList result;
+    result.reserve(searchPaths.size());
+    for (const auto &path: searchPaths) {
+        const QString dirPath = findModuleDirectory(path);
+        if (!dirPath.isEmpty())
+            result.append(dirPath);
+    }
+    return result;
+}
+
+QStringList ModuleLoader::getModuleFilePaths(const QString &dir)
+{
+    return m_loaderState.topLevelProject().getModuleFilesForDirectory(dir, [&] {
+        QStringList moduleFiles;
+        QDirIterator dirIter(dir, StringConstants::qbsFileWildcards());
+        while (dirIter.hasNext())
+            moduleFiles += dirIter.next();
+        return moduleFiles;
+    });
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/moduleloader.h b/src/lib/corelib/loader/moduleloader.h
new file mode 100644
index 000000000..b07f01836
--- /dev/null
+++ b/src/lib/corelib/loader/moduleloader.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+namespace qbs {
+class CodeLocation;
+namespace Internal {
+class Item;
+class LoaderState;
+class ProductContext;
+class QualifiedId;
+
+Item *searchAndLoadModuleFile(
+    LoaderState &loaderState,
+    ProductContext &product,
+    const CodeLocation &dependsItemLocation,
+    const QualifiedId &moduleName);
+
+} // namespace Internal
+} // namespace qbs
+
diff --git a/src/lib/corelib/loader/modulepropertymerger.cpp b/src/lib/corelib/loader/modulepropertymerger.cpp
new file mode 100644
index 000000000..c9dd56ccf
--- /dev/null
+++ b/src/lib/corelib/loader/modulepropertymerger.cpp
@@ -0,0 +1,323 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "modulepropertymerger.h"
+
+#include "loaderutils.h"
+
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/value.h>
+#include <logging/translator.h>
+#include <tools/profiling.h>
+#include <tools/set.h>
+#include <tools/setupprojectparameters.h>
+
+#include <unordered_set>
+
+namespace qbs::Internal {
+class ModulePropertyMerger
+{
+public:
+    ModulePropertyMerger(ProductContext &product, LoaderState &loaderState)
+        : m_product(product), m_loaderState(loaderState) {}
+
+    void mergeFromLocalInstance(Item *loadingItem, const QString &loadingName,
+                                const Item *localInstance, Item *globalInstance);
+    void doFinalMerge();
+
+private:
+    int compareValuePriorities(const ValueConstPtr &v1, const ValueConstPtr &v2);
+    ValuePtr mergeListValues(const ValuePtr &currentHead, const ValuePtr &newElem);
+    void mergePropertyFromLocalInstance(Item *loadingItem, const QString &loadingName,
+                                        Item *globalInstance, const QString &name,
+                                        const ValuePtr &value);
+    bool doFinalMerge(Item *moduleItem);
+    bool doFinalMerge(const PropertyDeclaration &propertyDecl, ValuePtr &propertyValue);
+
+    ProductContext & m_product;
+    LoaderState &m_loaderState;
+};
+
+void mergeFromLocalInstance(ProductContext &product, Item *loadingItem, const QString &loadingName,
+                            const Item *localInstance, Item *globalInstance,
+                            LoaderState &loaderState)
+{
+    ModulePropertyMerger(product, loaderState).mergeFromLocalInstance(
+        loadingItem, loadingName, localInstance, globalInstance);
+}
+
+void doFinalMerge(ProductContext &product, LoaderState &loaderState)
+{
+    ModulePropertyMerger(product, loaderState).doFinalMerge();
+}
+
+void ModulePropertyMerger::mergeFromLocalInstance(Item *loadingItem, const QString &loadingName,
+                                                  const Item *localInstance, Item *globalInstance)
+{
+    AccumulatingTimer t(m_loaderState.parameters().logElapsedTime()
+                            ? &m_product.timingData.propertyMerging : nullptr);
+
+    for (auto it = localInstance->properties().constBegin();
+         it != localInstance->properties().constEnd(); ++it) {
+        mergePropertyFromLocalInstance(loadingItem, loadingName, globalInstance, it.key(),
+                                       it.value());
+    }
+}
+
+void ModulePropertyMerger::doFinalMerge()
+{
+    AccumulatingTimer t(m_loaderState.parameters().logElapsedTime()
+                            ? &m_product.timingData.propertyMerging : nullptr);
+
+    std::unordered_set<const Item *> itemsToInvalidate;
+    for (const Item::Module &module : m_product.item->modules()) {
+        if (doFinalMerge(module.item))
+            itemsToInvalidate.insert(module.item);
+    }
+
+    // For each module item, if it requires invalidation, we also add modules that depend on
+    // that module item, all the way up to the Product item.
+    std::unordered_set<const Item *> visitedItems;
+    const auto collectDependentItems =
+        [&itemsToInvalidate, &visitedItems](const Item *item, const auto &collect) -> bool
+    {
+        const bool alreadyInSet = itemsToInvalidate.count(item);
+        if (!visitedItems.insert(item).second) // item handled already
+            return alreadyInSet;
+        bool addItem = false;
+        for (const Item::Module &m : item->modules()) {
+            if (collect(m.item, collect))
+                addItem = true;
+        }
+        if (addItem && !alreadyInSet)
+            itemsToInvalidate.insert(item);
+        return addItem || alreadyInSet;
+    };
+    collectDependentItems(m_product.item, collectDependentItems);
+    for (const Item * const item : itemsToInvalidate)
+        m_loaderState.evaluator().clearCache(item);
+}
+
+int ModulePropertyMerger::compareValuePriorities(const ValueConstPtr &v1, const ValueConstPtr &v2)
+{
+    QBS_CHECK(v1);
+    QBS_CHECK(v2);
+    QBS_CHECK(v1->scope() != v2->scope());
+    QBS_CHECK(v1->type() == Value::JSSourceValueType || v2->type() == Value::JSSourceValueType);
+
+    const int prio1 = v1->priority(m_product.item);
+    const int prio2 = v2->priority(m_product.item);
+    if (prio1 != prio2)
+        return prio1 - prio2;
+    const int prioDiff = v1->scopeName().compare(v2->scopeName()); // Sic! See 8ff1dd0044
+    QBS_CHECK(prioDiff != 0);
+    return prioDiff;
+}
+
+ValuePtr ModulePropertyMerger::mergeListValues(const ValuePtr &currentHead, const ValuePtr &newElem)
+{
+    QBS_CHECK(newElem);
+    QBS_CHECK(!newElem->next());
+
+    if (!currentHead)
+        return !newElem->expired(m_product.item) ? newElem : newElem->next();
+
+    QBS_CHECK(!currentHead->expired(m_product.item));
+
+    if (newElem->expired(m_product.item))
+        return currentHead;
+
+    if (compareValuePriorities(currentHead, newElem) < 0) {
+        newElem->setNext(currentHead);
+        return newElem;
+    }
+    currentHead->setNext(mergeListValues(currentHead->next(), newElem));
+    return currentHead;
+}
+
+void ModulePropertyMerger::mergePropertyFromLocalInstance(
+    Item *loadingItem, const QString &loadingName, Item *globalInstance,
+    const QString &name, const ValuePtr &value)
+{
+    if (loadingItem->type() == ItemType::Project) {
+        throw ErrorInfo(Tr::tr("Module properties cannot be set in Project items."),
+                        value->location());
+    }
+
+    const PropertyDeclaration decl = globalInstance->propertyDeclaration(name);
+    if (!decl.isValid()) {
+        if (value->type() == Value::ItemValueType || value->createdByPropertiesBlock())
+            return;
+        throw ErrorInfo(Tr::tr("Property '%1' is not declared.")
+                            .arg(name), value->location());
+    }
+    if (const ErrorInfo error = decl.checkForDeprecation(
+                m_loaderState.parameters().deprecationWarningMode(), value->location(),
+                m_loaderState.logger()); error.hasError()) {
+        handlePropertyError(error, m_loaderState.parameters(), m_loaderState.logger());
+        return;
+    }
+    if (value->setInternally()) { // E.g. qbs.architecture after multiplexing.
+        globalInstance->setProperty(decl.name(), value);
+        return;
+    }
+    QBS_CHECK(value->type() != Value::ItemValueType);
+    const ValuePtr globalVal = globalInstance->ownProperty(decl.name());
+    value->setScope(loadingItem, loadingName);
+    QBS_CHECK(globalVal);
+
+    // Values set internally cannot be overridden by JS values.
+    // The same goes for values set on the command line.
+    // Note that in both cases, there is no merging for list properties: The override is absolute.
+    if (globalVal->setInternally() || globalVal->setByCommandLine())
+        return;
+
+    QBS_CHECK(value->type() == Value::JSSourceValueType);
+
+    if (decl.isScalar()) {
+        QBS_CHECK(!globalVal->expired(m_product.item));
+        QBS_CHECK(!value->expired(m_product.item));
+        if (compareValuePriorities(globalVal, value) < 0) {
+            value->setCandidates(globalVal->candidates());
+            globalVal->setCandidates({});
+            value->addCandidate(globalVal);
+            globalInstance->setProperty(decl.name(), value);
+        } else {
+            globalVal->addCandidate(value);
+        }
+    } else {
+        if (const ValuePtr &newChainStart = mergeListValues(globalVal, value);
+            newChainStart != globalVal) {
+            globalInstance->setProperty(decl.name(), newChainStart);
+        }
+    }
+}
+
+bool ModulePropertyMerger::doFinalMerge(Item *moduleItem)
+{
+    if (!moduleItem->isPresentModule())
+        return false;
+    bool mustInvalidateCache = false;
+    for (auto it = moduleItem->properties().begin(); it != moduleItem->properties().end(); ++it) {
+        if (doFinalMerge(moduleItem->propertyDeclaration(it.key()), it.value()))
+            mustInvalidateCache = true;
+    }
+    return mustInvalidateCache;
+}
+
+bool ModulePropertyMerger::doFinalMerge(const PropertyDeclaration &propertyDecl,
+                                        ValuePtr &propertyValue)
+{
+    if (propertyValue->type() == Value::VariantValueType) {
+        QBS_CHECK(!propertyValue->next());
+        return false;
+    }
+    if (!propertyDecl.isValid())
+        return false; // Caught later by dedicated checker.
+    propertyValue->resetPriority();
+    if (propertyDecl.isScalar()) {
+        if (propertyValue->candidates().empty())
+            return false;
+        std::pair<int, std::vector<ValuePtr>> candidatesWithHighestPrio;
+        candidatesWithHighestPrio.first = propertyValue->priority(m_product.item);
+        candidatesWithHighestPrio.second.push_back(propertyValue);
+        for (const ValuePtr &v : propertyValue->candidates()) {
+            const int prio = v->priority(m_product.item);
+            if (prio < candidatesWithHighestPrio.first)
+                continue;
+            if (prio > candidatesWithHighestPrio.first) {
+                candidatesWithHighestPrio.first = prio;
+                candidatesWithHighestPrio.second = {v};
+                continue;
+            }
+            candidatesWithHighestPrio.second.push_back(v);
+        }
+        ValuePtr chosenValue = candidatesWithHighestPrio.second.front();
+        if (int(candidatesWithHighestPrio.second.size()) > 1) {
+            ErrorInfo error(Tr::tr("Conflicting scalar values for property '%1'.")
+                                .arg(propertyDecl.name()));
+            error.append({}, chosenValue->location());
+            QBS_CHECK(chosenValue->type() == Value::JSSourceValueType);
+            QStringView sourcCode = static_cast<JSSourceValue *>(
+                                        chosenValue.get())->sourceCode();
+            for (int i = 1; i < int(candidatesWithHighestPrio.second.size()); ++i) {
+                const ValuePtr &v = candidatesWithHighestPrio.second.at(i);
+                QBS_CHECK(v->type() == Value::JSSourceValueType);
+
+                // Note that this is a bit silly: The source code could still evaluate to
+                // different values in the end.
+                if (static_cast<JSSourceValue *>(v.get())->sourceCode() != sourcCode)
+                    error.append({}, v->location());
+            }
+            if (error.items().size() > 2)
+                m_loaderState.logger().printWarning(error);
+        }
+
+        if (propertyValue == chosenValue)
+            return false;
+        std::vector<ValuePtr> candidates = propertyValue->candidates();
+        candidates.erase(std::find(candidates.begin(), candidates.end(), chosenValue));
+        chosenValue->setCandidates(candidates);
+        chosenValue->addCandidate(propertyValue);
+        propertyValue->setCandidates({});
+        propertyValue = chosenValue;
+        return true;
+    }
+    if (!propertyValue->next())
+        return false;
+    std::vector<ValuePtr> singleValuesBefore;
+    for (ValuePtr current = propertyValue; current;) {
+        singleValuesBefore.push_back(current);
+        const ValuePtr next = current->next();
+        if (next)
+            current->setNext({});
+        current = next;
+    }
+    ValuePtr newValue;
+    for (const ValuePtr &v : singleValuesBefore)
+        newValue = mergeListValues(newValue, v);
+    std::vector<ValuePtr> singleValuesAfter;
+    for (ValuePtr current = propertyValue; current; current = current->next())
+        singleValuesAfter.push_back(current);
+    propertyValue = newValue;
+    return singleValuesBefore != singleValuesAfter;
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/modulepropertymerger.h b/src/lib/corelib/loader/modulepropertymerger.h
new file mode 100644
index 000000000..a6643216f
--- /dev/null
+++ b/src/lib/corelib/loader/modulepropertymerger.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
+class QString;
+QT_END_NAMESPACE
+
+namespace qbs::Internal {
+class Item;
+class LoaderState;
+class ProductContext;
+
+// This module comprises functions for collecting values attached to module properties
+// in different contexts.
+// For example, in the Qt.core module you will find a property binding such as this:
+//   cpp.defines: "QT_CORE_LIB"
+// while in the Qt.widgets module, it will look like this:
+//   cpp.defines: "QT_WIDGETS_LIB"
+// A product with a dependency on both these modules will end up with a value of
+// ["QT_WIDGETS_LIB", "QT_CORE_LIB"], plus potentially other defines set elsewhere.
+// Each of these values is assigned a priority that roughly corresponds to the "level" at which
+// the module containing the property binding resides in the dependency hierarchy.
+// For list properties, the priorities determine the order of the respecive values in the
+// final array, for scalar values they determine which one survives. Different scalar values
+// with the same priority trigger a warning message.
+// Since the right-hand side of a binding can refer to properties of the surrounding context,
+// each such value gets its own scope.
+
+// This function is called when a module is loaded via a Depends item.
+// loadingItem is the product or module containing the Depends item.
+// loadingName is the name of that module. It is used as a tie-breaker for list property values
+//             with equal priority.
+// localInstance is the module instance placeholder in the ItemValue of a property binding,
+//               i.e. the "cpp" in "cpp.defines".
+// globalInstance is the actual module into which the properties from localInstance get merged.
+void mergeFromLocalInstance(ProductContext &product, Item *loadingItem,
+                            const QString &loadingName, const Item *localInstance,
+                            Item *globalInstance, LoaderState &loaderState);
+
+// This function is called after all dependencies have been resolved. It uses its global
+// knowledge of module priorities to potentially adjust the order of list values or
+// favor different scalar values. It can also remove previously merged-in values again;
+// this can happen if a module fails to load after it already merged some values, or
+// if it fails validation in the end.
+void doFinalMerge(ProductContext &product, LoaderState &loaderState);
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/moduleproviderloader.cpp b/src/lib/corelib/loader/moduleproviderloader.cpp
new file mode 100644
index 000000000..d0789facd
--- /dev/null
+++ b/src/lib/corelib/loader/moduleproviderloader.cpp
@@ -0,0 +1,416 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2021 Ivan Komissarov (abbapoh@gmail.com)
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "moduleproviderloader.h"
+
+#include "itemreader.h"
+#include "probesresolver.h"
+
+#include <language/builtindeclarations.h>
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
+#include <logging/categories.h>
+#include <logging/translator.h>
+#include <tools/fileinfo.h>
+#include <tools/jsliterals.h>
+#include <tools/scripttools.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stlutils.h>
+#include <tools/stringconstants.h>
+
+#include <QtCore/qcryptographichash.h>
+#include <QtCore/qjsondocument.h>
+#include <QtCore/qjsonobject.h>
+
+namespace qbs {
+namespace Internal {
+
+static QString getConfigHash(const QVariantMap& config)
+{
+    QJsonDocument doc;
+    doc.setObject(QJsonObject::fromVariantMap(config));
+    return QString::fromLatin1(
+        QCryptographicHash::hash(doc.toJson(), QCryptographicHash::Sha1).toHex().left(16));
+}
+
+ModuleProviderLoader::ModuleProviderLoader(LoaderState &loaderState)
+    : m_loaderState(loaderState) {}
+
+ModuleProviderLoader::ModuleProviderResult ModuleProviderLoader::executeModuleProviders(
+    ProductContext &productContext,
+    const CodeLocation &dependsItemLocation,
+    const QualifiedId &moduleName)
+{
+    ModuleProviderLoader::ModuleProviderResult result;
+    try {
+        std::vector<Provider> providersToRun;
+        qCDebug(lcModuleLoader) << "Module" << moduleName.toString()
+                                << "not found, checking for module providers";
+        const auto providerNames = getModuleProviders(productContext.item);
+        if (providerNames) {
+            providersToRun = transformed<std::vector<Provider>>(*providerNames, [](const auto &name) {
+                return Provider{name, ModuleProviderLookup::Named}; });
+        } else {
+            for (QualifiedId providerName = moduleName; !providerName.empty();
+                providerName.pop_back()) {
+                    providersToRun.push_back({providerName, ModuleProviderLookup::Scoped});
+            }
+        }
+        result = executeModuleProvidersHelper(
+            productContext, dependsItemLocation, moduleName, providersToRun);
+    } catch (const ErrorInfo &error) {
+        auto ei = error;
+        ei.prepend(
+            Tr::tr("Error executing provider for module '%1':").arg(moduleName.toString()),
+            dependsItemLocation);
+        productContext.handleError(ei);
+    }
+    return result;
+}
+
+ModuleProviderLoader::ModuleProviderResult ModuleProviderLoader::executeModuleProvidersHelper(
+        ProductContext &product,
+        const CodeLocation &dependsItemLocation,
+        const QualifiedId &moduleName,
+        const std::vector<Provider> &providers)
+{
+    if (providers.empty())
+        return {};
+    QStringList allSearchPaths;
+    ModuleProviderResult result;
+    setupModuleProviderConfig(product);
+    const auto qbsModule = evaluateQbsModule(product);
+    for (const auto &[name, lookupType] : providers) {
+        const auto &[info, fromCache] = findOrCreateProviderInfo(
+                    product, dependsItemLocation, moduleName, name, lookupType, qbsModule);
+        if (info.providerFile.isEmpty()) {
+            if (lookupType == ModuleProviderLookup::Named)
+                throw ErrorInfo(Tr::tr("Unknown provider '%1'").arg(name.toString()));
+            continue;
+        }
+        if (fromCache)
+            qCDebug(lcModuleLoader) << "Re-using provider" << name.toString() << "from cache";
+
+        result.providerFound = true;
+        if (info.searchPaths.empty()) {
+            qCDebug(lcModuleLoader)
+                    << "Module provider did run, but did not set up any modules.";
+            continue;
+        }
+        qCDebug(lcModuleLoader) << "Module provider added" << info.searchPaths.size()
+                                << "new search path(s)";
+
+        allSearchPaths << info.searchPaths;
+    }
+    if (allSearchPaths.isEmpty())
+        return result;
+
+    result.searchPaths = std::move(allSearchPaths);
+
+    return result;
+}
+
+std::pair<const ModuleProviderInfo &, bool /*fromCache*/>
+ModuleProviderLoader::findOrCreateProviderInfo(
+        ProductContext &product, const CodeLocation &dependsItemLocation,
+        const QualifiedId &moduleName, const QualifiedId &name, ModuleProviderLookup lookupType,
+        const QVariantMap &qbsModule)
+{
+    QBS_CHECK(product.providerConfig);
+    const QVariantMap config = product.providerConfig->value(name.toString()).toMap();
+    std::lock_guard lock(m_loaderState.topLevelProject().moduleProvidersCacheLock());
+    ModuleProvidersCacheKey cacheKey{name.toString(), {}, config, qbsModule, int(lookupType)};
+    // TODO: get rid of non-eager providers and eliminate following if-logic
+    // first, try to find eager provider (stored with an empty module name)
+    if (ModuleProviderInfo *provider = m_loaderState.topLevelProject().moduleProvider(cacheKey))
+        return {*provider, true};
+    // second, try to find non-eager provider for a specific module name
+    std::get<1>(cacheKey) = moduleName.toString(); // override moduleName
+    if (ModuleProviderInfo *provider = m_loaderState.topLevelProject().moduleProvider(cacheKey))
+        return {*provider, true};
+    bool isEager = false;
+    ModuleProviderInfo info;
+    info.name = name;
+    info.config = config;
+    info.providerFile = findModuleProviderFile(name, lookupType);
+    if (!info.providerFile.isEmpty()) {
+        qCDebug(lcModuleLoader) << "Running provider" << name << "at" << info.providerFile;
+        std::tie(info.searchPaths, isEager) = evaluateModuleProvider(
+                    product,
+                    dependsItemLocation,
+                    moduleName,
+                    name,
+                    info.providerFile,
+                    config,
+                    qbsModule);
+        info.transientOutput = m_loaderState.parameters().dryRun();
+    }
+    std::get<1>(cacheKey) = isEager ? QString() : moduleName.toString();
+    return {m_loaderState.topLevelProject().addModuleProvider(cacheKey, info), false};
+}
+
+void ModuleProviderLoader::setupModuleProviderConfig(ProductContext &product)
+{
+    if (product.providerConfig)
+        return;
+    QVariantMap providerConfig;
+    const ItemValueConstPtr configItemValue =
+        product.item->itemProperty(StringConstants::moduleProviders(), m_loaderState.itemPool());
+    if (configItemValue) {
+        const std::function<void(const Item *, QualifiedId)> collectMap
+                = [this, &providerConfig, &collectMap](const Item *item, const QualifiedId &name) {
+            const Item::PropertyMap &props = item->properties();
+            for (auto it = props.begin(); it != props.end(); ++it) {
+                QVariant value;
+                switch (it.value()->type()) {
+                case Value::ItemValueType: {
+                    const auto childItem = static_cast<ItemValue *>(it.value().get())->item();
+                    childItem->setScope(item->scope());
+                    collectMap(childItem, QualifiedId(name) << it.key());
+                    continue;
+                }
+                case Value::JSSourceValueType: {
+                    it.value()->setScope(item->scope(), {});
+                    const ScopedJsValue sv(m_loaderState.evaluator().engine()->context(),
+                                           m_loaderState.evaluator().value(item, it.key()));
+                    value = getJsVariant(m_loaderState.evaluator().engine()->context(), sv);
+                    break;
+                }
+                case Value::VariantValueType:
+                    value = static_cast<VariantValue *>(it.value().get())->value();
+                    break;
+                }
+                QVariantMap m = providerConfig.value(name.toString()).toMap();
+                m.insert(it.key(), value);
+                providerConfig.insert(name.toString(), m);
+            }
+        };
+        configItemValue->item()->setScope(product.item);
+        collectMap(configItemValue->item(), QualifiedId());
+    }
+    for (auto it = product.moduleProperties.begin(); it != product.moduleProperties.end(); ++it) {
+        if (!it.key().startsWith(QStringLiteral("moduleProviders.")))
+            continue;
+        const QString provider = it.key().mid(QStringLiteral("moduleProviders.").size());
+        const QVariantMap providerConfigFromBuildConfig = it.value().toMap();
+        if (providerConfigFromBuildConfig.empty())
+            continue;
+        QVariantMap currentMapForProvider = providerConfig.value(provider).toMap();
+        for (auto propIt = providerConfigFromBuildConfig.begin();
+             propIt != providerConfigFromBuildConfig.end(); ++propIt) {
+            currentMapForProvider.insert(propIt.key(), propIt.value());
+        }
+        providerConfig.insert(provider, currentMapForProvider);
+    }
+    product.providerConfig = providerConfig;
+}
+
+std::optional<std::vector<QualifiedId>> ModuleProviderLoader::getModuleProviders(Item *item)
+{
+    while (item) {
+        const auto providers = m_loaderState.evaluator().optionalStringListValue(
+                    item, StringConstants::qbsModuleProviders());
+        if (providers) {
+            return transformed<std::vector<QualifiedId>>(*providers, [](const auto &provider) {
+                return QualifiedId::fromString(provider); });
+        }
+        item = item->parent();
+    }
+    return std::nullopt;
+}
+
+QString ModuleProviderLoader::findModuleProviderFile(
+        const QualifiedId &name, ModuleProviderLookup lookupType)
+{
+    for (const QString &path : m_loaderState.itemReader().allSearchPaths()) {
+        QString fullPath = FileInfo::resolvePath(path, QStringLiteral("module-providers"));
+        switch (lookupType) {
+        case ModuleProviderLookup::Named: {
+            const auto result =
+                    FileInfo::resolvePath(fullPath, name.toString() + QStringLiteral(".qbs"));
+            if (FileInfo::exists(result)) {
+                fullPath = result;
+                break;
+            }
+            [[fallthrough]];
+        }
+        case ModuleProviderLookup::Scoped:
+            for (const QString &component : name)
+                fullPath = FileInfo::resolvePath(fullPath, component);
+            fullPath = FileInfo::resolvePath(fullPath, QStringLiteral("provider.qbs"));
+            break;
+        }
+        if (!FileInfo::exists(fullPath)) {
+            qCDebug(lcModuleLoader) << "No module provider found at" << fullPath;
+            continue;
+        }
+        return fullPath;
+    }
+    return {};
+}
+
+QVariantMap ModuleProviderLoader::evaluateQbsModule(ProductContext &product) const
+{
+    if (product.providerQbsModule)
+        return *product.providerQbsModule;
+    const QString properties[] = {
+        QStringLiteral("sysroot"),
+        QStringLiteral("toolchain"),
+    };
+    const auto qbsItemValue = std::static_pointer_cast<ItemValue>(
+        product.item->property(StringConstants::qbsModule()));
+    QVariantMap result;
+    for (const auto &property : properties) {
+        const ScopedJsValue val(m_loaderState.evaluator().engine()->context(),
+                                m_loaderState.evaluator().value(qbsItemValue->item(), property));
+        auto value = getJsVariant(m_loaderState.evaluator().engine()->context(), val);
+        if (!value.isValid())
+            continue;
+
+        // The xcode module sets qbs.sysroot; the resulting value is bogus before the probes
+        // have run.
+        if (property == QLatin1String("sysroot") && !FileInfo::isAbsolute(value.toString()))
+            continue;
+
+        result[property] = std::move(value);
+    }
+    return *(product.providerQbsModule = result);
+}
+
+Item *ModuleProviderLoader::createProviderScope(
+    const ProductContext &product, const QVariantMap &qbsModule)
+{
+    const auto qbsItemValue = std::static_pointer_cast<ItemValue>(
+        product.item->property(StringConstants::qbsModule()));
+
+    Item *fakeQbsModule = Item::create(&m_loaderState.itemPool(), ItemType::Scope);
+
+    for (auto it = qbsModule.begin(), end = qbsModule.end(); it != end; ++it) {
+        fakeQbsModule->setProperty(it.key(), VariantValue::create(it.value()));
+    }
+
+    Item *scope = Item::create(&m_loaderState.itemPool(), ItemType::Scope);
+    scope->setFile(qbsItemValue->item()->file());
+    scope->setProperty(StringConstants::qbsModule(), ItemValue::create(fakeQbsModule));
+    return scope;
+}
+
+ModuleProviderLoader::EvaluationResult ModuleProviderLoader::evaluateModuleProvider(
+        ProductContext &product,
+        const CodeLocation &dependsItemLocation,
+        const QualifiedId &moduleName,
+        const QualifiedId &name,
+        const QString &providerFile,
+        const QVariantMap &moduleConfig,
+        const QVariantMap &qbsModule)
+{
+    qCDebug(lcModuleLoader) << "Instantiating module provider at" << providerFile;
+    const QString projectBuildDir = product.project->item->variantProperty(
+                StringConstants::buildDirectoryProperty())->value().toString();
+    const QString searchPathBaseDir = ModuleProviderInfo::outputDirPath(projectBuildDir, name);
+
+    // include qbs module into hash
+    auto jsConfig = moduleConfig;
+    jsConfig[StringConstants::qbsModule()] = qbsModule;
+
+    QString outputBaseDir = searchPathBaseDir + QLatin1Char('/') + getConfigHash(jsConfig);
+    Item * const providerItem = m_loaderState.itemReader().setupItemFromFile(
+                providerFile, dependsItemLocation);
+    if (providerItem->type() != ItemType::ModuleProvider) {
+        throw ErrorInfo(Tr::tr("File '%1' declares an item of type '%2', "
+                               "but '%3' was expected.")
+            .arg(providerFile, providerItem->typeName(),
+                 BuiltinDeclarations::instance().nameForType(ItemType::ModuleProvider)));
+    }
+
+    Item * const scope = createProviderScope(product, qbsModule);
+    for (auto it = providerItem->properties().begin(); it != providerItem->properties().end(); ++it)
+        it.value()->setScope(scope, {});
+    providerItem->setProperty(
+        StringConstants::nameProperty(),
+        VariantValue::create(name.toString()));
+    providerItem->setProperty(
+        QStringLiteral("outputBaseDir"),
+        VariantValue::create(outputBaseDir));
+    providerItem->overrideProperties(moduleConfig, name,
+                                     m_loaderState.parameters(), m_loaderState.logger());
+
+    const bool isEager = m_loaderState.evaluator().boolValue(
+        providerItem, StringConstants::isEagerProperty());
+    if (!isEager) {
+        providerItem->setProperty(
+            StringConstants::moduleNameProperty(),
+            VariantValue::create(moduleName.toString()));
+    }
+
+    ProbesResolver(m_loaderState).resolveProbes(product, providerItem);
+
+    EvalContextSwitcher contextSwitcher(m_loaderState.evaluator().engine(),
+                                        EvalContext::ModuleProvider);
+
+    checkAllowedValues(providerItem);
+    auto searchPaths = m_loaderState.evaluator().stringListValue(
+        providerItem, QStringLiteral("relativeSearchPaths"));
+    auto prependBaseDir = [&outputBaseDir](const auto &path) {
+        return outputBaseDir + QLatin1Char('/') + path;
+    };
+    std::transform(searchPaths.begin(), searchPaths.end(), searchPaths.begin(), prependBaseDir);
+    return {searchPaths, isEager};
+}
+
+void ModuleProviderLoader::checkAllowedValues(Item *providerItem)
+{
+    for (const auto &propertyDeclaration : providerItem->propertyDeclarations()) {
+        if (!propertyDeclaration.shouldCheckAllowedValues())
+            continue;
+        const auto &name = propertyDeclaration.name();
+        if (name == QStringLiteral("relativeSearchPaths"))
+            continue;
+        const auto value = m_loaderState.evaluator().variantValue(providerItem, name);
+        const auto propertyValue = providerItem->property(name);
+        propertyDeclaration.checkAllowedValues(
+            value, propertyValue->location(), name, m_loaderState);
+    }
+}
+
+} // namespace Internal
+} // namespace qbs
diff --git a/src/lib/corelib/language/moduleproviderloader.h b/src/lib/corelib/loader/moduleproviderloader.h
index 13eddc2b0..471cfbb02 100644
--- a/src/lib/corelib/language/moduleproviderloader.h
+++ b/src/lib/corelib/loader/moduleproviderloader.h
@@ -41,91 +41,72 @@
 #ifndef MODULEPROVIDERLOADER_H
 #define MODULEPROVIDERLOADER_H
 
-#include "moduleloader.h"
-#include "moduleproviderinfo.h"
+#include "loaderutils.h"
+
+#include <language/forward_decls.h>
+#include <language/moduleproviderinfo.h>
 
-#include <QtCore/qmap.h>
 #include <QtCore/qvariant.h>
 
-namespace qbs {
-namespace Internal {
+#include <optional>
+#include <utility>
+#include <vector>
 
-class Logger;
+namespace qbs::Internal {
+class Item;
+class LoaderState;
+class ProductContext;
 
 class ModuleProviderLoader
 {
 public:
-    using ProductContext = ModuleLoader::ProductContext;
-    using FallbackMode = ModuleLoader::FallbackMode;
-    explicit ModuleProviderLoader(ItemReader *itemReader, Evaluator *evaluator, Logger &logger);
+    explicit ModuleProviderLoader(LoaderState &loaderState);
 
-    enum class ModuleProviderLookup { Scoped, Named, Fallback };
+    struct ModuleProviderResult {
+        bool providerFound = false;
+        std::optional<QStringList> searchPaths;
+    };
+    ModuleProviderResult executeModuleProviders(
+        ProductContext &productContext,
+        const CodeLocation &dependsItemLocation,
+        const QualifiedId &moduleName);
 
-    struct Provider
-    {
+private:
+    enum class ModuleProviderLookup { Scoped, Named };
+    struct Provider {
         QualifiedId name;
         ModuleProviderLookup lookup;
     };
-
-    struct ModuleProviderResult
-    {
-        ModuleProviderResult() = default;
-        ModuleProviderResult(bool ran, bool added)
-            : providerFound(ran), providerAddedSearchPaths(added) {}
-        bool providerFound = false;
-        bool providerAddedSearchPaths = false;
-    };
-
-    const StoredModuleProviderInfo &storedModuleProviderInfo() const
-    {
-        return m_storedModuleProviderInfo;
-    }
-
-    void setStoredModuleProviderInfo(StoredModuleProviderInfo moduleProviderInfo)
-    {
-        m_storedModuleProviderInfo = std::move(moduleProviderInfo);
-    }
-
-    void setProjectParameters(SetupProjectParameters parameters)
-    {
-        m_parameters = std::move(parameters);
-    }
-
-    ModuleProviderResult executeModuleProvider(
-            ProductContext &productContext,
+    ModuleProviderResult executeModuleProvidersHelper(
+            ProductContext &product,
             const CodeLocation &dependsItemLocation,
             const QualifiedId &moduleName,
-            FallbackMode fallbackMode);
-    ModuleProviderResult findModuleProvider(
-            const std::vector<Provider> &providers,
-            ProductContext &product,
-            const CodeLocation &dependsItemLocation);
-    QVariantMap moduleProviderConfig(ProductContext &product);
-
-    const Set<QString> &tempQbsFiles() const { return m_tempQbsFiles; }
+            const std::vector<Provider> &providers);
+    std::pair<const ModuleProviderInfo &, bool>
+    findOrCreateProviderInfo(ProductContext &product, const CodeLocation &dependsItemLocation,
+                             const QualifiedId &moduleName, const QualifiedId &name,
+                             ModuleProviderLookup lookupType, const QVariantMap &qbsModule);
+    void setupModuleProviderConfig(ProductContext &product);
 
     std::optional<std::vector<QualifiedId>> getModuleProviders(Item *item);
 
-private:
     QString findModuleProviderFile(const QualifiedId &name, ModuleProviderLookup lookupType);
-    QStringList getProviderSearchPaths(
+    QVariantMap evaluateQbsModule(ProductContext &product) const;
+    Item *createProviderScope(const ProductContext &product, const QVariantMap &qbsModule);
+    using EvaluationResult = std::pair<QStringList, bool /*isEager*/>;
+    EvaluationResult evaluateModuleProvider(
+            ProductContext &product,
+            const CodeLocation &dependsItemLocation,
+            const QualifiedId &moduleName,
             const QualifiedId &name,
             const QString &providerFile,
-            ProductContext &product,
             const QVariantMap &moduleConfig,
-            const CodeLocation &location);
-
-private:
-    ItemReader *const m_reader{nullptr};
-    Evaluator *const m_evaluator{nullptr};
+            const QVariantMap &qbsModule);
+    void checkAllowedValues(Item *providerItem);
 
-    SetupProjectParameters m_parameters;
-    Logger &m_logger;
-    StoredModuleProviderInfo m_storedModuleProviderInfo;
-    Set<QString> m_tempQbsFiles;
+    LoaderState &m_loaderState;
 };
 
-} // namespace Internal
-} // namespace qbs
+} // namespace qbs::Internal
 
 #endif // MODULEPROVIDERLOADER_H
diff --git a/src/lib/corelib/loader/probesresolver.cpp b/src/lib/corelib/loader/probesresolver.cpp
new file mode 100644
index 000000000..269e9c4b6
--- /dev/null
+++ b/src/lib/corelib/loader/probesresolver.cpp
@@ -0,0 +1,293 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Copyright (C) 2022 Raphaël Cotty <raphael.cotty@gmail.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "probesresolver.h"
+
+#include "itemreader.h"
+#include "loaderutils.h"
+
+#include <api/languageinfo.h>
+#include <language/evaluator.h>
+#include <language/filecontext.h>
+#include <language/item.h>
+#include <language/language.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
+#include <logging/categories.h>
+#include <logging/logger.h>
+#include <logging/translator.h>
+#include <tools/profiling.h>
+#include <tools/scripttools.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+#include <quickjs.h>
+
+namespace qbs {
+namespace Internal {
+
+static QString probeGlobalId(Item *probe)
+{
+    QString id;
+
+    for (Item *obj = probe; obj; obj = obj->prototype()) {
+        if (!obj->id().isEmpty()) {
+            id = obj->id();
+            break;
+        }
+    }
+
+    if (id.isEmpty())
+        return {};
+
+    QBS_CHECK(probe->file());
+    return id + QLatin1Char('_') + probe->file()->filePath();
+}
+
+ProbesResolver::ProbesResolver(LoaderState &loaderState) : m_loaderState(loaderState) {}
+
+void ProbesResolver::resolveProbes(ProductContext &productContext, Item *item)
+{
+    AccumulatingTimer probesTimer(m_loaderState.parameters().logElapsedTime()
+                                  ? &productContext.timingData.probes : nullptr);
+
+    EvalContextSwitcher evalContextSwitcher(m_loaderState.evaluator().engine(),
+                                            EvalContext::ProbeExecution);
+    for (Item * const child : item->children()) {
+        if (child->type() == ItemType::Probe)
+            resolveProbe(productContext, item, child);
+    }
+}
+
+void ProbesResolver::resolveProbe(ProductContext &productContext, Item *parent,
+                                           Item *probe)
+{
+    qCDebug(lcModuleLoader) << "Resolving Probe at " << probe->location().toString();
+    const QString &probeId = probeGlobalId(probe);
+    if (Q_UNLIKELY(probeId.isEmpty()))
+        throw ErrorInfo(Tr::tr("Probe.id must be set."), probe->location());
+    const bool isProjectLevelProbe
+        = parent->type() == ItemType::Project
+          || productContext.name.startsWith(StringConstants::shadowProductPrefix());
+    const JSSourceValueConstPtr configureScript
+            = probe->sourceProperty(StringConstants::configureProperty());
+    QBS_CHECK(configureScript);
+    if (Q_UNLIKELY(configureScript->sourceCode() == StringConstants::undefinedValue()))
+        throw ErrorInfo(Tr::tr("Probe.configure must be set."), probe->location());
+    using ProbeProperty = std::pair<QString, ScopedJsValue>;
+    std::vector<ProbeProperty> probeBindings;
+    Evaluator &evaluator = m_loaderState.evaluator();
+    ScriptEngine * const engine = evaluator.engine();
+    JSContext * const ctx = engine->context();
+    QVariantMap initialProperties;
+    for (Item *obj = probe; obj; obj = obj->prototype()) {
+        const Item::PropertyMap &props = obj->properties();
+        for (auto it = props.cbegin(); it != props.cend(); ++it) {
+            const QString &name = it.key();
+            if (name == StringConstants::configureProperty())
+                continue;
+            const JSValue value = evaluator.value(probe, name);
+            probeBindings.emplace_back(name, ScopedJsValue(ctx, value));
+            if (name != StringConstants::conditionProperty())
+                initialProperties.insert(name, getJsVariant(ctx, value));
+        }
+    }
+    const bool condition = evaluator.boolValue(probe, StringConstants::conditionProperty());
+    const QString &sourceCode = configureScript->sourceCode().toString();
+    ProbeConstPtr resolvedProbe;
+    std::lock_guard lock(m_loaderState.topLevelProject().probesCacheLock());
+    m_loaderState.topLevelProject().incrementProbesCount();
+    if (isProjectLevelProbe) {
+        resolvedProbe = findOldProjectProbe(probeId, condition, initialProperties, sourceCode);
+    } else {
+        resolvedProbe = findOldProductProbe(productContext.uniqueName(), condition,
+                                            initialProperties, sourceCode);
+    }
+    if (!resolvedProbe) {
+        resolvedProbe = findCurrentProbe(probe->location(), condition, initialProperties);
+        if (resolvedProbe) {
+            qCDebug(lcModuleLoader) << "probe results cached from current run";
+            m_loaderState.topLevelProject().incrementReusedCurrentProbesCount();
+        }
+    } else {
+        qCDebug(lcModuleLoader) << "probe results cached from earlier run";
+        m_loaderState.topLevelProject().incrementReusedOldProbesCount();
+    }
+    ScopedJsValue configureScope(ctx, JS_UNDEFINED);
+    std::vector<QString> importedFilesUsedInConfigure;
+    if (!condition) {
+        qCDebug(lcModuleLoader) << "Probe disabled; skipping";
+    } else if (!resolvedProbe) {
+        m_loaderState.topLevelProject().incrementRunProbesCount();
+        qCDebug(lcModuleLoader) << "configure script needs to run";
+        const Evaluator::FileContextScopes fileCtxScopes
+                = evaluator.fileContextScopes(configureScript->file());
+        configureScope.setValue(engine->newObject());
+        for (const ProbeProperty &b : probeBindings)
+            setJsProperty(ctx, configureScope, b.first, JS_DupValue(ctx, b.second));
+        engine->clearRequestedProperties();
+        ScopedJsValue sv(ctx, engine->evaluate(JsValueOwner::Caller,
+                configureScript->sourceCodeForEvaluation(), {}, 1,
+                {fileCtxScopes.fileScope, fileCtxScopes.importScope, configureScope}));
+        if (JsException ex = engine->checkAndClearException(configureScript->location()))
+            throw ex.toErrorInfo();
+        importedFilesUsedInConfigure = engine->importedFilesUsedInScript();
+    } else {
+        importedFilesUsedInConfigure = resolvedProbe->importedFilesUsed();
+    }
+    QVariantMap properties;
+    VariantValuePtr storedValue;
+    QMap<QString, VariantValuePtr> storedValues;
+    for (const ProbeProperty &b : probeBindings) {
+        QVariant newValue;
+        if (resolvedProbe) {
+            newValue = resolvedProbe->properties().value(b.first);
+        } else {
+            if (condition) {
+                JSValue v = getJsProperty(ctx, configureScope, b.first);
+                const JSValue saved = v;
+                ScopedJsValue valueMgr(ctx, saved);
+                const PropertyDeclaration decl = probe->propertyDeclaration(b.first);
+                evaluator.convertToPropertyType(decl, probe->location(), v);
+
+                // If the value was converted from scalar to array as per our convenience
+                // functionality, then the original value is now the only element of a
+                // newly allocated array and thus gets deleted via that array.
+                // The array itself is owned by the script engine, so we must stay out of
+                // memory management here.
+                if (v != saved)
+                    valueMgr.setValue(JS_UNDEFINED);
+
+                if (JsException ex = engine->checkAndClearException({}))
+                    throw ex.toErrorInfo();
+                newValue = getJsVariant(ctx, v);
+                // Special case, string and path lists are represented as js arrays but we don't
+                // want to make them const as we do for object lists. Converting to QStringList
+                // allows to distinguish between these two cases in ScriptEngine::asJsValue
+                if (newValue.userType() == QMetaType::QVariantList
+                    && (decl.type() == PropertyDeclaration::StringList
+                        || decl.type() == PropertyDeclaration::PathList)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+                    newValue.convert(QMetaType(QMetaType::QStringList));
+#else
+                    newValue.convert(QMetaType::QStringList);
+#endif
+                }
+            } else {
+                newValue = initialProperties.value(b.first);
+            }
+        }
+        if (!qVariantsEqual(newValue, getJsVariant(ctx, b.second))) {
+            if (!resolvedProbe)
+                storedValue = VariantValue::createStored(newValue);
+            else
+                storedValue = resolvedProbe->values().value(b.first);
+
+            probe->setProperty(b.first, storedValue);
+        }
+        if (!resolvedProbe) {
+            properties.insert(b.first, newValue);
+            storedValues[b.first] = storedValue;
+        }
+    }
+    if (!resolvedProbe) {
+        resolvedProbe = Probe::create(probeId, probe->location(), condition,
+                                      sourceCode, properties, initialProperties, storedValues,
+                                      importedFilesUsedInConfigure);
+        m_loaderState.topLevelProject().addNewlyResolvedProbe(resolvedProbe);
+    }
+    if (isProjectLevelProbe)
+        m_loaderState.topLevelProject().addProjectLevelProbe(resolvedProbe);
+    else
+        productContext.probes << resolvedProbe;
+}
+
+ProbeConstPtr ProbesResolver::findOldProjectProbe(
+        const QString &globalId,
+        bool condition,
+        const QVariantMap &initialProperties,
+        const QString &sourceCode) const
+{
+    if (m_loaderState.parameters().forceProbeExecution())
+        return {};
+    return m_loaderState.topLevelProject().findOldProjectProbe(globalId,
+                                                               [&](const ProbeConstPtr &oldProbe) {
+        return probeMatches(oldProbe, condition, initialProperties, sourceCode, CompareScript::Yes);
+    });
+}
+
+ProbeConstPtr ProbesResolver::findOldProductProbe(
+        const QString &productName,
+        bool condition,
+        const QVariantMap &initialProperties,
+        const QString &sourceCode) const
+{
+    if (m_loaderState.parameters().forceProbeExecution())
+        return {};
+    return m_loaderState.topLevelProject().findOldProductProbe(productName,
+                                                               [&](const ProbeConstPtr &oldProbe) {
+        return probeMatches(oldProbe, condition, initialProperties, sourceCode, CompareScript::Yes);
+    });
+}
+
+ProbeConstPtr ProbesResolver::findCurrentProbe(
+        const CodeLocation &location,
+        bool condition,
+        const QVariantMap &initialProperties) const
+{
+    return m_loaderState.topLevelProject().findCurrentProbe(location,
+                                                            [&](const ProbeConstPtr &probe) {
+        return probeMatches(probe, condition, initialProperties, QString(), CompareScript::No);
+    });
+}
+
+bool ProbesResolver::probeMatches(const ProbeConstPtr &probe, bool condition,
+        const QVariantMap &initialProperties, const QString &configureScript,
+        CompareScript compareScript) const
+{
+    return probe->condition() == condition
+           && qVariantMapsEqual(probe->initialProperties(), initialProperties)
+           && (compareScript == CompareScript::No
+               || (probe->configureScript() == configureScript
+                   && !probe->needsReconfigure(m_loaderState.topLevelProject().lastResolveTime())));
+}
+
+} // namespace Internal
+} // namespace qbs
diff --git a/src/lib/corelib/loader/probesresolver.h b/src/lib/corelib/loader/probesresolver.h
new file mode 100644
index 000000000..4c49861d3
--- /dev/null
+++ b/src/lib/corelib/loader/probesresolver.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Copyright (C) 2022 Raphaël Cotty <raphael.cotty@gmail.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PROBESRESOLVER_H
+#define PROBESRESOLVER_H
+
+#include <language/forward_decls.h>
+#include <tools/codelocation.h>
+
+#include <QString>
+
+namespace qbs::Internal {
+class Item;
+class LoaderState;
+class ProductContext;
+
+class ProbesResolver
+{
+public:
+    explicit ProbesResolver(LoaderState &loaderState);
+    void resolveProbes(ProductContext &productContext, Item *item);
+
+private:
+    ProbeConstPtr findOldProjectProbe(const QString &globalId, bool condition,
+                                      const QVariantMap &initialProperties,
+                                      const QString &sourceCode) const;
+    ProbeConstPtr findOldProductProbe(const QString &productName, bool condition,
+                                      const QVariantMap &initialProperties,
+                                      const QString &sourceCode) const;
+    ProbeConstPtr findCurrentProbe(const CodeLocation &location, bool condition,
+                                   const QVariantMap &initialProperties) const;
+    enum class CompareScript { No, Yes };
+    bool probeMatches(const ProbeConstPtr &probe, bool condition,
+                      const QVariantMap &initialProperties, const QString &configureScript,
+                      CompareScript compareScript) const;
+    void resolveProbe(ProductContext &productContext, Item *parent, Item *probe);
+
+    LoaderState &m_loaderState;
+};
+
+} // namespace qbs::Internal
+
+#endif // PROBESRESOLVER_H
diff --git a/src/lib/corelib/loader/productitemmultiplexer.cpp b/src/lib/corelib/loader/productitemmultiplexer.cpp
new file mode 100644
index 000000000..0adb3d7fd
--- /dev/null
+++ b/src/lib/corelib/loader/productitemmultiplexer.cpp
@@ -0,0 +1,259 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "productitemmultiplexer.h"
+
+#include "loaderutils.h"
+#include "moduleinstantiator.h"
+
+#include <language/evaluator.h>
+#include <language/item.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
+#include <logging/translator.h>
+#include <tools/scripttools.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+#include <QJsonDocument>
+
+#include <vector>
+
+// This module deals with product multiplexing over the various defined axes.
+// For instance, a product with qbs.architectures: ["x86", "arm"] will get multiplexed into
+// two products with qbs.architecture: "x86" and qbs.architecture: "arm", respectively.
+namespace qbs::Internal {
+namespace {
+using MultiplexRow = std::vector<VariantValuePtr>;
+using MultiplexTable = std::vector<MultiplexRow>;
+class MultiplexInfo
+{
+public:
+    std::vector<QString> properties;
+    MultiplexTable table;
+    bool aggregate = false;
+    VariantValuePtr multiplexedType;
+
+    QString toIdString(size_t row, LoaderState &loaderState) const;
+};
+} // namespace
+
+class ProductItemMultiplexer
+{
+public:
+    ProductItemMultiplexer(const QString &productName, Item *productItem, Item *tempQbsModuleItem,
+                           const std::function<void()> &dropTempQbsModule, LoaderState &loaderState)
+        : m_loaderState(loaderState), m_productName(productName), m_productItem(productItem),
+          m_tempQbsModuleItem(tempQbsModuleItem), m_dropTempQbsModule(dropTempQbsModule) {}
+
+    QList<Item *> multiplex();
+private:
+    MultiplexInfo extractMultiplexInfo();
+    MultiplexTable combine(const MultiplexTable &table, const MultiplexRow &values);
+
+    LoaderState &m_loaderState;
+    const QString &m_productName;
+    Item * const m_productItem;
+    Item * const m_tempQbsModuleItem;
+    const std::function<void()> &m_dropTempQbsModule;
+};
+
+QList<Item *> ProductItemMultiplexer::multiplex()
+{
+    const auto multiplexInfo = extractMultiplexInfo();
+    m_dropTempQbsModule();
+    if (multiplexInfo.table.size() > 1)
+        m_productItem->setProperty(StringConstants::multiplexedProperty(), VariantValue::trueValue());
+    VariantValuePtr productNameValue = VariantValue::create(m_productName);
+    Item *aggregator = multiplexInfo.aggregate ? m_productItem->clone(m_loaderState.itemPool())
+                                               : nullptr;
+    QList<Item *> additionalProductItems;
+    std::vector<VariantValuePtr> multiplexConfigurationIdValues;
+    for (size_t row = 0; row < multiplexInfo.table.size(); ++row) {
+        Item *item = m_productItem;
+        const auto &mprow = multiplexInfo.table.at(row);
+        QBS_CHECK(mprow.size() == multiplexInfo.properties.size());
+        if (row > 0) {
+            item = m_productItem->clone(m_loaderState.itemPool());
+            additionalProductItems.push_back(item);
+        }
+        const QString multiplexConfigurationId = multiplexInfo.toIdString(row, m_loaderState);
+        const VariantValuePtr multiplexConfigurationIdValue
+            = VariantValue::create(multiplexConfigurationId);
+        if (multiplexInfo.table.size() > 1 || aggregator) {
+            multiplexConfigurationIdValues.push_back(multiplexConfigurationIdValue);
+            item->setProperty(StringConstants::multiplexConfigurationIdProperty(),
+                              multiplexConfigurationIdValue);
+        }
+        if (multiplexInfo.multiplexedType)
+            item->setProperty(StringConstants::typeProperty(), multiplexInfo.multiplexedType);
+        for (size_t column = 0; column < mprow.size(); ++column) {
+            Item * const qbsItem = retrieveQbsItem(item, m_loaderState);
+            const QString &propertyName = multiplexInfo.properties.at(column);
+            const VariantValuePtr &mpvalue = mprow.at(column);
+            qbsItem->setProperty(propertyName, mpvalue);
+        }
+    }
+
+    if (aggregator) {
+        additionalProductItems << aggregator;
+
+        // Add dependencies to all multiplexed instances.
+        for (const auto &v : multiplexConfigurationIdValues) {
+            Item *dependsItem = Item::create(&m_loaderState.itemPool(), ItemType::Depends);
+            dependsItem->setProperty(StringConstants::nameProperty(), productNameValue);
+            dependsItem->setProperty(StringConstants::multiplexConfigurationIdsProperty(), v);
+            dependsItem->setProperty(StringConstants::profilesProperty(),
+                                     VariantValue::create(QStringList()));
+            dependsItem->setFile(aggregator->file());
+            dependsItem->setupForBuiltinType(m_loaderState.parameters().deprecationWarningMode(),
+                                             m_loaderState.logger());
+            Item::addChild(aggregator, dependsItem);
+        }
+    }
+
+    return additionalProductItems;
+}
+
+MultiplexInfo ProductItemMultiplexer::extractMultiplexInfo()
+{
+    static const QString mpmKey = QStringLiteral("multiplexMap");
+
+    Evaluator &evaluator = m_loaderState.evaluator();
+    JSContext * const ctx = evaluator.engine()->context();
+    const ScopedJsValue multiplexMap(ctx, evaluator.value(m_tempQbsModuleItem, mpmKey));
+    const QStringList multiplexByQbsProperties = evaluator.stringListValue(
+        m_productItem, StringConstants::multiplexByQbsPropertiesProperty());
+
+    MultiplexInfo multiplexInfo;
+    multiplexInfo.aggregate = evaluator.boolValue(
+        m_productItem, StringConstants::aggregateProperty());
+
+    const QString multiplexedType = evaluator.stringValue(
+        m_productItem, StringConstants::multiplexedTypeProperty());
+    if (!multiplexedType.isEmpty())
+        multiplexInfo.multiplexedType = VariantValue::create(multiplexedType);
+
+    Set<QString> uniqueMultiplexByQbsProperties;
+    for (const QString &key : multiplexByQbsProperties) {
+        const QString mappedKey = getJsStringProperty(ctx, multiplexMap, key);
+        if (mappedKey.isEmpty())
+            throw ErrorInfo(Tr::tr("There is no entry for '%1' in 'qbs.multiplexMap'.").arg(key));
+
+        if (!uniqueMultiplexByQbsProperties.insert(mappedKey).second)
+            continue;
+
+        const ScopedJsValue arr(ctx, evaluator.value(m_tempQbsModuleItem, key));
+        if (JS_IsUndefined(arr))
+            continue;
+        if (!JS_IsArray(ctx, arr))
+            throw ErrorInfo(Tr::tr("Property '%1' must be an array.").arg(key));
+
+        const quint32 arrlen = getJsIntProperty(ctx, arr, StringConstants::lengthProperty());
+        if (arrlen == 0)
+            continue;
+
+        MultiplexRow mprow;
+        mprow.reserve(arrlen);
+        QVariantList entriesForKey;
+        for (quint32 i = 0; i < arrlen; ++i) {
+            const ScopedJsValue sv(ctx, JS_GetPropertyUint32(ctx, arr, i));
+            const QVariant value = getJsVariant(ctx, sv);
+            if (entriesForKey.contains(value))
+                continue;
+            entriesForKey << value;
+            mprow.push_back(VariantValue::create(value));
+        }
+        multiplexInfo.table = combine(multiplexInfo.table, mprow);
+        multiplexInfo.properties.push_back(mappedKey);
+    }
+    return multiplexInfo;
+}
+
+MultiplexTable ProductItemMultiplexer::combine(const MultiplexTable &table,
+                                               const MultiplexRow &values)
+{
+    MultiplexTable result;
+    if (table.empty()) {
+        result.resize(values.size());
+        for (size_t i = 0; i < values.size(); ++i) {
+            MultiplexRow row;
+            row.resize(1);
+            row[0] = values.at(i);
+            result[i] = row;
+        }
+    } else {
+        for (const auto &row : table) {
+            for (const auto &value : values) {
+                MultiplexRow newRow = row;
+                newRow.push_back(value);
+                result.push_back(newRow);
+            }
+        }
+    }
+    return result;
+}
+
+QString MultiplexInfo::toIdString(size_t row, LoaderState &loaderState) const
+{
+    const auto &mprow = table.at(row);
+    QVariantMap multiplexConfiguration;
+    for (size_t column = 0; column < mprow.size(); ++column) {
+        const QString &propertyName = properties.at(column);
+        const VariantValuePtr &mpvalue = mprow.at(column);
+        multiplexConfiguration.insert(propertyName, mpvalue->value());
+    }
+    QString id = QString::fromUtf8(QJsonDocument::fromVariant(multiplexConfiguration)
+                                   .toJson(QJsonDocument::Compact)
+                                   .toBase64());
+
+    // Cache for later use in multiplexIdToVariantMap()
+    loaderState.topLevelProject().addMultiplexConfiguration(id, multiplexConfiguration);
+
+    return id;
+}
+
+QList<Item *> multiplex(const QString &productName, Item *productItem, Item *tempQbsModuleItem,
+                        const std::function<void ()> &dropTempQbsModule, LoaderState &loaderState)
+{
+    return ProductItemMultiplexer(productName, productItem, tempQbsModuleItem, dropTempQbsModule,
+                                  loaderState).multiplex();
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/productitemmultiplexer.h b/src/lib/corelib/loader/productitemmultiplexer.h
new file mode 100644
index 000000000..e02e21793
--- /dev/null
+++ b/src/lib/corelib/loader/productitemmultiplexer.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QList>
+
+#include <functional>
+
+QT_BEGIN_NAMESPACE
+class QString;
+QT_END_NAMESPACE
+
+namespace qbs::Internal {
+class Item;
+class LoaderState;
+
+// Checks whether the product item is to be multiplexed and returns the list of additional
+// product items. In the normal, non-multiplex case, this list is empty.
+QList<Item *> multiplex(
+    const QString &productName,
+    Item *productItem,
+    Item *tempQbsModuleItem,
+    const std::function<void()> &dropTempQbsModule,
+    LoaderState &loaderState
+    );
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/productresolver.cpp b/src/lib/corelib/loader/productresolver.cpp
new file mode 100644
index 000000000..a026a76d6
--- /dev/null
+++ b/src/lib/corelib/loader/productresolver.cpp
@@ -0,0 +1,1618 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "productresolver.h"
+
+#include "dependenciesresolver.h"
+#include "groupshandler.h"
+#include "loaderutils.h"
+#include "modulepropertymerger.h"
+#include "probesresolver.h"
+
+#include <jsextensions/jsextensions.h>
+#include <jsextensions/moduleproperties.h>
+#include <language/artifactproperties.h>
+#include <language/builtindeclarations.h>
+#include <language/evaluator.h>
+#include <language/filecontext.h>
+#include <language/item.h>
+#include <language/language.h>
+#include <language/propertymapinternal.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
+#include <logging/categories.h>
+#include <logging/translator.h>
+#include <tools/fileinfo.h>
+#include <tools/jsliterals.h>
+#include <tools/profiling.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+#include <algorithm>
+
+namespace qbs::Internal {
+
+class PropertiesEvaluator
+{
+public:
+    PropertiesEvaluator(ProductContext &product, LoaderState &loaderState)
+        : m_product(product), m_loaderState(loaderState) {}
+
+    QVariantMap evaluateProperties(Item *item, bool lookupPrototype, bool checkErrors);
+    QVariantMap evaluateProperties(const Item *item, const Item *propertiesContainer,
+                                   const QVariantMap &tmplt, bool lookupPrototype,
+                                   bool checkErrors);
+    void evaluateProperty(const Item *item, const QString &propName, const ValuePtr &propValue,
+                          QVariantMap &result, bool checkErrors);
+
+private:
+    ProductContext &m_product;
+    LoaderState &m_loaderState;
+};
+
+// Dependency resolving, Probe execution.
+// Run for real products and shadow products.
+class ProductResolverStage1
+{
+public:
+    ProductResolverStage1(ProductContext &product, Deferral deferral, LoaderState &loaderState)
+        : m_product(product), m_loaderState(loaderState), m_deferral(deferral) {}
+    void start();
+
+private:
+    void resolveProbes();
+    void resolveProbes(Item *item);
+    void runModuleProbes(const Item::Module &module);
+    void updateModulePresentState(const Item::Module &module);
+    bool validateModule(const Item::Module &module);
+    void handleModuleSetupError(const Item::Module &module, const ErrorInfo &error);
+    void checkPropertyDeclarations();
+    void mergeDependencyParameters();
+    void checkDependencyParameterDeclarations(const Item *productItem,
+                                              const QString &productName) const;
+    void collectCodeLinks();
+
+    ProductContext &m_product;
+    LoaderState &m_loaderState;
+    const Deferral m_deferral;
+};
+
+// Setting up ResolvedProduct, incuding property evaluation and handling Product child items.
+// Run only for real products.
+class ProductResolverStage2
+{
+public:
+    ProductResolverStage2(ProductContext &product, LoaderState &loaderState)
+        : m_product(product), m_loaderState(loaderState) {}
+    void start();
+
+private:
+    void resolveProductFully();
+    void createProductConfig();
+    void resolveGroup(Item *item);
+    void resolveGroupFully(Item *item, bool isEnabled);
+    QVariantMap resolveAdditionalModuleProperties(const Item *group,
+                                                  const QVariantMap &currentValues);
+    SourceArtifactPtr createSourceArtifact(const QString &fileName, const GroupPtr &group,
+            bool wildcard, const CodeLocation &filesLocation,
+            ErrorInfo *errorInfo);
+    void resolveExport(Item *exportItem);
+    std::unique_ptr<ExportedItem> resolveExportChild(const Item *item,
+                                                     const ExportedModule &module);
+    void setupExportedProperties(const Item *item, const QString &namePrefix,
+                                 std::vector<ExportedProperty> &properties);
+    QVariantMap evaluateModuleValues(Item *item, bool lookupPrototype = true);
+
+    void resolveScanner(Item *item, ModuleContext &moduleContext);
+    void resolveModules();
+    void resolveModule(const QualifiedId &moduleName, Item *item, bool isProduct,
+                       const QVariantMap &parameters, JobLimits &jobLimits);
+    void applyFileTaggers();
+    void finalizeArtifactProperties();
+    void collectProductDependencies();
+
+    ProductContext &m_product;
+    LoaderState &m_loaderState;
+    GroupConstPtr m_currentGroup;
+    FileLocations m_sourceArtifactLocations;
+    PropertiesEvaluator m_propertiesEvaluator{m_product, m_loaderState};
+
+    using ArtifactPropertiesInfo = std::pair<ArtifactPropertiesPtr, std::vector<CodeLocation>>;
+    QHash<QStringList, ArtifactPropertiesInfo> m_artifactPropertiesPerFilter;
+};
+
+class ExportsResolver
+{
+public:
+    ExportsResolver(ProductContext &product, LoaderState &loaderState)
+        : m_product(product), m_loaderState(loaderState) {}
+    void start();
+
+private:
+    void resolveShadowProduct();
+    void collectPropertiesForExportItem(Item *productModuleInstance);
+    void collectPropertiesForExportItem(const QualifiedId &moduleName, const ValuePtr &value,
+                                        Item *moduleInstance, QVariantMap &moduleProps);
+    void collectPropertiesForModuleInExportItem(const Item::Module &module);
+    void adaptExportedPropertyValues();
+    void collectExportedProductDependencies();
+
+    ProductContext &m_product;
+    LoaderState &m_loaderState;
+    PropertiesEvaluator m_propertiesEvaluator{m_product, m_loaderState};
+};
+
+void resolveProduct(ProductContext &product, Deferral deferral, LoaderState &loaderState)
+{
+    try {
+        ProductResolverStage1(product, deferral, loaderState).start();
+    } catch (const ErrorInfo &err) {
+        if (err.isCancelException()) {
+            loaderState.topLevelProject().setCanceled();
+            return;
+        }
+        product.handleError(err);
+    }
+
+    if (product.dependenciesResolvingPending())
+        return;
+
+    if (product.name.startsWith(StringConstants::shadowProductPrefix()))
+        return;
+
+    // TODO: The weird double-forwarded error handling can hopefully be simplified now.
+    try {
+        ProductResolverStage2(product, loaderState).start();
+    } catch (const ErrorInfo &err) {
+        if (err.isCancelException()) {
+            loaderState.topLevelProject().setCanceled();
+            return;
+        }
+        loaderState.topLevelProject().addQueuedError(err);
+    }
+}
+
+void setupExports(ProductContext &product, LoaderState &loaderState)
+{
+    ExportsResolver(product, loaderState).start();
+}
+
+void ProductResolverStage1::start()
+{
+    TopLevelProjectContext &topLevelProject = m_loaderState.topLevelProject();
+    topLevelProject.checkCancelation();
+
+    if (m_product.delayedError.hasError())
+        return;
+
+    resolveDependencies(m_product, m_deferral, m_loaderState);
+    QBS_CHECK(m_product.dependenciesContext);
+    if (!m_product.dependenciesContext->dependenciesResolved)
+        return;
+    if (m_product.delayedError.hasError())
+        return;
+
+    // Run probes for modules and product.
+    resolveProbes();
+
+    // After the probes have run, we can switch on the evaluator cache.
+    Evaluator &evaluator = m_loaderState.evaluator();
+    FileTags fileTags = evaluator.fileTagsValue(m_product.item, StringConstants::typeProperty());
+    EvalCacheEnabler cacheEnabler(&evaluator, evaluator.stringValue(
+                                      m_product.item,
+                                      StringConstants::sourceDirectoryProperty()));
+
+    // Run module validation scripts.
+    for (const Item::Module &module : m_product.item->modules()) {
+        if (!validateModule(module))
+            return;
+        fileTags += evaluator.fileTagsValue(
+            module.item, StringConstants::additionalProductTypesProperty());
+    }
+
+    // Disable modules that have been pulled in only by now-disabled modules.
+    // Note that this has to happen in the reverse order compared to the other loops,
+    // with the leaves checked last.
+    for (auto it = m_product.item->modules().rbegin(); it != m_product.item->modules().rend(); ++it)
+        updateModulePresentState(*it);
+
+    // Now do the canonical module property values merge. Note that this will remove
+    // previously attached values from modules that failed validation.
+    // Evaluator cache entries that could potentially change due to this will be purged.
+    doFinalMerge(m_product, m_loaderState);
+
+    const bool enabled = topLevelProject.checkItemCondition(m_product.item, evaluator);
+
+    collectCodeLinks();
+    mergeDependencyParameters();
+    checkDependencyParameterDeclarations(m_product.item, m_product.name);
+
+    setupGroups(m_product, m_loaderState);
+
+    // Collect the full list of fileTags, including the values contributed by modules.
+    if (!m_product.delayedError.hasError() && enabled
+        && !m_product.name.startsWith(StringConstants::shadowProductPrefix())) {
+        topLevelProject.addProductByType(m_product, fileTags);
+        m_product.item->setProperty(StringConstants::typeProperty(),
+                                    VariantValue::create(sorted(fileTags.toStringList())));
+    }
+
+    checkPropertyDeclarations();
+}
+
+void ProductResolverStage1::resolveProbes()
+{
+    for (const Item::Module &module : m_product.item->modules()) {
+        runModuleProbes(module);
+        if (m_product.delayedError.hasError())
+            return;
+    }
+    resolveProbes(m_product.item);
+}
+
+void ProductResolverStage1::resolveProbes(Item *item)
+{
+    ProbesResolver(m_loaderState).resolveProbes(m_product, item);
+}
+
+void ProductResolverStage1::runModuleProbes(const Item::Module &module)
+{
+    if (!module.item->isPresentModule())
+        return;
+    if (module.product && m_loaderState.topLevelProject().isDisabledItem(module.product->item)) {
+        createNonPresentModule(m_loaderState.itemPool(), module.name.toString(),
+                               QLatin1String("module's exporting product is disabled"),
+                               module.item);
+        return;
+    }
+    try {
+        resolveProbes(module.item);
+        if (module.versionRange.minimum.isValid()
+            || module.versionRange.maximum.isValid()) {
+            if (module.versionRange.maximum.isValid()
+                && module.versionRange.minimum >= module.versionRange.maximum) {
+                throw ErrorInfo(Tr::tr("Impossible version constraint [%1,%2) set for module "
+                                       "'%3'").arg(module.versionRange.minimum.toString(),
+                                         module.versionRange.maximum.toString(),
+                                         module.name.toString()));
+            }
+            const Version moduleVersion = Version::fromString(
+                        m_loaderState.evaluator().stringValue(module.item,
+                                                              StringConstants::versionProperty()));
+            if (moduleVersion < module.versionRange.minimum) {
+                throw ErrorInfo(Tr::tr("Module '%1' has version %2, but it needs to be "
+                                       "at least %3.").arg(module.name.toString(),
+                                         moduleVersion.toString(),
+                                         module.versionRange.minimum.toString()));
+            }
+            if (module.versionRange.maximum.isValid()
+                && moduleVersion >= module.versionRange.maximum) {
+                throw ErrorInfo(Tr::tr("Module '%1' has version %2, but it needs to be "
+                                       "lower than %3.").arg(module.name.toString(),
+                                         moduleVersion.toString(),
+                                         module.versionRange.maximum.toString()));
+            }
+        }
+    } catch (const ErrorInfo &error) {
+        handleModuleSetupError(module, error);
+    }
+}
+
+void ProductResolverStage1::updateModulePresentState(const Item::Module &module)
+{
+    if (!module.item->isPresentModule())
+        return;
+    if (module.name.first() == StringConstants::qbsModule())
+        return;
+    bool hasPresentLoadingItem = false;
+    for (const Item::Module::LoadContext &loadContext : module.loadContexts) {
+        const Item * const loadingItem = loadContext.loadingItem();
+        if (loadingItem == m_product.item) {
+            hasPresentLoadingItem = true;
+            break;
+        }
+        if (!loadingItem->isPresentModule())
+            continue;
+        if (loadingItem->prototype() && loadingItem->prototype()->type() == ItemType::Export) {
+            QBS_CHECK(loadingItem->prototype()->parent()->type() == ItemType::Product);
+            if (m_loaderState.topLevelProject().isDisabledItem(loadingItem->prototype()->parent()))
+                continue;
+        }
+        hasPresentLoadingItem = true;
+        break;
+    }
+    if (!hasPresentLoadingItem) {
+        createNonPresentModule(m_loaderState.itemPool(), module.name.toString(),
+                               QLatin1String("imported only by disabled module(s)"),
+                               module.item);
+    }
+}
+
+bool ProductResolverStage1::validateModule(const Item::Module &module)
+{
+    if (!module.item->isPresentModule())
+        return true;
+    try {
+        m_loaderState.evaluator().boolValue(module.item, StringConstants::validateProperty());
+        for (const auto &dep : module.item->modules()) {
+            if (dep.required && !dep.item->isPresentModule()) {
+                throw ErrorInfo(Tr::tr("Module '%1' depends on module '%2', which was not "
+                                       "loaded successfully")
+                                    .arg(module.name.toString(), dep.name.toString()));
+            }
+        }
+    } catch (const ErrorInfo &error) {
+        handleModuleSetupError(module, error);
+        if (m_product.delayedError.hasError())
+            return false;
+    }
+    return true;
+}
+
+void ProductResolverStage1::handleModuleSetupError(const Item::Module &module,
+                                                   const ErrorInfo &error)
+{
+    if (module.required) {
+        m_product.handleError(error);
+    } else {
+        qCDebug(lcModuleLoader()) << "non-required module" << module.name.toString()
+                                  << "found, but not usable in product" << m_product.name
+                                  << error.toString();
+        createNonPresentModule(m_loaderState.itemPool(), module.name.toString(),
+                               QStringLiteral("failed validation"), module.item);
+    }
+}
+
+void ProductResolverStage1::checkPropertyDeclarations()
+{
+    AccumulatingTimer timer(m_loaderState.parameters().logElapsedTime()
+                            ? &m_product.timingData.propertyChecking : nullptr);
+    qbs::Internal::checkPropertyDeclarations(m_product.item, m_loaderState);
+}
+
+void ProductResolverStage1::mergeDependencyParameters()
+{
+    if (m_loaderState.topLevelProject().isDisabledItem(m_product.item))
+        return;
+
+    for (Item::Module &module : m_product.item->modules()) {
+        if (module.name.toString() == StringConstants::qbsModule())
+            continue;
+        if (!module.item->isPresentModule())
+            continue;
+
+        using PP = Item::Module::ParametersWithPriority;
+        std::vector<PP> priorityList;
+        const QVariantMap defaultParameters = module.product
+                ? module.product->defaultParameters
+                : m_loaderState.topLevelProject().parameters(module.item->prototype());
+        priorityList.emplace_back(defaultParameters, INT_MIN);
+        for (const Item::Module::LoadContext &context : module.loadContexts) {
+            const QVariantMap &parameters = context.parameters.first;
+
+            // Empty parameter maps and inactive loading modules do not contribute to the
+            // final parameter map.
+            if (parameters.isEmpty())
+                continue;
+            if (context.loadingItem()->type() == ItemType::ModuleInstance
+                    && !context.loadingItem()->isPresentModule()) {
+                continue;
+            }
+
+            // Build a list sorted by priority.
+            static const auto cmp = [](const PP &elem, int prio) { return elem.second < prio; };
+            const auto it = std::lower_bound(priorityList.begin(), priorityList.end(),
+                                             context.parameters.second, cmp);
+            priorityList.insert(it, context.parameters);
+        }
+
+        module.parameters = qbs::Internal::mergeDependencyParameters(std::move(priorityList));
+    }
+}
+
+class DependencyParameterDeclarationCheck
+{
+public:
+    DependencyParameterDeclarationCheck(const QString &productName, const Item *productItem,
+                                        const TopLevelProjectContext &topLevelProject)
+        : m_productName(productName), m_productItem(productItem), m_topLevelProject(topLevelProject)
+    {}
+
+    void operator()(const QVariantMap &parameters) const { check(parameters, QualifiedId()); }
+
+private:
+    void check(const QVariantMap &parameters, const QualifiedId &moduleName) const
+    {
+        for (auto it = parameters.begin(); it != parameters.end(); ++it) {
+            if (it.value().userType() == QMetaType::QVariantMap) {
+                check(it.value().toMap(), QualifiedId(moduleName) << it.key());
+            } else {
+                const auto &deps = m_productItem->modules();
+                auto m = std::find_if(deps.begin(), deps.end(),
+                                      [&moduleName] (const Item::Module &module) {
+                                          return module.name == moduleName;
+                                      });
+
+                if (m == deps.end()) {
+                    const QualifiedId fullName = QualifiedId(moduleName) << it.key();
+                    throw ErrorInfo(Tr::tr("Cannot set parameter '%1', "
+                                           "because '%2' does not have a dependency on '%3'.")
+                                        .arg(fullName.toString(), m_productName, moduleName.toString()),
+                                    m_productItem->location());
+                }
+
+                const auto decls = m_topLevelProject.parameterDeclarations(
+                            m->item->rootPrototype());
+                if (!decls.contains(it.key())) {
+                    const QualifiedId fullName = QualifiedId(moduleName) << it.key();
+                    throw ErrorInfo(Tr::tr("Parameter '%1' is not declared.")
+                                        .arg(fullName.toString()), m_productItem->location());
+                }
+            }
+        }
+    }
+
+    bool moduleExists(const QualifiedId &name) const
+    {
+        const auto &deps = m_productItem->modules();
+        return any_of(deps, [&name](const Item::Module &module) {
+            return module.name == name;
+        });
+    }
+
+    const QString &m_productName;
+    const Item * const m_productItem;
+    const TopLevelProjectContext &m_topLevelProject;
+};
+
+void ProductResolverStage1::checkDependencyParameterDeclarations(const Item *productItem,
+                                                                 const QString &productName) const
+{
+    DependencyParameterDeclarationCheck dpdc(productName, productItem,
+                                             m_loaderState.topLevelProject());
+    for (const Item::Module &dep : productItem->modules()) {
+        if (!dep.parameters.empty())
+            dpdc(dep.parameters);
+    }
+}
+
+void ProductResolverStage1::collectCodeLinks()
+{
+    for (const Item::Module &module : m_product.item->modules()) {
+        if (module.name.first() == StringConstants::qbsModule())
+            continue;
+        for (const Item::Module::LoadContext &context : module.loadContexts) {
+            m_loaderState.topLevelProject().addCodeLink(
+                        context.dependsItem->location().filePath(),
+                        context.dependsItem->codeRange(),
+                        module.product ? module.product->item->location()
+                                       : module.item->location());
+        }
+    }
+}
+
+
+void ProductResolverStage2::start()
+{
+    m_loaderState.evaluator().clearPropertyDependencies();
+
+    ResolvedProductPtr product = ResolvedProduct::create();
+    product->enabled = m_product.project->project->enabled;
+    product->moduleProperties = PropertyMapInternal::create();
+    product->project = m_product.project->project;
+    m_product.product = product;
+    product->location = m_product.item->location();
+    const auto errorFromDelayedError = [&] {
+        if (m_product.delayedError.hasError()) {
+            ErrorInfo errorInfo;
+
+            // First item is "main error", gets prepended again in the catch clause.
+            const QList<ErrorItem> &items = m_product.delayedError.items();
+            for (int i = 1; i < items.size(); ++i)
+                errorInfo.append(items.at(i));
+
+            m_product.delayedError.clear();
+            return errorInfo;
+        }
+        return ErrorInfo();
+    };
+
+    // Even if we previously encountered an error, try to continue for as long as possible
+    // to provide IDEs with useful data (e.g. the list of files).
+    // If we encounter a follow-up error, suppress it and report the original one instead.
+    try {
+        resolveProductFully();
+        if (const ErrorInfo error = errorFromDelayedError(); error.hasError())
+            throw error;
+    } catch (ErrorInfo e) {
+        if (const ErrorInfo error = errorFromDelayedError(); error.hasError())
+            e = error;
+        QString mainErrorString = !product->name.isEmpty()
+                ? Tr::tr("Error while handling product '%1':").arg(product->name)
+                : Tr::tr("Error while handling product:");
+        ErrorInfo fullError(mainErrorString, product->location);
+        appendError(fullError, e);
+        if (!product->enabled) {
+            qCDebug(lcProjectResolver) << fullError.toString();
+            return;
+        }
+        if (m_loaderState.parameters().productErrorMode() == ErrorHandlingMode::Strict)
+            throw fullError;
+        m_loaderState.logger().printWarning(fullError);
+        m_loaderState.logger().printWarning(
+                    ErrorInfo(Tr::tr("Product '%1' had errors and was disabled.")
+                              .arg(product->name), product->location));
+        product->enabled = false;
+    }
+}
+
+void ProductResolverStage2::resolveProductFully()
+{
+    Item * const item = m_product.item;
+    const ResolvedProductPtr product = m_product.product;
+    Evaluator &evaluator = m_loaderState.evaluator();
+    product->name = evaluator.stringValue(item, StringConstants::nameProperty());
+
+    // product->buildDirectory() isn't valid yet, because the productProperties map is not ready.
+    m_product.buildDirectory = evaluator.stringValue(
+                item, StringConstants::buildDirectoryProperty());
+    product->multiplexConfigurationId = evaluator.stringValue(
+                item, StringConstants::multiplexConfigurationIdProperty());
+    qCDebug(lcProjectResolver) << "resolveProduct" << product->uniqueName();
+    product->enabled = product->enabled
+            && evaluator.boolValue(item, StringConstants::conditionProperty());
+    const VariantValuePtr type = item->variantProperty(StringConstants::typeProperty());
+    if (type)
+        product->fileTags = FileTags::fromStringList(type->value().toStringList());
+    product->targetName = evaluator.stringValue(item, StringConstants::targetNameProperty());
+    product->sourceDirectory = evaluator.stringValue(
+                item, StringConstants::sourceDirectoryProperty());
+    product->destinationDirectory = evaluator.stringValue(
+                item, StringConstants::destinationDirProperty());
+
+    if (product->destinationDirectory.isEmpty()) {
+        product->destinationDirectory = m_product.buildDirectory;
+    } else {
+        product->destinationDirectory = FileInfo::resolvePath(
+                    product->topLevelProject()->buildDirectory,
+                    product->destinationDirectory);
+    }
+    product->probes = m_product.probes;
+    createProductConfig();
+    product->productProperties.insert(StringConstants::destinationDirProperty(),
+                                      product->destinationDirectory);
+    ModuleProperties::init(evaluator.engine(), evaluator.scriptValue(item), product.get());
+
+    QList<Item *> subItems = item->children();
+    const ValuePtr filesProperty = item->property(StringConstants::filesProperty());
+    if (filesProperty) {
+        Item *fakeGroup = Item::create(&m_loaderState.itemPool(), ItemType::Group);
+        fakeGroup->setFile(item->file());
+        fakeGroup->setLocation(item->location());
+        fakeGroup->setScope(item);
+        fakeGroup->setProperty(StringConstants::nameProperty(), VariantValue::create(product->name));
+        fakeGroup->setProperty(StringConstants::filesProperty(), filesProperty);
+        fakeGroup->setProperty(StringConstants::excludeFilesProperty(),
+                               item->property(StringConstants::excludeFilesProperty()));
+        fakeGroup->setProperty(StringConstants::overrideTagsProperty(),
+                               VariantValue::falseValue());
+        fakeGroup->setupForBuiltinType(m_loaderState.parameters().deprecationWarningMode(),
+                                       m_loaderState.logger());
+        subItems.prepend(fakeGroup);
+    }
+
+    for (Item * const child : std::as_const(subItems)) {
+        switch (child->type()) {
+        case ItemType::Rule:
+            resolveRule(m_loaderState, child, m_product.project, &m_product, nullptr);
+            break;
+        case ItemType::FileTagger:
+            resolveFileTagger(m_loaderState, child, nullptr, &m_product);
+            break;
+        case ItemType::JobLimit:
+            resolveJobLimit(m_loaderState, child, nullptr, &m_product, nullptr);
+            break;
+        case ItemType::Group:
+            resolveGroup(child);
+            break;
+        case ItemType::Export:
+            resolveExport(child);
+            break;
+        default:
+            break;
+        }
+    }
+
+    for (const ProjectContext *p = m_product.project; p; p = p->parent) {
+        JobLimits tempLimits = p->jobLimits;
+        product->jobLimits = tempLimits.update(product->jobLimits);
+    }
+
+    resolveModules();
+    applyFileTaggers();
+    finalizeArtifactProperties();
+
+    for (const RulePtr &rule : m_product.project->rules) {
+        RulePtr clonedRule = rule->clone();
+        clonedRule->product = product.get();
+        product->rules.push_back(clonedRule);
+    }
+
+    collectProductDependencies();
+}
+
+void ProductResolverStage2::createProductConfig()
+{
+    EvalCacheEnabler cachingEnabler(&m_loaderState.evaluator(),
+                                    m_product.product->sourceDirectory);
+    m_product.product->moduleProperties->setValue(evaluateModuleValues(m_product.item));
+    m_product.product->productProperties = m_propertiesEvaluator.evaluateProperties(
+        m_product.item, m_product.item, QVariantMap(), true, true);
+}
+
+void ProductResolverStage2::resolveGroup(Item *item)
+{
+    const bool parentEnabled = m_currentGroup ? m_currentGroup->enabled
+                                              : m_product.product->enabled;
+    const bool isEnabled = parentEnabled
+            && m_loaderState.evaluator().boolValue(item, StringConstants::conditionProperty());
+    try {
+        resolveGroupFully(item, isEnabled);
+    } catch (const ErrorInfo &error) {
+        if (!isEnabled) {
+            qCDebug(lcProjectResolver) << "error resolving group at" << item->location()
+                                       << error.toString();
+            return;
+        }
+        if (m_loaderState.parameters().productErrorMode() == ErrorHandlingMode::Strict)
+            throw;
+        m_loaderState.logger().printWarning(error);
+    }
+}
+
+void ProductResolverStage2::resolveGroupFully(Item *item, bool isEnabled)
+{
+    AccumulatingTimer groupTimer(m_loaderState.parameters().logElapsedTime()
+                                 ? &m_product.timingData.groupsResolving
+                                 : nullptr);
+
+    const auto getGroupPropertyMap = [&](const ArtifactProperties *existingProps) {
+        PropertyMapPtr moduleProperties;
+        bool newPropertyMapRequired = false;
+        if (existingProps)
+            moduleProperties = existingProps->propertyMap();
+        if (!moduleProperties) {
+            newPropertyMapRequired = true;
+            moduleProperties = m_currentGroup
+                    ? m_currentGroup->properties
+                    : m_product.product->moduleProperties;
+        }
+        const QVariantMap newModuleProperties = resolveAdditionalModuleProperties(
+                    item, moduleProperties->value());
+        if (!newModuleProperties.empty()) {
+            if (newPropertyMapRequired)
+                moduleProperties = PropertyMapInternal::create();
+            moduleProperties->setValue(newModuleProperties);
+        }
+        return moduleProperties;
+    };
+
+    Evaluator &evaluator = m_loaderState.evaluator();
+    QStringList files = evaluator.stringListValue(item, StringConstants::filesProperty());
+    bool fileTagsSet;
+    const FileTags fileTags = evaluator.fileTagsValue(item, StringConstants::fileTagsProperty(),
+                                                      &fileTagsSet);
+    const QStringList fileTagsFilter
+        = evaluator.stringListValue(item, StringConstants::fileTagsFilterProperty());
+    if (!fileTagsFilter.empty()) {
+        if (Q_UNLIKELY(!files.empty()))
+            throw ErrorInfo(Tr::tr("Group.files and Group.fileTagsFilters are exclusive."),
+                        item->location());
+
+        if (!isEnabled)
+            return;
+
+        ArtifactPropertiesInfo &apinfo = m_artifactPropertiesPerFilter[fileTagsFilter];
+        if (apinfo.first) {
+            const auto it = std::find_if(apinfo.second.cbegin(), apinfo.second.cend(),
+                                         [item](const CodeLocation &loc) {
+                return item->location().filePath() == loc.filePath();
+            });
+            if (it != apinfo.second.cend()) {
+                ErrorInfo error(Tr::tr("Conflicting fileTagsFilter in Group items."));
+                error.append(Tr::tr("First item"), *it);
+                error.append(Tr::tr("Second item"), item->location());
+                throw error;
+            }
+        } else {
+            apinfo.first = ArtifactProperties::create();
+            apinfo.first->setFileTagsFilter(FileTags::fromStringList(fileTagsFilter));
+            m_product.product->artifactProperties.push_back(apinfo.first);
+        }
+        apinfo.second.push_back(item->location());
+        apinfo.first->setPropertyMapInternal(getGroupPropertyMap(apinfo.first.get()));
+        apinfo.first->addExtraFileTags(fileTags);
+        return;
+    }
+    QStringList patterns;
+    for (int i = files.size(); --i >= 0;) {
+        if (FileInfo::isPattern(files[i]))
+            patterns.push_back(files.takeAt(i));
+    }
+    GroupPtr group = ResolvedGroup::create();
+    bool prefixWasSet = false;
+    group->prefix = evaluator.stringValue(item, StringConstants::prefixProperty(), QString(),
+                                          &prefixWasSet);
+    if (!prefixWasSet && m_currentGroup)
+        group->prefix = m_currentGroup->prefix;
+    if (!group->prefix.isEmpty()) {
+        for (auto it = files.rbegin(), end = files.rend(); it != end; ++it)
+            it->prepend(group->prefix);
+    }
+    group->location = item->location();
+    group->enabled = isEnabled;
+    group->properties = getGroupPropertyMap(nullptr);
+    group->fileTags = fileTags;
+    group->overrideTags = evaluator.boolValue(item, StringConstants::overrideTagsProperty());
+    if (group->overrideTags && fileTagsSet) {
+        if (group->fileTags.empty() )
+            group->fileTags.insert(unknownFileTag());
+    } else if (m_currentGroup) {
+        group->fileTags.unite(m_currentGroup->fileTags);
+    }
+
+    const CodeLocation filesLocation = item->property(StringConstants::filesProperty())->location();
+    const VariantValueConstPtr moduleProp = item->variantProperty(
+                StringConstants::modulePropertyInternal());
+    if (moduleProp)
+        group->targetOfModule = moduleProp->value().toString();
+    ErrorInfo fileError;
+    if (!patterns.empty()) {
+        group->wildcards = std::make_unique<SourceWildCards>();
+        SourceWildCards *wildcards = group->wildcards.get();
+        wildcards->excludePatterns = evaluator.stringListValue(
+            item, StringConstants::excludeFilesProperty());
+        wildcards->patterns = patterns;
+        wildcards->prefix = group->prefix;
+        wildcards->baseDir = FileInfo::path(item->file()->filePath());
+        wildcards->buildDir = m_product.project->project->topLevelProject()->buildDirectory;
+        wildcards->expandPatterns();
+        for (const QString &fileName : wildcards->expandedFiles)
+            createSourceArtifact(fileName, group, true, filesLocation, &fileError);
+    }
+
+    for (const QString &fileName : std::as_const(files))
+        createSourceArtifact(fileName, group, false, filesLocation, &fileError);
+    if (fileError.hasError()) {
+        if (group->enabled) {
+            if (m_loaderState.parameters().productErrorMode() == ErrorHandlingMode::Strict)
+                throw ErrorInfo(fileError);
+            m_loaderState.logger().printWarning(fileError);
+        } else {
+            qCDebug(lcProjectResolver) << "error for disabled group:" << fileError.toString();
+        }
+    }
+    group->name = evaluator.stringValue(item, StringConstants::nameProperty());
+    if (group->name.isEmpty())
+        group->name = Tr::tr("Group %1").arg(m_product.product->groups.size());
+    m_product.product->groups.push_back(group);
+
+    class GroupContextSwitcher {
+    public:
+        GroupContextSwitcher(ProductResolverStage2 &resolver, const GroupConstPtr &newGroup)
+            : m_resolver(resolver), m_oldGroup(resolver.m_currentGroup) {
+            resolver.m_currentGroup = newGroup;
+        }
+        ~GroupContextSwitcher() { m_resolver.m_currentGroup = m_oldGroup; }
+    private:
+        ProductResolverStage2 &m_resolver;
+        const GroupConstPtr m_oldGroup;
+    };
+    GroupContextSwitcher groupSwitcher(*this, group);
+    for (Item * const childItem : item->children())
+        resolveGroup(childItem);
+}
+
+SourceArtifactPtr ProductResolverStage2::createSourceArtifact(
+        const QString &fileName, const GroupPtr &group, bool wildcard,
+        const CodeLocation &filesLocation, ErrorInfo *errorInfo)
+{
+    const QString &baseDir = FileInfo::path(group->location.filePath());
+    const QString absFilePath = QDir::cleanPath(FileInfo::resolvePath(baseDir, fileName));
+    if (!wildcard && !FileInfo(absFilePath).exists()) {
+        if (errorInfo)
+            errorInfo->append(Tr::tr("File '%1' does not exist.").arg(absFilePath), filesLocation);
+        m_product.product->missingSourceFiles << absFilePath;
+        return {};
+    }
+    if (group->enabled) {
+        CodeLocation &loc = m_sourceArtifactLocations[
+                std::make_pair(group->targetOfModule, absFilePath)];
+        if (loc.isValid()) {
+            if (errorInfo) {
+                errorInfo->append(Tr::tr("Duplicate source file '%1'.").arg(absFilePath));
+                errorInfo->append(Tr::tr("First occurrence is here."), loc);
+                errorInfo->append(Tr::tr("Next occurrence is here."), filesLocation);
+            }
+            return {};
+        }
+        loc = filesLocation;
+    }
+    SourceArtifactPtr artifact = SourceArtifactInternal::create();
+    artifact->absoluteFilePath = absFilePath;
+    artifact->fileTags = group->fileTags;
+    artifact->overrideFileTags = group->overrideTags;
+    artifact->properties = group->properties;
+    artifact->targetOfModule = group->targetOfModule;
+    artifact->fromWildcard = wildcard;
+    group->files.push_back(artifact);
+    return artifact;
+}
+
+static QualifiedIdSet propertiesToEvaluate(std::deque<QualifiedId> initialProps,
+                                           const PropertyDependencies &deps)
+{
+    std::deque<QualifiedId> remainingProps = std::move(initialProps);
+    QualifiedIdSet allProperties;
+    while (!remainingProps.empty()) {
+        const QualifiedId prop = remainingProps.front();
+        remainingProps.pop_front();
+        const auto insertResult = allProperties.insert(prop);
+        if (!insertResult.second)
+            continue;
+        transform(deps.value(prop), remainingProps, [](const QualifiedId &id) { return id; });
+    }
+    return allProperties;
+}
+
+QVariantMap ProductResolverStage2::resolveAdditionalModuleProperties(
+        const Item *group, const QVariantMap &currentValues)
+{
+    // Step 1: Retrieve the properties directly set in the group
+    const ModulePropertiesPerGroup &mp = m_product.modulePropertiesSetInGroups;
+    const auto it = mp.find(group);
+    if (it == mp.end())
+        return {};
+    const QualifiedIdSet &propsSetInGroup = it->second;
+
+    // Step 2: Gather all properties that depend on these properties.
+    const QualifiedIdSet &propsToEval = propertiesToEvaluate(
+        rangeTo<std::deque<QualifiedId>>(propsSetInGroup),
+                m_loaderState.evaluator().propertyDependencies());
+
+    // Step 3: Evaluate all these properties and replace their values in the map
+    QVariantMap modulesMap = currentValues;
+    QHash<QString, QStringList> propsPerModule;
+    for (auto fullPropName : propsToEval) {
+        const QString moduleName
+                = QualifiedId(fullPropName.mid(0, fullPropName.size() - 1)).toString();
+        propsPerModule[moduleName] << fullPropName.last();
+    }
+    EvalCacheEnabler cachingEnabler(&m_loaderState.evaluator(),
+                                    m_product.product->sourceDirectory);
+    for (const Item::Module &module : group->modules()) {
+        const QString &fullModName = module.name.toString();
+        const QStringList propsForModule = propsPerModule.take(fullModName);
+        if (propsForModule.empty())
+            continue;
+        QVariantMap reusableValues = modulesMap.value(fullModName).toMap();
+        for (const QString &prop : std::as_const(propsForModule))
+            reusableValues.remove(prop);
+        modulesMap.insert(fullModName, m_propertiesEvaluator.evaluateProperties(
+                                           module.item, module.item, reusableValues, true, true));
+    }
+    return modulesMap;
+}
+
+static QString getLineAtLocation(const CodeLocation &loc, const QString &content)
+{
+    int pos = 0;
+    int currentLine = 1;
+    while (currentLine < loc.line()) {
+        while (content.at(pos++) != QLatin1Char('\n'))
+            ;
+        ++currentLine;
+    }
+    const int eolPos = content.indexOf(QLatin1Char('\n'), pos);
+    return content.mid(pos, eolPos - pos);
+}
+
+static bool usesImport(const ExportedProperty &prop, const QRegularExpression &regex)
+{
+    return prop.sourceCode.indexOf(regex) != -1;
+}
+
+static bool usesImport(const ExportedItem &item, const QRegularExpression &regex)
+{
+    return any_of(item.properties,
+                  [regex](const ExportedProperty &p) { return usesImport(p, regex); })
+            || any_of(item.children,
+                      [regex](const ExportedItemPtr &child) { return usesImport(*child, regex); });
+}
+
+static bool usesImport(const ExportedModule &module, const QString &name)
+{
+    // Imports are used in three ways:
+    // (1) var f = new TextFile(...);
+    // (2) var path = FileInfo.joinPaths(...)
+    // (3) var obj = DataCollection;
+    const QString pattern = QStringLiteral("\\b%1\\b");
+
+    const QRegularExpression regex(pattern.arg(name)); // std::regex is much slower
+    return any_of(module.m_properties,
+                  [regex](const ExportedProperty &p) { return usesImport(p, regex); })
+            || any_of(module.children,
+                      [regex](const ExportedItemPtr &child) { return usesImport(*child, regex); });
+}
+
+void ProductResolverStage2::resolveExport(Item *exportItem)
+{
+    ExportedModule &exportedModule = m_product.product->exportedModule;
+    setupExportedProperties(exportItem, QString(), exportedModule.m_properties);
+    static const auto cmpFunc = [](const ExportedProperty &p1, const ExportedProperty &p2) {
+        return p1.fullName < p2.fullName;
+    };
+    std::sort(exportedModule.m_properties.begin(), exportedModule.m_properties.end(), cmpFunc);
+
+    transform(exportItem->children(), exportedModule.children,
+              [&exportedModule, this](const auto &child) {
+        return resolveExportChild(child, exportedModule); });
+
+    for (const JsImport &jsImport : exportItem->file()->jsImports()) {
+        if (usesImport(exportedModule, jsImport.scopeName)) {
+            exportedModule.importStatements << getLineAtLocation(jsImport.location,
+                                                                 exportItem->file()->content());
+        }
+    }
+    const auto builtInImports = JsExtensions::extensionNames();
+    for (const QString &builtinImport: builtInImports) {
+        if (usesImport(exportedModule, builtinImport))
+            exportedModule.importStatements << QStringLiteral("import qbs.") + builtinImport;
+    }
+    exportedModule.importStatements.sort();
+}
+
+// TODO: This probably wouldn't be necessary if we had item serialization.
+std::unique_ptr<ExportedItem> ProductResolverStage2::resolveExportChild(
+        const Item *item, const ExportedModule &module)
+{
+    std::unique_ptr<ExportedItem> exportedItem(new ExportedItem);
+
+    // This is the type of the built-in base item. It may turn out that we need to support
+    // derived items under Export. In that case, we probably need a new Item member holding
+    // the original type name.
+    exportedItem->name = item->typeName();
+
+    transform(item->children(), exportedItem->children, [&module, this](const auto &child) {
+        return resolveExportChild(child, module); });
+
+    setupExportedProperties(item, QString(), exportedItem->properties);
+    return exportedItem;
+}
+
+void ProductResolverStage2::setupExportedProperties(const Item *item, const QString &namePrefix,
+                                                    std::vector<ExportedProperty> &properties)
+{
+    const auto &props = item->properties();
+    for (auto it = props.cbegin(); it != props.cend(); ++it) {
+        const QString qualifiedName = namePrefix.isEmpty()
+                ? it.key() : namePrefix + QLatin1Char('.') + it.key();
+        if ((item->type() == ItemType::Export || item->type() == ItemType::Properties)
+                && qualifiedName == StringConstants::prefixMappingProperty()) {
+            continue;
+        }
+        const ValuePtr &v = it.value();
+        if (v->type() == Value::ItemValueType) {
+            setupExportedProperties(std::static_pointer_cast<ItemValue>(v)->item(),
+                                    qualifiedName, properties);
+            continue;
+        }
+        ExportedProperty exportedProperty;
+        exportedProperty.fullName = qualifiedName;
+        exportedProperty.type = item->propertyDeclaration(it.key()).type();
+        if (v->type() == Value::VariantValueType) {
+            exportedProperty.sourceCode = toJSLiteral(
+                        std::static_pointer_cast<VariantValue>(v)->value());
+        } else {
+            QBS_CHECK(v->type() == Value::JSSourceValueType);
+            const JSSourceValue * const sv = static_cast<JSSourceValue *>(v.get());
+            exportedProperty.sourceCode = sv->sourceCode().toString();
+        }
+        const ItemDeclaration itemDecl
+                = BuiltinDeclarations::instance().declarationsForType(item->type());
+        PropertyDeclaration propertyDecl;
+        const auto itemProperties = itemDecl.properties();
+        for (const PropertyDeclaration &decl : itemProperties) {
+            if (decl.name() == it.key()) {
+                propertyDecl = decl;
+                exportedProperty.isBuiltin = true;
+                break;
+            }
+        }
+
+        // Do not add built-in properties that were left at their default value.
+        if (!exportedProperty.isBuiltin
+                || m_loaderState.evaluator().isNonDefaultValue(item, it.key())) {
+            properties.push_back(exportedProperty);
+        }
+    }
+
+    // Order the list of properties, so the output won't look so random.
+    static const auto less = [](const ExportedProperty &p1, const ExportedProperty &p2) -> bool {
+        const int p1ComponentCount = p1.fullName.count(QLatin1Char('.'));
+        const int p2ComponentCount = p2.fullName.count(QLatin1Char('.'));
+        if (p1.isBuiltin && !p2.isBuiltin)
+            return true;
+        if (!p1.isBuiltin && p2.isBuiltin)
+            return false;
+        if (p1ComponentCount < p2ComponentCount)
+            return true;
+        if (p1ComponentCount > p2ComponentCount)
+            return false;
+        return p1.fullName < p2.fullName;
+    };
+    std::sort(properties.begin(), properties.end(), less);
+}
+
+QVariantMap ProductResolverStage2::evaluateModuleValues(Item *item, bool lookupPrototype)
+{
+    QVariantMap moduleValues;
+    for (const Item::Module &module : item->modules()) {
+        if (!module.item->isPresentModule())
+            continue;
+        const QString fullName = module.name.toString();
+        moduleValues[fullName] = m_propertiesEvaluator.evaluateProperties(
+            module.item, lookupPrototype, true);
+    }
+    return moduleValues;
+}
+
+void ProductResolverStage2::resolveScanner(Item *item, ModuleContext &moduleContext)
+{
+    Evaluator &evaluator = m_loaderState.evaluator();
+    if (!evaluator.boolValue(item, StringConstants::conditionProperty())) {
+        qCDebug(lcProjectResolver) << "scanner condition is false";
+        return;
+    }
+
+    ResolvedScannerPtr scanner = ResolvedScanner::create();
+    scanner->module = moduleContext.module;
+    scanner->inputs = evaluator.fileTagsValue(item, StringConstants::inputsProperty());
+    scanner->recursive = evaluator.boolValue(item, StringConstants::recursiveProperty());
+    scanner->searchPathsScript.initialize(m_loaderState.topLevelProject().scriptFunctionValue(
+                                              item, StringConstants::searchPathsProperty()));
+    scanner->scanScript.initialize(m_loaderState.topLevelProject().scriptFunctionValue(
+                                       item, StringConstants::scanProperty()));
+    m_product.product->scanners.push_back(scanner);
+}
+
+void ProductResolverStage2::resolveModules()
+{
+    JobLimits jobLimits;
+    for (const Item::Module &m : m_product.item->modules())
+        resolveModule(m.name, m.item, m.product, m.parameters, jobLimits);
+    for (int i = 0; i < jobLimits.count(); ++i) {
+        const JobLimit &moduleJobLimit = jobLimits.jobLimitAt(i);
+        if (m_product.product->jobLimits.getLimit(moduleJobLimit.pool()) == -1)
+            m_product.product->jobLimits.setJobLimit(moduleJobLimit);
+    }
+}
+
+void ProductResolverStage2::resolveModule(const QualifiedId &moduleName, Item *item, bool isProduct,
+                                          const QVariantMap &parameters, JobLimits &jobLimits)
+{
+    if (!item->isPresentModule())
+        return;
+
+    ModuleContext moduleContext;
+    moduleContext.module = ResolvedModule::create();
+
+    const ResolvedModulePtr &module = moduleContext.module;
+    module->name = moduleName.toString();
+    module->isProduct = isProduct;
+    module->product = m_product.product.get();
+    module->setupBuildEnvironmentScript.initialize(m_loaderState.topLevelProject()
+            .scriptFunctionValue(item, StringConstants::setupBuildEnvironmentProperty()));
+    module->setupRunEnvironmentScript.initialize(m_loaderState.topLevelProject()
+            .scriptFunctionValue(item, StringConstants::setupRunEnvironmentProperty()));
+
+    for (const Item::Module &m : item->modules()) {
+        if (m.item->isPresentModule())
+            module->moduleDependencies += m.name.toString();
+    }
+
+    m_product.product->modules.push_back(module);
+    if (!parameters.empty())
+        m_product.product->moduleParameters[module] = parameters;
+
+    for (Item *child : item->children()) {
+        switch (child->type()) {
+        case ItemType::Rule:
+            resolveRule(m_loaderState, child, nullptr, &m_product, &moduleContext);
+            break;
+        case ItemType::FileTagger:
+            resolveFileTagger(m_loaderState, child, nullptr, &m_product);
+            break;
+        case ItemType::JobLimit:
+            resolveJobLimit(m_loaderState, child, nullptr, nullptr, &moduleContext);
+            break;
+        case ItemType::Scanner:
+            resolveScanner(child, moduleContext);
+            break;
+        default:
+            break;
+        }
+    }
+    for (int i = 0; i < moduleContext.jobLimits.count(); ++i) {
+        const JobLimit &newJobLimit = moduleContext.jobLimits.jobLimitAt(i);
+        const int oldLimit = jobLimits.getLimit(newJobLimit.pool());
+        if (oldLimit == -1 || oldLimit > newJobLimit.limit())
+            jobLimits.setJobLimit(newJobLimit);
+    }
+}
+
+void ProductResolverStage2::applyFileTaggers()
+{
+    m_product.product->fileTaggers << m_product.project->fileTaggers;
+    m_product.product->fileTaggers = sorted(m_product.product->fileTaggers,
+              [] (const FileTaggerConstPtr &a, const FileTaggerConstPtr &b) {
+        return a->priority() > b->priority();
+    });
+    for (const SourceArtifactPtr &artifact : m_product.product->allEnabledFiles()) {
+        if (!artifact->overrideFileTags || artifact->fileTags.empty()) {
+            const QString fileName = FileInfo::fileName(artifact->absoluteFilePath);
+            const FileTags fileTags = m_product.product->fileTagsForFileName(fileName);
+            artifact->fileTags.unite(fileTags);
+            if (artifact->fileTags.empty())
+                artifact->fileTags.insert(unknownFileTag());
+            qCDebug(lcProjectResolver) << "adding file tags" << artifact->fileTags
+                                       << "to" << fileName;
+        }
+    }
+}
+
+void ProductResolverStage2::finalizeArtifactProperties()
+{
+    for (const SourceArtifactPtr &artifact : m_product.product->allEnabledFiles()) {
+        for (const auto &artifactProperties : m_product.product->artifactProperties) {
+            if (!artifact->isTargetOfModule()
+                    && artifact->fileTags.intersects(artifactProperties->fileTagsFilter())) {
+                // FIXME: Should be merged, not overwritten.
+                artifact->properties = artifactProperties->propertyMap();
+            }
+        }
+
+        // Let a positive value of qbs.install imply the file tag "installable".
+        if (artifact->properties->qbsPropertyValue(StringConstants::installProperty()).toBool())
+            artifact->fileTags += "installable";
+    }
+}
+
+void ProductResolverStage2::collectProductDependencies()
+{
+    const ResolvedProductPtr &product = m_product.product;
+    if (!product)
+        return;
+    for (const Item::Module &module : m_product.item->modules()) {
+        if (!module.product)
+            continue;
+        const ResolvedProductPtr &dep = module.product->product;
+        QBS_CHECK(dep);
+        QBS_CHECK(dep != product);
+        product->dependencies << dep;
+        product->dependencyParameters.insert(dep, module.parameters); // TODO: Streamline this with normal module dependencies?
+    }
+
+    // TODO: We might want to keep the topological sorting and get rid of "module module dependencies".
+    std::sort(product->dependencies.begin(),product->dependencies.end(),
+              [](const ResolvedProductPtr &p1, const ResolvedProductPtr &p2) {
+        return p1->fullDisplayName() < p2->fullDisplayName();
+    });
+}
+
+void ExportsResolver::start()
+{
+    resolveShadowProduct();
+    collectExportedProductDependencies();
+}
+
+void ExportsResolver::resolveShadowProduct()
+{
+    if (!m_product.product->enabled)
+        return;
+    if (!m_product.shadowProduct)
+        return;
+    for (const auto &m : m_product.shadowProduct->item->modules()) {
+        if (m.name.toString() != m_product.product->name)
+            continue;
+        collectPropertiesForExportItem(m.item);
+        for (const auto &dep : m.item->modules())
+            collectPropertiesForModuleInExportItem(dep);
+        break;
+    }
+    try {
+        adaptExportedPropertyValues();
+    } catch (const ErrorInfo &) {}
+}
+
+class TempScopeSetter
+{
+public:
+    TempScopeSetter(const ValuePtr &value, Item *newScope) : m_value(value), m_oldScope(value->scope())
+    {
+        value->setScope(newScope, {});
+    }
+    ~TempScopeSetter() { if (m_value) m_value->setScope(m_oldScope, {}); }
+
+    TempScopeSetter(const TempScopeSetter &) = delete;
+    TempScopeSetter &operator=(const TempScopeSetter &) = delete;
+    TempScopeSetter &operator=(TempScopeSetter &&) = delete;
+
+    TempScopeSetter(TempScopeSetter &&other) noexcept
+        : m_value(std::move(other.m_value)), m_oldScope(other.m_oldScope)
+    {
+        other.m_value.reset();
+        other.m_oldScope = nullptr;
+    }
+
+private:
+    ValuePtr m_value;
+    Item *m_oldScope;
+};
+
+void ExportsResolver::collectPropertiesForExportItem(
+    const QualifiedId &moduleName, const ValuePtr &value, Item *moduleInstance,
+    QVariantMap &moduleProps)
+{
+    QBS_CHECK(value->type() == Value::ItemValueType);
+    Item * const itemValueItem = std::static_pointer_cast<ItemValue>(value)->item();
+    if (itemValueItem->propertyDeclarations().isEmpty()) {
+        for (const Item::Module &module : moduleInstance->modules()) {
+            if (module.name == moduleName) {
+                itemValueItem->setPropertyDeclarations(module.item->propertyDeclarations());
+                break;
+            }
+        }
+    }
+    if (itemValueItem->type() == ItemType::ModuleInstancePlaceholder) {
+        struct EvalPreparer {
+            EvalPreparer(Item *valueItem, const QualifiedId &moduleName)
+                : valueItem(valueItem),
+                hadName(!!valueItem->variantProperty(StringConstants::nameProperty()))
+            {
+                if (!hadName) {
+                    // Evaluator expects a name here.
+                    valueItem->setProperty(StringConstants::nameProperty(),
+                                           VariantValue::create(moduleName.toString()));
+                }
+            }
+            ~EvalPreparer()
+            {
+                if (!hadName)
+                    valueItem->removeProperty(StringConstants::nameProperty());
+            }
+            Item * const valueItem;
+            const bool hadName;
+        };
+        EvalPreparer ep(itemValueItem, moduleName);
+        std::vector<TempScopeSetter> tss;
+        for (const ValuePtr &v : itemValueItem->properties())
+            tss.emplace_back(v, moduleInstance);
+        moduleProps.insert(moduleName.toString(), m_propertiesEvaluator.evaluateProperties(
+                                                      itemValueItem, false, false));
+        return;
+    }
+    QBS_CHECK(itemValueItem->type() == ItemType::ModulePrefix);
+    const Item::PropertyMap &props = itemValueItem->properties();
+    for (auto it = props.begin(); it != props.end(); ++it) {
+        QualifiedId fullModuleName = moduleName;
+        fullModuleName << it.key();
+        collectPropertiesForExportItem(fullModuleName, it.value(), moduleInstance, moduleProps);
+    }
+}
+
+void ExportsResolver::collectPropertiesForExportItem(Item *productModuleInstance)
+{
+    if (!productModuleInstance->isPresentModule())
+        return;
+    Item * const exportItem = productModuleInstance->prototype();
+    QBS_CHECK(exportItem);
+    QBS_CHECK(exportItem->type() == ItemType::Export);
+    const ItemDeclaration::Properties exportDecls = BuiltinDeclarations::instance()
+                                                        .declarationsForType(ItemType::Export).properties();
+    ExportedModule &exportedModule = m_product.product->exportedModule;
+    const auto &props = exportItem->properties();
+    for (auto it = props.begin(); it != props.end(); ++it) {
+        const auto match
+            = [it](const PropertyDeclaration &decl) { return decl.name() == it.key(); };
+        if (it.key() != StringConstants::prefixMappingProperty() &&
+            std::find_if(exportDecls.begin(), exportDecls.end(), match) != exportDecls.end()) {
+            continue;
+        }
+        if (it.value()->type() == Value::ItemValueType) {
+            collectPropertiesForExportItem(it.key(), it.value(), productModuleInstance,
+                                           exportedModule.modulePropertyValues);
+        } else {
+            TempScopeSetter tss(it.value(), productModuleInstance);
+            m_propertiesEvaluator.evaluateProperty(
+                exportItem, it.key(), it.value(), exportedModule.propertyValues, false);
+        }
+    }
+}
+
+// Collects module properties assigned to in other (higher-level) modules.
+void ExportsResolver::collectPropertiesForModuleInExportItem(const Item::Module &module)
+{
+    if (!module.item->isPresentModule())
+        return;
+    ExportedModule &exportedModule = m_product.product->exportedModule;
+    if (module.product || module.name.first() == StringConstants::qbsModule())
+        return;
+    const auto checkName = [module](const ExportedModuleDependency &d) {
+        return module.name.toString() == d.name;
+    };
+    if (any_of(exportedModule.moduleDependencies, checkName))
+        return;
+
+    Item *modulePrototype = module.item->prototype();
+    while (modulePrototype && modulePrototype->type() != ItemType::Module)
+        modulePrototype = modulePrototype->prototype();
+    if (!modulePrototype) // Can happen for broken products in relaxed mode.
+        return;
+    ModuleItemLocker locker(*modulePrototype);
+    const Item::PropertyMap &props = modulePrototype->properties();
+    ExportedModuleDependency dep;
+    dep.name = module.name.toString();
+    for (auto it = props.begin(); it != props.end(); ++it) {
+        if (it.value()->type() == Value::ItemValueType)
+            collectPropertiesForExportItem(it.key(), it.value(), module.item, dep.moduleProperties);
+    }
+    exportedModule.moduleDependencies.push_back(dep);
+
+    for (const auto &dep : module.item->modules())
+        collectPropertiesForModuleInExportItem(dep);
+}
+
+void ExportsResolver::adaptExportedPropertyValues()
+{
+    QBS_CHECK(m_product.shadowProduct);
+    ExportedModule &m = m_product.product->exportedModule;
+    const QVariantList prefixList = m.propertyValues.take(
+                                                        StringConstants::prefixMappingProperty()).toList();
+    const QString shadowProductName = m_loaderState.evaluator().stringValue(
+        m_product.shadowProduct->item, StringConstants::nameProperty());
+    const QString shadowProductBuildDir = m_loaderState.evaluator().stringValue(
+        m_product.shadowProduct->item, StringConstants::buildDirectoryProperty());
+    QVariantMap prefixMap;
+    for (const QVariant &v : prefixList) {
+        const QVariantMap o = v.toMap();
+        prefixMap.insert(o.value(QStringLiteral("prefix")).toString(),
+                         o.value(QStringLiteral("replacement")).toString());
+    }
+    const auto valueRefersToImportingProduct
+        = [shadowProductName, shadowProductBuildDir](const QString &value) {
+              return value.toLower().contains(shadowProductName.toLower())
+                     || value.contains(shadowProductBuildDir);
+          };
+    static const auto stringMapper = [](const QVariantMap &mappings, const QString &value)
+        -> QString {
+        for (auto it = mappings.cbegin(); it != mappings.cend(); ++it) {
+            if (value.startsWith(it.key()))
+                return it.value().toString() + value.mid(it.key().size());
+        }
+        return value;
+    };
+    const auto stringListMapper = [&valueRefersToImportingProduct](
+                                      const QVariantMap &mappings, const QStringList &value)  -> QStringList {
+        QStringList result;
+        result.reserve(value.size());
+        for (const QString &s : value) {
+            if (!valueRefersToImportingProduct(s))
+                result.push_back(stringMapper(mappings, s));
+        }
+        return result;
+    };
+    const std::function<QVariant(const QVariantMap &, const QVariant &)> mapper
+        = [&stringListMapper, &mapper](
+              const QVariantMap &mappings, const QVariant &value) -> QVariant {
+        switch (static_cast<QMetaType::Type>(value.userType())) {
+        case QMetaType::QString:
+            return stringMapper(mappings, value.toString());
+        case QMetaType::QStringList:
+            return stringListMapper(mappings, value.toStringList());
+        case QMetaType::QVariantMap: {
+            QVariantMap m = value.toMap();
+            for (auto it = m.begin(); it != m.end(); ++it)
+                it.value() = mapper(mappings, it.value());
+            return m;
+        }
+        default:
+            return value;
+        }
+    };
+    for (auto it = m.propertyValues.begin(); it != m.propertyValues.end(); ++it)
+        it.value() = mapper(prefixMap, it.value());
+    for (auto it = m.modulePropertyValues.begin(); it != m.modulePropertyValues.end(); ++it)
+        it.value() = mapper(prefixMap, it.value());
+    for (ExportedModuleDependency &dep : m.moduleDependencies) {
+        for (auto it = dep.moduleProperties.begin(); it != dep.moduleProperties.end(); ++it)
+            it.value() = mapper(prefixMap, it.value());
+    }
+}
+
+void ExportsResolver::collectExportedProductDependencies()
+{
+    if (!m_product.shadowProduct)
+        return;
+    const ResolvedProductPtr exportingProduct = m_product.product;
+    if (!exportingProduct || !exportingProduct->enabled)
+        return;
+    Item * const importingProductItem = m_product.shadowProduct->item;
+
+    std::vector<std::pair<ResolvedProductPtr, QVariantMap>> directDeps;
+    for (const Item::Module &m : importingProductItem->modules()) {
+        if (m.name.toString() != exportingProduct->name)
+            continue;
+        for (const Item::Module &dep : m.item->modules()) {
+            if (dep.product)
+                directDeps.emplace_back(dep.product->product, m.parameters);
+        }
+    }
+    for (const auto &dep : directDeps) {
+        if (!contains(exportingProduct->exportedModule.productDependencies,
+                      dep.first->uniqueName())) {
+            exportingProduct->exportedModule.productDependencies.push_back(
+                dep.first->uniqueName());
+        }
+        if (!dep.second.isEmpty()) {
+            exportingProduct->exportedModule.dependencyParameters.insert(dep.first,
+                                                                         dep.second);
+        }
+    }
+    auto &productDeps = exportingProduct->exportedModule.productDependencies;
+    std::sort(productDeps.begin(), productDeps.end());
+}
+
+QVariantMap PropertiesEvaluator::evaluateProperties(
+    const Item *item, const Item *propertiesContainer, const QVariantMap &tmplt,
+    bool lookupPrototype, bool checkErrors)
+{
+    AccumulatingTimer propEvalTimer(m_loaderState.parameters().logElapsedTime()
+                                        ? &m_product.timingData.propertyEvaluation
+                                        : nullptr);
+    QVariantMap result = tmplt;
+    for (auto it = propertiesContainer->properties().begin();
+         it != propertiesContainer->properties().end(); ++it) {
+        evaluateProperty(item, it.key(), it.value(), result, checkErrors);
+    }
+    return lookupPrototype && propertiesContainer->prototype()
+            && propertiesContainer->prototype()->type() != ItemType::Module
+            ? evaluateProperties(item, propertiesContainer->prototype(), result, true, checkErrors)
+            : result;
+}
+
+QVariantMap PropertiesEvaluator::evaluateProperties(Item *item, bool lookupPrototype,
+                                                    bool checkErrors)
+{
+    const QVariantMap tmplt;
+    return evaluateProperties(item, item, tmplt, lookupPrototype, checkErrors);
+}
+
+void PropertiesEvaluator::evaluateProperty(
+    const Item *item, const QString &propName, const ValuePtr &propValue, QVariantMap &result,
+    bool checkErrors)
+{
+    JSContext * const ctx = m_loaderState.evaluator().engine()->context();
+    switch (propValue->type()) {
+    case Value::ItemValueType:
+    {
+        // Ignore items. Those point to module instances
+        // and are handled in evaluateModuleValues().
+        break;
+    }
+    case Value::JSSourceValueType:
+    {
+        if (result.contains(propName))
+            break;
+        const PropertyDeclaration pd = item->propertyDeclaration(propName);
+        if (pd.flags().testFlag(PropertyDeclaration::PropertyNotAvailableInConfig)) {
+            break;
+        }
+        const ScopedJsValue scriptValue(ctx, m_loaderState.evaluator().property(item, propName));
+        if (JsException ex = m_loaderState.evaluator().engine()->checkAndClearException(
+                propValue->location())) {
+            if (checkErrors)
+                throw ex.toErrorInfo();
+        }
+
+        // NOTE: Loses type information if scriptValue.isUndefined == true,
+        //       as such QScriptValues become invalid QVariants.
+        QVariant v;
+        if (JS_IsFunction(ctx, scriptValue)) {
+            v = getJsString(ctx, scriptValue);
+        } else {
+            v = getJsVariant(ctx, scriptValue);
+            QVariantMap m = v.toMap();
+            if (m.contains(StringConstants::importScopeNamePropertyInternal())) {
+                QVariantMap tmp = m;
+                const ScopedJsValue proto(ctx, JS_GetPrototype(ctx, scriptValue));
+                m = getJsVariant(ctx, proto).toMap();
+                for (auto it = tmp.begin(); it != tmp.end(); ++it)
+                    m.insert(it.key(), it.value());
+                v = m;
+            }
+        }
+
+        if (pd.type() == PropertyDeclaration::Path && v.isValid()) {
+            v = v.toString();
+        } else if (pd.type() == PropertyDeclaration::PathList
+                   || pd.type() == PropertyDeclaration::StringList) {
+            v = v.toStringList();
+        } else if (pd.type() == PropertyDeclaration::VariantList) {
+            v = v.toList();
+        }
+
+        // Enforce proper type for undefined values (note that path degrades to string).
+        if (!v.isValid())
+            v = pd.typedNullValue();
+
+        pd.checkAllowedValues(v, propValue->location(), propName, m_loaderState);
+
+        result[propName] = v;
+        break;
+    }
+    case Value::VariantValueType:
+    {
+        if (result.contains(propName))
+            break;
+        VariantValuePtr vvp = std::static_pointer_cast<VariantValue>(propValue);
+        QVariant v = vvp->value();
+
+        const PropertyDeclaration pd = item->propertyDeclaration(propName);
+        if (v.isNull() && !pd.isScalar()) // QTBUG-51237
+            v = QStringList();
+
+        pd.checkAllowedValues(v, propValue->location(), propName, m_loaderState);
+        result[propName] = v;
+        break;
+    }
+    }
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/productresolver.h b/src/lib/corelib/loader/productresolver.h
new file mode 100644
index 000000000..34c49b2bb
--- /dev/null
+++ b/src/lib/corelib/loader/productresolver.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+namespace qbs::Internal {
+enum class Deferral;
+class LoaderState;
+class ProductContext;
+
+// Responsibilities:
+//   - Resolving dependencies to modules and other products (via DependenciesResolver).
+//   - Module validation.
+//   - Running probes (via ProbesResolver) in Product and Module items.
+//   - Evaluating product and module properties.
+//   - Handling all Product child items, such as FileTaggers, Rules and so on.
+void resolveProduct(ProductContext &product, Deferral deferral, LoaderState &loaderState);
+
+void setupExports(ProductContext &product, LoaderState &loaderState);
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/productscollector.cpp b/src/lib/corelib/loader/productscollector.cpp
new file mode 100644
index 000000000..042dbd160
--- /dev/null
+++ b/src/lib/corelib/loader/productscollector.cpp
@@ -0,0 +1,754 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "productscollector.h"
+
+#include "dependenciesresolver.h"
+#include "itemreader.h"
+#include "loaderutils.h"
+#include "localprofiles.h"
+#include "productitemmultiplexer.h"
+#include "probesresolver.h"
+
+#include <language/builtindeclarations.h>
+#include <language/evaluator.h>
+#include <language/filecontext.h>
+#include <language/item.h>
+#include <language/language.h>
+#include <language/value.h>
+#include <logging/categories.h>
+#include <logging/translator.h>
+#include <tools/fileinfo.h>
+#include <tools/profile.h>
+#include <tools/profiling.h>
+#include <language/scriptengine.h>
+#include <tools/set.h>
+#include <tools/settings.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+#include <QDir>
+#include <QDirIterator>
+
+namespace qbs::Internal {
+
+class ProductsCollector::Private
+{
+public:
+    Private(LoaderState &loaderState) : loaderState(loaderState) {}
+
+    void handleProject(Item *projectItem, ProjectContext *parentProject,
+                       const Set<QString> &referencedFilePaths);
+    QList<Item *> multiplexProductItem(ProductContext &dummyContext, Item *productItem);
+    void prepareProduct(ProjectContext &projectContext, Item *productItem,
+                        ProductContext *mainProduct = nullptr);
+    void handleSubProject(ProjectContext &projectContext, Item *projectItem,
+                          const Set<QString> &referencedFilePaths);
+    void copyProperties(const Item *sourceProject, Item *targetProject);
+    QList<Item *> loadReferencedFile(
+            const QString &relativePath, const CodeLocation &referencingLocation,
+            const Set<QString> &referencedFilePaths, ProductContext &dummyContext);
+    bool mergeExportItems(ProductContext &productContext);
+    bool checkExportItemCondition(Item *exportItem, const ProductContext &product);
+    void initProductProperties(const ProductContext &product);
+    void checkProjectNamesInOverrides();
+    void collectProductsByNameAndItem();
+    void checkProductNamesInOverrides();
+    void mergeProperty(Item *dst, const QString &name, const ValuePtr &value);
+
+    LoaderState &loaderState;
+    Settings settings{loaderState.parameters().settingsDirectory()};
+    Set<QString> disabledProjects;
+    Version qbsVersion;
+    Item *tempScopeItem = nullptr;
+
+private:
+    // TODO: Put this in loaderutils
+    class TempBaseModuleAttacher {
+    public:
+        TempBaseModuleAttacher(Private *d, ProductContext &product);
+        ~TempBaseModuleAttacher() { drop(); }
+        void drop();
+        Item *tempBaseModuleItem() const { return m_tempBaseModule; }
+
+    private:
+        Item * const m_productItem;
+        ValuePtr m_origQbsValue;
+        Item *m_tempBaseModule = nullptr;
+    };
+};
+
+ProductsCollector::ProductsCollector(LoaderState &loaderState)
+    : d(makePimpl<Private>(loaderState)) {}
+
+ProductsCollector::~ProductsCollector() = default;
+
+void ProductsCollector::run(Item *rootProject)
+{
+    d->handleProject(rootProject, nullptr, {rootProject->file()->filePath()});
+    d->checkProjectNamesInOverrides();
+    d->collectProductsByNameAndItem();
+    d->checkProductNamesInOverrides();
+    d->loaderState.topLevelProject().checkForLocalProfileAsTopLevelProfile(
+                d->loaderState.parameters().topLevelProfile());
+}
+
+void ProductsCollector::Private::handleProject(Item *projectItem, ProjectContext *parentProject,
+                                               const Set<QString> &referencedFilePaths)
+{
+    const SetupProjectParameters &parameters = loaderState.parameters();
+    Evaluator &evaluator = loaderState.evaluator();
+    Logger &logger = loaderState.logger();
+    ItemReader &itemReader = loaderState.itemReader();
+    TopLevelProjectContext &topLevelProject = loaderState.topLevelProject();
+
+    auto p = std::make_unique<ProjectContext>();
+    auto &projectContext = *p;
+    projectContext.item = projectItem;
+    projectContext.parent = parentProject;
+    projectContext.topLevelProject = &topLevelProject;
+    ItemValuePtr itemValue = ItemValue::create(projectItem);
+    projectContext.scope = Item::create(&loaderState.itemPool(), ItemType::Scope);
+    projectContext.scope->setFile(projectItem->file());
+    projectContext.scope->setProperty(StringConstants::projectVar(), itemValue);
+    ProductContext dummyProduct;
+    dummyProduct.project = &projectContext;
+    dummyProduct.moduleProperties = parameters.finalBuildConfigurationTree();
+    dummyProduct.profileModuleProperties = dummyProduct.moduleProperties;
+    dummyProduct.profileName = parameters.topLevelProfile();
+    loadBaseModule(dummyProduct, projectItem, loaderState);
+
+    projectItem->overrideProperties(parameters.overriddenValuesTree(),
+                                    StringConstants::projectPrefix(), parameters, logger);
+    projectContext.name = evaluator.stringValue(projectItem, StringConstants::nameProperty());
+    if (projectContext.name.isEmpty()) {
+        projectContext.name = FileInfo::baseName(projectItem->location().filePath());
+        projectItem->setProperty(StringConstants::nameProperty(),
+                                 VariantValue::create(projectContext.name));
+    }
+    if (parentProject)
+        parentProject->children.push_back(p.get());
+    topLevelProject.addProject(p.release());
+    projectItem->overrideProperties(parameters.overriddenValuesTree(),
+                                    StringConstants::projectsOverridePrefix() + projectContext.name,
+                                    parameters, logger);
+    if (!topLevelProject.checkItemCondition(projectItem, evaluator)) {
+        disabledProjects.insert(projectContext.name);
+        return;
+    }
+    SearchPathsManager searchPathsManager(itemReader, itemReader.readExtraSearchPaths(projectItem)
+                                          << projectItem->file()->dirPath());
+    projectContext.searchPathsStack = itemReader.extraSearchPathsStack();
+
+    const QString minVersionStr
+        = evaluator.stringValue(projectItem, StringConstants::minimumQbsVersionProperty(),
+                                 QStringLiteral("1.3.0"));
+    const Version minVersion = Version::fromString(minVersionStr);
+    if (!minVersion.isValid()) {
+        throw ErrorInfo(Tr::tr("The value '%1' of Project.minimumQbsVersion "
+                               "is not a valid version string.")
+                            .arg(minVersionStr), projectItem->location());
+    }
+    if (!qbsVersion.isValid())
+        qbsVersion = Version::fromString(QLatin1String(QBS_VERSION));
+    if (qbsVersion < minVersion) {
+        throw ErrorInfo(Tr::tr("The project requires at least qbs version %1, but "
+                               "this is qbs version %2.").arg(minVersion.toString(),
+                                 qbsVersion.toString()));
+    }
+
+    for (Item * const child : projectItem->children())
+        child->setScope(projectContext.scope);
+
+    ProbesResolver(loaderState).resolveProbes(dummyProduct, projectItem);
+
+    collectProfilesFromItems(projectItem, projectContext.scope, loaderState);
+
+    QList<Item *> multiplexedProducts;
+    for (Item * const child : projectItem->children()) {
+        if (child->type() == ItemType::Product)
+            multiplexedProducts << multiplexProductItem(dummyProduct, child);
+    }
+    for (Item * const additionalProductItem : std::as_const(multiplexedProducts))
+        Item::addChild(projectItem, additionalProductItem);
+
+    const QList<Item *> originalChildren = projectItem->children();
+    for (Item * const child : originalChildren) {
+        switch (child->type()) {
+        case ItemType::Product:
+            prepareProduct(projectContext, child);
+            break;
+        case ItemType::SubProject:
+            handleSubProject(projectContext, child, referencedFilePaths);
+            break;
+        case ItemType::Project:
+            copyProperties(projectItem, child);
+            handleProject(child, &projectContext, referencedFilePaths);
+            break;
+        default:
+            break;
+        }
+    }
+
+    const QStringList refs = evaluator.stringListValue(
+        projectItem, StringConstants::referencesProperty());
+    const CodeLocation referencingLocation
+        = projectItem->property(StringConstants::referencesProperty())->location();
+    QList<Item *> additionalProjectChildren;
+    for (const QString &filePath : refs) {
+        try {
+            additionalProjectChildren << loadReferencedFile(
+                filePath, referencingLocation, referencedFilePaths, dummyProduct);
+        } catch (const ErrorInfo &error) {
+            if (parameters.productErrorMode() == ErrorHandlingMode::Strict)
+                throw;
+            logger.printWarning(error);
+        }
+    }
+    for (Item * const subItem : std::as_const(additionalProjectChildren)) {
+        Item::addChild(projectContext.item, subItem);
+        switch (subItem->type()) {
+        case ItemType::Product:
+            prepareProduct(projectContext, subItem);
+            break;
+        case ItemType::Project:
+            copyProperties(projectItem, subItem);
+            handleProject(subItem, &projectContext,
+                          Set<QString>(referencedFilePaths) << subItem->file()->filePath());
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+QList<Item *> ProductsCollector::Private::multiplexProductItem(ProductContext &dummyContext,
+                                                               Item *productItem)
+{
+    // Overriding the product item properties must be done here already, because multiplexing
+    // properties might depend on product properties.
+    const QString &nameKey = StringConstants::nameProperty();
+    QString productName = loaderState.evaluator().stringValue(productItem, nameKey);
+    if (productName.isEmpty()) {
+        productName = FileInfo::completeBaseName(productItem->file()->filePath());
+        productItem->setProperty(nameKey, VariantValue::create(productName));
+    }
+    productItem->overrideProperties(loaderState.parameters().overriddenValuesTree(),
+                                    StringConstants::productsOverridePrefix() + productName,
+                                    loaderState.parameters(), loaderState.logger());
+    dummyContext.item = productItem;
+    TempBaseModuleAttacher tbma(this, dummyContext);
+    return multiplex(productName, productItem, tbma.tempBaseModuleItem(),
+        [&] { tbma.drop(); }, loaderState);
+}
+
+void ProductsCollector::Private::prepareProduct(ProjectContext &projectContext, Item *productItem,
+                                                ProductContext *mainProduct)
+{
+    const SetupProjectParameters &parameters = loaderState.parameters();
+    Evaluator &evaluator = loaderState.evaluator();
+    TopLevelProjectContext &topLevelProject = loaderState.topLevelProject();
+
+    AccumulatingTimer timer(parameters.logElapsedTime()
+                            ? &topLevelProject.timingData().preparingProducts : nullptr);
+    topLevelProject.checkCancelation();
+    qCDebug(lcModuleLoader) << "prepareProduct" << productItem->file()->filePath();
+
+    if (mainProduct)
+        mainProduct->shadowProduct = std::make_unique<ProductContext>();
+    else
+        projectContext.products.emplace_back();
+    ProductContext &productContext = mainProduct
+            ? *mainProduct->shadowProduct : projectContext.products.back();
+    productContext.item = productItem;
+    productContext.project = &projectContext;
+
+    // Retrieve name, profile and multiplex id.
+    productContext.name = evaluator.stringValue(productItem, StringConstants::nameProperty());
+    QBS_CHECK(!productContext.name.isEmpty());
+    const ItemValueConstPtr qbsItemValue = productItem->itemProperty(StringConstants::qbsModule(),
+                                                                     loaderState.itemPool());
+    if (qbsItemValue && qbsItemValue->item()->hasProperty(StringConstants::profileProperty())) {
+        TempBaseModuleAttacher tbma(this, productContext);
+        productContext.profileName = evaluator.stringValue(
+            tbma.tempBaseModuleItem(), StringConstants::profileProperty(), QString());
+    } else {
+        productContext.profileName = parameters.topLevelProfile();
+    }
+    productContext.multiplexConfigurationId = evaluator.stringValue(
+        productItem, StringConstants::multiplexConfigurationIdProperty());
+    QBS_CHECK(!productContext.profileName.isEmpty());
+
+    // Set up full module property map based on the profile.
+    std::optional<QVariantMap> flatConfig
+            = topLevelProject.profileConfig(productContext.profileName);
+    if (!flatConfig) {
+        const Profile profile(productContext.profileName, &settings,
+                              loaderState.topLevelProject().localProfiles());
+        if (!profile.exists()) {
+            ErrorInfo error(Tr::tr("Profile '%1' does not exist.").arg(profile.name()),
+                            productItem->location());
+            productContext.handleError(error);
+            return;
+        }
+        flatConfig = SetupProjectParameters::expandedBuildConfiguration(
+            profile, parameters.configurationName());
+        topLevelProject.addProfileConfig(productContext.profileName, *flatConfig);
+    }
+    productContext.profileModuleProperties = SetupProjectParameters::finalBuildConfigurationTree(
+        *flatConfig, {});
+    productContext.moduleProperties = SetupProjectParameters::finalBuildConfigurationTree(
+        *flatConfig, parameters.overriddenValues());
+    initProductProperties(productContext);
+
+    // Set up product scope. This is mainly for using the "product" and "project"
+    // variables in some contexts.
+    ItemValuePtr itemValue = ItemValue::create(productItem);
+    productContext.scope = Item::create(&loaderState.itemPool(), ItemType::Scope);
+    productContext.scope->setProperty(StringConstants::productVar(), itemValue);
+    productContext.scope->setFile(productItem->file());
+    productContext.scope->setScope(productContext.project->scope);
+
+    // If there are any child items with an id, set up a scope for them. This is mostly
+    // relevant for Probe items. While we might get away with using the file's id scope
+    // in the absence of multiplexing, having a proper per-product scope seems cleaner.
+    QBS_CHECK(productItem->scope());
+    QBS_CHECK(productItem->scope() == productContext.project->scope);
+    for (Item * const child : productItem->children()) {
+        if (child->id().isEmpty())
+            continue;
+        if (productItem->scope() == productContext.project->scope) {
+            productItem->setScope(Item::create(&loaderState.itemPool(), ItemType::Scope));
+            productItem->scope()->setScope(productContext.project->scope);
+        }
+        const ItemValuePtr childValue = ItemValue::create(child);
+        productItem->scope()->setProperty(child->id(), childValue);
+        productContext.scope->setProperty(child->id(), childValue);
+    }
+
+    const bool hasExportItems = mergeExportItems(productContext);
+
+    setScopeForDescendants(productItem, productContext.scope);
+
+    if (!hasExportItems)
+        return;
+
+    // This "shadow product" exists only to pull in a dependency on the actual product
+    // and nothing else, thus providing us with the pure environment that we need to
+    // evaluate the product's exported properties in isolation in the project resolver.
+    Item * const importer = Item::create(&loaderState.itemPool(), ItemType::Product);
+    importer->setProperty(QStringLiteral("name"),
+                          VariantValue::create(StringConstants::shadowProductPrefix()
+                                               + productContext.name));
+    importer->setFile(productItem->file());
+    importer->setLocation(productItem->location());
+    importer->setScope(projectContext.scope);
+    importer->setupForBuiltinType(parameters.deprecationWarningMode(), loaderState.logger());
+    Item * const dependsItem = Item::create(&loaderState.itemPool(), ItemType::Depends);
+    dependsItem->setProperty(QStringLiteral("name"), VariantValue::create(productContext.name));
+    dependsItem->setProperty(QStringLiteral("required"), VariantValue::create(false));
+    dependsItem->setFile(importer->file());
+    dependsItem->setLocation(importer->location());
+    dependsItem->setupForBuiltinType(parameters.deprecationWarningMode(), loaderState.logger());
+    dependsItem->setProperty(StringConstants::multiplexConfigurationIdsProperty(),
+                             VariantValue::create(productContext.multiplexConfigurationId));
+    Item::addChild(importer, dependsItem);
+    prepareProduct(projectContext, importer, &productContext);
+}
+
+void ProductsCollector::Private::handleSubProject(
+        ProjectContext &projectContext, Item *projectItem, const Set<QString> &referencedFilePaths)
+{
+    const SetupProjectParameters &parameters = loaderState.parameters();
+    Evaluator &evaluator = loaderState.evaluator();
+    Logger &logger = loaderState.logger();
+    ItemReader &itemReader = loaderState.itemReader();
+    TopLevelProjectContext &topLevelProject = loaderState.topLevelProject();
+
+    qCDebug(lcModuleLoader) << "handleSubProject" << projectItem->file()->filePath();
+
+    Item * const propertiesItem = projectItem->child(ItemType::PropertiesInSubProject);
+    if (!topLevelProject.checkItemCondition(projectItem, evaluator))
+        return;
+    if (propertiesItem) {
+        propertiesItem->setScope(projectItem);
+        if (!topLevelProject.checkItemCondition(propertiesItem, evaluator))
+            return;
+    }
+
+    Item *loadedItem = nullptr;
+    QString subProjectFilePath;
+    try {
+        const QString projectFileDirPath = FileInfo::path(projectItem->file()->filePath());
+        const QString relativeFilePath
+            = evaluator.stringValue(projectItem, StringConstants::filePathProperty());
+        subProjectFilePath = FileInfo::resolvePath(projectFileDirPath, relativeFilePath);
+        if (referencedFilePaths.contains(subProjectFilePath))
+            throw ErrorInfo(Tr::tr("Cycle detected while loading subproject file '%1'.")
+                                .arg(relativeFilePath), projectItem->location());
+        loadedItem = itemReader.setupItemFromFile(subProjectFilePath, projectItem->location());
+    } catch (const ErrorInfo &error) {
+        if (parameters.productErrorMode() == ErrorHandlingMode::Strict)
+            throw;
+        logger.printWarning(error);
+        return;
+    }
+
+    loadedItem = itemReader.wrapInProjectIfNecessary(loadedItem);
+    const bool inheritProperties = evaluator.boolValue(
+        projectItem, StringConstants::inheritPropertiesProperty());
+
+    if (inheritProperties)
+        copyProperties(projectItem->parent(), loadedItem);
+    if (propertiesItem) {
+        const Item::PropertyMap &overriddenProperties = propertiesItem->properties();
+        for (auto it = overriddenProperties.begin(); it != overriddenProperties.end(); ++it)
+            loadedItem->setProperty(it.key(), it.value());
+    }
+
+    Item::addChild(projectItem, loadedItem);
+    projectItem->setScope(projectContext.scope);
+    handleProject(loadedItem, &projectContext, Set<QString>(referencedFilePaths) << subProjectFilePath);
+}
+
+void ProductsCollector::Private::copyProperties(const Item *sourceProject, Item *targetProject)
+{
+    if (!sourceProject)
+        return;
+    const QList<PropertyDeclaration> builtinProjectProperties
+        = BuiltinDeclarations::instance().declarationsForType(ItemType::Project).properties();
+    Set<QString> builtinProjectPropertyNames;
+    for (const PropertyDeclaration &p : builtinProjectProperties)
+        builtinProjectPropertyNames << p.name();
+
+    for (auto it = sourceProject->propertyDeclarations().begin();
+         it != sourceProject->propertyDeclarations().end(); ++it) {
+
+        // We must not inherit built-in properties such as "name",
+        // but there are exceptions.
+        if (it.key() == StringConstants::qbsSearchPathsProperty()
+            || it.key() == StringConstants::profileProperty()
+            || it.key() == StringConstants::buildDirectoryProperty()
+            || it.key() == StringConstants::sourceDirectoryProperty()
+            || it.key() == StringConstants::minimumQbsVersionProperty()) {
+            const JSSourceValueConstPtr &v = targetProject->sourceProperty(it.key());
+            QBS_ASSERT(v, continue);
+            if (v->sourceCode() == StringConstants::undefinedValue())
+                sourceProject->copyProperty(it.key(), targetProject);
+            continue;
+        }
+
+        if (builtinProjectPropertyNames.contains(it.key()))
+            continue;
+
+        if (targetProject->hasOwnProperty(it.key()))
+            continue; // Ignore stuff the target project already has.
+
+        targetProject->setPropertyDeclaration(it.key(), it.value());
+        sourceProject->copyProperty(it.key(), targetProject);
+    }
+}
+
+QList<Item *> ProductsCollector::Private::loadReferencedFile(
+        const QString &relativePath, const CodeLocation &referencingLocation,
+        const Set<QString> &referencedFilePaths, ProductContext &dummyContext)
+{
+    QString absReferencePath = FileInfo::resolvePath(FileInfo::path(referencingLocation.filePath()),
+                                                     relativePath);
+    if (FileInfo(absReferencePath).isDir()) {
+        QString qbsFilePath;
+
+        QDirIterator dit(absReferencePath, StringConstants::qbsFileWildcards());
+        while (dit.hasNext()) {
+            if (!qbsFilePath.isEmpty()) {
+                throw ErrorInfo(Tr::tr("Referenced directory '%1' contains more than one "
+                                       "qbs file.").arg(absReferencePath), referencingLocation);
+            }
+            qbsFilePath = dit.next();
+        }
+        if (qbsFilePath.isEmpty()) {
+            throw ErrorInfo(Tr::tr("Referenced directory '%1' does not contain a qbs file.")
+                                .arg(absReferencePath), referencingLocation);
+        }
+        absReferencePath = qbsFilePath;
+    }
+    if (referencedFilePaths.contains(absReferencePath))
+        throw ErrorInfo(Tr::tr("Cycle detected while referencing file '%1'.").arg(relativePath),
+                        referencingLocation);
+    Item * const subItem = loaderState.itemReader().setupItemFromFile(
+                absReferencePath, referencingLocation);
+    if (subItem->type() != ItemType::Project && subItem->type() != ItemType::Product) {
+        ErrorInfo error(Tr::tr("Item type should be 'Product' or 'Project', but is '%1'.")
+                            .arg(subItem->typeName()));
+        error.append(Tr::tr("Item is defined here."), subItem->location());
+        error.append(Tr::tr("File is referenced here."), referencingLocation);
+        throw  error;
+    }
+    subItem->setScope(dummyContext.project->scope);
+    subItem->setParent(dummyContext.project->item);
+    QList<Item *> loadedItems;
+    loadedItems << subItem;
+    if (subItem->type() == ItemType::Product) {
+        collectProfilesFromItems(subItem, dummyContext.project->scope, loaderState);
+        loadedItems << multiplexProductItem(dummyContext, subItem);
+    }
+    return loadedItems;
+}
+
+void ProductsCollector::Private::mergeProperty(Item *dst, const QString &name,
+                                               const ValuePtr &value)
+{
+    if (value->type() == Value::ItemValueType) {
+        const ItemValueConstPtr itemValue = std::static_pointer_cast<ItemValue>(value);
+        const Item * const valueItem = itemValue->item();
+        Item * const subItem = dst->itemProperty(name, itemValue, loaderState.itemPool())->item();
+        for (auto it = valueItem->properties().begin(); it != valueItem->properties().end(); ++it)
+            mergeProperty(subItem, it.key(), it.value());
+        return;
+    }
+
+    // If the property already exists, set up the base value.
+    if (value->type() == Value::JSSourceValueType) {
+        const auto jsValue = static_cast<JSSourceValue *>(value.get());
+        if (jsValue->isBuiltinDefaultValue())
+            return;
+        const ValuePtr baseValue = dst->property(name);
+        if (baseValue) {
+            QBS_CHECK(baseValue->type() == Value::JSSourceValueType);
+            const JSSourceValuePtr jsBaseValue = std::static_pointer_cast<JSSourceValue>(
+                baseValue->clone(loaderState.itemPool()));
+            jsValue->setBaseValue(jsBaseValue);
+            std::vector<JSSourceValue::Alternative> alternatives = jsValue->alternatives();
+            jsValue->clearAlternatives();
+            for (JSSourceValue::Alternative &a : alternatives) {
+                a.value->setBaseValue(jsBaseValue);
+                jsValue->addAlternative(a);
+            }
+        }
+    }
+    dst->setProperty(name, value);
+}
+
+bool ProductsCollector::Private::mergeExportItems(ProductContext &productContext)
+{
+    const SetupProjectParameters &parameters = loaderState.parameters();
+    Evaluator &evaluator = loaderState.evaluator();
+    Logger &logger = loaderState.logger();
+    TopLevelProjectContext &topLevelProject = loaderState.topLevelProject();
+
+    std::vector<Item *> exportItems;
+    QList<Item *> children = productContext.item->children();
+
+    const auto isExport = [](Item *item) { return item->type() == ItemType::Export; };
+    std::copy_if(children.cbegin(), children.cend(), std::back_inserter(exportItems), isExport);
+    qbs::Internal::removeIf(children, isExport);
+
+    // Note that we do not return if there are no Export items: The "merged" item becomes the
+    // "product module", which always needs to exist, regardless of whether the product sources
+    // actually contain an Export item or not.
+    if (!exportItems.empty())
+        productContext.item->setChildren(children);
+
+    Item *merged = Item::create(&loaderState.itemPool(), ItemType::Export);
+    const QString &nameKey = StringConstants::nameProperty();
+    const ValuePtr nameValue = VariantValue::create(productContext.name);
+    merged->setProperty(nameKey, nameValue);
+    Set<FileContextConstPtr> filesWithExportItem;
+    QVariantMap defaultParameters;
+    for (Item * const exportItem : exportItems) {
+        topLevelProject.checkCancelation();
+        if (Q_UNLIKELY(filesWithExportItem.contains(exportItem->file())))
+            throw ErrorInfo(Tr::tr("Multiple Export items in one product are prohibited."),
+                            exportItem->location());
+        exportItem->setProperty(nameKey, nameValue);
+        if (!checkExportItemCondition(exportItem, productContext))
+            continue;
+        filesWithExportItem += exportItem->file();
+        for (Item * const child : exportItem->children()) {
+            if (child->type() == ItemType::Parameters) {
+                adjustParametersScopes(child, child);
+                defaultParameters = mergeDependencyParameters(defaultParameters,
+                                          getJsVariant(evaluator.engine()->context(),
+                                                       evaluator.scriptValue(child)).toMap());
+            } else {
+                Item::addChild(merged, child);
+            }
+        }
+        const Item::PropertyDeclarationMap &decls = exportItem->propertyDeclarations();
+        for (auto it = decls.constBegin(); it != decls.constEnd(); ++it) {
+            const PropertyDeclaration &newDecl = it.value();
+            const PropertyDeclaration &existingDecl = merged->propertyDeclaration(it.key());
+            if (existingDecl.isValid() && existingDecl.type() != newDecl.type()) {
+                ErrorInfo error(Tr::tr("Export item in inherited item redeclares property "
+                                       "'%1' with different type.").arg(it.key()), exportItem->location());
+                handlePropertyError(error, parameters, logger);
+            }
+            merged->setPropertyDeclaration(newDecl.name(), newDecl);
+        }
+        for (QMap<QString, ValuePtr>::const_iterator it = exportItem->properties().constBegin();
+             it != exportItem->properties().constEnd(); ++it) {
+            mergeProperty(merged, it.key(), it.value());
+        }
+    }
+    merged->setFile(exportItems.empty()
+                        ? productContext.item->file() : exportItems.back()->file());
+    merged->setLocation(exportItems.empty()
+                            ? productContext.item->location() : exportItems.back()->location());
+    Item::addChild(productContext.item, merged);
+    merged->setupForBuiltinType(parameters.deprecationWarningMode(), logger);
+
+    productContext.mergedExportItem = merged;
+    productContext.defaultParameters = defaultParameters;
+    return !exportItems.empty();
+
+}
+
+// TODO: This seems dubious. Can we merge the conditions instead?
+bool ProductsCollector::Private::checkExportItemCondition(Item *exportItem,
+                                                          const ProductContext &product)
+{
+    class ScopeHandler {
+    public:
+        ScopeHandler(Item *exportItem, const ProductContext &productContext, Item **cachedScopeItem,
+                     ItemPool &itemPool) : m_exportItem(exportItem), m_itemPool(itemPool)
+        {
+            if (!*cachedScopeItem)
+                *cachedScopeItem = Item::create(&m_itemPool, ItemType::Scope);
+            Item * const scope = *cachedScopeItem;
+            QBS_CHECK(productContext.item->file());
+            scope->setFile(productContext.item->file());
+            scope->setScope(productContext.item);
+            productContext.project->scope->copyProperty(StringConstants::projectVar(), scope);
+            productContext.scope->copyProperty(StringConstants::productVar(), scope);
+            QBS_CHECK(!exportItem->scope());
+            exportItem->setScope(scope);
+        }
+        ~ScopeHandler() { m_exportItem->setScope(nullptr); }
+
+    private:
+        Item * const m_exportItem;
+        ItemPool &m_itemPool;
+    } scopeHandler(exportItem, product, &tempScopeItem, loaderState.itemPool());
+    return loaderState.topLevelProject().checkItemCondition(exportItem, loaderState.evaluator());
+}
+
+void ProductsCollector::Private::initProductProperties(const ProductContext &product)
+{
+    QString buildDir = ResolvedProduct::deriveBuildDirectoryName(product.name,
+                                                                 product.multiplexConfigurationId);
+    buildDir = FileInfo::resolvePath(product.project->topLevelProject->buildDirectory(), buildDir);
+    product.item->setProperty(StringConstants::buildDirectoryProperty(),
+                              VariantValue::create(buildDir));
+    const QString sourceDir = QFileInfo(product.item->file()->filePath()).absolutePath();
+    product.item->setProperty(StringConstants::sourceDirectoryProperty(),
+                              VariantValue::create(sourceDir));
+}
+
+void ProductsCollector::Private::checkProjectNamesInOverrides()
+{
+    for (const QString &projectNameInOverride
+         : loaderState.topLevelProject().projectNamesUsedInOverrides()) {
+        if (disabledProjects.contains(projectNameInOverride))
+            continue;
+        if (!any_of(loaderState.topLevelProject().projects(),
+                    [&projectNameInOverride](const ProjectContext *p) {
+                return p->name == projectNameInOverride; })) {
+            handlePropertyError(Tr::tr("Unknown project '%1' in property override.")
+                                .arg(projectNameInOverride),
+                                loaderState.parameters(), loaderState.logger());
+        }
+    }
+}
+
+void ProductsCollector::Private::collectProductsByNameAndItem()
+{
+    TopLevelProjectContext &topLevelProject = loaderState.topLevelProject();
+    for (ProjectContext * const project : topLevelProject.projects()) {
+        for (ProductContext &product : project->products)
+            topLevelProject.addProduct(product);
+    }
+}
+
+void ProductsCollector::Private::checkProductNamesInOverrides()
+{
+    TopLevelProjectContext &topLevelProject = loaderState.topLevelProject();
+    for (const QString &productNameInOverride : topLevelProject.productNamesUsedInOverrides()) {
+        if (!topLevelProject.productWithNameAndConstraint(
+                    productNameInOverride, [&productNameInOverride](const ProductContext &product) {
+                // In an override string such as "a.b.c:d, we cannot tell whether we have a product
+                // "a" and a module "b.c" or a product "a.b" and a module "c", so we need to take
+                // care not to emit false positives here.
+                return product.name == productNameInOverride
+                       || product.name.startsWith(productNameInOverride + StringConstants::dot());
+            })) {
+            handlePropertyError(Tr::tr("Unknown product '%1' in property override.")
+                                .arg(productNameInOverride),
+                                loaderState.parameters(), loaderState.logger());
+        }
+    }
+}
+
+ProductsCollector::Private::TempBaseModuleAttacher::TempBaseModuleAttacher(
+    ProductsCollector::Private *d, ProductContext &product)
+    : m_productItem(product.item)
+{
+    const ValuePtr qbsValue = m_productItem->property(StringConstants::qbsModule());
+
+    // Cloning is necessary because the original value will get "instantiated" now.
+    if (qbsValue)
+        m_origQbsValue = qbsValue->clone(d->loaderState.itemPool());
+
+    m_tempBaseModule = loadBaseModule(product, m_productItem, d->loaderState);
+}
+
+void ProductsCollector::Private::TempBaseModuleAttacher::drop()
+{
+    if (!m_tempBaseModule)
+        return;
+
+    // "Unload" the qbs module again.
+    if (m_origQbsValue)
+        m_productItem->setProperty(StringConstants::qbsModule(), m_origQbsValue);
+    else
+        m_productItem->removeProperty(StringConstants::qbsModule());
+    m_productItem->removeModules();
+    m_tempBaseModule = nullptr;
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/productscollector.h b/src/lib/corelib/loader/productscollector.h
new file mode 100644
index 000000000..246361b37
--- /dev/null
+++ b/src/lib/corelib/loader/productscollector.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <tools/pimpl.h>
+
+namespace qbs::Internal {
+class Item;
+class LoaderState;
+
+// Traverses the root project item and fills the TopLevelProjectContext with all the
+// product and sub-project information, including those coming from referenced files.
+class ProductsCollector
+{
+public:
+    ProductsCollector(LoaderState &loaderState);
+    ~ProductsCollector();
+
+    void run(Item *rootProject);
+
+private:
+     class Private;
+     Pimpl<Private> d;
+};
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/productsresolver.cpp b/src/lib/corelib/loader/productsresolver.cpp
new file mode 100644
index 000000000..997a4dc57
--- /dev/null
+++ b/src/lib/corelib/loader/productsresolver.cpp
@@ -0,0 +1,599 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "productsresolver.h"
+
+#include "itemreader.h"
+#include "loaderutils.h"
+#include "productresolver.h"
+
+#include <language/language.h>
+#include <language/scriptengine.h>
+#include <logging/categories.h>
+#include <logging/translator.h>
+#include <tools/profiling.h>
+#include <tools/progressobserver.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stringconstants.h>
+
+#include <algorithm>
+#include <condition_variable>
+#include <future>
+#include <mutex>
+#include <queue>
+#include <system_error>
+#include <thread>
+#include <unordered_map>
+#include <vector>
+
+namespace qbs::Internal {
+namespace {
+struct ThreadInfo {
+    ThreadInfo(std::future<void> &&future, LoaderState &loaderState)
+        : future(std::move(future)), loaderState(loaderState)
+    {}
+    std::future<void> future;
+    LoaderState &loaderState;
+    bool done = false;
+};
+
+struct ProductWithLoaderState {
+    ProductWithLoaderState(ProductContext &product, LoaderState *loaderState)
+        : product(&product), loaderState(loaderState) {}
+    ProductContext * const product;
+    LoaderState *loaderState;
+};
+
+class ThreadsLocker {
+public:
+    ThreadsLocker(std::launch mode, std::mutex &mutex) {
+        if (mode == std::launch::async)
+            lock = std::make_unique<std::unique_lock<std::mutex>>(mutex);
+    }
+    std::unique_ptr<std::unique_lock<std::mutex>> lock;
+};
+} // namespace
+
+class ProductsResolver
+{
+public:
+    ProductsResolver(LoaderState &loaderState) : m_loaderState(loaderState) {}
+    void resolve();
+
+private:
+    void initialize();
+    void initializeProductQueue();
+    void initializeLoaderStatePool();
+    void runScheduler();
+    void scheduleNext();
+    bool tryToReserveLoaderState(ProductWithLoaderState &product, Deferral deferral);
+    std::optional<std::pair<ProductContext *, Deferral>>
+    unblockProductWaitingForLoaderState(LoaderState &loaderState);
+    void startJob(const ProductWithLoaderState &product, Deferral deferral);
+    void checkForCancelation();
+    void handleFinishedThreads();
+    void queueProductForScheduling(const ProductWithLoaderState &product, Deferral deferral);
+    void waitForSingleDependency(const ProductWithLoaderState &product, ProductContext &dependency);
+    void waitForBulkDependency(const ProductWithLoaderState &product);
+    void unblockProductsWaitingForDependency(ProductContext &finishedProduct);
+    void postProcess();
+    void checkForMissedBulkDependencies(const ProductContext &product);
+
+    static int dependsItemCount(const Item *item);
+    static int dependsItemCount(ProductContext &product);
+
+    LoaderState &m_loaderState;
+    std::queue<std::pair<ProductWithLoaderState, int>> m_productsToSchedule;
+    std::vector<ProductContext *> m_finishedProducts;
+    std::unordered_map<ProductContext *,
+    std::vector<ProductWithLoaderState>> m_waitingForSingleDependency;
+    std::vector<ProductWithLoaderState> m_waitingForBulkDependency;
+    std::unordered_map<LoaderState *, std::queue<std::pair<ProductContext *, Deferral>>> m_waitingForLoaderState;
+    std::unordered_map<ProductContext *, ThreadInfo> m_runningThreads;
+    std::mutex m_threadsMutex;
+    std::condition_variable m_threadsNotifier;
+    std::vector<std::unique_ptr<ScriptEngine>> m_enginePool;
+    std::vector<std::unique_ptr<LoaderState>> m_loaderStatePool;
+    std::vector<LoaderState *> m_availableLoaderStates;
+    std::mutex m_cancelingMutex;
+    std::launch m_asyncMode = std::launch::async;
+    int m_maxJobCount = m_loaderState.parameters().maxJobCount();
+    bool m_canceling = false;
+};
+
+void resolveProducts(LoaderState &loaderState)
+{
+    ProductsResolver(loaderState).resolve();
+}
+
+void ProductsResolver::resolve()
+{
+    initialize();
+    try {
+        runScheduler();
+    } catch (const ErrorInfo &e) {
+        for (auto &thread : m_runningThreads)
+            thread.second.future.wait();
+        throw e;
+    }
+    postProcess();
+}
+
+void ProductsResolver::initialize()
+{
+    initializeProductQueue();
+    initializeLoaderStatePool();
+}
+
+void ProductsResolver::initializeProductQueue()
+{
+    TopLevelProjectContext &topLevelProject = m_loaderState.topLevelProject();
+    std::vector<ProductContext *> sortedProducts;
+    for (ProjectContext * const projectContext : topLevelProject.projects()) {
+        for (ProductContext &product : projectContext->products) {
+            topLevelProject.addProductToHandle(product);
+            const auto it = std::lower_bound(sortedProducts.begin(), sortedProducts.end(), product,
+                                             [&product](ProductContext *p1, const ProductContext &) {
+                return dependsItemCount(*p1) < dependsItemCount(product);
+            });
+            sortedProducts.insert(it, &product);
+        }
+    }
+
+    for (ProductContext * const product : sortedProducts) {
+        queueProductForScheduling(ProductWithLoaderState(*product, nullptr), Deferral::Allowed);
+        if (product->shadowProduct) {
+            topLevelProject.addProductToHandle(*product->shadowProduct);
+            queueProductForScheduling(ProductWithLoaderState(*product->shadowProduct, nullptr),
+                                      Deferral::Allowed);
+        }
+    }
+}
+
+void ProductsResolver::initializeLoaderStatePool()
+{
+    TopLevelProjectContext &topLevelProject = m_loaderState.topLevelProject();
+
+    // Adapt max job count: It makes no sense to have it be higher than the number of products
+    // or what can actually be run concurrently. In both cases, we would simply waste resources.
+    const int maxConcurrency = std::thread::hardware_concurrency();
+    if (maxConcurrency > 0 && maxConcurrency < m_maxJobCount)
+        m_maxJobCount = maxConcurrency;
+    if (m_maxJobCount > topLevelProject.productsToHandleCount())
+        m_maxJobCount = topLevelProject.productsToHandleCount();
+
+    // The number of engines and loader states we need to allocate here is one less than the
+    // total number of concurrent jobs, as we already have one loader state that we can re-use.
+    if (m_maxJobCount > 1)
+        m_enginePool.reserve(m_maxJobCount - 1);
+    m_loaderStatePool.reserve(m_enginePool.size());
+    m_availableLoaderStates.reserve(m_enginePool.size() + 1);
+    m_availableLoaderStates.push_back(&m_loaderState);
+    for (std::size_t i = 0; i < m_enginePool.capacity(); ++i) {
+        ScriptEngine &engine = *m_enginePool.emplace_back(
+            ScriptEngine::create(m_loaderState.logger(), EvalContext::PropertyEvaluation));
+        ItemPool &itemPool = topLevelProject.createItemPool();
+        engine.setEnvironment(m_loaderState.parameters().adjustedEnvironment());
+        auto loaderState = std::make_unique<LoaderState>(
+                    m_loaderState.parameters(), topLevelProject, itemPool, engine,
+                    m_loaderState.logger());
+        m_loaderStatePool.push_back(std::move(loaderState));
+        m_availableLoaderStates.push_back(m_loaderStatePool.back().get());
+        if (topLevelProject.progressObserver())
+            topLevelProject.progressObserver()->addScriptEngine(m_enginePool.back().get());
+    }
+    qCDebug(lcLoaderScheduling) << "using" << m_availableLoaderStates.size() << "loader states";
+    if (int(m_availableLoaderStates.size()) == 1)
+        m_asyncMode = std::launch::deferred;
+}
+
+void ProductsResolver::runScheduler()
+{
+    AccumulatingTimer timer(m_loaderState.parameters().logElapsedTime()
+                            ? &m_loaderState.topLevelProject().timingData().resolvingProducts
+                            : nullptr);
+
+    ThreadsLocker threadsLock(m_asyncMode, m_threadsMutex);
+    while (true) {
+        scheduleNext();
+        if (m_runningThreads.empty())
+            break;
+        if (m_asyncMode == std::launch::async) {
+            qCDebug(lcLoaderScheduling()) << "scheduling paused, waiting for threads to finish";
+            m_threadsNotifier.wait(*threadsLock.lock);
+        }
+        checkForCancelation();
+        handleFinishedThreads();
+    }
+
+    QBS_CHECK(m_productsToSchedule.empty());
+    QBS_CHECK(m_loaderState.topLevelProject().productsToHandleCount() == 0);
+    QBS_CHECK(m_runningThreads.empty());
+    QBS_CHECK(m_waitingForSingleDependency.empty());
+    QBS_CHECK(m_waitingForBulkDependency.empty());
+}
+
+void ProductsResolver::scheduleNext()
+{
+    TopLevelProjectContext &topLevelProject = m_loaderState.topLevelProject();
+    AccumulatingTimer timer(m_loaderState.parameters().logElapsedTime()
+                            ? &topLevelProject.timingData().schedulingProducts : nullptr);
+    while (m_maxJobCount > int(m_runningThreads.size()) && !m_productsToSchedule.empty()) {
+        auto [product, toHandleCountOnInsert] = m_productsToSchedule.front();
+        m_productsToSchedule.pop();
+
+        qCDebug(lcLoaderScheduling) << "potentially scheduling product"
+                                    << product.product->displayName()
+                                    << "unhandled product count on queue insertion"
+                                    << toHandleCountOnInsert << "current unhandled product count"
+                                    << topLevelProject.productsToHandleCount();
+
+        // If the number of unfinished products has shrunk since the last time we tried handling
+        // this product, there has been forward progress and we can allow a deferral.
+        const Deferral deferral = toHandleCountOnInsert == -1
+                || toHandleCountOnInsert > topLevelProject.productsToHandleCount()
+                ? Deferral::Allowed : Deferral::NotAllowed;
+
+        if (!tryToReserveLoaderState(product, deferral))
+            continue;
+
+        startJob(product, deferral);
+    }
+
+    // There are jobs running, so forward progress is still possible.
+    if (!m_runningThreads.empty())
+        return;
+
+    QBS_CHECK(m_productsToSchedule.empty());
+
+    // If we end up here, nothing was scheduled in the loop above, which means that either ...
+    //  a) ... we are done or
+    //  b) ... we finally need to schedule our bulk dependencies or
+    //  c) ... we need to schedule products waiting for an unhandled dependency.
+    // In the latter case, the project has at least one dependency cycle, and the
+    // DependencyResolver will emit an error.
+
+    // a)
+    if (m_waitingForBulkDependency.empty() && m_waitingForSingleDependency.empty())
+        return;
+
+    // b)
+    for (const ProductWithLoaderState &product : m_waitingForBulkDependency)
+        queueProductForScheduling(product, Deferral::NotAllowed);
+    if (!m_productsToSchedule.empty()) {
+        m_waitingForBulkDependency.clear();
+        scheduleNext();
+        return;
+    }
+
+    // c)
+    for (const auto &e : m_waitingForSingleDependency) {
+        for (const ProductWithLoaderState &p : e.second)
+            queueProductForScheduling(p, Deferral::NotAllowed);
+    }
+    QBS_CHECK(!m_productsToSchedule.empty());
+    scheduleNext();
+}
+
+bool ProductsResolver::tryToReserveLoaderState(ProductWithLoaderState &product, Deferral deferral)
+{
+    QBS_CHECK(!m_availableLoaderStates.empty());
+    if (!product.loaderState) {
+        product.loaderState = m_availableLoaderStates.back();
+        m_availableLoaderStates.pop_back();
+        return true;
+    }
+    if (const auto it = std::find(m_availableLoaderStates.begin(), m_availableLoaderStates.end(),
+                                  product.loaderState); it != m_availableLoaderStates.end()) {
+        m_availableLoaderStates.erase(it);
+        return true;
+    }
+    qCDebug(lcLoaderScheduling) << "loader state" << product.loaderState << " for product"
+                                << product.product->displayName()
+                                << "not available, adding product to wait queue";
+    m_waitingForLoaderState[product.loaderState].push({product.product, deferral});
+    return false;
+}
+
+std::optional<std::pair<ProductContext *, Deferral>>
+ProductsResolver::unblockProductWaitingForLoaderState(LoaderState &loaderState)
+{
+    auto &waitingForLoaderState = m_waitingForLoaderState[&loaderState];
+    if (waitingForLoaderState.empty())
+        return {};
+    const auto product = waitingForLoaderState.front();
+    waitingForLoaderState.pop();
+    qCDebug(lcLoaderScheduling) << "loader state" << &loaderState << "now available for product"
+              << product.first->displayName();
+    return product;
+}
+
+void ProductsResolver::startJob(const ProductWithLoaderState &product, Deferral deferral)
+{
+    QBS_CHECK(product.loaderState);
+    qCDebug(lcLoaderScheduling) << "scheduling product" << product.product->displayName()
+                                << "with loader state" << product.loaderState
+                                << "and deferral mode" << int(deferral);
+    try {
+        const auto it = m_runningThreads.emplace(product.product, ThreadInfo(std::async(m_asyncMode,
+            [this, product, deferral] {
+                product.loaderState->itemReader().setExtraSearchPathsStack(
+                product.product->project->searchPathsStack);
+                resolveProduct(*product.product, deferral, *product.loaderState);
+
+                // The search paths stack can change during dependency resolution
+                // (due to module providers); check that we've rolled back all the changes
+                QBS_CHECK(product.loaderState->itemReader().extraSearchPathsStack()
+                          == product.product->project->searchPathsStack);
+
+                std::lock_guard cancelingLock(m_cancelingMutex);
+                if (m_canceling)
+                    return;
+                ThreadsLocker threadsLock(m_asyncMode, m_threadsMutex);
+                if (const auto it = m_runningThreads.find(product.product);
+                    it != m_runningThreads.end()) {
+                    it->second.done = true;
+                    qCDebug(lcLoaderScheduling) << "thread for product"
+                                                << product.product->displayName()
+                                                << "finished, waking up scheduler";
+                    m_threadsNotifier.notify_one();
+                }
+            }), *product.loaderState));
+
+        // With just one worker thread, the notify/wait overhead would be excessive, so
+        // we run the task synchronously.
+        if (m_asyncMode == std::launch::deferred) {
+            qCDebug(lcLoaderScheduling) << "blocking on product thread immediately";
+            it.first->second.future.wait();
+        }
+    } catch (const std::system_error &e) {
+        if (e.code() != std::errc::resource_unavailable_try_again)
+            throw e;
+        qCWarning(lcLoaderScheduling) << "failed to create thread";
+        if (m_maxJobCount >= 2) {
+            m_maxJobCount /= 2;
+            qCWarning(lcLoaderScheduling) << "throttling down to" << m_maxJobCount << "jobs";
+        }
+        queueProductForScheduling(product, deferral);
+        m_availableLoaderStates.push_back(product.loaderState);
+    }
+}
+
+void ProductsResolver::checkForCancelation()
+{
+    if (m_loaderState.topLevelProject().isCanceled()) {
+        m_cancelingMutex.lock();
+        m_canceling = true;
+        m_cancelingMutex.unlock();
+        for (auto &thread : m_runningThreads)
+            thread.second.future.wait();
+        throw CancelException();
+    }
+}
+
+void ProductsResolver::handleFinishedThreads()
+{
+    TopLevelProjectContext &topLevelProject = m_loaderState.topLevelProject();
+    AccumulatingTimer timer(m_loaderState.parameters().logElapsedTime()
+                            ? &topLevelProject.timingData().schedulingProducts : nullptr);
+
+    std::vector<std::pair<ProductWithLoaderState, Deferral>> productsToScheduleDirectly;
+    for (auto it = m_runningThreads.begin(); it != m_runningThreads.end();) {
+        ThreadInfo &ti = it->second;
+        if (!ti.done) {
+            ++it;
+            continue;
+        }
+        ti.future.wait();
+        ProductContext &product = *it->first;
+        LoaderState &loaderState = ti.loaderState;
+        it = m_runningThreads.erase(it);
+
+        qCDebug(lcLoaderScheduling) << "handling finished thread for product"
+                                    << product.displayName()
+                                    << "current unhandled product count is"
+                                    << topLevelProject.productsToHandleCount();
+
+        // If there are products waiting for the loader state used in the finished thread,
+        // we can start a job for one of them right away (but not in the loop,
+        // because startJob() modifies the thread list we are currently iterating over).
+        if (const auto productInfo = unblockProductWaitingForLoaderState(loaderState)) {
+            productsToScheduleDirectly.emplace_back(
+                        ProductWithLoaderState(*productInfo->first, &loaderState),
+                        productInfo->second);
+        } else {
+            qCDebug(lcLoaderScheduling) << "making loader state" << &loaderState
+                                        << "available again";
+            m_availableLoaderStates.push_back(&loaderState);
+        }
+
+        // If we encountered a dependency to an in-progress product or to a bulk dependency,
+        // we defer handling this product.
+        if (product.dependenciesResolvingPending()) {
+            qCDebug(lcLoaderScheduling) << "dependencies resolving not finished for product"
+                                        << product.displayName();
+            const auto pending = product.pendingDependency();
+            switch (pending.first) {
+            case ProductDependency::Single:
+                waitForSingleDependency(ProductWithLoaderState(product, &loaderState),
+                                        *pending.second);
+                break;
+            case ProductDependency::Bulk:
+                waitForBulkDependency(ProductWithLoaderState(product, &loaderState));
+                break;
+            case ProductDependency::None:
+                // This can happen if the dependency has finished in between the check in
+                // DependencyResolver and the one here.
+                QBS_CHECK(pending.second);
+                queueProductForScheduling(ProductWithLoaderState(product, &loaderState),
+                                          Deferral::Allowed);
+                break;
+            }
+            topLevelProject.incProductDeferrals();
+        } else {
+            qCDebug(lcLoaderScheduling) << "product" << product.displayName() << "finished";
+            topLevelProject.removeProductToHandle(product);
+            if (!product.name.startsWith(StringConstants::shadowProductPrefix()))
+                m_finishedProducts.push_back(&product);
+            topLevelProject.timingData() += product.timingData;
+            checkForMissedBulkDependencies(product);
+            topLevelProject.registerBulkDependencies(product);
+            unblockProductsWaitingForDependency(product);
+        }
+    }
+
+    for (const auto &productInfo : productsToScheduleDirectly)
+        startJob(productInfo.first, productInfo.second);
+}
+
+void ProductsResolver::queueProductForScheduling(const ProductWithLoaderState &product,
+                                                 Deferral deferral)
+{
+    qCDebug(lcLoaderScheduling) << "queueing product" << product.product->displayName()
+                                << "with deferral mode" << int(deferral);
+    m_productsToSchedule.emplace(product, deferral == Deferral::Allowed
+            ? -1 : m_loaderState.topLevelProject().productsToHandleCount());
+}
+
+void ProductsResolver::waitForSingleDependency(const ProductWithLoaderState &product,
+                                               ProductContext &dependency)
+{
+    qCDebug(lcLoaderScheduling) << "product" << product.product->displayName()
+                                << "now waiting for single dependency"
+                                << dependency.displayName();
+    m_waitingForSingleDependency[&dependency].push_back(product);
+}
+
+void ProductsResolver::waitForBulkDependency(const ProductWithLoaderState &product)
+{
+    qCDebug(lcLoaderScheduling) << "product" << product.product->displayName()
+                                << "now waiting for bulk dependency";
+    m_waitingForBulkDependency.push_back(product);
+}
+
+void ProductsResolver::unblockProductsWaitingForDependency(ProductContext &finishedProduct)
+{
+    const auto it = m_waitingForSingleDependency.find(&finishedProduct);
+    if (it == m_waitingForSingleDependency.end())
+        return;
+
+    qCDebug(lcLoaderScheduling) << "unblocking all products waiting for now-finished product" <<
+                                   finishedProduct.displayName();
+    for (const ProductWithLoaderState &p : it->second) {
+        qCDebug(lcLoaderScheduling) << "  unblocking product" << p.product->displayName();
+        queueProductForScheduling(p, Deferral::Allowed);
+    }
+    m_waitingForSingleDependency.erase(it);
+}
+
+void ProductsResolver::postProcess()
+{
+    for (ProductContext * const product : m_finishedProducts) {
+        if (product->product)
+            product->product->project->products.push_back(product->product);
+
+        // This has to be done in post-processing, because we need both product and shadow product
+        // to be ready, and contrary to what one might assume, there is no proper ordering
+        // between them regarding dependency resolving.
+        setupExports(*product, m_loaderState);
+    }
+
+    for (const auto &engine : m_enginePool)
+        m_loaderState.topLevelProject().collectDataFromEngine(*engine);
+
+    QBS_CHECK(!m_loaderState.topLevelProject().projects().empty());
+    const auto project = std::dynamic_pointer_cast<TopLevelProject>(
+                m_loaderState.topLevelProject().projects().front()->project);
+    QBS_CHECK(project);
+    for (LoaderState * const loaderState : m_availableLoaderStates)
+        project->warningsEncountered << loaderState->logger().warnings();
+}
+
+void ProductsResolver::checkForMissedBulkDependencies(const ProductContext &product)
+{
+    if (!product.product || !product.product->enabled || !product.bulkDependencies.empty())
+        return;
+    for (const FileTag &tag : product.product->fileTags) {
+        for (const auto &[p, location]
+             : m_loaderState.topLevelProject().finishedProductsWithBulkDependency(tag)) {
+            if (!p->product->enabled)
+                continue;
+            if (p->name == product.name)
+                continue;
+            ErrorInfo e;
+            e.append(Tr::tr("Cyclic dependencies detected:"));
+            e.append(Tr::tr("First product is '%1'.")
+                     .arg(product.displayName()), product.item->location());
+            e.append(Tr::tr("Second product is '%1'.")
+                     .arg(p->displayName()), p->item->location());
+            e.append(Tr::tr("Dependency from %1 to %2 was established via Depends.productTypes.")
+                     .arg(p->displayName(), product.displayName()), location);
+            if (m_loaderState.parameters().productErrorMode() == ErrorHandlingMode::Strict)
+                throw e;
+            m_loaderState.logger().printWarning(e);
+            m_loaderState.logger().printWarning(
+                        ErrorInfo(Tr::tr("Product '%1' had errors and was disabled.")
+                                  .arg(product.displayName()), product.item->location()));
+            m_loaderState.logger().printWarning(
+                        ErrorInfo(Tr::tr("Product '%1' had errors and was disabled.")
+                                  .arg(p->displayName()), p->item->location()));
+            product.product->enabled = false;
+            p->product->enabled = false;
+        }
+    }
+}
+
+int ProductsResolver::dependsItemCount(const Item *item)
+{
+    int count = 0;
+    for (const Item * const child : item->children()) {
+        if (child->type() == ItemType::Depends)
+            ++count;
+    }
+    return count;
+}
+
+int ProductsResolver::dependsItemCount(ProductContext &product)
+{
+    if (product.dependsItemCount == -1)
+        product.dependsItemCount = dependsItemCount(product.item);
+    return product.dependsItemCount;
+}
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/productsresolver.h b/src/lib/corelib/loader/productsresolver.h
new file mode 100644
index 000000000..b8b4b7516
--- /dev/null
+++ b/src/lib/corelib/loader/productsresolver.h
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+namespace qbs::Internal {
+class LoaderState;
+
+void resolveProducts(LoaderState &loaderState);
+
+} // namespace qbs::Internal
diff --git a/src/lib/corelib/loader/projectresolver.cpp b/src/lib/corelib/loader/projectresolver.cpp
new file mode 100644
index 000000000..be99d547d
--- /dev/null
+++ b/src/lib/corelib/loader/projectresolver.cpp
@@ -0,0 +1,562 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "projectresolver.h"
+
+#include "itemreader.h"
+#include "loaderutils.h"
+#include "productscollector.h"
+#include "productsresolver.h"
+
+#include <jsextensions/jsextensions.h>
+#include <jsextensions/moduleproperties.h>
+#include <language/artifactproperties.h>
+#include <language/builtindeclarations.h>
+#include <language/evaluator.h>
+#include <language/filecontext.h>
+#include <language/filetags.h>
+#include <language/item.h>
+#include <language/itempool.h>
+#include <language/language.h>
+#include <language/propertymapinternal.h>
+#include <language/resolvedfilecontext.h>
+#include <language/scriptengine.h>
+#include <language/value.h>
+#include <logging/categories.h>
+#include <logging/translator.h>
+#include <tools/error.h>
+#include <tools/fileinfo.h>
+#include <tools/joblimits.h>
+#include <tools/jsliterals.h>
+#include <tools/profile.h>
+#include <tools/profiling.h>
+#include <tools/progressobserver.h>
+#include <tools/scripttools.h>
+#include <tools/qbsassert.h>
+#include <tools/qttools.h>
+#include <tools/set.h>
+#include <tools/settings.h>
+#include <tools/setupprojectparameters.h>
+#include <tools/stlutils.h>
+#include <tools/stringconstants.h>
+
+#include <quickjs.h>
+
+#include <QtCore/qdir.h>
+#include <QtCore/qregularexpression.h>
+
+#include <algorithm>
+#include <memory>
+#include <queue>
+#include <utility>
+#include <vector>
+
+namespace qbs {
+namespace Internal {
+
+static SetupProjectParameters finalizedProjectParameters(const SetupProjectParameters &in,
+                                                         Logger &logger)
+{
+    SetupProjectParameters params = in;
+    if (params.topLevelProfile().isEmpty()) {
+        Settings settings(params.settingsDirectory());
+        QString profileName = settings.defaultProfile();
+        if (profileName.isEmpty()) {
+            logger.qbsDebug() << Tr::tr("No profile specified and no default profile exists. "
+                                        "Using default property values.");
+            profileName = Profile::fallbackName();
+        }
+        params.setTopLevelProfile(profileName);
+        params.expandBuildConfiguration();
+    }
+    params.finalizeProjectFilePath();
+
+    QBS_CHECK(QFileInfo(params.projectFilePath()).isAbsolute());
+    QBS_CHECK(FileInfo::isAbsolute(params.buildRoot()));
+
+    return params;
+}
+
+class ProjectResolver::Private
+{
+public:
+    Private(const SetupProjectParameters &parameters, ScriptEngine *engine, Logger &&logger)
+        : setupParams(finalizedProjectParameters(parameters, logger)), engine(engine),
+          logger(std::move(logger)) {}
+
+    TopLevelProjectPtr resolveTopLevelProject();
+    void resolveProject(ProjectContext *projectContext);
+    void resolveProjectFully(ProjectContext *projectContext);
+    void resolveSubProject(Item *item, ProjectContext *projectContext);
+    void checkOverriddenValues();
+    void collectNameFromOverride(const QString &overrideString);
+    void loadTopLevelProjectItem();
+    void buildProjectTree();
+
+    void printProfilingInfo();
+
+    const SetupProjectParameters setupParams;
+    ScriptEngine * const engine;
+    mutable Logger logger;
+    ItemPool itemPool;
+    TopLevelProjectContext topLevelProject;
+    LoaderState state{setupParams, topLevelProject, itemPool, *engine, logger};
+    Item *rootProjectItem = nullptr;
+};
+
+ProjectResolver::ProjectResolver(const SetupProjectParameters &parameters, ScriptEngine *engine,
+                                 Logger logger)
+    : d(makePimpl<Private>(parameters, engine, std::move(logger)))
+{
+    d->logger.storeWarnings();
+}
+
+ProjectResolver::~ProjectResolver() = default;
+
+void ProjectResolver::setProgressObserver(ProgressObserver *observer)
+{
+    d->state.topLevelProject().setProgressObserver(observer);
+}
+
+void ProjectResolver::setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes)
+{
+    d->state.topLevelProject().setOldProjectProbes(oldProbes);
+}
+
+void ProjectResolver::setOldProductProbes(
+    const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes)
+{
+    d->state.topLevelProject().setOldProductProbes(oldProbes);
+}
+
+void ProjectResolver::setLastResolveTime(const FileTime &time)
+{
+    d->state.topLevelProject().setLastResolveTime(time);
+}
+
+void ProjectResolver::setStoredProfiles(const QVariantMap &profiles)
+{
+    d->state.topLevelProject().setProfileConfigs(profiles);
+}
+
+void ProjectResolver::setStoredModuleProviderInfo(const StoredModuleProviderInfo &providerInfo)
+{
+    d->state.topLevelProject().setModuleProvidersCache(providerInfo.providers);
+}
+
+static void checkForDuplicateProductNames(const TopLevelProjectConstPtr &project)
+{
+    const std::vector<ResolvedProductPtr> allProducts = project->allProducts();
+    for (size_t i = 0; i < allProducts.size(); ++i) {
+        const ResolvedProductConstPtr product1 = allProducts.at(i);
+        const QString productName = product1->uniqueName();
+        for (size_t j = i + 1; j < allProducts.size(); ++j) {
+            const ResolvedProductConstPtr product2 = allProducts.at(j);
+            if (product2->uniqueName() == productName) {
+                ErrorInfo error;
+                error.append(Tr::tr("Duplicate product name '%1'.").arg(product1->name));
+                error.append(Tr::tr("First product defined here."), product1->location);
+                error.append(Tr::tr("Second product defined here."), product2->location);
+                throw error;
+            }
+        }
+    }
+}
+
+TopLevelProjectPtr ProjectResolver::resolve()
+{
+    qCDebug(lcProjectResolver) << "resolving" << d->setupParams.projectFilePath();
+
+    d->engine->setEnvironment(d->setupParams.adjustedEnvironment());
+    d->engine->checkAndClearException({});
+    d->engine->clearImportsCache();
+    d->engine->clearRequestedProperties();
+    d->engine->enableProfiling(d->setupParams.logElapsedTime());
+    d->logger.clearWarnings();
+    EvalContextSwitcher evalContextSwitcher(d->engine, EvalContext::PropertyEvaluation);
+
+    // At this point, we cannot set a sensible total effort, because we know nothing about
+    // the project yet. That's why we use a placeholder here, so the user at least
+    // sees that an operation is starting. The real total effort will be set later when
+    // we have enough information.
+    if (ProgressObserver * const observer = d->state.topLevelProject().progressObserver()) {
+        observer->initialize(Tr::tr("Resolving project for configuration %1")
+            .arg(TopLevelProject::deriveId(d->setupParams.finalBuildConfigurationTree())), 1);
+        observer->addScriptEngine(d->engine);
+    }
+
+    const FileTime resolveTime = FileTime::currentTime();
+    TopLevelProjectPtr tlp;
+    try {
+        d->checkOverriddenValues();
+        d->loadTopLevelProjectItem();
+        d->buildProjectTree();
+        tlp = d->resolveTopLevelProject();
+    } catch (const CancelException &) {
+        throw ErrorInfo(Tr::tr("Project resolving canceled for configuration '%1'.")
+                            .arg(TopLevelProject::deriveId(
+                                d->setupParams.finalBuildConfigurationTree())));
+    }
+    tlp->lastStartResolveTime = resolveTime;
+    tlp->lastEndResolveTime = FileTime::currentTime();
+
+    // E.g. if the top-level project is disabled.
+    if (ProgressObserver * const observer = d->state.topLevelProject().progressObserver()) {
+        observer->setFinished();
+        d->printProfilingInfo();
+    }
+    return tlp;
+}
+
+static void makeSubProjectNamesUniqe(const ResolvedProjectPtr &parentProject)
+{
+    Set<QString> subProjectNames;
+    Set<ResolvedProjectPtr> projectsInNeedOfNameChange;
+    for (const ResolvedProjectPtr &p : std::as_const(parentProject->subProjects)) {
+        if (!subProjectNames.insert(p->name).second)
+            projectsInNeedOfNameChange << p;
+        makeSubProjectNamesUniqe(p);
+    }
+    while (!projectsInNeedOfNameChange.empty()) {
+        auto it = projectsInNeedOfNameChange.begin();
+        while (it != projectsInNeedOfNameChange.end()) {
+            const ResolvedProjectPtr p = *it;
+            p->name += QLatin1Char('_');
+            if (subProjectNames.insert(p->name).second) {
+                it = projectsInNeedOfNameChange.erase(it);
+            } else {
+                ++it;
+            }
+        }
+    }
+}
+
+TopLevelProjectPtr ProjectResolver::Private::resolveTopLevelProject()
+{
+    if (ProgressObserver * const observer = state.topLevelProject().progressObserver())
+        observer->setMaximum(state.topLevelProject().productCount());
+    TopLevelProjectPtr project = TopLevelProject::create();
+    project->buildDirectory = TopLevelProject::deriveBuildDirectory(
+        setupParams.buildRoot(),
+        TopLevelProject::deriveId(setupParams.finalBuildConfigurationTree()));
+    if (!state.topLevelProject().projects().empty()) {
+        ProjectContext * const projectContext = state.topLevelProject().projects().front();
+        QBS_CHECK(projectContext->item == rootProjectItem);
+        projectContext->project = project;
+        resolveProject(projectContext);
+    }
+    resolveProducts(state);
+    ErrorInfo accumulatedErrors;
+    {
+        const auto queuedErrors = state.topLevelProject().queuedErrors();
+        for (const ErrorInfo &e : queuedErrors.get())
+            appendError(accumulatedErrors, e);
+    }
+    if (accumulatedErrors.hasError())
+        throw accumulatedErrors;
+
+    project->buildSystemFiles.unite(state.topLevelProject().buildSystemFiles());
+    project->profileConfigs = state.topLevelProject().profileConfigs();
+    project->codeLinks = state.topLevelProject().codeLinks();
+    const QVariantMap &profiles = state.topLevelProject().localProfiles();
+    for (auto it = profiles.begin(); it != profiles.end(); ++it)
+        project->profileConfigs.remove(it.key());
+    project->probes = state.topLevelProject().projectLevelProbes();
+    project->moduleProviderInfo.providers = state.topLevelProject().moduleProvidersCache();
+    project->setBuildConfiguration(setupParams.finalBuildConfigurationTree());
+    project->overriddenValues = setupParams.overriddenValues();
+    state.topLevelProject().collectDataFromEngine(*engine);
+    makeSubProjectNamesUniqe(project);
+    checkForDuplicateProductNames(project);
+    project->warningsEncountered << logger.warnings();
+
+    return project;
+}
+
+void ProjectResolver::Private::resolveProject(ProjectContext *projectContext)
+{
+    state.topLevelProject().checkCancelation();
+
+    if (projectContext->parent) {
+        projectContext->project = ResolvedProject::create();
+        projectContext->parent->project->subProjects.push_back(projectContext->project);
+        projectContext->project->parentProject = projectContext->parent->project;
+        projectContext->project->enabled = projectContext->parent->project->enabled;
+    }
+    projectContext->project->location = projectContext->item->location();
+
+    try {
+        resolveProjectFully(projectContext);
+    } catch (const ErrorInfo &error) {
+        if (!projectContext->project->enabled) {
+            qCDebug(lcProjectResolver) << "error resolving project"
+                                       << projectContext->project->location << error.toString();
+            return;
+        }
+        if (setupParams.productErrorMode() == ErrorHandlingMode::Strict)
+            throw;
+        logger.printWarning(error);
+    }
+}
+
+void ProjectResolver::Private::resolveProjectFully(ProjectContext *projectContext)
+{
+    Item * const item = projectContext->item;
+    projectContext->project->enabled = projectContext->project->enabled
+            && state.evaluator().boolValue(item, StringConstants::conditionProperty());
+    projectContext->project->name = state.evaluator().stringValue(
+                item, StringConstants::nameProperty());
+    if (projectContext->project->name.isEmpty())
+        projectContext->project->name = FileInfo::baseName(item->location().filePath()); // FIXME: Must also be changed in item?
+    QVariantMap projectProperties;
+    if (!projectContext->project->enabled) {
+        projectProperties.insert(StringConstants::profileProperty(),
+                                 state.evaluator().stringValue(
+                                     item, StringConstants::profileProperty()));
+        projectContext->project->setProjectProperties(projectProperties);
+        return;
+    }
+
+    projectContext->dummyModule = ResolvedModule::create();
+
+    for (Item::PropertyDeclarationMap::const_iterator it
+                = item->propertyDeclarations().constBegin();
+            it != item->propertyDeclarations().constEnd(); ++it) {
+        if (it.value().flags().testFlag(PropertyDeclaration::PropertyNotAvailableInConfig))
+            continue;
+        const ValueConstPtr v = item->property(it.key());
+        QBS_ASSERT(v && v->type() != Value::ItemValueType, continue);
+        const ScopedJsValue sv(engine->context(), state.evaluator().value(item, it.key()));
+        projectProperties.insert(it.key(), getJsVariant(engine->context(), sv));
+    }
+    projectContext->project->setProjectProperties(projectProperties);
+
+    for (Item * const child : item->children()) {
+        state.topLevelProject().checkCancelation();
+        try {
+            switch (child->type()) {
+            case ItemType::SubProject:
+                resolveSubProject(child, projectContext);
+                break;
+            case ItemType::FileTagger:
+                resolveFileTagger(state, child, projectContext, nullptr);
+                break;
+            case ItemType::JobLimit:
+                resolveJobLimit(state, child, projectContext, nullptr, nullptr);
+                break;
+            case ItemType::Rule:
+                resolveRule(state, child, projectContext, nullptr, nullptr);
+                break;
+            default:
+                break;
+            }
+        } catch (const ErrorInfo &e) {
+            state.topLevelProject().addQueuedError(e);
+        }
+    }
+
+    for (ProjectContext * const childContext : projectContext->children)
+        resolveProject(childContext);
+}
+
+void ProjectResolver::Private::resolveSubProject(Item *item, ProjectContext *projectContext)
+{
+    // If we added a Project child item in ProductsCollector, then the sub-project will be
+    // resolved normally via resolveProject(). Otherwise, it was not loaded, for instance
+    // because its Properties condition was false, and special handling applies.
+    if (item->child(ItemType::Project))
+        return;
+
+    ResolvedProjectPtr project = ResolvedProject::create();
+    project->enabled = false;
+    project->parentProject = projectContext->project;
+    projectContext->project->subProjects << project;
+    if (Item * const propertiesItem = item->child(ItemType::PropertiesInSubProject)) {
+        project->name = state.evaluator().stringValue(propertiesItem,
+                                                      StringConstants::nameProperty());
+    }
+}
+
+void ProjectResolver::Private::checkOverriddenValues()
+{
+    static const auto matchesPrefix = [](const QString &key) {
+        static const QStringList prefixes({StringConstants::projectPrefix(),
+                                           QStringLiteral("projects"),
+                                           QStringLiteral("products"), QStringLiteral("modules"),
+                                           StringConstants::moduleProviders(),
+                                           StringConstants::qbsModule()});
+        return any_of(prefixes, [&key](const QString &prefix) {
+            return key.startsWith(prefix + QLatin1Char('.')); });
+    };
+    const QVariantMap &overriddenValues = state.parameters().overriddenValues();
+    for (auto it = overriddenValues.begin(); it != overriddenValues.end(); ++it) {
+        if (matchesPrefix(it.key())) {
+            collectNameFromOverride(it.key());
+            continue;
+        }
+
+        ErrorInfo e(Tr::tr("Property override key '%1' not understood.").arg(it.key()));
+        e.append(Tr::tr("Please use one of the following:"));
+        e.append(QLatin1Char('\t') + Tr::tr("projects.<project-name>.<property-name>:value"));
+        e.append(QLatin1Char('\t') + Tr::tr("products.<product-name>.<property-name>:value"));
+        e.append(QLatin1Char('\t') + Tr::tr("modules.<module-name>.<property-name>:value"));
+        e.append(QLatin1Char('\t') + Tr::tr("products.<product-name>.<module-name>."
+                                            "<property-name>:value"));
+        e.append(QLatin1Char('\t') + Tr::tr("moduleProviders.<provider-name>."
+                                            "<property-name>:value"));
+        handlePropertyError(e, state.parameters(), state.logger());
+    }
+}
+
+void ProjectResolver::Private::collectNameFromOverride(const QString &overrideString)
+{
+    const auto extract = [&overrideString](const QString &prefix) {
+        if (!overrideString.startsWith(prefix))
+            return QString();
+        const int startPos = prefix.length();
+        const int endPos = overrideString.lastIndexOf(StringConstants::dot());
+        if (endPos == -1)
+            return QString();
+        return overrideString.mid(startPos, endPos - startPos);
+    };
+    const QString &projectName = extract(StringConstants::projectsOverridePrefix());
+    if (!projectName.isEmpty()) {
+        state.topLevelProject().addProjectNameUsedInOverrides(projectName);
+        return;
+    }
+    const QString &productName = extract(StringConstants::productsOverridePrefix());
+    if (!productName.isEmpty()) {
+        state.topLevelProject().addProductNameUsedInOverrides(productName.left(
+            productName.indexOf(StringConstants::dot())));
+        return;
+    }
+}
+
+void ProjectResolver::Private::loadTopLevelProjectItem()
+{
+    const QStringList topLevelSearchPaths
+            = state.parameters().finalBuildConfigurationTree()
+              .value(StringConstants::projectPrefix()).toMap()
+              .value(StringConstants::qbsSearchPathsProperty()).toStringList();
+    SearchPathsManager searchPathsManager(state.itemReader(), topLevelSearchPaths);
+    Item * const root = state.itemReader().setupItemFromFile(
+                state.parameters().projectFilePath(), {});
+    if (!root)
+        return;
+
+    switch (root->type()) {
+    case ItemType::Product:
+        rootProjectItem = state.itemReader().wrapInProjectIfNecessary(root);
+        break;
+    case ItemType::Project:
+        rootProjectItem = root;
+        break;
+    default:
+        throw ErrorInfo(Tr::tr("The top-level item must be of type 'Project' or 'Product', but it"
+                               " is of type '%1'.").arg(root->typeName()), root->location());
+    }
+}
+
+void ProjectResolver::Private::buildProjectTree()
+{
+    state.topLevelProject().setBuildDirectory(TopLevelProject::deriveBuildDirectory(
+                state.parameters().buildRoot(),
+                TopLevelProject::deriveId(state.parameters().finalBuildConfigurationTree())));
+    rootProjectItem->setProperty(StringConstants::sourceDirectoryProperty(),
+                                 VariantValue::create(QFileInfo(rootProjectItem->file()->filePath())
+                                                      .absolutePath()));
+    rootProjectItem->setProperty(StringConstants::buildDirectoryProperty(),
+                                 VariantValue::create(state.topLevelProject().buildDirectory()));
+    rootProjectItem->setProperty(StringConstants::profileProperty(),
+                                 VariantValue::create(state.parameters().topLevelProfile()));
+    ProductsCollector(state).run(rootProjectItem);
+
+    AccumulatingTimer timer(state.parameters().logElapsedTime()
+                            ? &state.topLevelProject().timingData().propertyChecking : nullptr);
+    checkPropertyDeclarations(rootProjectItem, state);
+}
+
+void ProjectResolver::Private::printProfilingInfo()
+{
+    if (!setupParams.logElapsedTime())
+        return;
+    const auto print = [this](int indent, const QString &pattern, qint64 time) {
+        logger.qbsLog(LoggerInfo, true) << QByteArray(indent, ' ')
+                                        << pattern.arg(elapsedTimeString(time));
+    };
+    print(2, Tr::tr("Project file loading and parsing took %1."), state.itemReader().elapsedTime());
+    print(2, Tr::tr("Preparing products took %1."),
+          state.topLevelProject().timingData().preparingProducts);
+    print(2, Tr::tr("Setting up Groups took %1."),
+          state.topLevelProject().timingData().groupsSetup);
+    print(2, Tr::tr("Scheduling products took %1."),
+          state.topLevelProject().timingData().schedulingProducts);
+    print(2, Tr::tr("Resolving products took %1."),
+          state.topLevelProject().timingData().resolvingProducts);
+    print(4, Tr::tr("Property evaluation took %1."),
+          state.topLevelProject().timingData().propertyEvaluation);
+    print(4, Tr::tr("Resolving groups (without module property evaluation) took %1."),
+          state.topLevelProject().timingData().groupsResolving);
+    print(4, Tr::tr("Setting up product dependencies took %1."),
+          state.topLevelProject().timingData().dependenciesResolving);
+    print(6, Tr::tr("Running module providers took %1."),
+          state.topLevelProject().timingData().moduleProviders);
+    print(6, Tr::tr("Instantiating modules took %1."),
+          state.topLevelProject().timingData().moduleInstantiation);
+    print(6, Tr::tr("Merging module property values took %1."),
+          state.topLevelProject().timingData().propertyMerging);
+    logger.qbsLog(LoggerInfo, true) << QByteArray(4, ' ') << "There were "
+                                    << state.topLevelProject().productDeferrals()
+                                    << " product deferrals with a total of "
+                                    << state.topLevelProject().productCount() << " products.";
+    print(2, Tr::tr("Running Probes took %1."), state.topLevelProject().timingData().probes);
+    state.logger().qbsLog(LoggerInfo, true)
+        << "    "
+        << Tr::tr("%1 probes encountered, %2 configure scripts executed, "
+                  "%3 re-used from current run, %4 re-used from earlier run.")
+           .arg(state.topLevelProject().probesEncounteredCount())
+           .arg(state.topLevelProject().probesRunCount())
+           .arg(state.topLevelProject().reusedCurrentProbesCount())
+           .arg(state.topLevelProject().reusedOldProbesCount());
+    print(2, Tr::tr("Property checking took %1."),
+          state.topLevelProject().timingData().propertyChecking);
+}
+
+} // namespace Internal
+} // namespace qbs
diff --git a/src/lib/corelib/language/loader.h b/src/lib/corelib/loader/projectresolver.h
index 2c8b08446..22ad82518 100644
--- a/src/lib/corelib/language/loader.h
+++ b/src/lib/corelib/loader/projectresolver.h
@@ -36,53 +36,49 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef  QBS_LOADER_H
-#define  QBS_LOADER_H
 
-#include "forward_decls.h"
-#include "moduleproviderinfo.h"
+#ifndef PROJECTRESOLVER_H
+#define PROJECTRESOLVER_H
+
+#include <language/forward_decls.h>
 #include <logging/logger.h>
-#include <tools/filetime.h>
+#include <tools/pimpl.h>
+#include <tools/qbs_export.h>
+
+#include <QHash>
+#include <QVariant>
 
-#include <QtCore/qstringlist.h>
+#include <vector>
 
 namespace qbs {
-class Settings;
 class SetupProjectParameters;
 namespace Internal {
+class FileTime;
 class Logger;
 class ProgressObserver;
 class ScriptEngine;
+class StoredModuleProviderInfo;
 
-class QBS_AUTOTEST_EXPORT Loader
+class QBS_AUTOTEST_EXPORT ProjectResolver
 {
 public:
-    Loader(ScriptEngine *engine, Logger logger);
+    ProjectResolver(const SetupProjectParameters &parameters, ScriptEngine *engine, Logger logger);
+    ~ProjectResolver();
 
     void setProgressObserver(ProgressObserver *observer);
-    void setSearchPaths(const QStringList &searchPaths);
     void setOldProjectProbes(const std::vector<ProbeConstPtr> &oldProbes);
     void setOldProductProbes(const QHash<QString, std::vector<ProbeConstPtr>> &oldProbes);
-    void setLastResolveTime(const FileTime &time) { m_lastResolveTime = time; }
+    void setLastResolveTime(const FileTime &time);
     void setStoredProfiles(const QVariantMap &profiles);
     void setStoredModuleProviderInfo(const StoredModuleProviderInfo &providerInfo);
-    TopLevelProjectPtr loadProject(const SetupProjectParameters &parameters);
-
-    static void setupProjectFilePath(SetupProjectParameters &parameters);
+    TopLevelProjectPtr resolve();
 
 private:
-    Logger m_logger;
-    ProgressObserver *m_progressObserver;
-    ScriptEngine * const m_engine;
-    QStringList m_searchPaths;
-    std::vector<ProbeConstPtr> m_oldProjectProbes;
-    QHash<QString, std::vector<ProbeConstPtr>> m_oldProductProbes;
-    StoredModuleProviderInfo m_storedModuleProviderInfo;
-    QVariantMap m_storedProfiles;
-    FileTime m_lastResolveTime;
+    class Private;
+    Pimpl<Private> d;
 };
 
 } // namespace Internal
 } // namespace qbs
 
-#endif // QBS_LOADER_H
+#endif // PROJECTRESOLVER_H
diff --git a/src/lib/corelib/logging/categories.cpp b/src/lib/corelib/logging/categories.cpp
index 0f844f5b4..5738dc21d 100644
--- a/src/lib/corelib/logging/categories.cpp
+++ b/src/lib/corelib/logging/categories.cpp
@@ -50,6 +50,7 @@ Q_LOGGING_CATEGORY(lcModuleLoader, "qbs.moduleloader", QtCriticalMsg)
 Q_LOGGING_CATEGORY(lcPluginManager, "qbs.pluginmanager", QtCriticalMsg)
 Q_LOGGING_CATEGORY(lcProjectResolver, "qbs.projectresolver", QtCriticalMsg)
 Q_LOGGING_CATEGORY(lcUpToDateCheck, "qbs.uptodate", QtCriticalMsg)
+Q_LOGGING_CATEGORY(lcLoaderScheduling, "qbs.loader.scheduling", QtCriticalMsg)
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/logging/categories.h b/src/lib/corelib/logging/categories.h
index 40c69845e..c8873c30c 100644
--- a/src/lib/corelib/logging/categories.h
+++ b/src/lib/corelib/logging/categories.h
@@ -53,6 +53,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcModuleLoader)
 Q_DECLARE_LOGGING_CATEGORY(lcPluginManager)
 Q_DECLARE_LOGGING_CATEGORY(lcProjectResolver)
 Q_DECLARE_LOGGING_CATEGORY(lcUpToDateCheck)
+Q_DECLARE_LOGGING_CATEGORY(lcLoaderScheduling)
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp
index d4020892f..65d0cc27f 100644
--- a/src/lib/corelib/logging/logger.cpp
+++ b/src/lib/corelib/logging/logger.cpp
@@ -79,6 +79,9 @@ LogWriter::~LogWriter()
 
 const LogWriter &LogWriter::operator=(const LogWriter &other)
 {
+    if (this == &other) // Self assignment guard.
+        return *this;
+
     m_logSink = other.m_logSink;
     m_level = other.m_level;
     m_message = other.m_message;
@@ -228,7 +231,7 @@ void Logger::printWarning(const ErrorInfo &warning)
 
 LogWriter Logger::qbsLog(LoggerLevel level, bool force) const
 {
-    return LogWriter(m_logSink, level, force);
+    return {m_logSink, level, force};
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/logging/logging.pri b/src/lib/corelib/logging/logging.pri
deleted file mode 100644
index 3a4379a9a..000000000
--- a/src/lib/corelib/logging/logging.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-include(../../../install_prefix.pri)
-
-HEADERS += \
-    $$PWD/categories.h \
-    $$PWD/logger.h \
-    $$PWD/translator.h \
-    $$PWD/ilogsink.h
-
-SOURCES += \
-    $$PWD/categories.cpp \
-    $$PWD/logger.cpp \
-    $$PWD/ilogsink.cpp
-
-!qbs_no_dev_install {
-    logging_headers.files = $$PWD/ilogsink.h
-    logging_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/logging
-    INSTALLS += logging_headers
-}
diff --git a/src/lib/corelib/parser/parser.pri b/src/lib/corelib/parser/parser.pri
deleted file mode 100644
index e6a8a5345..000000000
--- a/src/lib/corelib/parser/parser.pri
+++ /dev/null
@@ -1,21 +0,0 @@
-HEADERS += \
-    $$PWD/qmljsast_p.h \
-    $$PWD/qmljsastfwd_p.h \
-    $$PWD/qmljsastvisitor_p.h \
-    $$PWD/qmljsengine_p.h \
-    $$PWD/qmljsgrammar_p.h \
-    $$PWD/qmljslexer_p.h \
-    $$PWD/qmljsmemorypool_p.h \
-    $$PWD/qmljsparser_p.h \
-    $$PWD/qmljsglobal_p.h \
-    $$PWD/qmlerror.h \
-    $$PWD/qmljskeywords_p.h \
-
-SOURCES += \
-    $$PWD/qmljsast.cpp \
-    $$PWD/qmljsastvisitor.cpp \
-    $$PWD/qmljsengine_p.cpp \
-    $$PWD/qmljsgrammar.cpp \
-    $$PWD/qmljslexer.cpp \
-    $$PWD/qmljsparser.cpp \
-    $$PWD/qmlerror.cpp \
diff --git a/src/lib/corelib/parser/qmlerror.cpp b/src/lib/corelib/parser/qmlerror.cpp
index 8a8118290..42ef8ea29 100644
--- a/src/lib/corelib/parser/qmlerror.cpp
+++ b/src/lib/corelib/parser/qmlerror.cpp
@@ -95,16 +95,12 @@ QmlErrorPrivate::QmlErrorPrivate()
 /*!
     Creates an empty error object.
 */
-QmlError::QmlError()
-: d(nullptr)
-{
-}
+QmlError::QmlError() = default;
 
 /*!
     Creates a copy of \a other.
 */
 QmlError::QmlError(const QmlError &other)
-: d(nullptr)
 {
     *this = other;
 }
@@ -114,11 +110,13 @@ QmlError::QmlError(const QmlError &other)
 */
 QmlError &QmlError::operator=(const QmlError &other)
 {
+    if (this == &other) // Self assignment guard.
+        return *this;
+
     if (!other.d) {
-        delete d;
         d = nullptr;
     } else {
-        if (!d) d = new QmlErrorPrivate;
+        if (!d) d = qbs::Internal::makePimpl<QmlErrorPrivate>();
         d->url = other.d->url;
         d->description = other.d->description;
         d->line = other.d->line;
@@ -130,10 +128,7 @@ QmlError &QmlError::operator=(const QmlError &other)
 /*!
     \internal
 */
-QmlError::~QmlError()
-{
-    delete d; d = nullptr;
-}
+QmlError::~QmlError() = default;
 
 /*!
     Returns true if this error is valid, otherwise false.
@@ -149,7 +144,7 @@ bool QmlError::isValid() const
 QUrl QmlError::url() const
 {
     if (d) return d->url;
-    else return {};
+    return {};
 }
 
 /*!
@@ -157,7 +152,7 @@ QUrl QmlError::url() const
 */
 void QmlError::setUrl(const QUrl &url)
 {
-    if (!d) d = new QmlErrorPrivate;
+    if (!d) d = qbs::Internal::makePimpl<QmlErrorPrivate>();
     d->url = url;
 }
 
@@ -167,7 +162,7 @@ void QmlError::setUrl(const QUrl &url)
 QString QmlError::description() const
 {
     if (d) return d->description;
-    else return {};
+    return {};
 }
 
 /*!
@@ -175,7 +170,7 @@ QString QmlError::description() const
 */
 void QmlError::setDescription(const QString &description)
 {
-    if (!d) d = new QmlErrorPrivate;
+    if (!d) d = qbs::Internal::makePimpl<QmlErrorPrivate>();
     d->description = description;
 }
 
@@ -185,7 +180,7 @@ void QmlError::setDescription(const QString &description)
 int QmlError::line() const
 {
     if (d) return d->line;
-    else return -1;
+    return -1;
 }
 
 /*!
@@ -193,7 +188,7 @@ int QmlError::line() const
 */
 void QmlError::setLine(int line)
 {
-    if (!d) d = new QmlErrorPrivate;
+    if (!d) qbs::Internal::makePimpl<QmlErrorPrivate>();
     d->line = line;
 }
 
@@ -203,7 +198,7 @@ void QmlError::setLine(int line)
 int QmlError::column() const
 {
     if (d) return d->column;
-    else return -1;
+    return -1;
 }
 
 /*!
@@ -211,7 +206,7 @@ int QmlError::column() const
 */
 void QmlError::setColumn(int column)
 {
-    if (!d) d = new QmlErrorPrivate;
+    if (!d) qbs::Internal::makePimpl<QmlErrorPrivate>();
     d->column = column;
 }
 
diff --git a/src/lib/corelib/parser/qmlerror.h b/src/lib/corelib/parser/qmlerror.h
index cfac506bb..4f7bf8a07 100644
--- a/src/lib/corelib/parser/qmlerror.h
+++ b/src/lib/corelib/parser/qmlerror.h
@@ -40,7 +40,7 @@
 #ifndef QQMLERROR_H
 #define QQMLERROR_H
 
-
+#include <tools/pimpl.h>
 
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
@@ -73,7 +73,7 @@ public:
 
     QString toString() const;
 private:
-    QmlErrorPrivate *d;
+    qbs::Internal::Pimpl<QmlErrorPrivate> d;
 };
 
 } // namespace QbsQmlJS
diff --git a/src/lib/corelib/parser/qmljsastvisitor_p.h b/src/lib/corelib/parser/qmljsastvisitor_p.h
index bec174c65..4b7911aa4 100644
--- a/src/lib/corelib/parser/qmljsastvisitor_p.h
+++ b/src/lib/corelib/parser/qmljsastvisitor_p.h
@@ -58,7 +58,7 @@
 namespace QbsQmlJS {
 namespace AST {
 
-class QBS_AUTOTEST_EXPORT Visitor
+class QML_PARSER_EXPORT Visitor
 {
 public:
     Visitor();
diff --git a/src/lib/corelib/parser/qmljsengine_p.cpp b/src/lib/corelib/parser/qmljsengine_p.cpp
index 11bf8a3f3..67da09825 100644
--- a/src/lib/corelib/parser/qmljsengine_p.cpp
+++ b/src/lib/corelib/parser/qmljsengine_p.cpp
@@ -50,9 +50,9 @@ static int toDigit(char c)
 {
     if ((c >= '0') && (c <= '9'))
         return c - '0';
-    else if ((c >= 'a') && (c <= 'z'))
+    if ((c >= 'a') && (c <= 'z'))
         return 10 + c - 'a';
-    else if ((c >= 'A') && (c <= 'Z'))
+    if ((c >= 'A') && (c <= 'Z'))
         return 10 + c - 'A';
     return -1;
 }
diff --git a/src/lib/corelib/parser/qmljsengine_p.h b/src/lib/corelib/parser/qmljsengine_p.h
index 2a616126d..9c603ee5c 100644
--- a/src/lib/corelib/parser/qmljsengine_p.h
+++ b/src/lib/corelib/parser/qmljsengine_p.h
@@ -93,7 +93,7 @@ public:
     QString message;
 };
 
-class QBS_AUTOTEST_EXPORT Engine
+class QML_PARSER_EXPORT Engine
 {
     Lexer *_lexer{nullptr};
     Directives *_directives{nullptr};
diff --git a/src/lib/corelib/parser/qmljsglobal_p.h b/src/lib/corelib/parser/qmljsglobal_p.h
index c3d198ea5..02e0b38e4 100644
--- a/src/lib/corelib/parser/qmljsglobal_p.h
+++ b/src/lib/corelib/parser/qmljsglobal_p.h
@@ -41,31 +41,14 @@
 
 #include <QtCore/qglobal.h>
 
-// Force QML_PARSER_EXPORT to be always empty.
-#ifndef QT_CREATOR
-#   define QT_CREATOR
-#endif
-#ifdef QML_BUILD_STATIC_LIB
-#   undef QML_BUILD_STATIC_LIB
-#endif
-#define QML_BUILD_STATIC_LIB 1
-
-#ifdef QT_CREATOR
-#  ifdef QMLJS_BUILD_DIR
-#    define QML_PARSER_EXPORT Q_DECL_EXPORT
-#  elif QML_BUILD_STATIC_LIB
-#    define QML_PARSER_EXPORT
-#  else
-#    define QML_PARSER_EXPORT Q_DECL_IMPORT
-#  endif // QMLJS_BUILD_DIR
-
-#else // !QT_CREATOR
-#  if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
-     // QmlDevTools is a static library
-#    define QML_PARSER_EXPORT
-#  else
-#    define QML_PARSER_EXPORT Q_AUTOTEST_EXPORT
-#  endif
-#endif // QT_CREATOR
+#ifdef QBS_STATIC_LIB
+#define QML_PARSER_EXPORT
+#else
+#ifdef QBS_LIBRARY
+#define QML_PARSER_EXPORT Q_DECL_EXPORT
+#else
+#define QML_PARSER_EXPORT Q_DECL_IMPORT
+#endif // QBS_LIBRARY
+#endif // QBS_STATIC_LIB
 
 #endif // QMLJSGLOBAL_P_H
diff --git a/src/lib/corelib/parser/qmljslexer.cpp b/src/lib/corelib/parser/qmljslexer.cpp
index db3004fc8..e148652ad 100644
--- a/src/lib/corelib/parser/qmljslexer.cpp
+++ b/src/lib/corelib/parser/qmljslexer.cpp
@@ -69,10 +69,9 @@ static unsigned char convertHex(ushort c)
 {
     if (c >= '0' && c <= '9')
         return (c - '0');
-    else if (c >= 'a' && c <= 'f')
+    if (c >= 'a' && c <= 'f')
         return (c - 'a' + 10);
-    else
-        return (c - 'A' + 10);
+    return (c - 'A' + 10);
 }
 
 static QChar convertHex(QChar c1, QChar c2)
@@ -297,10 +296,9 @@ again:
                 _tokenLine = _currentLineNumber;
                 _tokenStartPtr = _codePtr - 1; // ### TODO: insert it before the optional \r sequence.
                 return T_SEMICOLON;
-            } else {
-                _terminator = true;
-                syncProhibitAutomaticSemicolon();
             }
+            _terminator = true;
+            syncProhibitAutomaticSemicolon();
         }
 
         scanChar();
@@ -352,7 +350,8 @@ again:
                     return T_GT_GT_GT_EQ;
                 }
                 return T_GT_GT_GT;
-            } else if (_char == QLatin1Char('=')) {
+            }
+            if (_char == QLatin1Char('=')) {
                 scanChar();
                 return T_GT_GT_EQ;
             }
@@ -556,7 +555,8 @@ again:
             while (!_char.isNull()) {
                 if (_char == QLatin1Char('\n') || _char == QLatin1Char('\\')) {
                     break;
-                } else if (_char == quote) {
+                }
+                if (_char == quote) {
                     _tokenSpell = _engine->midRef(
                                 int(startCode - _code.unicode() - 1), int(_codePtr - startCode));
                     scanChar();
@@ -920,7 +920,7 @@ bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
             while (! _char.isNull() && ! isLineTerminator()) {
                 if (_char == QLatin1Char(']'))
                     break;
-                else if (_char == QLatin1Char('\\')) {
+                if (_char == QLatin1Char('\\')) {
                     // regular expression backslash sequence
                     _tokenText += _char;
                     scanChar();
@@ -1071,7 +1071,7 @@ bool Lexer::scanDirectives(Directives *directives)
 
         const int lineNumber = tokenStartLine();
 
-        if (! (_tokenKind == T_IDENTIFIER || _tokenKind == T_RESERVED_WORD))
+        if (_tokenKind != T_IDENTIFIER && _tokenKind != T_RESERVED_WORD)
             return false; // expected a valid QML/JS directive
 
         const QString directiveName = tokenText();
@@ -1083,7 +1083,7 @@ bool Lexer::scanDirectives(Directives *directives)
         // it must be a pragma or an import directive.
         if (directiveName == QLatin1String("pragma")) {
             // .pragma library
-            if (! (lex() == T_IDENTIFIER && tokenText() == QLatin1String("library")))
+            if (lex() != T_IDENTIFIER || tokenText() != QLatin1String("library"))
                 return false; // expected `library
 
             // we found a .pragma library directive
@@ -1126,7 +1126,7 @@ bool Lexer::scanDirectives(Directives *directives)
             //
             // recognize the mandatory `as' followed by the module name
             //
-            if (! (lex() == T_RESERVED_WORD && tokenText() == QLatin1String("as")))
+            if (lex() != T_RESERVED_WORD || tokenText() != QLatin1String("as"))
                 return false; // expected `as'
 
             if (lex() != T_IDENTIFIER)
diff --git a/src/lib/corelib/parser/qmljslexer_p.h b/src/lib/corelib/parser/qmljslexer_p.h
index aef68e0c5..c9801c0f5 100644
--- a/src/lib/corelib/parser/qmljslexer_p.h
+++ b/src/lib/corelib/parser/qmljslexer_p.h
@@ -86,7 +86,7 @@ public:
     }
 };
 
-class QBS_AUTOTEST_EXPORT Lexer: public QmlJSGrammar
+class QML_PARSER_EXPORT Lexer : public QmlJSGrammar
 {
 public:
     enum {
diff --git a/src/lib/corelib/parser/qmljsparser_p.h b/src/lib/corelib/parser/qmljsparser_p.h
index c761bb25b..9744a7eb6 100644
--- a/src/lib/corelib/parser/qmljsparser_p.h
+++ b/src/lib/corelib/parser/qmljsparser_p.h
@@ -70,7 +70,7 @@ namespace QbsQmlJS {
 
 class Engine;
 
-class QBS_AUTOTEST_EXPORT Parser: protected QmlJSGrammar
+class QML_PARSER_EXPORT Parser : protected QmlJSGrammar
 {
 public:
     union Value {
diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp
index feae266bf..de74e9206 100644
--- a/src/lib/corelib/tools/applecodesignutils.cpp
+++ b/src/lib/corelib/tools/applecodesignutils.cpp
@@ -95,12 +95,12 @@ QVariantMap certificateInfo(const QByteArray &data)
             map.insert(QString::fromUtf8(attr), cert.subjectInfo(attr).front());
         return map;
     };
-
+    const auto sha1 = QString::fromLatin1(cert.digest(QCryptographicHash::Sha1).toHex().toUpper());
     return {
-        {QStringLiteral("SHA1"), cert.digest(QCryptographicHash::Sha1).toHex().toUpper()},
+        {QStringLiteral("SHA1"), sha1},
         {QStringLiteral("subjectInfo"), subjectInfo(cert)},
-        {QStringLiteral("validBefore"), cert.effectiveDate()},
-        {QStringLiteral("validAfter"), cert.expiryDate()}
+        {QStringLiteral("validAfter"), cert.effectiveDate()},
+        {QStringLiteral("validBefore"), cert.expiryDate()}
     };
 }
 
diff --git a/src/lib/corelib/tools/architectures.cpp b/src/lib/corelib/tools/architectures.cpp
index cf9fec27b..f139509e4 100644
--- a/src/lib/corelib/tools/architectures.cpp
+++ b/src/lib/corelib/tools/architectures.cpp
@@ -55,7 +55,7 @@ QString canonicalTargetArchitecture(const QString &architecture,
                                     const QString &system,
                                     const QString &abi)
 {
-    const QString arch = canonicalArchitecture(architecture);
+    QString arch = canonicalArchitecture(architecture);
     const bool isApple = (vendor == QStringLiteral("apple")
                           || system == QStringLiteral("darwin")
                           || system == QStringLiteral("macosx")
diff --git a/src/lib/corelib/tools/buildoptions.cpp b/src/lib/corelib/tools/buildoptions.cpp
index e4e9ba17f..cc3ef7557 100644
--- a/src/lib/corelib/tools/buildoptions.cpp
+++ b/src/lib/corelib/tools/buildoptions.cpp
@@ -413,8 +413,8 @@ template<> JobLimits fromJson(const QJsonValue &limitsData)
 {
     JobLimits limits;
     const QJsonArray &limitsArray = limitsData.toArray();
-    for (const QJsonValue &v : limitsArray) {
-        const QJsonObject limitData = v.toObject();
+    for (const auto &value : limitsArray) {
+        const QJsonObject limitData = value.toObject();
         QString pool;
         int limit = 0;
         setValueFromJson(pool, limitData, "pool");
diff --git a/src/lib/corelib/tools/clangclinfo.cpp b/src/lib/corelib/tools/clangclinfo.cpp
index 0090b8f2c..fd907ebf1 100644
--- a/src/lib/corelib/tools/clangclinfo.cpp
+++ b/src/lib/corelib/tools/clangclinfo.cpp
@@ -47,10 +47,9 @@ static std::vector<MSVCInstallInfo> compatibleMsvcs(Logger &logger)
             return true;
         bool ok = false;
         const int major = versions.at(0).toInt(&ok);
-        return !(ok && major >= 15); // support MSVC2017 and above
+        return !ok || major < 15; // support MSVC2017 and above
     };
-    const auto it = std::remove_if(msvcs.begin(), msvcs.end(), filter);
-    msvcs.erase(it, msvcs.end());
+    Internal::removeIf(msvcs, filter);
     for (const auto &msvc: msvcs) {
         auto vcvarsallPath = msvc.findVcvarsallBat();
         if (vcvarsallPath.isEmpty())
@@ -62,7 +61,7 @@ static std::vector<MSVCInstallInfo> compatibleMsvcs(Logger &logger)
 static QString findCompatibleVcsarsallBat(const std::vector<MSVCInstallInfo> &msvcs)
 {
     for (const auto &msvc: msvcs) {
-        const auto vcvarsallPath = msvc.findVcvarsallBat();
+        auto vcvarsallPath = msvc.findVcvarsallBat();
         if (!vcvarsallPath.isEmpty())
             return vcvarsallPath;
     }
@@ -122,7 +121,7 @@ std::vector<ClangClInfo> ClangClInfo::installedCompilers(
     if (registry.contains(key)) {
         const auto compilerPath = QDir::fromNativeSeparators(registry.value(key).toString())
                 + QStringLiteral("/bin/") + compilerName;
-        if (QFileInfo(compilerPath).exists())
+        if (QFileInfo::exists(compilerPath) && !contains(compilerPaths, compilerPath))
             compilerPaths.push_back(compilerPath);
     }
 
@@ -133,7 +132,7 @@ std::vector<ClangClInfo> ClangClInfo::installedCompilers(
         const auto value
                 = QDir::fromNativeSeparators(QString::fromLocal8Bit(qgetenv(envVar)));
         const auto compilerPath = value + QStringLiteral("/LLVM/bin/") + compilerName;
-        if (QFileInfo(compilerPath).exists() && !contains(compilerPaths, compilerPath))
+        if (QFileInfo::exists(compilerPath) && !contains(compilerPaths, compilerPath))
             compilerPaths.push_back(compilerPath);
     }
 
@@ -148,15 +147,14 @@ std::vector<ClangClInfo> ClangClInfo::installedCompilers(
 
     std::vector<ClangClInfo> result;
     result.reserve(compilerPaths.size() + msvcs.size());
-
-    for (const auto &path: compilerPaths)
-        result.push_back({getToolchainInstallPath(QFileInfo(path)), vcvarsallPath});
+    transform(compilerPaths, result, [&vcvarsallPath](const auto &path) {
+        return ClangClInfo{getToolchainInstallPath(QFileInfo(path)), vcvarsallPath}; });
 
     // If we didn't find custom LLVM installation, try to find if it's installed with Visual Studio
     for (const auto &msvc : msvcs) {
         const auto compilerPath = QStringLiteral("%1/VC/Tools/Llvm/bin/%2")
                 .arg(msvc.installDir, compilerName);
-        if (QFileInfo(compilerPath).exists()) {
+        if (QFileInfo::exists(compilerPath)) {
             const auto vcvarsallPath = msvc.findVcvarsallBat();
             if (vcvarsallPath.isEmpty()) {
                 logger.qbsWarning()
diff --git a/src/lib/corelib/tools/codelocation.cpp b/src/lib/corelib/tools/codelocation.cpp
index ebfd5edc6..f04041e14 100644
--- a/src/lib/corelib/tools/codelocation.cpp
+++ b/src/lib/corelib/tools/codelocation.cpp
@@ -87,8 +87,9 @@ CodeLocation::CodeLocation(const QString &aFilePath, int aLine, int aColumn, boo
 }
 
 CodeLocation::CodeLocation(const CodeLocation &other) = default;
-
+CodeLocation::CodeLocation(CodeLocation &&other) noexcept = default;
 CodeLocation &CodeLocation::operator=(const CodeLocation &other) = default;
+CodeLocation &CodeLocation::operator=(CodeLocation &&other) noexcept = default;
 
 CodeLocation::~CodeLocation() = default;
 
@@ -181,4 +182,44 @@ bool operator<(const CodeLocation &cl1, const CodeLocation &cl2)
     return cl1.toString() < cl2.toString();
 }
 
+void CodePosition::load(Internal::PersistentPool &pool) { pool.load(m_line, m_column); }
+void CodePosition::store(Internal::PersistentPool &pool) const { pool.store(m_line, m_column); }
+
+bool operator==(const CodePosition &pos1, const CodePosition &pos2)
+{
+    return pos1.line() == pos2.line() && pos1.column() == pos2.column();
+}
+bool operator!=(const CodePosition &pos1, const CodePosition &pos2) { return !(pos1 == pos2); }
+
+bool operator<(const CodePosition &pos1, const CodePosition &pos2)
+{
+    const int lineDiff = pos1.line() - pos2.line();
+    if (lineDiff < 0)
+        return true;
+    if (lineDiff > 0)
+        return false;
+    return pos1.column() < pos2.column();
+}
+bool operator>(const CodePosition &pos1, const CodePosition &pos2) { return pos2 < pos1; }
+bool operator<=(const CodePosition &pos1, const CodePosition &pos2) { return !(pos1 > pos2); }
+bool operator>=(const CodePosition &pos1, const CodePosition &pos2) { return !(pos1 < pos2); }
+
+CodeRange::CodeRange(const CodePosition &start, const CodePosition &end)
+    : m_start(start), m_end(end) {}
+
+void CodeRange::load(Internal::PersistentPool &pool) { pool.load(m_start, m_end); }
+void CodeRange::store(Internal::PersistentPool &pool) const { pool.store(m_start, m_end); }
+
+bool CodeRange::contains(const CodePosition &pos) const
+{
+    return start() <= pos && end() > pos;
+}
+
+bool operator==(const CodeRange &r1, const CodeRange &r2)
+{
+    return r1.start() == r2.start() && r1.end() == r2.end();
+}
+bool operator!=(const CodeRange &r1, const CodeRange &r2) { return !(r1 == r2); }
+bool operator<(const CodeRange &r1, const CodeRange &r2) { return r1.start() < r2.start(); }
+
 } // namespace qbs
diff --git a/src/lib/corelib/tools/codelocation.h b/src/lib/corelib/tools/codelocation.h
index 3e84ce2d1..afcd2e075 100644
--- a/src/lib/corelib/tools/codelocation.h
+++ b/src/lib/corelib/tools/codelocation.h
@@ -62,7 +62,9 @@ public:
     explicit CodeLocation(const QString &aFilePath, int aLine = -1, int aColumn = -1,
                           bool checkPath = true);
     CodeLocation(const CodeLocation &other);
+    CodeLocation(CodeLocation &&other) noexcept;
     CodeLocation &operator=(const CodeLocation &other);
+    CodeLocation &operator=(CodeLocation &&other) noexcept;
     ~CodeLocation();
 
     QString filePath() const;
@@ -84,10 +86,78 @@ private:
 QBS_EXPORT bool operator==(const CodeLocation &cl1, const CodeLocation &cl2);
 QBS_EXPORT bool operator!=(const CodeLocation &cl1, const CodeLocation &cl2);
 QBS_EXPORT bool operator<(const CodeLocation &cl1, const CodeLocation &cl2);
+inline auto qHash(const CodeLocation &cl) { return qHash(cl.toString()); }
+QDebug operator<<(QDebug debug, const CodeLocation &location);
 
-inline uint qHash(const CodeLocation &cl) { return qHash(cl.toString()); }
+class QBS_EXPORT CodePosition
+{
+public:
+    CodePosition(int line, int column) : m_line(line), m_column(column) {}
 
-QDebug operator<<(QDebug debug, const CodeLocation &location);
+    CodePosition() = default;
+    CodePosition(const CodePosition &other) = default;
+    CodePosition(CodePosition &&other) = default;
+    CodePosition &operator=(const CodePosition &other) = default;
+    CodePosition &operator=(CodePosition &&other) = default;
+
+    int line() const { return m_line; }
+    void setLine(int newLine) { m_line = newLine; }
+
+    int column() const { return m_column; }
+    void setColumn(int newColumn) { m_column = newColumn; }
+
+    void load(Internal::PersistentPool &pool);
+    void store(Internal::PersistentPool &pool) const;
+
+private:
+    int m_line = 0;
+    int m_column = 0;
+};
+
+QBS_EXPORT bool operator==(const CodePosition &pos1, const CodePosition &pos2);
+QBS_EXPORT bool operator!=(const CodePosition &pos1, const CodePosition &pos2);
+QBS_EXPORT bool operator<(const CodePosition &pos1, const CodePosition &pos2);
+QBS_EXPORT bool operator>(const CodePosition &pos1, const CodePosition &pos2);
+QBS_EXPORT bool operator<=(const CodePosition &pos1, const CodePosition &pos2);
+QBS_EXPORT bool operator>=(const CodePosition &pos1, const CodePosition &pos2);
+inline auto qHash(const CodePosition &pos)
+{
+    return QT_PREPEND_NAMESPACE(qHash)(pos.line()) ^ QT_PREPEND_NAMESPACE(qHash)(pos.column());
+}
+
+class QBS_EXPORT CodeRange
+{
+public:
+    CodeRange(const CodePosition &start, const CodePosition &end);
+
+    CodeRange() = default;
+    CodeRange(const CodeRange &other) = default;
+    CodeRange(CodeRange &&other) = default;
+    CodeRange &operator=(const CodeRange &other) = default;
+    CodeRange &operator=(CodeRange &&other) = default;
+
+    const CodePosition &start() const & { return m_start; }
+    const CodePosition &end() const & { return m_end; }
+    CodePosition start() && { return std::move(m_start); }
+    CodePosition end() && { return std::move(m_end); }
+
+    bool contains(const CodePosition &pos) const;
+
+    void load(Internal::PersistentPool &pool);
+    void store(Internal::PersistentPool &pool) const;
+
+private:
+    CodePosition m_start;
+    CodePosition m_end;
+};
+
+QBS_EXPORT bool operator==(const CodeRange &r1, const CodeRange &r2);
+QBS_EXPORT bool operator!=(const CodeRange &r1, const CodeRange &r2);
+QBS_EXPORT bool operator<(const CodeRange &r1, const CodeRange &r2);
+inline auto qHash(const CodeRange &range) { return qHash(range.start()) ^ qHash(range.end()); }
+
+using CodeLinksInFile = QHash<CodeRange, QList<CodeLocation>>;
+using CodeLinks = QHash<QString, CodeLinksInFile>;
 
 } // namespace qbs
 
diff --git a/src/lib/corelib/tools/deprecationwarningmode.cpp b/src/lib/corelib/tools/deprecationwarningmode.cpp
new file mode 100644
index 000000000..e140e3e49
--- /dev/null
+++ b/src/lib/corelib/tools/deprecationwarningmode.cpp
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "deprecationwarningmode.h"
+
+/*!
+ * \enum DeprecationWarningMode
+ * This enum type specifies how \QBS should behave on encountering deprecated items or properties.
+ * \value DeprecationWarningMode::Error Project resolving will stop with an error message.
+ * \value DeprecationWarningMode::On A warning will be printed.
+ * \value DeprecationWarningMode::BeforeRemoval A warning will be printed if and only if this is
+ *            the last \QBS version before the removal version. This is the default behavior.
+ *            \note If the removal version's minor version number is zero, the behavior is
+ *                  the same as for ErrorHandlingMode::On.
+ * \value DeprecationWarningMode::Off No warnings will be emitted for deprecated constructs.
+ */
+
+namespace qbs {
+
+DeprecationWarningMode defaultDeprecationWarningMode()
+{
+    return DeprecationWarningMode::BeforeRemoval;
+}
+
+QString deprecationWarningModeName(DeprecationWarningMode mode)
+{
+    switch (mode) {
+    case DeprecationWarningMode::Error:
+        return QStringLiteral("error");
+    case DeprecationWarningMode::On:
+        return QStringLiteral("on");
+    case DeprecationWarningMode::BeforeRemoval:
+        return QStringLiteral("before-removal");
+    case DeprecationWarningMode::Off:
+        return QStringLiteral("off");
+    default:
+        break;
+    }
+    return {};
+}
+
+DeprecationWarningMode deprecationWarningModeFromName(const QString &name)
+{
+    DeprecationWarningMode mode = defaultDeprecationWarningMode();
+    for (int i = 0; i <= int(DeprecationWarningMode::Sentinel); ++i) {
+        if (deprecationWarningModeName(static_cast<DeprecationWarningMode>(i)) == name) {
+            mode = static_cast<DeprecationWarningMode>(i);
+            break;
+        }
+    }
+    return mode;
+}
+
+QStringList allDeprecationWarningModeStrings()
+{
+    QStringList result;
+    for (int i = 0; i <= int(DeprecationWarningMode::Sentinel); ++i)
+        result << deprecationWarningModeName(static_cast<DeprecationWarningMode>(i));
+    return result;
+}
+
+} // namespace qbs
diff --git a/src/lib/corelib/tools/deprecationwarningmode.h b/src/lib/corelib/tools/deprecationwarningmode.h
new file mode 100644
index 000000000..bb2a14155
--- /dev/null
+++ b/src/lib/corelib/tools/deprecationwarningmode.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QBS_DEPRECATIONWARNINGMODE_H
+#define QBS_DEPRECATIONWARNINGMODE_H
+
+#include "qbs_export.h"
+
+#include <QtCore/qstringlist.h>
+
+namespace qbs {
+
+enum class DeprecationWarningMode { Error, On, BeforeRemoval, Off, Sentinel = Off };
+
+QBS_EXPORT DeprecationWarningMode defaultDeprecationWarningMode();
+QBS_EXPORT QString deprecationWarningModeName(DeprecationWarningMode mode);
+QBS_EXPORT DeprecationWarningMode deprecationWarningModeFromName(const QString &name);
+QBS_EXPORT QStringList allDeprecationWarningModeStrings();
+
+} // namespace qbs
+
+#endif // QBS_DEPRECATIONWARNINGMODE_H
+
diff --git a/src/lib/corelib/tools/error.cpp b/src/lib/corelib/tools/error.cpp
index fe5027313..f1b90b71e 100644
--- a/src/lib/corelib/tools/error.cpp
+++ b/src/lib/corelib/tools/error.cpp
@@ -40,11 +40,12 @@
 #include "error.h"
 
 #include "persistence.h"
-#include "qttools.h"
 #include "stringconstants.h"
 #include "setupprojectparameters.h"
 #include "logging/logger.h"
 
+#include <tools/stlutils.h>
+
 #include <QtCore/qjsonarray.h>
 #include <QtCore/qjsonobject.h>
 #include <QtCore/qshareddata.h>
@@ -207,15 +208,21 @@ ErrorInfo::ErrorInfo(const QString &description, const QStringList &backtrace)
 {
     append(description);
     for (const QString &traceLine : backtrace) {
-        static const std::regex regexp("^(.+) at (.+):(\\-?[0-9]+)$");
+        if (traceLine.contains(QStringLiteral("<eval>")))
+            continue;
+        static const std::regex regexpWithFunc("^(.+) at [^(]*\\((.+):(\\-?[0-9]+)\\)$");
+        static const std::regex regexpWithoutFunc("^(.+) at (.+):(\\-?[0-9]+)$");
         std::smatch match;
         const std::string tl = traceLine.toStdString();
-        if (std::regex_match(tl, match, regexp)) {
-            const QString message = QString::fromStdString(match[1]),
-                             file = QString::fromStdString(match[2]),
-                             line = QString::fromStdString(match[3]);
+        bool hasMatch = std::regex_match(tl, match, regexpWithFunc);
+        if (!hasMatch)
+            hasMatch = std::regex_match(tl, match, regexpWithoutFunc);
+        if (hasMatch) {
+            const QString message = QString::fromStdString(match[1]).trimmed();
+            const QString file = QString::fromStdString(match[2]);
+            const QString line = QString::fromStdString(match[3]);
             const CodeLocation location(file, line.toInt());
-            appendBacktrace(message, location);
+            appendBacktrace(message, CodeLocation(file, line.toInt()));
         }
     }
 }
@@ -269,7 +276,7 @@ void ErrorInfo::clear()
 QString ErrorInfo::toString() const
 {
     QStringList lines;
-    for (const ErrorItem &e : qAsConst(d->items)) {
+    for (const ErrorItem &e : std::as_const(d->items)) {
         if (e.isBacktraceItem()) {
             QString line;
             if (!e.description().isEmpty())
@@ -306,8 +313,15 @@ bool ErrorInfo::isInternalError() const
 
 bool ErrorInfo::hasLocation() const
 {
-    return std::any_of(d->items.cbegin(), d->items.cend(),
-                        [](const ErrorItem &ei) { return ei.codeLocation().isValid(); });
+    return Internal::any_of(d->items, [](const ErrorItem &ei) {
+        return ei.codeLocation().isValid(); });
+}
+
+bool ErrorInfo::isCancelException() const
+{
+    return Internal::any_of(d->items, [](const ErrorItem &ei) {
+        return ei.description() == QLatin1String("interrupted");
+    });
 }
 
 void ErrorInfo::load(Internal::PersistentPool &pool)
diff --git a/src/lib/corelib/tools/error.h b/src/lib/corelib/tools/error.h
index ea8ddb5ec..ba600a558 100644
--- a/src/lib/corelib/tools/error.h
+++ b/src/lib/corelib/tools/error.h
@@ -113,6 +113,7 @@ public:
     QJsonObject toJson() const;
     bool isInternalError() const;
     bool hasLocation() const;
+    bool isCancelException() const;
 
     void load(Internal::PersistentPool &pool);
     void store(Internal::PersistentPool &pool) const;
@@ -126,7 +127,7 @@ void appendError(ErrorInfo &dst, const ErrorInfo &src);
 void handlePropertyError(
         const ErrorInfo &error, const SetupProjectParameters &params, Internal::Logger &logger);
 
-inline uint qHash(const ErrorInfo &e) { return qHash(e.toString()); }
+inline auto qHash(const ErrorInfo &e) { return qHash(e.toString()); }
 inline bool operator==(const ErrorInfo &e1, const ErrorInfo &e2) {
     return e1.toString() == e2.toString();
 }
diff --git a/src/lib/corelib/tools/executablefinder.cpp b/src/lib/corelib/tools/executablefinder.cpp
index a02fbdc98..b5d9c0151 100644
--- a/src/lib/corelib/tools/executablefinder.cpp
+++ b/src/lib/corelib/tools/executablefinder.cpp
@@ -76,7 +76,7 @@ QString ExecutableFinder::findExecutable(const QString &path, const QString &wor
     //if (FileInfo::fileName(filePath) == filePath)
     if (!FileInfo::isAbsolute(filePath))
         return findInPath(filePath, workingDirPath);
-    else if (HostOsInfo::isWindowsHost())
+    if (HostOsInfo::isWindowsHost())
         return findBySuffix(filePath);
     return filePath;
 }
@@ -99,7 +99,7 @@ QString ExecutableFinder::findBySuffix(const QString &filePath) const
 bool ExecutableFinder::candidateCheck(const QString &directory, const QString &program,
         QString &fullProgramPath) const
 {
-    for (const QString &suffix : qAsConst(m_executableSuffixes)) {
+    for (const QString &suffix : std::as_const(m_executableSuffixes)) {
         QString candidate = directory + program + suffix;
         qCDebug(lcExec) << "candidate:" << candidate;
         QFileInfo fi(candidate);
@@ -120,10 +120,10 @@ QString ExecutableFinder::findInPath(const QString &filePath, const QString &wor
     fullProgramPath = filePath;
     qCDebug(lcExec) << "looking for executable in PATH" << fullProgramPath;
     QStringList pathEnv = m_environment.value(StringConstants::pathEnvVar())
-            .split(HostOsInfo::pathListSeparator(), QBS_SKIP_EMPTY_PARTS);
+            .split(HostOsInfo::pathListSeparator(), Qt::SkipEmptyParts);
     if (HostOsInfo::isWindowsHost())
         pathEnv.prepend(StringConstants::dot());
-    for (QString directory : qAsConst(pathEnv)) {
+    for (QString directory : std::as_const(pathEnv)) {
         if (directory == StringConstants::dot())
             directory = workingDirPath;
         if (!directory.isEmpty()) {
diff --git a/src/lib/corelib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp
index 058ead049..f56762c04 100644
--- a/src/lib/corelib/tools/fileinfo.cpp
+++ b/src/lib/corelib/tools/fileinfo.cpp
@@ -41,6 +41,7 @@
 
 #include <logging/translator.h>
 #include <tools/qbsassert.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qcoreapplication.h>
@@ -182,13 +183,10 @@ bool FileInfo::isAbsolute(const QString &path, HostOsInfo::HostOs hostOs)
 
 bool FileInfo::isPattern(QStringView str)
 {
-    for (const QChar &ch : str) {
-        if (ch == QLatin1Char('*') || ch == QLatin1Char('?')
-                || ch == QLatin1Char(']') || ch == QLatin1Char('[')) {
-            return true;
-        }
-    }
-    return false;
+    return Internal::any_of(str, [](const auto &ch) {
+        return (ch == QLatin1Char('*') || ch == QLatin1Char('?') || ch == QLatin1Char(']')
+                || ch == QLatin1Char('['));
+    });
 }
 
 /**
diff --git a/src/lib/corelib/tools/fileinfo.h b/src/lib/corelib/tools/fileinfo.h
index f0a09a16b..3ad585f74 100644
--- a/src/lib/corelib/tools/fileinfo.h
+++ b/src/lib/corelib/tools/fileinfo.h
@@ -99,10 +99,10 @@ private:
 
 bool removeFileRecursion(const QFileInfo &f, QString *errorMessage);
 
-// FIXME: Used by tests.
-bool QBS_EXPORT removeDirectoryWithContents(const QString &path, QString *errorMessage);
-bool QBS_EXPORT copyFileRecursion(const QString &sourcePath, const QString &targetPath,
-                                  bool preserveSymLinks, bool copyDirectoryContents, QString *errorMessage);
+bool QBS_AUTOTEST_EXPORT removeDirectoryWithContents(const QString &path, QString *errorMessage);
+bool QBS_AUTOTEST_EXPORT copyFileRecursion(
+    const QString &sourcePath, const QString &targetPath, bool preserveSymLinks,
+    bool copyDirectoryContents, QString *errorMessage);
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/tools/filesaver.cpp b/src/lib/corelib/tools/filesaver.cpp
index c4eead940..3459ac558 100644
--- a/src/lib/corelib/tools/filesaver.cpp
+++ b/src/lib/corelib/tools/filesaver.cpp
@@ -109,7 +109,7 @@ bool FileSaver::commit()
 
 bool FileSaver::write(std::string_view data)
 {
-    return fwrite(data.data(), data.size(), device());
+    return Internal::fwrite(data.data(), data.size(), device());
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/tools/hostosinfo.h b/src/lib/corelib/tools/hostosinfo.h
index 4bfc3e00a..32817f731 100644
--- a/src/lib/corelib/tools/hostosinfo.h
+++ b/src/lib/corelib/tools/hostosinfo.h
@@ -73,10 +73,10 @@ public:
     // Add more as needed.
     enum HostOs { HostOsWindows, HostOsLinux, HostOsMacos, HostOsOtherUnix, HostOsOther };
 
-    static inline std::string hostOSIdentifier();
-    static inline std::string hostOSArchitecture();
-    static inline std::vector<std::string> hostOSIdentifiers();
-    static inline std::vector<std::string> canonicalOSIdentifiers(const std::string &os);
+    static inline QString hostOSIdentifier();
+    static inline QString hostOSArchitecture();
+    static inline std::vector<QString> hostOSIdentifiers();
+    static inline std::vector<QString> canonicalOSIdentifiers(const QString &os);
     static inline HostOs hostOs();
 
     static inline Version hostOsVersion() {
@@ -98,6 +98,28 @@ public:
         return v;
     }
 
+    static QString hostOsBuildVersion() {
+        QString v;
+        if (HostOsInfo::isWindowsHost()) {
+            QSettings settings(QStringLiteral("HKEY_LOCAL_MACHINE\\Software\\"
+                                                   "Microsoft\\Windows NT\\CurrentVersion"),
+                               QSettings::NativeFormat);
+            v = settings.value(QStringLiteral("CurrentBuildNumber")).toString();
+        } else if (HostOsInfo::isMacosHost()) {
+            QSettings serverSettings(QStringLiteral(
+                                         "/System/Library/CoreServices/ServerVersion.plist"),
+                               QSettings::NativeFormat);
+            v = serverSettings.value(QStringLiteral("ProductBuildVersion")).toString();
+            if (v.isNull()) {
+                QSettings systemSettings(QStringLiteral(
+                                             "/System/Library/CoreServices/SystemVersion.plist"),
+                                   QSettings::NativeFormat);
+                v = systemSettings.value(QStringLiteral("ProductBuildVersion")).toString();
+            }
+        }
+        return v;
+    }
+
     static bool isWindowsHost() { return hostOs() == HostOsWindows; }
     static bool isLinuxHost() { return hostOs() == HostOsLinux; }
     static bool isMacosHost() { return hostOs() == HostOsMacos; }
@@ -155,68 +177,68 @@ public:
     }
 };
 
-std::string HostOsInfo::hostOSIdentifier()
+QString HostOsInfo::hostOSIdentifier()
 {
 #if defined(__APPLE__)
-    return "macos";
+    return QStringLiteral("macos");
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
-    return "windows";
+    return QStringLiteral("windows");
 #elif defined(_AIX)
-    return "aix";
+    return QStringLiteral("aix");
 #elif defined(hpux) || defined(__hpux)
-    return "hpux";
+    return QStringLiteral("hpux");
 #elif defined(__sun) || defined(sun)
-    return "solaris";
+    return QStringLiteral("solaris");
 #elif defined(__linux__) || defined(__linux)
-    return "linux";
+    return QStringLiteral("linux");
 #elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
-    return "freebsd";
+    return QStringLiteral("freebsd");
 #elif defined(__NetBSD__)
-    return "netbsd";
+    return QStringLiteral("netbsd");
 #elif defined(__OpenBSD__)
-    return "openbsd";
+    return QStringLiteral("openbsd");
 #elif defined(__GNU__)
-    return "hurd";
+    return QStringLiteral("hurd");
 #elif defined(__HAIKU__)
-    return "haiku";
+    return QStringLiteral("haiku");
 #else
     #warning "Qbs has not been ported to this OS - see http://qbs.io/"
-    return "";
+    return {};
 #endif
 }
 
-std::string HostOsInfo::hostOSArchitecture()
+QString HostOsInfo::hostOSArchitecture()
 {
     const auto cpuArch = QSysInfo::currentCpuArchitecture();
     if (cpuArch == QLatin1String("i386"))
-        return "x86";
-    return cpuArch.toStdString();
+        return QStringLiteral("x86");
+    return cpuArch;
 }
 
-std::vector<std::string> HostOsInfo::hostOSIdentifiers()
+std::vector<QString> HostOsInfo::hostOSIdentifiers()
 {
     return canonicalOSIdentifiers(hostOSIdentifier());
 }
 
-std::vector<std::string> HostOsInfo::canonicalOSIdentifiers(const std::string &name)
+std::vector<QString> HostOsInfo::canonicalOSIdentifiers(const QString &name)
 {
-    std::vector<std::string> list { name };
-    if (contains({"ios-simulator"}, name))
-        list << canonicalOSIdentifiers("ios");
-    if (contains({"tvos-simulator"}, name))
-        list << canonicalOSIdentifiers("tvos");
-    if (contains({"watchos-simulator"}, name))
-        list << canonicalOSIdentifiers("watchos");
-    if (contains({"macos", "ios", "tvos", "watchos"}, name))
-        list << canonicalOSIdentifiers("darwin");
-    if (contains({"darwin", "freebsd", "netbsd", "openbsd"}, name))
-        list << canonicalOSIdentifiers("bsd");
-    if (contains({"android"}, name))
-        list << canonicalOSIdentifiers("linux");
+    std::vector<QString> list { name };
+    if (contains({u"ios-simulator"}, name))
+        list << canonicalOSIdentifiers(QStringLiteral("ios"));
+    if (contains({u"tvos-simulator"}, name))
+        list << canonicalOSIdentifiers(QStringLiteral("tvos"));
+    if (contains({u"watchos-simulator"}, name))
+        list << canonicalOSIdentifiers(QStringLiteral("watchos"));
+    if (contains({u"macos", u"ios", u"tvos", u"watchos"}, name))
+        list << canonicalOSIdentifiers(QStringLiteral("darwin"));
+    if (contains({u"darwin", u"freebsd", u"netbsd", u"openbsd"}, name))
+        list << canonicalOSIdentifiers(QStringLiteral("bsd"));
+    if (contains({u"android"}, name))
+        list << canonicalOSIdentifiers(QStringLiteral("linux"));
 
     // Note: recognized non-Unix platforms include: windows, haiku, vxworks
-    if (contains({"bsd", "aix", "hpux", "solaris", "linux", "hurd", "qnx", "integrity"}, name))
-        list << canonicalOSIdentifiers("unix");
+    if (contains({u"bsd", u"aix", u"hpux", u"solaris", u"linux", u"hurd", u"qnx", u"integrity"}, name))
+        list << canonicalOSIdentifiers(QStringLiteral("unix"));
 
     return list;
 }
diff --git a/src/lib/corelib/tools/id.cpp b/src/lib/corelib/tools/id.cpp
index 33cfd60f7..cca755512 100644
--- a/src/lib/corelib/tools/id.cpp
+++ b/src/lib/corelib/tools/id.cpp
@@ -75,7 +75,7 @@ public:
         : n(length), str(s)
     {
         if (!n)
-            length = n = qstrlen(s);
+            length = n = int(qstrlen(s));
         h = 0;
         while (length--) {
             h = (h << 4) + *s++;
@@ -95,7 +95,7 @@ static bool operator==(const StringHolder &sh1, const StringHolder &sh2)
 }
 
 
-static uint qHash(const StringHolder &sh)
+QHashValueType qHash(const StringHolder &sh)
 {
     return sh.h;
 }
@@ -272,8 +272,7 @@ bool Id::operator==(const char *name) const
     const auto string = getStringFromId(m_id);
     if (!string.isNull() && name)
         return strcmp(string.data(), name) == 0;
-    else
-        return false;
+    return false;
 }
 
 bool Id::alphabeticallyBefore(Id other) const
diff --git a/src/lib/corelib/tools/id.h b/src/lib/corelib/tools/id.h
index aa327833f..845ed60df 100644
--- a/src/lib/corelib/tools/id.h
+++ b/src/lib/corelib/tools/id.h
@@ -41,6 +41,7 @@
 #define QBS_TOOLS_ID_H
 
 #include "qbs_export.h"
+#include <tools/porting.h>
 
 #include <QtCore/qmetatype.h>
 #include <QtCore/qstring.h>
@@ -84,7 +85,7 @@ private:
     int m_id;
 };
 
-inline uint qHash(const Id &id) { return id.uniqueIdentifier(); }
+inline QHashValueType qHash(const Id &id) { return id.uniqueIdentifier(); }
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/tools/installoptions.cpp b/src/lib/corelib/tools/installoptions.cpp
index 5e112e6de..563f04a7b 100644
--- a/src/lib/corelib/tools/installoptions.cpp
+++ b/src/lib/corelib/tools/installoptions.cpp
@@ -68,7 +68,7 @@ public:
 
 QString effectiveInstallRoot(const InstallOptions &options, const TopLevelProject *project)
 {
-    const QString installRoot = options.installRoot();
+    QString installRoot = options.installRoot();
     if (!installRoot.isEmpty())
         return installRoot;
 
diff --git a/src/lib/corelib/tools/jsonhelper.h b/src/lib/corelib/tools/jsonhelper.h
index e695bd465..cb911c45a 100644
--- a/src/lib/corelib/tools/jsonhelper.h
+++ b/src/lib/corelib/tools/jsonhelper.h
@@ -40,6 +40,8 @@
 #ifndef QBS_JSON_HELPER_H
 #define QBS_JSON_HELPER_H
 
+#include <tools/stlutils.h>
+
 #include <QtCore/qjsonarray.h>
 #include <QtCore/qjsonobject.h>
 #include <QtCore/qjsonvalue.h>
@@ -60,10 +62,7 @@ template<> inline QString fromJson(const QJsonValue &v) { return v.toString(); }
 template<> inline QStringList fromJson(const QJsonValue &v)
 {
     const QJsonArray &jsonList = v.toArray();
-    QStringList stringList;
-    std::transform(jsonList.begin(), jsonList.end(), std::back_inserter(stringList),
-                   [](const auto &v) { return v.toString(); });
-    return stringList;
+    return transformed<QStringList>(jsonList, [](const auto &v) { return v.toString(); });
 }
 template<> inline QVariantMap fromJson(const QJsonValue &v) { return v.toObject().toVariantMap(); }
 template<> inline QProcessEnvironment fromJson(const QJsonValue &v)
diff --git a/src/lib/corelib/tools/launchersocket.cpp b/src/lib/corelib/tools/launchersocket.cpp
index 1489af1e9..7d4788ee3 100644
--- a/src/lib/corelib/tools/launchersocket.cpp
+++ b/src/lib/corelib/tools/launchersocket.cpp
@@ -82,12 +82,7 @@ void LauncherSocket::setSocket(QLocalSocket *socket)
     QBS_ASSERT(!m_socket, return);
     m_socket.store(socket);
     m_packetParser.setDevice(m_socket);
-    connect(m_socket,
-#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-            static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error),
-#else
-            &QLocalSocket::errorOccurred,
-#endif
+    connect(m_socket, &QLocalSocket::errorOccurred,
             this, &LauncherSocket::handleSocketError);
     connect(m_socket, &QLocalSocket::readyRead,
             this, &LauncherSocket::handleSocketDataAvailable);
@@ -144,7 +139,7 @@ void LauncherSocket::handleRequests()
     const auto socket = m_socket.load();
     QBS_ASSERT(socket, return);
     std::lock_guard<std::mutex> locker(m_requestsMutex);
-    for (const QByteArray &request : qAsConst(m_requests))
+    for (const QByteArray &request : std::as_const(m_requests))
         socket->write(request);
     m_requests.clear();
 }
diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp
index 58cd458c3..77b83023a 100644
--- a/src/lib/corelib/tools/msvcinfo.cpp
+++ b/src/lib/corelib/tools/msvcinfo.cpp
@@ -176,6 +176,7 @@ static QVariantMap getMsvcDefines(const QString &compilerFilePath,
                << qEnvironmentVariable("COMSPEC")
                << QStringLiteral("/c")
                << languageSwitch
+               << QStringLiteral("/Zs")
                << QStringLiteral("NUL"),
                compilerEnv, true, commands)).split(QLatin1Char('\n'));
 
@@ -309,7 +310,7 @@ static QString vswhereFilePath()
     static const std::vector<const char *> envVarCandidates{"ProgramFiles", "ProgramFiles(x86)"};
     for (const char * const envVar : envVarCandidates) {
         const QString value = QDir::fromNativeSeparators(QString::fromLocal8Bit(qgetenv(envVar)));
-        const QString cmd = value
+        QString cmd = value
                 + QStringLiteral("/Microsoft Visual Studio/Installer/vswhere.exe");
         if (QFileInfo(cmd).exists())
             return cmd;
@@ -356,8 +357,8 @@ static std::vector<MSVCInstallInfo> retrieveInstancesFromVSWhere(
         return result;
     }
     const auto jsonArray = jsonOutput.array();
-    for (const QJsonValue &v : jsonArray) {
-        const QJsonObject o = v.toObject();
+    for (const auto &value : jsonArray) {
+        const QJsonObject o = value.toObject();
         MSVCInstallInfo info;
         info.version = o.value(QStringLiteral("installationVersion")).toString();
         if (productType == ProductType::BuildTools) {
@@ -509,7 +510,7 @@ void MSVC::init()
 QString MSVC::architectureFromClPath(const QString &clPath)
 {
     const auto parentDir = QFileInfo(clPath).absolutePath();
-    const auto parentDirName = QFileInfo(parentDir).fileName().toLower();
+    auto parentDirName = QFileInfo(parentDir).fileName().toLower();
     // can be the case when cl.exe is present within the Windows SDK installation... but can it?
     if (parentDirName == QLatin1String("bin"))
         return QStringLiteral("x86");
@@ -669,12 +670,12 @@ std::vector<MSVC> MSVC::installedCompilers(Logger &logger)
         }
 
         const auto ais = findSupportedArchitectures(msvc);
-        for (const MSVCArchInfo &ai : ais) {
+        transform(ais, msvcs, [&msvc](const auto &ai) {
             MSVC specificMSVC = msvc;
             specificMSVC.architecture = ai.arch;
             specificMSVC.binPath = ai.binPath;
-            msvcs.push_back(specificMSVC);
-        }
+            return specificMSVC;
+        });
     }
     return msvcs;
 }
@@ -722,7 +723,7 @@ QString MSVCInstallInfo::findVcvarsallBat() const
 
 std::vector<MSVCInstallInfo> MSVCInstallInfo::installedMSVCs(Logger &logger)
 {
-    const auto installInfos = installedMSVCsFromVsWhere(logger);
+    auto installInfos = installedMSVCsFromVsWhere(logger);
     if (installInfos.empty())
         return installedMSVCsFromRegistry();
     return installInfos;
diff --git a/src/lib/corelib/buildgraph/scriptclasspropertyiterator.h b/src/lib/corelib/tools/mutexdata.h
index b57072236..160f6dd26 100644
--- a/src/lib/corelib/buildgraph/scriptclasspropertyiterator.h
+++ b/src/lib/corelib/tools/mutexdata.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2018 The Qt Company Ltd.
+** Copyright (C) 2023 Ivan Komissarov (abbapoh@gmail.com)
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qbs.
@@ -37,74 +37,68 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_SCRIPTCLASSPROPERTYITERATOR_H
-#define QBS_SCRIPTCLASSPROPERTYITERATOR_H
+#pragma once
 
-#include <tools/qbsassert.h>
-
-#include <QtCore/qmap.h>
-#include <QtCore/qstring.h>
-#include <QtScript/qscriptclasspropertyiterator.h>
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptstring.h>
-
-#include <vector>
+#include <shared_mutex>
 
 namespace qbs {
 namespace Internal {
 
-class ScriptClassPropertyIterator : public QScriptClassPropertyIterator
+// adapted version of https://github.com/dragazo/rustex/blob/master/rustex.h
+
+// a data with a mutually exclusive access
+template<typename DataType, typename MutexType = std::shared_mutex>
+class MutexData
 {
 public:
-    ScriptClassPropertyIterator(const QScriptValue &object, const QVariantMap &properties,
-                                std::vector<QString> additionalProperties)
-        : QScriptClassPropertyIterator(object),
-          m_it(properties),
-          m_additionalProperties(std::move(additionalProperties))
+    template<typename T, template<typename> typename LockType>
+    class ReferenceGuard
     {
-    }
+        friend class MutexData;
+        template<typename U>
+        ReferenceGuard(U &&data) noexcept
+            : m_ptr(std::addressof(data.m_data))
+            , m_lock(data.m_mutex)
+        {}
+    public:
+        ReferenceGuard(const ReferenceGuard &) = delete;
+        ReferenceGuard(ReferenceGuard &&) = default;
+        ReferenceGuard &operator=(const ReferenceGuard &) = delete;
+        ReferenceGuard &operator=(ReferenceGuard &&) = default;
 
-private:
-    bool hasNext() const override
-    {
-        return m_it.hasNext() || m_index < int(m_additionalProperties.size()) - 1;
-    }
-    bool hasPrevious() const override { return m_index > -1 || m_it.hasPrevious(); }
-    void toFront() override { m_it.toFront(); m_index = -1; }
-    void toBack() override { m_it.toBack(); m_index = int(m_additionalProperties.size()) - 1; }
+        T &get() const noexcept { return *m_ptr; }
+        T &data() const noexcept { return *m_ptr; }
+        operator T &() const noexcept { return *m_ptr; }
 
-    void next() override
-    {
-        QBS_ASSERT(hasNext(), return);
-        if (m_it.hasNext())
-            m_it.next();
-        else
-            ++m_index;
-    }
+    private:
+        T *m_ptr;
+        LockType<MutexType> m_lock;
+    };
 
-    void previous() override
-    {
-        QBS_ASSERT(hasPrevious(), return);
-        if (m_index >= 0)
-            --m_index;
-        if (m_index == -1)
-            m_it.previous();
-    }
+    using UniqueMutableGuard = ReferenceGuard<DataType, std::unique_lock>;
+    using UniqueConstGuard = ReferenceGuard<const DataType, std::unique_lock>;
+    using SharedGuard = ReferenceGuard<const DataType, std::shared_lock>;
 
-    QScriptString name() const override
-    {
-        const QString theName = m_index >= 0 && m_index < int(m_additionalProperties.size())
-                ? m_additionalProperties.at(m_index)
-                : m_it.key();
-        return object().engine()->toStringHandle(theName);
-    }
+    template<
+        typename ...Args,
+        std::enable_if_t<std::is_constructible_v<DataType, Args...>, int> = 0
+    >
+    explicit MutexData(Args &&...args) : m_data(std::forward<Args>(args)...) {}
+
+    [[nodiscard]] UniqueMutableGuard lock() noexcept { return UniqueMutableGuard{*this}; }
+    [[nodiscard]] UniqueConstGuard lock() const noexcept { return UniqueConstGuard{*this}; }
 
-    QMapIterator<QString, QVariant> m_it;
-    const std::vector<QString> m_additionalProperties;
-    int m_index = -1;
+    template<
+        typename U = MutexType,
+        std::enable_if_t<std::is_same_v<U, std::shared_mutex>, int> = 0
+    >
+    [[nodiscard]] SharedGuard lock_shared() const noexcept
+    { return SharedGuard{*this}; }
+
+private:
+    DataType m_data;
+    mutable MutexType m_mutex;
 };
 
-} // namespace Internal
 } // namespace qbs
-
-#endif // QBS_SCRIPTCLASSPROPERTYITERATOR_H
+} // namespace Internal
diff --git a/src/lib/corelib/tools/persistence.cpp b/src/lib/corelib/tools/persistence.cpp
index 95211e894..0e545377a 100644
--- a/src/lib/corelib/tools/persistence.cpp
+++ b/src/lib/corelib/tools/persistence.cpp
@@ -48,7 +48,7 @@
 namespace qbs {
 namespace Internal {
 
-static const char QBS_PERSISTENCE_MAGIC[] = "QBSPERSISTENCE-130";
+static const char QBS_PERSISTENCE_MAGIC[] = "QBSPERSISTENCE-133";
 
 NoBuildGraphError::NoBuildGraphError(const QString &filePath)
     : ErrorInfo(Tr::tr("Build graph not found for configuration '%1'. Expected location was '%2'.")
@@ -140,6 +140,11 @@ void PersistentPool::finalizeWriteStream()
 
 void PersistentPool::storeVariant(const QVariant &variant)
 {
+    if (variant.isNull()) {
+        m_stream << quint32(QMetaType::User);
+        m_stream << variant;
+        return;
+    }
     const auto type = static_cast<quint32>(variant.userType());
     m_stream << type;
     switch (type) {
@@ -231,8 +236,5 @@ void PersistentPool::doStoreValue(const QProcessEnvironment &env)
         store(env.value(key));
 }
 
-const PersistentPool::PersistentObjectId PersistentPool::ValueNotFoundId;
-const PersistentPool::PersistentObjectId PersistentPool::EmptyValueId;
-
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/tools/persistence.h b/src/lib/corelib/tools/persistence.h
index b7aa543a4..86365c993 100644
--- a/src/lib/corelib/tools/persistence.h
+++ b/src/lib/corelib/tools/persistence.h
@@ -145,8 +145,9 @@ private:
     template<typename T> QHash<T, PersistentObjectId> &idMap();
     template<typename T> PersistentObjectId &lastStoredId();
 
-    static const PersistentObjectId ValueNotFoundId = -1;
-    static const PersistentObjectId EmptyValueId = -2;
+    static const inline PersistentObjectId ValueNotFoundId = -1;
+    static const inline PersistentObjectId EmptyValueId = -2;
+    static const inline PersistentObjectId NullValueId = -3;
 
     std::unique_ptr<QIODevice> m_file;
     QDataStream m_stream;
@@ -271,8 +272,13 @@ template<typename T> inline T PersistentPool::idLoadValue()
 {
     int id;
     m_stream >> id;
-    if (id == EmptyValueId)
+    if (id == NullValueId)
         return T();
+    if (id == EmptyValueId) {
+        if constexpr (std::is_same_v<T, QString>)
+            return QString(0, QChar());
+        return T();
+    }
     QBS_CHECK(id >= 0);
     if (id >= static_cast<int>(idStorage<T>().size())) {
         T value;
@@ -287,6 +293,12 @@ template<typename T> inline T PersistentPool::idLoadValue()
 template<typename T>
 void PersistentPool::idStoreValue(const T &value)
 {
+    if constexpr (std::is_same_v<T, QString>) {
+        if (value.isNull()) {
+            m_stream << NullValueId;
+            return;
+        }
+    }
     if (value.isEmpty()) {
         m_stream << EmptyValueId;
         return;
diff --git a/src/lib/corelib/language/modulemerger.h b/src/lib/corelib/tools/pimpl.h
index 469dc86c4..ab672aabe 100644
--- a/src/lib/corelib/language/modulemerger.h
+++ b/src/lib/corelib/tools/pimpl.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2023 Ivan Komissarov (abbapoh@gmail.com)
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qbs.
@@ -37,53 +37,25 @@
 **
 ****************************************************************************/
 
-#ifndef QBS_MODULEMERGER_H
-#define QBS_MODULEMERGER_H
+#ifndef PIMPL_H
+#define PIMPL_H
 
-#include "item.h"
-#include "qualifiedid.h"
-
-#include <logging/logger.h>
-#include <tools/set.h>
-#include <tools/version.h>
-
-#include <QtCore/qhash.h>
+#include <tools/propagate_const.h>
+#include <memory>
 
 namespace qbs {
 namespace Internal {
 
-class ModuleMerger {
-public:
-    static void merge(Logger &logger, Item *productItem, const QString &productName,
-                      Item::Modules *topSortedModules);
-
-private:
-    ModuleMerger(Logger &logger, Item *productItem, const QString &productName,
-                 const Item::Modules::iterator &modulesBegin,
-                 const Item::Modules::iterator &modulesEnd);
-
-    void appendPrototypeValueToNextChain(Item *moduleProto, const QString &propertyName,
-            const ValuePtr &sv);
-    void mergeModule(Item::PropertyMap *props, const Item::Module &m);
-    void replaceItemInValues(QualifiedId moduleName, Item *containerItem, Item *toReplace);
-    void start();
-
-    static ValuePtr lastInNextChain(const ValuePtr &v);
-    static const Item::Module *findModule(const Item *item, const QualifiedId &name);
+template<typename T>
+using Pimpl = KDToolBox::propagate_const<std::unique_ptr<T>>;
 
-    Logger &m_logger;
-    Item * const m_productItem;
-    Item::Module &m_mergedModule;
-    Item *m_clonedModulePrototype = nullptr;
-    Set<const Item *> m_seenInstances;
-    Set<Item *> m_moduleInstanceContainers;
-    const bool m_isBaseModule;
-    const bool m_isShadowProduct;
-    const Item::Modules::iterator m_modulesBegin;
-    const Item::Modules::iterator m_modulesEnd;
-};
+template<typename T, typename... Args>
+Pimpl<T> makePimpl(Args&&... args)
+{
+    return Pimpl<T>(std::make_unique<T>(std::forward<Args>(args)...));
+}
 
 } // namespace Internal
 } // namespace qbs
 
-#endif // QBS_MODULEMERGER_H
+#endif // PIMPL_H
diff --git a/src/lib/corelib/tools/porting.h b/src/lib/corelib/tools/porting.h
new file mode 100644
index 000000000..37582e8d3
--- /dev/null
+++ b/src/lib/corelib/tools/porting.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QBS_TOOLS_PORTING_H
+#define QBS_TOOLS_PORTING_H
+
+#include <QtCore/qglobal.h>
+
+namespace qbs {
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+using QHashValueType = uint;
+#else
+using QHashValueType = size_t;
+#endif
+
+}
+
+#endif
diff --git a/src/lib/corelib/tools/processutils.cpp b/src/lib/corelib/tools/processutils.cpp
index b27592f88..02608cc9f 100644
--- a/src/lib/corelib/tools/processutils.cpp
+++ b/src/lib/corelib/tools/processutils.cpp
@@ -91,7 +91,7 @@ QString processNameByPid(qint64 pid)
     char exePath[64];
     char buf[PATH_MAX];
     memset(buf, 0, sizeof(buf));
-    sprintf(exePath, "/proc/%lld/exe", pid);
+    std::sprintf(exePath, "/proc/%lld/exe", pid);
     if (readlink(exePath, buf, sizeof(buf)) < 0)
         return {};
     return FileInfo::fileName(QString::fromUtf8(buf));
diff --git a/src/lib/corelib/tools/profile.cpp b/src/lib/corelib/tools/profile.cpp
index 2eac25091..0fe0ba19d 100644
--- a/src/lib/corelib/tools/profile.cpp
+++ b/src/lib/corelib/tools/profile.cpp
@@ -213,7 +213,7 @@ QVariant Profile::possiblyInheritedValue(const QString &key, const QVariant &def
                                          QStringList profileChain) const
 {
     extendAndCheckProfileChain(profileChain);
-    const QVariant v = localValue(key);
+    QVariant v = localValue(key);
     if (v.isValid())
         return v;
     const QString baseProfileName = baseProfile();
diff --git a/src/lib/corelib/tools/profiling.cpp b/src/lib/corelib/tools/profiling.cpp
index db64a73c6..b93d3fa17 100644
--- a/src/lib/corelib/tools/profiling.cpp
+++ b/src/lib/corelib/tools/profiling.cpp
@@ -72,7 +72,7 @@ void TimedActivityLogger::finishActivity()
 {
     if (!d)
         return;
-    const QString timeString = elapsedTimeString(d->timer.elapsed());
+    const QString timeString = elapsedTimeString(d->timer.nsecsElapsed());
     d->logger.qbsLog(LoggerInfo, true)
             << Tr::tr("Activity '%2' took %3.").arg(d->activity, timeString);
     d.reset();
@@ -98,13 +98,13 @@ void AccumulatingTimer::stop()
 {
     if (!m_timer.isValid())
         return;
-    *m_elapsedTime += m_timer.elapsed();
+    *m_elapsedTime += m_timer.nsecsElapsed();
     m_timer.invalidate();
 }
 
-QString elapsedTimeString(qint64 elapsedTimeInMs)
+QString elapsedTimeString(qint64 elapsedTimeInNs)
 {
-    qint64 ms = elapsedTimeInMs;
+    qint64 ms = elapsedTimeInNs / (1000ll * 1000ll);
     qint64 s = ms/1000;
     ms -= s*1000;
     qint64 m = s/60;
diff --git a/src/lib/corelib/tools/profiling.h b/src/lib/corelib/tools/profiling.h
index c6fc9ede7..3220c2a82 100644
--- a/src/lib/corelib/tools/profiling.h
+++ b/src/lib/corelib/tools/profiling.h
@@ -52,7 +52,7 @@ namespace qbs {
 namespace Internal {
 class Logger;
 
-QString elapsedTimeString(qint64 elapsedTimeInMs);
+QString elapsedTimeString(qint64 elapsedTimeInNs);
 
 class TimedActivityLogger
 {
diff --git a/src/lib/corelib/tools/progressobserver.h b/src/lib/corelib/tools/progressobserver.h
index fc49d9eed..73a61de37 100644
--- a/src/lib/corelib/tools/progressobserver.h
+++ b/src/lib/corelib/tools/progressobserver.h
@@ -41,12 +41,15 @@
 
 #include <QtCore/qglobal.h>
 
+#include <vector>
+
 QT_BEGIN_NAMESPACE
 class QString;
 QT_END_NAMESPACE
 
 namespace qbs {
 namespace Internal {
+class ScriptEngine;
 
 class ProgressObserver
 {
@@ -64,6 +67,14 @@ public:
 
     // Call this to ensure that the progress bar always goes to 100%.
     void setFinished();
+
+    void addScriptEngine(ScriptEngine *engine) { m_scriptEngines.push_back(engine); }
+
+protected:
+    const std::vector<ScriptEngine *> &scriptEngines() const { return m_scriptEngines; }
+
+private:
+    std::vector<ScriptEngine *> m_scriptEngines;
 };
 
 } // namespace Internal
diff --git a/src/lib/corelib/tools/propagate_const.h b/src/lib/corelib/tools/propagate_const.h
new file mode 100644
index 000000000..65e35fc8c
--- /dev/null
+++ b/src/lib/corelib/tools/propagate_const.h
@@ -0,0 +1,418 @@
+/****************************************************************************
+**                                MIT License
+**
+** Copyright (C) 2022-2023 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+** Author: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+**
+** This file is part of KDToolBox (https://github.com/KDAB/KDToolBox).
+**
+** Permission is hereby granted, free of charge, to any person obtaining a copy
+** of this software and associated documentation files (the "Software"), to deal
+** in the Software without restriction, including without limitation the rights
+** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, ** and to permit persons to whom the Software is
+** furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice (including the next paragraph)
+** shall be included in all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF ** CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+****************************************************************************/
+
+#ifndef KDTOOLBOX_PROPAGATE_CONST
+#define KDTOOLBOX_PROPAGATE_CONST
+
+#include <functional>
+#include <type_traits>
+#include <utility>
+
+// Our SFINAE is too noisy and clang-format gets confused.
+// clang-format off
+
+namespace KDToolBox
+{
+
+template <typename T>
+class propagate_const;
+
+namespace detail {
+// Type traits to detect propagate_const specializations
+template <typename T>
+struct is_propagate_const : std::false_type
+{
+};
+
+template <typename T>
+struct is_propagate_const<propagate_const<T>> : std::true_type
+{
+};
+
+// Using SFINAE in a base class to constrain the conversion operators.
+// Otherwise, if we make them function templates and apply SFINAE directly on
+// them, we would not be able to do certain conversions (cf.
+// [over.ics.user/3]).
+template <typename T>
+using propagate_const_element_type = std::remove_reference_t<decltype(*std::declval<T &>())>;
+
+// Const conversion.
+// NON-STANDARD: checks that `const T` is convertible, not `T`.
+// See https://wg21.link/lwg3812
+template <typename T,
+         bool = std::disjunction_v<
+             std::is_pointer<T>,
+             std::is_convertible<const T, const propagate_const_element_type<T> *>
+             >
+         >
+struct propagate_const_const_conversion_operator_base
+{
+};
+
+template <typename T>
+struct propagate_const_const_conversion_operator_base<T, true>
+{
+    constexpr operator const propagate_const_element_type<T> *() const;
+};
+
+// Non-const conversion
+template <typename T,
+         bool = std::disjunction_v<
+             std::is_pointer<T>,
+             std::is_convertible<T, propagate_const_element_type<T> *>
+             >
+         >
+struct propagate_const_non_const_conversion_operator_base
+{
+};
+
+template <typename T>
+struct propagate_const_non_const_conversion_operator_base<T, true>
+{
+    constexpr operator propagate_const_element_type<T> *();
+};
+
+template <typename T>
+struct propagate_const_base
+    : propagate_const_const_conversion_operator_base<T>,
+      propagate_const_non_const_conversion_operator_base<T>
+{};
+
+} // namespace detail
+
+/*
+    TODO: This code could benefit from a C++20 overhaul:
+    * concepts
+    * three-way comparisons
+    * explicit(bool)
+
+    However we can't depend on C++20 yet...
+*/
+
+template <typename T>
+class propagate_const : public detail::propagate_const_base<T>
+{
+public:
+    using element_type = detail::propagate_const_element_type<T>;
+
+    // Special member functions
+    propagate_const() = default;
+    propagate_const(propagate_const &&) = default;
+    propagate_const &operator=(propagate_const &&) = default;
+    propagate_const(const propagate_const &) = delete;
+    propagate_const &operator=(const propagate_const &) = delete;
+    ~propagate_const() = default;
+
+    // Constructor from values
+
+    template <
+        typename U,
+        std::enable_if_t< // This constructor is enabled if:
+            std::conjunction_v<
+                std::is_constructible<T, U>, // 1) we can build a T from a U,
+                std::negation<detail::is_propagate_const<std::decay_t<U>>>, // 2) we are not making a
+                // converting constructor,
+                std::is_convertible<U, T> // 3) and the conversion from U to T is implicit;
+                >,
+            bool> = true>
+    /* implicit */ // then, this constructor is implicit too.
+    propagate_const(U &&other)
+        : m_t(std::forward<U>(other))
+    {
+    }
+
+    template <
+        typename U,
+        std::enable_if_t< // This constructor is enabled if:
+            std::conjunction_v<
+                std::is_constructible<T, U>, // 1) we can build a T from a U,
+                std::negation<detail::is_propagate_const<std::decay_t<U>>>, // 2) we are not making a
+                // converting constructor,
+                std::negation<std::is_convertible<U, T>> // 3) and the conversion from U to T is
+                // explicit;
+                >,
+            bool> = true>
+    explicit // then, this constructor is explicit.
+        propagate_const(U &&other)
+        : m_t(std::forward<U>(other))
+    {
+    }
+
+    // Constructors from other propagate_const (converting constructors)
+    template <typename U,
+             std::enable_if_t< // This constructor is enabled if:
+                 std::conjunction_v<std::is_constructible<T, U>, // 1) we can do the conversion,
+                                    std::is_convertible<U, T> // 2) and the conversion is implicit;
+                                    >,
+                 bool> = true>
+    /* implicit */ // then, this constructor is implicit.
+    constexpr propagate_const(propagate_const<U> &&other)
+        : m_t(std::move(get_underlying(other)))
+    {
+    }
+
+    template <typename U,
+             std::enable_if_t< // This constructor is enabled if:
+                 std::conjunction_v<std::is_constructible<T, U>, // 1) we can do the conversion,
+                                    std::negation<std::is_convertible<U, T>> // 2) and the
+                                    // conversion is
+                                    // explicit;
+                                    >,
+                 bool> = true>
+    explicit // then, this constructor is explicit.
+        constexpr propagate_const(propagate_const<U> &&other)
+        : m_t(std::move(get_underlying(other)))
+    {
+    }
+
+    // Converting assignment
+    template <typename U,
+             std::enable_if_t< // This assignment operator is enabled if
+                 std::is_convertible_v<U, T>, // the conversion from U to T is implicit
+                 bool> = true>
+    constexpr propagate_const &operator=(propagate_const<U> &&other)
+    {
+        m_t = std::move(get_underlying(other));
+        return *this;
+    }
+
+    template <typename U,
+             std::enable_if_t< // This assignment operator is enabled if:
+                 std::conjunction_v<
+                     std::is_convertible<U, T>, // 1) the conversion from U to T is implicit,
+                     std::negation<detail::is_propagate_const<std::decay_t<U>>> // 2) and U is not a
+                     // propagate_const
+                     >,
+                 bool> = true>
+    constexpr propagate_const &operator=(U &&other)
+    {
+        m_t = std::forward<U>(other);
+        return *this;
+    }
+
+    // Swap
+    constexpr void swap(propagate_const &other) noexcept(std::is_nothrow_swappable_v<T>)
+    {
+        using std::swap;
+        swap(m_t, other.m_t);
+    }
+
+    // Const observers
+    constexpr explicit operator bool() const { return static_cast<bool>(m_t); }
+
+    constexpr const element_type *get() const { return get_impl(m_t); }
+
+    constexpr const element_type &operator*() const { return *get(); }
+
+    constexpr const element_type *operator->() const { return get(); }
+
+    // Non-const observers
+    constexpr element_type *get() { return get_impl(m_t); }
+
+    constexpr element_type &operator*() { return *get(); }
+
+    constexpr element_type *operator->() { return get(); }
+
+    // Non-member utilities: extract the contained object
+    template <typename U>
+    friend constexpr auto &get_underlying(propagate_const<U> &p);
+
+    template <typename U>
+    friend constexpr const auto &get_underlying(const propagate_const<U> &p);
+
+private:
+    // Implementation of get() that works with raw pointers and smart
+    // pointers. Similar to std::to_address, but to_address is C++20,
+    // and propagate_const spec does not match it.
+    template <typename U>
+    static constexpr element_type *get_impl(U *u)
+    {
+        return u;
+    }
+
+    template <typename U>
+    static constexpr element_type *get_impl(U &u)
+    {
+        return u.get();
+    }
+
+    template <typename U>
+    static constexpr const element_type *get_impl(const U *u)
+    {
+        return u;
+    }
+
+    template <typename U>
+    static constexpr const element_type *get_impl(const U &u)
+    {
+        return u.get();
+    }
+
+    T m_t;
+};
+
+// Swap
+template <typename T,
+         std::enable_if_t<std::is_swappable_v<T>, bool> = true>
+constexpr void swap(propagate_const<T> &lhs, propagate_const<T> &rhs)
+    noexcept(noexcept(lhs.swap(rhs)))
+{
+    lhs.swap(rhs);
+}
+
+// Implementation of get_underlying
+template <typename T>
+constexpr auto &get_underlying(propagate_const<T> &p)
+{
+    return p.m_t;
+}
+
+template <typename T>
+constexpr const auto &get_underlying(const propagate_const<T> &p)
+{
+    return p.m_t;
+}
+
+// Implementation of the conversion operators
+template <typename T>
+constexpr detail::propagate_const_const_conversion_operator_base<T, true>
+    ::operator const detail::propagate_const_element_type<T> *() const
+{
+    return static_cast<const propagate_const<T> *>(this)->get();
+}
+
+template <typename T>
+constexpr detail::propagate_const_non_const_conversion_operator_base<T, true>
+    ::operator detail::propagate_const_element_type<T> *()
+{
+    return static_cast<propagate_const<T> *>(this)->get();
+}
+
+// Comparisons. As per spec, they're free function templates.
+
+// Comparisons against nullptr.
+template <typename T>
+constexpr bool operator==(const propagate_const<T> &p, std::nullptr_t)
+{
+    return get_underlying(p) == nullptr;
+}
+
+template <typename T>
+constexpr bool operator!=(const propagate_const<T> &p, std::nullptr_t)
+{
+    return get_underlying(p) != nullptr;
+}
+
+template <typename T>
+constexpr bool operator==(std::nullptr_t, const propagate_const<T> &p)
+{
+    return nullptr == get_underlying(p);
+}
+
+template <typename T>
+constexpr bool operator!=(std::nullptr_t, const propagate_const<T> &p)
+{
+    return nullptr == get_underlying(p);
+}
+
+// Comparisons between propagate_const
+#define DEFINE_PROPAGATE_CONST_COMPARISON_OP(op)                                              \
+template <typename T, typename U>                                                         \
+    constexpr bool operator op (const propagate_const<T> &lhs, const propagate_const<U> &rhs) \
+{                                                                                         \
+        return get_underlying(lhs) op get_underlying(rhs);                                    \
+}                                                                                         \
+
+    DEFINE_PROPAGATE_CONST_COMPARISON_OP(==)
+    DEFINE_PROPAGATE_CONST_COMPARISON_OP(!=)
+    DEFINE_PROPAGATE_CONST_COMPARISON_OP(<)
+    DEFINE_PROPAGATE_CONST_COMPARISON_OP(<=)
+    DEFINE_PROPAGATE_CONST_COMPARISON_OP(>)
+    DEFINE_PROPAGATE_CONST_COMPARISON_OP(>=)
+
+#undef DEFINE_PROPAGATE_CONST_COMPARISON_OP
+
+// Comparisons against other (smart) pointers
+#define DEFINE_PROPAGATE_CONST_MIXED_COMPARISON_OP(op)                       \
+    template <typename T, typename U>                                        \
+    constexpr bool operator op (const propagate_const<T> &lhs, const U &rhs) \
+{                                                                        \
+        return get_underlying(lhs) op rhs;                                   \
+}                                                                        \
+    template <typename T, typename U>                                        \
+    constexpr bool operator op (const T &lhs, const propagate_const<U> &rhs) \
+{                                                                        \
+        return lhs op get_underlying(rhs);                                   \
+}                                                                        \
+
+    DEFINE_PROPAGATE_CONST_MIXED_COMPARISON_OP(==)
+    DEFINE_PROPAGATE_CONST_MIXED_COMPARISON_OP(!=)
+    DEFINE_PROPAGATE_CONST_MIXED_COMPARISON_OP(<)
+    DEFINE_PROPAGATE_CONST_MIXED_COMPARISON_OP(<=)
+    DEFINE_PROPAGATE_CONST_MIXED_COMPARISON_OP(>)
+    DEFINE_PROPAGATE_CONST_MIXED_COMPARISON_OP(>=)
+
+#undef DEFINE_PROPAGATE_CONST_MIXED_COMPARISON_OP
+
+} // namespace KDToolBox
+
+// std::hash specialization
+namespace std
+{
+template <typename T>
+struct hash<KDToolBox::propagate_const<T>>
+{
+    constexpr size_t operator()(const KDToolBox::propagate_const<T> &t) const
+        noexcept(noexcept(hash<T>{}(get_underlying(t))))
+    {
+        return hash<T>{}(get_underlying(t));
+    }
+};
+
+#define DEFINE_COMP_OBJECT_SPECIALIZATION_FOR_PROPAGATE_CONST(COMP)     \
+template <typename T>                                               \
+    struct COMP<KDToolBox::propagate_const<T>>                          \
+{                                                                   \
+        constexpr bool operator()(const KDToolBox::propagate_const<T> &lhs, \
+                   const KDToolBox::propagate_const<T> &rhs) \
+    {                                                                   \
+            return COMP<T>{}(get_underlying(lhs), get_underlying(rhs));     \
+    }                                                                   \
+};                                                                  \
+
+    DEFINE_COMP_OBJECT_SPECIALIZATION_FOR_PROPAGATE_CONST(equal_to)
+    DEFINE_COMP_OBJECT_SPECIALIZATION_FOR_PROPAGATE_CONST(not_equal_to)
+    DEFINE_COMP_OBJECT_SPECIALIZATION_FOR_PROPAGATE_CONST(less)
+    DEFINE_COMP_OBJECT_SPECIALIZATION_FOR_PROPAGATE_CONST(greater)
+    DEFINE_COMP_OBJECT_SPECIALIZATION_FOR_PROPAGATE_CONST(less_equal)
+    DEFINE_COMP_OBJECT_SPECIALIZATION_FOR_PROPAGATE_CONST(greater_equal)
+
+#undef DEFINE_COMP_OBJECT_SPECIALIZATION
+
+} // namespace std
+
+#endif // KDTOOLBOX_PROPAGATE_CONST
diff --git a/src/lib/corelib/tools/qbs_export.h b/src/lib/corelib/tools/qbs_export.h
index 164aa4184..2cfe1cd82 100644
--- a/src/lib/corelib/tools/qbs_export.h
+++ b/src/lib/corelib/tools/qbs_export.h
@@ -53,14 +53,14 @@
 #else
 #   ifdef QBS_LIBRARY
 #       define QBS_EXPORT QBS_DECL_EXPORT
-#       ifdef QBS_ENABLE_UNIT_TESTS
+#       ifdef QBS_WITH_TESTS
 #           define QBS_AUTOTEST_EXPORT QBS_DECL_EXPORT
 #       else
 #           define QBS_AUTOTEST_EXPORT
 #       endif
 #   else
 #       define QBS_EXPORT QBS_DECL_IMPORT
-#       ifdef QBS_ENABLE_UNIT_TESTS
+#       ifdef QBS_WITH_TESTS
 #           define QBS_AUTOTEST_EXPORT QBS_DECL_IMPORT
 #       else
 #           define QBS_AUTOTEST_EXPORT
diff --git a/src/lib/corelib/tools/qbsassert.h b/src/lib/corelib/tools/qbsassert.h
index e8dfcacf8..65352fdb3 100644
--- a/src/lib/corelib/tools/qbsassert.h
+++ b/src/lib/corelib/tools/qbsassert.h
@@ -59,6 +59,11 @@ QBS_EXPORT void writeAssertLocation(const char *condition, const char *file, int
 // The do {} while (0) is here to enforce the use of a semicolon after QBS_ASSERT.
 // action can also be continue or break. Copied from qtcassert.h in Qt Creator.
 
+#define QBS_GUARD(cond) \
+    (Q_LIKELY(cond)     \
+        ? true          \
+        : (::qbs::Internal::writeAssertLocation(#cond, __FILE__, __LINE__), false))
+
 #define QBS_CHECK(cond)\
     do {\
         if (Q_LIKELY(cond)) {} else {\
diff --git a/src/lib/corelib/tools/qbspluginmanager.cpp b/src/lib/corelib/tools/qbspluginmanager.cpp
index d4e92e22a..0816d9d25 100644
--- a/src/lib/corelib/tools/qbspluginmanager.cpp
+++ b/src/lib/corelib/tools/qbspluginmanager.cpp
@@ -79,7 +79,7 @@ QbsPluginManager::~QbsPluginManager()
 {
     unloadStaticPlugins();
 
-    for (QLibrary * const lib : qAsConst(d->libs)) {
+    for (QLibrary * const lib : std::as_const(d->libs)) {
         auto unload = reinterpret_cast<QbsPluginUnloadFunction>(lib->resolve("QbsPluginUnload"));
         if (unload)
             unload();
diff --git a/src/lib/corelib/tools/qbsprocess.cpp b/src/lib/corelib/tools/qbsprocess.cpp
index 52ce3f25a..3fdc05afe 100644
--- a/src/lib/corelib/tools/qbsprocess.cpp
+++ b/src/lib/corelib/tools/qbsprocess.cpp
@@ -65,7 +65,7 @@ void QbsProcess::start(const QString &command, const QStringList &arguments)
 {
     if (m_socketError) {
         m_error = QProcess::FailedToStart;
-        emit error(m_error);
+        emit errorOccurred(m_error);
         return;
     }
     m_command = command;
@@ -95,7 +95,7 @@ void QbsProcess::cancel()
         m_errorString = Tr::tr("Process canceled before it was started.");
         m_error = QProcess::FailedToStart;
         m_state = QProcess::NotRunning;
-        emit error(m_error);
+        emit errorOccurred(m_error);
         break;
     case QProcess::Running:
         sendPacket(StopProcessPacket(token()));
@@ -120,7 +120,7 @@ void QbsProcess::sendPacket(const LauncherPacket &packet)
 
 QByteArray QbsProcess::readAndClear(QByteArray &data)
 {
-    const QByteArray tmp = data;
+    QByteArray tmp = data;
     data.clear();
     return tmp;
 }
@@ -155,7 +155,7 @@ void QbsProcess::handleSocketError(const QString &message)
     if (m_state != QProcess::NotRunning) {
         m_state = QProcess::NotRunning;
         m_error = QProcess::FailedToStart;
-        emit error(m_error);
+        emit errorOccurred(m_error);
     }
 }
 
@@ -166,7 +166,7 @@ void QbsProcess::handleErrorPacket(const QByteArray &packetData)
     m_error = packet.error;
     m_errorString = packet.errorString;
     m_state = QProcess::NotRunning;
-    emit error(m_error);
+    emit errorOccurred(m_error);
 }
 
 void QbsProcess::handleFinishedPacket(const QByteArray &packetData)
diff --git a/src/lib/corelib/tools/qbsprocess.h b/src/lib/corelib/tools/qbsprocess.h
index 2181818f0..3314e3d3c 100644
--- a/src/lib/corelib/tools/qbsprocess.h
+++ b/src/lib/corelib/tools/qbsprocess.h
@@ -69,7 +69,7 @@ public:
     QString errorString() const { return m_errorString; }
 
 signals:
-    void error(QProcess::ProcessError error);
+    void errorOccurred(QProcess::ProcessError error);
     void finished(int exitCode);
 
 private:
diff --git a/src/lib/corelib/tools/qttools.cpp b/src/lib/corelib/tools/qttools.cpp
index c2ef91f16..40e0d0778 100644
--- a/src/lib/corelib/tools/qttools.cpp
+++ b/src/lib/corelib/tools/qttools.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qttools.h"
+#include "porting.h"
 
 #include <QtCore/qprocess.h>
 
@@ -64,15 +65,15 @@ size_t hash<QVariant>::operator()(const QVariant &v) const noexcept
 
 QT_BEGIN_NAMESPACE
 
-uint qHash(const QStringList &list)
+qbs::QHashValueType qHash(const QStringList &list)
 {
-    uint s = 0;
+    qbs::QHashValueType s = 0;
     for (const QString &n : list)
         s ^= qHash(n) + 0x9e3779b9 + (s << 6) + (s >> 2);
     return s;
 }
 
-uint qHash(const QProcessEnvironment &env)
+qbs::QHashValueType qHash(const QProcessEnvironment &env)
 {
     return qHash(env.toStringList());
 }
diff --git a/src/lib/corelib/tools/qttools.h b/src/lib/corelib/tools/qttools.h
index 86e81936b..029948be4 100644
--- a/src/lib/corelib/tools/qttools.h
+++ b/src/lib/corelib/tools/qttools.h
@@ -41,6 +41,7 @@
 #define QBSQTTOOLS_H
 
 #include <tools/qbsassert.h>
+#include <tools/porting.h>
 #include <tools/stlutils.h>
 
 #include <QtCore/qhash.h>
@@ -54,19 +55,7 @@ QT_BEGIN_NAMESPACE
 class QProcessEnvironment;
 QT_END_NAMESPACE
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-#define QBS_SKIP_EMPTY_PARTS QString::SkipEmptyParts
-#else
-#define QBS_SKIP_EMPTY_PARTS Qt::SkipEmptyParts
-#endif
-
 namespace std {
-#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-template<> struct hash<QString> {
-    std::size_t operator()(const QString &s) const { return qHash(s); }
-};
-#endif
-
 template<typename T1, typename T2> struct hash<std::pair<T1, T2>>
 {
     size_t operator()(const pair<T1, T2> &x) const
@@ -136,36 +125,30 @@ template<> struct hash<QVariantHash>
 
 QT_BEGIN_NAMESPACE
 
-uint qHash(const QStringList &list);
-uint qHash(const QProcessEnvironment &env);
+qbs::QHashValueType qHash(const QStringList &list);
+qbs::QHashValueType qHash(const QProcessEnvironment &env);
 
 template<typename... Args>
-uint qHash(const std::tuple<Args...> &tuple)
+qbs::QHashValueType qHash(const std::tuple<Args...> &tuple)
 {
     return std::hash<std::tuple<Args...>>()(tuple) % std::numeric_limits<uint>::max();
 }
 
-inline uint qHash(const QVariant &v)
+inline qbs::QHashValueType qHash(const QVariant &v)
 {
     return std::hash<QVariant>()(v) % std::numeric_limits<uint>::max();
 }
 
-inline uint qHash(const QVariantMap &v)
+inline qbs::QHashValueType qHash(const QVariantMap &v)
 {
     return std::hash<QVariantMap>()(v) % std::numeric_limits<uint>::max();
 }
 
-inline uint qHash(const QVariantHash &v)
+inline qbs::QHashValueType qHash(const QVariantHash &v)
 {
     return std::hash<QVariantHash>()(v) % std::numeric_limits<uint>::max();
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-namespace Qt {
-inline QTextStream &endl(QTextStream &stream) { return stream << QT_PREPEND_NAMESPACE(endl); }
-} // namespace Qt
-#endif
-
 QT_END_NAMESPACE
 
 namespace qbs {
@@ -173,32 +156,20 @@ namespace qbs {
 template <class T>
 QSet<T> toSet(const QList<T> &list)
 {
-#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-    return list.toSet();
-#else
     return QSet<T>(list.begin(), list.end());
-#endif
 }
 
 template<class T>
 QList<T> toList(const QSet<T> &set)
 {
-#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-    return set.toList();
-#else
     return QList<T>(set.begin(), set.end());
-#endif
 }
 
 template<typename K, typename V>
 QHash<K, V> &unite(QHash<K, V> &h, const QHash<K, V> &other)
 {
-#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-    return h.unite(other);
-#else
     h.insert(other);
     return h;
-#endif
 }
 
 inline void setupDefaultCodec(QTextStream &stream)
@@ -228,6 +199,51 @@ inline bool qVariantConvert(QVariant &variant, int typeId)
 #endif
 }
 
+inline QMetaType::Type qVariantType(const QVariant &v)
+{
+    return static_cast<QMetaType::Type>(
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+        v.metaType().id()
+#else
+        v.type()
+#endif
+    );
+}
+
+template<typename T>
+inline QVariant typedNullVariant()
+{
+    const auto metaType = QMetaType::fromType<T>();
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    return QVariant(metaType, nullptr);
+#else
+    return QVariant(static_cast<QVariant::Type>(metaType.id()));
+#endif
+}
+
+inline bool qVariantsEqual(const QVariant &v1, const QVariant &v2)
+{
+    return v1.isNull() == v2.isNull() && v1 == v2;
+}
+
+inline bool qVariantMapsEqual(const QVariantMap &m1, const QVariantMap &m2)
+{
+    if (m1.size() != m2.size())
+        return false;
+    if (m1.isSharedWith(m2))
+        return true;
+
+    auto it1 = m1.cbegin();
+    auto it2 = m2.cbegin();
+    while (it1 != m1.cend()) {
+        if (it1.key() != it2.key() || !qVariantsEqual(it1.value(), it2.value()))
+            return false;
+        ++it2;
+        ++it1;
+    }
+    return true;
+}
+
 } // namespace qbs
 
 #endif // QBSQTTOOLS_H
diff --git a/src/lib/corelib/tools/scripttools.cpp b/src/lib/corelib/tools/scripttools.cpp
index adf930cf0..e89e4a0ad 100644
--- a/src/lib/corelib/tools/scripttools.cpp
+++ b/src/lib/corelib/tools/scripttools.cpp
@@ -39,9 +39,14 @@
 
 #include "scripttools.h"
 
-#include <QtCore/qdatastream.h>
+#include <language/scriptengine.h>
+#include <tools/error.h>
 
-#include <QtScript/qscriptengine.h>
+#include <QtCore/qdatastream.h>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qjsonarray.h>
+#include <QtCore/qjsondocument.h>
+#include <QtCore/qjsonobject.h>
 
 namespace qbs {
 namespace Internal {
@@ -62,20 +67,262 @@ QVariant getConfigProperty(const QVariantMap &cfg, const QStringList &name)
 {
     if (name.length() == 1)
         return cfg.value(name.front());
-    else
-        return getConfigProperty(cfg.value(name.front()).toMap(), name.mid(1));
+    return getConfigProperty(cfg.value(name.front()).toMap(), name.mid(1));
 }
 
-TemporaryGlobalObjectSetter::TemporaryGlobalObjectSetter(const QScriptValue &object)
+TemporaryGlobalObjectSetter::TemporaryGlobalObjectSetter(
+        ScriptEngine *engine, const JSValue &object)
+    : m_engine(engine), m_oldGlobalObject(engine->globalObject())
 {
-    QScriptEngine *engine = object.engine();
-    m_oldGlobalObject = engine->globalObject();
     engine->setGlobalObject(object);
 }
 
 TemporaryGlobalObjectSetter::~TemporaryGlobalObjectSetter()
 {
-    m_oldGlobalObject.engine()->setGlobalObject(m_oldGlobalObject);
+    m_engine->setGlobalObject(m_oldGlobalObject);
+}
+
+JsException::JsException(JsException &&other) noexcept
+    : m_ctx(other.m_ctx), m_exception(other.m_exception),
+      m_fallbackLocation(std::move(other.m_fallbackLocation))
+{
+    other.m_exception = JS_NULL;
+}
+
+JsException::~JsException() { JS_FreeValue(m_ctx, m_exception); }
+
+QString JsException::message() const
+{
+    if (JS_IsError(m_ctx, m_exception))
+        return getJsStringProperty(m_ctx, m_exception, QStringLiteral("message"));
+    const QVariant v = getJsVariant(m_ctx, m_exception);
+    switch (static_cast<QMetaType::Type>(v.userType())) {
+    case QMetaType::QVariantMap:
+        return QString::fromUtf8(QJsonDocument(QJsonObject::fromVariantMap(v.toMap()))
+                                 .toJson(QJsonDocument::Indented));
+    case QMetaType::QStringList:
+        return QString::fromUtf8(QJsonDocument(QJsonArray::fromStringList(v.toStringList()))
+                                 .toJson(QJsonDocument::Indented));
+    case QMetaType::QVariantList:
+        return QString::fromUtf8(QJsonDocument(QJsonArray::fromVariantList(v.toList()))
+                                 .toJson(QJsonDocument::Indented));
+    default:
+        return v.toString();
+    }
+}
+
+const QStringList JsException::stackTrace() const
+{
+    return getJsStringProperty(m_ctx, m_exception, QLatin1String("stack"))
+            .split(QLatin1Char('\n'), Qt::SkipEmptyParts);
+}
+
+ErrorInfo JsException::toErrorInfo() const
+{
+    const QString msg = message();
+    ErrorInfo e(msg, stackTrace());
+    if (e.hasLocation() || !m_fallbackLocation.isValid())
+        return e;
+    return {msg, m_fallbackLocation};
+}
+
+void defineJsProperty(JSContext *ctx, JSValueConst obj, const QString &prop, JSValue val)
+{
+    JS_DefinePropertyValueStr(ctx, obj, prop.toUtf8().constData(), val, 0);
+}
+
+JSValue getJsProperty(JSContext *ctx, JSValue obj, const QString &prop)
+{
+    return JS_GetPropertyStr(ctx, obj, prop.toUtf8().constData());
+}
+
+void setJsProperty(JSContext *ctx, JSValue obj, const QString &prop, JSValue val)
+{
+    if (JS_SetPropertyStr(ctx, obj, prop.toUtf8().constData(), val) <= 0)
+        qDebug() << "Oje!";
+}
+
+void setJsProperty(JSContext *ctx, JSValue obj, const QString &prop, const QString &val)
+{
+    setJsProperty(ctx, obj, prop, makeJsString(ctx, val));
+}
+
+void handleJsProperties(JSContext *ctx, JSValue obj,
+                        const std::function<void (const JSAtom &,
+                                                  const JSPropertyDescriptor &)> &handler)
+{
+    struct PropsHolder {
+        PropsHolder(JSContext *ctx) : ctx(ctx) {}
+        ~PropsHolder() {
+            for (uint32_t i = 0; i < count; ++i)
+                JS_FreeAtom(ctx, props[i].atom);
+            js_free(ctx, props);
+        }
+        JSContext * const ctx;
+        JSPropertyEnum *props = nullptr;
+        uint32_t count = 0;
+    } propsHolder(ctx);
+    JS_GetOwnPropertyNames(ctx, &propsHolder.props, &propsHolder.count, obj, JS_GPN_STRING_MASK);
+    for (uint32_t i = 0; i < propsHolder.count; ++i) {
+        JSPropertyDescriptor desc{0, JS_UNDEFINED, JS_UNDEFINED, JS_UNDEFINED};
+        JS_GetOwnProperty(ctx, &desc, obj, propsHolder.props[i].atom);
+        const ScopedJsValueList valueHolder(ctx, {desc.value, desc.getter, desc.setter});
+        handler(propsHolder.props[i].atom, desc);
+    }
+}
+
+QString getJsString(JSContext *ctx, JSValueConst val)
+{
+    size_t strLen;
+    const char * const str = JS_ToCStringLen(ctx, &strLen, val);
+    QString s = QString::fromUtf8(str, strLen);
+    JS_FreeCString(ctx, str);
+    return s;
+}
+
+QString getJsStringProperty(JSContext *ctx, JSValue obj, const QString &prop)
+{
+    const ScopedJsValue sv(ctx, getJsProperty(ctx, obj, prop));
+    return getJsString(ctx, sv);
+}
+
+int getJsIntProperty(JSContext *ctx, JSValue obj, const QString &prop)
+{
+    return JS_VALUE_GET_INT(getJsProperty(ctx, obj, prop));
+}
+
+bool getJsBoolProperty(JSContext *ctx, JSValue obj, const QString &prop)
+{
+    return JS_VALUE_GET_BOOL(getJsProperty(ctx, obj, prop));
+}
+
+JSValue makeJsArrayBuffer(JSContext *ctx, const QByteArray &s)
+{
+    return ScriptEngine::engineForContext(ctx)->asJsValue(s);
+}
+
+JSValue makeJsString(JSContext *ctx, const QString &s)
+{
+    return ScriptEngine::engineForContext(ctx)->asJsValue(s);
+}
+
+JSValue makeJsStringList(JSContext *ctx, const QStringList &l)
+{
+    return ScriptEngine::engineForContext(ctx)->asJsValue(l);
+}
+
+JSValue throwError(JSContext *ctx, const QString &message)
+{
+    return JS_Throw(ctx, makeJsString(ctx, message));
+}
+
+QStringList getJsStringList(JSContext *ctx, JSValue val)
+{
+    if (JS_IsString(val))
+        return {getJsString(ctx, val)};
+    if (!JS_IsArray(ctx, val))
+        return {};
+    const int size = getJsIntProperty(ctx, val, QLatin1String("length"));
+    QStringList l;
+    for (int i = 0; i < size; ++i) {
+        const ScopedJsValue elem(ctx, JS_GetPropertyUint32(ctx, val, i));
+        l << getJsString(ctx, elem);
+    }
+    return l;
+}
+
+JSValue makeJsVariant(JSContext *ctx, const QVariant &v, quintptr id)
+{
+    return ScriptEngine::engineForContext(ctx)->asJsValue(v, id);
+}
+
+JSValue makeJsVariantList(JSContext *ctx, const QVariantList &l, quintptr id)
+{
+    return ScriptEngine::engineForContext(ctx)->asJsValue(l, id);
+}
+
+JSValue makeJsVariantMap(JSContext *ctx, const QVariantMap &m, quintptr id)
+{
+    return ScriptEngine::engineForContext(ctx)->asJsValue(m, id);
+}
+
+static QVariant getJsVariantImpl(JSContext *ctx, JSValue val, QList<JSValue> path)
+{
+    if (JS_IsString(val))
+        return getJsString(ctx, val);
+    if (JS_IsBool(val))
+        return bool(JS_VALUE_GET_BOOL(val));
+    if (JS_IsArrayBuffer(val)) {
+        size_t size = 0;
+        const auto data = JS_GetArrayBuffer(ctx, &size, val);
+        if (!data || !size)
+            return QByteArray();
+        return QByteArray(reinterpret_cast<const char *>(data), size);
+    }
+    if (JS_IsArray(ctx, val)) {
+        if (path.contains(val))
+            return {};
+        path << val;
+        QVariantList l;
+        const int size = getJsIntProperty(ctx, val, QLatin1String("length"));
+        for (int i = 0; i < size; ++i) {
+            const ScopedJsValue sv(ctx, JS_GetPropertyUint32(ctx, val, i));
+            l << getJsVariantImpl(ctx, sv, path);
+        }
+        return l;
+    }
+    if (JS_IsDate(val)) {
+        ScopedJsValue toString(ctx, getJsProperty(ctx, val, QLatin1String("toISOString")));
+        if (!JS_IsFunction(ctx, toString))
+            return {};
+        ScopedJsValue dateString(ctx, JS_Call(ctx, toString, val, 0, nullptr));
+        if (!JS_IsString(dateString))
+            return {};
+        return QDateTime::fromString(getJsString(ctx, dateString), Qt::ISODateWithMs);
+    }
+    if (JS_IsObject(val)) {
+        if (path.contains(val))
+            return {};
+        path << val;
+        QVariantMap map;
+        handleJsProperties(ctx, val, [ctx, &map, path](const JSAtom &prop, const JSPropertyDescriptor &desc) {
+            map.insert(getJsString(ctx, prop), getJsVariantImpl(ctx, desc.value, path));
+        });
+        return map;
+    }
+    const auto tag = JS_VALUE_GET_TAG(val);
+    if (tag == JS_TAG_INT)
+        return JS_VALUE_GET_INT(val);
+    else if (JS_TAG_IS_FLOAT64(tag))
+        return JS_VALUE_GET_FLOAT64(val);
+    return {};
+}
+
+QVariant getJsVariant(JSContext *ctx, JSValue val)
+{
+    return getJsVariantImpl(ctx, val, {});
+}
+
+QStringList getJsStringListProperty(JSContext *ctx, JSValue obj, const QString &prop)
+{
+    JSValue array = getJsProperty(ctx, obj, prop);
+    QStringList list = getJsStringList(ctx, array);
+    JS_FreeValue(ctx, array);
+    return list;
+}
+
+QVariant getJsVariantProperty(JSContext *ctx, JSValue obj, const QString &prop)
+{
+    const JSValue vv = getJsProperty(ctx, obj, prop);
+    QVariant v = getJsVariant(ctx, vv);
+    JS_FreeValue(ctx, vv);
+    return v;
+}
+
+QString getJsString(JSContext *ctx, JSAtom atom)
+{
+    const ScopedJsValue atomString(ctx, JS_AtomToString(ctx, atom));
+    return getJsString(ctx, atomString);
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/tools/scripttools.h b/src/lib/corelib/tools/scripttools.h
index 4a258b98f..ac7ed9928 100644
--- a/src/lib/corelib/tools/scripttools.h
+++ b/src/lib/corelib/tools/scripttools.h
@@ -40,57 +40,172 @@
 #ifndef QBS_SCRIPTTOOLS_H
 #define QBS_SCRIPTTOOLS_H
 
-#include <tools/qbs_export.h>
+#include "codelocation.h"
+#include "porting.h"
+#include "qbs_export.h"
 
+#include <quickjs.h>
+
+#include <QtCore/qhash.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qvariant.h>
 
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptprogram.h>
-#include <QtScript/qscriptvalue.h>
+#include <utility>
+#include <vector>
 
 namespace qbs {
+class ErrorInfo;
 namespace Internal {
+class ScriptEngine;
 
-template <typename C>
-QScriptValue toScriptValue(QScriptEngine *scriptEngine, const C &container)
-{
-    QScriptValue v = scriptEngine->newArray(container.size());
-    int i = 0;
-    for (const typename C::value_type &item : container)
-        v.setProperty(i++, scriptEngine->toScriptValue(item));
-    return v;
-}
+using JSValueList = std::vector<JSValue>;
 
-void setConfigProperty(QVariantMap &cfg, const QStringList &name, const QVariant &value);
-QVariant QBS_AUTOTEST_EXPORT getConfigProperty(const QVariantMap &cfg, const QStringList &name);
+void defineJsProperty(JSContext *ctx, JSValueConst obj, const QString &prop, JSValue val);
+JSValue getJsProperty(JSContext *ctx, JSValueConst obj, const QString &prop);
+void setJsProperty(JSContext *ctx, JSValueConst obj, const QString &prop, JSValue val);
+void setJsProperty(JSContext *ctx, JSValueConst obj, const QString &prop, const QString &val);
+QString getJsStringProperty(JSContext *ctx, JSValueConst obj, const QString &prop);
+QStringList getJsStringListProperty(JSContext *ctx, JSValueConst obj, const QString &prop);
+int getJsIntProperty(JSContext *ctx, JSValueConst obj, const QString &prop);
+bool getJsBoolProperty(JSContext *ctx, JSValueConst obj, const QString &prop);
+QVariant getJsVariantProperty(JSContext *ctx, JSValueConst obj, const QString &prop);
+QString getJsString(JSContext *ctx, JSValueConst val);
+QString getJsString(JSContext *ctx, JSAtom atom);
+QBS_AUTOTEST_EXPORT QVariant getJsVariant(JSContext *ctx, JSValueConst val);
+JSValue makeJsArrayBuffer(JSContext *ctx, const QByteArray &s);
+JSValue makeJsString(JSContext *ctx, const QString &s);
+JSValue makeJsStringList(JSContext *ctx, const QStringList &l);
+JSValue makeJsVariant(JSContext *ctx, const QVariant &v, quintptr id = 0);
+JSValue makeJsVariantList(JSContext *ctx, const QVariantList &l, quintptr id = 0);
+JSValue makeJsVariantMap(JSContext *ctx, const QVariantMap &m, quintptr id = 0);
+QStringList getJsStringList(JSContext *ctx, JSValueConst val);
+JSValue throwError(JSContext *ctx, const QString &message);
+using PropertyHandler = std::function<void(const JSAtom &, const JSPropertyDescriptor &)>;
+void handleJsProperties(JSContext *ctx, JSValueConst obj, const  PropertyHandler &handler);
+inline quintptr jsObjectId(const JSValue &val) { return quintptr(JS_VALUE_GET_OBJ(val)); }
 
 template <class T>
-void attachPointerTo(QScriptValue &scriptValue, T *ptr)
+void attachPointerTo(JSValue &scriptValue, T *ptr)
 {
-    QVariant v;
-    v.setValue<quintptr>(reinterpret_cast<quintptr>(ptr));
-    scriptValue.setData(scriptValue.engine()->newVariant(v));
+    JS_SetOpaque(scriptValue, const_cast<std::remove_const_t<T> *>(ptr));
 }
 
 template <class T>
-T *attachedPointer(const QScriptValue &scriptValue)
+T *attachedPointer(const JSValue &scriptValue, JSClassID id)
 {
-    const auto ptr = scriptValue.data().toVariant().value<quintptr>();
-    return reinterpret_cast<T *>(ptr);
+    return reinterpret_cast<T *>(JS_GetOpaque(scriptValue, id));
 }
 
 class TemporaryGlobalObjectSetter
 {
 public:
-    TemporaryGlobalObjectSetter(const QScriptValue &object);
+    TemporaryGlobalObjectSetter(ScriptEngine *engine, const JSValue &object);
     ~TemporaryGlobalObjectSetter();
 
 private:
-    QScriptValue m_oldGlobalObject;
+    ScriptEngine * const m_engine;
+    const JSValue m_oldGlobalObject;
+};
+
+class ScopedJsValue
+{
+public:
+    ScopedJsValue(JSContext *ctx, JSValue v) : m_context(ctx), m_value(v) {}
+    void setValue(JSValue v) { JS_FreeValue(m_context, m_value); m_value = v; }
+    ~ScopedJsValue() { JS_FreeValue(m_context, m_value); }
+    operator JSValue() const { return m_value; }
+    JSValue release() { const JSValue v = m_value; m_value = JS_UNDEFINED; return v; }
+    void reset(JSValue v) { JS_FreeValue(m_context, m_value); m_value = v; }
+
+    ScopedJsValue(const ScopedJsValue &) = delete;
+    ScopedJsValue &operator=(const ScopedJsValue &) = delete;
+
+    ScopedJsValue(ScopedJsValue && other) : m_context(other.m_context), m_value(other.m_value)
+    {
+        other.m_value = JS_UNDEFINED;
+    }
+
+private:
+    JSContext * const m_context;
+    JSValue m_value;
 };
 
+class ScopedJsValueList
+{
+public:
+    ScopedJsValueList(JSContext *ctx, const JSValueList &l) : m_context(ctx), m_list(l) {}
+    ~ScopedJsValueList() { for (const JSValue v : m_list) JS_FreeValue(m_context, v); }
+    operator JSValueList() const { return m_list; }
+
+    ScopedJsValueList(const ScopedJsValueList &) = delete;
+    ScopedJsValueList &operator=(const ScopedJsValueList &) = delete;
+
+    ScopedJsValueList(ScopedJsValueList && other) noexcept
+        : m_context(other.m_context), m_list(std::move(other.m_list))
+    {
+        other.m_list.clear();
+    }
+
+private:
+    JSContext * const m_context;
+    JSValueList m_list;
+};
+
+class ScopedJsAtom
+{
+public:
+    ScopedJsAtom(JSContext *ctx, JSAtom a) : m_context(ctx), m_atom(a) {}
+    ScopedJsAtom(JSContext *ctx, const QByteArray &s)
+        : ScopedJsAtom(ctx, JS_NewAtom(ctx, s.constData())) {}
+    ScopedJsAtom(JSContext *ctx, const QString &s) : ScopedJsAtom(ctx, s.toUtf8()) {}
+    ~ScopedJsAtom() { JS_FreeAtom(m_context, m_atom); }
+    operator JSAtom() const { return m_atom; }
+
+    ScopedJsAtom(const ScopedJsAtom &) = delete;
+    ScopedJsAtom&operator=(const ScopedJsAtom &) = delete;
+
+    ScopedJsAtom(ScopedJsAtom &&other) : m_context(other.m_context), m_atom(other.m_atom)
+    {
+        other.m_atom = 0;
+    }
+
+private:
+    JSContext * const m_context;
+    JSAtom m_atom;
+};
+
+class QBS_AUTOTEST_EXPORT JsException
+{
+public:
+    JsException(JSContext *ctx, JSValue ex, const CodeLocation &fallbackLocation)
+        : m_ctx(ctx), m_exception(ex), m_fallbackLocation(fallbackLocation) {}
+    JsException(JsException && other) noexcept;
+    ~JsException();
+    JsException(const JsException &) = delete;
+    JsException &operator=(const JsException &) = delete;
+
+    operator bool() const { return !JS_IsNull(m_exception); }
+    QString message() const;
+    const QStringList stackTrace() const;
+    ErrorInfo toErrorInfo() const;
+private:
+    JSContext *m_ctx;
+    JSValue m_exception;
+    CodeLocation m_fallbackLocation;
+};
+
+void setConfigProperty(QVariantMap &cfg, const QStringList &name, const QVariant &value);
+QVariant QBS_AUTOTEST_EXPORT getConfigProperty(const QVariantMap &cfg, const QStringList &name);
+
 } // namespace Internal
 } // namespace qbs
 
+// Only to be used for objects!
+#ifndef JS_NAN_BOXING
+inline bool operator==(JSValue v1, JSValue v2) { return v1.u.ptr == v2.u.ptr; }
+inline bool operator!=(JSValue v1, JSValue v2) { return !(v1 == v2); }
+inline bool operator<(JSValue v1, JSValue v2) { return v1.u.ptr < v2.u.ptr; }
+inline qbs::QHashValueType qHash(const JSValue &v) { return QT_PREPEND_NAMESPACE(qHash)(v.u.ptr); }
+#endif
+
 #endif // QBS_SCRIPTTOOLS_H
diff --git a/src/lib/corelib/tools/set.h b/src/lib/corelib/tools/set.h
index ddd38b6f3..461175615 100644
--- a/src/lib/corelib/tools/set.h
+++ b/src/lib/corelib/tools/set.h
@@ -292,11 +292,7 @@ template<typename T> void Set<T>::store(PersistentPool &pool) const
 #ifdef QT_CORE_LIB
 template<typename T> QStringList Set<T>::toStringList() const
 {
-    QStringList sl;
-    sl.reserve(int(size()));
-    std::transform(cbegin(), cend(), std::back_inserter(sl),
-                   [this](const T &e) { return toString(e); });
-    return sl;
+    return transformed<QStringList>(*this, [this](const T &e) { return toString(e); });
 }
 
 template<typename T> QString Set<T>::toString() const
diff --git a/src/lib/corelib/tools/settings.cpp b/src/lib/corelib/tools/settings.cpp
index 8b22c45e5..4a3d9d727 100644
--- a/src/lib/corelib/tools/settings.cpp
+++ b/src/lib/corelib/tools/settings.cpp
@@ -135,13 +135,22 @@ QStringList Settings::allKeys(Scopes scopes) const
     return keys;
 }
 
-QStringList Settings::directChildren(const QString &parentGroup, Scope scope) const
+QStringList Settings::directChildren(const QString &parentGroup, Scopes scopes) const
 {
-    QSettings * const settings = settingsForScope(scope);
-    settings->beginGroup(internalRepresentation(parentGroup));
-    QStringList children = settings->childGroups();
-    children << settings->childKeys();
-    settings->endGroup();
+    auto helper = [this, &parentGroup](const Scope scope) {
+        QSettings * const settings = settingsForScope(scope);
+        settings->beginGroup(internalRepresentation(parentGroup));
+        QStringList children = settings->childGroups();
+        children << settings->childKeys();
+        settings->endGroup();
+        return children;
+    };
+
+    QStringList children;
+    if (scopes & UserScope)
+        children += helper(UserScope);
+    if (scopes & SystemScope)
+        children += helper(SystemScope);
     fixupKeys(children);
     return children;
 }
diff --git a/src/lib/corelib/tools/settings.h b/src/lib/corelib/tools/settings.h
index 4ea148af0..7c9c52c9e 100644
--- a/src/lib/corelib/tools/settings.h
+++ b/src/lib/corelib/tools/settings.h
@@ -70,7 +70,7 @@ public:
     QVariant value(const QString &key, Scopes scopes,
                    const QVariant &defaultValue = QVariant()) const;
     QStringList allKeys(Scopes scopes) const;
-    QStringList directChildren(const QString &parentGroup, Scope scope) const; // Keys and groups.
+    QStringList directChildren(const QString &parentGroup, Scopes scopes) const; // Keys and groups.
     QStringList allKeysWithPrefix(const QString &group, Scopes scopes) const;
     void setValue(const QString &key, const QVariant &value);
     void remove(const QString &key);
diff --git a/src/lib/corelib/tools/settingscreator.cpp b/src/lib/corelib/tools/settingscreator.cpp
index 3fdaf0bc3..2cef0e5ce 100644
--- a/src/lib/corelib/tools/settingscreator.cpp
+++ b/src/lib/corelib/tools/settingscreator.cpp
@@ -53,14 +53,26 @@
 namespace qbs {
 namespace Internal {
 
+namespace {
+QString getBaseDir(QString baseDir) {
+    if (!baseDir.isEmpty())
+        return baseDir;
+
+    const char key[] = "QBS_SETTINGS_DIR";
+    if (qEnvironmentVariableIsSet(key))
+        return QLatin1String(qgetenv(key));
+
+    return {};
+}
+} // namespace
+
 static QSettings::Format format()
 {
     return HostOsInfo::isWindowsHost() ? QSettings::IniFormat : QSettings::NativeFormat;
 }
 
-
 SettingsCreator::SettingsCreator(QString baseDir)
-    : m_settingsBaseDir(std::move(baseDir))
+    : m_settingsBaseDir(getBaseDir(std::move(baseDir)))
     , m_qbsVersion(Version::fromString(QLatin1String(QBS_VERSION)))
 {
 }
@@ -84,46 +96,15 @@ void SettingsCreator::migrate()
     QString oldSettingsDir = m_settingsBaseDir;
     if (thePredecessor.isValid())
         oldSettingsDir.append(QLatin1String("/qbs/")).append(thePredecessor.toString());
-    QString oldProfilesDir = oldSettingsDir;
-    if (!thePredecessor.isValid())
-        oldProfilesDir += QLatin1String("/qbs");
-    oldProfilesDir += QLatin1String("/profiles");
-    const QString newProfilesDir = m_newSettingsDir + QLatin1String("/profiles");
-    QString errorMessage;
-    if (QFileInfo(oldProfilesDir).exists()
-            && !copyFileRecursion(oldProfilesDir, newProfilesDir, false, true, &errorMessage)) {
-        qWarning() << "Error in settings migration: " << errorMessage;
-    }
     const QString oldSettingsFilePath = oldSettingsDir + QLatin1Char('/') + m_settingsFileName;
-    if (QFileInfo(oldSettingsFilePath).exists()
+    if (QFileInfo::exists(oldSettingsFilePath)
             && (!QDir::root().mkpath(m_newSettingsDir)
                 || !QFile::copy(oldSettingsFilePath, m_newSettingsFilePath))) {
         qWarning() << "Error in settings migration: Could not copy" << oldSettingsFilePath
                    << "to" << m_newSettingsFilePath;
     }
 
-    // Adapt all paths in settings that point to the old location. At the time of this writing,
-    // that's only preferences.qbsSearchPaths as written by libqtprofilesetup, but we don't want
-    // to hardcode that here.
     m_settings = std::make_unique<QSettings>(m_newSettingsFilePath, format());
-    const auto allKeys = m_settings->allKeys();
-    for (const QString &key : allKeys) {
-        QVariant v = m_settings->value(key);
-        if (v.userType() == QMetaType::QString) {
-            QString s = v.toString();
-            if (s.contains(oldProfilesDir))
-                m_settings->setValue(key, s.replace(oldProfilesDir, newProfilesDir));
-        } else if (v.userType() == QMetaType::QStringList) {
-            const QStringList oldList = v.toStringList();
-            QStringList newList;
-            for (const QString &oldString : oldList) {
-                QString newString = oldString;
-                newList << newString.replace(oldProfilesDir, newProfilesDir);
-            }
-            if (newList != oldList)
-                m_settings->setValue(key, newList);
-        }
-    }
 }
 
 void SettingsCreator::createQSettings()
diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index 7b75cc050..4fa0e14da 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -42,6 +42,7 @@
 #include <tools/profile.h>
 #include <tools/qttools.h>
 #include <tools/settings.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qlist.h>
@@ -77,7 +78,7 @@ QString Node::uniqueChildName() const
     bool unique;
     do {
         unique = true;
-        for (const Node *childNode : qAsConst(children)) {
+        for (const Node *childNode : std::as_const(children)) {
             if (childNode->name == newName) {
                 unique = false;
                 newName += QLatin1Char('_');
@@ -90,11 +91,9 @@ QString Node::uniqueChildName() const
 
 bool Node::hasDirectChildWithName(const QString &name) const
 {
-    for (const Node * const child : qAsConst(children)) {
-        if (child->name == name)
-            return true;
-    }
-    return false;
+    return Internal::any_of(children, [&name](const auto &child){
+        return child->name == name;
+    });
 }
 
 } // namespace Internal
@@ -282,10 +281,10 @@ bool SettingsModel::setData(const QModelIndex &index, const QVariant &value, int
     const QString valueString = value.toString();
     QString *toChange = nullptr;
     if (index.column() == keyColumn() && !valueString.isEmpty()
-            && !node->parent->hasDirectChildWithName(valueString)
-            && !(node->parent->parent == &d->rootNode
-                 && node->parent->name == Internal::StringConstants::profilesSettingsKey()
-                 && valueString == Profile::fallbackName())) {
+        && !node->parent->hasDirectChildWithName(valueString)
+        && (node->parent->parent != &d->rootNode
+            || node->parent->name != Internal::StringConstants::profilesSettingsKey()
+            || valueString != Profile::fallbackName())) {
         toChange = &node->name;
     } else if (index.column() == valueColumn() && valueString != node->value) {
         toChange = &node->value;
@@ -330,7 +329,7 @@ void SettingsModel::SettingsModelPrivate::readSettings()
         addNodeFromSettings(&rootNode, topLevelKey);
     for (QVariantMap::ConstIterator it = additionalProperties.constBegin();
          it != additionalProperties.constEnd(); ++it) {
-        const QStringList nameAsList = it.key().split(QLatin1Char('.'), QBS_SKIP_EMPTY_PARTS);
+        const QStringList nameAsList = it.key().split(QLatin1Char('.'), Qt::SkipEmptyParts);
         addNode(&rootNode, nameAsList.front(), nameAsList.mid(1), it.value());
     }
     dirty = false;
@@ -362,7 +361,7 @@ void SettingsModel::SettingsModelPrivate::addNode(qbs::Internal::Node *parentNod
         const QString &currentNamePart, const QStringList &restOfName, const QVariant &value)
 {
     Node *currentNode = nullptr;
-    for (Node * const n : qAsConst(parentNode->children)) {
+    for (Node * const n : std::as_const(parentNode->children)) {
         if (n->name == currentNamePart) {
             currentNode = n;
             break;
@@ -386,7 +385,7 @@ void SettingsModel::SettingsModelPrivate::doSave(const Node *node, const QString
     }
 
     const QString newPrefix = prefix + node->name + QLatin1Char('.');
-    for (const Node * const child : qAsConst(node->children))
+    for (const Node * const child : std::as_const(node->children))
         doSave(child, newPrefix);
 }
 
diff --git a/src/lib/corelib/tools/settingsrepresentation.cpp b/src/lib/corelib/tools/settingsrepresentation.cpp
index 7790f1aa1..6dfd81beb 100644
--- a/src/lib/corelib/tools/settingsrepresentation.cpp
+++ b/src/lib/corelib/tools/settingsrepresentation.cpp
@@ -41,8 +41,8 @@
 
 #include "jsliterals.h"
 
-#include <QtScript/qscriptengine.h>
-#include <QtScript/qscriptvalue.h>
+#include <language/scriptengine.h>
+#include <logging/logger.h>
 
 namespace qbs {
 
@@ -54,11 +54,19 @@ QString settingsValueToRepresentation(const QVariant &value)
 static QVariant variantFromString(const QString &str, bool &ok)
 {
     // ### use Qt5's JSON reader at some point.
-    QScriptEngine engine;
-    QScriptValue sv = engine.evaluate(QLatin1String("(function(){return ")
-                                      + str + QLatin1String(";})()"));
-    ok = !sv.isError();
-    return sv.toVariant();
+    class DummyLogSink : public ILogSink {
+        void doPrintMessage(LoggerLevel, const QString &, const QString &) override { }
+    } logSink;
+    Internal::Logger logger(&logSink);
+
+    const auto engine = Internal::ScriptEngine::create(logger, {});
+    Internal::ScopedJsValue sv(
+                engine->context(),
+                engine->evaluate(Internal::JsValueOwner::Caller,
+                                 QLatin1String("(function(){return ") + str
+                                 + QLatin1String(";})()")));
+    ok = !engine->checkAndClearException({});
+    return Internal::getJsVariant(engine->context(), sv);
 }
 
 QVariant representationToSettingsValue(const QString &representation)
diff --git a/src/lib/corelib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp
index a06ffc4bd..e9212c165 100644
--- a/src/lib/corelib/tools/setupprojectparameters.cpp
+++ b/src/lib/corelib/tools/setupprojectparameters.cpp
@@ -38,6 +38,8 @@
 ****************************************************************************/
 #include "setupprojectparameters.h"
 
+#include "buildoptions.h"
+
 #include <logging/logger.h>
 #include <logging/translator.h>
 #include <tools/buildgraphlocker.h>
@@ -45,8 +47,10 @@
 #include <tools/jsonhelper.h>
 #include <tools/profile.h>
 #include <tools/qbsassert.h>
+#include <tools/qttools.h>
 #include <tools/scripttools.h>
 #include <tools/settings.h>
+#include <tools/stringconstants.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfileinfo.h>
@@ -89,21 +93,24 @@ public:
     mutable QVariantMap buildConfigurationTree;
     mutable QVariantMap overriddenValuesTree;
     mutable QVariantMap finalBuildConfigTree;
+    int maxJobCount = 0;
     bool overrideBuildGraphData;
     bool dryRun;
     bool logElapsedTime;
     bool forceProbeExecution;
     bool waitLockBuildGraph;
-    bool fallbackProviderEnabled = true;
     SetupProjectParameters::RestoreBehavior restoreBehavior;
     ErrorHandlingMode propertyCheckingMode;
     ErrorHandlingMode productErrorMode;
+    DeprecationWarningMode deprecationWarningMode = defaultDeprecationWarningMode();
     QProcessEnvironment environment;
 };
 
 } // namespace Internal
 
-SetupProjectParameters::SetupProjectParameters() : d(new Internal::SetupProjectParametersPrivate)
+using namespace Internal;
+
+SetupProjectParameters::SetupProjectParameters() : d(new SetupProjectParametersPrivate)
 {
 }
 
@@ -125,6 +132,11 @@ template<> ErrorHandlingMode fromJson(const QJsonValue &v)
     return ErrorHandlingMode::Strict;
 }
 
+template<> DeprecationWarningMode fromJson(const QJsonValue &v)
+{
+    return deprecationWarningModeFromName(v.toString());
+}
+
 template<> SetupProjectParameters::RestoreBehavior fromJson(const QJsonValue &v)
 {
     const QString value = v.toString();
@@ -145,15 +157,18 @@ SetupProjectParameters SetupProjectParameters::fromJson(const QJsonObject &data)
     setValueFromJson(params.d->projectFilePath, data, "project-file-path");
     setValueFromJson(params.d->buildRoot, data, "build-root");
     setValueFromJson(params.d->settingsBaseDir, data, "settings-directory");
+    setValueFromJson(params.d->maxJobCount, data, "max-job-count");
+    if (params.maxJobCount() <= 0)
+        params.setMaxJobCount(BuildOptions::defaultMaxJobCount());
     setValueFromJson(params.d->overriddenValues, data, "overridden-properties");
     setValueFromJson(params.d->dryRun, data, "dry-run");
     setValueFromJson(params.d->logElapsedTime, data, "log-time");
     setValueFromJson(params.d->forceProbeExecution, data, "force-probe-execution");
     setValueFromJson(params.d->waitLockBuildGraph, data, "wait-lock-build-graph");
-    setValueFromJson(params.d->fallbackProviderEnabled, data, "fallback-provider-enabled");
     setValueFromJson(params.d->environment, data, "environment");
     setValueFromJson(params.d->restoreBehavior, data, "restore-behavior");
     setValueFromJson(params.d->propertyCheckingMode, data, "error-handling-mode");
+    setValueFromJson(params.d->deprecationWarningMode, data, "deprecation-warning-mode");
     params.d->productErrorMode = params.d->propertyCheckingMode;
     return params;
 }
@@ -219,6 +234,44 @@ void SetupProjectParameters::setProjectFilePath(const QString &projectFilePath)
         d->projectFilePath = canonicalProjectFilePath;
 }
 
+void SetupProjectParameters::finalizeProjectFilePath()
+{
+    QString filePath = projectFilePath();
+    if (filePath.isEmpty())
+        filePath = QDir::currentPath();
+    const QFileInfo projectFileInfo(filePath);
+    if (!projectFileInfo.exists())
+        throw ErrorInfo(Tr::tr("Project file '%1' cannot be found.").arg(filePath));
+    if (projectFileInfo.isRelative())
+        filePath = projectFileInfo.absoluteFilePath();
+    if (projectFileInfo.isFile()) {
+        setProjectFilePath(filePath);
+        return;
+    }
+    if (!projectFileInfo.isDir())
+        throw ErrorInfo(Tr::tr("Project file '%1' has invalid type.").arg(filePath));
+
+    const QStringList &actualFileNames
+        = QDir(filePath).entryList(StringConstants::qbsFileWildcards(), QDir::Files);
+    if (actualFileNames.empty()) {
+        QString error;
+        if (projectFilePath().isEmpty())
+            error = Tr::tr("No project file given and none found in current directory.\n");
+        else
+            error = Tr::tr("No project file found in directory '%1'.").arg(filePath);
+        throw ErrorInfo(error);
+    }
+    if (actualFileNames.size() > 1) {
+        throw ErrorInfo(Tr::tr("More than one project file found in directory '%1'.")
+                            .arg(filePath));
+    }
+    filePath.append(QLatin1Char('/')).append(actualFileNames.front());
+
+    filePath = QDir::current().filePath(filePath);
+    filePath = QDir::cleanPath(filePath);
+    setProjectFilePath(filePath);
+}
+
 /*!
  * \brief Returns the base path of where to put the build artifacts and store the build graph.
  */
@@ -243,7 +296,7 @@ void SetupProjectParameters::setBuildRoot(const QString &buildRoot)
     // Calling mkpath() may be necessary to get the canonical build root, but if we do it,
     // it must be reverted immediately afterwards as not to create directories needlessly,
     // e.g in the case of a dry run build.
-    Internal::DirectoryManager dirManager(buildRoot, Internal::Logger());
+    DirectoryManager dirManager(buildRoot, Logger());
 
     // We don't do error checking here, as this is not a convenient place to report an error.
     // If creation of the build directory is not possible, we will get sensible error messages
@@ -325,6 +378,27 @@ void SetupProjectParameters::setSettingsDirectory(const QString &settingsBaseDir
 }
 
 /*!
+ * \brief Returns the maximum number of threads to employ when resolving the project.
+ * If the value is not valid (i.e. <= 0), a sensible one will be derived from the number of
+ * available processor cores.
+ * The default is 0.
+ * \sa BuildOptions::defaultMaxJobCount
+ */
+int SetupProjectParameters::maxJobCount() const
+{
+    return d->maxJobCount;
+}
+
+/*!
+ * \brief Controls how many threads to employ when resolving the project.
+ * A value <= 0 leaves the decision to qbs.
+ */
+void SetupProjectParameters::setMaxJobCount(int jobCount)
+{
+    d->maxJobCount = jobCount;
+}
+
+/*!
  * Returns the overridden values of the build configuration.
  */
 QVariantMap SetupProjectParameters::overriddenValues() const
@@ -354,7 +428,7 @@ static void provideValuesTree(const QVariantMap &values, QVariantMap *valueTree)
         const QStringList nameElements = (idx == -1)
                 ? QStringList() << name
                 : QStringList() << name.left(idx) << name.mid(idx + 1);
-        Internal::setConfigProperty(*valueTree, nameElements, it.value());
+        setConfigProperty(*valueTree, nameElements, it.value());
     }
 }
 
@@ -395,7 +469,7 @@ static QVariantMap expandedBuildConfigurationInternal(const Profile &profile,
         if (err.hasError())
             throw err;
         if (profileKeys.empty())
-            throw ErrorInfo(Internal::Tr::tr("Unknown or empty profile '%1'.").arg(profile.name()));
+            throw ErrorInfo(Tr::tr("Unknown or empty profile '%1'.").arg(profile.name()));
         for (const QString &profileKey : profileKeys) {
             buildConfig.insert(profileKey, profile.value(profileKey, QVariant(), &err));
                 if (err.hasError())
@@ -405,7 +479,7 @@ static QVariantMap expandedBuildConfigurationInternal(const Profile &profile,
 
     // (2) Build configuration name.
     if (configurationName.isEmpty())
-        throw ErrorInfo(Internal::Tr::tr("No build configuration name set."));
+        throw ErrorInfo(Tr::tr("No build configuration name set."));
     buildConfig.insert(QStringLiteral("qbs.configurationName"), configurationName);
     return buildConfig;
 }
@@ -442,7 +516,7 @@ ErrorInfo SetupProjectParameters::expandBuildConfiguration()
     QVariantMap expandedConfig = expandedBuildConfiguration(profile, configurationName(), &err);
     if (err.hasError())
         return err;
-    if (d->buildConfiguration != expandedConfig) {
+    if (!qVariantMapsEqual(d->buildConfiguration, expandedConfig)) {
         d->buildConfigurationTree.clear();
         d->buildConfiguration = expandedConfig;
     }
@@ -547,22 +621,6 @@ void SetupProjectParameters::setWaitLockBuildGraph(bool wait)
 }
 
 /*!
- * \brief Returns true if qbs should fall back to pkg-config if a dependency is not found.
- */
-bool SetupProjectParameters::fallbackProviderEnabled() const
-{
-    return d->fallbackProviderEnabled;
-}
-
-/*!
- * Controls whether to fall back to pkg-config if a dependency is not found.
- */
-void SetupProjectParameters::setFallbackProviderEnabled(bool enable)
-{
-    d->fallbackProviderEnabled = enable;
-}
-
-/*!
  * \brief Gets the environment used while resolving the project.
  */
 QProcessEnvironment SetupProjectParameters::environment() const
@@ -688,4 +746,20 @@ void SetupProjectParameters::setProductErrorMode(ErrorHandlingMode mode)
     d->productErrorMode = mode;
 }
 
+/*!
+ * \brief Indicates how deprecated constructs are handled.
+ */
+DeprecationWarningMode SetupProjectParameters::deprecationWarningMode() const
+{
+    return d->deprecationWarningMode;
+}
+
+/*!
+ * \brief Specifies the behavior on encountering deprecated constructs.
+ */
+void SetupProjectParameters::setDeprecationWarningMode(DeprecationWarningMode mode)
+{
+    d->deprecationWarningMode = mode;
+}
+
 } // namespace qbs
diff --git a/src/lib/corelib/tools/setupprojectparameters.h b/src/lib/corelib/tools/setupprojectparameters.h
index 2617a34cd..5cd9700a9 100644
--- a/src/lib/corelib/tools/setupprojectparameters.h
+++ b/src/lib/corelib/tools/setupprojectparameters.h
@@ -41,6 +41,7 @@
 
 #include "qbs_export.h"
 
+#include <tools/deprecationwarningmode.h>
 #include <tools/error.h>
 
 #include <QtCore/qshareddata.h>
@@ -81,6 +82,7 @@ public:
 
     QString projectFilePath() const;
     void setProjectFilePath(const QString &projectFilePath);
+    void finalizeProjectFilePath();
 
     QString buildRoot() const;
     void setBuildRoot(const QString &buildRoot);
@@ -97,6 +99,9 @@ public:
     QString settingsDirectory() const;
     void setSettingsDirectory(const QString &settingsBaseDir);
 
+    int maxJobCount() const;
+    void setMaxJobCount(int jobCount);
+
     QVariantMap overriddenValues() const;
     void setOverriddenValues(const QVariantMap &values);
     QVariantMap overriddenValuesTree() const;
@@ -127,9 +132,6 @@ public:
     bool waitLockBuildGraph() const;
     void setWaitLockBuildGraph(bool wait);
 
-    bool fallbackProviderEnabled() const;
-    void setFallbackProviderEnabled(bool enable);
-
     QProcessEnvironment environment() const;
     void setEnvironment(const QProcessEnvironment &env);
     QProcessEnvironment adjustedEnvironment() const;
@@ -144,6 +146,9 @@ public:
     ErrorHandlingMode productErrorMode() const;
     void setProductErrorMode(ErrorHandlingMode mode);
 
+    DeprecationWarningMode deprecationWarningMode() const;
+    void setDeprecationWarningMode(DeprecationWarningMode mode);
+
 private:
     QSharedDataPointer<Internal::SetupProjectParametersPrivate> d;
 };
diff --git a/src/lib/corelib/tools/shellutils.cpp b/src/lib/corelib/tools/shellutils.cpp
index d032aecac..5fff254f6 100644
--- a/src/lib/corelib/tools/shellutils.cpp
+++ b/src/lib/corelib/tools/shellutils.cpp
@@ -57,7 +57,7 @@ QString shellInterpreter(const QString &filePath) {
         const QString shebang = ts.readLine();
         if (shebang.startsWith(QLatin1String("#!"))) {
             return (shebang.mid(2).split(QRegularExpression(QStringLiteral("\\s")),
-                                         QBS_SKIP_EMPTY_PARTS) << QString()).front();
+                                         Qt::SkipEmptyParts) << QString()).front();
         }
     }
 
diff --git a/src/lib/corelib/tools/stlutils.h b/src/lib/corelib/tools/stlutils.h
index 5aff5cc54..306f37157 100644
--- a/src/lib/corelib/tools/stlutils.h
+++ b/src/lib/corelib/tools/stlutils.h
@@ -46,14 +46,46 @@
 namespace qbs {
 namespace Internal {
 
-template <class C>
-C sorted(const C &container)
+template <typename C>
+auto sorted(C &&container)
 {
-    C result = container;
+    using R = std::remove_cv_t<std::remove_reference_t<C>>;
+    R result(std::forward<C>(container));
     std::sort(std::begin(result), std::end(result));
     return result;
 }
 
+template <typename C, typename Pred>
+auto sorted(C &&container, Pred &&pred)
+{
+    using R = std::remove_cv_t<std::remove_reference_t<C>>;
+    R result(std::forward<C>(container));
+    std::sort(std::begin(result), std::end(result), std::forward<Pred>(pred));
+    return result;
+}
+
+template <typename To, typename From, typename Op>
+To transformed(const From &from, Op op)
+{
+    To to;
+    to.reserve(int(from.size()));
+    std::transform(std::cbegin(from), std::cend(from), std::back_inserter(to), std::move(op));
+    return to;
+}
+
+template <typename C, typename Op>
+void transform(C &&container, Op op)
+{
+    std::transform(std::begin(container), std::end(container), std::begin(container),
+                   std::move(op));
+}
+
+template <typename To, typename From, typename Op>
+void transform(const From &from, To &&to, Op op)
+{
+    std::transform(std::cbegin(from), std::cend(from), std::back_inserter(to), std::move(op));
+}
+
 template <class C, class T>
 bool contains(const C &container, const T &v)
 {
@@ -118,6 +150,12 @@ bool any_of(const Container &container, const UnaryPredicate &predicate)
 }
 
 template <class Container, class UnaryPredicate>
+bool all_of(const Container &container, const UnaryPredicate &predicate)
+{
+    return std::all_of(std::begin(container), std::end(container), predicate);
+}
+
+template <class Container, class UnaryPredicate>
 bool none_of(const Container &container, const UnaryPredicate &predicate)
 {
     return std::none_of(std::begin(container), std::end(container), predicate);
diff --git a/src/lib/corelib/tools/stringconstants.h b/src/lib/corelib/tools/stringconstants.h
index f40bfa4a7..799a140d9 100644
--- a/src/lib/corelib/tools/stringconstants.h
+++ b/src/lib/corelib/tools/stringconstants.h
@@ -110,6 +110,7 @@ public:
     QBS_STRING_CONSTANT(installDirProperty, "installDir")
     QBS_STRING_CONSTANT(installSourceBaseProperty, "installSourceBase")
     QBS_STRING_CONSTANT(isEnabledKey, "is-enabled")
+    QBS_STRING_CONSTANT(isEagerProperty, "isEager")
     QBS_STRING_CONSTANT(jobCountProperty, "jobCount")
     QBS_STRING_CONSTANT(jobPoolProperty, "jobPool")
     QBS_STRING_CONSTANT(lengthProperty, "length")
@@ -168,6 +169,7 @@ public:
 
     QBS_STRING_CONSTANT(importScopeNamePropertyInternal, "_qbs_importScopeName")
     QBS_STRING_CONSTANT(modulePropertyInternal, "__module")
+    QBS_STRING_CONSTANT(dataPropertyInternal, "_qbs_data")
     QBS_STRING_CONSTANT(qbsSourceDirPropertyInternal, "_qbs_sourceDir")
     static const char *qbsProcEnvVarInternal() { return "_qbs_procenv"; }
 
diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
deleted file mode 100644
index 00d87ecc7..000000000
--- a/src/lib/corelib/tools/tools.pri
+++ /dev/null
@@ -1,146 +0,0 @@
-include(../../../install_prefix.pri)
-
-INCLUDEPATH += $$PWD/../.. # for plugins
-
-QBS_SYSTEM_SETTINGS_DIR = $$(QBS_SYSTEM_SETTINGS_DIR)
-!isEmpty(QBS_SYSTEM_SETTINGS_DIR) {
-    DEFINES += QBS_SYSTEM_SETTINGS_DIR=\\\"$$QBS_SYSTEM_SETTINGS_DIR\\\"
-}
-
-HEADERS += \
-    $$PWD/architectures.h \
-    $$PWD/buildgraphlocker.h \
-    $$PWD/clangclinfo.h \
-    $$PWD/codelocation.h \
-    $$PWD/commandechomode.h \
-    $$PWD/dynamictypecheck.h \
-    $$PWD/error.h \
-    $$PWD/executablefinder.h \
-    $$PWD/fileinfo.h \
-    $$PWD/filesaver.h \
-    $$PWD/filetime.h \
-    $$PWD/generateoptions.h \
-    $$PWD/id.h \
-    $$PWD/iosutils.h \
-    $$PWD/joblimits.h \
-    $$PWD/jsliterals.h \
-    $$PWD/jsonhelper.h \
-    $$PWD/launcherinterface.h \
-    $$PWD/launcherpackets.h \
-    $$PWD/launchersocket.h \
-    $$PWD/msvcinfo.h \
-    $$PWD/persistence.h \
-    $$PWD/scannerpluginmanager.h \
-    $$PWD/scripttools.h \
-    $$PWD/set.h \
-    $$PWD/settings.h \
-    $$PWD/settingsmodel.h \
-    $$PWD/settingsrepresentation.h \
-    $$PWD/pathutils.h \
-    $$PWD/preferences.h \
-    $$PWD/profile.h \
-    $$PWD/profiling.h \
-    $$PWD/processresult.h \
-    $$PWD/processresult_p.h \
-    $$PWD/processutils.h \
-    $$PWD/progressobserver.h \
-    $$PWD/projectgeneratormanager.h \
-    $$PWD/qbspluginmanager.h \
-    $$PWD/qbsprocess.h \
-    $$PWD/shellutils.h \
-    $$PWD/stlutils.h \
-    $$PWD/stringutils.h \
-    $$PWD/toolchains.h \
-    $$PWD/hostosinfo.h \
-    $$PWD/buildoptions.h \
-    $$PWD/installoptions.h \
-    $$PWD/cleanoptions.h \
-    $$PWD/setupprojectparameters.h \
-    $$PWD/weakpointer.h \
-    $$PWD/qbs_export.h \
-    $$PWD/qbsassert.h \
-    $$PWD/qttools.h \
-    $$PWD/settingscreator.h \
-    $$PWD/stringconstants.h \
-    $$PWD/version.h \
-    $$PWD/visualstudioversioninfo.h \
-    $$PWD/vsenvironmentdetector.h
-
-SOURCES += \
-    $$PWD/architectures.cpp \
-    $$PWD/buildgraphlocker.cpp \
-    $$PWD/clangclinfo.cpp \
-    $$PWD/codelocation.cpp \
-    $$PWD/commandechomode.cpp \
-    $$PWD/error.cpp \
-    $$PWD/executablefinder.cpp \
-    $$PWD/fileinfo.cpp \
-    $$PWD/filesaver.cpp \
-    $$PWD/filetime.cpp \
-    $$PWD/generateoptions.cpp \
-    $$PWD/id.cpp \
-    $$PWD/joblimits.cpp \
-    $$PWD/jsliterals.cpp \
-    $$PWD/launcherinterface.cpp \
-    $$PWD/launcherpackets.cpp \
-    $$PWD/launchersocket.cpp \
-    $$PWD/msvcinfo.cpp \
-    $$PWD/persistence.cpp \
-    $$PWD/scannerpluginmanager.cpp \
-    $$PWD/scripttools.cpp \
-    $$PWD/settings.cpp \
-    $$PWD/settingsmodel.cpp \
-    $$PWD/settingsrepresentation.cpp \
-    $$PWD/preferences.cpp \
-    $$PWD/processresult.cpp \
-    $$PWD/processutils.cpp \
-    $$PWD/profile.cpp \
-    $$PWD/profiling.cpp \
-    $$PWD/progressobserver.cpp \
-    $$PWD/projectgeneratormanager.cpp \
-    $$PWD/qbspluginmanager.cpp \
-    $$PWD/qbsprocess.cpp \
-    $$PWD/shellutils.cpp \
-    $$PWD/buildoptions.cpp \
-    $$PWD/installoptions.cpp \
-    $$PWD/cleanoptions.cpp \
-    $$PWD/setupprojectparameters.cpp \
-    $$PWD/qbsassert.cpp \
-    $$PWD/qttools.cpp \
-    $$PWD/settingscreator.cpp \
-    $$PWD/toolchains.cpp \
-    $$PWD/version.cpp \
-    $$PWD/visualstudioversioninfo.cpp \
-    $$PWD/vsenvironmentdetector.cpp
-
-osx {
-    HEADERS += $$PWD/applecodesignutils.h
-    SOURCES += $$PWD/applecodesignutils.cpp
-    LIBS += -framework Security
-}
-
-!qbs_no_dev_install {
-    tools_headers.files = \
-        $$PWD/architectures.h \
-        $$PWD/buildoptions.h \
-        $$PWD/cleanoptions.h \
-        $$PWD/codelocation.h \
-        $$PWD/commandechomode.h \
-        $$PWD/error.h \
-        $$PWD/generateoptions.h \
-        $$PWD/installoptions.h \
-        $$PWD/joblimits.h \
-        $$PWD/preferences.h \
-        $$PWD/processresult.h \
-        $$PWD/profile.h \
-        $$PWD/projectgeneratormanager.h \
-        $$PWD/qbs_export.h \
-        $$PWD/settings.h \
-        $$PWD/settingsmodel.h \
-        $$PWD/settingsrepresentation.h \
-        $$PWD/setupprojectparameters.h \
-        $$PWD/toolchains.h \
-        $$PWD/version.h
-    tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
-    INSTALLS += tools_headers
-}
diff --git a/src/lib/corelib/tools/visualstudioversioninfo.cpp b/src/lib/corelib/tools/visualstudioversioninfo.cpp
index b5ee3e719..9ea86aaed 100644
--- a/src/lib/corelib/tools/visualstudioversioninfo.cpp
+++ b/src/lib/corelib/tools/visualstudioversioninfo.cpp
@@ -58,8 +58,8 @@ VisualStudioVersionInfo::VisualStudioVersionInfo(const Version &version)
 std::set<VisualStudioVersionInfo> VisualStudioVersionInfo::knownVersions()
 {
     static const std::set<VisualStudioVersionInfo> known = {
-        Version(16), Version(15), Version(14), Version(12), Version(11), Version(10), Version(9),
-        Version(8), Version(7, 1), Version(7), Version(6)
+        Version(17), Version(16), Version(15), Version(14), Version(12), Version(11),
+        Version(10), Version(9), Version(8), Version(7, 1), Version(7), Version(6)
     };
     return known;
 }
@@ -125,6 +125,8 @@ int VisualStudioVersionInfo::marketingVersion() const
         return 2017;
     case 16:
         return 2019;
+    case 17:
+        return 2022;
     default:
         qWarning() << QStringLiteral("unrecognized Visual Studio version: ")
                    << m_version.toString();
@@ -171,6 +173,7 @@ QString VisualStudioVersionInfo::toolsVersion() const
 QString VisualStudioVersionInfo::platformToolsetVersion() const
 {
     static std::pair<int, QString> table[] = {
+        {17, QStringLiteral("v143")},             // VS 2022
         {16, QStringLiteral("v142")},             // VS 2019
         {15, QStringLiteral("v141")}              // VS 2017
     };
@@ -181,7 +184,7 @@ QString VisualStudioVersionInfo::platformToolsetVersion() const
     return QStringLiteral("v%1").arg(m_version.majorVersion() * 10);
 }
 
-quint32 qHash(const VisualStudioVersionInfo &info)
+QHashValueType qHash(const VisualStudioVersionInfo &info)
 {
     return qHash(info.version().toString());
 }
diff --git a/src/lib/corelib/tools/visualstudioversioninfo.h b/src/lib/corelib/tools/visualstudioversioninfo.h
index d4b226623..92eecb388 100644
--- a/src/lib/corelib/tools/visualstudioversioninfo.h
+++ b/src/lib/corelib/tools/visualstudioversioninfo.h
@@ -43,6 +43,7 @@
 
 #include "qbs_export.h"
 
+#include <tools/porting.h>
 #include <tools/version.h>
 
 #include <QtCore/qstring.h>
@@ -78,7 +79,7 @@ private:
     Version m_version;
 };
 
-quint32 qHash(const VisualStudioVersionInfo &info);
+QHashValueType qHash(const VisualStudioVersionInfo &info);
 
 } // namespace Internal
 } // namespace qbs
diff --git a/src/lib/corelib/tools/vsenvironmentdetector.cpp b/src/lib/corelib/tools/vsenvironmentdetector.cpp
index 82dff578f..5bcbd93b6 100644
--- a/src/lib/corelib/tools/vsenvironmentdetector.cpp
+++ b/src/lib/corelib/tools/vsenvironmentdetector.cpp
@@ -64,7 +64,7 @@ static QString windowsSystem32Path()
 #ifdef Q_OS_WIN
     wchar_t str[UNICODE_STRING_MAX_CHARS];
     if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_SYSTEM, NULL, 0, str)))
-        return QString::fromUtf16(reinterpret_cast<ushort*>(str));
+        return QString::fromUtf16(reinterpret_cast<char16_t*>(str));
 #endif
     return {};
 }
@@ -124,14 +124,12 @@ QString VsEnvironmentDetector::findVcVarsAllBat(const MSVC &msvc,
     QString fullPath = dir.absoluteFilePath(path);
     if (dir.exists(path))
         return fullPath;
-    else
-        searchedPaths.push_back(fullPath);
+    searchedPaths.push_back(fullPath);
     path = QStringLiteral("Auxiliary/Build/") + vcvarsallbat;
     fullPath = dir.absoluteFilePath(path);
     if (dir.exists(path))
         return fullPath;
-    else
-        searchedPaths.push_back(fullPath);
+    searchedPaths.push_back(fullPath);
     return {};
 }
 
diff --git a/src/lib/corelib/use_corelib.pri b/src/lib/corelib/use_corelib.pri
deleted file mode 100644
index a0bb90e8b..000000000
--- a/src/lib/corelib/use_corelib.pri
+++ /dev/null
@@ -1,46 +0,0 @@
-include(../../../qbs_version.pri)
-include(../../library_dirname.pri)
-
-isEmpty(QBSLIBDIR) {
-    QBSLIBDIR = $$OUT_PWD/../../../$${QBS_LIBRARY_DIRNAME}
-}
-
-unix {
-    LIBS += -L$$QBSLIBDIR -lqbscore
-}
-
-isEmpty(QBS_RPATH): QBS_RPATH = ../$$QBS_LIBRARY_DIRNAME
-!qbs_disable_rpath {
-    linux-*: QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/$${QBS_RPATH}\'
-    macx: QMAKE_LFLAGS += -Wl,-rpath,@loader_path/$${QBS_RPATH}
-}
-
-!CONFIG(static, static|shared) {
-    QBSCORELIBSUFFIX = $$QBS_VERSION_MAJ
-}
-
-win32 {
-    CONFIG(debug, debug|release) {
-        QBSCORELIB = qbscored$$QBSCORELIBSUFFIX
-    }
-    CONFIG(release, debug|release) {
-        QBSCORELIB = qbscore$$QBSCORELIBSUFFIX
-    }
-    msvc {
-        LIBS += /LIBPATH:$$QBSLIBDIR
-        QBSCORELIB = $${QBSCORELIB}.lib
-        LIBS += Shell32.lib
-    } else {
-        LIBS += -L$${QBSLIBDIR}
-        QBSCORELIB = lib$${QBSCORELIB}
-    }
-    LIBS += $$QBSCORELIB
-}
-
-INCLUDEPATH += \
-    $$PWD
-
-CONFIG(static, static|shared) {
-    DEFINES += QBS_STATIC_LIB
-}
-qbs_enable_unit_tests:DEFINES += QBS_ENABLE_UNIT_TESTS
diff --git a/src/lib/corelib/use_installed_corelib.pri b/src/lib/corelib/use_installed_corelib.pri
deleted file mode 100644
index 48e020c7b..000000000
--- a/src/lib/corelib/use_installed_corelib.pri
+++ /dev/null
@@ -1,37 +0,0 @@
-include(qbs_version.pri)
-
-QBSLIBDIR=$${PWD}/../../lib
-unix {
-    LIBS += -L$$QBSLIBDIR -lqbscore
-}
-
-!qbs_disable_rpath:unix:QMAKE_LFLAGS += -Wl,-rpath,$${QBSLIBDIR}
-
-!CONFIG(static, static|shared) {
-    QBSCORELIBSUFFIX = $$QBS_VERSION_MAJ
-}
-
-win32 {
-    CONFIG(debug, debug|release) {
-        QBSCORELIB = qbscored$$QBSCORELIBSUFFIX
-    }
-    CONFIG(release, debug|release) {
-        QBSCORELIB = qbscore$$QBSCORELIBSUFFIX
-    }
-    msvc {
-        LIBS += /LIBPATH:$$QBSLIBDIR
-        QBSCORELIB = $${QBSCORELIB}.lib
-        LIBS += Shell32.lib
-    } else {
-        LIBS += -L$${QBSLIBDIR}
-        QBSCORELIB = lib$${QBSCORELIB}
-    }
-    LIBS += $$QBSCORELIB
-}
-
-INCLUDEPATH += $${PWD}
-
-CONFIG(static, static|shared) {
-    DEFINES += QBS_STATIC_LIB
-}
-qbs_enable_unit_tests:DEFINES += QBS_ENABLE_UNIT_TESTS
diff --git a/src/lib/library.pri b/src/lib/library.pri
deleted file mode 100644
index 7d12e1070..000000000
--- a/src/lib/library.pri
+++ /dev/null
@@ -1,32 +0,0 @@
-include(library_base.pri)
-
-CONFIG(static, static|shared) {
-    DEFINES += QBS_STATIC_LIB
-} else {
-    DEFINES += QBS_LIBRARY
-}
-
-qbs_disable_rpath {
-    osx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,$$QBS_INSTALL_PREFIX/$$QBS_LIBRARY_DIRNAME/
-} else {
-    osx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
-}
-
-linux {
-    # Turn off absurd qmake's soname "logic" and directly add the linker flag.
-    QMAKE_LFLAGS_SONAME =
-    QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.so.$${QBS_VERSION_MAJ}.$${QBS_VERSION_MIN}
-}
-
-win32 {
-    dlltarget.path = $${QBS_INSTALL_PREFIX}/bin
-    INSTALLS += dlltarget
-}
-
-!win32|!qbs_no_dev_install {
-    !isEmpty(QBS_LIB_INSTALL_DIR): \
-        target.path = $${QBS_LIB_INSTALL_DIR}
-    else: \
-        target.path = $${QBS_INSTALL_PREFIX}/$${QBS_LIBRARY_DIRNAME}
-    INSTALLS += target
-}
diff --git a/src/lib/library_base.pri b/src/lib/library_base.pri
deleted file mode 100644
index 1fde46e3a..000000000
--- a/src/lib/library_base.pri
+++ /dev/null
@@ -1,21 +0,0 @@
-include(../library_dirname.pri)
-include(../install_prefix.pri)
-
-TEMPLATE = lib
-QT = core
-!isEmpty(QBS_DLLDESTDIR):DLLDESTDIR = $${QBS_DLLDESTDIR}
-else:DLLDESTDIR = ../../../bin
-!isEmpty(QBS_DESTDIR):DESTDIR = $${QBS_DESTDIR}
-else:DESTDIR = ../../../$${QBS_LIBRARY_DIRNAME}
-
-DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_PROCESS_COMBINED_ARGUMENT_START
-qbs_enable_unit_tests:DEFINES += QBS_ENABLE_UNIT_TESTS
-INCLUDEPATH += $${PWD}/../
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-win32:CONFIG(debug, debug|release):TARGET = $${TARGET}d
-CONFIG(debug, debug|release):DEFINES += QT_STRICT_ITERATORS
-CONFIG += c++17
-CONFIG += create_prl
-
-include(../../qbs_version.pri)
-VERSION = $${QBS_VERSION}
diff --git a/src/lib/libs.qbs b/src/lib/libs.qbs
index 10890bb46..8638ab8dc 100644
--- a/src/lib/libs.qbs
+++ b/src/lib/libs.qbs
@@ -3,6 +3,5 @@ Project {
         "corelib/corelib.qbs",
         "msbuild/msbuild.qbs",
         "pkgconfig/pkgconfig.qbs",
-        "scriptengine/scriptengine.qbs",
     ]
 }
diff --git a/src/lib/msbuild/io/visualstudiosolutionwriter.cpp b/src/lib/msbuild/io/visualstudiosolutionwriter.cpp
index 625489ac6..874fbc71f 100644
--- a/src/lib/msbuild/io/visualstudiosolutionwriter.cpp
+++ b/src/lib/msbuild/io/visualstudiosolutionwriter.cpp
@@ -108,20 +108,6 @@ bool VisualStudioSolutionWriter::write(const VisualStudioSolution *solution)
             << project->guid().toString().toStdString()
             << u8"\"\n";
 
-        const auto dependencies = solution->dependencies(project);
-        if (!dependencies.empty()) {
-            out << u8"\tProjectSection(ProjectDependencies) = postProject\n";
-
-            for (const auto &dependency : dependencies)
-                out << u8"\t\t"
-                    << dependency->guid().toString().toStdString()
-                    << u8" = "
-                    << dependency->guid().toString().toStdString()
-                    << u8"\n";
-
-            out << u8"\tEndProjectSection\n";
-        }
-
         out << u8"EndProject\n";
     }
 
diff --git a/src/lib/msbuild/msbuild.pro b/src/lib/msbuild/msbuild.pro
deleted file mode 100644
index f724df793..000000000
--- a/src/lib/msbuild/msbuild.pro
+++ /dev/null
@@ -1,58 +0,0 @@
-TARGET = qbsmsbuild
-include(../staticlibrary.pri)
-include(../corelib/use_corelib.pri)
-
-HEADERS += \
-    io/msbuildprojectwriter.h \
-    io/visualstudiosolutionwriter.h \
-    msbuild/imsbuildgroup.h \
-    msbuild/imsbuildnode.h \
-    msbuild/imsbuildnodevisitor.h \
-    msbuild/items/msbuildclcompile.h \
-    msbuild/items/msbuildclinclude.h \
-    msbuild/items/msbuildfileitem.h \
-    msbuild/items/msbuildfilter.h \
-    msbuild/items/msbuildlink.h \
-    msbuild/items/msbuildnone.h \
-    msbuild/msbuildimport.h \
-    msbuild/msbuildimportgroup.h \
-    msbuild/msbuilditem.h \
-    msbuild/msbuilditemdefinitiongroup.h \
-    msbuild/msbuilditemgroup.h \
-    msbuild/msbuilditemmetadata.h \
-    msbuild/msbuildproject.h \
-    msbuild/msbuildproperty.h \
-    msbuild/msbuildpropertybase.h \
-    msbuild/msbuildpropertygroup.h \
-    solution/ivisualstudiosolutionproject.h \
-    solution/visualstudiosolution.h \
-    solution/visualstudiosolutionfileproject.h \
-    solution/visualstudiosolutionfolderproject.h \
-    solution/visualstudiosolutionglobalsection.h
-
-SOURCES += \
-    io/msbuildprojectwriter.cpp \
-    io/visualstudiosolutionwriter.cpp \
-    msbuild/imsbuildgroup.cpp \
-    msbuild/imsbuildnode.cpp \
-    msbuild/items/msbuildclcompile.cpp \
-    msbuild/items/msbuildclinclude.cpp \
-    msbuild/items/msbuildfileitem.cpp \
-    msbuild/items/msbuildfilter.cpp \
-    msbuild/items/msbuildlink.cpp \
-    msbuild/items/msbuildnone.cpp \
-    msbuild/msbuildimport.cpp \
-    msbuild/msbuildimportgroup.cpp \
-    msbuild/msbuilditem.cpp \
-    msbuild/msbuilditemdefinitiongroup.cpp \
-    msbuild/msbuilditemgroup.cpp \
-    msbuild/msbuilditemmetadata.cpp \
-    msbuild/msbuildproject.cpp \
-    msbuild/msbuildproperty.cpp \
-    msbuild/msbuildpropertybase.cpp \
-    msbuild/msbuildpropertygroup.cpp \
-    solution/ivisualstudiosolutionproject.cpp \
-    solution/visualstudiosolution.cpp \
-    solution/visualstudiosolutionfileproject.cpp \
-    solution/visualstudiosolutionfolderproject.cpp \
-    solution/visualstudiosolutionglobalsection.cpp
diff --git a/src/lib/msbuild/solution/visualstudiosolution.cpp b/src/lib/msbuild/solution/visualstudiosolution.cpp
index 89b266647..0f6cd4f23 100644
--- a/src/lib/msbuild/solution/visualstudiosolution.cpp
+++ b/src/lib/msbuild/solution/visualstudiosolution.cpp
@@ -72,7 +72,7 @@ QList<IVisualStudioSolutionProject *> VisualStudioSolution::projects() const
 QList<VisualStudioSolutionFileProject *> VisualStudioSolution::fileProjects() const
 {
     QList<VisualStudioSolutionFileProject *> list;
-    for (const auto &project : qAsConst(d->projects))
+    for (const auto &project : std::as_const(d->projects))
         if (auto fileProject = qobject_cast<VisualStudioSolutionFileProject *>(project))
             list.push_back(fileProject);
     return list;
@@ -81,7 +81,7 @@ QList<VisualStudioSolutionFileProject *> VisualStudioSolution::fileProjects() co
 QList<VisualStudioSolutionFolderProject *> VisualStudioSolution::folderProjects() const
 {
     QList<VisualStudioSolutionFolderProject *> list;
-    for (const auto &project : qAsConst(d->projects))
+    for (const auto &project : std::as_const(d->projects))
         if (auto folderProject = qobject_cast<VisualStudioSolutionFolderProject *>(project))
             list.push_back(folderProject);
     return list;
diff --git a/src/lib/msbuild/solution/visualstudiosolutionfileproject.cpp b/src/lib/msbuild/solution/visualstudiosolutionfileproject.cpp
index 7a67ce22b..e1b83d801 100644
--- a/src/lib/msbuild/solution/visualstudiosolutionfileproject.cpp
+++ b/src/lib/msbuild/solution/visualstudiosolutionfileproject.cpp
@@ -52,7 +52,7 @@ VisualStudioSolutionFileProject::~VisualStudioSolutionFileProject() = default;
 
 QString VisualStudioSolutionFileProject::name() const
 {
-    const auto projectName = IVisualStudioSolutionProject::name();
+    auto projectName = IVisualStudioSolutionProject::name();
     if (projectName.isEmpty())
         return QFileInfo(filePath()).baseName();
     return projectName;
diff --git a/src/lib/msbuild/use_installed_msbuild.pri b/src/lib/msbuild/use_installed_msbuild.pri
deleted file mode 100644
index af89b2550..000000000
--- a/src/lib/msbuild/use_installed_msbuild.pri
+++ /dev/null
@@ -1,20 +0,0 @@
-include(use_installed_corelib.pri)
-
-LIBNAME=qbsmsbuild
-
-unix:LIBS += -l$${LIBNAME}
-
-win32 {
-    CONFIG(debug, debug|release) {
-        QBSMSBUILDLIB = $${LIBNAME}d$${QBSCORELIBSUFFIX}
-    }
-    CONFIG(release, debug|release) {
-        QBSMSBUILDLIB = $${LIBNAME}$${QBSCORELIBSUFFIX}
-    }
-    msvc {
-        QBSMSBUILDLIB = $${QBSMSBUILDLIB}.lib
-    } else {
-        QBSMSBUILDLIB = lib$${QBSMSBUILDLIB}
-    }
-    LIBS += $${QBSMSBUILDLIB}
-}
diff --git a/src/lib/msbuild/use_msbuild.pri b/src/lib/msbuild/use_msbuild.pri
deleted file mode 100644
index bb69968d5..000000000
--- a/src/lib/msbuild/use_msbuild.pri
+++ /dev/null
@@ -1,38 +0,0 @@
-include(../../library_dirname.pri)
-
-isEmpty(QBSLIBDIR) {
-    QBSLIBDIR = $${OUT_PWD}/../../../$${QBS_LIBRARY_DIRNAME}
-}
-
-LIBNAME=qbsmsbuild
-
-unix {
-    LIBS += -L$${QBSLIBDIR} -l$${LIBNAME}
-}
-
-win32 {
-    CONFIG(debug, debug|release) {
-        QBSMSBUILDLIB = $${LIBNAME}d
-    }
-    CONFIG(release, debug|release) {
-        QBSMSBUILDLIB = $${LIBNAME}
-    }
-    msvc {
-        LIBS += /LIBPATH:$$QBSLIBDIR
-        QBSMSBUILDLIB = $${QBSMSBUILDLIB}.lib
-        LIBS += Shell32.lib
-    } else {
-        LIBS += -L$${QBSLIBDIR}
-        QBSMSBUILDLIB = lib$${QBSMSBUILDLIB}
-    }
-    LIBS += $${QBSMSBUILDLIB}
-}
-
-INCLUDEPATH += \
-    $$PWD
-
-CONFIG += depend_includepath
-
-CONFIG(static, static|shared) {
-    DEFINES += QBS_STATIC_LIB
-}
diff --git a/src/lib/pkgconfig/CMakeLists.txt b/src/lib/pkgconfig/CMakeLists.txt
index e64d934c8..c82edac16 100644
--- a/src/lib/pkgconfig/CMakeLists.txt
+++ b/src/lib/pkgconfig/CMakeLists.txt
@@ -15,7 +15,7 @@ else()
 endif()
 
 set(QBS_PKGCONFIG_PUBLIC_DEPENDS "")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
     set(QBS_PKGCONFIG_PUBLIC_DEPENDS "stdc++fs")
 endif()
 
diff --git a/src/lib/pkgconfig/pcpackage.cpp b/src/lib/pkgconfig/pcpackage.cpp
index cba783708..9aaefcfde 100644
--- a/src/lib/pkgconfig/pcpackage.cpp
+++ b/src/lib/pkgconfig/pcpackage.cpp
@@ -43,6 +43,8 @@
 
 namespace qbs {
 
+using Internal::startsWith;
+
 using ComparisonType = PcPackage::RequiredVersion::ComparisonType;
 
 std::string_view PcPackage::Flag::typeToString(Type t)
@@ -67,25 +69,25 @@ std::optional<PcPackage::Flag::Type> PcPackage::Flag::typeFromString(std::string
 {
     if (s == "LibraryName")
         return Type::LibraryName;
-    else if (s == "StaticLibraryName")
+    if (s == "StaticLibraryName")
         return Type::StaticLibraryName;
-    else if (s == "LibraryPath")
+    if (s == "LibraryPath")
         return Type::LibraryPath;
-    else if (s == "Framework")
+    if (s == "Framework")
         return Type::Framework;
-    else if (s == "FrameworkPath")
+    if (s == "FrameworkPath")
         return Type::FrameworkPath;
-    else if (s == "LinkerFlag")
+    if (s == "LinkerFlag")
         return Type::LinkerFlag;
-    else if (s == "IncludePath")
+    if (s == "IncludePath")
         return Type::IncludePath;
-    else if (s == "SystemIncludePath")
+    if (s == "SystemIncludePath")
         return Type::SystemIncludePath;
-    else if (s == "DirAfterIncludePath")
+    if (s == "DirAfterIncludePath")
         return Type::DirAfterIncludePath;
-    else if (s == "Define")
+    if (s == "Define")
         return Type::Define;
-    else if (s == "CompilerFlag")
+    if (s == "CompilerFlag")
         return Type::CompilerFlag;
     return std::nullopt;
 }
@@ -108,21 +110,41 @@ std::optional<ComparisonType> PcPackage::RequiredVersion::comparisonFromString(s
 {
     if (s == "LessThan")
         return ComparisonType::LessThan;
-    else if (s == "GreaterThan")
+    if (s == "GreaterThan")
         return ComparisonType::GreaterThan;
-    else if (s == "LessThanEqual")
+    if (s == "LessThanEqual")
         return ComparisonType::LessThanEqual;
-    else if (s == "GreaterThanEqual")
+    if (s == "GreaterThanEqual")
         return ComparisonType::GreaterThanEqual;
-    else if (s == "Equal")
+    if (s == "Equal")
         return ComparisonType::Equal;
-    else if (s == "NotEqual")
+    if (s == "NotEqual")
         return ComparisonType::NotEqual;
-    else if (s == "AlwaysMatch")
+    if (s == "AlwaysMatch")
         return ComparisonType::AlwaysMatch;
     return std::nullopt;
 }
 
+// see https://github.com/pkgconf/pkgconf/blob/pkgconf-2.1.0/libpkgconf/tuple.c#L194
+bool PcPackage::shouldRewriteSysroot(std::string_view sysroot, std::string_view value)
+{
+    if (sysroot.empty() || value.empty())
+        return false;
+
+    if (value.front() != '/')
+        return false;
+
+    if (sysroot == "/")
+        return false;
+
+    if (startsWith(value, sysroot))
+        return false;
+
+    return true;
+}
+
+// TODO: pkg-config only prepends sysroot to flags; while pkgconf does this as a part of the
+// variable substitution and thus this affects all variables, not only flags
 PcPackage PcPackage::prependSysroot(std::string_view sysroot) &&
 {
     PcPackage package(std::move(*this));
@@ -132,6 +154,8 @@ PcPackage PcPackage::prependSysroot(std::string_view sysroot) &&
         if (sysroot.empty())
             return flags;
         for (auto &flag : flags) {
+            if (!shouldRewriteSysroot(sysroot, flag.value))
+                continue;
             if (flag.type == Flag::Type::IncludePath
                     || flag.type == Flag::Type::SystemIncludePath
                     || flag.type == Flag::Type::DirAfterIncludePath
@@ -169,4 +193,51 @@ PcPackage PcPackage::removeSystemLibraryPaths(
     return package;
 }
 
+namespace Internal {
+
+std::string_view fileName(std::string_view filePath)
+{
+    const auto pos = filePath.rfind('/');
+    if (pos == std::string_view::npos) {
+#if defined(WIN32)
+        if (filePath.size() >= 2 && filePath[1] == ':')
+            return filePath.substr(2);
+#endif
+        return filePath;
+    }
+    return filePath.substr(pos + 1);
+}
+
+std::string_view completeBaseName(std::string_view filePath)
+{
+    filePath = fileName(filePath);
+    const auto pos = filePath.rfind('.');
+    return pos == std::string_view::npos
+            ? filePath
+            : filePath.substr(0, pos);
+}
+
+std::string_view parentPath(std::string_view path)
+{
+    if (path.empty())
+        return {};
+    auto pos = path.rfind('/');
+    if (pos == std::string_view::npos) {
+#if defined(WIN32)
+        if (path.size() >= 2 && path[1] == ':')
+            return path.substr(0, 2);
+#endif
+        return ".";
+    }
+    if (pos == 0)
+        return "/";
+#if defined(WIN32)
+    if (pos == 2 && path[1] == ':')
+        return path.substr(0, pos + 1);
+#endif
+    return path.substr(0, pos);
+};
+
+} // namespace Internal
+
 } // namespace qbs
diff --git a/src/lib/pkgconfig/pcpackage.h b/src/lib/pkgconfig/pcpackage.h
index 340a4698f..794e2fc40 100644
--- a/src/lib/pkgconfig/pcpackage.h
+++ b/src/lib/pkgconfig/pcpackage.h
@@ -112,12 +112,14 @@ public:
     std::vector<RequiredVersion> requiresPublic;
     std::vector<RequiredVersion> requiresPrivate;
     std::vector<RequiredVersion> conflicts;
+    std::optional<std::string> oldPrefix;
 
     using VariablesMap = std::map<std::string, std::string, std::less<>>;
-    VariablesMap vars;
+    VariablesMap variables;
 
     bool uninstalled{false};
 
+    static bool shouldRewriteSysroot(std::string_view sysroot, std::string_view value);
     PcPackage prependSysroot(std::string_view sysroot) &&;
     PcPackage removeSystemLibraryPaths(const std::unordered_set<std::string> &libraryPaths) &&;
 };
@@ -181,6 +183,26 @@ inline bool operator!=(const PcPackage::Flag &lhs, const PcPackage::Flag &rhs)
     return !(lhs == rhs);
 }
 
+namespace Internal {
+
+// fast versions (no allocations) of the QFileInfo methods
+std::string_view fileName(std::string_view filePath);
+std::string_view completeBaseName(std::string_view filePath);
+std::string_view parentPath(std::string_view path);
+
+inline bool startsWith(std::string_view haystack, std::string_view needle)
+{
+    return haystack.size() >= needle.size() && haystack.compare(0, needle.size(), needle) == 0;
+}
+
+inline bool endsWith(std::string_view haystack, std::string_view needle)
+{
+    return haystack.size() >= needle.size()
+            && haystack.compare(haystack.size() - needle.size(), needle.size(), needle) == 0;
+}
+
+} // Internal
+
 } // namespace qbs
 
 namespace std {
diff --git a/src/lib/pkgconfig/pcparser.cpp b/src/lib/pkgconfig/pcparser.cpp
index b3ba57c3d..eb07aa5ef 100644
--- a/src/lib/pkgconfig/pcparser.cpp
+++ b/src/lib/pkgconfig/pcparser.cpp
@@ -56,13 +56,28 @@ namespace std {
 #endif
 
 #include <algorithm>
+#include <cctype>
 #include <fstream>
 #include <stdexcept>
 
 namespace qbs {
 
+using Internal::completeBaseName;
+using Internal::parentPath;
+using Internal::startsWith;
+using Internal::endsWith;
+
 namespace {
 
+// workaround for a missing ctor before c++20
+template<typename It>
+std::string_view makeStringView(It begin, It end)
+{
+    if (begin == end)
+        return {};
+    return std::string_view(&*begin, std::distance(begin, end));
+}
+
 bool readOneLine(std::ifstream &file, std::string &line)
 {
     bool quoted = false;
@@ -81,9 +96,8 @@ bool readOneLine(std::ifstream &file, std::string &line)
                 line += '\\';
 
             return n_read > 0;
-        } else {
-            n_read++;
         }
+        n_read++;
 
         if (c == '\r') {
             n_read--;
@@ -133,7 +147,7 @@ std::string_view trimmed(std::string_view str)
     const auto right = std::find_if_not(str.rbegin(), str.rend(), predicate).base();
     if (right <= left)
         return {};
-    return std::string_view(&*left, std::distance(left, right));
+    return makeStringView(left, right);
 }
 
 // based on https://opensource.apple.com/source/distcc/distcc-31.0.81/popt/poptparse.c.auto.html
@@ -186,17 +200,6 @@ std::optional<std::vector<std::string>> splitCommand(std::string_view s)
     return result;
 }
 
-bool startsWith(std::string_view haystack, std::string_view needle)
-{
-    return haystack.size() >= needle.size() && haystack.compare(0, needle.size(), needle) == 0;
-}
-
-bool endsWith(std::string_view haystack, std::string_view needle)
-{
-    return haystack.size() >= needle.size()
-            && haystack.compare(haystack.size() - needle.size(), needle.size(), needle) == 0;
-}
-
 [[noreturn]] void raizeUnknownComparisonException(const PcPackage &pkg, std::string_view verName, std::string_view comp)
 {
     std::string message;
@@ -388,17 +391,6 @@ PcPackage::RequiredVersion::ComparisonType comparisonFromString(
     raizeUnknownComparisonException(pkg, verName, comp);
 }
 
-std::string baseName(const std::string_view &filePath)
-{
-    auto pos = filePath.rfind('/');
-    const auto fileName =
-            pos == std::string_view::npos ? std::string_view() : filePath.substr(pos + 1);
-    pos = fileName.rfind('.');
-    return std::string(pos == std::string_view::npos
-            ? std::string_view()
-            : fileName.substr(0, pos));
-}
-
 } // namespace
 
 PcParser::PcParser(const PkgConfig &pkgConfig)
@@ -420,15 +412,15 @@ try
     if (!file.is_open())
         throw PcException(std::string("Can't open file ") + path);
 
-    package.baseFileName = baseName(path);
+    package.baseFileName = std::string{completeBaseName(path)};
 #if HAS_STD_FILESYSTEM
     const auto fsPath = std::filesystem::path(path);
     package.filePath = fsPath.generic_string();
-    package.vars["pcfiledir"] = fsPath.parent_path().generic_string();
+    package.variables["pcfiledir"] = fsPath.parent_path().generic_string();
 #else
     QFileInfo fileInfo(QString::fromStdString(path));
     package.filePath = fileInfo.absoluteFilePath().toStdString();
-    package.vars["pcfiledir"] = fileInfo.absolutePath().toStdString();
+    package.variables["pcfiledir"] = fileInfo.absolutePath().toStdString();
 #endif
 
     std::string line;
@@ -436,7 +428,7 @@ try
         parseLine(package, line);
     return package;
 } catch(const PcException &ex) {
-    return PcBrokenPackage{path, baseName(path), ex.what()};
+    return PcBrokenPackage{path, std::string{completeBaseName(path)}, ex.what()};
 }
 
 std::string PcParser::trimAndSubstitute(const PcPackage &pkg, std::string_view str) const
@@ -466,10 +458,10 @@ std::string PcParser::trimAndSubstitute(const PcPackage &pkg, std::string_view s
 
             const auto varval = m_pkgConfig.packageGetVariable(pkg, varname);
 
-            if (varval.empty())
+            if (!varval)
                 raizeUndefinedVariableException(pkg, varname);
 
-            result += varval;
+            result += *varval;
         } else {
             result += str.front();
             str.remove_prefix(1);
@@ -479,6 +471,35 @@ std::string PcParser::trimAndSubstitute(const PcPackage &pkg, std::string_view s
     return result;
 }
 
+std::string PcParser::evaluateVariable(
+    PcPackage &pkg, std::string_view tag, std::string_view str) const
+{
+    static constexpr std::string_view prefixVariable = "prefix";
+    if (m_pkgConfig.options().definePrefix) {
+        if (tag == prefixVariable) {
+            std::string_view prefix = pkg.filePath;
+            prefix = parentPath(prefix);
+            if (completeBaseName(prefix) == "pkgconfig") {
+                prefix = parentPath(prefix);
+                prefix = parentPath(prefix);
+            }
+            pkg.oldPrefix = std::string(str);
+            if (!prefix.empty())
+                str = prefix;
+            return std::string(str);
+        } else if (pkg.oldPrefix
+                && str.size() > pkg.oldPrefix->size()
+                && str.substr(0, pkg.oldPrefix->size()) == *pkg.oldPrefix
+                && str[pkg.oldPrefix->size()] == '/') {
+            auto result = pkg.variables["prefix"];
+            result += str.substr(pkg.oldPrefix->size());
+            return trimAndSubstitute(pkg, result);
+        }
+    }
+
+    return trimAndSubstitute(pkg, str);
+}
+
 void PcParser::parseStringField(
         PcPackage &pkg,
         std::string &field,
@@ -503,9 +524,11 @@ void PcParser::parseLibs(
         raiseDuplicateFieldException(fieldName, pkg.filePath);
 
     const auto trimmed = trimAndSubstitute(pkg, str);
+    if (trimmed.empty())
+        return;
 
     const auto argv = splitCommand(trimmed);
-    if (!trimmed.empty() && !argv)
+    if (!argv)
         throw PcException("Couldn't parse Libs field into an argument vector");
 
     libs = doParseLibs(*argv);
@@ -572,9 +595,11 @@ void PcParser::parseCFlags(PcPackage &pkg, std::string_view str)
         raiseDuplicateFieldException("Cflags", pkg.filePath);
 
     const auto command = trimAndSubstitute(pkg, str);
+    if (command.empty())
+        return;
 
     const auto argv = splitCommand(command);
-    if (!command.empty() && !argv)
+    if (!argv)
         throw PcException("Couldn't parse Cflags field into an argument vector");
 
     std::vector<PcPackage::Flag> cflags;
@@ -633,10 +658,10 @@ std::vector<PcPackage::RequiredVersion> PcParser::parseModuleList(PcPackage &pkg
 
         auto start = p;
 
-        while (*p && !std::isspace(*p))
+        while (p != end && !std::isspace(*p))
             ++p;
 
-        const auto name = std::string_view(&*start, std::distance(start, p));
+        const auto name = makeStringView(start, p);
 
         if (name.empty())
             raizeEmptyPackageNameException(pkg);
@@ -651,7 +676,7 @@ std::vector<PcPackage::RequiredVersion> PcParser::parseModuleList(PcPackage &pkg
         while (p != end && !std::isspace(*p))
             ++p;
 
-        const auto comp = std::string_view(&*start, std::distance(start, p));
+        const auto comp = makeStringView(start, p);
         ver.comparison = comparisonFromString(pkg, ver.name, comp);
 
         while (p != end && std::isspace(*p))
@@ -662,7 +687,7 @@ std::vector<PcPackage::RequiredVersion> PcParser::parseModuleList(PcPackage &pkg
         while (p != end && !std::isspace(*p))
             ++p;
 
-        const auto version = std::string_view(&*start, std::distance(start, p));
+        const auto version = makeStringView(start, p);
 
         while (p != end && std::isspace(*p))
             ++p;
@@ -701,10 +726,8 @@ void PcParser::parseLine(PcPackage &pkg, std::string_view str)
         size_t pos = 0;
         for (; pos < s.size(); ++pos) {
             auto p = s.data() + pos;
-            if (!((*p >= 'A' && *p <= 'Z') ||
-                   (*p >= 'a' && *p <= 'z') ||
-                   (*p >= '0' && *p <= '9') ||
-                   *p == '_' || *p == '.')) {
+            if ((*p < 'A' || *p > 'Z') && (*p < 'a' || *p > 'z') && (*p < '0' || *p > '9')
+                && *p != '_' && *p != '.') {
                 break;
             }
         }
@@ -756,15 +779,8 @@ void PcParser::parseLine(PcPackage &pkg, std::string_view str)
         str.remove_prefix(1); // cut '='
         str = trimmed(str);
 
-        // TODO: support guesstimating of the prefix variable (pkg-config's --define-prefix option)
-        // from doc: "try to override the value of prefix for each .pc file found with a
-        // guesstimated value based on the location of the .pc file"
-        // https://gitlab.freedesktop.org/pkg-config/pkg-config/-/blob/pkg-config-0.29.2/parse.c#L998
-        // This option is disabled by default, and Qbs doesn't allow to override it yet, so we can
-        // ignore this feature for now
-
-        const auto value = trimAndSubstitute(pkg, str);
-        if (!pkg.vars.insert({std::string(tag), value}).second)
+        const auto value = evaluateVariable(pkg, tag, str);
+        if (!pkg.variables.insert({std::string(tag), value}).second)
             raizeDuplicateVariableException(pkg, tag);
     }
 }
diff --git a/src/lib/pkgconfig/pcparser.h b/src/lib/pkgconfig/pcparser.h
index ffdf86aaa..a8a5e5cd4 100644
--- a/src/lib/pkgconfig/pcparser.h
+++ b/src/lib/pkgconfig/pcparser.h
@@ -55,6 +55,7 @@ public:
 
 private:
     std::string trimAndSubstitute(const PcPackage &pkg, std::string_view str) const;
+    std::string evaluateVariable(PcPackage &pkg, std::string_view tag, std::string_view str) const;
     void parseStringField(
             PcPackage &pkg,
             std::string &field,
diff --git a/src/lib/pkgconfig/pkgconfig.cpp b/src/lib/pkgconfig/pkgconfig.cpp
index f017b365c..6b3bde46c 100644
--- a/src/lib/pkgconfig/pkgconfig.cpp
+++ b/src/lib/pkgconfig/pkgconfig.cpp
@@ -106,50 +106,6 @@ constexpr inline char listSeparator() noexcept
 #endif
 }
 
-// based on https://stackoverflow.com/a/33135699/295518
-int compareVersions(std::string_view v1, std::string_view v2)
-{
-    for (size_t i = 0, j = 0; i < v1.length() || j < v2.length(); ) {
-        size_t acc1 = 0;
-        size_t acc2 = 0;
-
-        while (i < v1.length() && v1[i] != '.') {
-            acc1 = acc1 * 10 + (v1[i] - '0');
-            i++;
-        }
-        while (j < v2.length() && v2[j] != '.') {
-            acc2 = acc2 * 10 + (v2[j] - '0');
-            j++;
-        }
-
-        if (acc1 < acc2)
-            return -1;
-        if (acc1 > acc2)
-            return +1;
-
-        ++i;
-        ++j;
-    }
-    return 0;
-}
-
-using ComparisonType = PcPackage::RequiredVersion::ComparisonType;
-
-bool versionTest(ComparisonType comparison, std::string_view a, std::string_view b)
-{
-    switch (comparison) {
-    case ComparisonType::LessThan: return compareVersions(a, b) < 0;
-    case ComparisonType::GreaterThan: return compareVersions(a, b) > 0;
-    case ComparisonType::LessThanEqual: return compareVersions(a, b) <= 0;
-    case ComparisonType::GreaterThanEqual: return compareVersions(a, b) >= 0;
-    case ComparisonType::Equal: return compareVersions(a, b) == 0;
-    case ComparisonType::NotEqual: return compareVersions(a, b) != 0;
-    case ComparisonType::AlwaysMatch: return true;
-    }
-
-    return false;
-}
-
 [[noreturn]] void raizeUnknownPackageException(std::string_view package)
 {
     std::string message;
@@ -217,16 +173,17 @@ const PcPackageVariant &PkgConfig::getPackage(std::string_view baseFileName) con
     return *it;
 }
 
-std::string_view PkgConfig::packageGetVariable(const PcPackage &pkg, std::string_view var) const
+std::optional<std::string_view> PkgConfig::packageGetVariable(
+    const PcPackage &pkg, std::string_view var) const
 {
-    std::string_view varval;
+    std::optional<std::string_view> result;
 
     if (var.empty())
-        return varval;
+        return result;
 
     const auto &globals = m_options.globalVariables;
     if (auto it = globals.find(var); it != globals.end())
-        varval = it->second;
+        result = it->second;
 
     // Allow overriding specific variables using an environment variable of the
     // form PKG_CONFIG_$PACKAGENAME_$VARIABLE
@@ -234,15 +191,15 @@ std::string_view PkgConfig::packageGetVariable(const PcPackage &pkg, std::string
         const std::string envVariable = varToEnvVar(pkg.baseFileName, var);
         const auto it = m_options.systemVariables.find(envVariable);
         if (it != m_options.systemVariables.end())
-            return it->second;
+            result = it->second;
     }
 
-    if (varval.empty()) {
-        const auto it = pkg.vars.find(var);
-        varval = (it != pkg.vars.end()) ? it->second : std::string_view();
+    if (!result) {
+        if (const auto it = pkg.variables.find(var); it != pkg.variables.end())
+            result = it->second;
     }
 
-    return varval;
+    return result;
 }
 
 #if HAS_STD_FILESYSTEM
@@ -333,115 +290,6 @@ PcBrokenPackage makeVersionMismatchDependency(
             package.filePath, package.baseFileName, std::move(message)};
 }
 
-PkgConfig::Packages PkgConfig::mergeDependencies(const PkgConfig::Packages &packages) const
-{
-    std::unordered_map<std::string_view, const PcPackageVariant *> packageHash;
-
-    struct MergedHashEntry
-    {
-        PcPackageVariant package; // merged package or broken package
-        std::vector<const PcPackage *> deps; // unmerged transitive deps, including Package itself
-    };
-    std::unordered_map<std::string, MergedHashEntry> mergedHash;
-
-    for (const auto &package: packages)
-        packageHash[package.getBaseFileName()] = &package;
-
-    auto func = [&](const PcPackageVariant &package, auto &f) -> const MergedHashEntry &
-    {
-        const auto it = mergedHash.find(package.getBaseFileName());
-        if (it != mergedHash.end())
-            return it->second;
-
-        auto &entry = mergedHash[package.getBaseFileName()];
-
-        auto visitor = [&](auto &&package) -> PcPackageVariant {
-
-            using T = std::decay_t<decltype(package)>;
-            if constexpr (std::is_same_v<T, PcPackage>) { // NOLINT
-
-                using Flags = std::vector<PcPackage::Flag>;
-
-                // returns true if multiple copies of the flag can present in the same package
-                // we can't properly merge flags that have multiple parameters except for
-                // -framework which we handle correctly.
-                auto canHaveDuplicates = [](const PcPackage::Flag::Type &type) {
-                    return type == PcPackage::Flag::Type::LinkerFlag
-                            || type == PcPackage::Flag::Type::CompilerFlag;
-                };
-
-                std::unordered_set<PcPackage::Flag> visitedFlags;
-                // appends only those flags to the target that were not seen before (except for
-                // ones that can have duplicates)
-                auto mergeFlags = [&](Flags &target, const Flags &source)
-                {
-                    for (const auto &flag: source) {
-                        if (canHaveDuplicates(flag.type) || visitedFlags.insert(flag).second)
-                            target.push_back(flag);
-                    }
-                };
-
-                std::unordered_set<const PcPackage *> visitedDeps;
-
-                PcPackage result;
-                // copy only meta info for now
-                result.filePath = package.filePath;
-                result.baseFileName = package.baseFileName;
-                result.name = package.name;
-                result.version = package.version;
-                result.description = package.description;
-                result.url = package.url;
-
-                auto allDependencies = package.requiresPublic;
-                if (m_options.staticMode)
-                    allDependencies << package.requiresPrivate;
-
-                for (const auto &dependency: allDependencies) {
-                    const auto it = packageHash.find(dependency.name);
-                    if (it == packageHash.end())
-                        return makeMissingDependency(result, dependency);
-
-                    const auto childEntry = f(*it->second, f);
-                    if (childEntry.package.isBroken())
-                        return makeBrokenDependency(result, dependency);
-
-                    const auto &mergedPackage = childEntry.package.asPackage();
-                    const bool versionOk = versionTest(
-                            dependency.comparison, mergedPackage.version, dependency.version);
-                    if (!versionOk)
-                        return makeVersionMismatchDependency(result, mergedPackage, dependency);
-
-                    for (const auto *dep: childEntry.deps) {
-                        if (visitedDeps.insert(dep).second)
-                            entry.deps.push_back(dep);
-                    }
-                }
-
-                entry.deps.push_back(&package);
-
-                for (const auto *dep: entry.deps) {
-                    mergeFlags(result.libs, dep->libs);
-                    mergeFlags(result.cflags, dep->cflags);
-                }
-
-                return result;
-            }
-            return package;
-        };
-        entry.package = package.visit(visitor);
-
-        return entry;
-    };
-
-    for (auto &package: packages)
-        func(package, func);
-
-    Packages result;
-    for (auto &[key, value]: mergedHash)
-        result.push_back(std::move(value.package));
-    return result;
-}
-
 PkgConfig::Packages PkgConfig::findPackages() const
 {
     Packages result;
@@ -478,9 +326,6 @@ PkgConfig::Packages PkgConfig::findPackages() const
         result.emplace_back(std::move(pkg));
     }
 
-    if (m_options.mergeDependencies)
-        result = mergeDependencies(result);
-
     const auto lessThanPackage = [](const PcPackageVariant &lhs, const PcPackageVariant &rhs)
     {
         return lhs.getBaseFileName() < rhs.getBaseFileName();
diff --git a/src/lib/pkgconfig/pkgconfig.h b/src/lib/pkgconfig/pkgconfig.h
index 6da1f053f..fd4cc3253 100644
--- a/src/lib/pkgconfig/pkgconfig.h
+++ b/src/lib/pkgconfig/pkgconfig.h
@@ -58,7 +58,7 @@ public:
         std::vector<std::string> systemLibraryPaths; // PKG_CONFIG_SYSTEM_LIBRARY_PATH
         bool disableUninstalled{true};               // PKG_CONFIG_DISABLE_UNINSTALLED
         bool staticMode{false};
-        bool mergeDependencies{true};
+        bool definePrefix{false};
         VariablesMap globalVariables;
         VariablesMap systemVariables;
     };
@@ -72,11 +72,11 @@ public:
     const Packages &packages() const { return m_packages; }
     const PcPackageVariant &getPackage(std::string_view baseFileName) const;
 
-    std::string_view packageGetVariable(const PcPackage &pkg, std::string_view var) const;
+    std::optional<std::string_view> packageGetVariable(
+        const PcPackage &pkg, std::string_view var) const;
 
 private:
     Packages findPackages() const;
-    Packages mergeDependencies(const Packages &packages) const;
 
 private:
     Options m_options;
diff --git a/src/lib/pkgconfig/pkgconfig.pro b/src/lib/pkgconfig/pkgconfig.pro
deleted file mode 100644
index dcabf0ba1..000000000
--- a/src/lib/pkgconfig/pkgconfig.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-TARGET = qbspkgconfig
-include(../staticlibrary.pri)
-include(../../shared/variant/variant.pri)
-
-DEFINES += \
-    PKG_CONFIG_PC_PATH=\\\"/usr/lib/pkgconfig:/usr/share/pkgconfig\\\" \
-    PKG_CONFIG_SYSTEM_LIBRARY_PATH=\\\"/usr/$${QBS_LIBRARY_DIRNAME}/\\\" \
-    QBS_PC_WITH_QT_SUPPORT=1
-
-macos|win32-g++ {
-    DEFINES += HAS_STD_FILESYSTEM=0
-} else {
-    DEFINES += HAS_STD_FILESYSTEM=1
-}
-
-HEADERS += \
-    pcpackage.h \
-    pcparser.h \
-    pkgconfig.h
-
-SOURCES += \
-    pcpackage.cpp \
-    pcparser.cpp \
-    pkgconfig.cpp \
-
diff --git a/src/lib/pkgconfig/pkgconfig.qbs b/src/lib/pkgconfig/pkgconfig.qbs
index 0be5065f5..a32eb775b 100644
--- a/src/lib/pkgconfig/pkgconfig.qbs
+++ b/src/lib/pkgconfig/pkgconfig.qbs
@@ -60,7 +60,7 @@ QbsStaticLibrary {
         Depends { name: "qbsvariant" }
         cpp.defines: exportingProduct.publicDefines
         cpp.staticLibraries: {
-            if (qbs.toolchainType === "gcc" && cpp.compilerVersionMajor === 7)
+            if (qbs.toolchainType === "gcc" && cpp.compilerVersionMajor < 9)
                 return ["stdc++fs"];
             return [];
         }
diff --git a/src/lib/pkgconfig/use_pkgconfig.pri b/src/lib/pkgconfig/use_pkgconfig.pri
deleted file mode 100644
index e0e485e46..000000000
--- a/src/lib/pkgconfig/use_pkgconfig.pri
+++ /dev/null
@@ -1,52 +0,0 @@
-include(../../library_dirname.pri)
-include(../../shared/variant/variant.pri)
-
-isEmpty(QBSLIBDIR) {
-    QBSLIBDIR = $${OUT_PWD}/../../../$${QBS_LIBRARY_DIRNAME}
-}
-
-QBSPKGCONFIG_LIBNAME=qbspkgconfig
-
-unix {
-    LIBS += -L$${QBSLIBDIR} -l$${QBSPKGCONFIG_LIBNAME}
-}
-
-win32 {
-    CONFIG(debug, debug|release) {
-        QBSPKGCONFIG_LIB = $${QBSPKGCONFIG_LIBNAME}d
-    }
-    CONFIG(release, debug|release) {
-        QBSPKGCONFIG_LIB = $${QBSPKGCONFIG_LIBNAME}
-    }
-    msvc {
-        LIBS += /LIBPATH:$$QBSLIBDIR
-        QBSPKGCONFIG_LIB = $${QBSPKGCONFIG_LIB}.lib
-        LIBS += Shell32.lib
-    } else {
-        LIBS += -L$${QBSLIBDIR}
-        QBSPKGCONFIG_LIB = lib$${QBSPKGCONFIG_LIB}
-    }
-    LIBS += $${QBSPKGCONFIG_LIB}
-}
-
-gcc {
-    isEmpty(COMPILER_VERSION) {
-        COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion")
-        COMPILER_MAJOR_VERSION = $$str_member($$COMPILER_VERSION)
-        equals(COMPILER_MAJOR_VERSION, 7) {
-            LIBS += -lstdc++fs
-        }
-    }
-}
-
-INCLUDEPATH += \
-    $$PWD
-
-CONFIG += depend_includepath
-
-CONFIG(static, static|shared) {
-    DEFINES += QBS_STATIC_LIB
-}
-
-DEFINES += \
-    QBS_PC_WITH_QT_SUPPORT=1
diff --git a/src/lib/scriptengine/CMakeLists.txt b/src/lib/scriptengine/CMakeLists.txt
deleted file mode 100644
index 0533cfac5..000000000
--- a/src/lib/scriptengine/CMakeLists.txt
+++ /dev/null
@@ -1,366 +0,0 @@
-set(QT_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../shared/qtscript/src/")
-
-if (UNIX)
-    set(_USE_SYSTEM_MALLOC NO)
-else()
-    set(_USE_SYSTEM_MALLOC YES)
-endif (UNIX)
-
-set(JAVASCRIPT_CORE_INCLUDES
-    assembler
-    bytecode
-    bytecompiler
-    debugger
-    interpreter
-    jit
-    parser
-    pcre
-    profiler
-    runtime
-    wrec
-    wtf
-    wtf/unicode
-    yarr
-    API
-    ForwardingHeaders
-    generated
-)
-list_transform_prepend(JAVASCRIPT_CORE_INCLUDES "${QT_SCRIPT_PATH}/3rdparty/javascriptcore/JavaScriptCore/")
-
-set(QT_SCRIPT_PUBLIC_INCLUDES
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "${CMAKE_CURRENT_BINARY_DIR}/include"
-)
-
-set(QT_SCRIPT_INCLUDES
-    "${QT_SCRIPT_PATH}/3rdparty/javascriptcore"
-    "${QT_SCRIPT_PATH}/3rdparty/javascriptcore/JavaScriptCore"
-    "${QT_SCRIPT_PATH}/script"
-    "${QT_SCRIPT_PATH}/script/api"
-    "${QT_SCRIPT_PATH}/script/parser"
-    "${CMAKE_CURRENT_BINARY_DIR}/include/QtScript/${QT_VERSION}/QtScript"
-)
-
-set(QT_SCRIPT_DEFINES
-    "QT_BUILD_SCRIPT_LIB"
-    "QT_NO_USING_NAMESPACE"
-    "JSC=QTJSC"
-    "jscyyparse=qtjscyyparse"
-    "jscyylex=qtjscyylex"
-    "jscyyerror=qtjscyyerror"
-    "WTF=QTWTF"
-    "LOG_DISABLED=1"
-    "WTF_USE_JAVASCRIPTCORE_BINDINGS=1"
-    "WTF_CHANGES=1"
-    "JS_NO_EXPORT"
-
-    # JavaScriptCore
-    "BUILDING_QT__"
-    "BUILDING_JavaScriptCore"
-    "BUILDING_WTF"
-    "ENABLE_JIT=0"
-    "ENABLE_YARR_JIT=0"
-    "ENABLE_YARR=0"
-
-    # WebKit
-    "WTF_USE_ACCELERATED_COMPOSITING"
-)
-
-if (APPLE)
-    list(APPEND QT_SCRIPT_DEFINES "ENABLE_JSC_MULTIPLE_THREADS=0")
-elseif(WIN32)
-    list(APPEND QT_SCRIPT_DEFINES "NOMINMAX" "_CRT_RAND_S")
-endif()
-
-if (MSVC)
-    set(QT_SCRIPT_CXX_FLAGS "/wd4291" "/wd4344" "/wd4396" "/wd4503" "/wd4800" "/wd4819" "/wd4996")
-else()
-    set(QT_SCRIPT_CXX_FLAGS "-fno-strict-aliasing" "-w"
-        "-Wall" "-Wreturn-type" "-Wcast-align" "-Wchar-subscripts"
-        "-Wformat-security" "-Wreturn-type" "-Wno-unused-parameter"
-        "-Wno-sign-compare" "-Wno-switch" "-Wno-switch-enum" "-Wundef"
-        "-Wmissing-noreturn" "-Winit-self" "-Wno-deprecated" "-Wno-suggest-attribute=noreturn"
-        "-Wno-nonnull-compare" "-pthread")
-endif()
-
-set(QT_SCRIPT_PUBLIC_DEPENDS Qt${QT_VERSION_MAJOR}::Core)
-if (UNIX)
-    list(APPEND QT_SCRIPT_PUBLIC_DEPENDS "pthread")
-elseif(WIN32)
-    list(APPEND QT_SCRIPT_PUBLIC_DEPENDS "winmm")
-endif()
-
-set(PCRE_SOURCES
-    pcre_compile.cpp
-    pcre_exec.cpp
-    pcre_tables.cpp
-    pcre_ucp_searchfuncs.cpp
-    pcre_xclass.cpp
-)
-list_transform_prepend(PCRE_SOURCES "${QT_SCRIPT_PATH}/3rdparty/javascriptcore/JavaScriptCore/pcre/")
-
-if (NOT _USE_SYSTEM_MALLOC)
-    set(SYSTEM_MALLOC_SOURCES
-        wtf/TCSystemAlloc.cpp
-    )
-    list_transform_prepend(SYSTEM_MALLOC_SOURCES "${QT_SCRIPT_PATH}/3rdparty/javascriptcore/JavaScriptCore/")
-
-else()
-    set(SYSTEM_MALLOC_SOURCES "")
-    list(APPEND QT_SCRIPT_DEFINES "USE_SYSTEM_MALLOC")
-endif()
-
-set(JAVASCRIPT_CORE_SOURCES
-    API/JSBase.cpp
-    API/JSCallbackConstructor.cpp
-    API/JSCallbackFunction.cpp
-    API/JSCallbackObject.cpp
-    API/JSClassRef.cpp
-    API/JSContextRef.cpp
-    API/JSObjectRef.cpp
-    API/JSStringRef.cpp
-    API/JSValueRef.cpp
-    API/OpaqueJSString.cpp
-    assembler/ARMAssembler.cpp
-    assembler/MacroAssemblerARM.cpp
-    bytecode/CodeBlock.cpp
-    bytecode/JumpTable.cpp
-    bytecode/Opcode.cpp
-    bytecode/SamplingTool.cpp
-    bytecode/StructureStubInfo.cpp
-    bytecompiler/BytecodeGenerator.cpp
-    bytecompiler/NodesCodegen.cpp
-    debugger/DebuggerActivation.cpp
-    debugger/DebuggerCallFrame.cpp
-    debugger/Debugger.cpp
-    generated/Grammar.cpp
-    interpreter/CallFrame.cpp
-    interpreter/Interpreter.cpp
-    interpreter/RegisterFile.cpp
-    parser/Lexer.cpp
-    parser/Nodes.cpp
-    parser/ParserArena.cpp
-    parser/Parser.cpp
-    profiler/Profile.cpp
-    profiler/ProfileGenerator.cpp
-    profiler/ProfileNode.cpp
-    profiler/Profiler.cpp
-    runtime/ArgList.cpp
-    runtime/Arguments.cpp
-    runtime/ArrayConstructor.cpp
-    runtime/ArrayPrototype.cpp
-    runtime/BooleanConstructor.cpp
-    runtime/BooleanObject.cpp
-    runtime/BooleanPrototype.cpp
-    runtime/CallData.cpp
-    runtime/Collector.cpp
-    runtime/CommonIdentifiers.cpp
-    runtime/Completion.cpp
-    runtime/ConstructData.cpp
-    runtime/DateConstructor.cpp
-    runtime/DateConversion.cpp
-    runtime/DateInstance.cpp
-    runtime/DatePrototype.cpp
-    runtime/ErrorConstructor.cpp
-    runtime/Error.cpp
-    runtime/ErrorInstance.cpp
-    runtime/ErrorPrototype.cpp
-    runtime/ExceptionHelpers.cpp
-    runtime/Executable.cpp
-    runtime/FunctionConstructor.cpp
-    runtime/FunctionPrototype.cpp
-    runtime/GetterSetter.cpp
-    runtime/GlobalEvalFunction.cpp
-    runtime/Identifier.cpp
-    runtime/InitializeThreading.cpp
-    runtime/InternalFunction.cpp
-    runtime/JSActivation.cpp
-    runtime/JSAPIValueWrapper.cpp
-    runtime/JSArray.cpp
-    runtime/JSByteArray.cpp
-    runtime/JSCell.cpp
-    runtime/JSFunction.cpp
-    runtime/JSGlobalData.cpp
-    runtime/JSGlobalObject.cpp
-    runtime/JSGlobalObjectFunctions.cpp
-    runtime/JSImmediate.cpp
-    runtime/JSLock.cpp
-    runtime/JSNotAnObject.cpp
-    runtime/JSNumberCell.cpp
-    runtime/JSObject.cpp
-    runtime/JSONObject.cpp
-    runtime/JSPropertyNameIterator.cpp
-    runtime/JSStaticScopeObject.cpp
-    runtime/JSString.cpp
-    runtime/JSValue.cpp
-    runtime/JSVariableObject.cpp
-    runtime/JSWrapperObject.cpp
-    runtime/LiteralParser.cpp
-    runtime/Lookup.cpp
-    runtime/MarkStackPosix.cpp
-    runtime/MarkStackSymbian.cpp
-    runtime/MarkStackWin.cpp
-    runtime/MarkStack.cpp
-    runtime/MathObject.cpp
-    runtime/NativeErrorConstructor.cpp
-    runtime/NativeErrorPrototype.cpp
-    runtime/NumberConstructor.cpp
-    runtime/NumberObject.cpp
-    runtime/NumberPrototype.cpp
-    runtime/ObjectConstructor.cpp
-    runtime/ObjectPrototype.cpp
-    runtime/Operations.cpp
-    runtime/PropertyDescriptor.cpp
-    runtime/PropertyNameArray.cpp
-    runtime/PropertySlot.cpp
-    runtime/PrototypeFunction.cpp
-    runtime/RegExpConstructor.cpp
-    runtime/RegExp.cpp
-    runtime/RegExpObject.cpp
-    runtime/RegExpPrototype.cpp
-    runtime/ScopeChain.cpp
-    runtime/SmallStrings.cpp
-    runtime/StringConstructor.cpp
-    runtime/StringObject.cpp
-    runtime/StringPrototype.cpp
-    runtime/StructureChain.cpp
-    runtime/Structure.cpp
-    runtime/TimeoutChecker.cpp
-    runtime/UString.cpp
-    runtime/UStringImpl.cpp
-    wtf/Assertions.cpp
-    wtf/ByteArray.cpp
-    wtf/CurrentTime.cpp
-    wtf/DateMath.cpp
-    wtf/dtoa.cpp
-    wtf/FastMalloc.cpp
-    wtf/HashTable.cpp
-    wtf/MainThread.cpp
-    wtf/qt/MainThreadQt.cpp
-    wtf/qt/ThreadingQt.cpp
-    wtf/RandomNumber.cpp
-    wtf/RefCountedLeakCounter.cpp
-    wtf/ThreadingNone.cpp
-    wtf/Threading.cpp
-    wtf/TypeTraits.cpp
-    wtf/unicode/CollatorDefault.cpp
-    wtf/unicode/icu/CollatorICU.cpp
-    wtf/unicode/UTF8.cpp
-)
-list_transform_prepend(JAVASCRIPT_CORE_SOURCES "${QT_SCRIPT_PATH}/3rdparty/javascriptcore/JavaScriptCore/")
-
-set(API_SOURCES
-    qscriptable.cpp
-    qscriptable.h
-    qscriptable_p.h
-    qscriptclass.cpp
-    qscriptclass.h
-    qscriptclasspropertyiterator.cpp
-    qscriptclasspropertyiterator.h
-    qscriptcontext.cpp
-    qscriptcontext.h
-    qscriptcontextinfo.cpp
-    qscriptcontextinfo.h
-    qscriptcontext_p.h
-    qscriptengineagent.cpp
-    qscriptengineagent.h
-    qscriptengineagent_p.h
-    qscriptengine.cpp
-    qscriptengine.h
-    qscriptengine_p.h
-    qscriptextensioninterface.h
-    qscriptextensionplugin.cpp
-    qscriptextensionplugin.h
-    qscriptprogram.cpp
-    qscriptprogram.h
-    qscriptprogram_p.h
-    qscriptstring.cpp
-    qscriptstring.h
-    qscriptstring_p.h
-    qscriptvalue.cpp
-    qscriptvalue.h
-    qscriptvalueiterator.cpp
-    qscriptvalueiterator.h
-    qscriptvalue_p.h
-    qtscriptglobal.h
-)
-list_transform_prepend(API_SOURCES "${QT_SCRIPT_PATH}/script/api/")
-
-set(BRIDGE_SOURCES
-    qscriptactivationobject.cpp
-    qscriptactivationobject_p.h
-    qscriptclassobject.cpp
-    qscriptclassobject_p.h
-    qscriptfunction.cpp
-    qscriptfunction_p.h
-    qscriptglobalobject.cpp
-    qscriptglobalobject_p.h
-    qscriptobject.cpp
-    qscriptobject_p.h
-    qscriptqobject.cpp
-    qscriptqobject_p.h
-    qscriptstaticscopeobject.cpp
-    qscriptstaticscopeobject_p.h
-    qscriptvariant.cpp
-    qscriptvariant_p.h
-)
-list_transform_prepend(BRIDGE_SOURCES "${QT_SCRIPT_PATH}/script/bridge/")
-
-set(PARSER_SOURCES
-    qscriptast.cpp
-    qscriptastfwd_p.h
-    qscriptast_p.h
-    qscriptastvisitor.cpp
-    qscriptastvisitor_p.h
-    qscriptgrammar.cpp
-    qscriptgrammar_p.h
-    qscriptlexer.cpp
-    qscriptlexer_p.h
-    qscriptsyntaxchecker.cpp
-    qscriptsyntaxchecker_p.h
-)
-list_transform_prepend(PARSER_SOURCES "${QT_SCRIPT_PATH}/script/parser/")
-
-find_package(Perl)
-
-get_target_property(_QT_MOC_EXECUTABLE Qt${QT_VERSION_MAJOR}::moc IMPORTED_LOCATION)
-get_filename_component(_QT_LIBEXEC_DIRECTORY ${_QT_MOC_EXECUTABLE} DIRECTORY)
-
-file(GLOB API_HEADERS "${QT_SCRIPT_PATH}/script/api/*.h")
-
-set(EXTERNAL_DEPENDS "")
-if(APPLE)
-    set(EXTERNAL_DEPENDS "-framework CoreFoundation")
-endif()
-
-if(WIN32)
-    set(EXTERNAL_DEPENDS "winmm")
-endif()
-
-add_custom_command(
-    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/QtScript/qscriptengine.h"
-    COMMAND ${PERL_EXECUTABLE} "${_QT_LIBEXEC_DIRECTORY}/syncqt.pl"
-        -minimal
-        -version "${QT_VERSION}"
-        -outdir ${CMAKE_CURRENT_BINARY_DIR}
-        "${QT_SCRIPT_PATH}/.."
-    BYPRODUCTS
-    DEPENDS ${API_HEADERS}
-    )
-
-add_qbs_library(qbsscriptengine
-    DEFINES ${QT_SCRIPT_DEFINES}
-    DEPENDS Qt${QT_VERSION_MAJOR}::CorePrivate Qt6Core5Compat ${EXTERNAL_DEPENDS}
-    PUBLIC_DEPENDS ${QT_SCRIPT_PUBLIC_DEPENDS}
-    INCLUDES ${QT_SCRIPT_PUBLIC_INCLUDES} ${QT_SCRIPT_INCLUDES} ${JAVASCRIPT_CORE_INCLUDES}
-    PUBLIC_INCLUDES ${QT_SCRIPT_PUBLIC_INCLUDES}
-    SOURCES
-        "${CMAKE_CURRENT_BINARY_DIR}/include/QtScript/qscriptengine.h"
-        ${PCRE_SOURCES}
-        ${SYSTEM_MALLOC_SOURCES}
-        ${JAVASCRIPT_CORE_SOURCES}
-        ${API_SOURCES}
-        ${BRIDGE_SOURCES}
-        ${PARSER_SOURCES}
-    )
-target_compile_options(qbsscriptengine PRIVATE ${QT_SCRIPT_CXX_FLAGS})
diff --git a/src/lib/scriptengine/scriptengine.pro b/src/lib/scriptengine/scriptengine.pro
deleted file mode 100644
index b1e6e8bad..000000000
--- a/src/lib/scriptengine/scriptengine.pro
+++ /dev/null
@@ -1,95 +0,0 @@
-TARGET = qbsscriptengine
-include(../library.pri)
-INSTALLS =
-
-QT         = core-private
-
-DEFINES   += QT_BUILD_SCRIPT_LIB
-
-DEFINES   += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qtjscyyerror WTF=QTWTF
-DEFINES   += QT_NO_USING_NAMESPACE
-
-CONFIG += building-libs
-
-GENERATED_SOURCES_DIR = generated
-
-CONFIG += QTDIR_build
-include(../../shared/qtscript/src/3rdparty/javascriptcore/WebKit.pri)
-
-# Disable a few warnings on Windows.
-# These are in addition to the ones disabled in WebKit.pri
-msvc: QMAKE_CXXFLAGS += -wd4396 -wd4099
-else: QMAKE_CXXFLAGS += -Wno-deprecated
-
-# We cannot afford -O0 for QtScript even in debug builds.
-QMAKE_CXXFLAGS_DEBUG += -O2
-
-darwin {
-    DEFINES += ENABLE_JSC_MULTIPLE_THREADS=0
-    contains(QT_CONFIG, coreservices) {
-        LIBS_PRIVATE += -framework CoreServices
-    } else {
-        LIBS_PRIVATE += -framework CoreFoundation
-    }
-}
-win32 {
-    LIBS += -lwinmm
-}
-
-# Suppress 'LEAK' messages (see QTBUG-18201)
-DEFINES += LOG_DISABLED=1
-
-JAVASCRIPTCORE_JIT = no
-include(../../shared/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri)
-
-# This line copied from WebCore.pro
-DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1
-
-CONFIG(release, debug|release): DEFINES += NDEBUG
-
-# Avoid JSC C API functions being exported.
-DEFINES += JS_NO_EXPORT
-
-!build_pass {
-    versionAtLeast(QT_VERSION, 6.1.0) {
-        qtPrepareLibExecTool(QMAKE_SYNCQT, syncqt, , system)
-    } else {
-        qtPrepareTool(QMAKE_SYNCQT, syncqt, , system)
-    }
-    QMAKE_SYNCQT += \
-        -minimal -version $$[QT_VERSION] \
-        -outdir $$system_quote($$system_path($$OUT_PWD)) \
-        $$system_quote($$system_path($$clean_path($$PWD/../../shared/qtscript)))
-    !system($$QMAKE_SYNCQT): error("Failed to execute syncqt for the bundled QtScript module.")
-}
-
-INCLUDEPATH += \
-    $$PWD/include \
-    $$OUT_PWD/include \
-    $$OUT_PWD/include/QtScript/$$[QT_VERSION]/QtScript \
-    $$PWD/../../shared/qtscript/src/script \
-    $$PWD/../../shared/qtscript/src/script/api
-
-include(../../shared/qtscript/src/script/api/api.pri)
-include(../../shared/qtscript/src/script/parser/parser.pri)
-
-BRIDGESRCDIR = ../../shared/qtscript/src/script/bridge
-SOURCES += \
-    $$BRIDGESRCDIR/qscriptactivationobject.cpp \
-    $$BRIDGESRCDIR/qscriptclassobject.cpp \
-    $$BRIDGESRCDIR/qscriptfunction.cpp \
-    $$BRIDGESRCDIR/qscriptglobalobject.cpp \
-    $$BRIDGESRCDIR/qscriptobject.cpp \
-    $$BRIDGESRCDIR/qscriptqobject.cpp \
-    $$BRIDGESRCDIR/qscriptstaticscopeobject.cpp \
-    $$BRIDGESRCDIR/qscriptvariant.cpp
-
-HEADERS += \
-    $$BRIDGESRCDIR/qscriptactivationobject_p.h \
-    $$BRIDGESRCDIR/qscriptclassobject_p.h \
-    $$BRIDGESRCDIR/qscriptfunction_p.h \
-    $$BRIDGESRCDIR/qscriptglobalobject_p.h \
-    $$BRIDGESRCDIR/qscriptobject_p.h \
-    $$BRIDGESRCDIR/qscriptqobject_p.h \
-    $$BRIDGESRCDIR/qscriptstaticscopeobject_p.h \
-    $$BRIDGESRCDIR/qscriptvariant_p.h
diff --git a/src/lib/scriptengine/scriptengine.qbs b/src/lib/scriptengine/scriptengine.qbs
deleted file mode 100644
index 0a7090ac0..000000000
--- a/src/lib/scriptengine/scriptengine.qbs
+++ /dev/null
@@ -1,464 +0,0 @@
-import qbs.File
-import qbs.FileInfo
-import qbs.Probes
-import qbs.Process
-import qbs.Utilities
-
-Project {
-    QbsLibrary {
-        condition: qbsbuildconfig.useBundledQtScript || !Qt.script.present
-        Depends {
-            name: "Qt.script"
-            condition: !qbsbuildconfig.useBundledQtScript
-            required: false
-        }
-        Depends { name: "QtScriptFwdHeaders" }
-        Depends { name: "cpp" }
-        Depends { name: "Qt"; submodules: ["core-private"] }
-        Depends {
-            name: "Qt.core5compat";
-            condition: Utilities.versionCompare(Qt.core.version, "6.0.0") >= 0
-        }
-        name: "qbsscriptengine"
-
-        generatePkgConfigFile: false
-        generateQbsModule: false
-
-        property bool useSystemMalloc: !qbs.targetOS.contains("macos")
-                                       && !qbs.targetOS.contains("unix")
-        property string qtscriptPath: "../../shared/qtscript/src/"
-        cpp.includePaths: {
-            var result = base.concat(
-                ".",
-                "include"
-            );
-
-            var jscBaseDir = qtscriptPath + "3rdparty/javascriptcore";
-            result.push(jscBaseDir);
-            jscBaseDir += "/JavaScriptCore";
-            result.push(jscBaseDir);
-
-            var jscSubDirs = [
-                "assembler",
-                "bytecode",
-                "bytecompiler",
-                "debugger",
-                "interpreter",
-                "jit",
-                "parser",
-                "pcre",
-                "profiler",
-                "runtime",
-                "wrec",
-                "wtf",
-                "wtf/unicode",
-                "yarr",
-                "API",
-                "ForwardingHeaders",
-                "generated"];
-            result = result.concat(jscSubDirs.map(function(s) { return jscBaseDir + '/' + s; }));
-
-            result.push(qtscriptPath + "script");
-            result.push(qtscriptPath + "script/api");
-            result.push(qtscriptPath + "script/parser");
-            result = result.concat(QtScriptFwdHeaders.publicIncludePaths,
-                                   QtScriptFwdHeaders.privateIncludePaths);
-            return result;
-        }
-        cpp.defines: {
-            var result = base.concat([
-                "QT_BUILD_SCRIPT_LIB", "QT_NO_USING_NAMESPACE",
-                "JSC=QTJSC", "jscyyparse=qtjscyyparse", "jscyylex=qtjscyylex",
-                "jscyyerror=qtjscyyerror",
-                "WTF=QTWTF",
-                "LOG_DISABLED=1",
-                "WTF_USE_JAVASCRIPTCORE_BINDINGS=1", "WTF_CHANGES=1",
-                "JS_NO_EXPORT"]);
-            if (qbs.buildVariant != "debug")
-                result.push("NDEBUG");
-            if (qbs.targetOS.contains("macos"))
-                result.push("ENABLE_JSC_MULTIPLE_THREADS=0");
-
-            // JavaScriptCore
-            result.push("BUILDING_QT__", "BUILDING_JavaScriptCore", "BUILDING_WTF",
-                        "ENABLE_JIT=0", "ENABLE_YARR_JIT=0", "ENABLE_YARR=0");
-            if (qbs.targetOS.contains("windows")) {
-                // Prevent definition of min, max macros in windows.h
-                result.push("NOMINMAX");
-                // Enables rand_s
-                result.push("_CRT_RAND_S");
-            }
-
-            // WebKit
-            result.push("WTF_USE_ACCELERATED_COMPOSITING");
-            if (useSystemMalloc)
-                result.push("USE_SYSTEM_MALLOC");
-
-            result = result.filter(function(value) {
-                return value !== "QT_RESTRICTED_CAST_FROM_ASCII"
-                        && value !== "QT_NO_CAST_FROM_BYTEARRAY"
-                        && value !== "QT_NO_CAST_FROM_ASCII";
-            })
-            return result;
-        }
-        cpp.cxxFlags: {
-            var result = base;
-            if (qbs.toolchain.contains("gcc")) {
-                result.push("-fno-strict-aliasing",
-                            "-Wall", "-Wreturn-type", "-Wcast-align", "-Wchar-subscripts",
-                            "-Wformat-security", "-Wreturn-type", "-Wno-unused-parameter",
-                            "-Wno-sign-compare", "-Wno-switch", "-Wno-switch-enum", "-Wundef",
-                            "-Wmissing-noreturn", "-Winit-self", "-Wno-deprecated",
-                            "-Wno-suggest-attribute=noreturn", "-Wno-nonnull-compare");
-            } else if (qbs.toolchain.contains("msvc")) {
-                result.push("-wd4291", "-wd4344", "-wd4396", "-wd4503", "-wd4800", "-wd4819",
-                            "-wd4996");
-            }
-            if (qbs.targetOS.contains("unix"))
-                result.push("-pthread");
-
-            return result;
-        }
-        cpp.warningLevel: "none"
-        cpp.optimization: "fast" // We cannot afford -O0 for QtScript even in debug builds.
-        cpp.frameworks: base.concat(qbs.targetOS.contains("darwin") ? ["CoreFoundation"] : [])
-        Properties {
-            condition: qbs.targetOS.contains("unix")
-            cpp.dynamicLibraries: base.concat(["pthread"])
-        }
-        Properties {
-            condition: qbs.targetOS.contains("windows")
-            cpp.dynamicLibraries: base.concat(["winmm"])
-        }
-
-        Group {
-            name: "pcre"
-            prefix: qtscriptPath + "3rdparty/javascriptcore/JavaScriptCore/pcre/"
-            files: [
-                "pcre_compile.cpp",
-                "pcre_exec.cpp",
-                "pcre_tables.cpp",
-                "pcre_ucp_searchfuncs.cpp",
-                "pcre_xclass.cpp",
-            ]
-        }
-
-        Group {
-            name: "system malloc replacement"
-            prefix: qtscriptPath + "3rdparty/javascriptcore/JavaScriptCore/"
-            condition: !useSystemMalloc
-            files: [
-                "wtf/TCSystemAlloc.cpp",
-            ]
-        }
-
-        Group {
-            name: "JavaScriptCore"
-            prefix: qtscriptPath + "3rdparty/javascriptcore/JavaScriptCore/"
-            files: [
-                "API/JSBase.cpp",
-                "API/JSCallbackConstructor.cpp",
-                "API/JSCallbackFunction.cpp",
-                "API/JSCallbackObject.cpp",
-                "API/JSClassRef.cpp",
-                "API/JSContextRef.cpp",
-                "API/JSObjectRef.cpp",
-                "API/JSStringRef.cpp",
-                "API/JSValueRef.cpp",
-                "API/OpaqueJSString.cpp",
-                "assembler/ARMAssembler.cpp",
-                "assembler/MacroAssemblerARM.cpp",
-                "bytecode/CodeBlock.cpp",
-                "bytecode/JumpTable.cpp",
-                "bytecode/Opcode.cpp",
-                "bytecode/SamplingTool.cpp",
-                "bytecode/StructureStubInfo.cpp",
-                "bytecompiler/BytecodeGenerator.cpp",
-                "bytecompiler/NodesCodegen.cpp",
-                "debugger/DebuggerActivation.cpp",
-                "debugger/DebuggerCallFrame.cpp",
-                "debugger/Debugger.cpp",
-                "generated/Grammar.cpp",
-                "interpreter/CallFrame.cpp",
-                "interpreter/Interpreter.cpp",
-                "interpreter/RegisterFile.cpp",
-                "parser/Lexer.cpp",
-                "parser/Nodes.cpp",
-                "parser/ParserArena.cpp",
-                "parser/Parser.cpp",
-                "profiler/Profile.cpp",
-                "profiler/ProfileGenerator.cpp",
-                "profiler/ProfileNode.cpp",
-                "profiler/Profiler.cpp",
-                "runtime/ArgList.cpp",
-                "runtime/Arguments.cpp",
-                "runtime/ArrayConstructor.cpp",
-                "runtime/ArrayPrototype.cpp",
-                "runtime/BooleanConstructor.cpp",
-                "runtime/BooleanObject.cpp",
-                "runtime/BooleanPrototype.cpp",
-                "runtime/CallData.cpp",
-                "runtime/Collector.cpp",
-                "runtime/CommonIdentifiers.cpp",
-                "runtime/Completion.cpp",
-                "runtime/ConstructData.cpp",
-                "runtime/DateConstructor.cpp",
-                "runtime/DateConversion.cpp",
-                "runtime/DateInstance.cpp",
-                "runtime/DatePrototype.cpp",
-                "runtime/ErrorConstructor.cpp",
-                "runtime/Error.cpp",
-                "runtime/ErrorInstance.cpp",
-                "runtime/ErrorPrototype.cpp",
-                "runtime/ExceptionHelpers.cpp",
-                "runtime/Executable.cpp",
-                "runtime/FunctionConstructor.cpp",
-                "runtime/FunctionPrototype.cpp",
-                "runtime/GetterSetter.cpp",
-                "runtime/GlobalEvalFunction.cpp",
-                "runtime/Identifier.cpp",
-                "runtime/InitializeThreading.cpp",
-                "runtime/InternalFunction.cpp",
-                "runtime/JSActivation.cpp",
-                "runtime/JSAPIValueWrapper.cpp",
-                "runtime/JSArray.cpp",
-                "runtime/JSByteArray.cpp",
-                "runtime/JSCell.cpp",
-                "runtime/JSFunction.cpp",
-                "runtime/JSGlobalData.cpp",
-                "runtime/JSGlobalObject.cpp",
-                "runtime/JSGlobalObjectFunctions.cpp",
-                "runtime/JSImmediate.cpp",
-                "runtime/JSLock.cpp",
-                "runtime/JSNotAnObject.cpp",
-                "runtime/JSNumberCell.cpp",
-                "runtime/JSObject.cpp",
-                "runtime/JSONObject.cpp",
-                "runtime/JSPropertyNameIterator.cpp",
-                "runtime/JSStaticScopeObject.cpp",
-                "runtime/JSString.cpp",
-                "runtime/JSValue.cpp",
-                "runtime/JSVariableObject.cpp",
-                "runtime/JSWrapperObject.cpp",
-                "runtime/LiteralParser.cpp",
-                "runtime/Lookup.cpp",
-                "runtime/MarkStackPosix.cpp",
-                "runtime/MarkStackSymbian.cpp",
-                "runtime/MarkStackWin.cpp",
-                "runtime/MarkStack.cpp",
-                "runtime/MathObject.cpp",
-                "runtime/NativeErrorConstructor.cpp",
-                "runtime/NativeErrorPrototype.cpp",
-                "runtime/NumberConstructor.cpp",
-                "runtime/NumberObject.cpp",
-                "runtime/NumberPrototype.cpp",
-                "runtime/ObjectConstructor.cpp",
-                "runtime/ObjectPrototype.cpp",
-                "runtime/Operations.cpp",
-                "runtime/PropertyDescriptor.cpp",
-                "runtime/PropertyNameArray.cpp",
-                "runtime/PropertySlot.cpp",
-                "runtime/PrototypeFunction.cpp",
-                "runtime/RegExpConstructor.cpp",
-                "runtime/RegExp.cpp",
-                "runtime/RegExpObject.cpp",
-                "runtime/RegExpPrototype.cpp",
-                "runtime/ScopeChain.cpp",
-                "runtime/SmallStrings.cpp",
-                "runtime/StringConstructor.cpp",
-                "runtime/StringObject.cpp",
-                "runtime/StringPrototype.cpp",
-                "runtime/StructureChain.cpp",
-                "runtime/Structure.cpp",
-                "runtime/TimeoutChecker.cpp",
-                "runtime/UString.cpp",
-                "runtime/UStringImpl.cpp",
-                "wtf/Assertions.cpp",
-                "wtf/ByteArray.cpp",
-                "wtf/CurrentTime.cpp",
-                "wtf/DateMath.cpp",
-                "wtf/dtoa.cpp",
-                "wtf/FastMalloc.cpp",
-                "wtf/HashTable.cpp",
-                "wtf/MainThread.cpp",
-                "wtf/qt/MainThreadQt.cpp",
-                "wtf/qt/ThreadingQt.cpp",
-                "wtf/RandomNumber.cpp",
-                "wtf/RefCountedLeakCounter.cpp",
-                "wtf/ThreadingNone.cpp",
-                "wtf/Threading.cpp",
-                "wtf/TypeTraits.cpp",
-                "wtf/unicode/CollatorDefault.cpp",
-                "wtf/unicode/icu/CollatorICU.cpp",
-                "wtf/unicode/UTF8.cpp",
-            ]
-        }
-        Group {
-            name: "api"
-            prefix: qtscriptPath + "script/api/"
-            files: [
-                "qscriptable.cpp",
-                "qscriptable.h",
-                "qscriptable_p.h",
-                "qscriptclass.cpp",
-                "qscriptclass.h",
-                "qscriptclasspropertyiterator.cpp",
-                "qscriptclasspropertyiterator.h",
-                "qscriptcontext.cpp",
-                "qscriptcontext.h",
-                "qscriptcontextinfo.cpp",
-                "qscriptcontextinfo.h",
-                "qscriptcontext_p.h",
-                "qscriptengineagent.cpp",
-                "qscriptengineagent.h",
-                "qscriptengineagent_p.h",
-                "qscriptengine.cpp",
-                "qscriptengine.h",
-                "qscriptengine_p.h",
-                "qscriptextensioninterface.h",
-                "qscriptextensionplugin.cpp",
-                "qscriptextensionplugin.h",
-                "qscriptprogram.cpp",
-                "qscriptprogram.h",
-                "qscriptprogram_p.h",
-                "qscriptstring.cpp",
-                "qscriptstring.h",
-                "qscriptstring_p.h",
-                "qscriptvalue.cpp",
-                "qscriptvalue.h",
-                "qscriptvalueiterator.cpp",
-                "qscriptvalueiterator.h",
-                "qscriptvalue_p.h",
-                "qtscriptglobal.h",
-            ]
-        }
-        Group {
-            name: "bridge"
-            prefix: qtscriptPath + "script/bridge/"
-            files: [
-                "qscriptactivationobject.cpp",
-                "qscriptactivationobject_p.h",
-                "qscriptclassobject.cpp",
-                "qscriptclassobject_p.h",
-                "qscriptfunction.cpp",
-                "qscriptfunction_p.h",
-                "qscriptglobalobject.cpp",
-                "qscriptglobalobject_p.h",
-                "qscriptobject.cpp",
-                "qscriptobject_p.h",
-                "qscriptqobject.cpp",
-                "qscriptqobject_p.h",
-                "qscriptstaticscopeobject.cpp",
-                "qscriptstaticscopeobject_p.h",
-                "qscriptvariant.cpp",
-                "qscriptvariant_p.h",
-            ]
-        }
-        Group {
-            name: "parser"
-            prefix: qtscriptPath + "script/parser/"
-            files: [
-                "qscriptast.cpp",
-                "qscriptastfwd_p.h",
-                "qscriptast_p.h",
-                "qscriptastvisitor.cpp",
-                "qscriptastvisitor_p.h",
-                "qscriptgrammar.cpp",
-                "qscriptgrammar_p.h",
-                "qscriptlexer.cpp",
-                "qscriptlexer_p.h",
-                "qscriptsyntaxchecker.cpp",
-                "qscriptsyntaxchecker_p.h",
-            ]
-        }
-
-        Export {
-            Depends { name: "QtScriptFwdHeaders" }
-            Depends { name: "cpp" }
-            property stringList includePaths: [exportingProduct.sourceDirectory + "/include"]
-                                              .concat(QtScriptFwdHeaders.publicIncludePaths)
-            Properties {
-                condition: qbs.targetOS.contains("unix")
-                cpp.dynamicLibraries: base.concat(["pthread"])
-            }
-            Properties {
-                condition: qbs.targetOS.contains("windows")
-                cpp.dynamicLibraries: base.concat(["winmm"])
-            }
-        }
-    }
-    Product {
-        type: ["hpp"]
-        name: "QtScriptFwdHeaders"
-        condition: qbsbuildconfig.useBundledQtScript || !Qt.script.present
-        Depends { name: "qbsbuildconfig" }
-        Depends {
-            name: "Qt.script"
-            condition: !qbsbuildconfig.useBundledQtScript
-            required: false
-        }
-        Depends { name: "Qt.core" }
-        Group {
-            files: [
-                "../../shared/qtscript/src/script/api/*.h"
-            ]
-            fileTags: ["qtscriptheader"]
-        }
-        Probes.BinaryProbe {
-            id: perlProbe
-            names: "perl"
-        }
-        property string perlPath: perlProbe.found ? perlProbe.filePath : undefined
-        Rule {
-            multiplex: true
-            inputs: ["qtscriptheader"]
-            Artifact {
-                filePath: "include/QtScript/qscriptengine.h"
-                fileTags: ["hpp"]
-            }
-            prepare: {
-                var syncQtPath;
-                if (Utilities.versionCompare(product.Qt.core.version, "6.1") >= 0) {
-                    syncQtPath = FileInfo.joinPaths(product.Qt.core.libExecPath, "syncqt.pl");
-                } else {
-                    syncQtPath = FileInfo.joinPaths(product.Qt.core.binPath, "syncqt.pl");
-                }
-                if (!File.exists(syncQtPath)) {
-                    // syncqt.pl is not in Qt's bin path. We might have a developer build.
-                    // As we don't provide QT_HOST_BINS/src in our Qt modules we must
-                    // kindly ask qmake.
-                    var qmake = FileInfo.joinPaths(product.Qt.core.binPath,
-                                                   "qmake" + product.cpp.executableSuffix);
-                    var p = new Process();
-                    if (p.exec(qmake, ["-query", "QT_HOST_BINS/src"]) !== 0)
-                        throw new Error("Error while querying qmake.");
-                    syncQtPath = FileInfo.joinPaths(p.readStdOut().replace(/\r?\n/, ''),
-                                                    "syncqt.pl");
-                }
-                var qtScriptSrcPath = FileInfo.cleanPath(
-                            FileInfo.path(inputs["qtscriptheader"][0].filePath) + "/../../..");
-                console.info("qtScriptSrcPath: " + qtScriptSrcPath);
-                var cmd = new Command(product.perlPath, [
-                                          syncQtPath,
-                                          "-minimal",
-                                          "-version", product.Qt.core.version,
-                                          "-outdir", FileInfo.cleanPath(
-                                              FileInfo.path(output.filePath) + "/../.."),
-                                          qtScriptSrcPath
-                                      ]);
-                cmd.description = "Create forwarding headers for the bundled QtScript module.";
-                return cmd;
-            }
-        }
-        Export {
-            Depends { name: "Qt.core" }
-            property stringList publicIncludePaths: [
-                FileInfo.joinPaths(exportingProduct.buildDirectory, "include")
-            ]
-            property stringList privateIncludePaths: [
-                FileInfo.joinPaths(exportingProduct.buildDirectory, "include",
-                                   "QtScript", Qt.core.version, "QtScript")
-            ]
-        }
-    }
-}
diff --git a/src/lib/scriptengine/use_scriptengine.pri b/src/lib/scriptengine/use_scriptengine.pri
deleted file mode 100644
index e763c9d86..000000000
--- a/src/lib/scriptengine/use_scriptengine.pri
+++ /dev/null
@@ -1,24 +0,0 @@
-!qbs_do_not_link_bundled_qtscript {
-    include(../../library_dirname.pri)
-    isEmpty(QBSLIBDIR) {
-        QBSLIBDIR = $$shadowed($$PWD/../../../$${QBS_LIBRARY_DIRNAME})
-    }
-
-    LIBS += -L$$QBSLIBDIR
-    macos {
-        LIBS += -lqbsscriptengine
-    }
-    else {
-        LIBS += -lqbsscriptengine$$qtPlatformTargetSuffix()
-    }
-
-    isEmpty(QBS_RPATH): QBS_RPATH = ../$$QBS_LIBRARY_DIRNAME
-    !qbs_disable_rpath {
-        linux-*: QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/$${QBS_RPATH}\'
-        macos: QMAKE_LFLAGS += -Wl,-rpath,@loader_path/$${QBS_RPATH}
-    }
-}
-
-INCLUDEPATH += \
-    $$PWD/include \
-    $$shadowed($$PWD/include)
diff --git a/src/lib/staticlibrary.pri b/src/lib/staticlibrary.pri
deleted file mode 100644
index 57f780b78..000000000
--- a/src/lib/staticlibrary.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-include(library_base.pri)
-
-CONFIG += staticlib
-DEFINES += QBS_STATIC_LIB
diff --git a/src/libexec/libexec.pri b/src/libexec/libexec.pri
deleted file mode 100644
index a5cd2c599..000000000
--- a/src/libexec/libexec.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-include(../install_prefix.pri)
-
-win32:LIBEXEC_BASE_DIR=bin
-else:LIBEXEC_BASE_DIR=libexec/qbs
-
-!isEmpty(QBS_LIBEXEC_DESTDIR):DESTDIR=$${QBS_LIBEXEC_DESTDIR}
-else:DESTDIR=../../../$$LIBEXEC_BASE_DIR
-
-!isEmpty(QBS_LIBEXEC_INSTALL_DIR):target.path = $${QBS_LIBEXEC_INSTALL_DIR}
-else:target.path = $${QBS_INSTALL_PREFIX}/$$LIBEXEC_BASE_DIR
-INSTALLS += target
diff --git a/src/libexec/libexec.pro b/src/libexec/libexec.pro
deleted file mode 100644
index 75b1d0844..000000000
--- a/src/libexec/libexec.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += qbs_processlauncher
diff --git a/src/libexec/qbs_processlauncher/launchersockethandler.cpp b/src/libexec/qbs_processlauncher/launchersockethandler.cpp
index 637362b88..037f061a5 100644
--- a/src/libexec/qbs_processlauncher/launchersockethandler.cpp
+++ b/src/libexec/qbs_processlauncher/launchersockethandler.cpp
@@ -121,12 +121,7 @@ void LauncherSocketHandler::start()
     connect(m_socket, &QLocalSocket::disconnected,
             this, &LauncherSocketHandler::handleSocketClosed);
     connect(m_socket, &QLocalSocket::readyRead, this, &LauncherSocketHandler::handleSocketData);
-    connect(m_socket,
-#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
-            static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error),
-#else
-            &QLocalSocket::errorOccurred,
-#endif
+    connect(m_socket, &QLocalSocket::errorOccurred,
             this, &LauncherSocketHandler::handleSocketError);
     m_socket->connectToServer(m_serverPath);
 }
diff --git a/src/libexec/qbs_processlauncher/qbs_processlauncher.pro b/src/libexec/qbs_processlauncher/qbs_processlauncher.pro
deleted file mode 100644
index c49e52e27..000000000
--- a/src/libexec/qbs_processlauncher/qbs_processlauncher.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-include(../libexec.pri)
-
-TARGET = qbs_processlauncher
-CONFIG += console c++17
-CONFIG -= app_bundle
-QT = core network
-
-TOOLS_DIR = $$PWD/../../lib/corelib/tools
-
-INCLUDEPATH += $$TOOLS_DIR
-
-HEADERS += \
-    launcherlogging.h \
-    launchersockethandler.h \
-    $$TOOLS_DIR/launcherpackets.h
-
-SOURCES += \
-    launcherlogging.cpp \
-    launchersockethandler.cpp \
-    processlauncher-main.cpp \
-    $$TOOLS_DIR/launcherpackets.cpp
diff --git a/src/library_dirname.pri b/src/library_dirname.pri
deleted file mode 100644
index 5d0712d79..000000000
--- a/src/library_dirname.pri
+++ /dev/null
@@ -1 +0,0 @@
-isEmpty(QBS_LIBRARY_DIRNAME):QBS_LIBRARY_DIRNAME = lib
diff --git a/src/packages/chocolatey/chocolatey.qbs b/src/packages/chocolatey/chocolatey.qbs
index 2ea79e3ff..4a0c2df4a 100644
--- a/src/packages/chocolatey/chocolatey.qbs
+++ b/src/packages/chocolatey/chocolatey.qbs
@@ -122,7 +122,7 @@ Product {
                                                                cmd.nuspecFileName),
                                     "--limitoutput",
                                     "--outputdirectory", cmd.chocoOutDirectory]);
-            cmd2.description = "choco pack " + inputs["chocolatey.nuspec"][0].fileName;
+            cmd2.description = "packing choco " + inputs["chocolatey.nuspec"][0].fileName;
             return [cmd, cmd2];
         }
     }
diff --git a/src/packages/chocolatey/chocolateyinstall.ps1 b/src/packages/chocolatey/chocolateyinstall.ps1
index f55d87eb9..fb763e681 100644
--- a/src/packages/chocolatey/chocolateyinstall.ps1
+++ b/src/packages/chocolatey/chocolateyinstall.ps1
@@ -9,15 +9,11 @@ ForEach ($line in (New-Object Net.WebClient).DownloadString("$qbsBaseUrl/${check
     $checksums.Add($items[1], $items[0])
 }
 
-$qbs32 = "qbs-windows-x86-$qbsVersion.zip"
 $qbs64 = "qbs-windows-x86_64-$qbsVersion.zip"
 
 Install-ChocolateyZipPackage `
     -PackageName 'qbs' `
-    -Url "$qbsBaseUrl/$qbs32" `
     -UnzipLocation "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" `
     -Url64bit "$qbsBaseUrl/$qbs64" `
-    -Checksum $checksums[$qbs32] `
-    -ChecksumType $checksumType `
     -Checksum64 $checksums[$qbs64] `
     -ChecksumType64 $checksumType
diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdb.pri b/src/plugins/generator/clangcompilationdb/clangcompilationdb.pri
deleted file mode 100644
index 7c9a71129..000000000
--- a/src/plugins/generator/clangcompilationdb/clangcompilationdb.pri
+++ /dev/null
@@ -1 +0,0 @@
-qbsPluginTarget = clangcompilationdbgenerator
diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdb.pro b/src/plugins/generator/clangcompilationdb/clangcompilationdb.pro
deleted file mode 100644
index 1b5342598..000000000
--- a/src/plugins/generator/clangcompilationdb/clangcompilationdb.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-include(clangcompilationdb.pri)
-include(../../plugins.pri)
-
-QT = core
-
-HEADERS += \
-    $$PWD/clangcompilationdbgenerator.h
-
-SOURCES += \
-    $$PWD/clangcompilationdbgenerator.cpp \
-    $$PWD/clangcompilationdbgeneratorplugin.cpp
diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp
index 3676d079e..dc5450967 100644
--- a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp
+++ b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp
@@ -45,6 +45,7 @@
 #include <tools/error.h>
 #include <tools/installoptions.h>
 #include <tools/shellutils.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
@@ -114,12 +115,11 @@ QJsonObject ClangCompilationDatabaseGenerator::createEntry(const QString &filePa
     const QStringList arguments = QStringList() << ruleCommand.executable()
                                                 << ruleCommand.arguments();
 
-    const QJsonObject object = {
+    return QJsonObject{
         { QStringLiteral("directory"), QJsonValue(workDir) },
         { QStringLiteral("arguments"), QJsonArray::fromStringList(arguments) },
         { QStringLiteral("file"), QJsonValue(filePath) }
     };
-    return object;
 }
 
 void ClangCompilationDatabaseGenerator::writeProjectDatabase(const QString &filePath,
@@ -130,13 +130,11 @@ void ClangCompilationDatabaseGenerator::writeProjectDatabase(const QString &file
 
     if (!databaseFile.open(QFile::WriteOnly))
         throw ErrorInfo(Tr::tr("Cannot open '%1' for writing: %2")
-                        .arg(filePath)
-                        .arg(databaseFile.errorString()));
+                        .arg(filePath, databaseFile.errorString()));
 
     if (databaseFile.write(database.toJson()) == -1)
         throw ErrorInfo(Tr::tr("Error while writing '%1': %2")
-                        .arg(filePath)
-                        .arg(databaseFile.errorString()));
+                        .arg(filePath, databaseFile.errorString()));
 }
 
 bool ClangCompilationDatabaseGenerator::hasValidInputFileTag(const QStringList &fileTags) const
@@ -148,11 +146,9 @@ bool ClangCompilationDatabaseGenerator::hasValidInputFileTag(const QStringList &
         QStringLiteral("objcpp")
     };
 
-    for (const QString &tag : fileTags) {
-        if (validFileTags.contains(tag))
-            return true;
-    }
-    return false;
+    return Internal::any_of(fileTags, [](const auto &tag) {
+        return validFileTags.contains(tag);
+    });
 }
 
 } // namespace qbs
diff --git a/src/plugins/generator/generator.pro b/src/plugins/generator/generator.pro
deleted file mode 100644
index 4a3861321..000000000
--- a/src/plugins/generator/generator.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += clangcompilationdb
-SUBDIRS += makefilegenerator
-SUBDIRS += visualstudio
-SUBDIRS += iarew
-SUBDIRS += keiluv
diff --git a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp
index b0c4b9368..b3b68377f 100644
--- a/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp
+++ b/src/plugins/generator/iarew/archs/mcs51/mcs51generalsettingsgroup_v10.cpp
@@ -95,17 +95,15 @@ struct TargetPageOptions final
         const QString core = IarewUtils::flagValue(
                     flags, QStringLiteral("--core"))
                 .toLower();
-        if (core == QLatin1String("plain")) {
+        // If the core variant is not set, then choose the
+        // default value, CorePlain (see the compiler datasheet for
+        // '--core' option).
+        if (core == QLatin1String("plain") || core.isEmpty()) {
             cpuCore = TargetPageOptions::CorePlain;
         } else if (core == QLatin1String("extended1")) {
             cpuCore = TargetPageOptions::CoreExtended1;
         } else if (core == QLatin1String("extended2")) {
             cpuCore = TargetPageOptions::CoreExtended2;
-        } else {
-            // If the core variant is not set, then choose the
-            // default values (see the compiler datasheet for
-            // '--core' option).
-            cpuCore = TargetPageOptions::CorePlain;
         }
 
         const QString cm = IarewUtils::flagValue(
@@ -119,7 +117,7 @@ struct TargetPageOptions final
             codeModel = TargetPageOptions::CodeModelFar;
         } else if (cm == QLatin1String("banked_ext2")) {
             codeModel = TargetPageOptions::CodeModelBankedExtended2;
-        } else {
+        } else if (cm.isEmpty()) {
             // If the code model is not set, then choose the
             // default values (see the compiler datasheet for
             // '--code_model' option).
@@ -145,7 +143,7 @@ struct TargetPageOptions final
             dataModel = TargetPageOptions::DataModelFarGeneric;
         } else if (dm == QLatin1String("far")) {
             dataModel = TargetPageOptions::DataModelFar;
-        } else {
+        } else if (dm.isEmpty()) {
             // If the data model is not set, then choose the
             // default values (see the compiler datasheet for
             // '--data_model' option).
@@ -172,26 +170,26 @@ struct TargetPageOptions final
         const QString constPlace = IarewUtils::flagValue(
                     flags, QStringLiteral("--place_constants"))
                 .toLower();
-        if (constPlace == QLatin1String("data")) {
+        // If this option is not set, then choose the
+        // default value (see the compiler datasheet for
+        // '--place_constants' option).
+        if (constPlace == QLatin1String("data") || constPlace.isEmpty()) {
             constPlacement = TargetPageOptions::RamMemoryPlace;
         } else if (constPlace == QLatin1String("data_rom")) {
             constPlacement = TargetPageOptions::RomMemoryPlace;
         } else if (constPlace == QLatin1String("code")) {
             constPlacement = TargetPageOptions::CodeMemoryPlace;
-        } else {
-            // If this option is not set, then choose the
-            // default value (see the compiler datasheet for
-            // '--place_constants' option).
-            constPlacement = TargetPageOptions::RamMemoryPlace;
         }
-
         const QString cc = IarewUtils::flagValue(
                     flags, QStringLiteral("--calling_convention")).toLower();
         if (cc == QLatin1String("data_overlay")) {
             callingConvention = TargetPageOptions::DataOverlayConvention;
         } else if (cc == QLatin1String("idata_overlay")) {
             callingConvention = TargetPageOptions::IDataOverlayConvention;
-        } else if (cc == QLatin1String("idata_reentrant")) {
+        } else if (cc == QLatin1String("idata_reentrant") || cc.isEmpty()) {
+            // If this option is not set, then choose the
+            // default value (see the compiler datasheet for
+            // '--calling_convention' option).
             callingConvention = TargetPageOptions::IDataReentrantConvention;
         } else if (cc == QLatin1String("pdata_reentrant")) {
             callingConvention = TargetPageOptions::PDataReentrantConvention;
@@ -199,11 +197,6 @@ struct TargetPageOptions final
             callingConvention = TargetPageOptions::XDataReentrantConvention;
         } else if (cc == QLatin1String("ext_stack_reentrant")) {
             callingConvention = TargetPageOptions::ExtendedStackReentrantConvention;
-        } else {
-            // If this option is not set, then choose the
-            // default value (see the compiler datasheet for
-            // '--calling_convention' option).
-            callingConvention = TargetPageOptions::IDataReentrantConvention;
         }
     }
 
@@ -237,7 +230,7 @@ struct TargetPageOptions final
         }
 
         const QString toolkitPath = IarewUtils::toolkitRootPath(qbsProduct);
-        for (const QVariant &configPath : qAsConst(configPaths)) {
+        for (const QVariant &configPath : std::as_const(configPaths)) {
             const QString fullConfigPath = configPath.toString();
             // We interested only in a config paths shipped inside of a toolkit.
             if (!fullConfigPath.startsWith(toolkitPath, Qt::CaseInsensitive))
@@ -446,13 +439,12 @@ struct DptrPageOptions final
             case VisibilityIndex:
                 if (part == QLatin1String("shadowed"))
                     dptrVisibility = DptrPageOptions::DptrShadowed;
-                else if (part == QLatin1String("separate"))
-                    dptrVisibility = DptrPageOptions::DptrSeparate;
-                else
-                    // If this option is not set, then choose the
+                else if (part == QLatin1String("separate") || part.isEmpty()) {
+                    // If this option is not set or set to "separate", then choose the
                     // default value (see the compiler datasheet for
                     // '--dptr' option).
                     dptrVisibility = DptrPageOptions::DptrSeparate;
+                }
                 break;
             case SwitchMethodIndex:
                 if (part == QLatin1String("inc")) {
@@ -647,30 +639,22 @@ struct LibraryOptionsPageOptions final
                               Qt::CaseInsensitive)) {
                 const QString prop = flag.split(
                             QLatin1Char('=')).at(0).toLower();
+                // see the compiler datasheet for the '_formatted_write' option.
                 if (prop == QLatin1String("-e_large_write"))
                     printfFormatter = LibraryOptionsPageOptions::PrintfLargeFormatter;
                 else if (prop == QLatin1String("-e_medium_write"))
                     printfFormatter = LibraryOptionsPageOptions::PrintfMediumFormatter;
                 else if (prop == QLatin1String("-e_small_write"))
                     printfFormatter = LibraryOptionsPageOptions::PrintfSmallFormatter;
-                else
-                    // If this option is not set, then choose the
-                    // default value (see the compiler datasheet for
-                    // '_formatted_write' option).
-                    printfFormatter = LibraryOptionsPageOptions::PrintfMediumFormatter;
             } else if (flag.endsWith(QLatin1String("_formatted_read"),
                                      Qt::CaseInsensitive)) {
                 const QString prop = flag.split(QLatin1Char('='))
                         .at(0).toLower();
+                // see the compiler datasheet for the '_formatted_read' option.
                 if (prop == QLatin1String("-e_large_read"))
                     scanfFormatter = LibraryOptionsPageOptions::ScanfLargeFormatter;
                 else if (prop == QLatin1String("-e_medium_read"))
                     scanfFormatter = LibraryOptionsPageOptions::ScanfMediumFormatter;
-                else
-                    // If this option is not set, then choose the
-                    // default value (see the compiler datasheet for
-                    // '_formatted_read' option).
-                    scanfFormatter = LibraryOptionsPageOptions::ScanfMediumFormatter;
             }
         }
     }
diff --git a/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp b/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp
index d99e15bb2..7b330ca7f 100644
--- a/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp
+++ b/src/plugins/generator/iarew/archs/msp430/msp430generalsettingsgroup_v7.cpp
@@ -281,7 +281,7 @@ struct LibraryOptionsPageOptions final
                 else if (prop == QLatin1String("_printflarge"))
                     printfFormatter = PrintfLargeFormatter;
                 else if (prop == QLatin1String("_printflargenomb"))
-                    printfFormatter = PrintfLargeFormatter;
+                    printfFormatter = PrintfLargeNoMultibytesFormatter;
                 else if (prop == QLatin1String("_printfsmall"))
                     printfFormatter = PrintfSmallFormatter;
                 else if (prop == QLatin1String("_printfsmallnomb"))
@@ -299,7 +299,7 @@ struct LibraryOptionsPageOptions final
                 else if (prop == QLatin1String("_scanflarge"))
                     scanfFormatter = ScanfLargeFormatter;
                 else if (prop == QLatin1String("_scanflargenomb"))
-                    scanfFormatter = ScanfLargeFormatter;
+                    scanfFormatter = ScanfLargeNoMultibytesFormatter;
                 else if (prop == QLatin1String("_scanfsmall"))
                     scanfFormatter = ScanfSmallFormatter;
                 else if (prop == QLatin1String("_scanfsmallnomb"))
diff --git a/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp
index 9477bc36e..83766442b 100644
--- a/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp
+++ b/src/plugins/generator/iarew/archs/stm8/stm8generalsettingsgroup_v3.cpp
@@ -205,7 +205,7 @@ struct LibraryOptionsPageOptions final
                 else if (prop == QLatin1String("_printffullnomb"))
                     printfFormatter = PrintfFullNoMultibytesFormatter;
                 else if (prop == QLatin1String("_printflarge"))
-                    printfFormatter = PrintfLargeFormatter;
+                    printfFormatter = PrintfLargeNoMultibytesFormatter;
                 else if (prop == QLatin1String("_printflargenomb"))
                     printfFormatter = PrintfLargeFormatter;
                 else if (prop == QLatin1String("_printfsmall"))
@@ -223,7 +223,7 @@ struct LibraryOptionsPageOptions final
                 else if (prop == QLatin1String("_scanffullnomb"))
                     scanfFormatter = ScanfFullNoMultibytesFormatter;
                 else if (prop == QLatin1String("_scanflarge"))
-                    scanfFormatter = ScanfLargeFormatter;
+                    scanfFormatter = ScanfLargeNoMultibytesFormatter;
                 else if (prop == QLatin1String("_scanflargenomb"))
                     scanfFormatter = ScanfLargeFormatter;
                 else if (prop == QLatin1String("_scanfsmall"))
diff --git a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp
index 066c47931..441333976 100644
--- a/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp
+++ b/src/plugins/generator/iarew/archs/stm8/stm8linkersettingsgroup_v3.cpp
@@ -32,6 +32,8 @@
 
 #include "../../iarewutils.h"
 
+#include <tools/stlutils.h>
+
 #include <QtCore/qdir.h>
 
 namespace qbs {
@@ -100,14 +102,11 @@ struct ConfigPageOptions final
         // on the general page).
         configDefinitions = IarewUtils::flagValues(
                     flags, QStringLiteral("--config_def"));
-        configDefinitions.erase(std::remove_if(
-                                    configDefinitions.begin(),
-                                    configDefinitions.end(),
-                                    [](const auto &definition){
+        Internal::removeIf(configDefinitions, [](const auto &definition){
             const auto def = definition.toString();
             return def.startsWith(QLatin1String("_CSTACK_SIZE"))
                     || def.startsWith(QLatin1String("_HEAP_SIZE"));
-        }), configDefinitions.end());
+        });
     }
 
     QVariantList configFilePaths;
diff --git a/src/plugins/generator/iarew/iarew.pri b/src/plugins/generator/iarew/iarew.pri
deleted file mode 100644
index 68a3593fa..000000000
--- a/src/plugins/generator/iarew/iarew.pri
+++ /dev/null
@@ -1 +0,0 @@
-qbsPluginTarget = iarewgenerator
diff --git a/src/plugins/generator/iarew/iarew.pro b/src/plugins/generator/iarew/iarew.pro
deleted file mode 100644
index 542449510..000000000
--- a/src/plugins/generator/iarew/iarew.pro
+++ /dev/null
@@ -1,131 +0,0 @@
-include(iarew.pri)
-include(../../plugins.pri)
-include(../../../shared/json/json.pri)
-
-QT = core
-
-# Plugin file.
-
-SOURCES += \
-    $$PWD/iarewgeneratorplugin.cpp \
-
-# Common files.
-
-HEADERS += \
-    $$PWD/iarewfileversionproperty.h \
-    $$PWD/iarewgenerator.h \
-    $$PWD/iarewoptionpropertygroup.h \
-    $$PWD/iarewproject.h \
-    $$PWD/iarewprojectwriter.h \
-    $$PWD/iarewsettingspropertygroup.h \
-    $$PWD/iarewsourcefilepropertygroup.h \
-    $$PWD/iarewsourcefilespropertygroup.h \
-    $$PWD/iarewtoolchainpropertygroup.h \
-    $$PWD/iarewutils.h \
-    $$PWD/iarewversioninfo.h \
-    $$PWD/iarewworkspace.h \
-    $$PWD/iarewworkspacewriter.h
-
-SOURCES += \
-    $$PWD/iarewfileversionproperty.cpp \
-    $$PWD/iarewgenerator.cpp \
-    $$PWD/iarewoptionpropertygroup.cpp \
-    $$PWD/iarewproject.cpp \
-    $$PWD/iarewprojectwriter.cpp \
-    $$PWD/iarewsettingspropertygroup.cpp \
-    $$PWD/iarewsourcefilepropertygroup.cpp \
-    $$PWD/iarewsourcefilespropertygroup.cpp \
-    $$PWD/iarewtoolchainpropertygroup.cpp \
-    $$PWD/iarewutils.cpp \
-    $$PWD/iarewworkspace.cpp \
-    $$PWD/iarewworkspacewriter.cpp
-
-# For ARM architecture.
-
-HEADERS += \
-    $$PWD/archs/arm/armarchiversettingsgroup_v8.h \
-    $$PWD/archs/arm/armassemblersettingsgroup_v8.h \
-    $$PWD/archs/arm/armbuildconfigurationgroup_v8.h \
-    $$PWD/archs/arm/armcompilersettingsgroup_v8.h \
-    $$PWD/archs/arm/armgeneralsettingsgroup_v8.h \
-    $$PWD/archs/arm/armlinkersettingsgroup_v8.h
-
-SOURCES += \
-    $$PWD/archs/arm/armarchiversettingsgroup_v8.cpp \
-    $$PWD/archs/arm/armassemblersettingsgroup_v8.cpp \
-    $$PWD/archs/arm/armbuildconfigurationgroup_v8.cpp \
-    $$PWD/archs/arm/armcompilersettingsgroup_v8.cpp \
-    $$PWD/archs/arm/armgeneralsettingsgroup_v8.cpp \
-    $$PWD/archs/arm/armlinkersettingsgroup_v8.cpp
-
-# For AVR architecture.
-
-HEADERS += \
-    $$PWD/archs/avr/avrarchiversettingsgroup_v7.h \
-    $$PWD/archs/avr/avrassemblersettingsgroup_v7.h \
-    $$PWD/archs/avr/avrbuildconfigurationgroup_v7.h \
-    $$PWD/archs/avr/avrcompilersettingsgroup_v7.h \
-    $$PWD/archs/avr/avrgeneralsettingsgroup_v7.h \
-    $$PWD/archs/avr/avrlinkersettingsgroup_v7.h
-
-SOURCES += \
-    $$PWD/archs/avr/avrarchiversettingsgroup_v7.cpp \
-    $$PWD/archs/avr/avrassemblersettingsgroup_v7.cpp \
-    $$PWD/archs/avr/avrbuildconfigurationgroup_v7.cpp \
-    $$PWD/archs/avr/avrcompilersettingsgroup_v7.cpp \
-    $$PWD/archs/avr/avrgeneralsettingsgroup_v7.cpp \
-    $$PWD/archs/avr/avrlinkersettingsgroup_v7.cpp
-
-# For MCS51 architecture.
-
-HEADERS += \
-    $$PWD/archs/mcs51/mcs51archiversettingsgroup_v10.h \
-    $$PWD/archs/mcs51/mcs51assemblersettingsgroup_v10.h \
-    $$PWD/archs/mcs51/mcs51buildconfigurationgroup_v10.h \
-    $$PWD/archs/mcs51/mcs51compilersettingsgroup_v10.h \
-    $$PWD/archs/mcs51/mcs51generalsettingsgroup_v10.h \
-    $$PWD/archs/mcs51/mcs51linkersettingsgroup_v10.h
-
-SOURCES += \
-    $$PWD/archs/mcs51/mcs51archiversettingsgroup_v10.cpp \
-    $$PWD/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp \
-    $$PWD/archs/mcs51/mcs51buildconfigurationgroup_v10.cpp \
-    $$PWD/archs/mcs51/mcs51compilersettingsgroup_v10.cpp \
-    $$PWD/archs/mcs51/mcs51generalsettingsgroup_v10.cpp \
-    $$PWD/archs/mcs51/mcs51linkersettingsgroup_v10.cpp
-
-# For STM8 architecture.
-
-HEADERS += \
-    $$PWD/archs/stm8/stm8archiversettingsgroup_v3.h \
-    $$PWD/archs/stm8/stm8assemblersettingsgroup_v3.h \
-    $$PWD/archs/stm8/stm8buildconfigurationgroup_v3.h \
-    $$PWD/archs/stm8/stm8compilersettingsgroup_v3.h \
-    $$PWD/archs/stm8/stm8generalsettingsgroup_v3.h \
-    $$PWD/archs/stm8/stm8linkersettingsgroup_v3.h
-
-SOURCES += \
-    $$PWD/archs/stm8/stm8archiversettingsgroup_v3.cpp \
-    $$PWD/archs/stm8/stm8assemblersettingsgroup_v3.cpp \
-    $$PWD/archs/stm8/stm8buildconfigurationgroup_v3.cpp \
-    $$PWD/archs/stm8/stm8compilersettingsgroup_v3.cpp \
-    $$PWD/archs/stm8/stm8generalsettingsgroup_v3.cpp \
-    $$PWD/archs/stm8/stm8linkersettingsgroup_v3.cpp
-
-# For MSP430 architecture.
-
-HEADERS += \
-    $$PWD/archs/msp430/msp430archiversettingsgroup_v7.h \
-    $$PWD/archs/msp430/msp430assemblersettingsgroup_v7.h \
-    $$PWD/archs/msp430/msp430buildconfigurationgroup_v7.h \
-    $$PWD/archs/msp430/msp430compilersettingsgroup_v7.h \
-    $$PWD/archs/msp430/msp430generalsettingsgroup_v7.h \
-    $$PWD/archs/msp430/msp430linkersettingsgroup_v7.h
-
-SOURCES += \
-    $$PWD/archs/msp430/msp430archiversettingsgroup_v7.cpp \
-    $$PWD/archs/msp430/msp430assemblersettingsgroup_v7.cpp \
-    $$PWD/archs/msp430/msp430buildconfigurationgroup_v7.cpp \
-    $$PWD/archs/msp430/msp430compilersettingsgroup_v7.cpp \
-    $$PWD/archs/msp430/msp430generalsettingsgroup_v7.cpp \
-    $$PWD/archs/msp430/msp430linkersettingsgroup_v7.cpp
diff --git a/src/plugins/generator/iarew/iarewproject.cpp b/src/plugins/generator/iarew/iarewproject.cpp
index f33ae4fcb..0387ae114 100644
--- a/src/plugins/generator/iarew/iarewproject.cpp
+++ b/src/plugins/generator/iarew/iarewproject.cpp
@@ -42,6 +42,8 @@
 
 #include <logging/translator.h>
 
+#include <tools/stlutils.h>
+
 namespace qbs {
 
 IarewProject::IarewProject(const GeneratableProject &genProject,
@@ -112,12 +114,10 @@ IarewProject::IarewProject(const GeneratableProject &genProject,
                 continue;
             auto sourceArtifacts = group.sourceArtifacts();
             // Remove the linker script artifacts.
-            sourceArtifacts.erase(std::remove_if(sourceArtifacts.begin(),
-                                                 sourceArtifacts.end(),
-                                      [](const auto &artifact){
+            Internal::removeIf(sourceArtifacts, [](const auto &artifact) {
                 const auto tags = artifact.fileTags();
                 return tags.contains(QLatin1String("linkerscript"));
-            }), sourceArtifacts.end());
+            });
 
             if (sourceArtifacts.isEmpty())
                 continue;
diff --git a/src/plugins/generator/iarew/iarewutils.cpp b/src/plugins/generator/iarew/iarewutils.cpp
index 7196a391c..9d39ab264 100644
--- a/src/plugins/generator/iarew/iarewutils.cpp
+++ b/src/plugins/generator/iarew/iarewutils.cpp
@@ -105,9 +105,9 @@ QString flagValue(const QStringList &flags, const QString &flagKey)
     // Check that option is in form of 'flagKey=<flagValue>'.
     if (flagIt->contains(QLatin1Char('='))) {
         value = flagIt->split(QLatin1Char('=')).at(1).trimmed();
-    } else if (flagKey.count() < flagIt->count()) {
+    } else if (flagKey.size() < flagIt->size()) {
         // In this case an option is in form of 'flagKey<flagValue>'.
-        value = flagIt->mid(flagKey.count()).trimmed();
+        value = flagIt->mid(flagKey.size()).trimmed();
     } else {
         // In this case an option is in form of 'flagKey <flagValue>'.
         ++flagIt;
diff --git a/src/plugins/generator/keiluv/archs/arm/armtargetlinkergroup_v5.cpp b/src/plugins/generator/keiluv/archs/arm/armtargetlinkergroup_v5.cpp
index 5532b58b0..f2bc8367e 100644
--- a/src/plugins/generator/keiluv/archs/arm/armtargetlinkergroup_v5.cpp
+++ b/src/plugins/generator/keiluv/archs/arm/armtargetlinkergroup_v5.cpp
@@ -34,6 +34,8 @@
 
 #include <generators/generatorutils.h>
 
+#include <tools/stlutils.h>
+
 namespace qbs {
 namespace keiluv {
 namespace arm {
@@ -91,18 +93,15 @@ struct LinkerPageOptions final
 
         // Transform all paths to relative.
         const QString baseDirectory = qbs::gen::utils::buildRootPath(qbsProject);
-        std::transform(scatterFiles.begin(), scatterFiles.end(),
-                       std::back_inserter(scatterFiles),
-                       [baseDirectory](const QString &scatterFile) {
-            return gen::utils::relativeFilePath(baseDirectory, scatterFile);
-        });
+        Internal::transform(scatterFiles, [&baseDirectory](const auto &file) {
+            return gen::utils::relativeFilePath(baseDirectory, file); });
 
         // Make a first scatter file as a main scatter file.
         // Other scatter files will be interpretes as a misc controls.
         if (scatterFiles.count() > 0)
             mainScatterFile = scatterFiles.takeFirst();
 
-        for (const auto &scatterFile : qAsConst(scatterFiles)) {
+        for (const auto &scatterFile : std::as_const(scatterFiles)) {
             const auto control = QStringLiteral("--scatter %1").arg(scatterFile);
             miscControls.push_back(control);
         }
diff --git a/src/plugins/generator/keiluv/archs/mcs51/mcs51utils.cpp b/src/plugins/generator/keiluv/archs/mcs51/mcs51utils.cpp
index 698f0df78..70ec47a62 100644
--- a/src/plugins/generator/keiluv/archs/mcs51/mcs51utils.cpp
+++ b/src/plugins/generator/keiluv/archs/mcs51/mcs51utils.cpp
@@ -30,6 +30,8 @@
 
 #include "mcs51utils.h"
 
+#include <tools/stlutils.h>
+
 namespace qbs {
 namespace keiluv {
 namespace mcs51 {
@@ -71,8 +73,7 @@ QString flagValue(const QStringList &flags, const QString &flagKey)
 QStringList flagValueParts(const QString &flagValue, const QLatin1Char &sep)
 {
     auto parts = flagValue.split(sep);
-    std::transform(parts.begin(), parts.end(), parts.begin(),
-                   [](const auto &part) { return part.trimmed(); });
+    Internal::transform(parts, [](const auto &part) { return part.trimmed(); });
     return parts;
 }
 
diff --git a/src/plugins/generator/keiluv/keiluv.pri b/src/plugins/generator/keiluv/keiluv.pri
deleted file mode 100644
index 6995fb059..000000000
--- a/src/plugins/generator/keiluv/keiluv.pri
+++ /dev/null
@@ -1 +0,0 @@
-qbsPluginTarget = keiluvgenerator
diff --git a/src/plugins/generator/keiluv/keiluv.pro b/src/plugins/generator/keiluv/keiluv.pro
deleted file mode 100644
index 052277ef8..000000000
--- a/src/plugins/generator/keiluv/keiluv.pro
+++ /dev/null
@@ -1,90 +0,0 @@
-include(keiluv.pri)
-include(../../plugins.pri)
-include(../../../shared/json/json.pri)
-
-QT = core
-
-# Plugin file.
-
-SOURCES += \
-    $$PWD/keiluvgeneratorplugin.cpp \
-
-# Common files.
-
-HEADERS += \
-    $$PWD/keiluvconstants.h \
-    $$PWD/keiluvfilesgroupspropertygroup.h \
-    $$PWD/keiluvgenerator.h \
-    $$PWD/keiluvproject.h \
-    $$PWD/keiluvprojectwriter.h \
-    $$PWD/keiluvutils.h \
-    $$PWD/keiluvversioninfo.h \
-    $$PWD/keiluvworkspace.h \
-    $$PWD/keiluvworkspacewriter.h
-
-SOURCES += \
-    $$PWD/keiluvfilesgroupspropertygroup.cpp \
-    $$PWD/keiluvgenerator.cpp \
-    $$PWD/keiluvproject.cpp \
-    $$PWD/keiluvprojectwriter.cpp \
-    $$PWD/keiluvutils.cpp \
-    $$PWD/keiluvworkspace.cpp \
-    $$PWD/keiluvworkspacewriter.cpp
-
-# For MCS51 architecture.
-
-HEADERS += \
-    $$PWD/archs/mcs51/mcs51buildtargetgroup_v5.h \
-    $$PWD/archs/mcs51/mcs51commonpropertygroup_v5.h \
-    $$PWD/archs/mcs51/mcs51debugoptiongroup_v5.h \
-    $$PWD/archs/mcs51/mcs51dlloptiongroup_v5.h \
-    $$PWD/archs/mcs51/mcs51targetassemblergroup_v5.h \
-    $$PWD/archs/mcs51/mcs51targetcommonoptionsgroup_v5.h \
-    $$PWD/archs/mcs51/mcs51targetcompilergroup_v5.h \
-    $$PWD/archs/mcs51/mcs51targetgroup_v5.h \
-    $$PWD/archs/mcs51/mcs51targetlinkergroup_v5.h \
-    $$PWD/archs/mcs51/mcs51targetmiscgroup_v5.h \
-    $$PWD/archs/mcs51/mcs51utilitiesgroup_v5.h \
-    $$PWD/archs/mcs51/mcs51utils.h
-
-SOURCES += \
-    $$PWD/archs/mcs51/mcs51buildtargetgroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51commonpropertygroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51debugoptiongroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51dlloptiongroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51targetassemblergroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51targetcommonoptionsgroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51targetcompilergroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51targetgroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51targetlinkergroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51targetmiscgroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51utilitiesgroup_v5.cpp \
-    $$PWD/archs/mcs51/mcs51utils.cpp
-
-# For ARM architecture.
-
-HEADERS += \
-    $$PWD/archs/arm/armbuildtargetgroup_v5.h \
-    $$PWD/archs/arm/armcommonpropertygroup_v5.h \
-    $$PWD/archs/arm/armdebugoptiongroup_v5.h \
-    $$PWD/archs/arm/armdlloptiongroup_v5.h \
-    $$PWD/archs/arm/armtargetassemblergroup_v5.h \
-    $$PWD/archs/arm/armtargetcommonoptionsgroup_v5.h \
-    $$PWD/archs/arm/armtargetcompilergroup_v5.h \
-    $$PWD/archs/arm/armtargetgroup_v5.h \
-    $$PWD/archs/arm/armtargetlinkergroup_v5.h \
-    $$PWD/archs/arm/armtargetmiscgroup_v5.h \
-    $$PWD/archs/arm/armutilitiesgroup_v5.h
-
-SOURCES += \
-    $$PWD/archs/arm/armbuildtargetgroup_v5.cpp \
-    $$PWD/archs/arm/armcommonpropertygroup_v5.cpp \
-    $$PWD/archs/arm/armdebugoptiongroup_v5.cpp \
-    $$PWD/archs/arm/armdlloptiongroup_v5.cpp \
-    $$PWD/archs/arm/armtargetassemblergroup_v5.cpp \
-    $$PWD/archs/arm/armtargetcommonoptionsgroup_v5.cpp \
-    $$PWD/archs/arm/armtargetcompilergroup_v5.cpp \
-    $$PWD/archs/arm/armtargetgroup_v5.cpp \
-    $$PWD/archs/arm/armtargetlinkergroup_v5.cpp \
-    $$PWD/archs/arm/armtargetmiscgroup_v5.cpp \
-    $$PWD/archs/arm/armutilitiesgroup_v5.cpp
diff --git a/src/plugins/generator/keiluv/keiluvfilesgroupspropertygroup.cpp b/src/plugins/generator/keiluv/keiluvfilesgroupspropertygroup.cpp
index d1fda9876..79281a153 100644
--- a/src/plugins/generator/keiluv/keiluvfilesgroupspropertygroup.cpp
+++ b/src/plugins/generator/keiluv/keiluvfilesgroupspropertygroup.cpp
@@ -33,6 +33,7 @@
 
 #include <generators/generatordata.h>
 
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 namespace qbs {
@@ -76,22 +77,24 @@ private:
         if (fileSuffix.compare(QLatin1String("c"),
                                Qt::CaseInsensitive) == 0) {
             return CSourceFileType;
-        } else if (fileSuffix.compare(QLatin1String("cpp"),
+        }
+        if (fileSuffix.compare(QLatin1String("cpp"),
                                       Qt::CaseInsensitive) == 0) {
             return CppSourceFileType;
-        } else if (fileSuffix.compare(QLatin1String("s"),
+        }
+        if (fileSuffix.compare(QLatin1String("s"),
                                       Qt::CaseInsensitive) == 0
                    || fileSuffix.compare(QLatin1String("a51"),
                                          Qt::CaseInsensitive) == 0) {
             return AssemblerFileType;
-        } else if (fileSuffix.compare(QLatin1String("lib"),
+        }
+        if (fileSuffix.compare(QLatin1String("lib"),
                                       Qt::CaseInsensitive) == 0) {
             return LibraryFileType;
-        } else {
-            // All header files, text files and include files
-            // interpretes as a text file types.
-            return TextFileType;
         }
+        // All header files, text files and include files
+        // interpretes as a text file types.
+        return TextFileType;
     }
 };
 
@@ -164,12 +167,10 @@ KeiluvFilesGroupsPropertyGroup::KeiluvFilesGroupsPropertyGroup(
             continue;
         auto sourceArtifacts = group.sourceArtifacts();
         // Remove the linker script artifacts.
-        sourceArtifacts.erase(std::remove_if(sourceArtifacts.begin(),
-                                             sourceArtifacts.end(),
-                                             [](const auto &artifact){
+        Internal::removeIf(sourceArtifacts, [](const auto &artifact){
             const auto tags = artifact.fileTags();
             return tags.contains(QLatin1String("linkerscript"));
-        }), sourceArtifacts.end());
+        });
 
         if (sourceArtifacts.isEmpty())
             continue;
diff --git a/src/plugins/generator/keiluv/keiluvutils.cpp b/src/plugins/generator/keiluv/keiluvutils.cpp
index ef93b9739..628a8e98a 100644
--- a/src/plugins/generator/keiluv/keiluvutils.cpp
+++ b/src/plugins/generator/keiluv/keiluvutils.cpp
@@ -32,6 +32,8 @@
 
 #include <generators/generatorutils.h>
 
+#include <tools/stlutils.h>
+
 namespace qbs {
 namespace KeiluvUtils {
 
@@ -82,10 +84,8 @@ QStringList includes(const PropertyMap &qbsProps)
                 qbsProps, {QStringLiteral("includePaths"),
                            QStringLiteral("systemIncludePaths")});
     // Transform include path separators to native.
-    std::transform(paths.begin(), paths.end(), paths.begin(),
-                   [](const auto &path) {
-        return QDir::toNativeSeparators(path);
-    });
+    Internal::transform(paths, [](const auto &path) {
+        return QDir::toNativeSeparators(path); });
     return paths;
 }
 
@@ -100,23 +100,18 @@ QStringList staticLibraries(const PropertyMap &qbsProps)
     auto libs = gen::utils::cppStringModuleProperties(
                 qbsProps, {QStringLiteral("staticLibraries")});
     // Transform library path separators to native.
-    std::transform(libs.begin(), libs.end(), libs.begin(),
-                   [](const auto &path) {
-        return QDir::toNativeSeparators(path);
-    });
+    Internal::transform(libs, [](const auto &path) {
+        return QDir::toNativeSeparators(path); });
     return libs;
 }
 
 QStringList dependencies(const std::vector<ProductData> &qbsProductDeps)
 {
-    QStringList deps;
-    for (const ProductData &qbsProductDep : qbsProductDeps) {
-        const auto path = qbsProductDep.buildDirectory()
-                + QLatin1String("/obj/")
-                + gen::utils::targetBinary(qbsProductDep);
-        deps.push_back(QDir::toNativeSeparators(path));
-    }
-    return deps;
+    return Internal::transformed<QStringList>(qbsProductDeps, [](const auto &dep) {
+        const auto path = dep.buildDirectory() + QLatin1String("/obj/")
+                          + gen::utils::targetBinary(dep);
+        return QDir::toNativeSeparators(path);
+    });
 }
 
 } // namespace KeiluvUtils
diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp
index e07dda133..690d83569 100644
--- a/src/plugins/generator/makefilegenerator/makefilegenerator.cpp
+++ b/src/plugins/generator/makefilegenerator/makefilegenerator.cpp
@@ -286,14 +286,14 @@ void qbs::MakefileGenerator::generate()
                 }
                 if (!processCommandEncountered && builtByDefault) {
                     const auto outputs = transformerData.outputs();
-                    for (const ArtifactData &output : outputs)
-                        filesCreatedByJsCommands.push_back(output.filePath());
+                    transform(outputs, filesCreatedByJsCommands, [](const auto &output) {
+                        return output.filePath(); });
                 }
             }
             stream << "install-" << productTarget << ": " << productTarget << '\n';
             Set<QString> createdDirs;
             const auto installableArtifacts = productData.installableArtifacts();
-            for (const ArtifactData &artifact : productData.installableArtifacts()) {
+            for (const ArtifactData &artifact : installableArtifacts) {
                 const QString &outputDir = artifact.installData().localInstallDir();
                 if (outputDir.contains(QLatin1Char(' '))) {
                     logger().qbsWarning() << Tr::tr("Skipping installation of '%1', because "
@@ -332,15 +332,15 @@ void qbs::MakefileGenerator::generate()
         }
 
         stream << "all:";
-        for (const QString &target : qAsConst(allDefaultTargets))
+        for (const QString &target : std::as_const(allDefaultTargets))
             stream << ' ' << target;
         stream << '\n';
         stream << "install:";
-        for (const QString &target : qAsConst(allDefaultTargets))
+        for (const QString &target : std::as_const(allDefaultTargets))
             stream << ' ' << "install-" << target;
         stream << '\n';
         stream << "clean:";
-        for (const QString &target : qAsConst(allTargets))
+        for (const QString &target : std::as_const(allTargets))
             stream << ' ' << "clean-" << target;
         stream << '\n';
         if (!filesCreatedByJsCommands.empty()) {
diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.pri b/src/plugins/generator/makefilegenerator/makefilegenerator.pri
deleted file mode 100644
index 971e63d24..000000000
--- a/src/plugins/generator/makefilegenerator/makefilegenerator.pri
+++ /dev/null
@@ -1 +0,0 @@
-qbsPluginTarget = makefilegenerator
diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.pro b/src/plugins/generator/makefilegenerator/makefilegenerator.pro
deleted file mode 100644
index c03191c39..000000000
--- a/src/plugins/generator/makefilegenerator/makefilegenerator.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-include(makefilegenerator.pri)
-include(../../plugins.pri)
-
-QT = core
-
-HEADERS += \
-    $$PWD/makefilegenerator.h
-
-SOURCES += \
-    $$PWD/makefilegenerator.cpp \
-    $$PWD/makefilegeneratorplugin.cpp
diff --git a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp
index 039b1173e..127d6a438 100644
--- a/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp
+++ b/src/plugins/generator/visualstudio/msbuildfiltersproject.cpp
@@ -45,110 +45,203 @@
 
 namespace qbs {
 
-static QStringList sourceFileExtensions()
+namespace {
+
+const QStringList & sourceFileExtensions()
 {
-    return {QStringLiteral("c"), QStringLiteral("C"), QStringLiteral("cpp"),
-            QStringLiteral("cxx"), QStringLiteral("c++"), QStringLiteral("cc"),
-            QStringLiteral("cs"), QStringLiteral("def"), QStringLiteral("java"),
-            QStringLiteral("m"), QStringLiteral("mm")};
+    static const QStringList EXTENSIONS{
+        QStringLiteral("c"),
+        QStringLiteral("C"),
+        QStringLiteral("cpp"),
+        QStringLiteral("cxx"),
+        QStringLiteral("c++"),
+        QStringLiteral("cc"),
+        QStringLiteral("cs"),
+        QStringLiteral("def"),
+        QStringLiteral("java"),
+        QStringLiteral("m"),
+        QStringLiteral("mm")};
+
+    return EXTENSIONS;
 }
 
-static QStringList headerFileExtensions()
+const QStringList & headerFileExtensions()
 {
-    return {QStringLiteral("h"), QStringLiteral("H"), QStringLiteral("hpp"),
-            QStringLiteral("hxx"),  QStringLiteral("h++")};
+    static const QStringList EXTENSIONS{
+        QStringLiteral("h"),
+        QStringLiteral("H"),
+        QStringLiteral("hpp"),
+        QStringLiteral("hxx"),
+        QStringLiteral("h++")};
+
+    return EXTENSIONS;
 }
 
-static std::vector<MSBuildFilter *> defaultItemGroupFilters(IMSBuildItemGroup *parent = nullptr)
+struct FilterInfo
+{
+    QString name;
+    QList<QString> extensions;
+    bool parseFiles{ true };
+    bool sourceControlFiles{ true };
+};
+
+const std::vector<FilterInfo> & getDefaultFilterInfo()
 {
-    const auto sourceFilter = new MSBuildFilter(QStringLiteral("Source Files"), sourceFileExtensions(), parent);
-    const auto headerFilter = new MSBuildFilter(QStringLiteral("Header Files"), headerFileExtensions(), parent);
-
-    const auto formFilter = new MSBuildFilter(QStringLiteral("Form Files"),
-                                              QStringList() << QStringLiteral("ui"), parent);
-    const auto resourceFilter = new MSBuildFilter(QStringLiteral("Resource Files"),
-                                                  QStringList()
-                                                  << QStringLiteral("qrc")
-                                                  << QStringLiteral("rc")
-                                                  << QStringLiteral("*"), parent);
-    resourceFilter->setParseFiles(false);
-    const auto generatedFilter = new MSBuildFilter(QStringLiteral("Generated Files"),
-                                                   QStringList() << QStringLiteral("moc"), parent);
-    generatedFilter->setSourceControlFiles(false);
-    const auto translationFilter = new MSBuildFilter(QStringLiteral("Translation Files"),
-                                                     QStringList() << QStringLiteral("ts"), parent);
-    translationFilter->setParseFiles(false);
-
-    return std::vector<MSBuildFilter *> {
-        sourceFilter, headerFilter, formFilter, resourceFilter, generatedFilter, translationFilter
+    static const std::vector<FilterInfo> INFOS {
+        {QStringLiteral("Source Files"), sourceFileExtensions()},
+        {QStringLiteral("Header Files"), headerFileExtensions()},
+        {QStringLiteral("Form Files"), QStringList() << QStringLiteral("ui")},
+        {QStringLiteral("Resource Files"), QStringList() << QStringLiteral("qrc") << QStringLiteral("rc") << QStringLiteral("*"), false},
+        {QStringLiteral("Generated Files"), QStringList() << QStringLiteral("moc"), true, false},
+        {QStringLiteral("Translation Files"), QStringList() << QStringLiteral("ts"), false},
     };
+
+    return INFOS;
 }
 
-static bool matchesFilter(const MSBuildFilter *filter, const QString &filePath)
+MSBuildFilter * makeBuildFilter(const FilterInfo &filterInfo,
+                               MSBuildItemGroup *itemFiltersGroup)
 {
-    return filter->extensions().contains(QFileInfo(filePath).completeSuffix());
+    const auto filter = new MSBuildFilter(filterInfo.name, filterInfo.extensions, itemFiltersGroup);
+    filter->appendProperty(QStringLiteral("ParseFiles"), filterInfo.parseFiles);
+    filter->appendProperty(QStringLiteral("SourceControlFiles"), filterInfo.sourceControlFiles);
+    return filter;
 }
 
-MSBuildFiltersProject::MSBuildFiltersProject(const GeneratableProductData &product,
-                                             QObject *parent)
-    : MSBuildProject(parent)
+bool matchesFilter(const FilterInfo &filterInfo,
+                   const QString &filePath)
 {
-    // Normally this would be versionInfo.toolsVersion() but for some reason it seems
-    // filters projects are always v4.0
-    setToolsVersion(QStringLiteral("4.0"));
+    return filterInfo.extensions.contains(QFileInfo(filePath).completeSuffix());
+}
 
-    const auto itemGroup = new MSBuildItemGroup(this);
-    const auto filterOptions = defaultItemGroupFilters();
-    for (const auto options : filterOptions) {
-        const auto filter = new MSBuildFilter(options->include(), options->extensions(), itemGroup);
-        filter->appendProperty(QStringLiteral("ParseFiles"), options->parseFiles());
-        filter->appendProperty(QStringLiteral("SourceControlFiles"), options->sourceControlFiles());
-    }
+bool isHeaderFile(const QString &filePath)
+{
+    return headerFileExtensions().contains(QFileInfo(filePath).completeSuffix());
+}
+
+bool isSourceFile(const QString &filePath)
+{
+    return sourceFileExtensions().contains(QFileInfo(filePath).completeSuffix());
+}
+
+MSBuildFileItem * makeFileItem(const QString& filePath,
+                              MSBuildItemGroup *itemGroup)
+{
+    if (isHeaderFile(filePath))
+        return new MSBuildClInclude(itemGroup);
 
+    if (isSourceFile(filePath))
+        return new MSBuildClCompile(itemGroup);
+
+    return new MSBuildNone(itemGroup);
+}
+
+
+class ProductProcessor
+{
+public:
     using StringSet = Internal::Set<QString>;
-    StringSet allFiles;
-    const auto productDatas = product.data.values();
-    for (const auto &productData : productDatas) {
-        for (const auto &groupData : productData.groups())
-            if (groupData.isEnabled())
-                allFiles.unite(Internal::rangeTo<StringSet>(groupData.allFilePaths()));
+
+    ProductProcessor(MSBuildProject *parent)
+        : m_parent(parent)
+        , m_itemFiltersGroup(new MSBuildItemGroup(m_parent))
+    {
     }
 
-    MSBuildItemGroup *headerFilesGroup = nullptr;
-    MSBuildItemGroup *sourceFilesGroup = nullptr;
-    MSBuildItemGroup *filesGroup = nullptr;
-
-    for (const auto &filePath : allFiles) {
-        MSBuildFileItem *fileItem = nullptr;
-
-        for (const MSBuildFilter *options : filterOptions) {
-            if (matchesFilter(options, filePath)) {
-                if (options->include() == QStringLiteral("Header Files")) {
-                    if (!headerFilesGroup)
-                        headerFilesGroup = new MSBuildItemGroup(this);
-                    fileItem = new MSBuildClInclude(headerFilesGroup);
-                } else if (options->include() == QStringLiteral("Source Files")) {
-                    if (!sourceFilesGroup)
-                        sourceFilesGroup = new MSBuildItemGroup(this);
-                    fileItem = new MSBuildClCompile(sourceFilesGroup);
+    void operator()(const QList<ProductData> &productDatas)
+    {
+        for (const auto &productData : productDatas) {
+            const auto &productName = productData.name();
+
+            for (const auto &groupData : productData.groups()) {
+                if (groupData.name() == productName) {
+                    processProductFiles(Internal::rangeTo<StringSet>(groupData.allFilePaths()));
+                } else {
+                    processGroup(groupData);
+                }
+            }
+        }
+    }
+
+    void processProductFiles(const StringSet &files)
+    {
+        for (const auto &filePath : files) {
+            MSBuildFileItem *fileItem = nullptr;
+
+            for (const auto &filterInfo : getDefaultFilterInfo()) {
+                if (matchesFilter(filterInfo, filePath)) {
+                    makeFilter(filterInfo);
+
+                    if (filterInfo.name == QStringLiteral("Header Files")) {
+                        if (!m_headerFilesGroup)
+                            m_headerFilesGroup = new MSBuildItemGroup(m_parent);
+                        fileItem = new MSBuildClInclude(m_headerFilesGroup);
+                    } else if (filterInfo.name == QStringLiteral("Source Files")) {
+                        if (!m_sourceFilesGroup)
+                            m_sourceFilesGroup = new MSBuildItemGroup(m_parent);
+                        fileItem = new MSBuildClCompile(m_sourceFilesGroup);
+                    }
+
+                    if (fileItem) {
+                        fileItem->setFilterName(filterInfo.name);
+                        break;
+                    }
                 }
+            }
 
-                if (fileItem) {
-                    fileItem->setFilterName(options->include());
-                    break;
+            if (!fileItem) {
+                if (!m_filesGroup) {
+                    m_filesGroup = new MSBuildItemGroup(m_parent);
                 }
+
+                fileItem = new MSBuildNone(m_filesGroup);
             }
+
+            fileItem->setFilePath(filePath);
+        }
+    }
+
+    void processGroup(const GroupData &groupData)
+    {
+        makeFilter({groupData.name(), QStringList() << QStringLiteral("*")});
+
+        auto *itemGroup = new MSBuildItemGroup(m_parent);
+        const auto &files = groupData.allFilePaths();
+        for (const auto &filePath : files) {
+            auto *fileItem = makeFileItem(filePath, itemGroup);
+            fileItem->setFilePath(filePath);
+            fileItem->setFilterName(groupData.name());
         }
+    }
 
-        if (!fileItem) {
-            if (!filesGroup)
-                filesGroup = new MSBuildItemGroup(this);
-            fileItem = new MSBuildNone(filesGroup);
+    void makeFilter(const FilterInfo &filterInfo)
+    {
+        if (!m_createdFilters.contains(filterInfo.name)) {
+            makeBuildFilter(filterInfo, m_itemFiltersGroup);
+            m_createdFilters.insert(filterInfo.name);
         }
-        fileItem->setFilePath(filePath);
     }
 
-    qDeleteAll(filterOptions);
+private:
+    MSBuildProject *m_parent = nullptr;
+    MSBuildItemGroup *m_itemFiltersGroup = nullptr;
+    MSBuildItemGroup *m_headerFilesGroup = nullptr;
+    MSBuildItemGroup *m_sourceFilesGroup = nullptr;
+    MSBuildItemGroup *m_filesGroup = nullptr;
+    QSet<QString> m_createdFilters;
+};
+
+} // namespace
+
+MSBuildFiltersProject::MSBuildFiltersProject(const GeneratableProductData &product,
+                                             QObject *parent)
+    : MSBuildProject(parent)
+{
+    // Normally this would be versionInfo.toolsVersion() but for some reason it seems
+    // filters projects are always v4.0
+    setToolsVersion(QStringLiteral("4.0"));
+
+    ProductProcessor(this)(product.data.values());
 }
 
 } // namespace qbs
diff --git a/src/plugins/generator/visualstudio/msbuildutils.h b/src/plugins/generator/visualstudio/msbuildutils.h
index 3eceeba2e..cf4c7eb0d 100644
--- a/src/plugins/generator/visualstudio/msbuildutils.h
+++ b/src/plugins/generator/visualstudio/msbuildutils.h
@@ -92,14 +92,12 @@ public:
 
     static QString fullDisplayName(const qbs::Project &project)
     {
-        return QStringLiteral("%1|%2")
-                .arg(configurationName(project))
-                .arg(displayPlatform(project));
+        return QStringLiteral("%1|%2").arg(configurationName(project), displayPlatform(project));
     }
 
     static QString fullName(const qbs::Project &project)
     {
-        return QStringLiteral("%1|%2").arg(configurationName(project)).arg(platform(project));
+        return QStringLiteral("%1|%2").arg(configurationName(project), platform(project));
     }
 
     static QString buildTaskCondition(const Project &buildTask)
diff --git a/src/plugins/generator/visualstudio/visualstudio.pri b/src/plugins/generator/visualstudio/visualstudio.pri
deleted file mode 100644
index 13a48e85d..000000000
--- a/src/plugins/generator/visualstudio/visualstudio.pri
+++ /dev/null
@@ -1 +0,0 @@
-qbsPluginTarget = visualstudiogenerator
diff --git a/src/plugins/generator/visualstudio/visualstudio.pro b/src/plugins/generator/visualstudio/visualstudio.pro
deleted file mode 100644
index 49aee0eb4..000000000
--- a/src/plugins/generator/visualstudio/visualstudio.pro
+++ /dev/null
@@ -1,32 +0,0 @@
-include(visualstudio.pri)
-include(../../plugins.pri)
-include(../../../shared/json/json.pri)
-include(../../../lib/msbuild/use_msbuild.pri)
-# Using the indirect usage of corelib via plugins.pri breaks linking on mingw
-include(../../../lib/corelib/use_corelib.pri)
-
-INCLUDEPATH += ../../../lib/msbuild
-
-QT = core
-
-HEADERS += \
-    $$PWD/msbuildfiltersproject.h \
-    $$PWD/msbuildqbsgenerateproject.h \
-    $$PWD/msbuildqbsproductproject.h \
-    $$PWD/msbuildsharedsolutionpropertiesproject.h \
-    $$PWD/msbuildsolutionpropertiesproject.h \
-    $$PWD/msbuildtargetproject.h \
-    $$PWD/msbuildutils.h \
-    $$PWD/visualstudiogenerator.h \
-    $$PWD/visualstudioguidpool.h
-
-SOURCES += \
-    $$PWD/msbuildfiltersproject.cpp \
-    $$PWD/msbuildqbsgenerateproject.cpp \
-    $$PWD/msbuildqbsproductproject.cpp \
-    $$PWD/msbuildsharedsolutionpropertiesproject.cpp \
-    $$PWD/msbuildsolutionpropertiesproject.cpp \
-    $$PWD/msbuildtargetproject.cpp \
-    $$PWD/visualstudiogenerator.cpp \
-    $$PWD/visualstudiogeneratorplugin.cpp \
-    $$PWD/visualstudioguidpool.cpp
diff --git a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp
index 8d50bb5f1..d6add9c6f 100644
--- a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp
+++ b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp
@@ -153,7 +153,7 @@ VisualStudioGenerator::VisualStudioGenerator(const VisualStudioVersionInfo &vers
 {
     if (d->versionInfo.usesVcBuild())
         throw ErrorInfo(Tr::tr("VCBuild (Visual Studio 2008 and below) is not supported"));
-    else if (!d->versionInfo.usesMsBuild())
+    if (!d->versionInfo.usesMsBuild())
         throw ErrorInfo(Tr::tr("Unknown/unsupported build engine"));
     Q_ASSERT(d->versionInfo.usesSolutions());
 }
@@ -189,7 +189,7 @@ void VisualStudioGenerator::addPropertySheets(const GeneratableProject &project)
 void VisualStudioGenerator::addPropertySheets(
         const std::shared_ptr<MSBuildTargetProject> &targetProject)
 {
-    for (const auto &pair : qAsConst(d->propertySheetNames)) {
+    for (const auto &pair : std::as_const(d->propertySheetNames)) {
         targetProject->appendPropertySheet(
                     QStringLiteral("$(SolutionDir)\\") + pair.first, pair.second);
     }
@@ -224,14 +224,12 @@ static void addDefaultGlobalSections(const GeneratableProject &topLevelProject,
     for (const auto project : projects) {
         for (const auto &qbsProject : topLevelProject.projects) {
             projectConfigurationPlatformsSection->appendProperty(
-                QStringLiteral("%1.%2.ActiveCfg")
-                        .arg(project->guid().toString())
-                        .arg(MSBuildUtils::fullDisplayName(qbsProject)),
+                QStringLiteral("%1.%2.ActiveCfg").arg(project->guid().toString(),
+                                                      MSBuildUtils::fullDisplayName(qbsProject)),
                 MSBuildUtils::fullName(qbsProject));
             projectConfigurationPlatformsSection->appendProperty(
-                QStringLiteral("%1.%2.Build.0")
-                        .arg(project->guid().toString())
-                        .arg(MSBuildUtils::fullDisplayName(qbsProject)),
+                QStringLiteral("%1.%2.Build.0").arg(project->guid().toString(),
+                                                    MSBuildUtils::fullDisplayName(qbsProject)),
                 MSBuildUtils::fullName(qbsProject));
         }
     }
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
deleted file mode 100644
index 65de9bc10..000000000
--- a/src/plugins/plugins.pri
+++ /dev/null
@@ -1,21 +0,0 @@
-include(qbs_plugin_common.pri)
-
-TARGET = $$qbsPluginTarget
-DESTDIR = $$qbsPluginDestDir
-
-isEmpty(QBSLIBDIR): QBSLIBDIR = $$OUT_PWD/../../../../$${QBS_LIBRARY_DIRNAME}
-isEmpty(QBS_RPATH): QBS_RPATH = ../..
-include($${PWD}/../lib/corelib/use_corelib.pri)
-
-TEMPLATE = lib
-
-CONFIG += c++17
-CONFIG(static, static|shared): CONFIG += create_prl
-CONFIG += plugin
-
-!isEmpty(QBS_PLUGINS_INSTALL_DIR): \
-    installPrefix = $${QBS_PLUGINS_INSTALL_DIR}
-else: \
-    installPrefix = $${QBS_INSTALL_PREFIX}/$${QBS_LIBRARY_DIRNAME}
-target.path = $${installPrefix}/qbs/plugins
-INSTALLS += target
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
deleted file mode 100644
index 9fe2e6b5b..000000000
--- a/src/plugins/plugins.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = generator scanner
diff --git a/src/plugins/qbs_plugin_common.pri b/src/plugins/qbs_plugin_common.pri
deleted file mode 100644
index 45ade4989..000000000
--- a/src/plugins/qbs_plugin_common.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-include(../library_dirname.pri)
-include(../install_prefix.pri)
-
-!isEmpty(QBS_PLUGINS_BUILD_DIR) {
-    destdirPrefix = $${QBS_PLUGINS_BUILD_DIR}
-} else {
-    destdirPrefix = $$shadowed($$PWD)/../../$${QBS_LIBRARY_DIRNAME}
-}
-qbsPluginDestDir = $${destdirPrefix}/qbs/plugins
diff --git a/src/plugins/scanner/cpp/Lexer.cpp b/src/plugins/scanner/cpp/Lexer.cpp
index 16556ac73..6793080e9 100644
--- a/src/plugins/scanner/cpp/Lexer.cpp
+++ b/src/plugins/scanner/cpp/Lexer.cpp
@@ -69,8 +69,6 @@ Lexer::Lexer(const char *firstChar, const char *lastChar)
     setSource(firstChar, lastChar);
 }
 
-Lexer::~Lexer() = default;
-
 void Lexer::setSource(const char *firstChar, const char *lastChar)
 {
     _firstChar = firstChar;
@@ -232,7 +230,7 @@ void Lexer::scan_helper(Token *tok)
         while (_yychar && _yychar != quote) {
             if (_yychar == '\n')
                 break;
-            else if (_yychar != '\\')
+            if (_yychar != '\\')
                 yyinp();
             else {
                 yyinp(); // skip `\\'
@@ -566,14 +564,15 @@ void Lexer::scan_helper(Token *tok)
 
                 do {
                     yyinp();
-                    if (! (isalnum(_yychar) || _yychar == '_' || _yychar == '$'))
+                    if (!isalnum(_yychar) && _yychar != '_' && _yychar != '$')
                         break;
                 } while (_yychar);
 
                 // const int yylen = _currentChar - yytext;
                 //tok->f.kind = classifyObjCAtKeyword(yytext, yylen);		 /// ### FIXME
                 break;
-            } else if (ch == '@' && _yychar == '"') {
+            }
+            if (ch == '@' && _yychar == '"') {
                 // objc @string literals
                 ch = _yychar;
                 yyinp();
diff --git a/src/plugins/scanner/cpp/Lexer.h b/src/plugins/scanner/cpp/Lexer.h
index 8f55f84e9..42f733dc5 100644
--- a/src/plugins/scanner/cpp/Lexer.h
+++ b/src/plugins/scanner/cpp/Lexer.h
@@ -79,7 +79,6 @@ public:
     };
 
     Lexer(const char *firstChar, const char *lastChar);
-    ~Lexer();
 
     bool qtMocRunEnabled() const;
     void setQtMocRunEnabled(bool onoff);
diff --git a/src/plugins/scanner/cpp/cpp.pri b/src/plugins/scanner/cpp/cpp.pri
deleted file mode 100644
index 515e65635..000000000
--- a/src/plugins/scanner/cpp/cpp.pri
+++ /dev/null
@@ -1 +0,0 @@
-qbsPluginTarget = qbs_cpp_scanner
diff --git a/src/plugins/scanner/cpp/cpp.pro b/src/plugins/scanner/cpp/cpp.pro
deleted file mode 100644
index 12a6d7b6c..000000000
--- a/src/plugins/scanner/cpp/cpp.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-include(cpp.pri)
-include(../../plugins.pri)
-DEFINES += CPLUSPLUS_NO_PARSER
-
-QT = core
-
-HEADERS += CPlusPlusForwardDeclarations.h Lexer.h Token.h ../scanner.h \
-           cpp_global.h
-SOURCES += Lexer.cpp Token.cpp \
-    cppscanner.cpp
diff --git a/src/plugins/scanner/qt/qt.pri b/src/plugins/scanner/qt/qt.pri
deleted file mode 100644
index 71e3a8a45..000000000
--- a/src/plugins/scanner/qt/qt.pri
+++ /dev/null
@@ -1 +0,0 @@
-qbsPluginTarget = qbs_qt_scanner
diff --git a/src/plugins/scanner/qt/qt.pro b/src/plugins/scanner/qt/qt.pro
deleted file mode 100644
index f231ea9e2..000000000
--- a/src/plugins/scanner/qt/qt.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-include(qt.pri)
-include(../../plugins.pri)
-
-QT = core
-
-HEADERS += ../scanner.h
-SOURCES += \
-    qtscanner.cpp
diff --git a/src/plugins/scanner/scanner.pro b/src/plugins/scanner/scanner.pro
deleted file mode 100644
index 68acae7da..000000000
--- a/src/plugins/scanner/scanner.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = cpp qt
-
diff --git a/src/plugins/use_plugin.pri b/src/plugins/use_plugin.pri
deleted file mode 100644
index 53be9f4db..000000000
--- a/src/plugins/use_plugin.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-include(qbs_plugin_common.pri)
-
-qbsPluginLibName = $$qbsPluginTarget
-win32:CONFIG(debug, debug|release):CONFIG(static, static|shared): \
-    qbsPluginLibName = $${qbsPluginLibName}d
-LIBS += -l$$qbsPluginLibName
-
-macos: QMAKE_LFLAGS += -Wl,-u,_qbs_static_plugin_register_$$qbsPluginTarget
-!macos:gcc: QMAKE_LFLAGS += -Wl,--require-defined=qbs_static_plugin_register_$$qbsPluginTarget
-msvc: QMAKE_LFLAGS += /INCLUDE:qbs_static_plugin_register_$$qbsPluginTarget
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index b77e01b4e..226dd77ec 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -1,2 +1,4 @@
 add_subdirectory(json)
+add_subdirectory(lsp)
+add_subdirectory(quickjs)
 add_subdirectory(variant)
diff --git a/src/shared/bundledqt/bundledqt.qbs b/src/shared/bundledqt/bundledqt.qbs
index e0f79df59..39409b938 100644
--- a/src/shared/bundledqt/bundledqt.qbs
+++ b/src/shared/bundledqt/bundledqt.qbs
@@ -6,7 +6,6 @@ Product {
     Depends { name: "qbsbuildconfig" }
     Depends { name: "Qt"; submodules: ["core", "gui", "network", "printsupport", "widgets", "xml"] }
     Depends { name: "Qt.test"; condition: project.withTests === true }
-    Depends { name: "Qt.script"; condition: !qbsbuildconfig.useBundledQtScript; required: false }
     Depends {
         name: "Qt.core5compat";
         condition: Utilities.versionCompare(Qt.core.version, "6") >= 0
diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp
index cb6e91f51..0ea6e8fd0 100644
--- a/src/shared/json/json.cpp
+++ b/src/shared/json/json.cpp
@@ -815,7 +815,7 @@ JsonValue::JsonValue(const JsonObject &o)
 JsonValue::~JsonValue()
 {
     if (t == String && stringData && !stringData->ref.deref())
-        free(stringData);
+        delete stringData;
 
     if (d && !d->ref.deref())
         delete d;
@@ -841,8 +841,11 @@ JsonValue::JsonValue(const JsonValue &other)
  */
 JsonValue &JsonValue::operator=(const JsonValue &other)
 {
+    if (this == &other) // Self assignment guard.
+        return *this;
+
     if (t == String && stringData && !stringData->ref.deref())
-        free(stringData);
+        delete stringData;
 
     t = other.t;
     dbl = other.dbl;
@@ -1310,6 +1313,9 @@ JsonArray::JsonArray(const JsonArray &other)
  */
 JsonArray &JsonArray::operator=(const JsonArray &other)
 {
+    if (this == &other) // Self assignment guard.
+        return *this;
+
     if (d != other.d) {
         if (d && !d->ref.deref())
             delete d;
@@ -2353,6 +2359,9 @@ JsonObject::JsonObject(const JsonObject &other)
  */
 JsonObject &JsonObject::operator=(const JsonObject &other)
 {
+    if (this == &other) // Self assignment guard.
+        return *this;
+
     if (d != other.d) {
         if (d && !d->ref.deref())
             delete d;
@@ -3305,6 +3314,9 @@ JsonDocument::JsonDocument(const JsonDocument &other)
  */
 JsonDocument &JsonDocument::operator=(const JsonDocument &other)
 {
+    if (this == &other) // Self assignment guard.
+        return *this;
+
     if (d != other.d) {
         if (d && !d->ref.deref())
             delete d;
@@ -3650,8 +3662,7 @@ bool JsonDocument::operator==(const JsonDocument &other) const
     if (d->header->root()->isObject())
         return JsonObject(d, static_cast<Internal::Object *>(d->header->root()))
                 == JsonObject(other.d, static_cast<Internal::Object *>(other.d->header->root()));
-    else
-        return JsonArray(d, static_cast<Internal::Array *>(d->header->root()))
+    return JsonArray(d, static_cast<Internal::Array *>(d->header->root()))
                 == JsonArray(other.d, static_cast<Internal::Array *>(other.d->header->root()));
 }
 
@@ -3746,7 +3757,7 @@ static void valueToJson(const Base *b, const Value &v, std::string &json, int in
             // +2 to format to ensure the expected precision
             const int n = std::numeric_limits<double>::digits10 + 2;
             char buf[30] = {0};
-            sprintf(buf, "%.*g", n, d);
+            std::snprintf(buf, sizeof(buf), "%.*g", n, d);
             // Hack:
             if (buf[0] == '-' && buf[1] == '0' && buf[2] == '\0')
                 json += "0";
@@ -4209,7 +4220,7 @@ bool Parser::parseArray()
             char token = nextToken();
             if (token == EndArray)
                 break;
-            else if (token != ValueSeparator) {
+            if (token != ValueSeparator) {
                 if (!eatSpace())
                     lastError = JsonParseError::UnterminatedArray;
                 else
@@ -4708,7 +4719,7 @@ int Base::reserveSpace(uint32_t dataSize, int posInTable, uint32_t numItems, boo
 {
     // assert(posInTable >= 0 && posInTable <= (int)length);
     if (size + dataSize >= Value::MaxSize) {
-        fprintf(stderr, "Json: Document too large to store in data structure %d %d %d\n", (uint32_t)size, dataSize, Value::MaxSize);
+        std::fprintf(stderr, "Json: Document too large to store in data structure %d %d %d\n", (uint32_t)size, dataSize, Value::MaxSize);
         return 0;
     }
 
@@ -4890,7 +4901,7 @@ int Value::requiredStorage(JsonValue &v, bool *compressed)
         }
         return sizeof(double);
     case JsonValue::String: {
-        std::string s = v.toString().data();
+        std::string s = v.toString();
         *compressed = false;
         return Internal::qStringSize(s);
     }
diff --git a/src/shared/json/json.pri b/src/shared/json/json.pri
deleted file mode 100644
index 1b44027c6..000000000
--- a/src/shared/json/json.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-INCLUDEPATH += $$PWD
-HEADERS += $$PWD/json.h
-SOURCES += $$PWD/json.cpp
diff --git a/src/shared/lsp/.clang-tidy b/src/shared/lsp/.clang-tidy
new file mode 100644
index 000000000..f451e9596
--- /dev/null
+++ b/src/shared/lsp/.clang-tidy
@@ -0,0 +1,3 @@
+Checks: '-*,misc-definitions-in-headers'
+CheckOptions:
+  - { key: HeaderFileExtensions, value: "x" }
diff --git a/src/shared/lsp/CMakeLists.txt b/src/shared/lsp/CMakeLists.txt
new file mode 100644
index 000000000..1ed95db25
--- /dev/null
+++ b/src/shared/lsp/CMakeLists.txt
@@ -0,0 +1,57 @@
+add_qbs_library(qtclsp
+    STATIC
+    DEPENDS Qt${QT_VERSION_MAJOR}::Core Qt6Core5Compat
+    SOURCES
+      algorithm.h
+      basemessage.cpp
+      basemessage.h
+      callhierarchy.cpp
+      callhierarchy.h
+      client.cpp
+      client.h
+      clientcapabilities.cpp
+      clientcapabilities.h
+      completion.cpp
+      completion.h
+      diagnostics.cpp
+      diagnostics.h
+      initializemessages.cpp
+      initializemessages.h
+      jsonkeys.h
+      jsonobject.cpp
+      jsonobject.h
+      jsonrpcmessages.cpp
+      jsonrpcmessages.h
+      languagefeatures.cpp
+      languagefeatures.h
+      languageserverprotocol_global.h
+      languageserverprotocoltr.h
+      lsptypes.cpp
+      lsptypes.h
+      lsputils.cpp
+      lsputils.h
+      messages.cpp
+      messages.h
+      progresssupport.cpp
+      progresssupport.h
+      semantictokens.cpp
+      semantictokens.h
+      servercapabilities.cpp
+      servercapabilities.h
+      shutdownmessages.cpp
+      shutdownmessages.h
+      textsynchronization.cpp
+      textsynchronization.h
+      textutils.cpp
+      textutils.h
+      workspace.cpp
+      workspace.h
+  )
+target_include_directories(
+    qtclsp
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/corelib
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..
+)
+target_compile_definitions(qtclsp
+  PUBLIC "LANGUAGESERVERPROTOCOL_STATIC_LIBRARY"
+)
diff --git a/src/shared/lsp/algorithm.h b/src/shared/lsp/algorithm.h
new file mode 100644
index 000000000..4c41fb649
--- /dev/null
+++ b/src/shared/lsp/algorithm.h
@@ -0,0 +1,1518 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "predicates.h"
+
+#include <qcompilerdetection.h> // for Q_REQUIRED_RESULT
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <set>
+#include <tuple>
+#include <unordered_map>
+#include <unordered_set>
+
+#include <QHash>
+#include <QObject>
+#include <QSet>
+#include <QStringList>
+
+#include <memory>
+#include <optional>
+#include <type_traits>
+
+namespace lsp::Utils {
+
+/////////////////////////
+// anyOf
+/////////////////////////
+template<typename T, typename F>
+bool anyOf(const T &container, F predicate);
+template<typename T, typename R, typename S>
+bool anyOf(const T &container, R (S::*predicate)() const);
+template<typename T, typename R, typename S>
+bool anyOf(const T &container, R S::*member);
+
+/////////////////////////
+// count
+/////////////////////////
+template<typename T, typename F>
+int count(const T &container, F predicate);
+
+/////////////////////////
+// allOf
+/////////////////////////
+template<typename T, typename F>
+bool allOf(const T &container, F predicate);
+
+/////////////////////////
+// erase
+/////////////////////////
+template<typename T, typename F>
+void erase(T &container, F predicate);
+template<typename T, typename F>
+bool eraseOne(T &container, F predicate);
+
+/////////////////////////
+// contains
+/////////////////////////
+template<typename T, typename F>
+bool contains(const T &container, F function);
+template<typename T, typename R, typename S>
+bool contains(const T &container, R (S::*function)() const);
+template<typename C, typename R, typename S>
+bool contains(const C &container, R S::*member);
+
+/////////////////////////
+// findOr
+/////////////////////////
+template<typename C, typename F>
+Q_REQUIRED_RESULT typename C::value_type findOr(const C &container,
+                                                typename C::value_type other,
+                                                F function);
+template<typename T, typename R, typename S>
+Q_REQUIRED_RESULT typename T::value_type findOr(const T &container,
+                                                typename T::value_type other,
+                                                R (S::*function)() const);
+template<typename T, typename R, typename S>
+Q_REQUIRED_RESULT typename T::value_type findOr(const T &container,
+                                                typename T::value_type other,
+                                                R S::*member);
+
+/////////////////////////
+// findOrDefault
+/////////////////////////
+template<typename C, typename F>
+Q_REQUIRED_RESULT typename std::enable_if_t<std::is_copy_assignable<typename C::value_type>::value,
+                                            typename C::value_type>
+findOrDefault(const C &container, F function);
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT typename std::enable_if_t<std::is_copy_assignable<typename C::value_type>::value,
+                                            typename C::value_type>
+findOrDefault(const C &container, R (S::*function)() const);
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT typename std::enable_if_t<std::is_copy_assignable<typename C::value_type>::value,
+                                            typename C::value_type>
+findOrDefault(const C &container, R S::*member);
+
+/////////////////////////
+// indexOf
+/////////////////////////
+template<typename C, typename F>
+Q_REQUIRED_RESULT int indexOf(const C &container, F function);
+
+/////////////////////////
+// maxElementOr
+/////////////////////////
+template<typename T>
+typename T::value_type maxElementOr(const T &container, typename T::value_type other);
+
+/////////////////////////
+// filtered
+/////////////////////////
+template<typename C, typename F>
+Q_REQUIRED_RESULT C filtered(const C &container, F predicate);
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT C filtered(const C &container, R (S::*predicate)() const);
+
+/////////////////////////
+// partition
+/////////////////////////
+// Recommended usage:
+// C hit;
+// C miss;
+// std::tie(hit, miss) = Utils::partition(container, predicate);
+template<typename C, typename F>
+Q_REQUIRED_RESULT std::tuple<C, C> partition(const C &container, F predicate);
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT std::tuple<C, C> partition(const C &container, R (S::*predicate)() const);
+
+/////////////////////////
+// filteredUnique
+/////////////////////////
+template<typename C>
+Q_REQUIRED_RESULT C filteredUnique(const C &container);
+
+/////////////////////////
+// qobject_container_cast
+/////////////////////////
+template<class T, template<typename> class Container, typename Base>
+Container<T> qobject_container_cast(const Container<Base> &container);
+
+/////////////////////////
+// static_container_cast
+/////////////////////////
+template<class T, template<typename> class Container, typename Base>
+Container<T> static_container_cast(const Container<Base> &container);
+
+/////////////////////////
+// sort
+/////////////////////////
+template<typename Container>
+inline void sort(Container &container);
+template<typename Container, typename Predicate>
+inline void sort(Container &container, Predicate p);
+template<typename Container, typename R, typename S>
+inline void sort(Container &container, R S::*member);
+template<typename Container, typename R, typename S>
+inline void sort(Container &container, R (S::*function)() const);
+
+/////////////////////////
+// reverseForeach
+/////////////////////////
+template<typename Container, typename Op>
+inline void reverseForeach(const Container &c, const Op &operation);
+
+/////////////////////////
+// toReferences
+/////////////////////////
+template<template<typename...> class ResultContainer, typename SourceContainer>
+auto toReferences(SourceContainer &sources);
+template<typename SourceContainer>
+auto toReferences(SourceContainer &sources);
+
+/////////////////////////
+// toConstReferences
+/////////////////////////
+template<template<typename...> class ResultContainer, typename SourceContainer>
+auto toConstReferences(const SourceContainer &sources);
+template<typename SourceContainer>
+auto toConstReferences(const SourceContainer &sources);
+
+/////////////////////////
+// take
+/////////////////////////
+template<class C, typename P>
+Q_REQUIRED_RESULT std::optional<typename C::value_type> take(C &container, P predicate);
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT decltype(auto) take(C &container, R S::*member);
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT decltype(auto) take(C &container, R (S::*function)() const);
+
+/////////////////////////
+// setUnionMerge
+/////////////////////////
+// Works like std::set_union but provides a merge function for items that match
+// !(a > b) && !(b > a) which normally means that there is an "equal" match.
+// It uses iterators to support move_iterators.
+template<class InputIt1, class InputIt2, class OutputIt, class Merge, class Compare>
+OutputIt setUnionMerge(InputIt1 first1,
+                       InputIt1 last1,
+                       InputIt2 first2,
+                       InputIt2 last2,
+                       OutputIt d_first,
+                       Merge merge,
+                       Compare comp);
+template<class InputIt1, class InputIt2, class OutputIt, class Merge>
+OutputIt setUnionMerge(
+    InputIt1 first1, InputIt1 last1, InputIt2 first2, InputIt2 last2, OutputIt d_first, Merge merge);
+template<class OutputContainer, class InputContainer1, class InputContainer2, class Merge, class Compare>
+OutputContainer setUnionMerge(InputContainer1 &&input1,
+                              InputContainer2 &&input2,
+                              Merge merge,
+                              Compare comp);
+template<class OutputContainer, class InputContainer1, class InputContainer2, class Merge>
+OutputContainer setUnionMerge(InputContainer1 &&input1, InputContainer2 &&input2, Merge merge);
+
+/////////////////////////
+// setUnion
+/////////////////////////
+template<typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Compare>
+OutputIterator set_union(InputIterator1 first1,
+                         InputIterator1 last1,
+                         InputIterator2 first2,
+                         InputIterator2 last2,
+                         OutputIterator result,
+                         Compare comp);
+template<typename InputIterator1, typename InputIterator2, typename OutputIterator>
+OutputIterator set_union(InputIterator1 first1,
+                         InputIterator1 last1,
+                         InputIterator2 first2,
+                         InputIterator2 last2,
+                         OutputIterator result);
+
+/////////////////////////
+// transform
+/////////////////////////
+// function without result type deduction:
+template<typename ResultContainer, // complete result container type
+         typename SC,              // input container type
+         typename F>               // function type
+Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
+
+// function with result type deduction:
+template<template<typename> class C, // result container type
+         typename SC,                // input container type
+         typename F,                 // function type
+         typename Value = typename std::decay_t<SC>::value_type,
+         typename Result = std::decay_t<std::result_of_t<F(Value &)>>,
+         typename ResultContainer = C<Result>>
+Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
+#ifdef Q_CC_CLANG
+// "Matching of template template-arguments excludes compatible templates"
+// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html (P0522R0)
+// in C++17 makes the above match e.g. C=std::vector even though that takes two
+// template parameters. Unfortunately the following one matches too, and there is no additional
+// partial ordering rule, resulting in an ambiguous call for this previously valid code.
+// GCC and MSVC ignore that issue and follow the standard to the letter, but Clang only
+// enables the new behavior when given -frelaxed-template-template-args .
+// To avoid requiring everyone using this header to enable that feature, keep the old implementation
+// for Clang.
+template<template<typename, typename> class C, // result container type
+         typename SC,                          // input container type
+         typename F,                           // function type
+         typename Value = typename std::decay_t<SC>::value_type,
+         typename Result = std::decay_t<std::result_of_t<F(Value &)>>,
+         typename ResultContainer = C<Result, std::allocator<Result>>>
+Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
+#endif
+
+// member function without result type deduction:
+template<template<typename...> class C, // result container type
+         typename SC,                   // input container type
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, R (S::*p)() const);
+
+// member function with result type deduction:
+template<typename ResultContainer, // complete result container type
+         typename SC,              // input container type
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, R (S::*p)() const);
+
+// member without result type deduction:
+template<typename ResultContainer, // complete result container type
+         typename SC,              // input container
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, R S::*p);
+
+// member with result type deduction:
+template<template<typename...> class C, // result container
+         typename SC,                   // input container
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, R S::*p);
+
+// same container types for input and output, const input
+// function:
+template<template<typename...> class C, // container type
+         typename F,                    // function type
+         typename... CArgs>             // Arguments to SC
+Q_REQUIRED_RESULT decltype(auto) transform(const C<CArgs...> &container, F function);
+
+// same container types for input and output, const input
+// member function:
+template<template<typename...> class C, // container type
+         typename R,
+         typename S,
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT decltype(auto) transform(const C<CArgs...> &container, R (S::*p)() const);
+
+// same container types for input and output, const input
+// members:
+template<template<typename...> class C, // container
+         typename R,
+         typename S,
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT decltype(auto) transform(const C<CArgs...> &container, R S::*p);
+
+// same container types for input and output, non-const input
+// function:
+template<template<typename...> class C, // container type
+         typename F,                    // function type
+         typename... CArgs>             // Arguments to SC
+Q_REQUIRED_RESULT decltype(auto) transform(C<CArgs...> &container, F function);
+
+// same container types for input and output, non-const input
+// member function:
+template<template<typename...> class C, // container type
+         typename R,
+         typename S,
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT decltype(auto) transform(C<CArgs...> &container, R (S::*p)() const);
+
+// same container types for input and output, non-const input
+// members:
+template<template<typename...> class C, // container
+         typename R,
+         typename S,
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT decltype(auto) transform(C<CArgs...> &container, R S::*p);
+
+/////////////////////////////////////////////////////////////////////////////
+////////    Implementations    //////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+//////////////////
+// anyOf
+/////////////////
+template<typename T, typename F>
+bool anyOf(const T &container, F predicate)
+{
+    return std::any_of(std::begin(container), std::end(container), predicate);
+}
+
+// anyOf taking a member function pointer
+template<typename T, typename R, typename S>
+bool anyOf(const T &container, R (S::*predicate)() const)
+{
+    return std::any_of(std::begin(container), std::end(container), std::mem_fn(predicate));
+}
+
+// anyOf taking a member pointer
+template<typename T, typename R, typename S>
+bool anyOf(const T &container, R S::*member)
+{
+    return std::any_of(std::begin(container), std::end(container), std::mem_fn(member));
+}
+
+
+//////////////////
+// count
+/////////////////
+template<typename T, typename F>
+int count(const T &container, F predicate)
+{
+    return std::count_if(std::begin(container), std::end(container), predicate);
+}
+
+//////////////////
+// allOf
+/////////////////
+template<typename T, typename F>
+bool allOf(const T &container, F predicate)
+{
+    return std::all_of(std::begin(container), std::end(container), predicate);
+}
+
+// allOf taking a member function pointer
+template<typename T, typename R, typename S>
+bool allOf(const T &container, R (S::*predicate)() const)
+{
+    return std::all_of(std::begin(container), std::end(container), std::mem_fn(predicate));
+}
+
+// allOf taking a member pointer
+template<typename T, typename R, typename S>
+bool allOf(const T &container, R S::*member)
+{
+    return std::all_of(std::begin(container), std::end(container), std::mem_fn(member));
+}
+
+//////////////////
+// erase
+/////////////////
+template<typename T, typename F>
+void erase(T &container, F predicate)
+{
+    container.erase(std::remove_if(std::begin(container), std::end(container), predicate),
+                    std::end(container));
+}
+template<typename T, typename F>
+bool eraseOne(T &container, F predicate)
+{
+    const auto it = std::find_if(std::begin(container), std::end(container), predicate);
+    if (it == std::end(container))
+        return false;
+    container.erase(it);
+    return true;
+}
+
+//////////////////
+// contains
+/////////////////
+template<typename T, typename F>
+bool contains(const T &container, F function)
+{
+    return anyOf(container, function);
+}
+
+template<typename T, typename R, typename S>
+bool contains(const T &container, R (S::*function)() const)
+{
+    return anyOf(container, function);
+}
+
+template<typename C, typename R, typename S>
+bool contains(const C &container, R S::*member)
+{
+    return anyOf(container, std::mem_fn(member));
+}
+
+//////////////////
+// findOr
+/////////////////
+template<typename C, typename F>
+Q_REQUIRED_RESULT
+typename C::value_type findOr(const C &container, typename C::value_type other, F function)
+{
+    typename C::const_iterator begin = std::begin(container);
+    typename C::const_iterator end = std::end(container);
+
+    typename C::const_iterator it = std::find_if(begin, end, function);
+    return it == end ? other : *it;
+}
+
+template<typename T, typename R, typename S>
+Q_REQUIRED_RESULT
+typename T::value_type findOr(const T &container, typename T::value_type other, R (S::*function)() const)
+{
+    return findOr(container, other, std::mem_fn(function));
+}
+
+template<typename T, typename R, typename S>
+Q_REQUIRED_RESULT
+typename T::value_type findOr(const T &container, typename T::value_type other, R S::*member)
+{
+    return findOr(container, other, std::mem_fn(member));
+}
+
+//////////////////
+// findOrDefault
+//////////////////
+// Default implementation:
+template<typename C, typename F>
+Q_REQUIRED_RESULT
+typename std::enable_if_t<std::is_copy_assignable<typename C::value_type>::value, typename C::value_type>
+findOrDefault(const C &container, F function)
+{
+    return findOr(container, typename C::value_type(), function);
+}
+
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT
+typename std::enable_if_t<std::is_copy_assignable<typename C::value_type>::value, typename C::value_type>
+findOrDefault(const C &container, R (S::*function)() const)
+{
+    return findOr(container, typename C::value_type(), std::mem_fn(function));
+}
+
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT
+typename std::enable_if_t<std::is_copy_assignable<typename C::value_type>::value, typename C::value_type>
+findOrDefault(const C &container, R S::*member)
+{
+    return findOr(container, typename C::value_type(), std::mem_fn(member));
+}
+
+//////////////////
+// index of:
+//////////////////
+
+template<typename C, typename F>
+Q_REQUIRED_RESULT
+int indexOf(const C& container, F function)
+{
+    typename C::const_iterator begin = std::begin(container);
+    typename C::const_iterator end = std::end(container);
+
+    typename C::const_iterator it = std::find_if(begin, end, function);
+    return it == end ? -1 : std::distance(begin, it);
+}
+
+
+//////////////////
+// max element
+//////////////////
+
+template<typename T>
+typename T::value_type maxElementOr(const T &container, typename T::value_type other)
+{
+    typename T::const_iterator begin = std::begin(container);
+    typename T::const_iterator end = std::end(container);
+
+    typename T::const_iterator it = std::max_element(begin, end);
+    if (it == end)
+        return other;
+    return *it;
+}
+
+
+//////////////////
+// transform
+/////////////////
+
+namespace {
+/////////////////
+// helper code for transform to use back_inserter and thus push_back for everything
+// and insert for QSet<>
+//
+
+// SetInsertIterator, straight from the standard for insert_iterator
+// just without the additional parameter to insert
+template<class Container>
+class SetInsertIterator
+{
+protected:
+  Container *container;
+
+public:
+    using iterator_category = std::output_iterator_tag;
+    using container_type = Container;
+    explicit SetInsertIterator(Container &x)
+        : container(&x)
+    {}
+    SetInsertIterator<Container> &operator=(const typename Container::value_type &value)
+    {
+        container->insert(value);
+        return *this;
+    }
+    SetInsertIterator<Container> &operator=(typename Container::value_type &&value)
+    {
+        container->insert(std::move(value));
+        return *this;
+    }
+    SetInsertIterator<Container> &operator*() { return *this; }
+    SetInsertIterator<Container> &operator++() { return *this; }
+    SetInsertIterator<Container> operator++(int) { return *this; }
+};
+
+// for QMap / QHash, inserting a std::pair / QPair
+template<class Container>
+class MapInsertIterator
+{
+protected:
+    Container *container;
+
+public:
+    using iterator_category = std::output_iterator_tag;
+    using container_type = Container;
+    explicit MapInsertIterator(Container &x)
+        : container(&x)
+    {}
+    MapInsertIterator<Container> &operator=(
+        const std::pair<const typename Container::key_type, typename Container::mapped_type> &value)
+    { container->insert(value.first, value.second); return *this; }
+    MapInsertIterator<Container> &operator=(
+        const QPair<typename Container::key_type, typename Container::mapped_type> &value)
+    { container->insert(value.first, value.second); return *this; }
+    MapInsertIterator<Container> &operator*() { return *this; }
+    MapInsertIterator<Container> &operator++() { return *this; }
+    MapInsertIterator<Container> operator++(int) { return *this; }
+};
+
+// because Qt container are not implementing the standard interface we need
+// this helper functions for generic code
+template<typename Type>
+void append(QList<Type> *container, QList<Type> &&input)
+{
+    container->append(std::move(input));
+}
+
+template<typename Type>
+void append(QList<Type> *container, const QList<Type> &input)
+{
+    container->append(input);
+}
+
+template<typename Container>
+void append(Container *container, Container &&input)
+{
+    container->insert(container->end(),
+                      std::make_move_iterator(input.begin()),
+                      std::make_move_iterator(input.end()));
+}
+
+template<typename Container>
+void append(Container *container, const Container &input)
+{
+    container->insert(container->end(), input.begin(), input.end());
+}
+
+// BackInsertIterator behaves like std::back_insert_iterator except is adds the back insertion for
+// container of the same type
+template<typename Container>
+class BackInsertIterator
+{
+public:
+    using iterator_category = std::output_iterator_tag;
+    using value_type = void;
+    using difference_type = ptrdiff_t;
+    using pointer = void;
+    using reference = void;
+    using container_type = Container;
+
+    explicit constexpr BackInsertIterator(Container &container)
+        : m_container(std::addressof(container))
+    {}
+
+    constexpr BackInsertIterator &operator=(const typename Container::value_type &value)
+    {
+        m_container->push_back(value);
+        return *this;
+    }
+
+    constexpr BackInsertIterator &operator=(typename Container::value_type &&value)
+    {
+        m_container->push_back(std::move(value));
+        return *this;
+    }
+
+    constexpr BackInsertIterator &operator=(const Container &container)
+    {
+        append(m_container, container);
+        return *this;
+    }
+
+    constexpr BackInsertIterator &operator=(Container &&container)
+    {
+        append(m_container, container);
+        return *this;
+    }
+
+    [[nodiscard]] constexpr BackInsertIterator &operator*() { return *this; }
+
+    constexpr BackInsertIterator &operator++() { return *this; }
+
+    constexpr BackInsertIterator operator++(int) { return *this; }
+
+private:
+    Container *m_container;
+};
+
+// inserter helper function, returns a BackInsertIterator for most containers
+// and is overloaded for QSet<> and other containers without push_back, returning custom inserters
+template<typename Container>
+inline BackInsertIterator<Container> inserter(Container &container)
+{
+    return BackInsertIterator(container);
+}
+
+template<typename X>
+inline SetInsertIterator<QSet<X>>
+inserter(QSet<X> &container)
+{
+    return SetInsertIterator<QSet<X>>(container);
+}
+
+template<typename K, typename C, typename A>
+inline SetInsertIterator<std::set<K, C, A>>
+inserter(std::set<K, C, A> &container)
+{
+    return SetInsertIterator<std::set<K, C, A>>(container);
+}
+
+template<typename K, typename H, typename C, typename A>
+inline SetInsertIterator<std::unordered_set<K, H, C, A>>
+inserter(std::unordered_set<K, H, C, A> &container)
+{
+    return SetInsertIterator<std::unordered_set<K, H, C, A>>(container);
+}
+
+template<typename K, typename V, typename C, typename A>
+inline SetInsertIterator<std::map<K, V, C, A>>
+inserter(std::map<K, V, C, A> &container)
+{
+    return SetInsertIterator<std::map<K, V, C, A>>(container);
+}
+
+template<typename K, typename V, typename H, typename C, typename A>
+inline SetInsertIterator<std::unordered_map<K, V, H, C, A>>
+inserter(std::unordered_map<K, V, H, C, A> &container)
+{
+    return SetInsertIterator<std::unordered_map<K, V, H, C, A>>(container);
+}
+
+template<typename K, typename V>
+inline MapInsertIterator<QMap<K, V>>
+inserter(QMap<K, V> &container)
+{
+    return MapInsertIterator<QMap<K, V>>(container);
+}
+
+template<typename K, typename V>
+inline MapInsertIterator<QHash<K, V>>
+inserter(QHash<K, V> &container)
+{
+    return MapInsertIterator<QHash<K, V>>(container);
+}
+
+// Helper code for container.reserve that makes it possible to effectively disable it for
+// specific cases
+
+// default: do reserve
+// Template arguments are more specific than the second version below, so this is tried first
+template<template<typename...> class C, typename... CArgs,
+         typename = decltype(&C<CArgs...>::reserve)>
+void reserve(C<CArgs...> &c, typename C<CArgs...>::size_type s)
+{
+    c.reserve(s);
+}
+
+// containers that don't have reserve()
+template<typename C>
+void reserve(C &, typename C::size_type) { }
+
+} // anonymous
+
+// --------------------------------------------------------------------
+// Different containers for input and output:
+// --------------------------------------------------------------------
+
+// different container types for input and output, e.g. transforming a QList into a QSet
+
+// function without result type deduction:
+template<typename ResultContainer, // complete result container type
+         typename SC, // input container type
+         typename F> // function type
+Q_REQUIRED_RESULT
+decltype(auto) transform(SC &&container, F function)
+{
+    ResultContainer result;
+    reserve(result, typename ResultContainer::size_type(container.size()));
+    std::transform(std::begin(container), std::end(container), inserter(result), function);
+    return result;
+}
+
+// function with result type deduction:
+template<template<typename> class C, // result container type
+         typename SC,                // input container type
+         typename F,                 // function type
+         typename Value,
+         typename Result,
+         typename ResultContainer>
+Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function)
+{
+    return transform<ResultContainer>(std::forward<SC>(container), function);
+}
+
+#ifdef Q_CC_CLANG
+template<template<typename, typename> class C, // result container type
+         typename SC,                          // input container type
+         typename F,                           // function type
+         typename Value,
+         typename Result,
+         typename ResultContainer>
+Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function)
+{
+    return transform<ResultContainer>(std::forward<SC>(container), function);
+}
+#endif
+
+// member function without result type deduction:
+template<template<typename...> class C, // result container type
+         typename SC, // input container type
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT
+decltype(auto) transform(SC &&container, R (S::*p)() const)
+{
+    return transform<C>(std::forward<SC>(container), std::mem_fn(p));
+}
+
+// member function with result type deduction:
+template<typename ResultContainer, // complete result container type
+         typename SC, // input container type
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT
+decltype(auto) transform(SC &&container, R (S::*p)() const)
+{
+    return transform<ResultContainer>(std::forward<SC>(container), std::mem_fn(p));
+}
+
+// member without result type deduction:
+template<typename ResultContainer, // complete result container type
+         typename SC, // input container
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT
+decltype(auto) transform(SC &&container, R S::*p)
+{
+    return transform<ResultContainer>(std::forward<SC>(container), std::mem_fn(p));
+}
+
+// member with result type deduction:
+template<template<typename...> class C, // result container
+         typename SC, // input container
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT
+decltype(auto) transform(SC &&container, R S::*p)
+{
+    return transform<C>(std::forward<SC>(container), std::mem_fn(p));
+}
+
+// same container types for input and output, const input
+
+// function:
+template<template<typename...> class C, // container type
+         typename F, // function type
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT
+decltype(auto) transform(const C<CArgs...> &container, F function)
+{
+    return transform<C, const C<CArgs...> &>(container, function);
+}
+
+// member function:
+template<template<typename...> class C, // container type
+         typename R,
+         typename S,
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT
+decltype(auto) transform(const C<CArgs...> &container, R (S::*p)() const)
+{
+    return transform<C, const C<CArgs...> &>(container, std::mem_fn(p));
+}
+
+// members:
+template<template<typename...> class C, // container
+         typename R,
+         typename S,
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT
+decltype(auto) transform(const C<CArgs...> &container, R S::*p)
+{
+    return transform<C, const C<CArgs...> &>(container, std::mem_fn(p));
+}
+
+// same container types for input and output, non-const input
+
+// function:
+template<template<typename...> class C, // container type
+         typename F, // function type
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT
+decltype(auto) transform(C<CArgs...> &container, F function)
+{
+    return transform<C, C<CArgs...> &>(container, function);
+}
+
+// member function:
+template<template<typename...> class C, // container type
+         typename R,
+         typename S,
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT
+decltype(auto) transform(C<CArgs...> &container, R (S::*p)() const)
+{
+    return transform<C, C<CArgs...> &>(container, std::mem_fn(p));
+}
+
+// members:
+template<template<typename...> class C, // container
+         typename R,
+         typename S,
+         typename... CArgs> // Arguments to SC
+Q_REQUIRED_RESULT
+decltype(auto) transform(C<CArgs...> &container, R S::*p)
+{
+    return transform<C, C<CArgs...> &>(container, std::mem_fn(p));
+}
+
+// Specialization for QStringList:
+
+template<template<typename...> class C = QList, // result container
+         typename F> // Arguments to C
+Q_REQUIRED_RESULT
+decltype(auto) transform(const QStringList &container, F function)
+{
+    return transform<C, const QList<QString> &>(static_cast<QList<QString>>(container), function);
+}
+
+// member function:
+template<template<typename...> class C = QList, // result container type
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT
+decltype(auto) transform(const QStringList &container, R (S::*p)() const)
+{
+    return transform<C, const QList<QString> &>(static_cast<QList<QString>>(container), std::mem_fn(p));
+}
+
+// members:
+template<template<typename...> class C = QList, // result container
+         typename R,
+         typename S>
+Q_REQUIRED_RESULT
+decltype(auto) transform(const QStringList &container, R S::*p)
+{
+    return transform<C, const QList<QString> &>(static_cast<QList<QString>>(container), std::mem_fn(p));
+}
+
+//////////////////
+// filtered
+/////////////////
+template<typename C, typename F>
+Q_REQUIRED_RESULT
+C filtered(const C &container, F predicate)
+{
+    C out;
+    std::copy_if(std::begin(container), std::end(container),
+                 inserter(out), predicate);
+    return out;
+}
+
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT
+C filtered(const C &container, R (S::*predicate)() const)
+{
+    C out;
+    std::copy_if(std::begin(container), std::end(container),
+                 inserter(out), std::mem_fn(predicate));
+    return out;
+}
+
+//////////////////
+// filteredCast
+/////////////////
+template<typename R, typename C, typename F>
+Q_REQUIRED_RESULT R filteredCast(const C &container, F predicate)
+{
+    R out;
+    std::copy_if(std::begin(container), std::end(container), inserter(out), predicate);
+    return out;
+}
+
+//////////////////
+// partition
+/////////////////
+
+// Recommended usage:
+// C hit;
+// C miss;
+// std::tie(hit, miss) = Utils::partition(container, predicate);
+
+template<typename C, typename F>
+Q_REQUIRED_RESULT
+std::tuple<C, C> partition(const C &container, F predicate)
+{
+    C hit;
+    C miss;
+    reserve(hit, container.size());
+    reserve(miss, container.size());
+    auto hitIns = inserter(hit);
+    auto missIns = inserter(miss);
+    for (const auto &i : container) {
+        if (predicate(i))
+            hitIns = i;
+        else
+            missIns = i;
+    }
+    return std::make_tuple(hit, miss);
+}
+
+template<typename C, typename R, typename S>
+Q_REQUIRED_RESULT
+std::tuple<C, C> partition(const C &container, R (S::*predicate)() const)
+{
+    return partition(container, std::mem_fn(predicate));
+}
+
+//////////////////
+// filteredUnique
+/////////////////
+
+template<typename C>
+Q_REQUIRED_RESULT
+C filteredUnique(const C &container)
+{
+    C result;
+    auto ins = inserter(result);
+
+    QSet<typename C::value_type> seen;
+    int setSize = 0;
+
+    auto endIt = std::end(container);
+    for (auto it = std::begin(container); it != endIt; ++it) {
+        seen.insert(*it);
+        if (setSize == seen.size()) // unchanged size => was already seen
+            continue;
+        ++setSize;
+        ins = *it;
+    }
+    return result;
+}
+
+//////////////////
+// qobject_container_cast
+/////////////////
+template <class T, template<typename> class Container, typename Base>
+Container<T> qobject_container_cast(const Container<Base> &container)
+{
+    Container<T> result;
+    auto ins = inserter(result);
+    for (Base val : container) {
+        if (T target = qobject_cast<T>(val))
+            ins = target;
+    }
+    return result;
+}
+
+//////////////////
+// static_container_cast
+/////////////////
+template <class T, template<typename> class Container, typename Base>
+Container<T> static_container_cast(const Container<Base> &container)
+{
+    Container<T> result;
+    reserve(result, container.size());
+    auto ins = inserter(result);
+    for (Base val : container)
+        ins = static_cast<T>(val);
+    return result;
+}
+
+//////////////////
+// sort
+/////////////////
+template <typename Container>
+inline void sort(Container &container)
+{
+    std::stable_sort(std::begin(container), std::end(container));
+}
+
+template <typename Container, typename Predicate>
+inline void sort(Container &container, Predicate p)
+{
+    std::stable_sort(std::begin(container), std::end(container), p);
+}
+
+// const lvalue
+template<typename Container>
+inline Container sorted(const Container &container)
+{
+    Container c = container;
+    sort(c);
+    return c;
+}
+
+// non-const lvalue
+// This is needed because otherwise the "universal" reference below is used, modifying the input
+// container.
+template<typename Container>
+inline Container sorted(Container &container)
+{
+    Container c = container;
+    sort(c);
+    return c;
+}
+
+// non-const rvalue (actually rvalue or lvalue, but lvalue is handled above)
+template<typename Container>
+inline Container sorted(Container &&container)
+{
+    sort(container);
+    return std::move(container);
+}
+
+// const rvalue
+template<typename Container>
+inline Container sorted(const Container &&container)
+{
+    return sorted(container);
+}
+
+// const lvalue
+template<typename Container, typename Predicate>
+inline Container sorted(const Container &container, Predicate p)
+{
+    Container c = container;
+    sort(c, p);
+    return c;
+}
+
+// non-const lvalue
+// This is needed because otherwise the "universal" reference below is used, modifying the input
+// container.
+template<typename Container, typename Predicate>
+inline Container sorted(Container &container, Predicate p)
+{
+    Container c = container;
+    sort(c, p);
+    return c;
+}
+
+// non-const rvalue (actually rvalue or lvalue, but lvalue is handled above)
+template<typename Container, typename Predicate>
+inline Container sorted(Container &&container, Predicate p)
+{
+    sort(container, p);
+    return std::move(container);
+}
+
+// const rvalue
+template<typename Container, typename Predicate>
+inline Container sorted(const Container &&container, Predicate p)
+{
+    return sorted(container, p);
+}
+
+// pointer to member
+template<typename Container, typename R, typename S>
+inline void sort(Container &container, R S::*member)
+{
+    auto f = std::mem_fn(member);
+    using const_ref = typename Container::const_reference;
+    std::stable_sort(std::begin(container), std::end(container),
+              [&f](const_ref a, const_ref b) {
+        return f(a) < f(b);
+    });
+}
+
+// const lvalue
+template<typename Container, typename R, typename S>
+inline Container sorted(const Container &container, R S::*member)
+{
+    Container c = container;
+    sort(c, member);
+    return c;
+}
+
+// non-const lvalue
+// This is needed because otherwise the "universal" reference below is used, modifying the input
+// container.
+template<typename Container, typename R, typename S>
+inline Container sorted(Container &container, R S::*member)
+{
+    Container c = container;
+    sort(c, member);
+    return c;
+}
+
+// non-const rvalue (actually rvalue or lvalue, but lvalue is handled above)
+template<typename Container, typename R, typename S>
+inline Container sorted(Container &&container, R S::*member)
+{
+    sort(container, member);
+    return std::move(container);
+}
+
+// const rvalue
+template<typename Container, typename R, typename S>
+inline Container sorted(const Container &&container, R S::*member)
+{
+    return sorted(container, member);
+}
+
+// pointer to member function
+template<typename Container, typename R, typename S>
+inline void sort(Container &container, R (S::*function)() const)
+{
+    auto f = std::mem_fn(function);
+    using const_ref = typename Container::const_reference;
+    std::stable_sort(std::begin(container), std::end(container),
+              [&f](const_ref a, const_ref b) {
+        return f(a) < f(b);
+    });
+}
+
+// const lvalue
+template<typename Container, typename R, typename S>
+inline Container sorted(const Container &container, R (S::*function)() const)
+{
+    Container c = container;
+    sort(c, function);
+    return c;
+}
+
+// non-const lvalue
+// This is needed because otherwise the "universal" reference below is used, modifying the input
+// container.
+template<typename Container, typename R, typename S>
+inline Container sorted(Container &container, R (S::*function)() const)
+{
+    Container c = container;
+    sort(c, function);
+    return c;
+}
+
+// non-const rvalue (actually rvalue or lvalue, but lvalue is handled above)
+template<typename Container, typename R, typename S>
+inline Container sorted(Container &&container, R (S::*function)() const)
+{
+    sort(container, function);
+    return std::move(container);
+}
+
+// const rvalue
+template<typename Container, typename R, typename S>
+inline Container sorted(const Container &&container, R (S::*function)() const)
+{
+    return sorted(container, function);
+}
+
+//////////////////
+// reverseForeach
+/////////////////
+template <typename Container, typename Op>
+inline void reverseForeach(const Container &c, const Op &operation)
+{
+    auto rend = c.rend();
+    for (auto it = c.rbegin(); it != rend; ++it)
+        operation(*it);
+}
+
+//////////////////
+// toReferences
+/////////////////
+template <template<typename...> class ResultContainer,
+          typename SourceContainer>
+auto toReferences(SourceContainer &sources)
+{
+    return transform<ResultContainer>(sources, [] (auto &value) { return std::ref(value); });
+}
+
+template <typename SourceContainer>
+auto toReferences(SourceContainer &sources)
+{
+    return transform(sources, [] (auto &value) { return std::ref(value); });
+}
+
+//////////////////
+// toConstReferences
+/////////////////
+template <template<typename...> class ResultContainer,
+          typename SourceContainer>
+auto toConstReferences(const SourceContainer &sources)
+{
+    return transform<ResultContainer>(sources, [] (const auto &value) { return std::cref(value); });
+}
+
+template <typename SourceContainer>
+auto toConstReferences(const SourceContainer &sources)
+{
+    return transform(sources, [] (const auto &value) { return std::cref(value); });
+}
+
+//////////////////
+// take:
+/////////////////
+
+template<class C, typename P>
+Q_REQUIRED_RESULT std::optional<typename C::value_type> take(C &container, P predicate)
+{
+    const auto end = std::end(container);
+
+    const auto it = std::find_if(std::begin(container), end, predicate);
+    if (it == end)
+        return std::nullopt;
+
+    std::optional<typename C::value_type> result = std::make_optional(std::move(*it));
+    container.erase(it);
+    return result;
+}
+
+// pointer to member
+template <typename C, typename R, typename S>
+Q_REQUIRED_RESULT decltype(auto) take(C &container, R S::*member)
+{
+    return take(container, std::mem_fn(member));
+}
+
+// pointer to member function
+template <typename C, typename R, typename S>
+Q_REQUIRED_RESULT decltype(auto) take(C &container, R (S::*function)() const)
+{
+    return take(container, std::mem_fn(function));
+}
+
+//////////////////
+// setUnionMerge: Works like std::set_union but provides a merge function for items that match
+//                !(a > b) && !(b > a) which normally means that there is an "equal" match.
+//                It uses iterators to support move_iterators.
+/////////////////
+
+template<class InputIt1,
+         class InputIt2,
+         class OutputIt,
+         class Merge,
+         class Compare>
+OutputIt setUnionMerge(InputIt1 first1,
+                       InputIt1 last1,
+                       InputIt2 first2,
+                       InputIt2 last2,
+                       OutputIt d_first,
+                       Merge merge,
+                       Compare comp)
+{
+    for (; first1 != last1; ++d_first) {
+        if (first2 == last2)
+            return std::copy(first1, last1, d_first);
+        if (comp(*first2, *first1)) {
+            *d_first = *first2++;
+        } else {
+            if (comp(*first1, *first2)) {
+                *d_first = *first1;
+            } else {
+                *d_first = merge(*first1, *first2);
+                ++first2;
+            }
+            ++first1;
+        }
+    }
+    return std::copy(first2, last2, d_first);
+}
+
+template<class InputIt1,
+         class InputIt2,
+         class OutputIt,
+         class Merge>
+OutputIt setUnionMerge(InputIt1 first1,
+                       InputIt1 last1,
+                       InputIt2 first2,
+                       InputIt2 last2,
+                       OutputIt d_first,
+                       Merge merge)
+{
+    return setUnionMerge(first1,
+                         last1,
+                         first2,
+                         last2,
+                         d_first,
+                         merge,
+                         std::less<std::decay_t<decltype(*first1)>>{});
+}
+
+template<class OutputContainer,
+         class InputContainer1,
+         class InputContainer2,
+         class Merge,
+         class Compare>
+OutputContainer setUnionMerge(InputContainer1 &&input1,
+                              InputContainer2 &&input2,
+                              Merge merge,
+                              Compare comp)
+{
+    OutputContainer results;
+    results.reserve(input1.size() + input2.size());
+
+    setUnionMerge(std::make_move_iterator(std::begin(input1)),
+                  std::make_move_iterator(std::end(input1)),
+                  std::make_move_iterator(std::begin(input2)),
+                  std::make_move_iterator(std::end(input2)),
+                  std::back_inserter(results),
+                  merge,
+                  comp);
+
+    return results;
+}
+
+template<class OutputContainer,
+         class InputContainer1,
+         class InputContainer2,
+         class Merge>
+OutputContainer setUnionMerge(InputContainer1 &&input1,
+                              InputContainer2 &&input2,
+                              Merge merge)
+{
+    return setUnionMerge<OutputContainer>(std::forward<InputContainer1>(input1),
+                                          std::forward<InputContainer2>(input2),
+                                          merge,
+                                          std::less<std::decay_t<decltype(*std::begin(input1))>>{});
+}
+
+template<typename Container>
+auto usize(const Container &container)
+{
+    return static_cast<std::make_unsigned_t<decltype(std::size(container))>>(std::size(container));
+}
+
+template<typename Container>
+auto ssize(const Container &container)
+{
+    return static_cast<std::make_signed_t<decltype(std::size(container))>>(std::size(container));
+}
+
+template<typename Compare>
+struct CompareIter
+{
+    Compare compare;
+
+    explicit constexpr CompareIter(Compare compare)
+        : compare(std::move(compare))
+    {}
+
+    template<typename Iterator1, typename Iterator2>
+    constexpr bool operator()(Iterator1 it1, Iterator2 it2)
+    {
+        return bool(compare(*it1, *it2));
+    }
+};
+
+template<typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Compare>
+OutputIterator set_union_impl(InputIterator1 first1,
+                              InputIterator1 last1,
+                              InputIterator2 first2,
+                              InputIterator2 last2,
+                              OutputIterator result,
+                              Compare comp)
+{
+    auto compare = CompareIter<Compare>(comp);
+
+    while (first1 != last1 && first2 != last2) {
+        if (compare(first1, first2)) {
+            *result = *first1;
+            ++first1;
+        } else if (compare(first2, first1)) {
+            *result = *first2;
+            ++first2;
+        } else {
+            *result = *first1;
+            ++first1;
+            ++first2;
+        }
+        ++result;
+    }
+
+    return std::copy(first2, last2, std::copy(first1, last1, result));
+}
+
+template<typename InputIterator1, typename InputIterator2, typename OutputIterator, typename Compare>
+OutputIterator set_union(InputIterator1 first1,
+                         InputIterator1 last1,
+                         InputIterator2 first2,
+                         InputIterator2 last2,
+                         OutputIterator result,
+                         Compare comp)
+{
+    return set_union_impl(first1, last1, first2, last2, result, comp);
+}
+
+template<typename InputIterator1, typename InputIterator2, typename OutputIterator>
+OutputIterator set_union(InputIterator1 first1,
+                         InputIterator1 last1,
+                         InputIterator2 first2,
+                         InputIterator2 last2,
+                         OutputIterator result)
+{
+    return set_union_impl(
+        first1, last1, first2, last2, result, std::less<typename InputIterator1::value_type>{});
+}
+
+// Replacement for deprecated Qt functionality
+
+template <class T>
+QSet<T> toSet(const QList<T> &list)
+{
+    return QSet<T>(list.begin(), list.end());
+}
+
+template<class T>
+QList<T> toList(const QSet<T> &set)
+{
+    return QList<T>(set.begin(), set.end());
+}
+
+template <class Key, class T>
+void addToHash(QHash<Key, T> *result, const QHash<Key, T> &additionalContents)
+{
+    result->insert(additionalContents);
+}
+
+// Workaround for missing information from QSet::insert()
+// Return type could be a pair like for std::set, but we never use the iterator anyway.
+template<typename T, typename U> [[nodiscard]] bool insert(QSet<T> &s, const U &v)
+{
+    const int oldSize = s.size();
+    s.insert(v);
+    return s.size() > oldSize;
+}
+
+} // namespace lsp::Utils
diff --git a/src/shared/lsp/basemessage.cpp b/src/shared/lsp/basemessage.cpp
new file mode 100644
index 000000000..4b19190dc
--- /dev/null
+++ b/src/shared/lsp/basemessage.cpp
@@ -0,0 +1,188 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "basemessage.h"
+
+#include "jsonrpcmessages.h"
+#include "languageserverprotocoltr.h"
+
+#include <QBuffer>
+#include <QTextCodec>
+
+#include <cstring>
+#include <utility>
+
+namespace lsp {
+
+Q_LOGGING_CATEGORY(parseLog, "qtc.languageserverprotocol.parse", QtWarningMsg)
+
+constexpr char headerFieldSeparator[] = ": ";
+constexpr char contentCharsetName[] = "charset";
+constexpr char defaultCharset[] = "utf-8";
+constexpr char contentLengthFieldName[] = "Content-Length";
+constexpr char headerSeparator[] = "\r\n";
+constexpr char contentTypeFieldName[] = "Content-Type";
+
+BaseMessage::BaseMessage()
+    : mimeType(JsonRpcMessage::jsonRpcMimeType())
+{ }
+
+BaseMessage::BaseMessage(const QByteArray &mimeType, const QByteArray &content,
+                         int expectedLength, QTextCodec *codec)
+    : mimeType(mimeType.isEmpty() ? JsonRpcMessage::jsonRpcMimeType() : mimeType)
+    , content(content)
+    , contentLength(expectedLength)
+    , codec(codec)
+{ }
+
+BaseMessage::BaseMessage(const QByteArray &mimeType, const QByteArray &content)
+    : BaseMessage(mimeType, content, content.length(), defaultCodec())
+{ }
+
+bool BaseMessage::operator==(const BaseMessage &other) const
+{
+    if (mimeType != other.mimeType || content != other.content)
+        return false;
+    if (codec) {
+        if (other.codec)
+            return codec->mibEnum() == other.codec->mibEnum();
+        return codec->mibEnum() == defaultCodec()->mibEnum();
+    }
+    if (other.codec)
+        return other.codec->mibEnum() == defaultCodec()->mibEnum();
+
+    return true;
+}
+
+static QPair<QByteArray, QByteArray> splitHeaderFieldLine(const QByteArray &headerFieldLine)
+{
+    static const int fieldSeparatorLength = int(std::strlen(headerFieldSeparator));
+    int assignmentIndex = headerFieldLine.indexOf(headerFieldSeparator);
+    if (assignmentIndex >= 0) {
+        return {headerFieldLine.mid(0, assignmentIndex),
+                    headerFieldLine.mid(assignmentIndex + fieldSeparatorLength)};
+    }
+    qCWarning(parseLog) << "Unexpected header line:" << QLatin1String(headerFieldLine);
+    return {};
+}
+
+static void parseContentType(BaseMessage &message, QByteArray contentType, QString &parseError)
+{
+    if (contentType.startsWith('"') && contentType.endsWith('"'))
+        contentType = contentType.mid(1, contentType.length() - 2);
+    QList<QByteArray> contentTypeElements = contentType.split(';');
+    QByteArray mimeTypeName = contentTypeElements.takeFirst();
+    QTextCodec *codec = nullptr;
+    for (const QByteArray &_contentTypeElement : contentTypeElements) {
+        const QByteArray &contentTypeElement = _contentTypeElement.trimmed();
+        if (contentTypeElement.startsWith(contentCharsetName)) {
+            const int equalindex = contentTypeElement.indexOf('=');
+            const QByteArray charset = contentTypeElement.mid(equalindex + 1);
+            if (equalindex > 0)
+                codec = QTextCodec::codecForName(charset);
+            if (!codec) {
+                parseError = Tr::tr("Cannot decode content with \"%1\". Falling back to \"%2\".")
+                                 .arg(QLatin1String(charset),
+                                      QLatin1String(defaultCharset));
+            }
+        }
+    }
+    message.mimeType = mimeTypeName;
+    message.codec = codec ? codec : BaseMessage::defaultCodec();
+}
+
+static void parseContentLength(BaseMessage &message, QByteArray contentLength, QString &parseError)
+{
+    bool ok = true;
+    message.contentLength = contentLength.toInt(&ok);
+    if (!ok) {
+        parseError = Tr::tr("Expected an integer in \"%1\", but got \"%2\".")
+                .arg(QString::fromLatin1(contentLengthFieldName), QString::fromLatin1(contentLength));
+    }
+}
+
+void BaseMessage::parse(QBuffer *data, QString &parseError, BaseMessage &message)
+{
+    const qint64 startPos = data->pos();
+
+    if (message.isValid()) { // incomplete message from last parse
+        message.content.append(data->read(message.contentLength - message.content.length()));
+        return;
+    }
+
+    while (!data->atEnd()) {
+        const QByteArray &headerFieldLine = data->readLine();
+        if (headerFieldLine == headerSeparator) {
+            if (message.isValid())
+                message.content = data->read(message.contentLength);
+            return;
+        }
+        const QPair<QByteArray, QByteArray> nameAndValue = splitHeaderFieldLine(headerFieldLine);
+        const QByteArray &headerFieldName = nameAndValue.first.trimmed();
+        const QByteArray &headerFieldValue = nameAndValue.second.trimmed();
+
+        if (headerFieldName.isEmpty())
+            continue;
+        if (headerFieldName == contentLengthFieldName) {
+            parseContentLength(message, headerFieldValue, parseError);
+        } else if (headerFieldName == contentTypeFieldName) {
+            parseContentType(message, headerFieldValue, parseError);
+        } else {
+            qCWarning(parseLog) << "Unexpected header field" << QLatin1String(headerFieldName)
+                                  << "in" << QLatin1String(headerFieldLine);
+        }
+    }
+
+    // the complete header wasn't received jet, waiting for the rest of it and reparse
+    message = BaseMessage();
+    data->seek(startPos);
+}
+
+QTextCodec *BaseMessage::defaultCodec()
+{
+    static QTextCodec *codec = QTextCodec::codecForName(defaultCharset);
+    return codec;
+}
+
+bool BaseMessage::isComplete() const
+{
+    if (!isValid())
+        return false;
+    QBS_ASSERT(content.length() <= contentLength, return true);
+    return content.length() == contentLength;
+}
+
+bool BaseMessage::isValid() const
+{
+    return contentLength >= 0;
+}
+
+QByteArray BaseMessage::header() const
+{
+    QByteArray header;
+    header.append(lengthHeader());
+    if (codec != defaultCodec()
+            || (!mimeType.isEmpty() && mimeType != JsonRpcMessage::jsonRpcMimeType())) {
+        header.append(typeHeader());
+    }
+    header.append(headerSeparator);
+    return header;
+}
+
+QByteArray BaseMessage::lengthHeader() const
+{
+    return QByteArray(contentLengthFieldName)
+            + QByteArray(headerFieldSeparator)
+            + QString::number(content.size()).toLatin1()
+            + QByteArray(headerSeparator);
+}
+
+QByteArray BaseMessage::typeHeader() const
+{
+    return QByteArray(contentTypeFieldName)
+            + QByteArray(headerFieldSeparator)
+            + mimeType + "; " + contentCharsetName + "=" + codec->name()
+            + QByteArray(headerSeparator);
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/basemessage.h b/src/shared/lsp/basemessage.h
new file mode 100644
index 000000000..4c6f0cb48
--- /dev/null
+++ b/src/shared/lsp/basemessage.h
@@ -0,0 +1,48 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "languageserverprotocol_global.h"
+
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QLoggingCategory>
+
+QT_BEGIN_NAMESPACE
+class QBuffer;
+class QTextCodec;
+QT_END_NAMESPACE
+
+namespace lsp {
+
+LANGUAGESERVERPROTOCOL_EXPORT Q_DECLARE_LOGGING_CATEGORY(parseLog)
+
+class LANGUAGESERVERPROTOCOL_EXPORT BaseMessage
+{
+public:
+    BaseMessage();
+    BaseMessage(const QByteArray &mimeType, const QByteArray &content,
+                int expectedLength, QTextCodec *codec);
+    BaseMessage(const QByteArray &mimeType, const QByteArray &content);
+
+    bool operator==(const BaseMessage &other) const;
+
+    static void parse(QBuffer *data, QString &parseError, BaseMessage &message);
+    static QTextCodec *defaultCodec();
+
+    bool isComplete() const;
+    bool isValid() const;
+    QByteArray header() const;
+
+    QByteArray mimeType;
+    QByteArray content;
+    int contentLength = -1;
+    QTextCodec *codec = defaultCodec();
+
+private:
+    QByteArray lengthHeader() const;
+    QByteArray typeHeader() const;
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/callhierarchy.cpp b/src/shared/lsp/callhierarchy.cpp
new file mode 100644
index 000000000..af786fa95
--- /dev/null
+++ b/src/shared/lsp/callhierarchy.cpp
@@ -0,0 +1,28 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#include "callhierarchy.h"
+
+namespace lsp {
+
+bool CallHierarchyItem::isValid() const
+{
+    return contains(nameKey) && contains(symbolKindKey) && contains(rangeKey) && contains(uriKey)
+           && contains(selectionRangeKey);
+}
+
+PrepareCallHierarchyRequest::PrepareCallHierarchyRequest(const TextDocumentPositionParams &params)
+    : Request(methodName, params)
+{}
+
+CallHierarchyIncomingCallsRequest::CallHierarchyIncomingCallsRequest(
+    const CallHierarchyCallsParams &params)
+    : Request(methodName, params)
+{}
+
+CallHierarchyOutgoingCallsRequest::CallHierarchyOutgoingCallsRequest(
+    const CallHierarchyCallsParams &params)
+    : Request(methodName, params)
+{}
+
+} // namespace lsp
diff --git a/src/shared/lsp/callhierarchy.h b/src/shared/lsp/callhierarchy.h
new file mode 100644
index 000000000..3db1f08de
--- /dev/null
+++ b/src/shared/lsp/callhierarchy.h
@@ -0,0 +1,108 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT CallHierarchyItem : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString name() const { return typedValue<QString>(nameKey); }
+    void setName(const QString &name) { insert(nameKey, name); }
+
+    SymbolKind symbolKind() const { return SymbolKind(typedValue<int>(symbolKindKey)); }
+    void setSymbolKind(const SymbolKind &symbolKind) { insert(symbolKindKey, int(symbolKind)); }
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+    void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+    Range selectionRange() const { return typedValue<Range>(selectionRangeKey); }
+    void setSelectionRange(Range selectionRange) { insert(selectionRangeKey, selectionRange); }
+
+    std::optional<QString> detail() const { return optionalValue<QString>(detailKey); }
+    void setDetail(const QString &detail) { insert(detailKey, detail); }
+    void clearDetail() { remove(detailKey); }
+
+    std::optional<QList<DocumentSymbol>> children() const
+    { return optionalArray<DocumentSymbol>(childrenKey); }
+    void setChildren(const QList<DocumentSymbol> &children) { insertArray(childrenKey, children); }
+    void clearChildren() { remove(childrenKey); }
+
+    bool isValid() const override;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT PrepareCallHierarchyRequest : public Request<
+        LanguageClientArray<CallHierarchyItem>, std::nullptr_t, TextDocumentPositionParams>
+{
+public:
+    explicit PrepareCallHierarchyRequest(const TextDocumentPositionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/prepareCallHierarchy";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CallHierarchyCallsParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    CallHierarchyItem item() const { return typedValue<CallHierarchyItem>(itemKey); }
+    void setItem(const CallHierarchyItem &item) { insert(itemKey, item); }
+
+    bool isValid() const override { return contains(itemKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CallHierarchyIncomingCall : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    CallHierarchyItem from() const { return typedValue<CallHierarchyItem>(fromKey); }
+    void setFrom(const CallHierarchyItem &from) { insert(fromKey, from); }
+
+    QList<Range> fromRanges() const { return array<Range>(fromRangesKey); }
+    void setFromRanges(const QList<Range> &fromRanges) { insertArray(fromRangesKey, fromRanges); }
+
+    bool isValid() const override { return contains(fromRangesKey) && contains(fromRangesKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CallHierarchyIncomingCallsRequest : public Request<
+        LanguageClientArray<CallHierarchyIncomingCall>, std::nullptr_t, CallHierarchyCallsParams>
+{
+public:
+    explicit CallHierarchyIncomingCallsRequest(const CallHierarchyCallsParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "callHierarchy/incomingCalls";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CallHierarchyOutgoingCall : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    CallHierarchyItem to() const { return typedValue<CallHierarchyItem>(toKey); }
+    void setTo(const CallHierarchyItem &to) { insert(toKey, to); }
+
+    QList<Range> fromRanges() const { return array<Range>(fromRangesKey); }
+    void setFromRanges(const QList<Range> &fromRanges) { insertArray(fromRangesKey, fromRanges); }
+
+    bool isValid() const override { return contains(fromRangesKey) && contains(fromRangesKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CallHierarchyOutgoingCallsRequest : public Request<
+        LanguageClientArray<CallHierarchyOutgoingCall>, std::nullptr_t, CallHierarchyCallsParams>
+{
+public:
+    explicit CallHierarchyOutgoingCallsRequest(const CallHierarchyCallsParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "callHierarchy/outgoingCalls";
+};
+
+} // namespace lsp
diff --git a/src/shared/lsp/client.cpp b/src/shared/lsp/client.cpp
new file mode 100644
index 000000000..8479131a6
--- /dev/null
+++ b/src/shared/lsp/client.cpp
@@ -0,0 +1,17 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "client.h"
+
+namespace lsp {
+
+constexpr const char RegisterCapabilityRequest::methodName[];
+constexpr const char UnregisterCapabilityRequest::methodName[];
+
+RegisterCapabilityRequest::RegisterCapabilityRequest(const RegistrationParams &params)
+    : Request(methodName, params) { }
+
+UnregisterCapabilityRequest::UnregisterCapabilityRequest(const UnregistrationParams &params)
+    : UnregisterCapabilityRequest(methodName, params) { }
+
+} // namespace lsp
diff --git a/src/shared/lsp/client.h b/src/shared/lsp/client.h
new file mode 100644
index 000000000..29ebc5bc6
--- /dev/null
+++ b/src/shared/lsp/client.h
@@ -0,0 +1,94 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+
+namespace lsp {
+
+class Registration : public JsonObject
+{
+public:
+    Registration() : Registration(QString()) {}
+    explicit Registration(const QString &method)
+    {
+        setId(QUuid::createUuid().toString());
+        setMethod(method);
+    }
+    using JsonObject::JsonObject;
+
+    QString id() const { return typedValue<QString>(idKey); }
+    void setId(const QString &id) { insert(idKey, id); }
+
+    QString method() const { return typedValue<QString>(methodKey); }
+    void setMethod(const QString &method) { insert(methodKey, method); }
+
+    QJsonValue registerOptions() const { return value(registerOptionsKey); }
+    void setRegisterOptions(const QJsonValue &registerOptions)
+    { insert(registerOptionsKey, registerOptions); }
+
+    bool isValid() const override { return contains(idKey) && contains(methodKey); }
+};
+
+class RegistrationParams : public JsonObject
+{
+public:
+    RegistrationParams() : RegistrationParams(QList<Registration>()) {}
+    explicit RegistrationParams(const QList<Registration> &registrations)
+    { setRegistrations(registrations); }
+    using JsonObject::JsonObject;
+
+    QList<Registration> registrations() const { return array<Registration>(registrationsKey); }
+    void setRegistrations(const QList<Registration> &registrations)
+    { insertArray(registrationsKey, registrations); }
+
+    bool isValid() const override { return contains(registrationsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT RegisterCapabilityRequest : public Request<
+        std::nullptr_t, std::nullptr_t, RegistrationParams>
+{
+public:
+    explicit RegisterCapabilityRequest(const RegistrationParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "client/registerCapability";
+};
+
+class Unregistration : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString id() const { return typedValue<QString>(idKey); }
+    void setId(const QString &id) { insert(idKey, id); }
+
+    QString method() const { return typedValue<QString>(methodKey); }
+    void setMethod(const QString &method) { insert(methodKey, method); }
+
+    bool isValid() const override { return contains(idKey) && contains(methodKey); }
+};
+
+class UnregistrationParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QList<Unregistration> unregistrations() const
+    { return array<Unregistration>(unregistrationsKey); }
+    void setUnregistrations(const QList<Unregistration> &unregistrations)
+    { insertArray(unregistrationsKey, unregistrations); }
+
+    bool isValid() const override { return contains(unregistrationsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT UnregisterCapabilityRequest : public Request<
+        std::nullptr_t, std::nullptr_t, UnregistrationParams>
+{
+public:
+    explicit UnregisterCapabilityRequest(const UnregistrationParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "client/unregisterCapability";
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/clientcapabilities.cpp b/src/shared/lsp/clientcapabilities.cpp
new file mode 100644
index 000000000..34d9de9e7
--- /dev/null
+++ b/src/shared/lsp/clientcapabilities.cpp
@@ -0,0 +1,122 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "clientcapabilities.h"
+
+namespace lsp {
+
+std::optional<QList<SymbolKind>> SymbolCapabilities::SymbolKindCapabilities::valueSet() const
+{
+    if (std::optional<QList<int>> array = optionalArray<int>(valueSetKey)) {
+        return std::make_optional(
+            Utils::transform(*array, [](int value) { return static_cast<SymbolKind>(value); }));
+    }
+    return std::nullopt;
+}
+
+void SymbolCapabilities::SymbolKindCapabilities::setValueSet(const QList<SymbolKind> &valueSet)
+{
+    insert(valueSetKey, enumArrayToJsonArray<SymbolKind>(valueSet));
+}
+
+WorkspaceClientCapabilities::WorkspaceClientCapabilities()
+{
+    setWorkspaceFolders(true);
+}
+
+std::optional<std::variant<bool, QJsonObject>> SemanticTokensClientCapabilities::Requests::range()
+    const
+{
+    using RetType = std::variant<bool, QJsonObject>;
+    const QJsonValue &rangeOptions = value(rangeKey);
+    if (rangeOptions.isBool())
+        return RetType(rangeOptions.toBool());
+    if (rangeOptions.isObject())
+        return RetType(rangeOptions.toObject());
+    return std::nullopt;
+}
+
+void SemanticTokensClientCapabilities::Requests::setRange(
+    const std::variant<bool, QJsonObject> &range)
+{
+    insertVariant<bool, QJsonObject>(rangeKey, range);
+}
+
+std::optional<std::variant<bool, FullSemanticTokenOptions>>
+SemanticTokensClientCapabilities::Requests::full() const
+{
+    using RetType = std::variant<bool, FullSemanticTokenOptions>;
+    const QJsonValue &fullOptions = value(fullKey);
+    if (fullOptions.isBool())
+        return RetType(fullOptions.toBool());
+    if (fullOptions.isObject())
+        return RetType(FullSemanticTokenOptions(fullOptions.toObject()));
+    return std::nullopt;
+}
+
+void SemanticTokensClientCapabilities::Requests::setFull(
+    const std::variant<bool, FullSemanticTokenOptions> &full)
+{
+    insertVariant<bool, FullSemanticTokenOptions>(fullKey, full);
+}
+
+std::optional<SemanticTokensClientCapabilities> TextDocumentClientCapabilities::semanticTokens() const
+{
+    return optionalValue<SemanticTokensClientCapabilities>(semanticTokensKey);
+}
+
+void TextDocumentClientCapabilities::setSemanticTokens(
+    const SemanticTokensClientCapabilities &semanticTokens)
+{
+    insert(semanticTokensKey, semanticTokens);
+}
+
+bool SemanticTokensClientCapabilities::isValid() const
+{
+    return contains(requestsKey) && contains(tokenTypesKey) && contains(tokenModifiersKey)
+           && contains(formatsKey);
+}
+
+const char resourceOperationCreate[] = "create";
+const char resourceOperationRename[] = "rename";
+const char resourceOperationDelete[] = "delete";
+
+std::optional<QList<WorkspaceClientCapabilities::WorkspaceEditCapabilities::ResourceOperationKind>>
+WorkspaceClientCapabilities::WorkspaceEditCapabilities::resourceOperations() const
+{
+    if (!contains(resourceOperationsKey))
+        return std::nullopt;
+    QList<ResourceOperationKind> result;
+    for (const QJsonValue &value : this->value(resourceOperationsKey).toArray()) {
+        const QString str = value.toString();
+        if (str == resourceOperationCreate)
+            result << ResourceOperationKind::Create;
+        else if (str == resourceOperationRename)
+            result << ResourceOperationKind::Rename;
+        else if (str == resourceOperationDelete)
+            result << ResourceOperationKind::Delete;
+    }
+    return result;
+}
+
+void WorkspaceClientCapabilities::WorkspaceEditCapabilities::setResourceOperations(
+    const QList<ResourceOperationKind> &resourceOperations)
+{
+    QJsonArray array;
+    for (const auto &kind : resourceOperations) {
+        switch (kind) {
+        case ResourceOperationKind::Create:
+            array << resourceOperationCreate;
+            break;
+        case ResourceOperationKind::Rename:
+            array << resourceOperationRename;
+            break;
+        case ResourceOperationKind::Delete:
+            array << resourceOperationDelete;
+            break;
+        }
+    }
+    insert(resourceOperationsKey, array);
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/clientcapabilities.h b/src/shared/lsp/clientcapabilities.h
new file mode 100644
index 000000000..44add0a2c
--- /dev/null
+++ b/src/shared/lsp/clientcapabilities.h
@@ -0,0 +1,674 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonkeys.h"
+#include "lsptypes.h"
+#include "semantictokens.h"
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT DynamicRegistrationCapabilities : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    std::optional<bool> dynamicRegistration() const
+    {
+        return optionalValue<bool>(dynamicRegistrationKey);
+    }
+    void setDynamicRegistration(bool dynamicRegistration) { insert(dynamicRegistrationKey, dynamicRegistration); }
+    void clearDynamicRegistration() { remove(dynamicRegistrationKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT FullSemanticTokenOptions : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    /**
+      * The client will send the `textDocument/semanticTokens/full/delta`
+      * request if the server provides a corresponding handler.
+      */
+    std::optional<bool> delta() const { return optionalValue<bool>(deltaKey); }
+    void setDelta(bool delta) { insert(deltaKey, delta); }
+    void clearDelta() { remove(deltaKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensClientCapabilities : public DynamicRegistrationCapabilities
+{
+public:
+    using DynamicRegistrationCapabilities::DynamicRegistrationCapabilities;
+    class LANGUAGESERVERPROTOCOL_EXPORT Requests : public JsonObject
+    {
+        /**
+         * Which requests the client supports and might send to the server
+         * depending on the server's capability. Please note that clients might not
+         * show semantic tokens or degrade some of the user experience if a range
+         * or full request is advertised by the client but not provided by the
+         * server. If for example the client capability `requests.full` and
+         * `request.range` are both set to true but the server only provides a
+         * range provider the client might not render a minimap correctly or might
+         * even decide to not show any semantic tokens at all.
+         */
+    public:
+        using JsonObject::JsonObject;
+
+        /**
+         * The client will send the `textDocument/semanticTokens/range` request
+         * if the server provides a corresponding handler.
+         */
+        std::optional<std::variant<bool, QJsonObject>> range() const;
+        void setRange(const std::variant<bool, QJsonObject> &range);
+        void clearRange() { remove(rangeKey); }
+
+        /**
+         * The client will send the `textDocument/semanticTokens/full` request
+         * if the server provides a corresponding handler.
+         */
+        std::optional<std::variant<bool, FullSemanticTokenOptions>> full() const;
+        void setFull(const std::variant<bool, FullSemanticTokenOptions> &full);
+        void clearFull() { remove(fullKey); }
+    };
+
+    Requests requests() const { return typedValue<Requests>(requestsKey); }
+    void setRequests(const Requests &requests) { insert(requestsKey, requests); }
+
+    /// The token types that the client supports.
+    QList<QString> tokenTypes() const { return array<QString>(tokenTypesKey); }
+    void setTokenTypes(const QList<QString> &value) { insertArray(tokenTypesKey, value); }
+
+    /// The token modifiers that the client supports.
+    QList<QString> tokenModifiers() const { return array<QString>(tokenModifiersKey); }
+    void setTokenModifiers(const QList<QString> &value) { insertArray(tokenModifiersKey, value); }
+
+    /// The formats the clients supports.
+    QList<QString> formats() const { return array<QString>(formatsKey); }
+    void setFormats(const QList<QString> &value) { insertArray(formatsKey, value); }
+
+    /// Whether the client supports tokens that can overlap each other.
+    std::optional<bool> overlappingTokenSupport() const
+    {
+        return optionalValue<bool>(overlappingTokenSupportKey);
+    }
+    void setOverlappingTokenSupport(bool overlappingTokenSupport) { insert(overlappingTokenSupportKey, overlappingTokenSupport); }
+    void clearOverlappingTokenSupport() { remove(overlappingTokenSupportKey); }
+
+    /// Whether the client supports tokens that can span multiple lines.
+    std::optional<bool> multiLineTokenSupport() const
+    {
+        return optionalValue<bool>(multiLineTokenSupportKey);
+    }
+    void setMultiLineTokenSupport(bool multiLineTokenSupport) { insert(multiLineTokenSupportKey, multiLineTokenSupport); }
+    void clearMultiLineTokenSupport() { remove(multiLineTokenSupportKey); }
+
+    bool isValid() const override;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SymbolCapabilities : public DynamicRegistrationCapabilities
+{
+public:
+    using DynamicRegistrationCapabilities::DynamicRegistrationCapabilities;
+
+    class LANGUAGESERVERPROTOCOL_EXPORT SymbolKindCapabilities : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        /*
+         * The symbol kind values the client supports. When this
+         * property exists the client also guarantees that it will
+         * handle values outside its set gracefully and falls back
+         * to a default value when unknown.
+         *
+         * If this property is not present the client only supports
+         * the symbol kinds from `File` to `Array` as defined in
+         * the initial version of the protocol.
+         */
+        std::optional<QList<SymbolKind>> valueSet() const;
+        void setValueSet(const QList<SymbolKind> &valueSet);
+        void clearValueSet() { remove(valueSetKey); }
+    };
+
+    // Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
+    std::optional<SymbolKindCapabilities> symbolKind() const
+    { return optionalValue<SymbolKindCapabilities>(symbolKindKey); }
+    void setSymbolKind(const SymbolKindCapabilities &symbolKind) { insert(symbolKindKey, symbolKind); }
+    void clearSymbolKind() { remove(symbolKindKey); }
+
+    std::optional<bool> hierarchicalDocumentSymbolSupport() const
+    { return optionalValue<bool>(hierarchicalDocumentSymbolSupportKey); }
+    void setHierarchicalDocumentSymbolSupport(bool hierarchicalDocumentSymbolSupport)
+    { insert(hierarchicalDocumentSymbolSupportKey, hierarchicalDocumentSymbolSupport); }
+    void clearHierachicalDocumentSymbolSupport() { remove(hierarchicalDocumentSymbolSupportKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentClientCapabilities : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    class LANGUAGESERVERPROTOCOL_EXPORT SynchronizationCapabilities : public DynamicRegistrationCapabilities
+    {
+    public:
+        using DynamicRegistrationCapabilities::DynamicRegistrationCapabilities;
+
+        // The client supports sending will save notifications.
+        std::optional<bool> willSave() const { return optionalValue<bool>(willSaveKey); }
+        void setWillSave(bool willSave) { insert(willSaveKey, willSave); }
+        void clearWillSave() { remove(willSaveKey); }
+
+        /*
+         * The client supports sending a will save request and
+         * waits for a response providing text edits which will
+         * be applied to the document before it is saved.
+         */
+        std::optional<bool> willSaveWaitUntil() const
+        { return optionalValue<bool>(willSaveWaitUntilKey); }
+        void setWillSaveWaitUntil(bool willSaveWaitUntil)
+        { insert(willSaveWaitUntilKey, willSaveWaitUntil); }
+        void clearWillSaveWaitUntil() { remove(willSaveWaitUntilKey); }
+
+        // The client supports did save notifications.
+        std::optional<bool> didSave() const { return optionalValue<bool>(didSaveKey); }
+        void setDidSave(bool didSave) { insert(didSaveKey, didSave); }
+        void clearDidSave() { remove(didSaveKey); }
+    };
+
+    std::optional<SynchronizationCapabilities> synchronization() const
+    { return optionalValue<SynchronizationCapabilities>(synchronizationKey); }
+    void setSynchronization(const SynchronizationCapabilities &synchronization)
+    { insert(synchronizationKey, synchronization); }
+    void clearSynchronization() { remove(synchronizationKey); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT CompletionCapabilities : public DynamicRegistrationCapabilities
+    {
+    public:
+        using DynamicRegistrationCapabilities::DynamicRegistrationCapabilities;
+
+        class LANGUAGESERVERPROTOCOL_EXPORT CompletionItemCapbilities : public JsonObject
+        {
+        public:
+            using JsonObject::JsonObject;
+
+            /*
+             * Client supports snippets as insert text.
+             *
+             * A snippet can define tab stops and placeholders with `$1`, `$2`
+             * and `${3:foo}`. `$0` defines the final tab stop, it defaults to
+             * the end of the snippet. Placeholders with equal identifiers are linked,
+             * that is typing in one will update others too.
+             */
+            std::optional<bool> snippetSupport() const
+            { return optionalValue<bool>(snippetSupportKey); }
+            void setSnippetSupport(bool snippetSupport)
+            { insert(snippetSupportKey, snippetSupport); }
+            void clearSnippetSupport() { remove(snippetSupportKey); }
+
+            // Client supports commit characters on a completion item.
+            std::optional<bool> commitCharacterSupport() const
+            { return optionalValue<bool>(commitCharacterSupportKey); }
+            void setCommitCharacterSupport(bool commitCharacterSupport)
+            { insert(commitCharacterSupportKey, commitCharacterSupport); }
+            void clearCommitCharacterSupport() { remove(commitCharacterSupportKey); }
+
+            /*
+             * Client supports the follow content formats for the documentation
+             * property. The order describes the preferred format of the client.
+             */
+            std::optional<QList<MarkupKind>> documentationFormat() const;
+            void setDocumentationFormat(const QList<MarkupKind> &documentationFormat);
+            void clearDocumentationFormat() { remove(documentationFormatKey); }
+        };
+
+        // The client supports the following `CompletionItem` specific capabilities.
+        std::optional<CompletionItemCapbilities> completionItem() const
+        { return optionalValue<CompletionItemCapbilities>(completionItemKey); }
+        void setCompletionItem(const CompletionItemCapbilities &completionItem)
+        { insert(completionItemKey, completionItem); }
+        void clearCompletionItem() { remove(completionItemKey); }
+
+        class LANGUAGESERVERPROTOCOL_EXPORT CompletionItemKindCapabilities : public JsonObject
+        {
+        public:
+            CompletionItemKindCapabilities();
+            using JsonObject::JsonObject;
+            /*
+             * The completion item kind values the client supports. When this
+             * property exists the client also guarantees that it will
+             * handle values outside its set gracefully and falls back
+             * to a default value when unknown.
+             *
+             * If this property is not present the client only supports
+             * the completion items kinds from `Text` to `Reference` as defined in
+             * the initial version of the protocol.
+             */
+            std::optional<QList<CompletionItemKind::Kind>> valueSet() const;
+            void setValueSet(const QList<CompletionItemKind::Kind> &valueSet);
+            void clearValueSet() { remove(valueSetKey); }
+        };
+
+        std::optional<CompletionItemKindCapabilities> completionItemKind() const
+        { return optionalValue<CompletionItemKindCapabilities>(completionItemKindKey); }
+        void setCompletionItemKind(const CompletionItemKindCapabilities &completionItemKind)
+        { insert(completionItemKindKey, completionItemKind); }
+        void clearCompletionItemKind() { remove(completionItemKindKey); }
+
+        /*
+         * The client supports to send additional context information for a
+         * `textDocument/completion` request.
+         */
+        std::optional<bool> contextSupport() const
+        {
+            return optionalValue<bool>(contextSupportKey);
+        }
+        void setContextSupport(bool contextSupport) { insert(contextSupportKey, contextSupport); }
+        void clearContextSupport() { remove(contextSupportKey); }
+    };
+
+    // Capabilities specific to the `textDocument/completion`
+    std::optional<CompletionCapabilities> completion() const
+    { return optionalValue<CompletionCapabilities>(completionKey); }
+    void setCompletion(const CompletionCapabilities &completion)
+    { insert(completionKey, completion); }
+    void clearCompletion() { remove(completionKey); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT HoverCapabilities : public DynamicRegistrationCapabilities
+    {
+    public:
+        using DynamicRegistrationCapabilities::DynamicRegistrationCapabilities;
+        /*
+         * Client supports the follow content formats for the content
+         * property. The order describes the preferred format of the client.
+         */
+        std::optional<QList<MarkupKind>> contentFormat() const;
+        void setContentFormat(const QList<MarkupKind> &contentFormat);
+        void clearContentFormat() { remove(contentFormatKey); }
+    };
+
+    std::optional<HoverCapabilities> hover() const
+    {
+        return optionalValue<HoverCapabilities>(hoverKey);
+    }
+    void setHover(const HoverCapabilities &hover) { insert(hoverKey, hover); }
+    void clearHover() { remove(hoverKey); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT SignatureHelpCapabilities : public DynamicRegistrationCapabilities
+    {
+    public:
+        using DynamicRegistrationCapabilities::DynamicRegistrationCapabilities;
+
+        class LANGUAGESERVERPROTOCOL_EXPORT SignatureInformationCapabilities : public JsonObject
+        {
+        public:
+            using JsonObject::JsonObject;
+            /*
+             * Client supports the follow content formats for the documentation
+             * property. The order describes the preferred format of the client.
+             */
+            std::optional<QList<MarkupKind>> documentationFormat() const;
+            void setDocumentationFormat(const QList<MarkupKind> &documentationFormat);
+            void clearDocumentationFormat() { remove(documentationFormatKey); }
+
+            std::optional<bool> activeParameterSupport() const
+            { return optionalValue<bool>(activeParameterSupportKey); }
+            void setActiveParameterSupport(bool activeParameterSupport)
+            { insert(activeParameterSupportKey, activeParameterSupport); }
+            void clearActiveParameterSupport() { remove(activeParameterSupportKey); }
+        };
+
+        // The client supports the following `SignatureInformation` specific properties.
+        std::optional<SignatureInformationCapabilities> signatureInformation() const
+        { return optionalValue<SignatureInformationCapabilities>(signatureInformationKey); }
+        void setSignatureInformation(const SignatureInformationCapabilities &signatureInformation)
+        { insert(signatureInformationKey, signatureInformation); }
+        void clearSignatureInformation() { remove(signatureInformationKey); }
+    };
+
+    // Capabilities specific to the `textDocument/signatureHelp`
+    std::optional<SignatureHelpCapabilities> signatureHelp() const
+    { return optionalValue<SignatureHelpCapabilities>(signatureHelpKey); }
+    void setSignatureHelp(const SignatureHelpCapabilities &signatureHelp)
+    { insert(signatureHelpKey, signatureHelp); }
+    void clearSignatureHelp() { remove(signatureHelpKey); }
+
+    // Whether references supports dynamic registration.
+    std::optional<DynamicRegistrationCapabilities> references() const
+    { return optionalValue<DynamicRegistrationCapabilities>(referencesKey); }
+    void setReferences(const DynamicRegistrationCapabilities &references)
+    { insert(referencesKey, references); }
+    void clearReferences() { remove(referencesKey); }
+
+    // Whether document highlight supports dynamic registration.
+    std::optional<DynamicRegistrationCapabilities> documentHighlight() const
+    { return optionalValue<DynamicRegistrationCapabilities>(documentHighlightKey); }
+    void setDocumentHighlight(const DynamicRegistrationCapabilities &documentHighlight)
+    { insert(documentHighlightKey, documentHighlight); }
+    void clearDocumentHighlight() { remove(documentHighlightKey); }
+
+    // Capabilities specific to the `textDocument/documentSymbol`
+    std::optional<SymbolCapabilities> documentSymbol() const
+    { return optionalValue<SymbolCapabilities>(documentSymbolKey); }
+    void setDocumentSymbol(const SymbolCapabilities &documentSymbol)
+    { insert(documentSymbolKey, documentSymbol); }
+    void clearDocumentSymbol() { remove(documentSymbolKey); }
+
+    // Whether formatting supports dynamic registration.
+    std::optional<DynamicRegistrationCapabilities> formatting() const
+    { return optionalValue<DynamicRegistrationCapabilities>(formattingKey); }
+    void setFormatting(const DynamicRegistrationCapabilities &formatting)
+    { insert(formattingKey, formatting); }
+    void clearFormatting() { remove(formattingKey); }
+
+    // Whether range formatting supports dynamic registration.
+    std::optional<DynamicRegistrationCapabilities> rangeFormatting() const
+    { return optionalValue<DynamicRegistrationCapabilities>(rangeFormattingKey); }
+    void setRangeFormatting(const DynamicRegistrationCapabilities &rangeFormatting)
+    { insert(rangeFormattingKey, rangeFormatting); }
+    void clearRangeFormatting() { remove(rangeFormattingKey); }
+
+    // Whether on type formatting supports dynamic registration.
+    std::optional<DynamicRegistrationCapabilities> onTypeFormatting() const
+    { return optionalValue<DynamicRegistrationCapabilities>(onTypeFormattingKey); }
+    void setOnTypeFormatting(const DynamicRegistrationCapabilities &onTypeFormatting)
+    { insert(onTypeFormattingKey, onTypeFormatting); }
+    void clearOnTypeFormatting() { remove(onTypeFormattingKey); }
+
+    // Whether definition supports dynamic registration.
+    std::optional<DynamicRegistrationCapabilities> definition() const
+    { return optionalValue<DynamicRegistrationCapabilities>(definitionKey); }
+    void setDefinition(const DynamicRegistrationCapabilities &definition)
+    { insert(definitionKey, definition); }
+    void clearDefinition() { remove(definitionKey); }
+
+    /*
+     * Whether typeDefinition supports dynamic registration. If this is set to `true`
+     * the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+     * return value for the corresponding server capability as well.
+     */
+    std::optional<DynamicRegistrationCapabilities> typeDefinition() const
+    { return optionalValue<DynamicRegistrationCapabilities>(typeDefinitionKey); }
+    void setTypeDefinition(const DynamicRegistrationCapabilities &typeDefinition)
+    { insert(typeDefinitionKey, typeDefinition); }
+    void clearTypeDefinition() { remove(typeDefinitionKey); }
+
+    /*
+     * Whether implementation supports dynamic registration. If this is set to `true`
+     * the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+     * return value for the corresponding server capability as well.
+     */
+    std::optional<DynamicRegistrationCapabilities> implementation() const
+    { return optionalValue<DynamicRegistrationCapabilities>(implementationKey); }
+    void setImplementation(const DynamicRegistrationCapabilities &implementation)
+    { insert(implementationKey, implementation); }
+    void clearImplementation() { remove(implementationKey); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT CodeActionCapabilities : public DynamicRegistrationCapabilities
+    {
+    public:
+        using DynamicRegistrationCapabilities::DynamicRegistrationCapabilities;
+
+        class LANGUAGESERVERPROTOCOL_EXPORT CodeActionLiteralSupport : public JsonObject
+        {
+        public:
+            using JsonObject::JsonObject;
+
+            class LANGUAGESERVERPROTOCOL_EXPORT CodeActionKind : public JsonObject
+            {
+            public:
+                using JsonObject::JsonObject;
+                CodeActionKind() : CodeActionKind(QList<QString>()) {}
+                explicit CodeActionKind(const QList<QString> &kinds) { setValueSet(kinds); }
+
+                QList<QString> valueSet() const { return array<QString>(valueSetKey); }
+                void setValueSet(const QList<QString> &valueSet)
+                { insertArray(valueSetKey, valueSet); }
+
+                bool isValid() const override { return contains(valueSetKey); }
+            };
+
+            CodeActionKind codeActionKind() const
+            { return typedValue<CodeActionKind>(codeActionKindKey); }
+            void setCodeActionKind(const CodeActionKind &codeActionKind)
+            { insert(codeActionKindKey, codeActionKind); }
+
+            bool isValid() const override { return contains(codeActionKindKey); }
+        };
+
+        std::optional<CodeActionLiteralSupport> codeActionLiteralSupport() const
+        { return optionalValue<CodeActionLiteralSupport>(codeActionLiteralSupportKey); }
+        void setCodeActionLiteralSupport(const CodeActionLiteralSupport &codeActionLiteralSupport)
+        { insert(codeActionLiteralSupportKey, codeActionLiteralSupport); }
+        void clearCodeActionLiteralSupport() { remove(codeActionLiteralSupportKey); }
+    };
+
+    // Whether code action supports dynamic registration.
+    std::optional<CodeActionCapabilities> codeAction() const
+    { return optionalValue<CodeActionCapabilities>(codeActionKey); }
+    void setCodeAction(const CodeActionCapabilities &codeAction)
+    { insert(codeActionKey, codeAction); }
+    void clearCodeAction() { remove(codeActionKey); }
+
+    // Whether code lens supports dynamic registration.
+    std::optional<DynamicRegistrationCapabilities> codeLens() const
+    { return optionalValue<DynamicRegistrationCapabilities>(codeLensKey); }
+    void setCodeLens(const DynamicRegistrationCapabilities &codeLens)
+    { insert(codeLensKey, codeLens); }
+    void clearCodeLens() { remove(codeLensKey); }
+
+    // Whether document link supports dynamic registration.
+    std::optional<DynamicRegistrationCapabilities> documentLink() const
+    { return optionalValue<DynamicRegistrationCapabilities>(documentLinkKey); }
+    void setDocumentLink(const DynamicRegistrationCapabilities &documentLink)
+    { insert(documentLinkKey, documentLink); }
+    void clearDocumentLink() { remove(documentLinkKey); }
+
+    /*
+     * Whether colorProvider supports dynamic registration. If this is set to `true`
+     * the client supports the new `(ColorProviderOptions & TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+     * return value for the corresponding server capability as well.
+     */
+    std::optional<DynamicRegistrationCapabilities> colorProvider() const
+    { return optionalValue<DynamicRegistrationCapabilities>(colorProviderKey); }
+    void setColorProvider(const DynamicRegistrationCapabilities &colorProvider)
+    { insert(colorProviderKey, colorProvider); }
+    void clearColorProvider() { remove(colorProviderKey); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT RenameClientCapabilities : public DynamicRegistrationCapabilities
+    {
+    public:
+        using DynamicRegistrationCapabilities::DynamicRegistrationCapabilities;
+        /**
+         * Client supports testing for validity of rename operations
+         * before execution.
+         *
+         * @since version 3.12.0
+         */
+
+        std::optional<bool> prepareSupport() const
+        {
+            return optionalValue<bool>(prepareSupportKey);
+        }
+        void setPrepareSupport(bool prepareSupport) { insert(prepareSupportKey, prepareSupport); }
+        void clearPrepareSupport() { remove(prepareSupportKey); }
+    };
+
+    // Whether rename supports dynamic registration.
+    std::optional<RenameClientCapabilities> rename() const
+    { return optionalValue<RenameClientCapabilities>(renameKey); }
+    void setRename(const RenameClientCapabilities &rename)
+    { insert(renameKey, rename); }
+    void clearRename() { remove(renameKey); }
+
+    std::optional<SemanticTokensClientCapabilities> semanticTokens() const;
+    void setSemanticTokens(const SemanticTokensClientCapabilities &semanticTokens);
+    void clearSemanticTokens() { remove(semanticTokensKey); }
+
+    std::optional<DynamicRegistrationCapabilities> callHierarchy() const
+    { return optionalValue<DynamicRegistrationCapabilities>(callHierarchyKey); }
+    void setCallHierarchy(const DynamicRegistrationCapabilities &callHierarchy)
+    { insert(callHierarchyKey, callHierarchy); }
+    void clearCallHierarchy() { remove(callHierarchyKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensWorkspaceClientCapabilities : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+    /**
+     * Whether the client implementation supports a refresh request sent from
+     * the server to the client.
+     *
+     * Note that this event is global and will force the client to refresh all
+     * semantic tokens currently shown. It should be used with absolute care
+     * and is useful for situation where a server for example detect a project
+     * wide change that requires such a calculation.
+     */
+    std::optional<bool> refreshSupport() const { return optionalValue<bool>(refreshSupportKey); }
+    void setRefreshSupport(bool refreshSupport) { insert(refreshSupportKey, refreshSupport); }
+    void clearRefreshSupport() { remove(refreshSupportKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkspaceClientCapabilities : public JsonObject
+{
+public:
+    WorkspaceClientCapabilities();
+    using JsonObject::JsonObject;
+
+    /*
+     * The client supports applying batch edits to the workspace by supporting the request
+     * 'workspace/applyEdit'
+     */
+    std::optional<bool> applyEdit() const { return optionalValue<bool>(applyEditKey); }
+    void setApplyEdit(bool applyEdit) { insert(applyEditKey, applyEdit); }
+    void clearApplyEdit() { remove(applyEditKey); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT WorkspaceEditCapabilities : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        // The client supports versioned document changes in `WorkspaceEdit`s
+        std::optional<bool> documentChanges() const
+        { return optionalValue<bool>(documentChangesKey); }
+        void setDocumentChanges(bool documentChanges)
+        { insert(documentChangesKey, documentChanges); }
+        void clearDocumentChanges() { remove(documentChangesKey); }
+
+        enum class ResourceOperationKind { Create, Rename, Delete };
+
+        // The resource operations the client supports. Clients should at least support 'create',
+        // 'rename' and 'delete' files and folders.
+        std::optional<QList<ResourceOperationKind>> resourceOperations() const;
+        void setResourceOperations(const QList<ResourceOperationKind> &resourceOperations);
+        void clearResourceOperations() { remove(resourceOperationsKey); }
+    };
+
+    // Capabilities specific to `WorkspaceEdit`s
+    std::optional<WorkspaceEditCapabilities> workspaceEdit() const
+    { return optionalValue<WorkspaceEditCapabilities>(workspaceEditKey); }
+    void setWorkspaceEdit(const WorkspaceEditCapabilities &workspaceEdit)
+    { insert(workspaceEditKey, workspaceEdit); }
+    void clearWorkspaceEdit() { remove(workspaceEditKey); }
+
+    // Capabilities specific to the `workspace/didChangeConfiguration` notification.
+    std::optional<DynamicRegistrationCapabilities> didChangeConfiguration() const
+    { return optionalValue<DynamicRegistrationCapabilities>(didChangeConfigurationKey); }
+    void setDidChangeConfiguration(const DynamicRegistrationCapabilities &didChangeConfiguration)
+    { insert(didChangeConfigurationKey, didChangeConfiguration); }
+    void clearDidChangeConfiguration() { remove(didChangeConfigurationKey); }
+
+    // Capabilities specific to the `workspace/didChangeWatchedFiles` notification.
+    std::optional<DynamicRegistrationCapabilities> didChangeWatchedFiles() const
+    { return optionalValue<DynamicRegistrationCapabilities>(didChangeWatchedFilesKey); }
+    void setDidChangeWatchedFiles(const DynamicRegistrationCapabilities &didChangeWatchedFiles)
+    { insert(didChangeWatchedFilesKey, didChangeWatchedFiles); }
+    void clearDidChangeWatchedFiles() { remove(didChangeWatchedFilesKey); }
+
+    // Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
+    std::optional<SymbolCapabilities> symbol() const
+    { return optionalValue<SymbolCapabilities>(symbolKey); }
+    void setSymbol(const SymbolCapabilities &symbol) { insert(symbolKey, symbol); }
+    void clearSymbol() { remove(symbolKey); }
+
+    // Capabilities specific to the `workspace/executeCommand` request.
+    std::optional<DynamicRegistrationCapabilities> executeCommand() const
+    { return optionalValue<DynamicRegistrationCapabilities>(executeCommandKey); }
+    void setExecuteCommand(const DynamicRegistrationCapabilities &executeCommand)
+    { insert(executeCommandKey, executeCommand); }
+    void clearExecuteCommand() { remove(executeCommandKey); }
+
+    // The client has support for workspace folders. Since 3.6.0
+    std::optional<bool> workspaceFolders() const
+    { return optionalValue<bool>(workspaceFoldersKey); }
+    void setWorkspaceFolders(bool workspaceFolders)
+    { insert(workspaceFoldersKey, workspaceFolders); }
+    void clearWorkspaceFolders() { remove(workspaceFoldersKey); }
+
+    // The client supports `workspace/configuration` requests. Since 3.6.0
+    std::optional<bool> configuration() const { return optionalValue<bool>(configurationKey); }
+    void setConfiguration(bool configuration) { insert(configurationKey, configuration); }
+    void clearConfiguration() { remove(configurationKey); }
+
+    std::optional<SemanticTokensWorkspaceClientCapabilities> semanticTokens() const
+    { return optionalValue<SemanticTokensWorkspaceClientCapabilities>(semanticTokensKey); }
+    void setSemanticTokens(const SemanticTokensWorkspaceClientCapabilities &semanticTokens)
+    { insert(semanticTokensKey, semanticTokens); }
+    void clearSemanticTokens() { remove(semanticTokensKey); }
+};
+
+class WindowClientClientCapabilities : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    /**
+      * Whether client supports handling progress notifications.
+      * If set, servers are allowed to report in `workDoneProgress` property
+      * in the request specific server capabilities.
+      *
+      */
+    std::optional<bool> workDoneProgress() const
+    { return optionalValue<bool>(workDoneProgressKey); }
+    void setWorkDoneProgress(bool workDoneProgress)
+    { insert(workDoneProgressKey, workDoneProgress); }
+    void clearWorkDoneProgress() { remove(workDoneProgressKey); }
+
+private:
+    constexpr static const char workDoneProgressKey[] = "workDoneProgress";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ClientCapabilities : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // Workspace specific client capabilities.
+    std::optional<WorkspaceClientCapabilities> workspace() const
+    { return optionalValue<WorkspaceClientCapabilities>(workspaceKey); }
+    void setWorkspace(const WorkspaceClientCapabilities &workspace)
+    { insert(workspaceKey, workspace); }
+    void clearWorkspace() { remove(workspaceKey); }
+
+    // Text document specific client capabilities.
+    std::optional<TextDocumentClientCapabilities> textDocument() const
+    { return optionalValue<TextDocumentClientCapabilities>(textDocumentKey); }
+    void setTextDocument(const TextDocumentClientCapabilities &textDocument)
+    { insert(textDocumentKey, textDocument); }
+    void clearTextDocument() { remove(textDocumentKey); }
+
+    // Window specific client capabilities.
+    std::optional<WindowClientClientCapabilities> window() const
+    { return optionalValue<WindowClientClientCapabilities>(windowKey); }
+    void setWindow(const WindowClientClientCapabilities &window)
+    { insert(windowKey, window); }
+    void clearWindow() { remove(windowKey); }
+
+    // Experimental client capabilities.
+    QJsonValue experimental() const { return value(experimentalKey); }
+    void setExperimental(const QJsonValue &experimental) { insert(experimentalKey, experimental); }
+    void clearExperimental() { remove(experimentalKey); }
+};
+
+} // namespace lsp
diff --git a/src/shared/lsp/completion.cpp b/src/shared/lsp/completion.cpp
new file mode 100644
index 000000000..48a2ac868
--- /dev/null
+++ b/src/shared/lsp/completion.cpp
@@ -0,0 +1,59 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "completion.h"
+
+namespace lsp {
+
+constexpr const char CompletionRequest::methodName[];
+constexpr const char CompletionItemResolveRequest::methodName[];
+
+CompletionRequest::CompletionRequest(const CompletionParams &params)
+    : Request(methodName, params)
+{ }
+
+std::optional<MarkupOrString> CompletionItem::documentation() const
+{
+    QJsonValue documentation = value(documentationKey);
+    if (documentation.isUndefined())
+        return std::nullopt;
+    return MarkupOrString(documentation);
+}
+
+std::optional<CompletionItem::InsertTextFormat> CompletionItem::insertTextFormat() const
+{
+    if (std::optional<int> value = optionalValue<int>(insertTextFormatKey))
+        return std::make_optional(CompletionItem::InsertTextFormat(*value));
+    return std::nullopt;
+}
+
+std::optional<QList<CompletionItem::CompletionItemTag>> CompletionItem::tags() const
+{
+    if (const auto value = optionalValue<QJsonArray>(tagsKey)) {
+        QList<CompletionItemTag> tags;
+        for (auto it = value->cbegin(); it != value->cend(); ++it)
+            tags << static_cast<CompletionItemTag>(it->toInt());
+        return tags;
+    }
+    return {};
+}
+
+CompletionItemResolveRequest::CompletionItemResolveRequest(const CompletionItem &params)
+    : Request(methodName, params)
+{ }
+
+CompletionResult::CompletionResult(const QJsonValue &value)
+{
+    if (value.isNull()) {
+        emplace<std::nullptr_t>(nullptr);
+    } else if (value.isArray()) {
+        QList<CompletionItem> items;
+        for (auto arrayElement : value.toArray())
+            items << CompletionItem(arrayElement);
+        emplace<QList<CompletionItem>>(items);
+    } else if (value.isObject()) {
+        emplace<CompletionList>(CompletionList(value));
+    }
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/completion.h b/src/shared/lsp/completion.h
new file mode 100644
index 000000000..665b5a5ae
--- /dev/null
+++ b/src/shared/lsp/completion.h
@@ -0,0 +1,269 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+#include "languagefeatures.h"
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT CompletionParams : public TextDocumentPositionParams
+{
+public:
+    using TextDocumentPositionParams::TextDocumentPositionParams;
+
+    enum CompletionTriggerKind {
+        /**
+         * Completion was triggered by typing an identifier (24x7 code
+         * complete), manual invocation (e.g Ctrl+Space) or via API.
+         */
+        Invoked = 1,
+        /**
+         * Completion was triggered by a trigger character specified by
+         * the `triggerCharacters` properties of the `CompletionRegistrationOptions`.
+         */
+        TriggerCharacter = 2,
+        /// Completion was re-triggered as the current completion list is incomplete.
+        TriggerForIncompleteCompletions = 3
+    };
+
+    class CompletionContext : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        /// How the completion was triggered.
+        CompletionTriggerKind triggerKind() const
+        { return CompletionTriggerKind(typedValue<int>(triggerKindKey)); }
+        void setTriggerKind(CompletionTriggerKind triggerKind)
+        { insert(triggerKindKey, triggerKind); }
+
+        /**
+         * The trigger character (a single character) that has trigger code complete.
+         * Is undefined if `triggerKind !== CompletionTriggerKind.TriggerCharacter`
+         */
+        std::optional<QString> triggerCharacter() const
+        { return optionalValue<QString>(triggerCharacterKey); }
+        void setTriggerCharacter(const QString &triggerCharacter)
+        { insert(triggerCharacterKey, triggerCharacter); }
+        void clearTriggerCharacter() { remove(triggerCharacterKey); }
+
+        bool isValid() const override { return contains(triggerKindKey); }
+    };
+
+    /**
+     * The completion context. This is only available it the client specifies
+     * to send this using `ClientCapabilities.textDocument.completion.contextSupport === true`
+     */
+    std::optional<CompletionContext> context() const
+    { return optionalValue<CompletionContext>(contextKey); }
+    void setContext(const CompletionContext &context)
+    { insert(contextKey, context); }
+    void clearContext() { remove(contextKey); }
+
+    // clangd extension
+    void setLimit(int limit) { insert(limitKey, limit); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CompletionItem : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    /**
+     * The label of this completion item. By default also the text that is inserted when selecting
+     * this completion.
+     */
+    QString label() const { return typedValue<QString>(labelKey); }
+    void setLabel(const QString &label) { insert(labelKey, label); }
+
+    /// The kind of this completion item. Based of the kind an icon is chosen by the editor.
+    std::optional<int> kind() const { return optionalValue<int>(kindKey); }
+    void setKind(int kind) { insert(kindKey, kind); }
+    void clearKind() { remove(kindKey); }
+
+    /// A human-readable string with additional information about this item, like type information.
+    std::optional<QString> detail() const { return optionalValue<QString>(detailKey); }
+    void setDetail(const QString &detail) { insert(detailKey, detail); }
+    void clearDetail() { remove(detailKey); }
+
+    /// A human-readable string that represents a doc-comment.
+    std::optional<MarkupOrString> documentation() const;
+    void setDocumentation(const MarkupOrString &documentation)
+    { insert(documentationKey, documentation.toJson()); }
+    void cleatDocumentation() { remove(documentationKey); }
+
+    /// A string that should be used when comparing this item
+    /// with other items. When `falsy` the label is used.
+    std::optional<QString> sortText() const { return optionalValue<QString>(sortTextKey); }
+    void setSortText(const QString &sortText) { insert(sortTextKey, sortText); }
+    void clearSortText() { remove(sortTextKey); }
+
+    /// A string that should be used when filtering a set of
+    /// completion items. When `falsy` the label is used.
+    std::optional<QString> filterText() const { return optionalValue<QString>(filterTextKey); }
+    void setFilterText(const QString &filterText) { insert(filterTextKey, filterText); }
+    void clearFilterText() { remove(filterTextKey); }
+
+    /**
+     * A string that should be inserted into a document when selecting
+     * this completion. When `falsy` the label is used.
+     *
+     * The `insertText` is subject to interpretation by the client side.
+     * Some tools might not take the string literally. For example
+     * VS Code when code complete is requested in this example `con<cursor position>`
+     * and a completion item with an `insertText` of `console` is provided it
+     * will only insert `sole`. Therefore it is recommended to use `textEdit` instead
+     * since it avoids additional client side interpretation.
+     *
+     * @deprecated Use textEdit instead.
+     */
+    std::optional<QString> insertText() const { return optionalValue<QString>(insertTextKey); }
+    void setInsertText(const QString &insertText) { insert(insertTextKey, insertText); }
+    void clearInsertText() { remove(insertTextKey); }
+
+    enum InsertTextFormat {
+        /// The primary text to be inserted is treated as a plain string.
+        PlainText = 1,
+
+        /**
+          * The primary text to be inserted is treated as a snippet.
+          *
+          * A snippet can define tab stops and placeholders with `$1`, `$2`
+          * and `${3:foo}`. `$0` defines the final tab stop, it defaults to
+          * the end of the snippet. Placeholders with equal identifiers are linked,
+          * that is typing in one will update others too.
+          */
+        Snippet = 2
+    };
+
+    /// The format of the insert text. The format applies to both the `insertText` property
+    /// and the `newText` property of a provided `textEdit`.
+    std::optional<InsertTextFormat> insertTextFormat() const;
+    void setInsertTextFormat(const InsertTextFormat &insertTextFormat)
+    { insert(insertTextFormatKey, insertTextFormat); }
+    void clearInsertTextFormat() { remove(insertTextFormatKey); }
+
+    /**
+     * An edit which is applied to a document when selecting this completion. When an edit is provided the value of
+     * `insertText` is ignored.
+     *
+     * *Note:* The range of the edit must be a single line range and it must contain the position at which completion
+     * has been requested.
+     */
+    std::optional<TextEdit> textEdit() const { return optionalValue<TextEdit>(textEditKey); }
+    void setTextEdit(const TextEdit &textEdit) { insert(textEditKey, textEdit); }
+    void clearTextEdit() { remove(textEditKey); }
+
+    /**
+     * An optional array of additional text edits that are applied when
+     * selecting this completion. Edits must not overlap with the main edit
+     * nor with themselves.
+     */
+    std::optional<QList<TextEdit>> additionalTextEdits() const
+    { return optionalArray<TextEdit>(additionalTextEditsKey); }
+    void setAdditionalTextEdits(const QList<TextEdit> &additionalTextEdits)
+    { insertArray(additionalTextEditsKey, additionalTextEdits); }
+    void clearAdditionalTextEdits() { remove(additionalTextEditsKey); }
+
+    /**
+     * An optional set of characters that when pressed while this completion is active will accept it first and
+     * then type that character. *Note* that all commit characters should have `length=1` and that superfluous
+     * characters will be ignored.
+     */
+    std::optional<QList<QString>> commitCharacters() const
+    { return optionalArray<QString>(commitCharactersKey); }
+    void setCommitCharacters(const QList<QString> &commitCharacters)
+    { insertArray(commitCharactersKey, commitCharacters); }
+    void clearCommitCharacters() { remove(commitCharactersKey); }
+
+    /**
+     * An optional command that is executed *after* inserting this completion. *Note* that
+     * additional modifications to the current document should be described with the
+     * additionalTextEdits-property.
+     */
+    std::optional<Command> command() const { return optionalValue<Command>(commandKey); }
+    void setCommand(const Command &command) { insert(commandKey, command); }
+    void clearCommand() { remove(commandKey); }
+
+    /**
+     * An data entry field that is preserved on a completion item between
+     * a completion and a completion resolve request.
+     */
+    std::optional<QJsonValue> data() const { return optionalValue<QJsonValue>(dataKey); }
+    void setData(const QJsonValue &data) { insert(dataKey, data); }
+    void clearData() { remove(dataKey); }
+
+    /**
+     * Completion item tags are extra annotations that tweak the rendering of a
+     * completion item.
+     * @since 3.15.0
+     */
+    enum CompletionItemTag {
+        Deprecated = 1,
+    };
+
+    /**
+     * Tags for this completion item.
+     * @since 3.15.0
+     */
+    std::optional<QList<CompletionItemTag>> tags() const;
+
+    /**
+      * Indicates if this item is deprecated.
+      * @deprecated Use `tags` instead if supported.
+      */
+    std::optional<bool> deprecated() const { return optionalValue<bool>(deprecatedKey); }
+
+    bool isValid() const override { return contains(labelKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CompletionList : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    /**
+     * This list it not complete. Further typing should result in recomputing
+     * this list.
+     */
+    bool isIncomplete() const { return typedValue<bool>(isIncompleteKey); }
+    void setIsIncomplete(bool isIncomplete) { insert(isIncompleteKey, isIncomplete); }
+
+    /// The completion items.
+    std::optional<QList<CompletionItem>> items() const { return array<CompletionItem>(itemsKey); }
+    void setItems(const QList<CompletionItem> &items) { insertArray(itemsKey, items); }
+    void clearItems() { remove(itemsKey); }
+
+    bool isValid() const override { return contains(isIncompleteKey); }
+};
+
+/// The result of a completion is CompletionItem[] | CompletionList | null
+class LANGUAGESERVERPROTOCOL_EXPORT CompletionResult
+        : public std::variant<QList<CompletionItem>, CompletionList, std::nullptr_t>
+{
+public:
+    using variant::variant;
+    explicit CompletionResult(const QJsonValue &value);
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CompletionRequest : public Request<
+        CompletionResult, std::nullptr_t, CompletionParams>
+{
+public:
+    explicit CompletionRequest(const CompletionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/completion";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CompletionItemResolveRequest : public Request<
+        CompletionItem, std::nullptr_t, CompletionItem>
+{
+public:
+    explicit CompletionItemResolveRequest(const CompletionItem &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "completionItem/resolve";
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/diagnostics.cpp b/src/shared/lsp/diagnostics.cpp
new file mode 100644
index 000000000..352b1572f
--- /dev/null
+++ b/src/shared/lsp/diagnostics.cpp
@@ -0,0 +1,13 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "diagnostics.h"
+
+namespace lsp {
+
+constexpr const char PublishDiagnosticsNotification::methodName[];
+
+PublishDiagnosticsNotification::PublishDiagnosticsNotification(const PublishDiagnosticsParams &params)
+    : Notification(methodName, params) { }
+
+} // namespace lsp
diff --git a/src/shared/lsp/diagnostics.h b/src/shared/lsp/diagnostics.h
new file mode 100644
index 000000000..ae479a23b
--- /dev/null
+++ b/src/shared/lsp/diagnostics.h
@@ -0,0 +1,38 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+#include "languagefeatures.h"
+
+namespace lsp {
+
+class PublishDiagnosticsParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+    void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+    QList<Diagnostic> diagnostics() const { return array<Diagnostic>(diagnosticsKey); }
+    void setDiagnostics(const QList<Diagnostic> &diagnostics)
+    { insertArray(diagnosticsKey, diagnostics); }
+
+    std::optional<int> version() const { return optionalValue<int>(versionKey); }
+    void setVersion(int version) { insert(versionKey, version); }
+    void clearVersion() { remove(versionKey); }
+
+    bool isValid() const override { return contains(diagnosticsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT PublishDiagnosticsNotification : public Notification<PublishDiagnosticsParams>
+{
+public:
+    explicit PublishDiagnosticsNotification(const PublishDiagnosticsParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "textDocument/publishDiagnostics";
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/filepath.h b/src/shared/lsp/filepath.h
new file mode 100644
index 000000000..736085828
--- /dev/null
+++ b/src/shared/lsp/filepath.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2023 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qbs.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#pragma once
+
+#include <tools/hostosinfo.h>
+
+#include <QDir>
+#include <QFileInfo>
+#include <QString>
+
+namespace lsp::Utils {
+
+class FilePath : public QString
+{
+public:
+    FilePath() = default;
+    FilePath(const QString &s) : QString(s) {}
+
+    QString scheme() const { return {}; }
+    QString host() const { return {}; }
+    Qt::CaseSensitivity caseSensitivity() const {
+        return qbs::Internal::HostOsInfo::fileNameCaseSensitivity();
+    }
+    QString toString() const { return *this; }
+    QString path() const { return toString(); }
+
+    static FilePath fromUserInput(const QString &s) { return QDir::fromNativeSeparators(s); }
+    QString toUserOutput() const { return QDir::toNativeSeparators(*this); }
+};
+
+} // namespace lsp::Utils
diff --git a/src/shared/lsp/initializemessages.cpp b/src/shared/lsp/initializemessages.cpp
new file mode 100644
index 000000000..db0abcf49
--- /dev/null
+++ b/src/shared/lsp/initializemessages.cpp
@@ -0,0 +1,137 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "initializemessages.h"
+
+#include <QCoreApplication>
+
+namespace lsp {
+
+constexpr const char InitializeRequest::methodName[];
+constexpr const char InitializeNotification::methodName[];
+constexpr Trace::Values s_trace = Trace::off;
+
+Trace Trace::fromString(const QString &val)
+{
+    if (val == "messages")
+        return messages;
+    if (val == "verbose")
+        return verbose;
+    return off;
+}
+
+#define RETURN_CASE(name) case Trace::name: return QString(#name);
+QString Trace::toString() const
+{
+    switch (m_value) {
+    RETURN_CASE(off);
+    RETURN_CASE(messages);
+    RETURN_CASE(verbose);
+    }
+    return QString("off");
+}
+#undef RETURN_CASE
+
+std::optional<QList<MarkupKind>>
+TextDocumentClientCapabilities::CompletionCapabilities::CompletionItemCapbilities::
+documentationFormat() const
+{
+    return optionalArray<MarkupKind>(documentationFormatKey);
+}
+
+void
+TextDocumentClientCapabilities::CompletionCapabilities::CompletionItemCapbilities::
+setDocumentationFormat(const QList<MarkupKind> &documentationFormat)
+{
+    insertArray(documentationFormatKey, documentationFormat);
+}
+
+TextDocumentClientCapabilities::CompletionCapabilities::CompletionItemKindCapabilities::CompletionItemKindCapabilities()
+{
+    setValueSet({CompletionItemKind::Text, CompletionItemKind::Method, CompletionItemKind::Function,
+                 CompletionItemKind::Constructor, CompletionItemKind::Field, CompletionItemKind::Variable,
+                 CompletionItemKind::Class, CompletionItemKind::Interface, CompletionItemKind::Module,
+                 CompletionItemKind::Property, CompletionItemKind::Unit, CompletionItemKind::Value,
+                 CompletionItemKind::Enum, CompletionItemKind::Keyword, CompletionItemKind::Snippet,
+                 CompletionItemKind::Color, CompletionItemKind::File, CompletionItemKind::Reference,
+                 CompletionItemKind::Folder, CompletionItemKind::EnumMember, CompletionItemKind::Constant,
+                 CompletionItemKind::Struct, CompletionItemKind::Event, CompletionItemKind::Operator,
+                 CompletionItemKind::TypeParameter});
+}
+
+std::optional<QList<CompletionItemKind::Kind>>
+TextDocumentClientCapabilities::CompletionCapabilities::CompletionItemKindCapabilities::
+valueSet() const
+{
+    if (std::optional<QList<int>> array = optionalArray<int>(valueSetKey)) {
+        return std::make_optional(Utils::transform(*array, [](int value) {
+            return static_cast<CompletionItemKind::Kind>(value);
+        }));
+    }
+    return std::nullopt;
+}
+
+void
+TextDocumentClientCapabilities::CompletionCapabilities::CompletionItemKindCapabilities::
+setValueSet(const QList<CompletionItemKind::Kind> &valueSet)
+{
+    insert(valueSetKey, enumArrayToJsonArray<CompletionItemKind::Kind>(valueSet));
+}
+
+std::optional<QList<MarkupKind> > TextDocumentClientCapabilities::HoverCapabilities::contentFormat() const
+{
+    return optionalArray<MarkupKind>(contentFormatKey);
+}
+
+void TextDocumentClientCapabilities::HoverCapabilities::setContentFormat(const QList<MarkupKind> &contentFormat)
+{
+    insertArray(contentFormatKey, contentFormat);
+}
+
+std::optional<QList<MarkupKind>>
+TextDocumentClientCapabilities::SignatureHelpCapabilities::SignatureInformationCapabilities::
+documentationFormat() const
+{
+    return optionalArray<MarkupKind>(documentationFormatKey);
+}
+
+void
+TextDocumentClientCapabilities::SignatureHelpCapabilities::SignatureInformationCapabilities::
+setDocumentationFormat(const QList<MarkupKind> &documentationFormat)
+{
+    insertArray(documentationFormatKey, documentationFormat);
+}
+
+InitializeParams::InitializeParams()
+{
+    setProcessId(int(QCoreApplication::applicationPid()));
+    setRootUri(LanguageClientValue<DocumentUri>());
+    setCapabilities(ClientCapabilities());
+    setTrace(s_trace);
+}
+
+std::optional<QJsonObject> InitializeParams::initializationOptions() const
+{
+    const QJsonValue &optionsValue = value(initializationOptionsKey);
+    if (optionsValue.isObject())
+        return optionsValue.toObject();
+    return std::nullopt;
+}
+
+std::optional<Trace> InitializeParams::trace() const
+{
+    const QJsonValue &traceValue = value(traceKey);
+    if (traceValue.isUndefined())
+        return std::nullopt;
+    return std::make_optional(Trace(traceValue.toString()));
+}
+
+InitializeRequest::InitializeRequest(const InitializeParams &params)
+    : Request(methodName, params)
+{ }
+
+InitializeNotification::InitializeNotification(const InitializedParams &params)
+    : Notification(methodName, params)
+{ }
+
+} // namespace lsp
diff --git a/src/shared/lsp/initializemessages.h b/src/shared/lsp/initializemessages.h
new file mode 100644
index 000000000..159d62ded
--- /dev/null
+++ b/src/shared/lsp/initializemessages.h
@@ -0,0 +1,187 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "clientcapabilities.h"
+#include "jsonrpcmessages.h"
+#include "lsptypes.h"
+#include "servercapabilities.h"
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT Trace
+{
+public:
+    enum Values
+    {
+        off,
+        messages,
+        verbose
+    };
+
+    Trace() = default;
+    Trace(Values val) : m_value(val) {}
+    Trace(QString val) : Trace(fromString(val)) {}
+
+    static Trace fromString(const QString& val);
+    QString toString() const;
+
+private:
+    Values m_value = off;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ClientInfo : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString name() const { return typedValue<QString>(nameKey); }
+    void setName(const QString &name) { insert(nameKey, name); }
+
+    std::optional<QString> version() const { return optionalValue<QString>(versionKey); }
+    void setVersion(const QString &version) { insert(versionKey, version); }
+    void clearVersion() { remove(versionKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT InitializeParams : public JsonObject
+{
+public:
+    InitializeParams();
+    using JsonObject::JsonObject;
+
+    /*
+     * The process Id of the parent process that started
+     * the server. Is null if the process has not been started by another process.
+     * If the parent process is not alive then the server should exit (see exit notification)
+     * its process.
+     */
+    LanguageClientValue<int> processId() const { return clientValue<int>(processIdKey); }
+    void setProcessId(const LanguageClientValue<int> &id) { insert(processIdKey, id); }
+
+    /*
+     * The rootPath of the workspace. Is null
+     * if no folder is open.
+     *
+     * @deprecated in favor of rootUri.
+     */
+    std::optional<LanguageClientValue<QString>> rootPath() const
+    { return optionalClientValue<QString>(rootPathKey); }
+    void setRootPath(const LanguageClientValue<QString> &path)
+    { insert(rootPathKey, path); }
+    void clearRootPath() { remove(rootPathKey); }
+
+    /*
+     * The rootUri of the workspace. Is null if no
+     * folder is open. If both `rootPath` and `rootUri` are set
+     * `rootUri` wins.
+     */
+    LanguageClientValue<DocumentUri> rootUri() const
+    { return clientValue<QString>(rootUriKey).transform<DocumentUri>(); }
+    void setRootUri(const LanguageClientValue<DocumentUri> &uri)
+    { insert(rootUriKey, uri); }
+
+    // User provided initialization options.
+    std::optional<QJsonObject> initializationOptions() const;
+    void setInitializationOptions(const QJsonObject &options)
+    { insert(initializationOptionsKey, options); }
+    void clearInitializationOptions() { remove(initializationOptionsKey); }
+
+    // The capabilities provided by the client (editor or tool)
+    ClientCapabilities capabilities() const { return typedValue<ClientCapabilities>(capabilitiesKey); }
+    void setCapabilities(const ClientCapabilities &capabilities)
+    { insert(capabilitiesKey, capabilities); }
+
+    // The initial trace setting. If omitted trace is disabled ('off').
+    std::optional<Trace> trace() const;
+    void setTrace(Trace trace) { insert(traceKey, trace.toString()); }
+    void clearTrace() { remove(traceKey); }
+
+    /*
+     * The workspace folders configured in the client when the server starts.
+     * This property is only available if the client supports workspace folders.
+     * It can be `null` if the client supports workspace folders but none are
+     * configured.
+     *
+     * Since 3.6.0
+     */
+    std::optional<LanguageClientArray<WorkSpaceFolder>> workspaceFolders() const
+    { return optionalClientArray<WorkSpaceFolder>(workspaceFoldersKey); }
+    void setWorkSpaceFolders(const LanguageClientArray<WorkSpaceFolder> &folders)
+    { insert(workspaceFoldersKey, folders.toJson()); }
+    void clearWorkSpaceFolders() { remove(workspaceFoldersKey); }
+
+    std::optional<ClientInfo> clientInfo() const { return optionalValue<ClientInfo>(clientInfoKey); }
+    void setClientInfo(const ClientInfo &clientInfo) { insert(clientInfoKey, clientInfo); }
+    void clearClientInfo() { remove(clientInfoKey); }
+
+    bool isValid() const override
+    { return contains(processIdKey) && contains(rootUriKey) && contains(capabilitiesKey); }
+};
+
+using InitializedParams = JsonObject;
+
+class LANGUAGESERVERPROTOCOL_EXPORT InitializeNotification : public Notification<InitializedParams>
+{
+public:
+    explicit InitializeNotification(const InitializedParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "initialized";
+
+    bool parametersAreValid(QString * /*errorMessage*/) const final { return true; }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ServerInfo : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString name() const { return typedValue<QString>(nameKey); }
+    std::optional<QString> version() const { return optionalValue<QString>(versionKey); }
+
+    bool isValid() const override { return contains(nameKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT InitializeResult : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    ServerCapabilities capabilities() const
+    { return typedValue<ServerCapabilities>(capabilitiesKey); }
+    void setCapabilities(const ServerCapabilities &capabilities)
+    { insert(capabilitiesKey, capabilities); }
+
+    std::optional<ServerInfo> serverInfo() const
+    { return optionalValue<ServerInfo>(serverInfoKey); }
+
+    bool isValid() const override { return contains(capabilitiesKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT InitializeError : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    /*
+     * Indicates whether the client execute the following retry logic:
+     * (1) show the message provided by the ResponseError to the user
+     * (2) user selects retry or cancel
+     * (3) if user selected retry the initialize method is sent again.
+     */
+    bool retry() const { return typedValue<bool>(retryKey); }
+    void setRetry(const bool &retry) { insert(retryKey, retry); }
+
+    bool isValid() const override { return contains(retryKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT InitializeRequest : public Request<
+        InitializeResult, InitializeError, InitializeParams>
+{
+public:
+    explicit InitializeRequest(const InitializeParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "initialize";
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/jsonkeys.h b/src/shared/lsp/jsonkeys.h
new file mode 100644
index 000000000..5e5491caa
--- /dev/null
+++ b/src/shared/lsp/jsonkeys.h
@@ -0,0 +1,231 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace lsp {
+
+constexpr char actionsKey[] = "actions";
+constexpr char activeParameterKey[] = "activeParameter";
+constexpr char activeParameterSupportKey[] = "activeParameterSupport";
+constexpr char activeSignatureKey[] = "activeSignature";
+constexpr char addedKey[] = "added";
+constexpr char additionalTextEditsKey[] = "additionalTextEdits";
+constexpr char alphaKey[] = "alpha";
+constexpr char appliedKey[] = "applied";
+constexpr char applyEditKey[] = "applyEdit";
+constexpr char argumentsKey[] = "arguments";
+constexpr char blueKey[] = "blue";
+constexpr char callHierarchyKey[] = "callHierarchy";
+constexpr char callHierarchyProviderKey[] = "callHierarchyProvider";
+constexpr char cancellableKey[] = "cancellable";
+constexpr char capabilitiesKey[] = "capabilities";
+constexpr char chKey[] = "ch";
+constexpr char changeKey[] = "change";
+constexpr char changeNotificationsKey[] = "changeNotifications";
+constexpr char changesKey[] = "changes";
+constexpr char characterKey[] = "character";
+constexpr char childrenKey[] = "children";
+constexpr char clientInfoKey[] = "clientInfo";
+constexpr char codeActionKey[] = "codeAction";
+constexpr char codeActionKindKey[] = "codeActionKind";
+constexpr char codeActionKindsKey[] = "codeActionKinds";
+constexpr char codeActionLiteralSupportKey[] = "codeActionLiteralSupport";
+constexpr char codeActionProviderKey[] = "codeActionProvider";
+constexpr char codeKey[] = "code";
+constexpr char codeLensKey[] = "codeLens";
+constexpr char codeLensProviderKey[] = "codeLensProvider";
+constexpr char colorInfoKey[] = "colorInfo";
+constexpr char colorKey[] = "color";
+constexpr char colorProviderKey[] = "colorProvider";
+constexpr char commandKey[] = "command";
+constexpr char commandsKey[] = "commands";
+constexpr char commitCharacterSupportKey[] = "commitCharacterSupport";
+constexpr char commitCharactersKey[] = "commitCharacters";
+constexpr char completionItemKey[] = "completionItem";
+constexpr char completionItemKindKey[] = "completionItemKind";
+constexpr char completionKey[] = "completion";
+constexpr char completionProviderKey[] = "completionProvider";
+constexpr char configurationKey[] = "configuration";
+constexpr char containerNameKey[] = "containerName";
+constexpr char contentChangesKey[] = "contentChanges";
+constexpr char contentFormatKey[] = "contentFormat";
+constexpr char contentKey[] = "value";
+constexpr char contentsKey[] = "contents";
+constexpr char contextKey[] = "context";
+constexpr char contextSupportKey[] = "contextSupport";
+constexpr char dataKey[] = "data";
+constexpr char definitionKey[] = "definition";
+constexpr char definitionProviderKey[] = "definitionProvider";
+constexpr char deleteCountKey[] = "deleteCount";
+constexpr char deltaKey[] = "delta";
+constexpr char deprecatedKey[] = "deprecated";
+constexpr char detailKey[] = "detail";
+constexpr char diagnosticsKey[] = "diagnostics";
+constexpr char didChangeConfigurationKey[] = "didChangeConfiguration";
+constexpr char didChangeWatchedFilesKey[] = "didChangeWatchedFiles";
+constexpr char didSaveKey[] = "didSave";
+constexpr char documentChangesKey[] = "documentChanges";
+constexpr char documentFormattingProviderKey[] = "documentFormattingProvider";
+constexpr char documentHighlightKey[] = "documentHighlight";
+constexpr char documentHighlightProviderKey[] = "documentHighlightProvider";
+constexpr char documentLinkKey[] = "documentLink";
+constexpr char documentLinkProviderKey[] = "documentLinkProvider";
+constexpr char documentRangeFormattingProviderKey[] = "documentRangeFormattingProvider";
+constexpr char documentSelectorKey[] = "documentSelector";
+constexpr char documentSymbolKey[] = "documentSymbol";
+constexpr char documentSymbolProviderKey[] = "documentSymbolProvider";
+constexpr char documentationFormatKey[] = "documentationFormat";
+constexpr char documentationKey[] = "documentation";
+constexpr char dynamicRegistrationKey[] = "dynamicRegistration";
+constexpr char editKey[] = "edit";
+constexpr char editsKey[] = "edits";
+constexpr char endKey[] = "end";
+constexpr char errorKey[] = "error";
+constexpr char eventKey[] = "event";
+constexpr char executeCommandKey[] = "executeCommand";
+constexpr char executeCommandProviderKey[] = "executeCommandProvider";
+constexpr char experimentalKey[] = "experimental";
+constexpr char filterTextKey[] = "filterText";
+constexpr char firstTriggerCharacterKey[] = "firstTriggerCharacter";
+constexpr char formatsKey[] = "formats";
+constexpr char formattingKey[] = "formatting";
+constexpr char fromKey[] = "from";
+constexpr char fromRangesKey[] = "fromRanges";
+constexpr char fullKey[] = "full";
+constexpr char greenKey[] = "green";
+constexpr char hierarchicalDocumentSymbolSupportKey[] = "hierarchicalDocumentSymbolSupport";
+constexpr char hoverKey[] = "hover";
+constexpr char hoverProviderKey[] = "hoverProvider";
+constexpr char idKey[] = "id";
+constexpr char ignoreIfExistsKey[] = "ignoreIfExists";
+constexpr char ignoreIfNotExistsKey[] = "ignoreIfNotExists";
+constexpr char implementationKey[] = "implementation";
+constexpr char implementationProviderKey[] = "implementationProvider";
+constexpr char includeDeclarationKey[] = "includeDeclaration";
+constexpr char includeTextKey[] = "includeText";
+constexpr char initializationOptionsKey[] = "initializationOptions";
+constexpr char insertFinalNewlineKey[] = "insertFinalNewline";
+constexpr char insertSpaceKey[] = "insertSpace";
+constexpr char insertTextFormatKey[] = "insertTextFormat";
+constexpr char insertTextKey[] = "insertText";
+constexpr char isIncompleteKey[] = "isIncomplete";
+constexpr char itemKey[] = "item";
+constexpr char itemsKey[] = "items";
+constexpr char jsonRpcVersionKey[] = "jsonrpc";
+constexpr char kindKey[] = "kind";
+constexpr char labelKey[] = "label";
+constexpr char languageIdKey[] = "languageId";
+constexpr char languageKey[] = "language";
+constexpr char legendKey[] = "legend";
+constexpr char limitKey[] = "limit";
+constexpr char lineKey[] = "line";
+constexpr char linesKey[] = "lines";
+constexpr char locationKey[] = "location";
+constexpr char messageKey[] = "message";
+constexpr char methodKey[] = "method";
+constexpr char moreTriggerCharacterKey[] = "moreTriggerCharacter";
+constexpr char multiLineTokenSupportKey[] = "multiLineTokenSupport";
+constexpr char nameKey[] = "name";
+constexpr char newNameKey[] = "newName";
+constexpr char newTextKey[] = "newText";
+constexpr char newUriKey[] = "newUri";
+constexpr char oldUriKey[] = "oldUri";
+constexpr char onTypeFormattingKey[] = "onTypeFormatting";
+constexpr char onlyKey[] = "only";
+constexpr char openCloseKey[] = "openClose";
+constexpr char optionsKey[] = "options";
+constexpr char overlappingTokenSupportKey[] = "overlappingTokenSupport";
+constexpr char overwriteKey[] = "overwrite";
+constexpr char parametersKey[] = "parameters";
+constexpr char paramsKey[] = "params";
+constexpr char patternKey[] = "pattern";
+constexpr char percentageKey[] = "percentage";
+constexpr char placeHolderKey[] = "placeHolder";
+constexpr char positionKey[] = "position";
+constexpr char prepareProviderKey[] = "prepareProvider";
+constexpr char prepareSupportKey[] = "prepareSupport";
+constexpr char previousResultIdKey[] = "previousResultId";
+constexpr char processIdKey[] = "processId";
+constexpr char queryKey[] = "query";
+constexpr char rangeFormattingKey[] = "rangeFormatting";
+constexpr char rangeKey[] = "range";
+constexpr char rangeLengthKey[] = "rangeLength";
+constexpr char reasonKey[] = "reason";
+constexpr char recursiveKey[] = "recursive";
+constexpr char redKey[] = "red";
+constexpr char referencesKey[] = "references";
+constexpr char referencesProviderKey[] = "referencesProvider";
+constexpr char refreshSupportKey[] = "refreshSupport";
+constexpr char registerOptionsKey[] = "registerOptions";
+constexpr char registrationsKey[] = "registrations";
+constexpr char removedKey[] = "removed";
+constexpr char renameKey[] = "rename";
+constexpr char renameProviderKey[] = "renameProvider";
+constexpr char requestsKey[] = "requests";
+constexpr char resolveProviderKey[] = "resolveProvider";
+constexpr char resourceOperationsKey[] = "resourceOperations";
+constexpr char resultIdKey[] = "resultId";
+constexpr char resultKey[] = "result";
+constexpr char retryKey[] = "retry";
+constexpr char rootPathKey[] = "rootPath";
+constexpr char rootUriKey[] = "rootUri";
+constexpr char saveKey[] = "save";
+constexpr char schemeKey[] = "scheme";
+constexpr char scopeUriKey[] = "scopeUri";
+constexpr char sectionKey[] = "section";
+constexpr char selectionRangeKey[] = "selectionRange";
+constexpr char semanticTokensKey[] = "semanticTokens";
+constexpr char semanticTokensProviderKey[] = "semanticTokensProvider";
+constexpr char serverInfoKey[] = "serverInfo";
+constexpr char settingsKey[] = "settings";
+constexpr char severityKey[] = "severity";
+constexpr char signatureHelpKey[] = "signatureHelp";
+constexpr char signatureHelpProviderKey[] = "signatureHelpProvider";
+constexpr char signatureInformationKey[] = "signatureInformation";
+constexpr char signaturesKey[] = "signatures";
+constexpr char snippetSupportKey[] = "snippetSupport";
+constexpr char sortTextKey[] = "sortText";
+constexpr char sourceKey[] = "source";
+constexpr char startKey[] = "start";
+constexpr char supportedKey[] = "supported";
+constexpr char symbolKey[] = "symbol";
+constexpr char symbolKindKey[] = "symbolKind";
+constexpr char syncKindKey[] = "syncKind";
+constexpr char synchronizationKey[] = "synchronization";
+constexpr char tabSizeKey[] = "tabSize";
+constexpr char tagsKey[] = "tags";
+constexpr char targetKey[] = "target";
+constexpr char textDocumentKey[] = "textDocument";
+constexpr char textDocumentSyncKey[] = "textDocumentSync";
+constexpr char textEditKey[] = "textEdit";
+constexpr char textKey[] = "text";
+constexpr char titleKey[] = "title";
+constexpr char toKey[] = "to";
+constexpr char tokenKey[] = "token";
+constexpr char tokenModifiersKey[] = "tokenModifiers";
+constexpr char tokenTypesKey[] = "tokenTypes";
+constexpr char traceKey[] = "trace";
+constexpr char triggerCharacterKey[] = "triggerCharacter";
+constexpr char triggerCharactersKey[] = "triggerCharacters";
+constexpr char triggerKindKey[] = "triggerKind";
+constexpr char trimFinalNewlinesKey[] = "trimFinalNewlines";
+constexpr char trimTrailingWhitespaceKey[] = "trimTrailingWhitespace";
+constexpr char typeDefinitionKey[] = "typeDefinition";
+constexpr char typeDefinitionProviderKey[] = "typeDefinitionProvider";
+constexpr char typeKey[] = "type";
+constexpr char unregistrationsKey[] = "unregistrations";
+constexpr char uriKey[] = "uri";
+constexpr char valueKey[] = "value";
+constexpr char valueSetKey[] = "valueSet";
+constexpr char versionKey[] = "version";
+constexpr char willSaveKey[] = "willSave";
+constexpr char willSaveWaitUntilKey[] = "willSaveWaitUntil";
+constexpr char windowKey[] = "window";
+constexpr char workDoneProgressKey[] = "workDoneProgress";
+constexpr char workspaceEditKey[] = "workspaceEdit";
+constexpr char workspaceFoldersKey[] = "workspaceFolders";
+constexpr char workspaceKey[] = "workspace";
+constexpr char workspaceSymbolProviderKey[] = "workspaceSymbolProvider";
+
+} // namespace lsp
diff --git a/src/shared/lsp/jsonobject.cpp b/src/shared/lsp/jsonobject.cpp
new file mode 100644
index 000000000..887d79a5e
--- /dev/null
+++ b/src/shared/lsp/jsonobject.cpp
@@ -0,0 +1,28 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "jsonobject.h"
+
+#include <QCoreApplication>
+
+namespace lsp {
+
+JsonObject &JsonObject::operator=(const JsonObject &other) = default;
+
+JsonObject &JsonObject::operator=(JsonObject &&other)
+{
+    m_jsonObject.swap(other.m_jsonObject);
+    return *this;
+}
+
+QJsonObject::iterator JsonObject::insert(const std::string_view key, const JsonObject &object)
+{
+    return m_jsonObject.insert(QLatin1String(key.data()), object.m_jsonObject);
+}
+
+QJsonObject::iterator JsonObject::insert(const std::string_view key, const QJsonValue &value)
+{
+    return m_jsonObject.insert(QLatin1String(key.data()), value);
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/jsonobject.h b/src/shared/lsp/jsonobject.h
new file mode 100644
index 000000000..29811839f
--- /dev/null
+++ b/src/shared/lsp/jsonobject.h
@@ -0,0 +1,181 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "algorithm.h"
+#include "languageserverprotocol_global.h"
+#include "lsputils.h"
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QJsonObject>
+
+#include <optional>
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT JsonObject
+{
+public:
+    using iterator = QJsonObject::iterator;
+    using const_iterator = QJsonObject::const_iterator;
+
+    JsonObject() = default;
+
+    explicit JsonObject(const QJsonObject &object) : m_jsonObject(object) { }
+    explicit JsonObject(QJsonObject &&object) : m_jsonObject(std::move(object)) { }
+
+    JsonObject(const JsonObject &object) : m_jsonObject(object.m_jsonObject) { }
+    JsonObject(JsonObject &&object) : m_jsonObject(std::move(object.m_jsonObject)) { }
+
+    explicit JsonObject(const QJsonValue &value) : m_jsonObject(value.toObject()) { }
+
+    virtual ~JsonObject() = default;
+
+    JsonObject &operator=(const JsonObject &other);
+    JsonObject &operator=(JsonObject &&other);
+
+    bool operator==(const JsonObject &other) const { return m_jsonObject == other.m_jsonObject; }
+
+    operator const QJsonObject&() const { return m_jsonObject; }
+
+    virtual bool isValid() const { return true; }
+
+    iterator end() { return m_jsonObject.end(); }
+    const_iterator end() const { return m_jsonObject.end(); }
+
+    iterator insert(const std::string_view key, const JsonObject &value);
+    iterator insert(const std::string_view key, const QJsonValue &value);
+
+protected:
+
+    template <typename T, typename V>
+    iterator insertVariant(const std::string_view key, const V &variant);
+    template <typename T1, typename T2, typename... Args, typename V>
+    iterator insertVariant(const std::string_view key, const V &variant);
+
+    // QJSonObject redirections
+    QJsonValue value(const std::string_view key) const { return m_jsonObject.value(QLatin1String(key.data())); }
+    bool contains(const std::string_view key) const { return m_jsonObject.contains(QLatin1String(key.data())); }
+    iterator find(const std::string_view key) { return m_jsonObject.find(QLatin1String(key.data())); }
+    const_iterator find(const std::string_view key) const { return m_jsonObject.find(QLatin1String(key.data())); }
+    void remove(const std::string_view key) { m_jsonObject.remove(QLatin1String(key.data())); }
+    QStringList keys() const { return m_jsonObject.keys(); }
+
+    // convenience value access
+    template<typename T>
+    T typedValue(const std::string_view key) const;
+    template<typename T>
+    std::optional<T> optionalValue(const std::string_view key) const;
+    template<typename T>
+    LanguageClientValue<T> clientValue(const std::string_view key) const;
+    template<typename T>
+    std::optional<LanguageClientValue<T>> optionalClientValue(const std::string_view key) const;
+    template<typename T>
+    QList<T> array(const std::string_view key) const;
+    template<typename T>
+    std::optional<QList<T>> optionalArray(const std::string_view key) const;
+    template<typename T>
+    LanguageClientArray<T> clientArray(const std::string_view key) const;
+    template<typename T>
+    std::optional<LanguageClientArray<T>> optionalClientArray(const std::string_view key) const;
+    template<typename T>
+    void insertArray(const std::string_view key, const QList<T> &array);
+    template<typename>
+    void insertArray(const std::string_view key, const QList<JsonObject> &array);
+
+private:
+    QJsonObject m_jsonObject;
+};
+
+template<typename T, typename V>
+JsonObject::iterator JsonObject::insertVariant(const std::string_view key, const V &variant)
+{
+    return std::holds_alternative<T>(variant) ? insert(key, std::get<T>(variant)) : end();
+}
+
+template<typename T1, typename T2, typename... Args, typename V>
+JsonObject::iterator JsonObject::insertVariant(const std::string_view key, const V &variant)
+{
+    auto result = insertVariant<T1>(key, variant);
+    return result != end() ? result : insertVariant<T2, Args...>(key, variant);
+}
+
+template<typename T>
+T JsonObject::typedValue(const std::string_view key) const
+{
+    return fromJsonValue<T>(value(key));
+}
+
+template<typename T>
+std::optional<T> JsonObject::optionalValue(const std::string_view key) const
+{
+    const QJsonValue &val = value(key);
+    return val.isUndefined() ? std::nullopt : std::make_optional(fromJsonValue<T>(val));
+}
+
+template<typename T>
+LanguageClientValue<T> JsonObject::clientValue(const std::string_view key) const
+{
+    return LanguageClientValue<T>(value(key));
+}
+
+template<typename T>
+std::optional<LanguageClientValue<T>> JsonObject::optionalClientValue(const std::string_view key) const
+{
+    return contains(key) ? std::make_optional(clientValue<T>(key)) : std::nullopt;
+}
+
+template<typename T>
+QList<T> JsonObject::array(const std::string_view key) const
+{
+    if (const std::optional<QList<T>> &array = optionalArray<T>(key))
+        return *array;
+    qCDebug(conversionLog) << QString("Expected array under %1 in:")
+        .arg(QLatin1String(key.data())) << *this;
+    return {};
+}
+
+template<typename T>
+std::optional<QList<T>> JsonObject::optionalArray(const std::string_view key) const
+{
+    const QJsonValue &jsonValue = value(key);
+    if (jsonValue.isUndefined())
+        return std::nullopt;
+    return Utils::transform<QList<T>>(jsonValue.toArray(), &fromJsonValue<T>);
+}
+
+template<typename T>
+LanguageClientArray<T> JsonObject::clientArray(const std::string_view key) const
+{
+    return LanguageClientArray<T>(value(key));
+}
+
+template<typename T>
+std::optional<LanguageClientArray<T>> JsonObject::optionalClientArray(const std::string_view key) const
+{
+    const QJsonValue &val = value(key);
+    return !val.isUndefined() ? std::make_optional(LanguageClientArray<T>(value(key)))
+                              : std::nullopt;
+}
+
+template<typename T>
+void JsonObject::insertArray(const std::string_view key, const QList<T> &array)
+{
+    QJsonArray jsonArray;
+    for (const T &item : array)
+        jsonArray.append(QJsonValue(item));
+    insert(key, jsonArray);
+}
+
+template<typename >
+void JsonObject::insertArray(const std::string_view key, const QList<JsonObject> &array)
+{
+    QJsonArray jsonArray;
+    for (const JsonObject &item : array)
+        jsonArray.append(item.m_jsonObject);
+    insert(key, jsonArray);
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/jsonrpcmessages.cpp b/src/shared/lsp/jsonrpcmessages.cpp
new file mode 100644
index 000000000..dbe354bc4
--- /dev/null
+++ b/src/shared/lsp/jsonrpcmessages.cpp
@@ -0,0 +1,107 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "jsonrpcmessages.h"
+
+#include "initializemessages.h"
+#include "languageserverprotocoltr.h"
+#include "lsputils.h"
+
+#include <QCoreApplication>
+#include <QObject>
+#include <QJsonDocument>
+#include <QTextCodec>
+
+namespace lsp {
+Q_LOGGING_CATEGORY(timingLog, "qtc.languageserverprotocol.timing", QtWarningMsg)
+
+constexpr const char CancelRequest::methodName[];
+
+QByteArray JsonRpcMessage::toRawData() const
+{
+    return QJsonDocument(m_jsonObject).toJson(QJsonDocument::Compact);
+}
+
+bool JsonRpcMessage::isValid(QString *errorMessage) const
+{
+    if (!m_parseError.isEmpty()) {
+        if (errorMessage)
+            *errorMessage = m_parseError;
+        return false;
+    }
+    return m_jsonObject[jsonRpcVersionKey] == "2.0";
+}
+
+const QJsonObject &JsonRpcMessage::toJsonObject() const
+{
+    return m_jsonObject;
+}
+
+JsonRpcMessage::JsonRpcMessage()
+{
+    // The language server protocol always uses “2.0” as the jsonrpc version
+    m_jsonObject[jsonRpcVersionKey] = "2.0";
+}
+
+constexpr int utf8mib = 106;
+
+static QString docType(const QJsonDocument &doc)
+{
+    if (doc.isArray())
+        return QString("array");
+    if (doc.isEmpty())
+        return QString("empty");
+    if (doc.isNull())
+        return QString("null");
+    if (doc.isObject())
+        return QString("object");
+    return {};
+}
+
+JsonRpcMessage::JsonRpcMessage(const BaseMessage &message)
+{
+    if (message.content.isEmpty())
+        return;
+    QByteArray content;
+    if (message.codec && message.codec->mibEnum() != utf8mib) {
+        QTextCodec *utf8 = QTextCodec::codecForMib(utf8mib);
+        if (utf8)
+            content = utf8->fromUnicode(message.codec->toUnicode(message.content));
+    }
+    if (content.isEmpty())
+        content = message.content;
+    QJsonParseError error = {0, QJsonParseError::NoError};
+    const QJsonDocument doc = QJsonDocument::fromJson(content, &error);
+    if (doc.isObject())
+        m_jsonObject = doc.object();
+    else if (doc.isNull())
+        m_parseError = Tr::tr("Could not parse JSON message: \"%1\".").arg(error.errorString());
+    else
+        m_parseError =
+            Tr::tr("Expected a JSON object, but got a JSON \"%1\" value.").arg(docType(doc));
+}
+
+JsonRpcMessage::JsonRpcMessage(const QJsonObject &jsonObject)
+    : m_jsonObject(jsonObject)
+{ }
+
+JsonRpcMessage::JsonRpcMessage(QJsonObject &&jsonObject)
+    : m_jsonObject(std::move(jsonObject))
+{ }
+
+QByteArray JsonRpcMessage::jsonRpcMimeType()
+{
+    return "application/vscode-jsonrpc";
+}
+
+CancelRequest::CancelRequest(const CancelParameter &params)
+    : Notification(methodName, params)
+{ }
+
+void logElapsedTime(const QString &method, const QElapsedTimer &t)
+{
+    qCDebug(timingLog) << "received server reply to" << method
+                       << "after" << t.elapsed() << "ms";
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/jsonrpcmessages.h b/src/shared/lsp/jsonrpcmessages.h
new file mode 100644
index 000000000..a523dd5e1
--- /dev/null
+++ b/src/shared/lsp/jsonrpcmessages.h
@@ -0,0 +1,415 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "basemessage.h"
+#include "jsonkeys.h"
+#include "lsptypes.h"
+
+#include <QDebug>
+#include <QElapsedTimer>
+#include <QHash>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QCoreApplication>
+#include <QUuid>
+
+#include <optional>
+#include <variant>
+
+namespace lsp {
+
+class JsonRpcMessage;
+
+class LANGUAGESERVERPROTOCOL_EXPORT MessageId : public std::variant<int, QString>
+{
+public:
+    MessageId() : variant(QString()) {}
+    explicit MessageId(int id) : variant(id) {}
+    explicit MessageId(const QString &id) : variant(id) {}
+    explicit MessageId(const QJsonValue &value)
+    {
+        if (value.isDouble())
+            emplace<int>(value.toInt());
+        else
+            emplace<QString>(value.toString());
+    }
+
+    operator QJsonValue() const
+    {
+        if (auto id = std::get_if<int>(this))
+            return *id;
+        if (auto id = std::get_if<QString>(this))
+            return *id;
+        return QJsonValue();
+    }
+
+    bool isValid() const
+    {
+        if (std::holds_alternative<int>(*this))
+            return true;
+        const QString *id = std::get_if<QString>(this);
+        QBS_ASSERT(id, return false);
+        return !id->isEmpty();
+    }
+
+    QString toString() const
+    {
+        if (auto id = std::get_if<QString>(this))
+            return *id;
+        if (auto id = std::get_if<int>(this))
+            return QString::number(*id);
+        return {};
+    }
+
+private:
+    friend size_t qHash(const MessageId &id)
+    {
+        if (std::holds_alternative<int>(id))
+            return QT_PREPEND_NAMESPACE(qHash(std::get<int>(id)));
+        if (std::holds_alternative<QString>(id))
+            return QT_PREPEND_NAMESPACE(qHash(std::get<QString>(id)));
+        return QT_PREPEND_NAMESPACE(qHash(0));
+    }
+
+    friend QDebug operator<<(QDebug stream, const MessageId &id)
+    {
+        if (std::holds_alternative<int>(id))
+            stream << std::get<int>(id);
+        else
+            stream << std::get<QString>(id);
+        return stream;
+    }
+};
+
+struct ResponseHandler
+{
+    MessageId id;
+    using Callback = std::function<void(const JsonRpcMessage &)>;
+    Callback callback;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT JsonRpcMessage
+{
+public:
+    JsonRpcMessage();
+    explicit JsonRpcMessage(const BaseMessage &message);
+    explicit JsonRpcMessage(const QJsonObject &jsonObject);
+    explicit JsonRpcMessage(QJsonObject &&jsonObject);
+
+    virtual ~JsonRpcMessage() = default;
+
+    static QByteArray jsonRpcMimeType();
+
+    QByteArray toRawData() const;
+    virtual bool isValid(QString *errorMessage) const;
+
+    const QJsonObject &toJsonObject() const;
+
+    const QString parseError() { return m_parseError; }
+
+    virtual std::optional<ResponseHandler> responseHandler() const { return std::nullopt; }
+
+    BaseMessage toBaseMessage() const
+    { return BaseMessage(jsonRpcMimeType(), toRawData()); }
+
+protected:
+    QJsonObject m_jsonObject;
+
+private:
+    QString m_parseError;
+};
+
+template <typename Params>
+class Notification : public JsonRpcMessage
+{
+public:
+    Notification(const QString &methodName, const Params &params)
+    {
+        setMethod(methodName);
+        setParams(params);
+    }
+
+    explicit Notification(const QJsonObject &jsonObject) : JsonRpcMessage(jsonObject) {}
+    explicit Notification(QJsonObject &&jsonObject) : JsonRpcMessage(std::move(jsonObject)) {}
+
+    QString method() const
+    { return fromJsonValue<QString>(m_jsonObject.value(methodKey)); }
+    void setMethod(const QString &method)
+    { m_jsonObject.insert(methodKey, method); }
+
+    using Parameters = Params;
+    std::optional<Params> params() const
+    {
+        const QJsonValue &params = m_jsonObject.value(paramsKey);
+        return params.isUndefined() ? std::nullopt : std::make_optional(Params(params));
+    }
+    void setParams(const Params &params)
+    { m_jsonObject.insert(paramsKey, QJsonValue(params)); }
+    void clearParams() { m_jsonObject.remove(paramsKey); }
+
+    bool isValid(QString *errorMessage) const override
+    {
+        return JsonRpcMessage::isValid(errorMessage)
+                && m_jsonObject.value(methodKey).isString()
+                && parametersAreValid(errorMessage);
+    }
+
+    virtual bool parametersAreValid(QString *errorMessage) const
+    {
+        if (auto parameter = params())
+            return parameter->isValid();
+        if (errorMessage)
+            *errorMessage = QCoreApplication::translate("QtC::LanguageServerProtocol",
+                                                        "No parameters in \"%1\".").arg(method());
+        return false;
+    }
+};
+
+template <>
+class Notification<std::nullptr_t> : public JsonRpcMessage
+{
+public:
+    Notification() : Notification(QString()) {}
+    explicit Notification(const QString &methodName, const std::nullptr_t &/*params*/ = nullptr)
+    {
+        setMethod(methodName);
+        setParams(nullptr);
+    }
+    using JsonRpcMessage::JsonRpcMessage;
+
+    QString method() const
+    { return fromJsonValue<QString>(m_jsonObject.value(methodKey)); }
+    void setMethod(const QString &method)
+    { m_jsonObject.insert(methodKey, method); }
+
+    std::optional<std::nullptr_t> params() const
+    { return nullptr; }
+    void setParams(const std::nullptr_t &/*params*/)
+    { m_jsonObject.insert(paramsKey, QJsonValue::Null); }
+    void clearParams() { m_jsonObject.remove(paramsKey); }
+
+    bool isValid(QString *errorMessage) const override
+    {
+        return JsonRpcMessage::isValid(errorMessage)
+               && m_jsonObject.value(methodKey).isString()
+               && parametersAreValid(errorMessage);
+    }
+
+    virtual bool parametersAreValid(QString * /*errorMessage*/) const
+    { return true; }
+};
+
+template <typename Error>
+class ResponseError : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    int code() const { return typedValue<int>(codeKey); }
+    void setCode(int code) { insert(codeKey, code); }
+
+    QString message() const { return typedValue<QString>(messageKey); }
+    void setMessage(const QString &message) { insert(messageKey, message); }
+
+    std::optional<Error> data() const { return optionalValue<Error>(dataKey); }
+    void setData(const Error &data) { insert(dataKey, data); }
+    void clearData() { remove(dataKey); }
+
+    bool isValid() const override { return contains(codeKey) && contains(messageKey); }
+
+    QString toString() const { return errorCodesToString(code()) + ": " + message(); }
+
+    // predefined error codes
+    enum ErrorCodes {
+        // Defined by JSON RPC
+        ParseError = -32700,
+        InvalidRequest = -32600,
+        MethodNotFound = -32601,
+        InvalidParams = -32602,
+        InternalError = -32603,
+        serverErrorStart = -32099,
+        serverErrorEnd = -32000,
+        ServerNotInitialized = -32002,
+        UnknownErrorCode = -32001,
+
+        // Defined by the protocol.
+        RequestCancelled = -32800
+    };
+
+#define CASE_ERRORCODES(x) case ErrorCodes::x: return QLatin1String(#x)
+    static QString errorCodesToString(int code)
+    {
+        switch (code) {
+        CASE_ERRORCODES(ParseError);
+        CASE_ERRORCODES(InvalidRequest);
+        CASE_ERRORCODES(MethodNotFound);
+        CASE_ERRORCODES(InvalidParams);
+        CASE_ERRORCODES(InternalError);
+        CASE_ERRORCODES(serverErrorStart);
+        CASE_ERRORCODES(serverErrorEnd);
+        CASE_ERRORCODES(ServerNotInitialized);
+        CASE_ERRORCODES(RequestCancelled);
+        default:
+            return QCoreApplication::translate("QtC::LanguageClient", "Error %1").arg(code);
+        }
+    }
+#undef CASE_ERRORCODES
+};
+
+template <typename Result, typename ErrorDataType>
+class Response : public JsonRpcMessage
+{
+public:
+    explicit Response(const MessageId &id) { setId(id); }
+    using JsonRpcMessage::JsonRpcMessage;
+
+    MessageId id() const
+    { return MessageId(m_jsonObject.value(idKey)); }
+    void setId(MessageId id)
+    { this->m_jsonObject.insert(idKey, id); }
+
+    std::optional<Result> result() const
+    {
+        const QJsonValue &result = m_jsonObject.value(resultKey);
+        if (result.isUndefined())
+            return std::nullopt;
+        return std::make_optional(Result(result));
+    }
+    void setResult(const Result &result) { m_jsonObject.insert(resultKey, QJsonValue(result)); }
+    void clearResult() { m_jsonObject.remove(resultKey); }
+
+    using Error = ResponseError<ErrorDataType>;
+    std::optional<Error> error() const
+    {
+        const QJsonValue &val = m_jsonObject.value(errorKey);
+        return val.isUndefined() ? std::nullopt : std::make_optional(fromJsonValue<Error>(val));
+    }
+    void setError(const Error &error)
+    {
+        m_jsonObject.insert(errorKey, QJsonValue(error));
+    }
+    void clearError() { m_jsonObject.remove(errorKey); }
+
+    bool isValid(QString *errorMessage) const override
+    { return JsonRpcMessage::isValid(errorMessage) && id().isValid(); }
+};
+
+template<typename ErrorDataType>
+class Response<std::nullptr_t, ErrorDataType> : public JsonRpcMessage
+{
+public:
+    explicit Response(const MessageId &id) { setId(id); }
+    using JsonRpcMessage::JsonRpcMessage;
+
+    MessageId id() const
+    { return MessageId(m_jsonObject.value(idKey)); }
+    void setId(MessageId id)
+    { this->m_jsonObject.insert(idKey, id); }
+
+    std::optional<std::nullptr_t> result() const
+    {
+        return m_jsonObject.value(resultKey).isNull() ? std::make_optional(nullptr) : std::nullopt;
+    }
+    void setResult(const std::nullptr_t &) { m_jsonObject.insert(resultKey, QJsonValue::Null); }
+    void clearResult() { m_jsonObject.remove(resultKey); }
+
+    using Error = ResponseError<ErrorDataType>;
+    std::optional<Error> error() const
+    {
+        const QJsonValue &val = m_jsonObject.value(errorKey);
+        return val.isUndefined() ? std::nullopt : std::make_optional(fromJsonValue<Error>(val));
+    }
+    void setError(const Error &error)
+    { m_jsonObject.insert(errorKey, QJsonValue(error)); }
+    void clearError() { m_jsonObject.remove(errorKey); }
+
+    bool isValid(QString *errorMessage) const override
+    { return JsonRpcMessage::isValid(errorMessage) && id().isValid(); }
+};
+
+void LANGUAGESERVERPROTOCOL_EXPORT logElapsedTime(const QString &method, const QElapsedTimer &t);
+
+template <typename Result, typename ErrorDataType, typename Params>
+class Request : public Notification<Params>
+{
+public:
+    Request(const QString &methodName, const Params &params)
+        : Notification<Params>(methodName, params)
+    { setId(MessageId(QUuid::createUuid().toString())); }
+    explicit Request(const QJsonObject &jsonObject) : Notification<Params>(jsonObject) { }
+    explicit Request(QJsonObject &&jsonObject) : Notification<Params>(std::move(jsonObject)) { }
+
+    MessageId id() const
+    { return MessageId(JsonRpcMessage::m_jsonObject.value(idKey)); }
+    void setId(const MessageId &id)
+    { JsonRpcMessage::m_jsonObject.insert(idKey, id); }
+
+    using Response = lsp::Response<Result, ErrorDataType>;
+    using ResponseCallback = std::function<void(Response)>;
+    void setResponseCallback(const ResponseCallback &callback)
+    { m_callBack = callback; }
+
+    std::optional<ResponseHandler> responseHandler() const final
+    {
+        QElapsedTimer timer;
+        timer.start();
+        auto callback = [callback = m_callBack, method = this->method(), t = std::move(timer)]
+                (const JsonRpcMessage &message) {
+            if (!callback)
+                return;
+            logElapsedTime(method, t);
+
+            callback(Response(message.toJsonObject()));
+        };
+        return std::make_optional(ResponseHandler{id(), callback});
+    }
+
+    bool isValid(QString *errorMessage) const override
+    {
+        if (!Notification<Params>::isValid(errorMessage))
+            return false;
+        if (id().isValid())
+            return true;
+        if (errorMessage)
+            *errorMessage = QCoreApplication::translate("QtC::LanguageServerProtocol",
+                                                        "No ID set in \"%1\".").arg(this->method());
+        return false;
+    }
+
+private:
+    ResponseCallback m_callBack;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CancelParameter : public JsonObject
+{
+public:
+    explicit CancelParameter(const MessageId &id) { setId(id); }
+    CancelParameter() = default;
+    using JsonObject::JsonObject;
+
+    MessageId id() const { return typedValue<MessageId>(idKey); }
+    void setId(const MessageId &id) { insert(idKey, id); }
+
+    bool isValid() const override { return contains(idKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CancelRequest : public Notification<CancelParameter>
+{
+public:
+    explicit CancelRequest(const CancelParameter &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "$/cancelRequest";
+};
+
+} // namespace lsp
+
+template <typename Error>
+inline QDebug operator<<(QDebug stream, const lsp::ResponseError<Error> &error)
+{
+    stream.nospace() << error.toString();
+    return stream;
+}
+
+Q_DECLARE_METATYPE(lsp::JsonRpcMessage)
diff --git a/src/shared/lsp/languagefeatures.cpp b/src/shared/lsp/languagefeatures.cpp
new file mode 100644
index 000000000..8ca771f68
--- /dev/null
+++ b/src/shared/lsp/languagefeatures.cpp
@@ -0,0 +1,399 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "languagefeatures.h"
+
+#include <cstddef>
+
+namespace lsp {
+
+constexpr const char HoverRequest::methodName[];
+constexpr const char GotoDefinitionRequest::methodName[];
+constexpr const char GotoTypeDefinitionRequest::methodName[];
+constexpr const char GotoImplementationRequest::methodName[];
+constexpr const char FindReferencesRequest::methodName[];
+constexpr const char DocumentHighlightsRequest::methodName[];
+constexpr const char DocumentSymbolsRequest::methodName[];
+constexpr const char CodeActionRequest::methodName[];
+constexpr const char CodeLensRequest::methodName[];
+constexpr const char CodeLensResolveRequest::methodName[];
+constexpr const char DocumentLinkRequest::methodName[];
+constexpr const char DocumentLinkResolveRequest::methodName[];
+constexpr const char DocumentColorRequest::methodName[];
+constexpr const char ColorPresentationRequest::methodName[];
+constexpr const char DocumentFormattingRequest::methodName[];
+constexpr const char DocumentRangeFormattingRequest::methodName[];
+constexpr const char DocumentOnTypeFormattingRequest::methodName[];
+constexpr const char RenameRequest::methodName[];
+constexpr const char SignatureHelpRequest::methodName[];
+constexpr const char PrepareRenameRequest::methodName[];
+
+HoverContent Hover::content() const
+{
+    return HoverContent(value(contentsKey));
+}
+
+void Hover::setContent(const HoverContent &content)
+{
+    if (auto val = std::get_if<MarkedString>(&content))
+        insert(contentsKey, *val);
+    else if (auto val = std::get_if<MarkupContent>(&content))
+        insert(contentsKey, *val);
+    else if (auto val = std::get_if<QList<MarkedString>>(&content))
+        insert(contentsKey, LanguageClientArray<MarkedString>(*val).toJson());
+    else
+        QBS_ASSERT("LanguageClient Using unknown type Hover::setContent",;);
+}
+
+HoverRequest::HoverRequest(const TextDocumentPositionParams &params)
+    : Request(methodName, params)
+{ }
+
+std::optional<MarkupOrString> ParameterInformation::documentation() const
+{
+    QJsonValue documentation = value(documentationKey);
+    if (documentation.isUndefined())
+        return std::nullopt;
+    return MarkupOrString(documentation);
+}
+
+GotoDefinitionRequest::GotoDefinitionRequest(const TextDocumentPositionParams &params)
+    : Request(methodName, params)
+{ }
+
+GotoTypeDefinitionRequest::GotoTypeDefinitionRequest(const TextDocumentPositionParams &params)
+    : Request(methodName, params)
+{ }
+
+GotoImplementationRequest::GotoImplementationRequest(const TextDocumentPositionParams &params)
+    : Request(methodName, params)
+{ }
+
+FindReferencesRequest::FindReferencesRequest(const ReferenceParams &params)
+    : Request(methodName, params)
+{ }
+
+DocumentHighlightsRequest::DocumentHighlightsRequest(const TextDocumentPositionParams &params)
+    : Request(methodName, params)
+{ }
+
+DocumentSymbolsRequest::DocumentSymbolsRequest(const DocumentSymbolParams &params)
+    : Request(methodName, params)
+{ }
+
+std::optional<QList<CodeActionKind> > CodeActionParams::CodeActionContext::only() const
+{
+    return optionalArray<CodeActionKind>(onlyKey);
+}
+
+void CodeActionParams::CodeActionContext::setOnly(const QList<CodeActionKind> &only)
+{
+    insertArray(onlyKey, only);
+}
+
+CodeActionRequest::CodeActionRequest(const CodeActionParams &params)
+    : Request(methodName, params)
+{ }
+
+CodeLensRequest::CodeLensRequest(const CodeLensParams &params)
+    : Request(methodName, params)
+{ }
+
+CodeLensResolveRequest::CodeLensResolveRequest(const CodeLens &params)
+    : Request(methodName, params)
+{ }
+
+DocumentLinkRequest::DocumentLinkRequest(const DocumentLinkParams &params)
+    : Request(methodName, params)
+{ }
+
+DocumentLinkResolveRequest::DocumentLinkResolveRequest(const DocumentLink &params)
+    : Request(methodName, params)
+{ }
+
+DocumentColorRequest::DocumentColorRequest(const DocumentColorParams &params)
+    : Request(methodName, params)
+{ }
+
+ColorPresentationRequest::ColorPresentationRequest(const ColorPresentationParams &params)
+    : Request(methodName, params)
+{ }
+
+QHash<QString, DocumentFormattingProperty> FormattingOptions::properties() const
+{
+    QHash<QString, DocumentFormattingProperty> ret;
+    for (const QString &key : keys()) {
+        if (key == tabSizeKey || key == insertSpaceKey)
+            continue;
+        QJsonValue property = value(key.toStdString());
+        if (property.isBool())
+            ret[key] = property.toBool();
+        if (property.isDouble())
+            ret[key] = property.toDouble();
+        if (property.isString())
+            ret[key] = property.toString();
+    }
+    return ret;
+}
+
+void FormattingOptions::setProperty(const std::string_view key, const DocumentFormattingProperty &property)
+{
+    using namespace std;
+    if (auto val = get_if<double>(&property))
+        insert(key, *val);
+    else if (auto val = get_if<QString>(&property))
+        insert(key, *val);
+    else if (auto val = get_if<bool>(&property))
+        insert(key, *val);
+}
+
+DocumentFormattingRequest::DocumentFormattingRequest(const DocumentFormattingParams &params)
+    : Request(methodName, params)
+{ }
+
+DocumentRangeFormattingRequest::DocumentRangeFormattingRequest(
+        const DocumentRangeFormattingParams &params)
+    : Request(methodName, params)
+{ }
+
+bool DocumentOnTypeFormattingParams::isValid() const
+{
+    return contains(textDocumentKey) && contains(positionKey) && contains(chKey)
+           && contains(optionsKey);
+}
+
+DocumentOnTypeFormattingRequest::DocumentOnTypeFormattingRequest(
+        const DocumentOnTypeFormattingParams &params)
+    : Request(methodName, params)
+{ }
+
+PrepareRenameRequest::PrepareRenameRequest(const TextDocumentPositionParams &params)
+    : Request(methodName, params)
+{ }
+
+bool RenameParams::isValid() const
+{
+    return contains(textDocumentKey) && contains(positionKey) && contains(newNameKey);
+}
+
+RenameRequest::RenameRequest(const RenameParams &params)
+    : Request(methodName, params)
+{ }
+
+std::optional<DocumentUri> DocumentLink::target() const
+{
+    if (std::optional<QString> optionalTarget = optionalValue<QString>(targetKey))
+        return std::make_optional(DocumentUri::fromProtocol(*optionalTarget));
+    return std::nullopt;
+}
+
+std::optional<QJsonValue> DocumentLink::data() const
+{
+    return contains(dataKey) ? std::make_optional(value(dataKey)) : std::nullopt;
+}
+
+TextDocumentParams::TextDocumentParams()
+    : TextDocumentParams(TextDocumentIdentifier())
+{ }
+
+TextDocumentParams::TextDocumentParams(const TextDocumentIdentifier &identifier)
+    : JsonObject()
+{
+    setTextDocument(identifier);
+}
+
+GotoResult::GotoResult(const QJsonValue &value)
+{
+    if (value.isArray()) {
+        QList<Location> locations;
+        for (auto arrayValue : value.toArray()) {
+            if (arrayValue.isObject())
+                locations.append(Location(arrayValue.toObject()));
+        }
+        emplace<QList<Location>>(locations);
+    } else if (value.isObject()) {
+        emplace<Location>(value.toObject());
+    } else {
+        emplace<std::nullptr_t>(nullptr);
+    }
+}
+
+template<typename Symbol>
+QList<Symbol> documentSymbolsResultArray(const QJsonArray &array)
+{
+    QList<Symbol> ret;
+    for (const auto &arrayValue : array) {
+        if (arrayValue.isObject())
+            ret << Symbol(arrayValue.toObject());
+    }
+    return ret;
+}
+
+DocumentSymbolsResult::DocumentSymbolsResult(const QJsonValue &value)
+{
+    if (value.isArray()) {
+        QJsonArray array = value.toArray();
+        if (array.isEmpty()) {
+            *this = QList<SymbolInformation>();
+        } else {
+            QJsonObject arrayObject = array.first().toObject();
+            if (arrayObject.contains(rangeKey))
+                *this = documentSymbolsResultArray<DocumentSymbol>(array);
+            else
+                *this = documentSymbolsResultArray<SymbolInformation>(array);
+        }
+    } else {
+        *this = nullptr;
+    }
+}
+
+DocumentHighlightsResult::DocumentHighlightsResult(const QJsonValue &value)
+{
+    if (value.isArray()) {
+        QList<DocumentHighlight> highlights;
+        for (auto arrayValue : value.toArray()) {
+            if (arrayValue.isObject())
+                highlights.append(DocumentHighlight(arrayValue.toObject()));
+        }
+        *this = highlights;
+    } else {
+        *this = nullptr;
+    }
+}
+
+MarkedString::MarkedString(const QJsonValue &value)
+{
+    if (value.isObject())
+        emplace<MarkedLanguageString>(MarkedLanguageString(value.toObject()));
+    else
+        emplace<QString>(value.toString());
+}
+
+bool MarkedString::isValid() const
+{
+    if (auto markedLanguageString = std::get_if<MarkedLanguageString>(this))
+        return markedLanguageString->isValid();
+    return true;
+}
+
+MarkedString::operator QJsonValue() const
+{
+    if (auto val = std::get_if<QString>(this))
+        return *val;
+    if (auto val = std::get_if<MarkedLanguageString>(this))
+        return QJsonValue(*val);
+    return {};
+}
+
+HoverContent::HoverContent(const QJsonValue &value)
+{
+    if (value.isArray()) {
+        emplace<QList<MarkedString>>(LanguageClientArray<MarkedString>(value).toList());
+    } else if (value.isObject()) {
+        const QJsonObject &object = value.toObject();
+        MarkedLanguageString markedLanguageString(object);
+        if (markedLanguageString.isValid())
+            emplace<MarkedString>(markedLanguageString);
+        else
+            emplace<MarkupContent>(MarkupContent(object));
+    } else if (value.isString()) {
+        emplace<MarkedString>(MarkedString(value.toString()));
+    }
+}
+
+bool HoverContent::isValid() const
+{
+    if (std::holds_alternative<MarkedString>(*this))
+        return std::get<MarkedString>(*this).isValid();
+    return true;
+}
+
+DocumentFormattingProperty::DocumentFormattingProperty(const QJsonValue &value)
+{
+    if (value.isBool())
+        *this = value.toBool();
+    if (value.isDouble())
+        *this = value.toDouble();
+    if (value.isString())
+        *this = value.toString();
+}
+
+SignatureHelpRequest::SignatureHelpRequest(const TextDocumentPositionParams &params)
+    : Request(methodName, params)
+{ }
+
+CodeActionResult::CodeActionResult(const QJsonValue &val)
+{
+    using ResultArray = QList<std::variant<Command, CodeAction>>;
+    if (val.isArray()) {
+        const QJsonArray array = val.toArray();
+        ResultArray result;
+        for (const QJsonValue &val : array) {
+            if (val.toObject().value(commandKey).isString()) {
+                const Command command(val);
+                if (command.isValid())
+                    result << command;
+            } else {
+                const CodeAction action(val);
+                if (action.isValid())
+                    result << action;
+            }
+        }
+        emplace<ResultArray>(result);
+        return;
+    }
+    emplace<std::nullptr_t>(nullptr);
+}
+
+PrepareRenameResult::PrepareRenameResult()
+    : std::variant<PlaceHolderResult, Range, std::nullptr_t>(nullptr)
+{}
+
+PrepareRenameResult::PrepareRenameResult(
+    const std::variant<PlaceHolderResult, Range, std::nullptr_t> &val)
+    : std::variant<PlaceHolderResult, Range, std::nullptr_t>(val)
+{}
+
+PrepareRenameResult::PrepareRenameResult(const PlaceHolderResult &val)
+    : std::variant<PlaceHolderResult, Range, std::nullptr_t>(val)
+
+{}
+
+PrepareRenameResult::PrepareRenameResult(const Range &val)
+    : std::variant<PlaceHolderResult, Range, std::nullptr_t>(val)
+{}
+
+PrepareRenameResult::PrepareRenameResult(const QJsonValue &val)
+{
+    if (val.isNull()) {
+        emplace<std::nullptr_t>(nullptr);
+    } else if (val.isObject()) {
+        const QJsonObject object = val.toObject();
+        if (object.keys().contains(rangeKey))
+            emplace<PlaceHolderResult>(PlaceHolderResult(object));
+        else
+            emplace<Range>(Range(object));
+    }
+}
+
+std::optional<QJsonValue> CodeLens::data() const
+{
+    return contains(dataKey) ? std::make_optional(value(dataKey)) : std::nullopt;
+}
+
+HoverResult::HoverResult(const QJsonValue &value)
+{
+    if (value.isObject())
+        emplace<Hover>(Hover(value.toObject()));
+    else
+        emplace<std::nullptr_t>(nullptr);
+}
+
+bool HoverResult::isValid() const
+{
+    if (auto hover = std::get_if<Hover>(this))
+        return hover->isValid();
+    return true;
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/languagefeatures.h b/src/shared/lsp/languagefeatures.h
new file mode 100644
index 000000000..13e3e9857
--- /dev/null
+++ b/src/shared/lsp/languagefeatures.h
@@ -0,0 +1,836 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+
+namespace lsp {
+
+/**
+ * MarkedString can be used to render human readable text. It is either a markdown string
+ * or a code-block that provides a language and a code snippet. The language identifier
+ * is semantically equal to the optional language identifier in fenced code blocks in GitHub
+ * issues. See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
+ *
+ * The pair of a language and a value is an equivalent to markdown:
+ * ```${language}
+ * ${value}
+ * ```
+ *
+ * Note that markdown strings will be sanitized - that means html will be escaped.
+* @deprecated use MarkupContent instead.
+*/
+class LANGUAGESERVERPROTOCOL_EXPORT MarkedLanguageString : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString language() const { return typedValue<QString>(languageKey); }
+    void setLanguage(const QString &language) { insert(languageKey, language); }
+
+    QString value() const { return typedValue<QString>(valueKey); }
+    void setValue(const QString &value) { insert(valueKey, value); }
+
+    bool isValid() const override { return contains(languageKey) && contains(valueKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT MarkedString
+    : public std::variant<QString, MarkedLanguageString>
+{
+public:
+    MarkedString() = default;
+    explicit MarkedString(const MarkedLanguageString &other)
+        : variant(other)
+    {}
+    explicit MarkedString(const QString &other)
+        : variant(other)
+    {}
+    explicit MarkedString(const QJsonValue &value);
+
+    bool isValid() const;
+    operator QJsonValue() const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT HoverContent
+    : public std::variant<MarkedString, QList<MarkedString>, MarkupContent>
+{
+public:
+    HoverContent() = default;
+    explicit HoverContent(const MarkedString &other) : variant(other) {}
+    explicit HoverContent(const QList<MarkedString> &other) : variant(other) {}
+    explicit HoverContent(const MarkupContent &other) : variant(other) {}
+    explicit HoverContent(const QJsonValue &value);
+    bool isValid() const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT Hover : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    HoverContent content() const;
+    void setContent(const HoverContent &content);
+
+    std::optional<Range> range() const { return optionalValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+    void clearRange() { remove(rangeKey); }
+
+    bool isValid() const override { return contains(contentsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT HoverResult : public std::variant<Hover, std::nullptr_t>
+{
+public:
+    HoverResult() : variant(nullptr) {}
+    explicit HoverResult(const Hover &hover) : variant(hover) {}
+    explicit HoverResult(const QJsonValue &value);
+    bool isValid() const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT HoverRequest
+    : public Request<HoverResult, std::nullptr_t, TextDocumentPositionParams>
+{
+public:
+    explicit HoverRequest(const TextDocumentPositionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/hover";
+};
+
+/**
+ * Represents a parameter of a callable-signature. A parameter can
+ * have a label and a doc-comment.
+ */
+class LANGUAGESERVERPROTOCOL_EXPORT ParameterInformation : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString label() const { return typedValue<QString>(labelKey); }
+    void setLabel(const QString &label) { insert(labelKey, label); }
+
+    std::optional<MarkupOrString> documentation() const;
+    void setDocumentation(const MarkupOrString &documentation)
+    { insert(documentationKey, documentation.toJson()); }
+    void clearDocumentation() { remove(documentationKey); }
+
+    bool isValid() const override { return contains(labelKey); }
+};
+
+/**
+ * Represents the signature of something callable. A signature
+ * can have a label, like a function-name, a doc-comment, and
+ * a set of parameters.
+ */
+class LANGUAGESERVERPROTOCOL_EXPORT SignatureInformation : public ParameterInformation
+{
+public:
+    using ParameterInformation::ParameterInformation;
+
+    std::optional<QList<ParameterInformation>> parameters() const
+    { return optionalArray<ParameterInformation>(parametersKey); }
+    void setParameters(const QList<ParameterInformation> &parameters)
+    { insertArray(parametersKey, parameters); }
+    void clearParameters() { remove(parametersKey); }
+
+    std::optional<int> activeParameter() const { return optionalValue<int>(activeParameterKey); }
+    void setActiveParameter(int activeParameter) { insert(activeParameterKey, activeParameter); }
+    void clearActiveParameter() { remove(activeParameterKey); }
+};
+
+/**
+ * Signature help represents the signature of something
+ * callable. There can be multiple signature but only one
+ * active and only one active parameter.
+ */
+class LANGUAGESERVERPROTOCOL_EXPORT SignatureHelp : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    /// One or more signatures.
+    QList<SignatureInformation> signatures() const
+    { return array<SignatureInformation>(signaturesKey); }
+    void setSignatures(const QList<SignatureInformation> &signatures)
+    { insertArray(signaturesKey, signatures); }
+
+    /**
+     * The active signature. If omitted or the value lies outside the
+     * range of `signatures` the value defaults to zero or is ignored if
+     * `signatures.length === 0`. Whenever possible implementors should
+     * make an active decision about the active signature and shouldn't
+     * rely on a default value.
+     * In future version of the protocol this property might become
+     * mandatory to better express this.
+     */
+    std::optional<int> activeSignature() const { return optionalValue<int>(activeSignatureKey); }
+    void setActiveSignature(int activeSignature) { insert(activeSignatureKey, activeSignature); }
+    void clearActiveSignature() { remove(activeSignatureKey); }
+
+    /**
+     * The active parameter of the active signature. If omitted or the value
+     * lies outside the range of `signatures[activeSignature].parameters`
+     * defaults to 0 if the active signature has parameters. If
+     * the active signature has no parameters it is ignored.
+     * In future version of the protocol this property might become
+     * mandatory to better express the active parameter if the
+     * active signature does have any.
+     */
+    std::optional<int> activeParameter() const { return optionalValue<int>(activeParameterKey); }
+    void setActiveParameter(int activeParameter) { insert(activeParameterKey, activeParameter); }
+    void clearActiveParameter() { remove(activeParameterKey); }
+
+    bool isValid() const override { return contains(signaturesKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SignatureHelpRequest
+    : public Request<LanguageClientValue<SignatureHelp>, std::nullptr_t, TextDocumentPositionParams>
+{
+public:
+    explicit SignatureHelpRequest(const TextDocumentPositionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/signatureHelp";
+};
+
+/// The result of a goto request can either be a location, a list of locations or null
+class LANGUAGESERVERPROTOCOL_EXPORT GotoResult
+        : public std::variant<Location, QList<Location>, std::nullptr_t>
+{
+public:
+    explicit GotoResult(const QJsonValue &value);
+    using variant::variant;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT GotoDefinitionRequest
+    : public Request<GotoResult, std::nullptr_t, TextDocumentPositionParams>
+{
+public:
+    explicit GotoDefinitionRequest(const TextDocumentPositionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/definition";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT GotoTypeDefinitionRequest : public Request<
+        GotoResult, std::nullptr_t, TextDocumentPositionParams>
+{
+public:
+    explicit GotoTypeDefinitionRequest(const TextDocumentPositionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/typeDefinition";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT GotoImplementationRequest : public Request<
+        GotoResult, std::nullptr_t, TextDocumentPositionParams>
+{
+public:
+    explicit GotoImplementationRequest(const TextDocumentPositionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/implementation";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ReferenceParams : public TextDocumentPositionParams
+{
+public:
+    using TextDocumentPositionParams::TextDocumentPositionParams;
+
+    class ReferenceContext : public JsonObject
+    {
+    public:
+        explicit ReferenceContext(bool includeDeclaration)
+        { setIncludeDeclaration(includeDeclaration); }
+        ReferenceContext() = default;
+        using JsonObject::JsonObject;
+        bool includeDeclaration() const { return typedValue<bool>(includeDeclarationKey); }
+        void setIncludeDeclaration(bool includeDeclaration)
+        { insert(includeDeclarationKey, includeDeclaration); }
+
+        bool isValid() const override { return contains(includeDeclarationKey); }
+    };
+
+    ReferenceContext context() const { return typedValue<ReferenceContext>(contextKey); }
+    void setContext(const ReferenceContext &context) { insert(contextKey, context); }
+
+    bool isValid() const override
+    { return TextDocumentPositionParams::isValid() && contains(contextKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT FindReferencesRequest : public Request<
+        LanguageClientArray<Location>, std::nullptr_t, ReferenceParams>
+{
+public:
+    explicit FindReferencesRequest(const ReferenceParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/references";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentHighlight : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    enum DocumentHighlightKind {
+        Text = 1,
+        Read = 2,
+        Write = 3
+    };
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    std::optional<int> kind() const { return optionalValue<int>(kindKey); }
+    void setKind(int kind) { insert(kindKey, kind); }
+    void clearKind() { remove(kindKey); }
+
+    bool isValid() const override { return contains(rangeKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentHighlightsResult
+        : public std::variant<QList<DocumentHighlight>, std::nullptr_t>
+{
+public:
+    using variant::variant;
+    DocumentHighlightsResult() : variant(nullptr) {}
+    explicit DocumentHighlightsResult(const QJsonValue &value);
+    using variant::operator=;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentHighlightsRequest : public Request<
+        DocumentHighlightsResult, std::nullptr_t, TextDocumentPositionParams>
+{
+public:
+    explicit DocumentHighlightsRequest(const TextDocumentPositionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/documentHighlight";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentParams : public JsonObject
+{
+public:
+    TextDocumentParams();
+    explicit TextDocumentParams(const TextDocumentIdentifier &identifier);
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    bool isValid() const override { return contains(textDocumentKey); }
+};
+
+using DocumentSymbolParams = TextDocumentParams;
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentSymbolsResult
+        : public std::variant<QList<SymbolInformation>, QList<DocumentSymbol>, std::nullptr_t>
+{
+public:
+    using variant::variant;
+    DocumentSymbolsResult() : variant(nullptr) {}
+    explicit DocumentSymbolsResult(const QJsonValue &value);
+    DocumentSymbolsResult(const DocumentSymbolsResult &other) : variant(other) {}
+    DocumentSymbolsResult(DocumentSymbolsResult &&other) : variant(std::move(other)) {}
+
+    using variant::operator=;
+    DocumentSymbolsResult &operator =(DocumentSymbolsResult &&other)
+    {
+        variant::operator=(std::move(other));
+        return *this;
+    }
+    DocumentSymbolsResult &operator =(const DocumentSymbolsResult &other)
+    {
+        variant::operator=(other);
+        return *this;
+    }
+    // Needed to make it usable in Qt 6 signals.
+    bool operator<(const DocumentSymbolsResult &other) const = delete;
+};
+
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentSymbolsRequest
+        : public Request<DocumentSymbolsResult, std::nullptr_t, DocumentSymbolParams>
+{
+public:
+    explicit DocumentSymbolsRequest(const DocumentSymbolParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/documentSymbol";
+};
+
+/**
+ * The kind of a code action.
+ *
+ * Kinds are a hierarchical list of identifiers separated by `.`, e.g. `"refactor.extract.function"`.
+ *
+ * The set of kinds is open and client needs to announce the kinds it supports to the server during
+ * initialization.
+ */
+
+using CodeActionKind = QString;
+
+/**
+ * A set of predefined code action kinds
+ */
+
+namespace CodeActionKinds {
+constexpr char QuickFix[] = "quickfix";
+constexpr char Refactor[] = "refactor";
+constexpr char RefactorExtract[] = "refactor.extract";
+constexpr char RefactorInline[] = "refactor.inline";
+constexpr char RefactorRewrite[] = "refactor.rewrite";
+constexpr char Source[] = "source";
+constexpr char SourceOrganizeImports[] = "source.organizeImports";
+}
+
+class LANGUAGESERVERPROTOCOL_EXPORT CodeActionParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    class LANGUAGESERVERPROTOCOL_EXPORT CodeActionContext : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        QList<Diagnostic> diagnostics() const { return array<Diagnostic>(diagnosticsKey); }
+        void setDiagnostics(const QList<Diagnostic> &diagnostics)
+        { insertArray(diagnosticsKey, diagnostics); }
+
+        std::optional<QList<CodeActionKind>> only() const;
+        void setOnly(const QList<CodeActionKind> &only);
+        void clearOnly() { remove(onlyKey); }
+
+        bool isValid() const override { return contains(diagnosticsKey); }
+    };
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    CodeActionContext context() const { return typedValue<CodeActionContext>(contextKey); }
+    void setContext(const CodeActionContext &context) { insert(contextKey, context); }
+
+    bool isValid() const override
+    { return contains(textDocumentKey) && contains(rangeKey) && contains(contextKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CodeAction : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString title() const { return typedValue<QString>(titleKey); }
+    void setTitle(QString title) { insert(titleKey, title); }
+
+    std::optional<CodeActionKind> kind() const { return optionalValue<CodeActionKind>(kindKey); }
+    void setKind(const CodeActionKind &kind) { insert(kindKey, kind); }
+    void clearKind() { remove(kindKey); }
+
+    std::optional<QList<Diagnostic>> diagnostics() const
+    { return optionalArray<Diagnostic>(diagnosticsKey); }
+    void setDiagnostics(const QList<Diagnostic> &diagnostics)
+    { insertArray(diagnosticsKey, diagnostics); }
+    void clearDiagnostics() { remove(diagnosticsKey); }
+
+    std::optional<WorkspaceEdit> edit() const { return optionalValue<WorkspaceEdit>(editKey); }
+    void setEdit(const WorkspaceEdit &edit) { insert(editKey, edit); }
+    void clearEdit() { remove(editKey); }
+
+    std::optional<Command> command() const { return optionalValue<Command>(commandKey); }
+    void setCommand(const Command &command) { insert(commandKey, command); }
+    void clearCommand() { remove(commandKey); }
+
+    bool isValid() const override { return contains(titleKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CodeActionResult
+    : public std::variant<QList<std::variant<Command, CodeAction>>, std::nullptr_t>
+{
+public:
+    using variant::variant;
+    explicit CodeActionResult(const QJsonValue &val);
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CodeActionRequest : public Request<
+        CodeActionResult, std::nullptr_t, CodeActionParams>
+{
+public:
+    explicit CodeActionRequest(const CodeActionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/codeAction";
+};
+
+using CodeLensParams = TextDocumentParams;
+
+class LANGUAGESERVERPROTOCOL_EXPORT CodeLens : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    std::optional<Command> command() const { return optionalValue<Command>(commandKey); }
+    void setCommand(const Command &command) { insert(commandKey, command); }
+    void clearCommand() { remove(commandKey); }
+
+    std::optional<QJsonValue> data() const;
+    void setData(const QJsonValue &data) { insert(dataKey, data); }
+    void clearData() { remove(dataKey); }
+
+    bool isValid() const override { return contains(rangeKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CodeLensRequest : public Request<
+        LanguageClientArray<CodeLens>, std::nullptr_t, CodeLensParams>
+{
+public:
+    explicit CodeLensRequest(const CodeLensParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/codeLens";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CodeLensResolveRequest : public Request<
+        CodeLens, std::nullptr_t, CodeLens>
+{
+public:
+    explicit CodeLensResolveRequest(const CodeLens &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "codeLens/resolve";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentLink : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    std::optional<DocumentUri> target() const;
+    void setTarget(const DocumentUri &target) { insert(targetKey, target.toString()); }
+    void clearTarget() { remove(targetKey); }
+
+    std::optional<QJsonValue> data() const;
+    void setData(const QJsonValue &data) { insert(dataKey, data); }
+    void clearData() { remove(dataKey); }
+
+    bool isValid() const override { return contains(rangeKey); }
+};
+
+using DocumentLinkParams = TextDocumentParams;
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentLinkRequest : public Request<
+        LanguageClientValue<DocumentLink>, std::nullptr_t, DocumentLinkParams>
+{
+public:
+    explicit DocumentLinkRequest(const DocumentLinkParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/documentLink";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentLinkResolveRequest : public Request<
+        DocumentLink, std::nullptr_t, DocumentLink>
+{
+public:
+    explicit DocumentLinkResolveRequest(const DocumentLink &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "documentLink/resolve";
+};
+
+using DocumentColorParams = TextDocumentParams;
+
+class LANGUAGESERVERPROTOCOL_EXPORT Color : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    double red() const { return typedValue<double>(redKey); }
+    void setRed(double red) { insert(redKey, red); }
+
+    double green() const { return typedValue<double>(greenKey); }
+    void setGreen(double green) { insert(greenKey, green); }
+
+    double blue() const { return typedValue<double>(blueKey); }
+    void setBlue(double blue) { insert(blueKey, blue); }
+
+    double alpha() const { return typedValue<double>(alphaKey); }
+    void setAlpha(double alpha) { insert(alphaKey, alpha); }
+
+    bool isValid() const override
+    { return contains(redKey) && contains(greenKey) && contains(blueKey) && contains(alphaKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ColorInformation : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(Range range) { insert(rangeKey, range); }
+
+    Color color() const { return typedValue<Color>(colorKey); }
+    void setColor(const Color &color) { insert(colorKey, color); }
+
+    bool isValid() const override { return contains(rangeKey) && contains(colorKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentColorRequest : public Request<
+        QList<ColorInformation>, std::nullptr_t, DocumentColorParams>
+{
+public:
+    explicit DocumentColorRequest(const DocumentColorParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/documentColor";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ColorPresentationParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    Color colorInfo() const { return typedValue<Color>(colorInfoKey); }
+    void setColorInfo(const Color &colorInfo) { insert(colorInfoKey, colorInfo); }
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    bool isValid() const override
+    { return contains(textDocumentKey) && contains(colorInfoKey) && contains(rangeKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ColorPresentation : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString label() const { return typedValue<QString>(labelKey); }
+    void setLabel(const QString &label) { insert(labelKey, label); }
+
+    std::optional<TextEdit> textEdit() const { return optionalValue<TextEdit>(textEditKey); }
+    void setTextEdit(const TextEdit &textEdit) { insert(textEditKey, textEdit); }
+    void clearTextEdit() { remove(textEditKey); }
+
+    std::optional<QList<TextEdit>> additionalTextEdits() const
+    { return optionalArray<TextEdit>(additionalTextEditsKey); }
+    void setAdditionalTextEdits(const QList<TextEdit> &additionalTextEdits)
+    { insertArray(additionalTextEditsKey, additionalTextEdits); }
+    void clearAdditionalTextEdits() { remove(additionalTextEditsKey); }
+
+    bool isValid() const override { return contains(labelKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ColorPresentationRequest : public Request<
+        QList<ColorPresentation>, std::nullptr_t, ColorPresentationParams>
+{
+public:
+    explicit ColorPresentationRequest(const ColorPresentationParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/colorPresentation";
+};
+
+class DocumentFormattingProperty : public std::variant<bool, double, QString>
+{
+public:
+    DocumentFormattingProperty() = default;
+    explicit DocumentFormattingProperty(const QJsonValue &value);
+    explicit DocumentFormattingProperty(const DocumentFormattingProperty &other)
+        : std::variant<bool, double, QString>(other) {}
+
+    using variant::variant;
+    using variant::operator=;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT FormattingOptions : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    int tabSize() const { return typedValue<int>(tabSizeKey); }
+    void setTabSize(int tabSize) { insert(tabSizeKey, tabSize); }
+
+    bool insertSpace() const { return typedValue<bool>(insertSpaceKey); }
+    void setInsertSpace(bool insertSpace) { insert(insertSpaceKey, insertSpace); }
+
+    std::optional<bool> trimTrailingWhitespace() const
+    { return optionalValue<bool>(trimTrailingWhitespaceKey); }
+    void setTrimTrailingWhitespace(bool trimTrailingWhitespace)
+    { insert(trimTrailingWhitespaceKey, trimTrailingWhitespace); }
+    void clearTrimTrailingWhitespace() { remove(trimTrailingWhitespaceKey); }
+
+    std::optional<bool> insertFinalNewline() const
+    { return optionalValue<bool>(insertFinalNewlineKey); }
+    void setInsertFinalNewline(bool insertFinalNewline)
+    { insert(insertFinalNewlineKey, insertFinalNewline); }
+    void clearInsertFinalNewline() { remove(insertFinalNewlineKey); }
+
+    std::optional<bool> trimFinalNewlines() const
+    { return optionalValue<bool>(trimFinalNewlinesKey); }
+    void setTrimFinalNewlines(bool trimFinalNewlines)
+    { insert(trimFinalNewlinesKey, trimFinalNewlines); }
+    void clearTrimFinalNewlines() { remove(trimFinalNewlinesKey); }
+
+    QHash<QString, DocumentFormattingProperty> properties() const;
+    void setProperty(const std::string_view key, const DocumentFormattingProperty &property);
+    void removeProperty(const std::string_view &key) { remove(key); }
+
+    bool isValid() const override { return contains(insertSpaceKey) && contains(tabSizeKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentFormattingParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    FormattingOptions options() const { return typedValue<FormattingOptions>(optionsKey); }
+    void setOptions(const FormattingOptions &options) { insert(optionsKey, options); }
+
+    bool isValid() const override { return contains(textDocumentKey) && contains(optionsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentFormattingRequest : public Request<
+        LanguageClientArray<TextEdit>, std::nullptr_t, DocumentFormattingParams>
+{
+public:
+    explicit DocumentFormattingRequest(const DocumentFormattingParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/formatting";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentRangeFormattingParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    FormattingOptions options() const { return typedValue<FormattingOptions>(optionsKey); }
+    void setOptions(const FormattingOptions &options) { insert(optionsKey, options); }
+
+    bool isValid() const override
+    { return contains(textDocumentKey) && contains(rangeKey) && contains(optionsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentRangeFormattingRequest : public Request<
+        LanguageClientArray<TextEdit>, std::nullptr_t, DocumentRangeFormattingParams>
+{
+public:
+    explicit DocumentRangeFormattingRequest(const DocumentRangeFormattingParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/rangeFormatting";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentOnTypeFormattingParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    Position position() const { return typedValue<Position>(positionKey); }
+    void setPosition(const Position &position) { insert(positionKey, position); }
+
+    QString ch() const { return typedValue<QString>(chKey); }
+    void setCh(const QString &ch) { insert(chKey, ch); }
+
+    FormattingOptions options() const { return typedValue<FormattingOptions>(optionsKey); }
+    void setOptions(const FormattingOptions &options) { insert(optionsKey, options); }
+
+    bool isValid() const override;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentOnTypeFormattingRequest : public Request<
+        LanguageClientArray<TextEdit>, std::nullptr_t, DocumentOnTypeFormattingParams>
+{
+public:
+    explicit DocumentOnTypeFormattingRequest(const DocumentOnTypeFormattingParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/onTypeFormatting";
+};
+
+class PlaceHolderResult : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    QString placeHolder() const { return typedValue<QString>(placeHolderKey); }
+    void setPlaceHolder(const QString &placeHolder) { insert(placeHolderKey, placeHolder); }
+
+    bool isValid() const override { return contains(rangeKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT PrepareRenameResult
+    : public std::variant<PlaceHolderResult, Range, std::nullptr_t>
+{
+public:
+    PrepareRenameResult();
+    PrepareRenameResult(const std::variant<PlaceHolderResult, Range, std::nullptr_t> &val);
+    explicit PrepareRenameResult(const PlaceHolderResult &val);
+    explicit PrepareRenameResult(const Range &val);
+    explicit PrepareRenameResult(const QJsonValue &val);
+
+    bool isValid() const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT PrepareRenameRequest
+    : public Request<PrepareRenameResult, std::nullptr_t, TextDocumentPositionParams>
+{
+public:
+    explicit PrepareRenameRequest(const TextDocumentPositionParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/prepareRename";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT RenameParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    Position position() const { return typedValue<Position>(positionKey); }
+    void setPosition(const Position &position) { insert(positionKey, position); }
+
+    QString newName() const { return typedValue<QString>(newNameKey); }
+    void setNewName(const QString &newName) { insert(newNameKey, newName); }
+
+    bool isValid() const override;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT RenameRequest : public Request<
+        WorkspaceEdit, std::nullptr_t, RenameParams>
+{
+public:
+    explicit RenameRequest(const RenameParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/rename";
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/languageserverprotocol_global.h b/src/shared/lsp/languageserverprotocol_global.h
new file mode 100644
index 000000000..7f06f1216
--- /dev/null
+++ b/src/shared/lsp/languageserverprotocol_global.h
@@ -0,0 +1,14 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QtGlobal>
+
+#if defined(LANGUAGESERVERPROTOCOL_LIBRARY)
+#  define LANGUAGESERVERPROTOCOL_EXPORT Q_DECL_EXPORT
+#elif defined(LANGUAGESERVERPROTOCOL_STATIC_LIBRARY)
+#  define LANGUAGESERVERPROTOCOL_EXPORT
+#else
+#  define LANGUAGESERVERPROTOCOL_EXPORT Q_DECL_IMPORT
+#endif
diff --git a/src/shared/lsp/languageserverprotocoltr.h b/src/shared/lsp/languageserverprotocoltr.h
new file mode 100644
index 000000000..a4e2f324c
--- /dev/null
+++ b/src/shared/lsp/languageserverprotocoltr.h
@@ -0,0 +1,15 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QCoreApplication>
+
+namespace lsp {
+
+struct Tr
+{
+    Q_DECLARE_TR_FUNCTIONS(QtC::LanguageServerProtocol)
+};
+
+} // LanguageServerProtocol
diff --git a/src/shared/lsp/link.cpp b/src/shared/lsp/link.cpp
new file mode 100644
index 000000000..e25b828d7
--- /dev/null
+++ b/src/shared/lsp/link.cpp
@@ -0,0 +1,35 @@
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "link.h"
+
+#include "textutils.h"
+
+namespace lsp::Utils {
+
+/*!
+    Returns the Link to \a filePath.
+    If \a canContainLineNumber is true the line number, and column number components
+    are extracted from the \a filePath's \c path() and the found \a postfix is set.
+
+    The following patterns are supported: \c {filepath.txt:19},
+    \c{filepath.txt:19:12}, \c {filepath.txt+19},
+    \c {filepath.txt+19+12}, and \c {filepath.txt(19)}.
+*/
+
+Link Link::fromString(const QString &filePathWithNumbers, bool canContainLineNumber)
+{
+    Link link;
+    if (!canContainLineNumber) {
+        link.targetFilePath = FilePath::fromUserInput(filePathWithNumbers);
+    } else {
+        int postfixPos = -1;
+        const Text::Position pos = Text::Position::fromFileName(filePathWithNumbers, postfixPos);
+        link.targetFilePath = FilePath::fromUserInput(filePathWithNumbers.left(postfixPos));
+        link.targetLine = pos.line;
+        link.targetColumn = pos.column;
+    }
+    return link;
+}
+
+} // namespace lsp::Utils
diff --git a/src/shared/lsp/link.h b/src/shared/lsp/link.h
new file mode 100644
index 000000000..eaafe280c
--- /dev/null
+++ b/src/shared/lsp/link.h
@@ -0,0 +1,78 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "filepath.h"
+
+#include <QMetaType>
+#include <QMultiHash>
+#include <QString>
+
+#include <functional>
+
+namespace lsp::Utils {
+
+class Link
+{
+public:
+    Link() = default;
+    Link(const FilePath &filePath, int line = 0, int column = 0)
+        : targetFilePath(filePath)
+        , targetLine(line)
+        , targetColumn(column)
+    {}
+
+    static Link fromString(const QString &filePathWithNumbers, bool canContainLineNumber = false);
+
+    bool hasValidTarget() const
+    {
+        if (!targetFilePath.isEmpty())
+            return true;
+        return !targetFilePath.scheme().isEmpty() || !targetFilePath.host().isEmpty();
+    }
+
+    bool hasValidLinkText() const
+    { return linkTextStart != linkTextEnd; }
+
+    bool operator==(const Link &other) const
+    {
+        return hasSameLocation(other)
+               && linkTextStart == other.linkTextStart
+               && linkTextEnd == other.linkTextEnd;
+    }
+    bool operator!=(const Link &other) const { return !(*this == other); }
+
+    bool hasSameLocation(const Link &other) const
+    {
+        return targetFilePath == other.targetFilePath
+               && targetLine == other.targetLine
+               && targetColumn == other.targetColumn;
+    }
+
+    friend size_t qHash(const Link &l, uint seed = 0)
+    { return QT_PREPEND_NAMESPACE(qHash)(l.targetFilePath, seed)
+                | QT_PREPEND_NAMESPACE(qHash(l.targetLine, seed))
+                | QT_PREPEND_NAMESPACE(qHash(l.targetColumn, seed)); }
+
+    int linkTextStart = -1;
+    int linkTextEnd = -1;
+
+    FilePath targetFilePath;
+    int targetLine = 0;
+    int targetColumn = 0;
+};
+
+using LinkHandler = std::function<void(const Link &)>;
+using Links = QList<Link>;
+
+} // namespace lsp::Utils
+
+namespace std {
+
+template<> struct hash<lsp::Utils::Link>
+{
+    size_t operator()(const lsp::Utils::Link &fn) const { return qHash(fn); }
+};
+
+} // std
diff --git a/src/shared/lsp/lsp.qbs b/src/shared/lsp/lsp.qbs
new file mode 100644
index 000000000..95323d332
--- /dev/null
+++ b/src/shared/lsp/lsp.qbs
@@ -0,0 +1,72 @@
+import qbs.Utilities
+
+QbsStaticLibrary {
+    name: "qtclsp"
+
+    Depends { name: "qbscore"; cpp.link: false }
+
+    Depends {
+        condition: Utilities.versionCompare(Qt.core.version, "6") >= 0
+        name: "Qt.core5compat"
+    }
+
+    cpp.defines: base.filter(function(d) { return d !== "QT_NO_CAST_FROM_ASCII"; })
+         .concat("LANGUAGESERVERPROTOCOL_STATIC_LIBRARY")
+
+    files: [
+        "algorithm.h",
+        "basemessage.cpp",
+        "basemessage.h",
+        "callhierarchy.cpp",
+        "callhierarchy.h",
+        "client.cpp",
+        "client.h",
+        "clientcapabilities.cpp",
+        "clientcapabilities.h",
+        "completion.cpp",
+        "completion.h",
+        "diagnostics.cpp",
+        "diagnostics.h",
+        "filepath.h",
+        "initializemessages.cpp",
+        "initializemessages.h",
+        "jsonkeys.h",
+        "jsonobject.cpp",
+        "jsonobject.h",
+        "jsonrpcmessages.cpp",
+        "jsonrpcmessages.h",
+        "languagefeatures.cpp",
+        "languagefeatures.h",
+        "languageserverprotocol_global.h",
+        "languageserverprotocoltr.h",
+        "link.cpp",
+        "link.h",
+        "lsptypes.cpp",
+        "lsptypes.h",
+        "lsputils.cpp",
+        "lsputils.h",
+        "messages.cpp",
+        "messages.h",
+        "predicates.h",
+        "progresssupport.cpp",
+        "progresssupport.h",
+        "semantictokens.cpp",
+        "semantictokens.h",
+        "servercapabilities.cpp",
+        "servercapabilities.h",
+        "shutdownmessages.cpp",
+        "shutdownmessages.h",
+        "textsynchronization.cpp",
+        "textsynchronization.h",
+        "textutils.cpp",
+        "textutils.h",
+        "workspace.cpp",
+        "workspace.h",
+    ]
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.defines: "LANGUAGESERVERPROTOCOL_STATIC_LIBRARY"
+        cpp.includePaths: exportingProduct.sourceDirectory + "/.."
+    }
+}
diff --git a/src/shared/lsp/lsptypes.cpp b/src/shared/lsp/lsptypes.cpp
new file mode 100644
index 000000000..751fc4e3d
--- /dev/null
+++ b/src/shared/lsp/lsptypes.cpp
@@ -0,0 +1,364 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "lsptypes.h"
+
+#include "languageserverprotocoltr.h"
+#include "lsputils.h"
+#include "textutils.h"
+
+#include <QFile>
+#include <QHash>
+#include <QJsonArray>
+#include <QMap>
+#include <QRegularExpression>
+#include <QVector>
+
+namespace lsp {
+
+std::optional<DiagnosticSeverity> Diagnostic::severity() const
+{
+    if (auto val = optionalValue<int>(severityKey))
+        return std::make_optional(static_cast<DiagnosticSeverity>(*val));
+    return std::nullopt;
+}
+
+std::optional<Diagnostic::Code> Diagnostic::code() const
+{
+    QJsonValue codeValue = value(codeKey);
+    auto it = find(codeKey);
+    if (codeValue.isUndefined())
+        return std::nullopt;
+    QJsonValue::Type type = it.value().type();
+    if (type != QJsonValue::String && type != QJsonValue::Double)
+        return std::make_optional(Code(QString()));
+    return std::make_optional(codeValue.isDouble() ? Code(codeValue.toInt())
+                                                   : Code(codeValue.toString()));
+}
+
+void Diagnostic::setCode(const Diagnostic::Code &code)
+{
+    insertVariant<int, QString>(codeKey, code);
+}
+
+std::optional<WorkspaceEdit::Changes> WorkspaceEdit::changes() const
+{
+    auto it = find(changesKey);
+    if (it == end())
+        return std::nullopt;
+    const QJsonObject &changesObject = it.value().toObject();
+    Changes changesResult;
+    for (const QString &key : changesObject.keys())
+        changesResult[DocumentUri::fromProtocol(key)] = LanguageClientArray<TextEdit>(changesObject.value(key)).toList();
+    return std::make_optional(changesResult);
+}
+
+void WorkspaceEdit::setChanges(const Changes &changes)
+{
+    QJsonObject changesObject;
+    const auto end = changes.end();
+    for (auto it = changes.begin(); it != end; ++it) {
+        QJsonArray edits;
+        for (const TextEdit &edit : it.value())
+            edits.append(QJsonValue(edit));
+        changesObject.insert(QJsonValue(it.key()).toString(), edits);
+    }
+    insert(changesKey, changesObject);
+}
+
+WorkSpaceFolder::WorkSpaceFolder(const DocumentUri &uri, const QString &name)
+{
+    setUri(uri);
+    setName(name);
+}
+
+MarkupOrString::MarkupOrString(const std::variant<QString, MarkupContent> &val)
+    : std::variant<QString, MarkupContent>(val)
+{ }
+
+MarkupOrString::MarkupOrString(const QString &val)
+    : std::variant<QString, MarkupContent>(val)
+{ }
+
+MarkupOrString::MarkupOrString(const MarkupContent &val)
+    : std::variant<QString, MarkupContent>(val)
+{ }
+
+MarkupOrString::MarkupOrString(const QJsonValue &val)
+{
+    if (val.isString()) {
+        emplace<QString>(val.toString());
+    } else {
+        MarkupContent markupContent(val.toObject());
+        if (markupContent.isValid())
+            emplace<MarkupContent>(MarkupContent(val.toObject()));
+    }
+}
+
+QJsonValue MarkupOrString::toJson() const
+{
+    if (std::holds_alternative<QString>(*this))
+        return std::get<QString>(*this);
+    if (std::holds_alternative<MarkupContent>(*this))
+        return QJsonValue(std::get<MarkupContent>(*this));
+    return {};
+}
+
+QMap<QString, QString> languageIds()
+{
+    static const QMap<QString, QString> languages({
+            {"Windows Bat","bat"                        },
+            {"BibTeX","bibtex"                          },
+            {"Clojure","clojure"                        },
+            {"Coffeescript","coffeescript"              },
+            {"C","c"                                    },
+            {"C++","cpp"                                },
+            {"C#","csharp"                              },
+            {"CSS","css"                                },
+            {"Diff","diff"                              },
+            {"Dockerfile","dockerfile"                  },
+            {"F#","fsharp"                              },
+            {"Git commit","git-commit"                  },
+            {"Git rebase","git-rebase"                  },
+            {"Go","go"                                  },
+            {"Groovy","groovy"                          },
+            {"Handlebars","handlebars"                  },
+            {"HTML","html"                              },
+            {"Ini","ini"                                },
+            {"Java","java"                              },
+            {"JavaScript","javascript"                  },
+            {"JSON","json"                              },
+            {"LaTeX","latex"                            },
+            {"Less","less"                              },
+            {"Lua","lua"                                },
+            {"Makefile","makefile"                      },
+            {"Markdown","markdown"                      },
+            {"Objective-C","objective-c"                },
+            {"Objective-C++","objective-cpp"            },
+            {"Perl6","perl6"                            },
+            {"Perl","perl"                              },
+            {"PHP","php"                                },
+            {"Powershell","powershell"                  },
+            {"Pug","jade"                               },
+            {"Python","python"                          },
+            {"R","r"                                    },
+            {"Razor (cshtml)","razor"                   },
+            {"Ruby","ruby"                              },
+            {"Rust","rust"                              },
+            {"Scss (syntax using curly brackets)","scss"},
+            {"Sass (indented syntax)","sass"            },
+            {"ShaderLab","shaderlab"                    },
+            {"Shell Script (Bash)","shellscript"        },
+            {"SQL","sql"                                },
+            {"Swift","swift"                            },
+            {"TypeScript","typescript"                  },
+            {"TeX","tex"                                },
+            {"Visual Basic","vb"                        },
+            {"XML","xml"                                },
+            {"XSL","xsl"                                },
+            {"YAML","yaml"                              }
+    });
+    return languages;
+}
+
+bool TextDocumentItem::isValid() const
+{
+    return contains(uriKey) && contains(languageIdKey) && contains(versionKey) && contains(textKey);
+}
+
+TextDocumentPositionParams::TextDocumentPositionParams()
+    : TextDocumentPositionParams(TextDocumentIdentifier(), Position())
+{
+
+}
+
+TextDocumentPositionParams::TextDocumentPositionParams(
+        const TextDocumentIdentifier &document, const Position &position)
+{
+    setTextDocument(document);
+    setPosition(position);
+}
+
+Position::Position(int line, int character)
+{
+    setLine(line);
+    setCharacter(character);
+}
+
+Range::Range(const Position &start, const Position &end)
+{
+    setStart(start);
+    setEnd(end);
+}
+
+bool Range::contains(const Range &other) const
+{
+    if (start() > other.start())
+        return false;
+    if (end() < other.end())
+        return false;
+    return true;
+}
+
+bool Range::overlaps(const Range &range) const
+{
+    return !isLeftOf(range) && !range.isLeftOf(*this);
+}
+
+QString expressionForGlob(QString globPattern)
+{
+    const QString anySubDir("qtc_anysubdir_id");
+    globPattern.replace("**/", anySubDir);
+    QString regexp = QRegularExpression::wildcardToRegularExpression(globPattern);
+    regexp.replace(anySubDir,"(.*[/\\\\])*");
+    regexp.replace("\\{", "(");
+    regexp.replace("\\}", ")");
+    regexp.replace(",", "|");
+    return regexp;
+}
+
+bool DocumentFilter::applies(const Utils::FilePath &fileName) const
+{
+    if (std::optional<QString> _pattern = pattern()) {
+        QRegularExpression::PatternOption option = QRegularExpression::NoPatternOption;
+        if (fileName.caseSensitivity() == Qt::CaseInsensitive)
+            option = QRegularExpression::CaseInsensitiveOption;
+        const QRegularExpression regexp(expressionForGlob(*_pattern), option);
+        if (regexp.isValid() && regexp.match(fileName.toString()).hasMatch())
+            return true;
+    }
+    // return false when any of the filter didn't match but return true when no filter was defined
+    return !contains(schemeKey) && !contains(languageKey) && !contains(patternKey);
+}
+
+Utils::Link Location::toLink(const DocumentUri::PathMapper &mapToHostPath) const
+{
+    if (!isValid())
+        return Utils::Link();
+
+    return Utils::Link(uri().toFilePath(mapToHostPath),
+                       range().start().line() + 1,
+                       range().start().character());
+}
+
+// Ensure %xx like %20 are really decoded using fromPercentEncoding
+// Else, a path with spaces would keep its %20 which would cause failure
+// to open the file by the text editor. This is the cases with compilers in
+// C:\Programs Files on Windows.
+DocumentUri::DocumentUri(const QString &other)
+    : QUrl(QUrl::fromPercentEncoding(other.toUtf8()))
+{ }
+
+DocumentUri::DocumentUri(const Utils::FilePath &other, const PathMapper &mapToServerPath)
+    : QUrl(QUrl::fromLocalFile(mapToServerPath(other).path()))
+{ }
+
+Utils::FilePath DocumentUri::toFilePath(const PathMapper &mapToHostPath) const
+{
+    if (isLocalFile()) {
+        const Utils::FilePath serverPath = Utils::FilePath::fromUserInput(toLocalFile());
+        QBS_ASSERT(mapToHostPath, return serverPath);
+        return mapToHostPath(serverPath);
+    }
+    return {};
+}
+
+DocumentUri DocumentUri::fromProtocol(const QString &uri)
+{
+    return DocumentUri(uri);
+}
+
+DocumentUri DocumentUri::fromFilePath(const Utils::FilePath &file, const PathMapper &mapToServerPath)
+{
+    return DocumentUri(file, mapToServerPath);
+}
+
+MarkupKind::MarkupKind(const QJsonValue &value)
+{
+    m_value = value.toString() == "markdown" ? markdown : plaintext;
+}
+
+MarkupKind::operator QJsonValue() const
+{
+    switch (m_value) {
+    case MarkupKind::markdown:
+        return "markdown";
+    case MarkupKind::plaintext:
+        return "plaintext";
+    }
+    return {};
+}
+
+DocumentChange::DocumentChange(const QJsonValue &value)
+{
+    const QString kind = value["kind"].toString();
+    if (kind == "create")
+        emplace<CreateFileOperation>(value);
+    else if (kind == "rename")
+        emplace<RenameFileOperation>(value);
+    else if (kind == "delete")
+        emplace<DeleteFileOperation>(value);
+    else
+        emplace<TextDocumentEdit>(value);
+}
+
+using DocumentChangeBase = std::variant<TextDocumentEdit, CreateFileOperation, RenameFileOperation, DeleteFileOperation>;
+
+bool DocumentChange::isValid() const
+{
+    return std::visit([](const auto &v) { return v.isValid(); }, DocumentChangeBase(*this));
+}
+
+DocumentChange::operator const QJsonValue () const
+{
+    return std::visit([](const auto &v) { return QJsonValue(v); }, DocumentChangeBase(*this));
+}
+
+CreateFileOperation::CreateFileOperation()
+{
+    insert(kindKey, "create");
+}
+
+QString CreateFileOperation::message(const DocumentUri::PathMapper &mapToHostPath) const
+{
+    return Tr::tr("Create %1").arg(uri().toFilePath(mapToHostPath).toUserOutput());
+}
+
+bool CreateFileOperation::isValid() const
+{
+    return contains(uriKey) && value(kindKey) == "create";
+}
+
+RenameFileOperation::RenameFileOperation()
+{
+    insert(kindKey, "rename");
+}
+
+QString RenameFileOperation::message(const DocumentUri::PathMapper &mapToHostPath) const
+{
+    return Tr::tr("Rename %1 to %2")
+        .arg(oldUri().toFilePath(mapToHostPath).toUserOutput(),
+             newUri().toFilePath(mapToHostPath).toUserOutput());
+}
+
+bool RenameFileOperation::isValid() const
+{
+    return contains(oldUriKey) && contains(newUriKey) && value(kindKey) == "rename";
+}
+
+DeleteFileOperation::DeleteFileOperation()
+{
+    insert(kindKey, "delete");
+}
+
+QString DeleteFileOperation::message(const DocumentUri::PathMapper &mapToHostPath) const
+{
+    return Tr::tr("Delete %1").arg(uri().toFilePath(mapToHostPath).toUserOutput());
+}
+
+bool DeleteFileOperation::isValid() const
+{
+    return contains(uriKey) && value(kindKey) == "delete";
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/lsptypes.h b/src/shared/lsp/lsptypes.h
new file mode 100644
index 000000000..52e7b95a9
--- /dev/null
+++ b/src/shared/lsp/lsptypes.h
@@ -0,0 +1,680 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonkeys.h"
+#include "jsonobject.h"
+#include "lsputils.h"
+#include "filepath.h"
+#include "link.h"
+
+#include <QJsonObject>
+#include <QUrl>
+#include <QList>
+
+#include <optional>
+#include <variant>
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentUri : public QUrl
+{
+public:
+    DocumentUri() = default;
+    using PathMapper = std::function<Utils::FilePath(const Utils::FilePath &)>;
+    Utils::FilePath toFilePath(const PathMapper &mapToHostPath) const;
+
+    static DocumentUri fromProtocol(const QString &uri);
+    static DocumentUri fromFilePath(const Utils::FilePath &file, const PathMapper &mapToServerPath);
+
+    operator QJsonValue() const { return QJsonValue(toString()); }
+
+private:
+    DocumentUri(const QString &other);
+    DocumentUri(const Utils::FilePath &other, const PathMapper &mapToServerPath);
+
+    friend class LanguageClientValue<QString>;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT Position : public JsonObject
+{
+public:
+    Position() = default;
+    Position(int line, int character);
+    using JsonObject::JsonObject;
+
+    // Line position in a document (zero-based).
+    int line() const { return typedValue<int>(lineKey); }
+    void setLine(int line) { insert(lineKey, line); }
+
+    /*
+     * Character offset on a line in a document (zero-based). Assuming that the line is
+     * represented as a string, the `character` value represents the gap between the
+     * `character` and `character + 1`.
+     *
+     * If the character value is greater than the line length it defaults back to the
+     * line length.
+     */
+    int character() const { return typedValue<int>(characterKey); }
+    void setCharacter(int character) { insert(characterKey, character); }
+
+    bool isValid() const override
+    { return contains(lineKey) && contains(characterKey); }
+};
+
+inline bool operator<(const Position &first, const Position &second)
+{
+    return first.line() < second.line()
+            || (first.line() == second.line() && first.character() < second.character());
+}
+
+inline bool operator>(const Position &first, const Position &second)
+{
+    return second < first;
+}
+
+inline bool operator>=(const Position &first, const Position &second)
+{
+    return !(first < second);
+}
+
+inline bool operator<=(const Position &first, const Position &second)
+{
+    return !(first > second);
+}
+
+class LANGUAGESERVERPROTOCOL_EXPORT Range : public JsonObject
+{
+public:
+    Range() = default;
+    Range(const Position &start, const Position &end);
+    using JsonObject::JsonObject;
+
+    // The range's start position.
+    Position start() const { return typedValue<Position>(startKey); }
+    void setStart(const Position &start) { insert(startKey, start); }
+
+    // The range's end position.
+    Position end() const { return typedValue<Position>(endKey); }
+    void setEnd(const Position &end) { insert(endKey, end); }
+
+    bool isEmpty() const { return start() == end(); }
+    bool contains(const Position &pos) const { return start() <= pos && pos <= end(); }
+    bool contains(const Range &other) const;
+    bool overlaps(const Range &range) const;
+    bool isLeftOf(const Range &other) const
+    { return isEmpty() || other.isEmpty() ? end() < other.start() : end() <= other.start(); }
+
+    bool isValid() const override
+    { return JsonObject::contains(startKey) && JsonObject::contains(endKey); }
+};
+
+inline bool operator==(const Range &r1, const Range &r2)
+{
+    return r1.contains(r2) && r2.contains(r1);
+}
+inline bool operator!=(const Range &r1, const Range &r2) { return !(r1 == r2); }
+
+class LANGUAGESERVERPROTOCOL_EXPORT Location : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+    void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    Utils::Link toLink(const DocumentUri::PathMapper &mapToHostPath) const;
+
+    bool isValid() const override { return contains(uriKey) && contains(rangeKey); }
+};
+
+enum class DiagnosticSeverity
+{
+    Error = 1,
+    Warning = 2,
+    Information = 3,
+    Hint = 4
+
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT Diagnostic : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // The range at which the message applies.
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    // The diagnostic's severity. Can be omitted. If omitted it is up to the
+    // client to interpret diagnostics as error, warning, info or hint.
+    std::optional<DiagnosticSeverity> severity() const;
+    void setSeverity(const DiagnosticSeverity &severity)
+    { insert(severityKey, static_cast<int>(severity)); }
+    void clearSeverity() { remove(severityKey); }
+
+    // The diagnostic's code, which might appear in the user interface.
+    using Code = std::variant<int, QString>;
+    std::optional<Code> code() const;
+    void setCode(const Code &code);
+    void clearCode() { remove(codeKey); }
+
+    // A human-readable string describing the source of this
+    // diagnostic, e.g. 'typescript' or 'super lint'.
+    std::optional<QString> source() const
+    { return optionalValue<QString>(sourceKey); }
+    void setSource(const QString &source) { insert(sourceKey, source); }
+    void clearSource() { remove(sourceKey); }
+
+    // The diagnostic's message.
+    QString message() const
+    { return typedValue<QString>(messageKey); }
+    void setMessage(const QString &message) { insert(messageKey, message); }
+
+    bool isValid() const override { return contains(rangeKey) && contains(messageKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT Command : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // Title of the command, like `save`.
+    QString title() const { return typedValue<QString>(titleKey); }
+    void setTitle(const QString &title) { insert(titleKey, title); }
+    void clearTitle() { remove(titleKey); }
+
+    // The identifier of the actual command handler.
+    QString command() const { return typedValue<QString>(commandKey); }
+    void setCommand(const QString &command) { insert(commandKey, command); }
+    void clearCommand() { remove(commandKey); }
+
+    // Arguments that the command handler should be invoked with.
+    std::optional<QJsonArray> arguments() const { return typedValue<QJsonArray>(argumentsKey); }
+    void setArguments(const QJsonArray &arguments) { insert(argumentsKey, arguments); }
+    void clearArguments() { remove(argumentsKey); }
+
+    bool isValid() const override { return contains(titleKey) && contains(commandKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextEdit : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // The range of the text document to be manipulated. To insert
+    // text into a document create a range where start === end.
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    // The string to be inserted. For delete operations use an empty string.
+    QString newText() const { return typedValue<QString>(newTextKey); }
+    void setNewText(const QString &text) { insert(newTextKey, text); }
+
+    bool isValid() const override
+    { return contains(rangeKey) && contains(newTextKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentIdentifier : public JsonObject
+{
+public:
+    TextDocumentIdentifier() : TextDocumentIdentifier(DocumentUri()) {}
+    explicit TextDocumentIdentifier(const DocumentUri &uri) { setUri(uri); }
+    using JsonObject::JsonObject;
+
+    // The text document's URI.
+    DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+    void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+    bool isValid() const override { return contains(uriKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT VersionedTextDocumentIdentifier : public TextDocumentIdentifier
+{
+public:
+    using TextDocumentIdentifier::TextDocumentIdentifier;
+
+    /*
+     * The version number of this document. If a versioned text document identifier
+     * is sent from the server to the client and the file is not open in the editor
+     * (the server has not received an open notification before) the server can send
+     * `null` to indicate that the version is known and the content on disk is the
+     * truth (as speced with document content ownership)
+     */
+    LanguageClientValue<int> version() const { return clientValue<int>(versionKey); }
+    void setVersion(LanguageClientValue<int> version) { insert(versionKey, version); }
+
+    bool isValid() const override
+    {
+        return TextDocumentIdentifier::isValid() && contains(versionKey);
+    }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentEdit : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // The text document to change.
+    VersionedTextDocumentIdentifier textDocument() const
+    { return  typedValue<VersionedTextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const VersionedTextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    // The edits to be applied.
+    QList<TextEdit> edits() const { return array<TextEdit>(editsKey); }
+    void setEdits(const QList<TextEdit> edits) { insertArray(editsKey, edits); }
+
+    bool isValid() const override { return contains(textDocumentKey) && contains(editsKey); }
+};
+
+class CreateFileOptions : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    std::optional<bool> overwrite() const { return optionalValue<bool>(overwriteKey); }
+    void setOverwrite(bool overwrite) { insert(overwriteKey, overwrite); }
+    void clearOverwrite() { remove(overwriteKey); }
+
+    std::optional<bool> ignoreIfExists() const { return optionalValue<bool>(ignoreIfExistsKey); }
+    void setIgnoreIfExists(bool ignoreIfExists) { insert(ignoreIfExistsKey, ignoreIfExists); }
+    void clearIgnoreIfExists() { remove(ignoreIfExistsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CreateFileOperation : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+    CreateFileOperation();
+
+    DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+    void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+    std::optional<CreateFileOptions> options() const
+    { return optionalValue<CreateFileOptions>(optionsKey); }
+    void setOptions(const CreateFileOptions &options) { insert(optionsKey, options); }
+    void clearOptions() { remove(optionsKey); }
+
+    QString message(const DocumentUri::PathMapper &mapToHostPath) const;
+
+    bool isValid() const override;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT RenameFileOperation : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+    RenameFileOperation();
+
+    DocumentUri oldUri() const { return DocumentUri::fromProtocol(typedValue<QString>(oldUriKey)); }
+    void setOldUri(const DocumentUri &oldUri) { insert(oldUriKey, oldUri); }
+
+    DocumentUri newUri() const { return DocumentUri::fromProtocol(typedValue<QString>(newUriKey)); }
+    void setNewUri(const DocumentUri &newUri) { insert(newUriKey, newUri); }
+
+    std::optional<CreateFileOptions> options() const
+    { return optionalValue<CreateFileOptions>(optionsKey); }
+    void setOptions(const CreateFileOptions &options) { insert(optionsKey, options); }
+    void clearOptions() { remove(optionsKey); }
+
+    QString message(const DocumentUri::PathMapper &mapToHostPath) const;
+
+    bool isValid() const override;
+};
+
+class DeleteFileOptions : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    std::optional<bool> recursive() const { return optionalValue<bool>(recursiveKey); }
+    void setRecursive(bool recursive) { insert(recursiveKey, recursive); }
+    void clearRecursive() { remove(recursiveKey); }
+
+    std::optional<bool> ignoreIfNotExists() const { return optionalValue<bool>(ignoreIfNotExistsKey); }
+    void setIgnoreIfNotExists(bool ignoreIfNotExists) { insert(ignoreIfNotExistsKey, ignoreIfNotExists); }
+    void clearIgnoreIfNotExists() { remove(ignoreIfNotExistsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DeleteFileOperation : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+    DeleteFileOperation();
+
+    DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+    void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+    std::optional<DeleteFileOptions> options() const
+    { return optionalValue<DeleteFileOptions>(optionsKey); }
+    void setOptions(const DeleteFileOptions &options) { insert(optionsKey, options); }
+    void clearOptions() { remove(optionsKey); }
+
+    QString message(const DocumentUri::PathMapper &mapToHostPath) const;
+
+    bool isValid() const override;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentChange
+    : public std::variant<TextDocumentEdit, CreateFileOperation, RenameFileOperation, DeleteFileOperation>
+{
+public:
+    using variant::variant;
+    DocumentChange(const QJsonValue &value);
+
+    bool isValid() const;
+
+    operator const QJsonValue() const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkspaceEdit : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // Holds changes to existing resources.
+    using Changes = QMap<DocumentUri, QList<TextEdit>>;
+    std::optional<Changes> changes() const;
+    void setChanges(const Changes &changes);
+
+    /*
+     * Depending on the client capability
+     * `workspace.workspaceEdit.resourceOperations` document changes are either
+     * an array of `TextDocumentEdit`s to express changes to n different text
+     * documents where each text document edit addresses a specific version of
+     * a text document. Or it can contain above `TextDocumentEdit`s mixed with
+     * create, rename and delete file / folder operations.
+     *
+     * Whether a client supports versioned document edits is expressed via
+     * `workspace.workspaceEdit.documentChanges` client capability.
+     *
+     * If a client neither supports `documentChanges` nor
+     * `workspace.workspaceEdit.resourceOperations` then only plain `TextEdit`s
+     * using the `changes` property are supported.
+     */
+    std::optional<QList<DocumentChange>> documentChanges() const
+    { return optionalArray<DocumentChange>(documentChangesKey); }
+    void setDocumentChanges(const QList<DocumentChange> &changes)
+    { insertArray(documentChangesKey, changes); }
+};
+
+LANGUAGESERVERPROTOCOL_EXPORT QMap<QString, QString> languageIds();
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentItem : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // The text document's URI.
+    DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+    void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+    // The text document's language identifier.
+    QString languageId() const { return typedValue<QString>(languageIdKey); }
+    void setLanguageId(const QString &id) { insert(languageIdKey, id); }
+
+    // The version number of this document (it will increase after each change, including undo/redo
+    int version() const { return typedValue<int>(versionKey); }
+    void setVersion(int version) { insert(versionKey, version); }
+
+    // The content of the opened text document.
+    QString text() const { return typedValue<QString>(textKey); }
+    void setText(const QString &text) { insert(textKey, text); }
+
+    bool isValid() const override;
+
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentPositionParams : public JsonObject
+{
+public:
+    TextDocumentPositionParams();
+    TextDocumentPositionParams(const TextDocumentIdentifier &document, const Position &position);
+    using JsonObject::JsonObject;
+
+    // The text document.
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &id) { insert(textDocumentKey, id); }
+
+    // The position inside the text document.
+    Position position() const { return typedValue<Position>(positionKey); }
+    void setPosition(const Position &position) { insert(positionKey, position); }
+
+    bool isValid() const override { return contains(textDocumentKey) && contains(positionKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentFilter : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // A language id, like `typescript`.
+    std::optional<QString> language() const { return optionalValue<QString>(languageKey); }
+    void setLanguage(const QString &language) { insert(languageKey, language); }
+    void clearLanguage() { remove(languageKey); }
+
+    // A Uri [scheme](#Uri.scheme), like `file` or `untitled`.
+    std::optional<QString> scheme() const { return optionalValue<QString>(schemeKey); }
+    void setScheme(const QString &scheme) { insert(schemeKey, scheme); }
+    void clearScheme() { remove(schemeKey); }
+
+    /**
+     * A glob pattern, like `*.{ts,js}`.
+     *
+     * Glob patterns can have the following syntax:
+     * - `*` to match one or more characters in a path segment
+     * - `?` to match on one character in a path segment
+     * - `**` to match any number of path segments, including none
+     * - `{}` to group sub patterns into an OR expression. (e.g. `*.{ts,js}`
+     *   matches all TypeScript and JavaScript files)
+     * - `[]` to declare a range of characters to match in a path segment
+     *   (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+     * - `[!...]` to negate a range of characters to match in a path segment
+     *   (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but
+     *   not `example.0`)
+     */
+    std::optional<QString> pattern() const { return optionalValue<QString>(patternKey); }
+    void setPattern(const QString &pattern) { insert(patternKey, pattern); }
+    void clearPattern() { remove(patternKey); }
+
+    bool applies(const Utils::FilePath &fileName) const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT MarkupKind
+{
+public:
+    enum Value { plaintext, markdown };
+    MarkupKind() = default;
+    MarkupKind(const Value value)
+        : m_value(value)
+    {}
+    explicit MarkupKind(const QJsonValue &value);
+
+    operator QJsonValue() const;
+    Value value() const { return m_value; }
+
+    bool operator==(const Value &value) const { return m_value == value; }
+
+    bool isValid() const { return true; }
+private:
+    Value m_value = plaintext;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT MarkupContent : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // The type of the Markup
+    MarkupKind kind() const { return MarkupKind(value(kindKey)); }
+    void setKind(MarkupKind kind) { insert(kindKey, kind); }
+    Qt::TextFormat textFormat() const
+    { return kind() == MarkupKind::markdown ? Qt::MarkdownText : Qt::PlainText; }
+
+    // The content itself
+    QString content() const { return typedValue<QString>(contentKey); }
+    void setContent(const QString &content) { insert(contentKey, content); }
+
+    bool isValid() const override
+    { return contains(kindKey) && contains(contentKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT MarkupOrString : public std::variant<QString, MarkupContent>
+{
+public:
+    MarkupOrString() = default;
+    explicit MarkupOrString(const std::variant<QString, MarkupContent> &val);
+    explicit MarkupOrString(const QString &val);
+    explicit MarkupOrString(const MarkupContent &val);
+    MarkupOrString(const QJsonValue &val);
+
+    bool isValid() const { return true; }
+
+    QJsonValue toJson() const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkSpaceFolder : public JsonObject
+{
+public:
+    WorkSpaceFolder() = default;
+    WorkSpaceFolder(const DocumentUri &uri, const QString &name);
+    using JsonObject::JsonObject;
+
+    // The associated URI for this workspace folder.
+    DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+    void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+    // The name of the workspace folder. Defaults to the uri's basename.
+    QString name() const { return typedValue<QString>(nameKey); }
+    void setName(const QString &name) { insert(nameKey, name); }
+
+    bool isValid() const override
+    { return contains(uriKey) && contains(nameKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SymbolInformation : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString name() const { return typedValue<QString>(nameKey); }
+    void setName(const QString &name) { insert(nameKey, name); }
+
+    int kind() const { return typedValue<int>(kindKey); }
+    void setKind(int kind) { insert(kindKey, kind); }
+
+    std::optional<bool> deprecated() const { return optionalValue<bool>(deprecatedKey); }
+    void setDeprecated(bool deprecated) { insert(deprecatedKey, deprecated); }
+    void clearDeprecated() { remove(deprecatedKey); }
+
+    Location location() const { return typedValue<Location>(locationKey); }
+    void setLocation(const Location &location) { insert(locationKey, location); }
+
+    std::optional<QString> containerName() const
+    { return optionalValue<QString>(containerNameKey); }
+    void setContainerName(const QString &containerName) { insert(containerNameKey, containerName); }
+    void clearContainerName() { remove(containerNameKey); }
+
+    bool isValid() const override
+    { return contains(nameKey) && contains(kindKey) && contains(locationKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DocumentSymbol : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString name() const { return typedValue<QString>(nameKey); }
+    void setName(const QString &name) { insert(nameKey, name); }
+
+    std::optional<QString> detail() const { return optionalValue<QString>(detailKey); }
+    void setDetail(const QString &detail) { insert(detailKey, detail); }
+    void clearDetail() { remove(detailKey); }
+
+    int kind() const { return typedValue<int>(kindKey); }
+    void setKind(int kind) { insert(kindKey, kind); }
+
+    std::optional<bool> deprecated() const { return optionalValue<bool>(deprecatedKey); }
+    void setDeprecated(bool deprecated) { insert(deprecatedKey, deprecated); }
+    void clearDeprecated() { remove(deprecatedKey); }
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(Range range) { insert(rangeKey, range); }
+
+    Range selectionRange() const { return typedValue<Range>(selectionRangeKey); }
+    void setSelectionRange(Range selectionRange) { insert(selectionRangeKey, selectionRange); }
+
+    std::optional<QList<DocumentSymbol>> children() const
+    { return optionalArray<DocumentSymbol>(childrenKey); }
+    void setChildren(QList<DocumentSymbol> children) { insertArray(childrenKey, children); }
+    void clearChildren() { remove(childrenKey); }
+};
+
+enum class SymbolKind {
+    File = 1,
+    FirstSymbolKind = File,
+    Module = 2,
+    Namespace = 3,
+    Package = 4,
+    Class = 5,
+    Method = 6,
+    Property = 7,
+    Field = 8,
+    Constructor = 9,
+    Enum = 10,
+    Interface = 11,
+    Function = 12,
+    Variable = 13,
+    Constant = 14,
+    String = 15,
+    Number = 16,
+    Boolean = 17,
+    Array = 18,
+    Object = 19,
+    Key = 20,
+    Null = 21,
+    EnumMember = 22,
+    Struct = 23,
+    Event = 24,
+    Operator = 25,
+    TypeParameter = 26,
+    LastSymbolKind = TypeParameter,
+};
+
+namespace CompletionItemKind {
+enum Kind {
+    Text = 1,
+    Method = 2,
+    Function = 3,
+    Constructor = 4,
+    Field = 5,
+    Variable = 6,
+    Class = 7,
+    Interface = 8,
+    Module = 9,
+    Property = 10,
+    Unit = 11,
+    Value = 12,
+    Enum = 13,
+    Keyword = 14,
+    Snippet = 15,
+    Color = 16,
+    File = 17,
+    Reference = 18,
+    Folder = 19,
+    EnumMember = 20,
+    Constant = 21,
+    Struct = 22,
+    Event = 23,
+    Operator = 24,
+    TypeParameter = 25
+};
+} // namespace CompletionItemKind
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/lsputils.cpp b/src/shared/lsp/lsputils.cpp
new file mode 100644
index 000000000..f26a8a21c
--- /dev/null
+++ b/src/shared/lsp/lsputils.cpp
@@ -0,0 +1,68 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "lsputils.h"
+
+#include <QHash>
+#include <QLoggingCategory>
+#include <QVector>
+
+namespace lsp {
+
+Q_LOGGING_CATEGORY(conversionLog, "qtc.languageserverprotocol.conversion", QtWarningMsg)
+
+template<>
+QString fromJsonValue<QString>(const QJsonValue &value)
+{
+    if (conversionLog().isDebugEnabled() && !value.isString())
+        qCDebug(conversionLog) << "Expected String in json value but got: " << value;
+    return value.toString();
+}
+
+template<>
+int fromJsonValue<int>(const QJsonValue &value)
+{
+    if (conversionLog().isDebugEnabled() && !value.isDouble())
+        qCDebug(conversionLog) << "Expected double in json value but got: " << value;
+    return value.toInt();
+}
+
+template<>
+double fromJsonValue<double>(const QJsonValue &value)
+{
+    if (conversionLog().isDebugEnabled() && !value.isDouble())
+        qCDebug(conversionLog) << "Expected double in json value but got: " << value;
+    return value.toDouble();
+}
+
+template<>
+bool fromJsonValue<bool>(const QJsonValue &value)
+{
+    if (conversionLog().isDebugEnabled() && !value.isBool())
+        qCDebug(conversionLog) << "Expected bool in json value but got: " << value;
+    return value.toBool();
+}
+
+template<>
+QJsonArray fromJsonValue<QJsonArray>(const QJsonValue &value)
+{
+    if (conversionLog().isDebugEnabled() && !value.isArray())
+        qCDebug(conversionLog) << "Expected Array in json value but got: " << value;
+    return value.toArray();
+}
+
+template<>
+QJsonObject fromJsonValue<QJsonObject>(const QJsonValue &value)
+{
+    if (conversionLog().isDebugEnabled() && !value.isObject())
+        qCDebug(conversionLog) << "Expected Object in json value but got: " << value;
+    return value.toObject();
+}
+
+template<>
+QJsonValue fromJsonValue<QJsonValue>(const QJsonValue &value)
+{
+    return value;
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/lsputils.h b/src/shared/lsp/lsputils.h
new file mode 100644
index 000000000..eb7a18342
--- /dev/null
+++ b/src/shared/lsp/lsputils.h
@@ -0,0 +1,160 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "languageserverprotocol_global.h"
+
+#include <tools/qbsassert.h>
+
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QLoggingCategory>
+
+#include <variant>
+
+namespace lsp {
+
+LANGUAGESERVERPROTOCOL_EXPORT Q_DECLARE_LOGGING_CATEGORY(conversionLog)
+
+template <typename T>
+T fromJsonValue(const QJsonValue &value)
+{
+    if (conversionLog().isDebugEnabled() && !value.isObject())
+        qCDebug(conversionLog) << "Expected Object in json value but got: " << value;
+    T result(value.toObject());
+    if (conversionLog().isDebugEnabled() && !result.isValid())
+        qCDebug(conversionLog) << typeid(result).name() << " is not valid: " << result;
+    return result;
+}
+
+template<>
+LANGUAGESERVERPROTOCOL_EXPORT QString fromJsonValue<QString>(const QJsonValue &value);
+
+template<>
+LANGUAGESERVERPROTOCOL_EXPORT int fromJsonValue<int>(const QJsonValue &value);
+
+template<>
+LANGUAGESERVERPROTOCOL_EXPORT double fromJsonValue<double>(const QJsonValue &value);
+
+template<>
+LANGUAGESERVERPROTOCOL_EXPORT bool fromJsonValue<bool>(const QJsonValue &value);
+
+template<>
+LANGUAGESERVERPROTOCOL_EXPORT QJsonObject fromJsonValue<QJsonObject>(const QJsonValue &value);
+
+template<>
+LANGUAGESERVERPROTOCOL_EXPORT QJsonArray fromJsonValue<QJsonArray>(const QJsonValue &value);
+
+template<>
+LANGUAGESERVERPROTOCOL_EXPORT QJsonValue fromJsonValue<QJsonValue>(const QJsonValue &value);
+
+template <typename T>
+class LanguageClientArray : public std::variant<QList<T>, std::nullptr_t>
+{
+public:
+    using std::variant<QList<T>, std::nullptr_t>::variant;
+    using std::variant<QList<T>, std::nullptr_t>::operator=;
+
+    LanguageClientArray() {}
+
+    explicit LanguageClientArray(const QList<T> &list)
+    { *this = list; }
+
+    explicit LanguageClientArray(const QJsonValue &value)
+    {
+        if (value.isArray()) {
+            QList<T> values;
+            values.reserve(value.toArray().count());
+            for (auto arrayValue : value.toArray())
+                values << fromJsonValue<T>(arrayValue);
+            *this = values;
+        } else {
+            *this = nullptr;
+        }
+    }
+
+    QJsonValue toJson() const
+    {
+        if (const auto list = std::get_if<QList<T>>(this)) {
+            QJsonArray array;
+            for (const T &value : *list)
+                array.append(QJsonValue(value));
+            return array;
+        }
+        return QJsonValue();
+    }
+
+    QList<T> toListOrEmpty() const
+    {
+        if (std::holds_alternative<QList<T>>(*this))
+            return std::get<QList<T>>(*this);
+        return {};
+    }
+
+    QList<T> toList() const
+    {
+        QBS_ASSERT(std::holds_alternative<QList<T>>(*this), return {});
+        return std::get<QList<T>>(*this);
+    }
+    bool isNull() const { return std::holds_alternative<std::nullptr_t>(*this); }
+};
+
+template <typename T>
+class LanguageClientValue : public std::variant<T, std::nullptr_t>
+{
+public:
+    using std::variant<T, std::nullptr_t>::operator=;
+
+    LanguageClientValue() : std::variant<T, std::nullptr_t>(nullptr) { }
+    LanguageClientValue(const T &value) : std::variant<T, std::nullptr_t>(value) { }
+    LanguageClientValue(const QJsonValue &value)
+    {
+        if (!QBS_GUARD(!value.isUndefined()) || value.isNull())
+            *this = nullptr;
+        else
+            *this = fromJsonValue<T>(value);
+    }
+
+    operator const QJsonValue() const
+    {
+        if (auto val = std::get_if<T>(this))
+            return QJsonValue(*val);
+        return QJsonValue();
+    }
+
+    T value(const T &defaultValue = T()) const
+    {
+        QBS_ASSERT(std::holds_alternative<T>(*this), return defaultValue);
+        return std::get<T>(*this);
+    }
+
+    template<typename Type>
+    LanguageClientValue<Type> transform()
+    {
+        QBS_ASSERT(!std::holds_alternative<T>(*this), return LanguageClientValue<Type>());
+        return Type(std::get<T>(*this));
+    }
+
+    bool isNull() const { return std::holds_alternative<std::nullptr_t>(*this); }
+};
+
+template <typename T>
+QJsonArray enumArrayToJsonArray(const QList<T> &values)
+{
+    QJsonArray array;
+    for (T value : values)
+        array.append(static_cast<int>(value));
+    return array;
+}
+
+template <typename T>
+QList<T> jsonArrayToList(const QJsonArray &array)
+{
+    QList<T> list;
+    for (const QJsonValue &val : array)
+        list << fromJsonValue<T>(val);
+    return list;
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/messages.cpp b/src/shared/lsp/messages.cpp
new file mode 100644
index 000000000..a909fdb82
--- /dev/null
+++ b/src/shared/lsp/messages.cpp
@@ -0,0 +1,45 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "messages.h"
+
+namespace lsp {
+
+constexpr const char ShowMessageNotification::methodName[];
+constexpr const char ShowMessageRequest::methodName[];
+constexpr const char LogMessageNotification::methodName[];
+constexpr const char TelemetryNotification::methodName[];
+
+ShowMessageNotification::ShowMessageNotification(const ShowMessageParams &params)
+    : Notification(methodName, params)
+{ }
+
+ShowMessageRequest::ShowMessageRequest(const ShowMessageRequestParams &params)
+    : Request(methodName, params)
+{ }
+
+LogMessageNotification::LogMessageNotification(const LogMessageParams &params)
+    : Notification(methodName, params)
+{ }
+
+TelemetryNotification::TelemetryNotification(const JsonObject &params)
+    : Notification(methodName, params)
+{ }
+
+static QString messageTypeName(int messageType)
+{
+    switch (messageType) {
+    case Error: return QString("Error");
+    case Warning: return QString("Warning");
+    case Info: return QString("Info");
+    case Log: return QString("Log");
+    }
+    return QString("");
+}
+
+QString ShowMessageParams::toString() const
+{
+    return messageTypeName(type()) + ": " + message();
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/messages.h b/src/shared/lsp/messages.h
new file mode 100644
index 000000000..8c7d05c6d
--- /dev/null
+++ b/src/shared/lsp/messages.h
@@ -0,0 +1,93 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+
+namespace lsp {
+
+enum MessageType {
+    Error = 1,
+    Warning = 2,
+    Info = 3,
+    Log = 4,
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ShowMessageParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    int type() const { return typedValue<int>(typeKey); }
+    void setType(int type) { insert(typeKey, type); }
+
+    QString message() const { return typedValue<QString>(messageKey); }
+    void setMessage(QString message) { insert(messageKey, message); }
+
+    QString toString() const;
+
+    bool isValid() const override
+    { return contains(typeKey) && contains(messageKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ShowMessageNotification : public Notification<ShowMessageParams>
+{
+public:
+    explicit ShowMessageNotification(const ShowMessageParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "window/showMessage";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT MessageActionItem : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString title() const { return typedValue<QString>(titleKey); }
+    void setTitle(QString title) { insert(titleKey, title); }
+
+    bool isValid() const override { return contains(titleKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ShowMessageRequestParams : public ShowMessageParams
+{
+public:
+    using ShowMessageParams::ShowMessageParams;
+
+    std::optional<QList<MessageActionItem>> actions() const
+    { return optionalArray<MessageActionItem>(actionsKey); }
+    void setActions(const QList<MessageActionItem> &actions) { insertArray(actionsKey, actions); }
+    void clearActions() { remove(actionsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ShowMessageRequest : public Request<
+        LanguageClientValue<MessageActionItem>, std::nullptr_t, ShowMessageRequestParams>
+{
+public:
+    explicit ShowMessageRequest(const ShowMessageRequestParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "window/showMessageRequest";
+};
+
+using LogMessageParams = ShowMessageParams;
+
+class LANGUAGESERVERPROTOCOL_EXPORT LogMessageNotification : public Notification<LogMessageParams>
+{
+public:
+    explicit LogMessageNotification(const LogMessageParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "window/logMessage";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TelemetryNotification : public Notification<JsonObject>
+{
+public:
+    explicit TelemetryNotification(const JsonObject &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "telemetry/event";
+
+    bool parametersAreValid(QString * /*error*/) const override { return params().has_value(); }
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/predicates.h b/src/shared/lsp/predicates.h
new file mode 100644
index 000000000..800a84757
--- /dev/null
+++ b/src/shared/lsp/predicates.h
@@ -0,0 +1,110 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <functional>
+#include <type_traits>
+#include <utility>
+
+namespace lsp::Utils
+{
+
+//////////////////
+// find helpers
+//////////////////
+template<typename R, typename S, typename T>
+decltype(auto) equal(R (S::*function)() const, T value)
+{
+    // This should use std::equal_to<> instead of std::equal_to<T>,
+    // but that's not supported everywhere yet, since it is C++14
+    return std::bind<bool>(std::equal_to<T>(), value, std::bind(function, std::placeholders::_1));
+}
+
+template<typename R, typename S, typename T>
+decltype(auto) equal(R S::*member, T value)
+{
+    return std::bind<bool>(std::equal_to<T>(), value, std::bind(member, std::placeholders::_1));
+}
+
+//////////////////
+// comparison predicates
+//////////////////
+template <typename Type>
+auto equalTo(Type &&value)
+{
+    return [value = std::forward<Type>(value)] (const auto &entry)
+    {
+        static_assert(std::is_same<std::decay_t<Type>,
+                      std::decay_t<decltype(entry)>>::value,
+                      "The container and predicate type of equalTo should be the same to prevent "
+                      "unnecessary conversion.");
+        return entry == value;
+    };
+}
+
+template <typename Type>
+auto unequalTo(Type &&value)
+{
+    return [value = std::forward<Type>(value)] (const auto &entry)
+    {
+        static_assert(std::is_same<std::decay_t<Type>,
+                      std::decay_t<decltype(entry)>>::value,
+                      "The container and predicate type of unequalTo should be the same to prevent "
+                      "unnecessary conversion.");
+        return !(entry == value);
+    };
+}
+
+template <typename Type>
+auto lessThan(Type &&value)
+{
+    return [value = std::forward<Type>(value)] (const auto &entry)
+    {
+        static_assert(std::is_same<std::decay_t<Type>,
+                      std::decay_t<decltype(entry)>>::value,
+                      "The container and predicate type of unequalTo should be the same to prevent "
+                      "unnecessary conversion.");
+        return entry < value;
+    };
+}
+
+template <typename Type>
+auto lessEqualThan(Type &&value)
+{
+    return [value = std::forward<Type>(value)] (const auto &entry)
+    {
+        static_assert(std::is_same<std::decay_t<Type>,
+                      std::decay_t<decltype(entry)>>::value,
+                      "The container and predicate type of lessEqualThan should be the same to "
+                      "prevent unnecessary conversion.");
+        return !(value < entry);
+    };
+}
+
+template <typename Type>
+auto greaterThan(Type &&value)
+{
+    return [value = std::forward<Type>(value)] (const auto &entry)
+    {
+        static_assert(std::is_same<std::decay_t<Type>,
+                      std::decay_t<decltype(entry)>>::value,
+                      "The container and predicate type of greaterThan should be the same to "
+                      "prevent unnecessary conversion.");
+        return value < entry;
+    };
+}
+
+template <typename Type>
+auto greaterEqualThan(Type &&value)
+{
+    return [value = std::forward<Type>(value)] (const auto &entry)
+    {
+        static_assert(std::is_same<std::decay_t<Type>,
+                      std::decay_t<decltype(entry)>>::value,
+                      "The container and predicate type of greaterEqualThan should be the same to "
+                      "prevent unnecessary conversion.");
+        return !(entry < value);
+    };
+}
+} // namespace Utils
diff --git a/src/shared/lsp/progresssupport.cpp b/src/shared/lsp/progresssupport.cpp
new file mode 100644
index 000000000..6a554b4f4
--- /dev/null
+++ b/src/shared/lsp/progresssupport.cpp
@@ -0,0 +1,54 @@
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "progresssupport.h"
+
+#include <QUuid>
+
+namespace lsp {
+
+ProgressToken::ProgressToken(const QJsonValue &value)
+{
+    if (!QBS_GUARD(value.isDouble() || value.isString()))
+        emplace<QString>(QUuid::createUuid().toString());
+    else if (value.isDouble())
+        emplace<int>(value.toInt());
+    else
+        emplace<QString>(value.toString());
+}
+
+ProgressToken::operator QJsonValue() const
+{
+    if (std::holds_alternative<QString>(*this))
+        return QJsonValue(std::get<QString>(*this));
+    return QJsonValue(std::get<int>(*this));
+}
+
+ProgressParams::ProgressType ProgressParams::value() const
+{
+    QJsonObject paramsValue = JsonObject::value(valueKey).toObject();
+    if (paramsValue[kindKey] == "begin")
+        return ProgressParams::ProgressType(WorkDoneProgressBegin(paramsValue));
+    if (paramsValue[kindKey] == "report")
+        return ProgressParams::ProgressType(WorkDoneProgressReport(paramsValue));
+    return ProgressParams::ProgressType(WorkDoneProgressEnd(paramsValue));
+}
+
+void ProgressParams::setValue(const ProgressParams::ProgressType &value)
+{
+    insertVariant<WorkDoneProgressBegin, WorkDoneProgressReport, WorkDoneProgressEnd>(valueKey, value);
+}
+
+ProgressNotification::ProgressNotification(const ProgressParams &params)
+    : Notification(methodName, params)
+{
+
+}
+
+WorkDoneProgressCreateRequest::WorkDoneProgressCreateRequest(const WorkDoneProgressCreateParams &params)
+    : Request(methodName, params)
+{
+
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/progresssupport.h b/src/shared/lsp/progresssupport.h
new file mode 100644
index 000000000..8ccc34c37
--- /dev/null
+++ b/src/shared/lsp/progresssupport.h
@@ -0,0 +1,152 @@
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+
+#include <QJsonValue>
+
+#include <variant>
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT ProgressToken : public std::variant<int, QString>
+{
+public:
+    using variant::variant;
+    explicit ProgressToken(const QJsonValue &value);
+
+    bool isValid() { return true; }
+    operator QJsonValue() const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkDoneProgressReport : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    /**
+     * Controls if a cancel button should be shown to allow the user to cancel the
+     * long running operation.
+     * Clients that don't support cancellation can ignore the setting.
+     */
+    std::optional<bool> cancellable() const { return optionalValue<bool>(cancellableKey); }
+    void setCancellable(bool cancellable) { insert(cancellableKey, cancellable); }
+    void clearCancellable() { remove(cancellableKey); }
+
+    /**
+     * Optional, more detailed associated progress message. Contains
+     * complementary information to the `title`.
+     *
+     * Examples: "3/25 files", "project/src/module2", "node_modules/some_dep".
+     * If unset, the previous progress message (if any) is still valid.
+     */
+    std::optional<QString> message() const { return optionalValue<QString>(messageKey); }
+    void setMessage(const QString &message) { insert(messageKey, message); }
+    void clearMessage() { remove(messageKey); }
+
+    /**
+     * Optional progress percentage to display (value 100 is considered 100%).
+     * If not provided infinite progress is assumed and clients are allowed
+     * to ignore the `percentage` value in subsequent in report notifications.
+     *
+     * The value should be steadily rising. Clients are free to ignore values
+     * that are not following this rule.
+     */
+
+    // Allthough percentage is defined as an uint by the protocol some server
+    // return a double here. Be less strict and also use a double.
+    // CAUTION: the range is still 0 - 100 and not 0 - 1
+    std::optional<double> percentage() const { return optionalValue<double>(percentageKey); }
+    void setPercentage(double percentage) { insert(percentageKey, percentage); }
+    void clearPercentage() { remove(percentageKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkDoneProgressBegin : public WorkDoneProgressReport
+{
+public:
+    using WorkDoneProgressReport::WorkDoneProgressReport;
+
+    /**
+     * Mandatory title of the progress operation. Used to briefly inform about
+     * the kind of operation being performed.
+     *
+     * Examples: "Indexing" or "Linking dependencies".
+     */
+
+    QString title() const { return typedValue<QString>(titleKey); }
+    void setTitle(const QString &title) { insert(titleKey, title); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkDoneProgressEnd : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    /**
+     * Optional, a final message indicating to for example indicate the outcome
+     * of the operation.
+     */
+    std::optional<QString> message() const { return optionalValue<QString>(messageKey); }
+    void setMessage(const QString &message) { insert(messageKey, message); }
+    void clearMessage() { remove(messageKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ProgressParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    ProgressToken token() const { return ProgressToken(JsonObject::value(tokenKey)); }
+    void setToken(const ProgressToken &token) { insert(tokenKey, token); }
+
+    using ProgressType
+        = std::variant<WorkDoneProgressBegin, WorkDoneProgressReport, WorkDoneProgressEnd>;
+    ProgressType value() const;
+    void setValue(const ProgressType &value);
+
+    bool isValid() const override { return contains(tokenKey) && contains(valueKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ProgressNotification : public Notification<ProgressParams>
+{
+public:
+    ProgressNotification(const ProgressParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "$/progress";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ProgressTokenParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // The token to be used to report progress.
+    ProgressToken token() const { return typedValue<ProgressToken>(tokenKey); }
+    void setToken(const ProgressToken &token) { insert(tokenKey, token); }
+};
+
+using WorkDoneProgressCreateParams = ProgressTokenParams;
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkDoneProgressCreateRequest
+    : public Request<std::nullptr_t, std::nullptr_t, WorkDoneProgressCreateParams>
+{
+public:
+    WorkDoneProgressCreateRequest(const WorkDoneProgressCreateParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "window/workDoneProgress/create";
+};
+
+using WorkDoneProgressCancelParams = ProgressTokenParams;
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkDoneProgressCancelRequest
+    : public Request<std::nullptr_t, std::nullptr_t, WorkDoneProgressCancelParams>
+{
+public:
+    using Request::Request;
+    constexpr static const char methodName[] = "window/workDoneProgress/cancel";
+};
+
+
+} // namespace lsp
diff --git a/src/shared/lsp/semantictokens.cpp b/src/shared/lsp/semantictokens.cpp
new file mode 100644
index 000000000..209966dcf
--- /dev/null
+++ b/src/shared/lsp/semantictokens.cpp
@@ -0,0 +1,141 @@
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "semantictokens.h"
+
+namespace lsp {
+
+bool SemanticTokensLegend::isValid() const
+{
+    return contains(tokenTypesKey) && contains(tokenModifiersKey);
+}
+
+QMap<QString, int> SemanticTokens::defaultTokenTypesMap()
+{
+    QMap<QString, int> map;
+    map.insert("namespace", namespaceToken);
+    map.insert("type", typeToken);
+    map.insert("class", classToken);
+    map.insert("enum", enumToken);
+    map.insert("interface", interfaceToken);
+    map.insert("struct", structToken);
+    map.insert("typeParameter", typeParameterToken);
+    map.insert("parameter", parameterToken);
+    map.insert("variable", variableToken);
+    map.insert("property", propertyToken);
+    map.insert("enumMember", enumMemberToken);
+    map.insert("event", eventToken);
+    map.insert("function", functionToken);
+    map.insert("method", methodToken);
+    map.insert("macro", macroToken);
+    map.insert("keyword", keywordToken);
+    map.insert("modifier", modifierToken);
+    map.insert("comment", commentToken);
+    map.insert("string", stringToken);
+    map.insert("number", numberToken);
+    map.insert("regexp", regexpToken);
+    map.insert("operator", operatorToken);
+    return map;
+}
+
+QMap<QString, int> SemanticTokens::defaultTokenModifiersMap()
+{
+    QMap<QString, int> map;
+    map.insert("declaration", declarationModifier);
+    map.insert("definition", definitionModifier);
+    map.insert("readonly", readonlyModifier);
+    map.insert("static", staticModifier);
+    map.insert("deprecated", deprecatedModifier);
+    map.insert("abstract", abstractModifier);
+    map.insert("async", asyncModifier);
+    map.insert("modification", modificationModifier);
+    map.insert("documentation", documentationModifier);
+    map.insert("defaultLibrary", defaultLibraryModifier);
+    return map;
+}
+
+static int convertModifiers(int modifiersData, const QList<int> &tokenModifiers)
+{
+    int result = 0;
+    for (int i = 0; i < tokenModifiers.size() && modifiersData > 0; ++i) {
+        if (modifiersData & 0x1) {
+            const int modifier = tokenModifiers[i];
+            if (modifier > 0)
+                result |= modifier;
+        }
+        modifiersData = modifiersData >> 1;
+    }
+    return result;
+}
+
+QList<SemanticToken> SemanticTokens::toTokens(const QList<int> &tokenTypes,
+                                              const QList<int> &tokenModifiers) const
+{
+    const QList<int> &data = this->data();
+    if (data.size() % 5 != 0)
+        return {};
+    QList<SemanticToken> tokens;
+    tokens.reserve(int(data.size() / 5));
+    auto end = data.end();
+    for (auto it = data.begin(); it != end; it += 5) {
+        SemanticToken token;
+        token.deltaLine = *(it);
+        token.deltaStart = *(it + 1);
+        token.length = *(it + 2);
+        token.tokenIndex = *(it + 3);
+        token.tokenType = tokenTypes.value(token.tokenIndex, -1);
+        token.rawTokenModifiers = *(it + 4);
+        token.tokenModifiers = convertModifiers(token.rawTokenModifiers, tokenModifiers);
+        tokens << token;
+    }
+    return tokens;
+}
+
+bool SemanticTokensRangeParams::isValid() const
+{
+    return SemanticTokensParams::isValid() && contains(rangeKey);
+}
+
+SemanticTokensFullRequest::SemanticTokensFullRequest(const SemanticTokensParams &params)
+    : Request(methodName, params)
+{}
+
+SemanticTokensRangeRequest::SemanticTokensRangeRequest(const SemanticTokensRangeParams &params)
+    : Request(methodName, params)
+{}
+
+SemanticTokensResult::SemanticTokensResult(const QJsonValue &value)
+{
+    if (value.isObject())
+        emplace<SemanticTokens>(SemanticTokens(value.toObject()));
+    else
+        emplace<std::nullptr_t>(nullptr);
+}
+
+SemanticTokensFullDeltaRequest::SemanticTokensFullDeltaRequest(const SemanticTokensDeltaParams &params)
+    : Request(methodName, params)
+{}
+
+bool SemanticTokensDeltaParams::isValid() const
+{
+    return SemanticTokensParams::isValid() && contains(previousResultIdKey);
+}
+
+SemanticTokensDeltaResult::SemanticTokensDeltaResult(const QJsonValue &value)
+{
+    if (value.isObject()) {
+        QJsonObject object = value.toObject();
+        if (object.contains(editsKey))
+            emplace<SemanticTokensDelta>(object);
+        else
+            emplace<SemanticTokens>(object);
+    } else {
+        emplace<std::nullptr_t>(nullptr);
+    }
+}
+
+SemanticTokensRefreshRequest::SemanticTokensRefreshRequest()
+    : Request(methodName, nullptr)
+{}
+
+} // namespace lsp
diff --git a/src/shared/lsp/semantictokens.h b/src/shared/lsp/semantictokens.h
new file mode 100644
index 000000000..2dce74aa4
--- /dev/null
+++ b/src/shared/lsp/semantictokens.h
@@ -0,0 +1,230 @@
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonkeys.h"
+#include "jsonobject.h"
+#include "jsonrpcmessages.h"
+#include "languageserverprotocol_global.h"
+#include "lsptypes.h"
+
+namespace lsp {
+
+struct LANGUAGESERVERPROTOCOL_EXPORT SemanticToken
+{
+    int deltaLine = 0;
+    int deltaStart = 0;
+    int length = 0;
+    int tokenIndex = 0;
+    int tokenType = 0;
+    int rawTokenModifiers = 0;
+    int tokenModifiers = 0;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensLegend : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // The token types a server uses.
+    QList<QString> tokenTypes() const { return array<QString>(tokenTypesKey); }
+    void setTokenTypes(const QList<QString> &tokenTypes) { insertArray(tokenTypesKey, tokenTypes); }
+
+    // The token modifiers a server uses.
+    QList<QString> tokenModifiers() const { return array<QString>(tokenModifiersKey); }
+    void setTokenModifiers(const QList<QString> &value) { insertArray(tokenModifiersKey, value); }
+
+    bool isValid() const override;
+};
+
+enum SemanticTokenTypes {
+    namespaceToken,
+    typeToken,
+    classToken,
+    enumToken,
+    interfaceToken,
+    structToken,
+    typeParameterToken,
+    parameterToken,
+    variableToken,
+    propertyToken,
+    enumMemberToken,
+    eventToken,
+    functionToken,
+    methodToken,
+    macroToken,
+    keywordToken,
+    modifierToken,
+    commentToken,
+    stringToken,
+    numberToken,
+    regexpToken,
+    operatorToken
+};
+
+enum SemanticTokenModifiers {
+    declarationModifier = 0x1,
+    definitionModifier = 0x2,
+    readonlyModifier = 0x4,
+    staticModifier = 0x8,
+    deprecatedModifier = 0x10,
+    abstractModifier = 0x20,
+    asyncModifier = 0x40,
+    modificationModifier = 0x80,
+    documentationModifier = 0x100,
+    defaultLibraryModifier = 0x200
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    bool isValid() const override { return contains(textDocumentKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensDeltaParams : public SemanticTokensParams
+{
+public:
+    using SemanticTokensParams::SemanticTokensParams;
+
+    QString previousResultId() const { return typedValue<QString>(previousResultIdKey); }
+    void setPreviousResultId(const QString &previousResultId)
+    {
+        insert(previousResultIdKey, previousResultId);
+    }
+
+    bool isValid() const override;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensRangeParams : public SemanticTokensParams
+{
+public:
+    using SemanticTokensParams::SemanticTokensParams;
+
+    Range range() const { return typedValue<Range>(rangeKey); }
+    void setRange(const Range &range) { insert(rangeKey, range); }
+
+    bool isValid() const override;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokens : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    /**
+     * An optional result id. If provided and clients support delta updating
+     * the client will include the result id in the next semantic token request.
+     * A server can then instead of computing all semantic tokens again simply
+     * send a delta.
+     */
+    std::optional<QString> resultId() const { return optionalValue<QString>(resultIdKey); }
+    void setResultId(const QString &resultId) { insert(resultIdKey, resultId); }
+    void clearResultId() { remove(resultIdKey); }
+
+    /// The actual tokens.
+    QList<int> data() const { return array<int>(dataKey); }
+    void setData(const QList<int> &value) { insertArray(dataKey, value); }
+
+    bool isValid() const override { return contains(dataKey); }
+
+    QList<SemanticToken> toTokens(const QList<int> &tokenTypes,
+                                  const QList<int> &tokenModifiers) const;
+    static QMap<QString, int> defaultTokenTypesMap();
+    static QMap<QString, int> defaultTokenModifiersMap();
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensResult
+    : public std::variant<SemanticTokens, std::nullptr_t>
+{
+public:
+    using variant::variant;
+    explicit SemanticTokensResult(const QJsonValue &value);
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensFullRequest
+    : public Request<SemanticTokensResult, std::nullptr_t, SemanticTokensParams>
+{
+public:
+    explicit SemanticTokensFullRequest(const SemanticTokensParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/semanticTokens/full";
+};
+
+class SemanticTokensEdit : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    int start() const { return typedValue<int>(startKey); }
+    void setStart(int start) { insert(startKey, start); }
+
+    int deleteCount() const { return typedValue<int>(deleteCountKey); }
+    void setDeleteCount(int deleteCount) { insert(deleteCountKey, deleteCount); }
+
+    std::optional<QList<int>> data() const { return optionalArray<int>(dataKey); }
+    void setData(const QList<int> &value) { insertArray(dataKey, value); }
+    void clearData() { remove(dataKey); }
+
+    int dataSize() const { return contains(dataKey) ? value(dataKey).toArray().size() : 0; }
+
+    bool isValid() const override { return contains(dataKey) && contains(deleteCountKey); }
+};
+
+class SemanticTokensDelta : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString resultId() const { return typedValue<QString>(resultIdKey); }
+    void setResultId(const QString &resultId) { insert(resultIdKey, resultId); }
+
+    QList<SemanticTokensEdit> edits() const { return array<SemanticTokensEdit>(editsKey); }
+    void setEdits(const QList<SemanticTokensEdit> &edits) { insertArray(editsKey, edits); }
+
+    bool isValid() const override { return contains(resultIdKey) && contains(editsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensDeltaResult
+    : public std::variant<SemanticTokens, SemanticTokensDelta, std::nullptr_t>
+{
+public:
+    using variant::variant;
+    explicit SemanticTokensDeltaResult(const QJsonValue &value);
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensFullDeltaRequest
+    : public Request<SemanticTokensDeltaResult, std::nullptr_t, SemanticTokensDeltaParams>
+{
+public:
+    explicit SemanticTokensFullDeltaRequest(const SemanticTokensDeltaParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/semanticTokens/full/delta";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensRangeRequest
+    : public Request<SemanticTokensResult, std::nullptr_t, SemanticTokensRangeParams>
+{
+public:
+    explicit SemanticTokensRangeRequest(const SemanticTokensRangeParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/semanticTokens/range";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensRefreshRequest
+    : public Request<std::nullptr_t, std::nullptr_t, std::nullptr_t>
+{
+public:
+    explicit SemanticTokensRefreshRequest();
+    using Request::Request;
+    constexpr static const char methodName[] = "workspace/semanticTokens/refresh";
+};
+
+} // namespace lsp
diff --git a/src/shared/lsp/servercapabilities.cpp b/src/shared/lsp/servercapabilities.cpp
new file mode 100644
index 000000000..0923f76f3
--- /dev/null
+++ b/src/shared/lsp/servercapabilities.cpp
@@ -0,0 +1,386 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "servercapabilities.h"
+
+namespace lsp {
+
+std::optional<ServerCapabilities::TextDocumentSync> ServerCapabilities::textDocumentSync() const
+{
+    const QJsonValue &sync = value(textDocumentSyncKey);
+    if (sync.isUndefined())
+        return std::nullopt;
+    return std::make_optional(sync.isDouble()
+                                  ? TextDocumentSync(sync.toInt())
+                                  : TextDocumentSync(TextDocumentSyncOptions(sync.toObject())));
+}
+
+void ServerCapabilities::setTextDocumentSync(const ServerCapabilities::TextDocumentSync &textDocumentSync)
+{
+    insertVariant<TextDocumentSyncOptions, int>(textDocumentSyncKey, textDocumentSync);
+}
+
+TextDocumentSyncKind ServerCapabilities::textDocumentSyncKindHelper()
+{
+    if (std::optional<TextDocumentSync> sync = textDocumentSync()) {
+        if (auto kind = std::get_if<int>(&*sync))
+            return static_cast<TextDocumentSyncKind>(*kind);
+        if (auto options = std::get_if<TextDocumentSyncOptions>(&*sync)) {
+            if (const std::optional<int> &change = options->change())
+                return static_cast<TextDocumentSyncKind>(*change);
+        }
+    }
+    return TextDocumentSyncKind::None;
+}
+
+std::optional<std::variant<bool, WorkDoneProgressOptions>> ServerCapabilities::hoverProvider()
+    const
+{
+    using RetType = std::variant<bool, WorkDoneProgressOptions>;
+    const QJsonValue &provider = value(hoverProviderKey);
+    if (provider.isBool())
+        return std::make_optional(RetType(provider.toBool()));
+    if (provider.isObject())
+        return std::make_optional(RetType(WorkDoneProgressOptions(provider.toObject())));
+    return std::nullopt;
+}
+
+void ServerCapabilities::setHoverProvider(
+    const std::variant<bool, WorkDoneProgressOptions> &hoverProvider)
+{
+    insertVariant<bool, WorkDoneProgressOptions>(hoverProviderKey, hoverProvider);
+}
+
+std::optional<std::variant<bool, ServerCapabilities::RegistrationOptions>>
+ServerCapabilities::definitionProvider() const
+{
+    using RetType = std::variant<bool, ServerCapabilities::RegistrationOptions>;
+    const QJsonValue &provider = value(definitionProviderKey);
+    if (provider.isUndefined() || !(provider.isBool() || provider.isObject()))
+        return std::nullopt;
+    return std::make_optional(provider.isBool()
+                                  ? RetType(provider.toBool())
+                                  : RetType(RegistrationOptions(provider.toObject())));
+}
+
+void ServerCapabilities::setDefinitionProvider(
+    const std::variant<bool, RegistrationOptions> &definitionProvider)
+{
+    insertVariant<bool, RegistrationOptions>(definitionProviderKey, definitionProvider);
+}
+
+std::optional<std::variant<bool, ServerCapabilities::RegistrationOptions>>
+ServerCapabilities::typeDefinitionProvider() const
+{
+    using RetType = std::variant<bool, ServerCapabilities::RegistrationOptions>;
+    const QJsonValue &provider = value(typeDefinitionProviderKey);
+    if (provider.isUndefined() || !(provider.isBool() || provider.isObject()))
+        return std::nullopt;
+    return std::make_optional(provider.isBool()
+                                  ? RetType(provider.toBool())
+                                  : RetType(RegistrationOptions(provider.toObject())));
+}
+
+void ServerCapabilities::setTypeDefinitionProvider(
+        const std::variant<bool, ServerCapabilities::RegistrationOptions> &typeDefinitionProvider)
+{
+    insertVariant<bool, ServerCapabilities::RegistrationOptions>(typeDefinitionProviderKey,
+                                                                 typeDefinitionProvider);
+}
+
+std::optional<std::variant<bool, ServerCapabilities::RegistrationOptions>>
+ServerCapabilities::implementationProvider() const
+{
+    using RetType = std::variant<bool, ServerCapabilities::RegistrationOptions>;
+    const QJsonValue &provider = value(implementationProviderKey);
+    if (provider.isUndefined() || !(provider.isBool() || provider.isObject()))
+        return std::nullopt;
+    return std::make_optional(provider.isBool()
+                                  ? RetType(provider.toBool())
+                                  : RetType(RegistrationOptions(provider.toObject())));
+}
+
+void ServerCapabilities::setImplementationProvider(
+        const std::variant<bool, ServerCapabilities::RegistrationOptions> &implementationProvider)
+{
+    insertVariant<bool, RegistrationOptions>(implementationProviderKey, implementationProvider);
+}
+
+std::optional<std::variant<bool, WorkDoneProgressOptions>>
+ServerCapabilities::referencesProvider() const
+{
+    using RetType = std::variant<bool, WorkDoneProgressOptions>;
+    const QJsonValue &provider = value(referencesProviderKey);
+    if (provider.isBool())
+        return std::make_optional(RetType(provider.toBool()));
+    if (provider.isObject())
+        return std::make_optional(RetType(WorkDoneProgressOptions(provider.toObject())));
+    return std::nullopt;
+}
+
+void ServerCapabilities::setReferencesProvider(
+    const std::variant<bool, WorkDoneProgressOptions> &referencesProvider)
+{
+    insertVariant<bool, WorkDoneProgressOptions>(referencesProviderKey,
+                                                 referencesProvider);
+}
+
+std::optional<std::variant<bool, WorkDoneProgressOptions>>
+ServerCapabilities::documentHighlightProvider() const
+{
+    using RetType = std::variant<bool, WorkDoneProgressOptions>;
+    const QJsonValue &provider = value(documentHighlightProviderKey);
+    if (provider.isBool())
+        return std::make_optional(RetType(provider.toBool()));
+    if (provider.isObject())
+        return std::make_optional(RetType(WorkDoneProgressOptions(provider.toObject())));
+    return std::nullopt;
+}
+
+void ServerCapabilities::setDocumentHighlightProvider(
+    const std::variant<bool, WorkDoneProgressOptions> &documentHighlightProvider)
+{
+    insertVariant<bool, WorkDoneProgressOptions>(documentHighlightProviderKey,
+                                                 documentHighlightProvider);
+}
+
+std::optional<std::variant<bool, WorkDoneProgressOptions>>
+ServerCapabilities::documentSymbolProvider() const
+{
+    using RetType = std::variant<bool, WorkDoneProgressOptions>;
+    const QJsonValue &provider = value(documentSymbolProviderKey);
+    if (provider.isBool())
+        return std::make_optional(RetType(provider.toBool()));
+    if (provider.isObject())
+        return std::make_optional(RetType(WorkDoneProgressOptions(provider.toObject())));
+    return std::nullopt;
+}
+
+void ServerCapabilities::setDocumentSymbolProvider(
+    std::variant<bool, WorkDoneProgressOptions> documentSymbolProvider)
+{
+    insertVariant<bool, WorkDoneProgressOptions>(documentSymbolProviderKey,
+                                                 documentSymbolProvider);
+}
+
+std::optional<SemanticTokensOptions> ServerCapabilities::semanticTokensProvider() const
+{
+    return optionalValue<SemanticTokensOptions>(semanticTokensProviderKey);
+}
+
+void ServerCapabilities::setSemanticTokensProvider(
+    const SemanticTokensOptions &semanticTokensProvider)
+{
+    insert(semanticTokensProviderKey, semanticTokensProvider);
+}
+
+std::optional<std::variant<bool, WorkDoneProgressOptions> >
+ServerCapabilities::callHierarchyProvider() const
+{
+    const QJsonValue &provider = value(callHierarchyProviderKey);
+    if (provider.isBool())
+        return provider.toBool();
+    else if (provider.isObject())
+        return WorkDoneProgressOptions(provider.toObject());
+    return std::nullopt;
+}
+
+void ServerCapabilities::setCallHierarchyProvider(
+    const std::variant<bool, WorkDoneProgressOptions> &callHierarchyProvider)
+{
+    QJsonValue val;
+    if (std::holds_alternative<bool>(callHierarchyProvider))
+        val = std::get<bool>(callHierarchyProvider);
+    else if (std::holds_alternative<WorkDoneProgressOptions>(callHierarchyProvider))
+        val = QJsonObject(std::get<WorkDoneProgressOptions>(callHierarchyProvider));
+    insert(callHierarchyProviderKey, val);
+}
+
+std::optional<std::variant<bool, WorkDoneProgressOptions>>
+ServerCapabilities::workspaceSymbolProvider() const
+{
+    using RetType = std::variant<bool, WorkDoneProgressOptions>;
+    const QJsonValue &provider = value(workspaceSymbolProviderKey);
+    if (provider.isBool())
+        return std::make_optional(RetType(provider.toBool()));
+    if (provider.isObject())
+        return std::make_optional(RetType(WorkDoneProgressOptions(provider.toObject())));
+    return std::nullopt;
+}
+
+void ServerCapabilities::setWorkspaceSymbolProvider(
+    std::variant<bool, WorkDoneProgressOptions> workspaceSymbolProvider)
+{
+    insertVariant<bool, WorkDoneProgressOptions>(workspaceSymbolProviderKey,
+                                                 workspaceSymbolProvider);
+}
+
+std::optional<std::variant<bool, CodeActionOptions>> ServerCapabilities::codeActionProvider() const
+{
+    const QJsonValue &provider = value(codeActionProviderKey);
+    if (provider.isBool())
+        return std::make_optional(std::variant<bool, CodeActionOptions>(provider.toBool()));
+    if (provider.isObject()) {
+        CodeActionOptions options(provider);
+        if (options.isValid())
+            return std::make_optional(std::variant<bool, CodeActionOptions>(options));
+    }
+    return std::nullopt;
+}
+
+std::optional<std::variant<bool, WorkDoneProgressOptions>>
+ServerCapabilities::documentFormattingProvider() const
+{
+    using RetType = std::variant<bool, WorkDoneProgressOptions>;
+    const QJsonValue &provider = value(documentFormattingProviderKey);
+    if (provider.isBool())
+        return std::make_optional(RetType(provider.toBool()));
+    if (provider.isObject())
+        return std::make_optional(RetType(WorkDoneProgressOptions(provider.toObject())));
+    return std::nullopt;
+}
+
+void ServerCapabilities::setDocumentFormattingProvider(
+    const std::variant<bool, WorkDoneProgressOptions> &documentFormattingProvider)
+{
+    insertVariant<bool, WorkDoneProgressOptions>(documentFormattingProviderKey,
+                                                 documentFormattingProvider);
+}
+
+std::optional<std::variant<bool, WorkDoneProgressOptions>>
+ServerCapabilities::documentRangeFormattingProvider() const
+{
+    using RetType = std::variant<bool, WorkDoneProgressOptions>;
+    const QJsonValue &provider = value(documentRangeFormattingProviderKey);
+    if (provider.isBool())
+        return std::make_optional(RetType(provider.toBool()));
+    if (provider.isObject())
+        return std::make_optional(RetType(WorkDoneProgressOptions(provider.toObject())));
+    return std::nullopt;
+}
+
+void ServerCapabilities::setDocumentRangeFormattingProvider(
+    std::variant<bool, WorkDoneProgressOptions> documentRangeFormattingProvider)
+{
+    insertVariant<bool, WorkDoneProgressOptions>(documentRangeFormattingProviderKey,
+                                                 documentRangeFormattingProvider);
+}
+
+std::optional<std::variant<ServerCapabilities::RenameOptions, bool>> ServerCapabilities::renameProvider() const
+{
+    using RetType = std::variant<ServerCapabilities::RenameOptions, bool>;
+    const QJsonValue &localValue = value(renameProviderKey);
+    if (localValue.isBool())
+        return RetType(localValue.toBool());
+    if (localValue.isObject())
+        return RetType(RenameOptions(localValue.toObject()));
+    return std::nullopt;
+}
+
+void ServerCapabilities::setRenameProvider(std::variant<ServerCapabilities::RenameOptions, bool> renameProvider)
+{
+    insertVariant<RenameOptions, bool>(renameProviderKey, renameProvider);
+}
+
+std::optional<std::variant<bool, JsonObject>> ServerCapabilities::colorProvider() const
+{
+    using RetType = std::variant<bool, JsonObject>;
+    const QJsonValue &localValue = value(colorProviderKey);
+    if (localValue.isBool())
+        return RetType(localValue.toBool());
+    if (localValue.isObject())
+        return RetType(JsonObject(localValue.toObject()));
+    return std::nullopt;
+}
+
+void ServerCapabilities::setColorProvider(std::variant<bool, JsonObject> colorProvider)
+{
+    insertVariant<bool, JsonObject>(renameProviderKey, colorProvider);
+}
+
+std::optional<std::variant<QString, bool> >
+ServerCapabilities::WorkspaceServerCapabilities::WorkspaceFoldersCapabilities::changeNotifications() const
+{
+    using RetType = std::variant<QString, bool>;
+    const QJsonValue &change = value(changeNotificationsKey);
+    if (change.isUndefined())
+        return std::nullopt;
+    return std::make_optional(change.isBool() ? RetType(change.toBool())
+                                              : RetType(change.toString()));
+}
+
+void ServerCapabilities::WorkspaceServerCapabilities::WorkspaceFoldersCapabilities::setChangeNotifications(
+        std::variant<QString, bool> changeNotifications)
+{
+    insertVariant<QString, bool>(changeNotificationsKey, changeNotifications);
+}
+
+bool TextDocumentRegistrationOptions::filterApplies(const Utils::FilePath &fileName) const
+{
+    Q_UNUSED(fileName)
+    return true;
+}
+
+bool ServerCapabilities::ExecuteCommandOptions::isValid() const
+{
+    return WorkDoneProgressOptions::isValid() && contains(commandsKey);
+}
+
+bool CodeActionOptions::isValid() const
+{
+    return WorkDoneProgressOptions::isValid() && contains(codeActionKindsKey);
+}
+
+std::optional<std::variant<bool, QJsonObject>> SemanticTokensOptions::range() const
+{
+    using RetType = std::variant<bool, QJsonObject>;
+    const QJsonValue &rangeOptions = value(rangeKey);
+    if (rangeOptions.isBool())
+        return RetType(rangeOptions.toBool());
+    if (rangeOptions.isObject())
+        return RetType(rangeOptions.toObject());
+    return std::nullopt;
+}
+
+void SemanticTokensOptions::setRange(const std::variant<bool, QJsonObject> &range)
+{
+    insertVariant<bool, QJsonObject>(rangeKey, range);
+}
+
+std::optional<std::variant<bool, SemanticTokensOptions::FullSemanticTokenOptions>>
+SemanticTokensOptions::full() const
+{
+    using RetType = std::variant<bool, SemanticTokensOptions::FullSemanticTokenOptions>;
+    const QJsonValue &fullOptions = value(fullKey);
+    if (fullOptions.isBool())
+        return RetType(fullOptions.toBool());
+    if (fullOptions.isObject())
+        return RetType(FullSemanticTokenOptions(fullOptions.toObject()));
+    return std::nullopt;
+}
+
+void SemanticTokensOptions::setFull(
+    const std::variant<bool, SemanticTokensOptions::FullSemanticTokenOptions> &full)
+{
+    insertVariant<bool, FullSemanticTokenOptions>(fullKey, full);
+}
+
+SemanticRequestTypes SemanticTokensOptions::supportedRequests() const
+{
+    SemanticRequestTypes result;
+    QJsonValue rangeValue = value(rangeKey);
+    if (rangeValue.isObject() || rangeValue.toBool())
+        result |= SemanticRequestType::Range;
+    QJsonValue fullValue = value(fullKey);
+    if (fullValue.isObject()) {
+        SemanticTokensOptions::FullSemanticTokenOptions options(fullValue.toObject());
+        if (options.delta().value_or(false))
+            result |= SemanticRequestType::FullDelta;
+        result |= SemanticRequestType::Full;
+    } else if (fullValue.toBool()) {
+        result |= SemanticRequestType::Full;
+    }
+    return result;
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/servercapabilities.h b/src/shared/lsp/servercapabilities.h
new file mode 100644
index 000000000..03c0371e8
--- /dev/null
+++ b/src/shared/lsp/servercapabilities.h
@@ -0,0 +1,435 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "lsptypes.h"
+#include "semantictokens.h"
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkDoneProgressOptions : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    std::optional<bool> workDoneProgress() const { return optionalValue<bool>(workDoneProgressKey); }
+    void setWorkDoneProgress(bool workDoneProgress) { insert(workDoneProgressKey, workDoneProgress); }
+    void clearWorkDoneProgress() { remove(workDoneProgressKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ResolveProviderOption : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    std::optional<bool> resolveProvider() const { return optionalValue<bool>(resolveProviderKey); }
+    void setResolveProvider(bool resolveProvider) { insert(resolveProviderKey, resolveProvider); }
+    void clearResolveProvider() { remove(resolveProviderKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentRegistrationOptions : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    LanguageClientArray<DocumentFilter> documentSelector() const
+    { return clientArray<DocumentFilter>(documentSelectorKey); }
+    void setDocumentSelector(const LanguageClientArray<DocumentFilter> &documentSelector)
+    { insert(documentSelectorKey, documentSelector.toJson()); }
+
+    bool filterApplies(const Utils::FilePath &fileName) const;
+
+    bool isValid() const override { return contains(documentSelectorKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT SaveOptions : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // The client is supposed to include the content on save.
+    std::optional<bool> includeText() const { return optionalValue<bool>(includeTextKey); }
+    void setIncludeText(bool includeText) { insert(includeTextKey, includeText); }
+    void clearIncludeText() { remove(includeTextKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentSyncOptions : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // Open and close notifications are sent to the server.
+    std::optional<bool> openClose() const { return optionalValue<bool>(openCloseKey); }
+    void setOpenClose(bool openClose) { insert(openCloseKey, openClose); }
+    void clearOpenClose() { remove(openCloseKey); }
+
+    // Change notifications are sent to the server. See TextDocumentSyncKind.None,
+    // TextDocumentSyncKind.Full and TextDocumentSyncKind.Incremental.
+    std::optional<int> change() const { return optionalValue<int>(changeKey); }
+    void setChange(int change) { insert(changeKey, change); }
+    void clearChange() { remove(changeKey); }
+
+    // Will save notifications are sent to the server.
+    std::optional<bool> willSave() const { return optionalValue<bool>(willSaveKey); }
+    void setWillSave(bool willSave) { insert(willSaveKey, willSave); }
+    void clearWillSave() { remove(willSaveKey); }
+
+    // Will save wait until requests are sent to the server.
+    std::optional<bool> willSaveWaitUntil() const
+    { return optionalValue<bool>(willSaveWaitUntilKey); }
+    void setWillSaveWaitUntil(bool willSaveWaitUntil)
+    { insert(willSaveWaitUntilKey, willSaveWaitUntil); }
+    void clearWillSaveWaitUntil() { remove(willSaveWaitUntilKey); }
+
+    // Save notifications are sent to the server.
+    std::optional<SaveOptions> save() const { return optionalValue<SaveOptions>(saveKey); }
+    void setSave(const SaveOptions &save) { insert(saveKey, save); }
+    void clearSave() { remove(saveKey); }
+};
+
+enum class TextDocumentSyncKind
+{
+    // Documents should not be synced at all.
+    None = 0,
+    // Documents are synced by always sending the full content of the document.
+    Full = 1,
+    // Documents are synced by sending the full content on open.
+    // After that only incremental updates to the document are send.
+    Incremental = 2
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT CodeActionOptions : public WorkDoneProgressOptions
+{
+public:
+    using WorkDoneProgressOptions::WorkDoneProgressOptions;
+
+    QList<QString> codeActionKinds() const { return array<QString>(codeActionKindsKey); }
+    void setCodeActionKinds(const QList<QString> &codeActionKinds)
+    { insertArray(codeActionKindsKey, codeActionKinds); }
+
+    bool isValid() const override;
+};
+
+enum class SemanticRequestType {
+    None = 0x0,
+    Full = 0x1,
+    FullDelta = 0x2,
+    Range = 0x4
+};
+Q_DECLARE_FLAGS(SemanticRequestTypes, SemanticRequestType)
+
+class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensOptions : public WorkDoneProgressOptions
+{
+public:
+    using WorkDoneProgressOptions::WorkDoneProgressOptions;
+
+    /// The legend used by the server
+    SemanticTokensLegend legend() const { return typedValue<SemanticTokensLegend>(legendKey); }
+    void setLegend(const SemanticTokensLegend &legend) { insert(legendKey, legend); }
+
+    /// Server supports providing semantic tokens for a specific range of a document.
+    std::optional<std::variant<bool, QJsonObject>> range() const;
+    void setRange(const std::variant<bool, QJsonObject> &range);
+    void clearRange() { remove(rangeKey); }
+
+    class FullSemanticTokenOptions : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        /// The server supports deltas for full documents.
+        std::optional<bool> delta() const { return optionalValue<bool>(deltaKey); }
+        void setDelta(bool delta) { insert(deltaKey, delta); }
+        void clearDelta() { remove(deltaKey); }
+    };
+
+    /// Server supports providing semantic tokens for a full document.
+    std::optional<std::variant<bool, FullSemanticTokenOptions>> full() const;
+    void setFull(const std::variant<bool, FullSemanticTokenOptions> &full);
+    void clearFull() { remove(fullKey); }
+
+    bool isValid() const override { return contains(legendKey); }
+
+    SemanticRequestTypes supportedRequests() const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ServerCapabilities : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    // Defines how the host (editor) should sync document changes to the language server.
+
+    class LANGUAGESERVERPROTOCOL_EXPORT CompletionOptions : public WorkDoneProgressOptions
+    {
+    public:
+        using WorkDoneProgressOptions::WorkDoneProgressOptions;
+
+        // The characters that trigger completion automatically.
+        std::optional<QList<QString>> triggerCharacters() const
+        { return optionalArray<QString>(triggerCharactersKey); }
+        void setTriggerCharacters(const QList<QString> &triggerCharacters)
+        { insertArray(triggerCharactersKey, triggerCharacters); }
+        void clearTriggerCharacters() { remove(triggerCharactersKey); }
+
+        std::optional<bool> resolveProvider() const { return optionalValue<bool>(resolveProviderKey); }
+        void setResolveProvider(bool resolveProvider) { insert(resolveProviderKey, resolveProvider); }
+        void clearResolveProvider() { remove(resolveProviderKey); }
+    };
+
+    class LANGUAGESERVERPROTOCOL_EXPORT SignatureHelpOptions : public WorkDoneProgressOptions
+    {
+    public:
+        using WorkDoneProgressOptions::WorkDoneProgressOptions;
+
+        // The characters that trigger signature help automatically.
+        std::optional<QList<QString>> triggerCharacters() const
+        { return optionalArray<QString>(triggerCharactersKey); }
+        void setTriggerCharacters(const QList<QString> &triggerCharacters)
+        { insertArray(triggerCharactersKey, triggerCharacters); }
+        void clearTriggerCharacters() { remove(triggerCharactersKey); }
+    };
+
+    using CodeLensOptions = ResolveProviderOption;
+
+    class LANGUAGESERVERPROTOCOL_EXPORT DocumentOnTypeFormattingOptions : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        // A character on which formatting should be triggered, like `}`.
+        QString firstTriggerCharacter() const { return typedValue<QString>(firstTriggerCharacterKey); }
+        void setFirstTriggerCharacter(QString firstTriggerCharacter)
+        { insert(firstTriggerCharacterKey, firstTriggerCharacter); }
+
+        // More trigger characters.
+        std::optional<QList<QString>> moreTriggerCharacter() const
+        { return optionalArray<QString>(moreTriggerCharacterKey); }
+        void setMoreTriggerCharacter(const QList<QString> &moreTriggerCharacter)
+        { insertArray(moreTriggerCharacterKey, moreTriggerCharacter); }
+        void clearMoreTriggerCharacter() { remove(moreTriggerCharacterKey); }
+
+        bool isValid() const override { return contains(firstTriggerCharacterKey); }
+    };
+
+    using DocumentLinkOptions = ResolveProviderOption;
+
+    class LANGUAGESERVERPROTOCOL_EXPORT ExecuteCommandOptions : public WorkDoneProgressOptions
+    {
+    public:
+        using WorkDoneProgressOptions::WorkDoneProgressOptions;
+
+        QList<QString> commands() const { return array<QString>(commandsKey); }
+        void setCommands(const QList<QString> &commands) { insertArray(commandsKey, commands); }
+
+        bool isValid() const override;
+    };
+
+    using ColorProviderOptions = JsonObject;
+
+    class LANGUAGESERVERPROTOCOL_EXPORT StaticRegistrationOptions : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        // The id used to register the request. The id can be used to deregister
+        // the request again. See also Registration#id.
+        std::optional<QString> id() const { return optionalValue<QString>(idKey); }
+        void setId(const QString &id) { insert(idKey, id); }
+        void clearId() { remove(idKey); }
+    };
+
+    // Defines how text documents are synced. Is either a detailed structure defining each
+    // notification or for backwards compatibility the TextDocumentSyncKind number.
+    using TextDocumentSync = std::variant<TextDocumentSyncOptions, int>;
+    std::optional<TextDocumentSync> textDocumentSync() const;
+    void setTextDocumentSync(const TextDocumentSync &textDocumentSync);
+    void clearTextDocumentSync() { remove(textDocumentSyncKey); }
+
+    TextDocumentSyncKind textDocumentSyncKindHelper();
+
+    // The server provides hover support.
+    std::optional<std::variant<bool, WorkDoneProgressOptions>> hoverProvider() const;
+    void setHoverProvider(const std::variant<bool, WorkDoneProgressOptions> &hoverProvider);
+    void clearHoverProvider() { remove(hoverProviderKey); }
+
+    // The server provides completion support.
+    std::optional<CompletionOptions> completionProvider() const
+    { return optionalValue<CompletionOptions>(completionProviderKey); }
+    void setCompletionProvider(const CompletionOptions &completionProvider)
+    { insert(completionProviderKey, completionProvider); }
+    void clearCompletionProvider() { remove(completionProviderKey); }
+
+    // The server provides signature help support.
+    std::optional<SignatureHelpOptions> signatureHelpProvider() const
+    { return optionalValue<SignatureHelpOptions>(signatureHelpProviderKey); }
+    void setSignatureHelpProvider(const SignatureHelpOptions &signatureHelpProvider)
+    { insert(signatureHelpProviderKey, signatureHelpProvider); }
+    void clearSignatureHelpProvider() { remove(signatureHelpProviderKey); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT RegistrationOptions : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        LanguageClientArray<DocumentFilter> documentSelector() const
+        { return clientArray<DocumentFilter>(documentSelectorKey); }
+        void setDocumentSelector(const LanguageClientArray<DocumentFilter> &documentSelector)
+        { insert(documentSelectorKey, documentSelector.toJson()); }
+
+        bool filterApplies(const Utils::FilePath &fileName) const;
+
+        // The id used to register the request. The id can be used to deregister
+        // the request again. See also Registration#id.
+        std::optional<QString> id() const { return optionalValue<QString>(idKey); }
+        void setId(const QString &id) { insert(idKey, id); }
+        void clearId() { remove(idKey); }
+
+        bool isValid() const override { return contains(documentSelectorKey); }
+    };
+
+    // The server provides goto definition support.
+    std::optional<std::variant<bool, RegistrationOptions>> definitionProvider() const;
+    void setDefinitionProvider(const std::variant<bool, RegistrationOptions> &typeDefinitionProvider);
+    void clearDefinitionProvider() { remove(typeDefinitionProviderKey); }
+
+    // The server provides Goto Type Definition support.
+    std::optional<std::variant<bool, RegistrationOptions>> typeDefinitionProvider() const;
+    void setTypeDefinitionProvider(const std::variant<bool, RegistrationOptions> &typeDefinitionProvider);
+    void clearTypeDefinitionProvider() { remove(typeDefinitionProviderKey); }
+
+    // The server provides Goto Implementation support.
+    std::optional<std::variant<bool, RegistrationOptions>> implementationProvider() const;
+    void setImplementationProvider(const std::variant<bool, RegistrationOptions> &implementationProvider);
+    void clearImplementationProvider() { remove(implementationProviderKey); }
+
+    // The server provides find references support.
+    std::optional<std::variant<bool, WorkDoneProgressOptions>> referencesProvider() const;
+    void setReferencesProvider(const std::variant<bool, WorkDoneProgressOptions> &referencesProvider);
+    void clearReferencesProvider() { remove(referencesProviderKey); }
+
+    // The server provides document highlight support.
+    std::optional<std::variant<bool, WorkDoneProgressOptions>> documentHighlightProvider() const;
+    void setDocumentHighlightProvider(
+        const std::variant<bool, WorkDoneProgressOptions> &documentHighlightProvider);
+    void clearDocumentHighlightProvider() { remove(documentHighlightProviderKey); }
+
+    // The server provides document symbol support.
+    std::optional<std::variant<bool, WorkDoneProgressOptions>> documentSymbolProvider() const;
+    void setDocumentSymbolProvider(std::variant<bool, WorkDoneProgressOptions> documentSymbolProvider);
+    void clearDocumentSymbolProvider() { remove(documentSymbolProviderKey); }
+
+    std::optional<SemanticTokensOptions> semanticTokensProvider() const;
+    void setSemanticTokensProvider(const SemanticTokensOptions &semanticTokensProvider);
+    void clearSemanticTokensProvider() { remove(semanticTokensProviderKey); }
+
+    std::optional<std::variant<bool, WorkDoneProgressOptions>> callHierarchyProvider() const;
+    void setCallHierarchyProvider(const std::variant<bool, WorkDoneProgressOptions> &callHierarchyProvider);
+    void clearCallHierarchyProvider() { remove(callHierarchyProviderKey); }
+
+    // The server provides workspace symbol support.
+    std::optional<std::variant<bool, WorkDoneProgressOptions>> workspaceSymbolProvider() const;
+    void setWorkspaceSymbolProvider(std::variant<bool, WorkDoneProgressOptions> workspaceSymbolProvider);
+    void clearWorkspaceSymbolProvider() { remove(workspaceSymbolProviderKey); }
+
+    // The server provides code actions.
+    std::optional<std::variant<bool, CodeActionOptions>> codeActionProvider() const;
+    void setCodeActionProvider(bool codeActionProvider)
+    { insert(codeActionProviderKey, codeActionProvider); }
+    void setCodeActionProvider(CodeActionOptions options)
+    { insert(codeActionProviderKey, options); }
+    void clearCodeActionProvider() { remove(codeActionProviderKey); }
+
+    // The server provides code lens.
+    std::optional<CodeLensOptions> codeLensProvider() const
+    { return optionalValue<CodeLensOptions>(codeLensProviderKey); }
+    void setCodeLensProvider(CodeLensOptions codeLensProvider)
+    { insert(codeLensProviderKey, codeLensProvider); }
+    void clearCodeLensProvider() { remove(codeLensProviderKey); }
+
+    // The server provides document formatting.
+    std::optional<std::variant<bool, WorkDoneProgressOptions>> documentFormattingProvider() const;
+    void setDocumentFormattingProvider(
+        const std::variant<bool, WorkDoneProgressOptions> &documentFormattingProvider);
+    void clearDocumentFormattingProvider() { remove(documentFormattingProviderKey); }
+
+    // The server provides document formatting on typing.
+    std::optional<std::variant<bool, WorkDoneProgressOptions>> documentRangeFormattingProvider() const;
+    void setDocumentRangeFormattingProvider(std::variant<bool, WorkDoneProgressOptions> documentRangeFormattingProvider);
+    void clearDocumentRangeFormattingProvider() { remove(documentRangeFormattingProviderKey); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT RenameOptions : public WorkDoneProgressOptions
+    {
+    public:
+        using WorkDoneProgressOptions::WorkDoneProgressOptions;
+
+        // Renames should be checked and tested before being executed.
+        std::optional<bool> prepareProvider() const { return optionalValue<bool>(prepareProviderKey); }
+        void setPrepareProvider(bool prepareProvider) { insert(prepareProviderKey, prepareProvider); }
+        void clearPrepareProvider() { remove(prepareProviderKey); }
+    };
+
+    // The server provides rename support.
+    std::optional<std::variant<RenameOptions, bool>> renameProvider() const;
+    void setRenameProvider(std::variant<RenameOptions,bool> renameProvider);
+    void clearRenameProvider() { remove(renameProviderKey); }
+
+    // The server provides document link support.
+    std::optional<DocumentLinkOptions> documentLinkProvider() const
+    { return optionalValue<DocumentLinkOptions>(documentLinkProviderKey); }
+    void setDocumentLinkProvider(const DocumentLinkOptions &documentLinkProvider)
+    { insert(documentLinkProviderKey, documentLinkProvider); }
+    void clearDocumentLinkProvider() { remove(documentLinkProviderKey); }
+
+    // The server provides color provider support.
+    std::optional<std::variant<bool, JsonObject>> colorProvider() const;
+    void setColorProvider(std::variant<bool, JsonObject> colorProvider);
+    void clearColorProvider() { remove(colorProviderKey); }
+
+    // The server provides execute command support.
+    std::optional<ExecuteCommandOptions> executeCommandProvider() const
+    { return optionalValue<ExecuteCommandOptions>(executeCommandProviderKey); }
+    void setExecuteCommandProvider(ExecuteCommandOptions executeCommandProvider)
+    { insert(executeCommandProviderKey, executeCommandProvider); }
+    void clearExecuteCommandProvider() { remove(executeCommandProviderKey); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT WorkspaceServerCapabilities : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        class LANGUAGESERVERPROTOCOL_EXPORT WorkspaceFoldersCapabilities : public JsonObject
+        {
+        public:
+            using JsonObject::JsonObject;
+
+            // The server has support for workspace folders
+            std::optional<bool> supported() const { return optionalValue<bool>(supportedKey); }
+            void setSupported(bool supported) { insert(supportedKey, supported); }
+            void clearSupported() { remove(supportedKey); }
+
+            std::optional<std::variant<QString, bool>> changeNotifications() const;
+            void setChangeNotifications(std::variant<QString, bool> changeNotifications);
+            void clearChangeNotifications() { remove(changeNotificationsKey); }
+        };
+
+        std::optional<WorkspaceFoldersCapabilities> workspaceFolders() const
+        { return optionalValue<WorkspaceFoldersCapabilities>(workspaceFoldersKey); }
+        void setWorkspaceFolders(const WorkspaceFoldersCapabilities &workspaceFolders)
+        { insert(workspaceFoldersKey, workspaceFolders); }
+        void clearWorkspaceFolders() { remove(workspaceFoldersKey); }
+    };
+
+    std::optional<WorkspaceServerCapabilities> workspace() const
+    { return optionalValue<WorkspaceServerCapabilities>(workspaceKey); }
+    void setWorkspace(const WorkspaceServerCapabilities &workspace)
+    { insert(workspaceKey, workspace); }
+    void clearWorkspace() { remove(workspaceKey); }
+
+    std::optional<JsonObject> experimental() const { return optionalValue<JsonObject>(experimentalKey); }
+    void setExperimental(const JsonObject &experimental) { insert(experimentalKey, experimental); }
+    void clearExperimental() { remove(experimentalKey); }
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/shutdownmessages.cpp b/src/shared/lsp/shutdownmessages.cpp
new file mode 100644
index 000000000..21c41c1d3
--- /dev/null
+++ b/src/shared/lsp/shutdownmessages.cpp
@@ -0,0 +1,13 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "shutdownmessages.h"
+
+namespace lsp {
+
+constexpr const char ShutdownRequest::methodName[];
+constexpr const char ExitNotification::methodName[];
+ShutdownRequest::ShutdownRequest() : Request(methodName, nullptr) { }
+ExitNotification::ExitNotification() : Notification(methodName) { }
+
+} // namespace lsp
diff --git a/src/shared/lsp/shutdownmessages.h b/src/shared/lsp/shutdownmessages.h
new file mode 100644
index 000000000..2e8da4c66
--- /dev/null
+++ b/src/shared/lsp/shutdownmessages.h
@@ -0,0 +1,29 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT ShutdownRequest : public Request<
+        std::nullptr_t, std::nullptr_t, std::nullptr_t>
+{
+public:
+    ShutdownRequest();
+    using Request::Request;
+    constexpr static const char methodName[] = "shutdown";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ExitNotification : public Notification<std::nullptr_t>
+{
+public:
+    ExitNotification();
+    using Notification::Notification;
+    constexpr static const char methodName[] = "exit";
+
+    bool parametersAreValid(QString * /*errorMessage*/) const final { return true; }
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/textsynchronization.cpp b/src/shared/lsp/textsynchronization.cpp
new file mode 100644
index 000000000..ba9ee2f32
--- /dev/null
+++ b/src/shared/lsp/textsynchronization.cpp
@@ -0,0 +1,84 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "textsynchronization.h"
+
+namespace lsp {
+
+constexpr const char DidOpenTextDocumentNotification::methodName[];
+constexpr const char DidChangeTextDocumentNotification::methodName[];
+constexpr const char WillSaveTextDocumentNotification::methodName[];
+constexpr const char WillSaveWaitUntilTextDocumentRequest::methodName[];
+constexpr const char DidSaveTextDocumentNotification::methodName[];
+constexpr const char DidCloseTextDocumentNotification::methodName[];
+
+DidOpenTextDocumentNotification::DidOpenTextDocumentNotification(
+        const DidOpenTextDocumentParams &params)
+    : Notification(methodName, params)
+{ }
+
+DidChangeTextDocumentNotification::DidChangeTextDocumentNotification(
+        const DidChangeTextDocumentParams &params)
+    : DidChangeTextDocumentNotification(methodName, params)
+{ }
+
+WillSaveTextDocumentNotification::WillSaveTextDocumentNotification(
+        const WillSaveTextDocumentParams &params)
+    : Notification(methodName, params)
+{ }
+
+WillSaveWaitUntilTextDocumentRequest::WillSaveWaitUntilTextDocumentRequest(const WillSaveTextDocumentParams &params)
+    : Request(methodName, params)
+{ }
+
+DidSaveTextDocumentNotification::DidSaveTextDocumentNotification(
+        const DidSaveTextDocumentParams &params)
+    : Notification(methodName, params)
+{ }
+
+DidCloseTextDocumentNotification::DidCloseTextDocumentNotification(
+        const DidCloseTextDocumentParams &params)
+    : Notification(methodName, params)
+{ }
+
+DidChangeTextDocumentParams::DidChangeTextDocumentParams()
+    : DidChangeTextDocumentParams(VersionedTextDocumentIdentifier())
+{ }
+
+DidChangeTextDocumentParams::DidChangeTextDocumentParams(
+        const VersionedTextDocumentIdentifier &docId, const QString &text)
+{
+    setTextDocument(docId);
+    setContentChanges({TextDocumentContentChangeEvent(text)});
+}
+
+DidOpenTextDocumentParams::DidOpenTextDocumentParams(const TextDocumentItem &document)
+{
+    setTextDocument(document);
+}
+
+DidCloseTextDocumentParams::DidCloseTextDocumentParams(const TextDocumentIdentifier &document)
+{
+    setTextDocument(document);
+}
+
+DidChangeTextDocumentParams::TextDocumentContentChangeEvent::TextDocumentContentChangeEvent(
+    const QString &text)
+{
+    setText(text);
+}
+
+DidSaveTextDocumentParams::DidSaveTextDocumentParams(const TextDocumentIdentifier &document)
+{
+    setTextDocument(document);
+}
+
+WillSaveTextDocumentParams::WillSaveTextDocumentParams(
+        const TextDocumentIdentifier &document,
+        const WillSaveTextDocumentParams::TextDocumentSaveReason &reason)
+{
+    setTextDocument(document);
+    setReason(reason);
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/textsynchronization.h b/src/shared/lsp/textsynchronization.h
new file mode 100644
index 000000000..9ec3d4164
--- /dev/null
+++ b/src/shared/lsp/textsynchronization.h
@@ -0,0 +1,215 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+#include "servercapabilities.h"
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidOpenTextDocumentParams : public JsonObject
+{
+public:
+    DidOpenTextDocumentParams() = default;
+    explicit DidOpenTextDocumentParams(const TextDocumentItem &document);
+    using JsonObject::JsonObject;
+
+    TextDocumentItem textDocument() const { return typedValue<TextDocumentItem>(textDocumentKey); }
+    void setTextDocument(TextDocumentItem textDocument) { insert(textDocumentKey, textDocument); }
+
+    bool isValid() const override { return contains(textDocumentKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidOpenTextDocumentNotification : public Notification<
+        DidOpenTextDocumentParams>
+{
+public:
+    explicit DidOpenTextDocumentNotification(const DidOpenTextDocumentParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "textDocument/didOpen";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentChangeRegistrationOptions : public JsonObject
+{
+public:
+    TextDocumentChangeRegistrationOptions();
+    explicit TextDocumentChangeRegistrationOptions(TextDocumentSyncKind kind);
+    using JsonObject::JsonObject;
+
+    TextDocumentSyncKind syncKind() const
+    { return static_cast<TextDocumentSyncKind>(typedValue<int>(syncKindKey)); }
+    void setSyncKind(TextDocumentSyncKind syncKind)
+    { insert(syncKindKey, static_cast<int>(syncKind)); }
+
+    bool isValid() const override { return contains(syncKindKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidChangeTextDocumentParams : public JsonObject
+{
+public:
+    DidChangeTextDocumentParams();
+    explicit DidChangeTextDocumentParams(const VersionedTextDocumentIdentifier &docId,
+                                         const QString &text = QString());
+    using JsonObject::JsonObject;
+
+    VersionedTextDocumentIdentifier textDocument() const
+    { return typedValue<VersionedTextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const VersionedTextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentContentChangeEvent : public JsonObject
+    {
+        /*
+         * An event describing a change to a text document. If range and rangeLength are omitted
+         * the new text is considered to be the full content of the document.
+         */
+    public:
+        TextDocumentContentChangeEvent() = default;
+        explicit TextDocumentContentChangeEvent(const QString &text);
+        using JsonObject::JsonObject;
+
+        // The range of the document that changed.
+        std::optional<Range> range() const { return optionalValue<Range>(rangeKey); }
+        void setRange(Range range) { insert(rangeKey, range); }
+        void clearRange() { remove(rangeKey); }
+
+        // The length of the range that got replaced.
+        std::optional<int> rangeLength() const { return optionalValue<int>(rangeLengthKey); }
+        void setRangeLength(int rangeLength) { insert(rangeLengthKey, rangeLength); }
+        void clearRangeLength() { remove(rangeLengthKey); }
+
+        // The new text of the range/document.
+        QString text() const { return typedValue<QString>(textKey); }
+        void setText(const QString &text) { insert(textKey, text); }
+
+        bool isValid() const override { return contains(textKey); }
+    };
+
+    QList<TextDocumentContentChangeEvent> contentChanges() const
+    { return array<TextDocumentContentChangeEvent>(contentChangesKey); }
+    void setContentChanges(const QList<TextDocumentContentChangeEvent> &contentChanges)
+    { insertArray(contentChangesKey, contentChanges); }
+
+    bool isValid() const override
+    { return contains(textDocumentKey) && contains(contentChangesKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidChangeTextDocumentNotification : public Notification<
+        DidChangeTextDocumentParams>
+{
+public:
+    explicit DidChangeTextDocumentNotification(const DidChangeTextDocumentParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "textDocument/didChange";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WillSaveTextDocumentParams : public JsonObject
+{
+public:
+    enum class TextDocumentSaveReason  {
+        Manual = 1,
+        AfterDelay = 2,
+        FocusOut = 3
+    };
+
+    WillSaveTextDocumentParams() : WillSaveTextDocumentParams(TextDocumentIdentifier()) {}
+    explicit WillSaveTextDocumentParams(
+        const TextDocumentIdentifier &document,
+        const TextDocumentSaveReason &reason = TextDocumentSaveReason::Manual);
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    TextDocumentSaveReason reason() const
+    { return static_cast<TextDocumentSaveReason>(typedValue<int>(reasonKey)); }
+    void setReason(TextDocumentSaveReason reason) { insert(reasonKey, static_cast<int>(reason)); }
+
+    bool isValid() const override { return contains(textDocumentKey) && contains(reasonKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WillSaveTextDocumentNotification : public Notification<
+        WillSaveTextDocumentParams>
+{
+public:
+    explicit WillSaveTextDocumentNotification(const WillSaveTextDocumentParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "textDocument/willSave";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WillSaveWaitUntilTextDocumentRequest : public Request<
+        LanguageClientArray<TextEdit>, std::nullptr_t, WillSaveTextDocumentParams>
+{
+public:
+    explicit WillSaveWaitUntilTextDocumentRequest(const WillSaveTextDocumentParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "textDocument/willSaveWaitUntil";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT TextDocumentSaveRegistrationOptions
+        : public TextDocumentRegistrationOptions
+{
+public:
+    using TextDocumentRegistrationOptions::TextDocumentRegistrationOptions;
+
+    std::optional<bool> includeText() const { return optionalValue<bool>(includeTextKey); }
+    void setIncludeText(bool includeText) { insert(includeTextKey, includeText); }
+    void clearIncludeText() { remove(includeTextKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidSaveTextDocumentParams : public JsonObject
+{
+public:
+    DidSaveTextDocumentParams() : DidSaveTextDocumentParams(TextDocumentIdentifier()) {}
+    explicit DidSaveTextDocumentParams(const TextDocumentIdentifier &document);
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument()
+    const { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(TextDocumentIdentifier textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    std::optional<QString> text() const { return optionalValue<QString>(textKey); }
+    void setText(const QString &text) { insert(textKey, text); }
+    void clearText() { remove(textKey); }
+
+    bool isValid() const override { return contains(textDocumentKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidSaveTextDocumentNotification : public Notification<
+        DidSaveTextDocumentParams>
+{
+public:
+    explicit DidSaveTextDocumentNotification(const DidSaveTextDocumentParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "textDocument/didSave";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidCloseTextDocumentParams : public JsonObject
+{
+public:
+    DidCloseTextDocumentParams() = default;
+    explicit DidCloseTextDocumentParams(const TextDocumentIdentifier &document);
+    using JsonObject::JsonObject;
+
+    TextDocumentIdentifier textDocument() const
+    { return typedValue<TextDocumentIdentifier>(textDocumentKey); }
+    void setTextDocument(const TextDocumentIdentifier &textDocument)
+    { insert(textDocumentKey, textDocument); }
+
+    bool isValid() const override { return contains(textDocumentKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidCloseTextDocumentNotification : public Notification<
+        DidCloseTextDocumentParams>
+{
+public:
+    explicit DidCloseTextDocumentNotification(const DidCloseTextDocumentParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "textDocument/didClose";
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/lsp/textutils.cpp b/src/shared/lsp/textutils.cpp
new file mode 100644
index 000000000..1c0bff9d0
--- /dev/null
+++ b/src/shared/lsp/textutils.cpp
@@ -0,0 +1,126 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "textutils.h"
+
+#include <tools/qbsassert.h>
+
+#include <QRegularExpression>
+#include <QtDebug>
+
+namespace lsp::Utils::Text {
+
+bool Position::operator==(const Position &other) const
+{
+    return line == other.line && column == other.column;
+}
+
+/*!
+    Returns the text position of a \a fileName and sets the \a postfixPos if
+    it can find a positional postfix.
+
+    The following patterns are supported: \c {filepath.txt:19},
+    \c{filepath.txt:19:12}, \c {filepath.txt+19},
+    \c {filepath.txt+19+12}, and \c {filepath.txt(19)}.
+*/
+
+Position Position::fromFileName(QStringView fileName, int &postfixPos)
+{
+    static const auto regexp = QRegularExpression("[:+](\\d+)?([:+](\\d+)?)?$");
+    // (10) MSVC-style
+    static const auto vsRegexp = QRegularExpression("[(]((\\d+)[)]?)?$");
+    const QRegularExpressionMatch match = regexp.match(fileName);
+    Position pos;
+    if (match.hasMatch()) {
+        postfixPos = match.capturedStart(0);
+        if (match.lastCapturedIndex() > 0) {
+            pos.line = match.captured(1).toInt();
+            if (match.lastCapturedIndex() > 2) // index 2 includes the + or : for the column number
+                pos.column = match.captured(3).toInt() - 1; //column is 0 based, despite line being 1 based
+        }
+    } else {
+        const QRegularExpressionMatch vsMatch = vsRegexp.match(fileName);
+        postfixPos = vsMatch.capturedStart(0);
+        if (vsMatch.lastCapturedIndex() > 1) // index 1 includes closing )
+            pos.line = vsMatch.captured(2).toInt();
+    }
+    if (pos.line > 0 && pos.column < 0)
+        pos.column = 0; // if we got a valid line make sure to return a valid TextPosition
+    return pos;
+}
+
+int Range::length(const QString &text) const
+{
+    if (end.line < begin.line)
+        return -1;
+
+    if (begin.line == end.line)
+        return end.column - begin.column;
+
+    int index = 0;
+    int currentLine = 1;
+    while (currentLine < begin.line) {
+        index = text.indexOf(QChar::LineFeed, index);
+        if (index < 0)
+            return -1;
+        ++index;
+        ++currentLine;
+    }
+    const int beginIndex = index + begin.column;
+    while (currentLine < end.line) {
+        index = text.indexOf(QChar::LineFeed, index);
+        if (index < 0)
+            return -1;
+        ++index;
+        ++currentLine;
+    }
+    return index + end.column - beginIndex;
+}
+
+bool Range::operator==(const Range &other) const
+{
+    return begin == other.begin && end == other.end;
+}
+
+QString utf16LineTextInUtf8Buffer(const QByteArray &utf8Buffer, int currentUtf8Offset)
+{
+    const int lineStartUtf8Offset = currentUtf8Offset
+                                        ? (utf8Buffer.lastIndexOf('\n', currentUtf8Offset - 1) + 1)
+                                        : 0;
+    const int lineEndUtf8Offset = utf8Buffer.indexOf('\n', currentUtf8Offset);
+    return QString::fromUtf8(
+        utf8Buffer.mid(lineStartUtf8Offset, lineEndUtf8Offset - lineStartUtf8Offset));
+}
+
+static bool isByteOfMultiByteCodePoint(unsigned char byte)
+{
+    return byte & 0x80; // Check if most significant bit is set
+}
+
+bool utf8AdvanceCodePoint(const char *&current)
+{
+    if (Q_UNLIKELY(*current == '\0'))
+        return false;
+
+    // Process multi-byte UTF-8 code point (non-latin1)
+    if (Q_UNLIKELY(isByteOfMultiByteCodePoint(*current))) {
+        unsigned trailingBytesCurrentCodePoint = 1;
+        for (unsigned char c = (*current) << 2; isByteOfMultiByteCodePoint(c); c <<= 1)
+            ++trailingBytesCurrentCodePoint;
+        current += trailingBytesCurrentCodePoint + 1;
+
+    // Process single-byte UTF-8 code point (latin1)
+    } else {
+        ++current;
+    }
+
+    return true;
+}
+
+QDebug &operator<<(QDebug &stream, const Position &pos)
+{
+    stream << "line: " << pos.line << ", column: " << pos.column;
+    return stream;
+}
+
+} // namespace Utils::Text
diff --git a/src/shared/lsp/textutils.h b/src/shared/lsp/textutils.h
new file mode 100644
index 000000000..bf4ae083f
--- /dev/null
+++ b/src/shared/lsp/textutils.h
@@ -0,0 +1,46 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include <QMetaType>
+#include <QString>
+
+namespace lsp::Utils::Text {
+
+class Position
+{
+public:
+    int line = 0; // 1-based
+    int column = -1; // 0-based
+
+    bool operator<(const Position &other) const
+    { return line < other.line || (line == other.line && column < other.column); }
+    bool operator==(const Position &other) const;
+
+    bool operator!=(const Position &other) const { return !(operator==(other)); }
+
+    bool isValid() const { return line > 0 && column >= 0; }
+
+    static Position fromFileName(QStringView fileName, int &postfixPos);
+};
+
+class Range
+{
+public:
+    int length(const QString &text) const;
+
+    Position begin;
+    Position end;
+
+    bool operator<(const Range &other) const { return begin < other.begin; }
+    bool operator==(const Range &other) const;
+
+    bool operator!=(const Range &other) const { return !(operator==(other)); }
+};
+
+QString utf16LineTextInUtf8Buffer(const QByteArray &utf8Buffer, int currentUtf8Offset);
+
+QDebug &operator<<(QDebug &stream, const Position &pos);
+
+} // Text
diff --git a/src/shared/lsp/workspace.cpp b/src/shared/lsp/workspace.cpp
new file mode 100644
index 000000000..e653bf96b
--- /dev/null
+++ b/src/shared/lsp/workspace.cpp
@@ -0,0 +1,82 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "workspace.h"
+
+namespace lsp {
+
+constexpr const char WorkSpaceFolderRequest::methodName[];
+constexpr const char DidChangeWorkspaceFoldersNotification::methodName[];
+constexpr const char DidChangeConfigurationNotification::methodName[];
+constexpr const char ConfigurationRequest::methodName[];
+constexpr const char WorkspaceSymbolRequest::methodName[];
+constexpr const char ExecuteCommandRequest::methodName[];
+constexpr const char ApplyWorkspaceEditRequest::methodName[];
+constexpr const char DidChangeWatchedFilesNotification::methodName[];
+
+WorkSpaceFolderRequest::WorkSpaceFolderRequest()
+    : Request(methodName, nullptr)
+{ }
+
+DidChangeWorkspaceFoldersNotification::DidChangeWorkspaceFoldersNotification(
+        const DidChangeWorkspaceFoldersParams &params)
+    : Notification(methodName, params)
+{ }
+
+DidChangeConfigurationNotification::DidChangeConfigurationNotification(
+        const DidChangeConfigurationParams &params)
+    : Notification(methodName, params)
+{ }
+
+ConfigurationRequest::ConfigurationRequest(const ConfigurationParams &params)
+    : Request(methodName, params)
+{ }
+
+WorkspaceSymbolRequest::WorkspaceSymbolRequest(const WorkspaceSymbolParams &params)
+    : Request(methodName, params)
+{ }
+
+ExecuteCommandRequest::ExecuteCommandRequest(const ExecuteCommandParams &params)
+    : Request(methodName, params)
+{ }
+
+ApplyWorkspaceEditRequest::ApplyWorkspaceEditRequest(const ApplyWorkspaceEditParams &params)
+    : Request(methodName, params)
+{ }
+
+WorkspaceFoldersChangeEvent::WorkspaceFoldersChangeEvent()
+{
+    insert(addedKey, QJsonArray());
+    insert(removedKey, QJsonArray());
+}
+
+DidChangeWatchedFilesNotification::DidChangeWatchedFilesNotification(
+        const DidChangeWatchedFilesParams &params)
+    : Notification(methodName, params)
+{ }
+
+ExecuteCommandParams::ExecuteCommandParams(const Command &command)
+{
+    setCommand(command.command());
+    if (command.arguments().has_value())
+        setArguments(*command.arguments());
+}
+
+WorkSpaceFolderResult::operator const QJsonValue() const
+{
+    if (!std::holds_alternative<QList<WorkSpaceFolder>>(*this))
+        return QJsonValue::Null;
+    QJsonArray array;
+    for (const auto &folder : std::get<QList<WorkSpaceFolder>>(*this))
+        array.append(QJsonValue(folder));
+    return array;
+}
+
+std::optional<DocumentUri> ConfigurationParams::ConfigurationItem::scopeUri() const
+{
+    if (const std::optional<QString> optionalScope = optionalValue<QString>(scopeUriKey))
+        return std::make_optional(DocumentUri::fromProtocol(*optionalScope));
+    return std::nullopt;
+}
+
+} // namespace lsp
diff --git a/src/shared/lsp/workspace.h b/src/shared/lsp/workspace.h
new file mode 100644
index 000000000..ffd37c1e6
--- /dev/null
+++ b/src/shared/lsp/workspace.h
@@ -0,0 +1,245 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+#include "jsonrpcmessages.h"
+
+namespace lsp {
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkSpaceFolderResult
+    : public std::variant<QList<WorkSpaceFolder>, std::nullptr_t>
+{
+public:
+    using variant::variant;
+    using variant::operator=;
+    operator const QJsonValue() const;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkSpaceFolderRequest : public Request<
+    WorkSpaceFolderResult, std::nullptr_t, std::nullptr_t>
+{
+public:
+    WorkSpaceFolderRequest();
+    using Request::Request;
+    constexpr static const char methodName[] = "workspace/workspaceFolders";
+
+    bool parametersAreValid(QString * /*errorMessage*/) const override { return true; }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkspaceFoldersChangeEvent : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+    WorkspaceFoldersChangeEvent();
+
+    QList<WorkSpaceFolder> added() const { return array<WorkSpaceFolder>(addedKey); }
+    void setAdded(const QList<WorkSpaceFolder> &added) { insertArray(addedKey, added); }
+
+    QList<WorkSpaceFolder> removed() const { return array<WorkSpaceFolder>(removedKey); }
+    void setRemoved(const QList<WorkSpaceFolder> &removed) { insertArray(removedKey, removed); }
+
+    bool isValid() const override { return contains(addedKey) && contains(removedKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidChangeWorkspaceFoldersParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    WorkspaceFoldersChangeEvent event() const
+    { return typedValue<WorkspaceFoldersChangeEvent>(eventKey); }
+    void setEvent(const WorkspaceFoldersChangeEvent &event) { insert(eventKey, event); }
+
+    bool isValid() const override { return contains(eventKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidChangeWorkspaceFoldersNotification : public Notification<
+        DidChangeWorkspaceFoldersParams>
+{
+public:
+    explicit DidChangeWorkspaceFoldersNotification(const DidChangeWorkspaceFoldersParams &params);
+    constexpr static const char methodName[] = "workspace/didChangeWorkspaceFolders";
+    using Notification::Notification;
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidChangeConfigurationParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QJsonValue settings() const { return value(settingsKey); }
+    void setSettings(QJsonValue settings) { insert(settingsKey, settings); }
+
+    bool isValid() const override { return contains(settingsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidChangeConfigurationNotification : public Notification<
+        DidChangeConfigurationParams>
+{
+public:
+    explicit DidChangeConfigurationNotification(const DidChangeConfigurationParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "workspace/didChangeConfiguration";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ConfigurationParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+    class LANGUAGESERVERPROTOCOL_EXPORT ConfigurationItem : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        std::optional<DocumentUri> scopeUri() const;
+        void setScopeUri(const DocumentUri &scopeUri) { insert(scopeUriKey, scopeUri); }
+        void clearScopeUri() { remove(scopeUriKey); }
+
+        std::optional<QString> section() const { return optionalValue<QString>(sectionKey); }
+        void setSection(const QString &section) { insert(sectionKey, section); }
+        void clearSection() { remove(sectionKey); }
+
+        bool isValid() const override { return contains(scopeUriKey); }
+    };
+
+    QList<ConfigurationItem> items() const { return array<ConfigurationItem>(itemsKey); }
+    void setItems(const QList<ConfigurationItem> &items) { insertArray(itemsKey, items); }
+
+    bool isValid() const override { return contains(itemsKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ConfigurationRequest
+    : public Request<QJsonArray, std::nullptr_t, ConfigurationParams>
+{
+public:
+    explicit ConfigurationRequest(const ConfigurationParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "workspace/configuration";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidChangeWatchedFilesParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    class FileEvent : public JsonObject
+    {
+    public:
+        using JsonObject::JsonObject;
+
+        DocumentUri uri() const { return DocumentUri::fromProtocol(typedValue<QString>(uriKey)); }
+        void setUri(const DocumentUri &uri) { insert(uriKey, uri); }
+
+        int type() const { return typedValue<int>(typeKey); }
+        void setType(int type) { insert(typeKey, type); }
+
+        enum FileChangeType {
+            Created = 1,
+            Changed = 2,
+            Deleted = 3
+        };
+
+        bool isValid() const override { return contains(uriKey) && contains(typeKey); }
+    };
+
+    QList<FileEvent> changes() const { return array<FileEvent>(changesKey); }
+    void setChanges(const QList<FileEvent> &changes) { insertArray(changesKey, changes); }
+
+    bool isValid() const override { return contains(changesKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT DidChangeWatchedFilesNotification : public Notification<
+        DidChangeWatchedFilesParams>
+{
+public:
+    explicit DidChangeWatchedFilesNotification(const DidChangeWatchedFilesParams &params);
+    using Notification::Notification;
+    constexpr static const char methodName[] = "workspace/didChangeWatchedFiles";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkspaceSymbolParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    QString query() const { return typedValue<QString>(queryKey); }
+    void setQuery(const QString &query) { insert(queryKey, query); }
+
+    void setLimit(int limit) { insert("limit", limit); } // clangd extension
+
+    bool isValid() const override { return contains(queryKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT WorkspaceSymbolRequest : public Request<
+        LanguageClientArray<SymbolInformation>, std::nullptr_t, WorkspaceSymbolParams>
+{
+public:
+    explicit WorkspaceSymbolRequest(const WorkspaceSymbolParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "workspace/symbol";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ExecuteCommandParams : public JsonObject
+{
+public:
+    explicit ExecuteCommandParams(const Command &command);
+    explicit ExecuteCommandParams(const QJsonValue &value) : JsonObject(value) {}
+    ExecuteCommandParams() : JsonObject() {}
+
+    QString command() const { return typedValue<QString>(commandKey); }
+    void setCommand(const QString &command) { insert(commandKey, command); }
+    void clearCommand() { remove(commandKey); }
+
+    std::optional<QJsonArray> arguments() const { return typedValue<QJsonArray>(argumentsKey); }
+    void setArguments(const QJsonArray &arguments) { insert(argumentsKey, arguments); }
+    void clearArguments() { remove(argumentsKey); }
+
+    bool isValid() const override { return contains(commandKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ExecuteCommandRequest : public Request<
+        QJsonValue, std::nullptr_t, ExecuteCommandParams>
+{
+public:
+    explicit ExecuteCommandRequest(const ExecuteCommandParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "workspace/executeCommand";
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ApplyWorkspaceEditParams : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    std::optional<QString> label() const { return optionalValue<QString>(labelKey); }
+    void setLabel(const QString &label) { insert(labelKey, label); }
+    void clearLabel() { remove(labelKey); }
+
+    WorkspaceEdit edit() const { return typedValue<WorkspaceEdit>(editKey); }
+    void setEdit(const WorkspaceEdit &edit) { insert(editKey, edit); }
+
+    bool isValid() const override { return contains(editKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ApplyWorkspaceEditResult : public JsonObject
+{
+public:
+    using JsonObject::JsonObject;
+
+    bool applied() const { return typedValue<bool>(appliedKey); }
+    void setApplied(bool applied) { insert(appliedKey, applied); }
+
+    bool isValid() const override { return contains(appliedKey); }
+};
+
+class LANGUAGESERVERPROTOCOL_EXPORT ApplyWorkspaceEditRequest : public Request<
+        ApplyWorkspaceEditResult, std::nullptr_t, ApplyWorkspaceEditParams>
+{
+public:
+    explicit ApplyWorkspaceEditRequest(const ApplyWorkspaceEditParams &params);
+    using Request::Request;
+    constexpr static const char methodName[] = "workspace/applyEdit";
+};
+
+} // namespace LanguageClient
diff --git a/src/shared/qtscript b/src/shared/qtscript
deleted file mode 160000
-Subproject e19477e1129a4c64e023006c59878637d594e99
diff --git a/src/shared/quickjs/.clang-format b/src/shared/quickjs/.clang-format
new file mode 100644
index 000000000..47a38a93f
--- /dev/null
+++ b/src/shared/quickjs/.clang-format
@@ -0,0 +1,2 @@
+DisableFormat: true
+SortIncludes: Never
diff --git a/src/shared/quickjs/.clang-tidy b/src/shared/quickjs/.clang-tidy
new file mode 100644
index 000000000..b9209aae5
--- /dev/null
+++ b/src/shared/quickjs/.clang-tidy
@@ -0,0 +1,3 @@
+Checks: '-*,misc-definitions-in-headers'
+
+InheritParentConfig: true
diff --git a/src/shared/quickjs/CMakeLists.txt b/src/shared/quickjs/CMakeLists.txt
new file mode 100644
index 000000000..d88739ab0
--- /dev/null
+++ b/src/shared/quickjs/CMakeLists.txt
@@ -0,0 +1,34 @@
+add_qbs_library(qbsquickjs
+    STATIC
+    SOURCES
+        cutils.c cutils.h
+        libbf.c libbf.h
+        libregexp-opcode.h
+        libregexp.c libregexp.h
+        libunicode-table.h
+        libunicode.c libunicode.h
+        list.h
+        quickjs-atom.h
+        quickjs-opcode.h
+        quickjs.c quickjs.h
+    DEFINES
+        "CONFIG_VERSION=\"2021-03-27\""
+)
+if(QBS_QUICKJS_LEAK_CHECK)
+  add_definitions(-DDUMP_LEAKS)
+endif()
+target_include_directories(
+    qbsquickjs
+    SYSTEM
+    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_library(qbsquickjsheaders INTERFACE)
+target_include_directories(
+    qbsquickjsheaders
+    SYSTEM
+    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}
+)
+if(MSVC)
+  target_compile_options(qbsquickjs PUBLIC /wd4018 /wd4334 /wd4101 /wd4146 /wd4244 /wd4267 /wd4996)
+endif()
diff --git a/src/shared/quickjs/LICENSE b/src/shared/quickjs/LICENSE
new file mode 100644
index 000000000..2cf449dd3
--- /dev/null
+++ b/src/shared/quickjs/LICENSE
@@ -0,0 +1,22 @@
+QuickJS Javascript Engine
+
+Copyright (c) 2017-2021 Fabrice Bellard
+Copyright (c) 2017-2021 Charlie Gordon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/shared/quickjs/cutils.c b/src/shared/quickjs/cutils.c
new file mode 100644
index 000000000..95ae5688d
--- /dev/null
+++ b/src/shared/quickjs/cutils.c
@@ -0,0 +1,630 @@
+/*
+ * C utilities
+ *
+ * Copyright (c) 2017 Fabrice Bellard
+ * Copyright (c) 2018 Charlie Gordon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "cutils.h"
+
+void pstrcpy(char *buf, int buf_size, const char *str)
+{
+    int c;
+    char *q = buf;
+
+    if (buf_size <= 0)
+        return;
+
+    for(;;) {
+        c = *str++;
+        if (c == 0 || q >= buf + buf_size - 1)
+            break;
+        *q++ = c;
+    }
+    *q = '\0';
+}
+
+/* strcat and truncate. */
+char *pstrcat(char *buf, int buf_size, const char *s)
+{
+    int len;
+    len = strlen(buf);
+    if (len < buf_size)
+        pstrcpy(buf + len, buf_size - len, s);
+    return buf;
+}
+
+int strstart(const char *str, const char *val, const char **ptr)
+{
+    const char *p, *q;
+    p = str;
+    q = val;
+    while (*q != '\0') {
+        if (*p != *q)
+            return 0;
+        p++;
+        q++;
+    }
+    if (ptr)
+        *ptr = p;
+    return 1;
+}
+
+int has_suffix(const char *str, const char *suffix)
+{
+    size_t len = strlen(str);
+    size_t slen = strlen(suffix);
+    return (len >= slen && !memcmp(str + len - slen, suffix, slen));
+}
+
+/* Dynamic buffer package */
+
+static void *dbuf_default_realloc(void *opaque, void *ptr, size_t size)
+{
+    return realloc(ptr, size);
+}
+
+void dbuf_init2(DynBuf *s, void *opaque, DynBufReallocFunc *realloc_func)
+{
+    memset(s, 0, sizeof(*s));
+    if (!realloc_func)
+        realloc_func = dbuf_default_realloc;
+    s->opaque = opaque;
+    s->realloc_func = realloc_func;
+}
+
+void dbuf_init(DynBuf *s)
+{
+    dbuf_init2(s, NULL, NULL);
+}
+
+/* return < 0 if error */
+int dbuf_realloc(DynBuf *s, size_t new_size)
+{
+    size_t size;
+    uint8_t *new_buf;
+    if (new_size > s->allocated_size) {
+        if (s->error)
+            return -1;
+        size = s->allocated_size * 3 / 2;
+        if (size > new_size)
+            new_size = size;
+        new_buf = s->realloc_func(s->opaque, s->buf, new_size);
+        if (!new_buf) {
+            s->error = TRUE;
+            return -1;
+        }
+        s->buf = new_buf;
+        s->allocated_size = new_size;
+    }
+    return 0;
+}
+
+int dbuf_write(DynBuf *s, size_t offset, const uint8_t *data, size_t len)
+{
+    size_t end;
+    end = offset + len;
+    if (dbuf_realloc(s, end))
+        return -1;
+    memcpy(s->buf + offset, data, len);
+    if (end > s->size)
+        s->size = end;
+    return 0;
+}
+
+int dbuf_put(DynBuf *s, const uint8_t *data, size_t len)
+{
+    if (unlikely((s->size + len) > s->allocated_size)) {
+        if (dbuf_realloc(s, s->size + len))
+            return -1;
+    }
+    memcpy_no_ub(s->buf + s->size, data, len);
+    s->size += len;
+    return 0;
+}
+
+int dbuf_put_self(DynBuf *s, size_t offset, size_t len)
+{
+    if (unlikely((s->size + len) > s->allocated_size)) {
+        if (dbuf_realloc(s, s->size + len))
+            return -1;
+    }
+    memcpy(s->buf + s->size, s->buf + offset, len);
+    s->size += len;
+    return 0;
+}
+
+int dbuf_putc(DynBuf *s, uint8_t c)
+{
+    return dbuf_put(s, &c, 1);
+}
+
+int dbuf_putstr(DynBuf *s, const char *str)
+{
+    return dbuf_put(s, (const uint8_t *)str, strlen(str));
+}
+
+int FORMAT_ATTR(2, 3) dbuf_printf(DynBuf *s, const char *fmt, ...)
+{
+    va_list ap;
+    char buf[128];
+    int len;
+
+    va_start(ap, fmt);
+    len = vsnprintf(buf, sizeof(buf), fmt, ap);
+    va_end(ap);
+    if (len < sizeof(buf)) {
+        /* fast case */
+        return dbuf_put(s, (uint8_t *)buf, len);
+    } else {
+        if (dbuf_realloc(s, s->size + len + 1))
+            return -1;
+        va_start(ap, fmt);
+        vsnprintf((char *)(s->buf + s->size), s->allocated_size - s->size,
+                  fmt, ap);
+        va_end(ap);
+        s->size += len;
+    }
+    return 0;
+}
+
+void dbuf_free(DynBuf *s)
+{
+    /* we test s->buf as a fail safe to avoid crashing if dbuf_free()
+       is called twice */
+    if (s->buf) {
+        s->realloc_func(s->opaque, s->buf, 0);
+    }
+    memset(s, 0, sizeof(*s));
+}
+
+/* Note: at most 31 bits are encoded. At most UTF8_CHAR_LEN_MAX bytes
+   are output. */
+int unicode_to_utf8(uint8_t *buf, unsigned int c)
+{
+    uint8_t *q = buf;
+
+    if (c < 0x80) {
+        *q++ = c;
+    } else {
+        if (c < 0x800) {
+            *q++ = (c >> 6) | 0xc0;
+        } else {
+            if (c < 0x10000) {
+                *q++ = (c >> 12) | 0xe0;
+            } else {
+                if (c < 0x00200000) {
+                    *q++ = (c >> 18) | 0xf0;
+                } else {
+                    if (c < 0x04000000) {
+                        *q++ = (c >> 24) | 0xf8;
+                    } else if (c < 0x80000000) {
+                        *q++ = (c >> 30) | 0xfc;
+                        *q++ = ((c >> 24) & 0x3f) | 0x80;
+                    } else {
+                        return 0;
+                    }
+                    *q++ = ((c >> 18) & 0x3f) | 0x80;
+                }
+                *q++ = ((c >> 12) & 0x3f) | 0x80;
+            }
+            *q++ = ((c >> 6) & 0x3f) | 0x80;
+        }
+        *q++ = (c & 0x3f) | 0x80;
+    }
+    return q - buf;
+}
+
+static const unsigned int utf8_min_code[5] = {
+    0x80, 0x800, 0x10000, 0x00200000, 0x04000000,
+};
+
+static const unsigned char utf8_first_code_mask[5] = {
+    0x1f, 0xf, 0x7, 0x3, 0x1,
+};
+
+/* return -1 if error. *pp is not updated in this case. max_len must
+   be >= 1. The maximum length for a UTF8 byte sequence is 6 bytes. */
+int unicode_from_utf8(const uint8_t *p, int max_len, const uint8_t **pp)
+{
+    int l, c, b, i;
+
+    c = *p++;
+    if (c < 0x80) {
+        *pp = p;
+        return c;
+    }
+    switch(c) {
+    case 0xc0: case 0xc1: case 0xc2: case 0xc3:
+    case 0xc4: case 0xc5: case 0xc6: case 0xc7:
+    case 0xc8: case 0xc9: case 0xca: case 0xcb:
+    case 0xcc: case 0xcd: case 0xce: case 0xcf:
+    case 0xd0: case 0xd1: case 0xd2: case 0xd3:
+    case 0xd4: case 0xd5: case 0xd6: case 0xd7:
+    case 0xd8: case 0xd9: case 0xda: case 0xdb:
+    case 0xdc: case 0xdd: case 0xde: case 0xdf:
+        l = 1;
+        break;
+    case 0xe0: case 0xe1: case 0xe2: case 0xe3:
+    case 0xe4: case 0xe5: case 0xe6: case 0xe7:
+    case 0xe8: case 0xe9: case 0xea: case 0xeb:
+    case 0xec: case 0xed: case 0xee: case 0xef:
+        l = 2;
+        break;
+    case 0xf0: case 0xf1: case 0xf2: case 0xf3:
+    case 0xf4: case 0xf5: case 0xf6: case 0xf7:
+        l = 3;
+        break;
+    case 0xf8: case 0xf9: case 0xfa: case 0xfb:
+        l = 4;
+        break;
+    case 0xfc: case 0xfd:
+        l = 5;
+        break;
+    default:
+        return -1;
+    }
+    /* check that we have enough characters */
+    if (l > (max_len - 1))
+        return -1;
+    c &= utf8_first_code_mask[l - 1];
+    for(i = 0; i < l; i++) {
+        b = *p++;
+        if (b < 0x80 || b >= 0xc0)
+            return -1;
+        c = (c << 6) | (b & 0x3f);
+    }
+    if (c < utf8_min_code[l - 1])
+        return -1;
+    *pp = p;
+    return c;
+}
+
+#if 0
+
+#if defined(EMSCRIPTEN) || defined(__ANDROID__)
+
+static void *rqsort_arg;
+static int (*rqsort_cmp)(const void *, const void *, void *);
+
+static int rqsort_cmp2(const void *p1, const void *p2)
+{
+    return rqsort_cmp(p1, p2, rqsort_arg);
+}
+
+/* not reentrant, but not needed with emscripten */
+void rqsort(void *base, size_t nmemb, size_t size,
+            int (*cmp)(const void *, const void *, void *),
+            void *arg)
+{
+    rqsort_arg = arg;
+    rqsort_cmp = cmp;
+    qsort(base, nmemb, size, rqsort_cmp2);
+}
+
+#endif
+
+#else
+
+typedef void (*exchange_f)(void *a, void *b, size_t size);
+typedef int (*cmp_f)(const void *, const void *, void *opaque);
+
+static void exchange_bytes(void *a, void *b, size_t size) {
+    uint8_t *ap = (uint8_t *)a;
+    uint8_t *bp = (uint8_t *)b;
+
+    while (size-- != 0) {
+        uint8_t t = *ap;
+        *ap++ = *bp;
+        *bp++ = t;
+    }
+}
+
+static void exchange_one_byte(void *a, void *b, size_t size) {
+    uint8_t *ap = (uint8_t *)a;
+    uint8_t *bp = (uint8_t *)b;
+    uint8_t t = *ap;
+    *ap = *bp;
+    *bp = t;
+}
+
+static void exchange_int16s(void *a, void *b, size_t size) {
+    uint16_t *ap = (uint16_t *)a;
+    uint16_t *bp = (uint16_t *)b;
+
+    for (size /= sizeof(uint16_t); size-- != 0;) {
+        uint16_t t = *ap;
+        *ap++ = *bp;
+        *bp++ = t;
+    }
+}
+
+static void exchange_one_int16(void *a, void *b, size_t size) {
+    uint16_t *ap = (uint16_t *)a;
+    uint16_t *bp = (uint16_t *)b;
+    uint16_t t = *ap;
+    *ap = *bp;
+    *bp = t;
+}
+
+static void exchange_int32s(void *a, void *b, size_t size) {
+    uint32_t *ap = (uint32_t *)a;
+    uint32_t *bp = (uint32_t *)b;
+
+    for (size /= sizeof(uint32_t); size-- != 0;) {
+        uint32_t t = *ap;
+        *ap++ = *bp;
+        *bp++ = t;
+    }
+}
+
+static void exchange_one_int32(void *a, void *b, size_t size) {
+    uint32_t *ap = (uint32_t *)a;
+    uint32_t *bp = (uint32_t *)b;
+    uint32_t t = *ap;
+    *ap = *bp;
+    *bp = t;
+}
+
+static void exchange_int64s(void *a, void *b, size_t size) {
+    uint64_t *ap = (uint64_t *)a;
+    uint64_t *bp = (uint64_t *)b;
+
+    for (size /= sizeof(uint64_t); size-- != 0;) {
+        uint64_t t = *ap;
+        *ap++ = *bp;
+        *bp++ = t;
+    }
+}
+
+static void exchange_one_int64(void *a, void *b, size_t size) {
+    uint64_t *ap = (uint64_t *)a;
+    uint64_t *bp = (uint64_t *)b;
+    uint64_t t = *ap;
+    *ap = *bp;
+    *bp = t;
+}
+
+static void exchange_int128s(void *a, void *b, size_t size) {
+    uint64_t *ap = (uint64_t *)a;
+    uint64_t *bp = (uint64_t *)b;
+
+    for (size /= sizeof(uint64_t) * 2; size-- != 0; ap += 2, bp += 2) {
+        uint64_t t = ap[0];
+        uint64_t u = ap[1];
+        ap[0] = bp[0];
+        ap[1] = bp[1];
+        bp[0] = t;
+        bp[1] = u;
+    }
+}
+
+static void exchange_one_int128(void *a, void *b, size_t size) {
+    uint64_t *ap = (uint64_t *)a;
+    uint64_t *bp = (uint64_t *)b;
+    uint64_t t = ap[0];
+    uint64_t u = ap[1];
+    ap[0] = bp[0];
+    ap[1] = bp[1];
+    bp[0] = t;
+    bp[1] = u;
+}
+
+static inline exchange_f exchange_func(const void *base, size_t size) {
+    switch (((uintptr_t)base | (uintptr_t)size) & 15) {
+    case 0:
+        if (size == sizeof(uint64_t) * 2)
+            return exchange_one_int128;
+        else
+            return exchange_int128s;
+    case 8:
+        if (size == sizeof(uint64_t))
+            return exchange_one_int64;
+        else
+            return exchange_int64s;
+    case 4:
+    case 12:
+        if (size == sizeof(uint32_t))
+            return exchange_one_int32;
+        else
+            return exchange_int32s;
+    case 2:
+    case 6:
+    case 10:
+    case 14:
+        if (size == sizeof(uint16_t))
+            return exchange_one_int16;
+        else
+            return exchange_int16s;
+    default:
+        if (size == 1)
+            return exchange_one_byte;
+        else
+            return exchange_bytes;
+    }
+}
+
+static void heapsortx(void *base, size_t nmemb, size_t size, cmp_f cmp, void *opaque)
+{
+    uint8_t *basep = (uint8_t *)base;
+    size_t i, n, c, r;
+    exchange_f swap = exchange_func(base, size);
+
+    if (nmemb > 1) {
+        i = (nmemb / 2) * size;
+        n = nmemb * size;
+
+        while (i > 0) {
+            i -= size;
+            for (r = i; (c = r * 2 + size) < n; r = c) {
+                if (c < n - size && cmp(basep + c, basep + c + size, opaque) <= 0)
+                    c += size;
+                if (cmp(basep + r, basep + c, opaque) > 0)
+                    break;
+                swap(basep + r, basep + c, size);
+            }
+        }
+        for (i = n - size; i > 0; i -= size) {
+            swap(basep, basep + i, size);
+
+            for (r = 0; (c = r * 2 + size) < i; r = c) {
+                if (c < i - size && cmp(basep + c, basep + c + size, opaque) <= 0)
+                    c += size;
+                if (cmp(basep + r, basep + c, opaque) > 0)
+                    break;
+                swap(basep + r, basep + c, size);
+            }
+        }
+    }
+}
+
+static inline void *med3(void *a, void *b, void *c, cmp_f cmp, void *opaque)
+{
+    return cmp(a, b, opaque) < 0 ?
+        (cmp(b, c, opaque) < 0 ? b : (cmp(a, c, opaque) < 0 ? c : a )) :
+        (cmp(b, c, opaque) > 0 ? b : (cmp(a, c, opaque) < 0 ? a : c ));
+}
+
+/* pointer based version with local stack and insertion sort threshhold */
+void rqsort(void *base, size_t nmemb, size_t size, cmp_f cmp, void *opaque)
+{
+    struct { uint8_t *base; size_t count; int depth; } stack[50], *sp = stack;
+    uint8_t *ptr, *pi, *pj, *plt, *pgt, *top, *m;
+    size_t m4, i, lt, gt, span, span2;
+    int c, depth;
+    exchange_f swap = exchange_func(base, size);
+    exchange_f swap_block = exchange_func(base, size | 128);
+
+    if (nmemb < 2 || size <= 0)
+        return;
+
+    sp->base = (uint8_t *)base;
+    sp->count = nmemb;
+    sp->depth = 0;
+    sp++;
+
+    while (sp > stack) {
+        sp--;
+        ptr = sp->base;
+        nmemb = sp->count;
+        depth = sp->depth;
+
+        while (nmemb > 6) {
+            if (++depth > 50) {
+                /* depth check to ensure worst case logarithmic time */
+                heapsortx(ptr, nmemb, size, cmp, opaque);
+                nmemb = 0;
+                break;
+            }
+            /* select median of 3 from 1/4, 1/2, 3/4 positions */
+            /* should use median of 5 or 9? */
+            m4 = (nmemb >> 2) * size;
+            m = med3(ptr + m4, ptr + 2 * m4, ptr + 3 * m4, cmp, opaque);
+            swap(ptr, m, size);  /* move the pivot to the start or the array */
+            i = lt = 1;
+            pi = plt = ptr + size;
+            gt = nmemb;
+            pj = pgt = top = ptr + nmemb * size;
+            for (;;) {
+                while (pi < pj && (c = cmp(ptr, pi, opaque)) >= 0) {
+                    if (c == 0) {
+                        swap(plt, pi, size);
+                        lt++;
+                        plt += size;
+                    }
+                    i++;
+                    pi += size;
+                }
+                while (pi < (pj -= size) && (c = cmp(ptr, pj, opaque)) <= 0) {
+                    if (c == 0) {
+                        gt--;
+                        pgt -= size;
+                        swap(pgt, pj, size);
+                    }
+                }
+                if (pi >= pj)
+                    break;
+                swap(pi, pj, size);
+                i++;
+                pi += size;
+            }
+            /* array has 4 parts:
+             * from 0 to lt excluded: elements identical to pivot
+             * from lt to pi excluded: elements smaller than pivot
+             * from pi to gt excluded: elements greater than pivot
+             * from gt to n excluded: elements identical to pivot
+             */
+            /* move elements identical to pivot in the middle of the array: */
+            /* swap values in ranges [0..lt[ and [i-lt..i[
+               swapping the smallest span between lt and i-lt is sufficient
+             */
+            span = plt - ptr;
+            span2 = pi - plt;
+            lt = i - lt;
+            if (span > span2)
+                span = span2;
+            swap_block(ptr, pi - span, span);
+            /* swap values in ranges [gt..top[ and [i..top-(top-gt)[
+               swapping the smallest span between top-gt and gt-i is sufficient
+             */
+            span = top - pgt;
+            span2 = pgt - pi;
+            pgt = top - span2;
+            gt = nmemb - (gt - i);
+            if (span > span2)
+                span = span2;
+            swap_block(pi, top - span, span);
+
+            /* now array has 3 parts:
+             * from 0 to lt excluded: elements smaller than pivot
+             * from lt to gt excluded: elements identical to pivot
+             * from gt to n excluded: elements greater than pivot
+             */
+            /* stack the larger segment and keep processing the smaller one
+               to minimize stack use for pathological distributions */
+            if (lt > nmemb - gt) {
+                sp->base = ptr;
+                sp->count = lt;
+                sp->depth = depth;
+                sp++;
+                ptr = pgt;
+                nmemb -= gt;
+            } else {
+                sp->base = pgt;
+                sp->count = nmemb - gt;
+                sp->depth = depth;
+                sp++;
+                nmemb = lt;
+            }
+        }
+        /* Use insertion sort for small fragments */
+        for (pi = ptr + size, top = ptr + nmemb * size; pi < top; pi += size) {
+            for (pj = pi; pj > ptr && cmp(pj - size, pj, opaque) > 0; pj -= size)
+                swap(pj, pj - size, size);
+        }
+    }
+}
+
+#endif
diff --git a/src/shared/quickjs/cutils.h b/src/shared/quickjs/cutils.h
new file mode 100644
index 000000000..265fd0aee
--- /dev/null
+++ b/src/shared/quickjs/cutils.h
@@ -0,0 +1,389 @@
+/*
+ * C utilities
+ *
+ * Copyright (c) 2017 Fabrice Bellard
+ * Copyright (c) 2018 Charlie Gordon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef CUTILS_H
+#define CUTILS_H
+
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#else
+#include <sys/types.h>
+#endif
+
+#ifdef __GNUC__
+#define likely(x)       __builtin_expect(!!(x), 1)
+#define unlikely(x)     __builtin_expect(!!(x), 0)
+#define force_inline inline __attribute__((always_inline))
+#define no_inline __attribute__((noinline))
+#define __maybe_unused __attribute__((unused))
+#else
+#define likely(x) (x)
+#define unlikely(x) (x)
+#define force_inline
+#define no_inline
+#define __maybe_unused
+#endif
+
+#ifdef _MSC_VER
+#define alloca _alloca
+#endif
+
+#define xglue(x, y) x ## y
+#define glue(x, y) xglue(x, y)
+#define stringify(s)    tostring(s)
+#define tostring(s)     #s
+
+#ifndef offsetof
+#define offsetof(type, field) ((size_t) &((type *)0)->field)
+#endif
+#ifndef countof
+#define countof(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+#ifndef container_of
+/* return the pointer of type 'type *' containing 'ptr' as field 'member' */
+#define container_of(ptr, type, member) ((type *)((uint8_t *)(ptr) - offsetof(type, member)))
+#endif
+
+#if !defined(_MSC_VER) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#define minimum_length(n)  static n
+#else
+#define minimum_length(n)  n
+#endif
+
+typedef int BOOL;
+
+#ifndef FALSE
+enum {
+    FALSE = 0,
+    TRUE = 1,
+};
+#endif
+
+void pstrcpy(char *buf, int buf_size, const char *str);
+char *pstrcat(char *buf, int buf_size, const char *s);
+int strstart(const char *str, const char *val, const char **ptr);
+int has_suffix(const char *str, const char *suffix);
+
+/* Prevent UB when n == 0 and (src == NULL or dest == NULL) */
+static inline void memcpy_no_ub(void *dest, const void *src, size_t n) {
+    if (n)
+        memcpy(dest, src, n);
+}
+
+static inline int max_int(int a, int b)
+{
+    if (a > b)
+        return a;
+    else
+        return b;
+}
+
+static inline int min_int(int a, int b)
+{
+    if (a < b)
+        return a;
+    else
+        return b;
+}
+
+static inline uint32_t max_uint32(uint32_t a, uint32_t b)
+{
+    if (a > b)
+        return a;
+    else
+        return b;
+}
+
+static inline uint32_t min_uint32(uint32_t a, uint32_t b)
+{
+    if (a < b)
+        return a;
+    else
+        return b;
+}
+
+static inline int64_t max_int64(int64_t a, int64_t b)
+{
+    if (a > b)
+        return a;
+    else
+        return b;
+}
+
+static inline int64_t min_int64(int64_t a, int64_t b)
+{
+    if (a < b)
+        return a;
+    else
+        return b;
+}
+
+/* WARNING: undefined if a = 0 */
+static inline int clz32(unsigned int a)
+{
+#ifdef _MSC_VER
+    return (int) __lzcnt(a);
+#else
+    return __builtin_clz(a);
+#endif
+}
+
+/* WARNING: undefined if a = 0 */
+static inline int clz64(uint64_t a)
+{
+#ifdef _MSC_VER
+    return (int) __lzcnt64(a);
+#else
+    return __builtin_clzll(a);
+#endif
+}
+
+/* WARNING: undefined if a = 0 */
+static inline int ctz32(unsigned int a)
+{
+#ifdef _MSC_VER
+    return (int) _tzcnt_u32(a);
+#else
+    return __builtin_ctz(a);
+#endif
+}
+
+/* WARNING: undefined if a = 0 */
+static inline int ctz64(uint64_t a)
+{
+#ifdef _MSC_VER
+    return (int) _tzcnt_u64(a);
+#else
+    return __builtin_ctzll(a);
+#endif
+}
+
+#pragma pack(push, 1)
+struct packed_u64 {
+    uint64_t v;
+};
+struct packed_u32 {
+    uint32_t v;
+};
+struct packed_u16 {
+    uint16_t v;
+};
+#pragma pack(pop)
+
+static inline uint64_t get_u64(const uint8_t *tab)
+{
+    return ((const struct packed_u64 *)tab)->v;
+}
+
+static inline int64_t get_i64(const uint8_t *tab)
+{
+    return (int64_t)((const struct packed_u64 *)tab)->v;
+}
+
+static inline void put_u64(uint8_t *tab, uint64_t val)
+{
+    ((struct packed_u64 *)tab)->v = val;
+}
+
+static inline uint32_t get_u32(const uint8_t *tab)
+{
+    return ((const struct packed_u32 *)tab)->v;
+}
+
+static inline int32_t get_i32(const uint8_t *tab)
+{
+    return (int32_t)((const struct packed_u32 *)tab)->v;
+}
+
+static inline void put_u32(uint8_t *tab, uint32_t val)
+{
+    ((struct packed_u32 *)tab)->v = val;
+}
+
+static inline uint32_t get_u16(const uint8_t *tab)
+{
+    return ((const struct packed_u16 *)tab)->v;
+}
+
+static inline int32_t get_i16(const uint8_t *tab)
+{
+    return (int16_t)((const struct packed_u16 *)tab)->v;
+}
+
+static inline void put_u16(uint8_t *tab, uint16_t val)
+{
+    ((struct packed_u16 *)tab)->v = val;
+}
+
+static inline uint32_t get_u8(const uint8_t *tab)
+{
+    return *tab;
+}
+
+static inline int32_t get_i8(const uint8_t *tab)
+{
+    return (int8_t)*tab;
+}
+
+static inline void put_u8(uint8_t *tab, uint8_t val)
+{
+    *tab = val;
+}
+
+#ifndef bswap16
+static inline uint16_t bswap16(uint16_t x)
+{
+    return (x >> 8) | (x << 8);
+}
+#endif
+
+#ifndef bswap32
+static inline uint32_t bswap32(uint32_t v)
+{
+    return ((v & 0xff000000) >> 24) | ((v & 0x00ff0000) >>  8) |
+        ((v & 0x0000ff00) <<  8) | ((v & 0x000000ff) << 24);
+}
+#endif
+
+#ifndef bswap64
+static inline uint64_t bswap64(uint64_t v)
+{
+    return ((v & ((uint64_t)0xff << (7 * 8))) >> (7 * 8)) |
+        ((v & ((uint64_t)0xff << (6 * 8))) >> (5 * 8)) |
+        ((v & ((uint64_t)0xff << (5 * 8))) >> (3 * 8)) |
+        ((v & ((uint64_t)0xff << (4 * 8))) >> (1 * 8)) |
+        ((v & ((uint64_t)0xff << (3 * 8))) << (1 * 8)) |
+        ((v & ((uint64_t)0xff << (2 * 8))) << (3 * 8)) |
+        ((v & ((uint64_t)0xff << (1 * 8))) << (5 * 8)) |
+        ((v & ((uint64_t)0xff << (0 * 8))) << (7 * 8));
+}
+#endif
+
+/* XXX: should take an extra argument to pass slack information to the caller */
+typedef void *DynBufReallocFunc(void *opaque, void *ptr, size_t size);
+
+typedef struct DynBuf {
+    uint8_t *buf;
+    size_t size;
+    size_t allocated_size;
+    BOOL error; /* true if a memory allocation error occurred */
+    DynBufReallocFunc *realloc_func;
+    void *opaque; /* for realloc_func */
+} DynBuf;
+
+void dbuf_init(DynBuf *s);
+void dbuf_init2(DynBuf *s, void *opaque, DynBufReallocFunc *realloc_func);
+int dbuf_realloc(DynBuf *s, size_t new_size);
+int dbuf_write(DynBuf *s, size_t offset, const uint8_t *data, size_t len);
+int dbuf_put(DynBuf *s, const uint8_t *data, size_t len);
+int dbuf_put_self(DynBuf *s, size_t offset, size_t len);
+int dbuf_putc(DynBuf *s, uint8_t c);
+int dbuf_putstr(DynBuf *s, const char *str);
+static inline int dbuf_put_u16(DynBuf *s, uint16_t val)
+{
+    return dbuf_put(s, (uint8_t *)&val, 2);
+}
+static inline int dbuf_put_u32(DynBuf *s, uint32_t val)
+{
+    return dbuf_put(s, (uint8_t *)&val, 4);
+}
+static inline int dbuf_put_u64(DynBuf *s, uint64_t val)
+{
+    return dbuf_put(s, (uint8_t *)&val, 8);
+}
+
+#ifdef __GNUC__
+#define FORMAT_ATTR(x, y) __attribute__((format(printf, x, y)))
+#else
+#define FORMAT_ATTR(x, y)
+#endif
+
+int FORMAT_ATTR(2, 3) dbuf_printf(DynBuf *s, const char *fmt, ...);
+
+void dbuf_free(DynBuf *s);
+static inline BOOL dbuf_error(DynBuf *s) {
+    return s->error;
+}
+static inline void dbuf_set_error(DynBuf *s)
+{
+    s->error = TRUE;
+}
+
+#define UTF8_CHAR_LEN_MAX 6
+
+int unicode_to_utf8(uint8_t *buf, unsigned int c);
+int unicode_from_utf8(const uint8_t *p, int max_len, const uint8_t **pp);
+
+static inline BOOL is_surrogate(uint32_t c)
+{
+    return (c >> 11) == (0xD800 >> 11); // 0xD800-0xDFFF
+}
+
+static inline BOOL is_hi_surrogate(uint32_t c)
+{
+    return (c >> 10) == (0xD800 >> 10); // 0xD800-0xDBFF
+}
+
+static inline BOOL is_lo_surrogate(uint32_t c)
+{
+    return (c >> 10) == (0xDC00 >> 10); // 0xDC00-0xDFFF
+}
+
+static inline uint32_t get_hi_surrogate(uint32_t c)
+{
+    return (c >> 10) - (0x10000 >> 10) + 0xD800;
+}
+
+static inline uint32_t get_lo_surrogate(uint32_t c)
+{
+    return (c & 0x3FF) | 0xDC00;
+}
+
+static inline uint32_t from_surrogate(uint32_t hi, uint32_t lo)
+{
+    return 0x10000 + 0x400 * (hi - 0xD800) + (lo - 0xDC00);
+}
+
+static inline int from_hex(int c)
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    else if (c >= 'A' && c <= 'F')
+        return c - 'A' + 10;
+    else if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+    else
+        return -1;
+}
+
+void rqsort(void *base, size_t nmemb, size_t size,
+            int (*cmp)(const void *, const void *, void *),
+            void *arg);
+
+#endif  /* CUTILS_H */
diff --git a/src/shared/quickjs/libbf.c b/src/shared/quickjs/libbf.c
new file mode 100644
index 000000000..56b2be861
--- /dev/null
+++ b/src/shared/quickjs/libbf.c
@@ -0,0 +1,8475 @@
+/*
+ * Tiny arbitrary precision floating point library
+ *
+ * Copyright (c) 2017-2021 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <math.h>
+#include <string.h>
+#include <assert.h>
+
+#ifdef __AVX2__
+#include <immintrin.h>
+#endif
+
+#include "cutils.h"
+#include "libbf.h"
+
+/* enable it to check the multiplication result */
+//#define USE_MUL_CHECK
+/* enable it to use FFT/NTT multiplication */
+#define USE_FFT_MUL
+/* enable decimal floating point support */
+#define USE_BF_DEC
+
+//#define inline __attribute__((always_inline))
+
+#ifdef __AVX2__
+#define FFT_MUL_THRESHOLD 100 /* in limbs of the smallest factor */
+#else
+#define FFT_MUL_THRESHOLD 100 /* in limbs of the smallest factor */
+#endif
+
+/* XXX: adjust */
+#define DIVNORM_LARGE_THRESHOLD 50
+#define UDIV1NORM_THRESHOLD 3
+
+#if LIMB_BITS == 64
+#define FMT_LIMB1 "%" PRIx64
+#define FMT_LIMB "%016" PRIx64
+#define PRId_LIMB PRId64
+#define PRIu_LIMB PRIu64
+
+#else
+
+#define FMT_LIMB1 "%x"
+#define FMT_LIMB "%08x"
+#define PRId_LIMB "d"
+#define PRIu_LIMB "u"
+
+#endif
+
+typedef intptr_t mp_size_t;
+
+typedef int bf_op2_func_t(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                          bf_flags_t flags);
+
+#ifdef USE_FFT_MUL
+
+#define FFT_MUL_R_OVERLAP_A (1 << 0)
+#define FFT_MUL_R_OVERLAP_B (1 << 1)
+#define FFT_MUL_R_NORESIZE  (1 << 2)
+
+static no_inline int fft_mul(bf_context_t *s,
+                             bf_t *res, limb_t *a_tab, limb_t a_len,
+                             limb_t *b_tab, limb_t b_len, int mul_flags);
+static void fft_clear_cache(bf_context_t *s);
+#endif
+#ifdef USE_BF_DEC
+static limb_t get_digit(const limb_t *tab, limb_t len, slimb_t pos);
+#endif
+
+
+/* could leading zeros */
+static inline int clz(limb_t a)
+{
+    if (a == 0) {
+        return LIMB_BITS;
+    } else {
+#if LIMB_BITS == 64
+        return clz64(a);
+#else
+        return clz32(a);
+#endif
+    }
+}
+
+static inline int ctz(limb_t a)
+{
+    if (a == 0) {
+        return LIMB_BITS;
+    } else {
+#if LIMB_BITS == 64
+        return ctz64(a);
+#else
+        return ctz32(a);
+#endif
+    }
+}
+
+static inline int ceil_log2(limb_t a)
+{
+    if (a <= 1)
+        return 0;
+    else
+        return LIMB_BITS - clz(a - 1);
+}
+
+/* b must be >= 1 */
+static inline slimb_t ceil_div(slimb_t a, slimb_t b)
+{
+    if (a >= 0)
+        return (a + b - 1) / b;
+    else
+        return a / b;
+}
+
+#ifdef USE_BF_DEC
+/* b must be >= 1 */
+static inline slimb_t floor_div(slimb_t a, slimb_t b)
+{
+    if (a >= 0) {
+        return a / b;
+    } else {
+        return (a - b + 1) / b;
+    }
+}
+#endif
+
+/* return r = a modulo b (0 <= r <= b - 1. b must be >= 1 */
+static inline limb_t smod(slimb_t a, slimb_t b)
+{
+    a = a % (slimb_t)b;
+    if (a < 0)
+        a += b;
+    return a;
+}
+
+/* signed addition with saturation */
+static inline slimb_t sat_add(slimb_t a, slimb_t b)
+{
+    slimb_t r;
+    r = a + b;
+    /* overflow ? */
+    if (((a ^ r) & (b ^ r)) < 0)
+        r = (a >> (LIMB_BITS - 1)) ^ (((limb_t)1 << (LIMB_BITS - 1)) - 1);
+    return r;
+}
+
+static inline __maybe_unused limb_t shrd(limb_t low, limb_t high, long shift)
+{
+    if (shift != 0)
+        low = (low >> shift) | (high << (LIMB_BITS - shift));
+    return low;
+}
+
+static inline __maybe_unused limb_t shld(limb_t a1, limb_t a0, long shift)
+{
+    if (shift != 0)
+        return (a1 << shift) | (a0 >> (LIMB_BITS - shift));
+    else
+        return a1;
+}
+
+#define malloc(s) malloc_is_forbidden(s)
+#define free(p) free_is_forbidden(p)
+#define realloc(p, s) realloc_is_forbidden(p, s)
+
+void bf_context_init(bf_context_t *s, bf_realloc_func_t *realloc_func,
+                     void *realloc_opaque)
+{
+    memset(s, 0, sizeof(*s));
+    s->realloc_func = realloc_func;
+    s->realloc_opaque = realloc_opaque;
+}
+
+void bf_context_end(bf_context_t *s)
+{
+    bf_clear_cache(s);
+}
+
+void bf_init(bf_context_t *s, bf_t *r)
+{
+    r->ctx = s;
+    r->sign = 0;
+    r->expn = BF_EXP_ZERO;
+    r->len = 0;
+    r->tab = NULL;
+}
+
+/* return 0 if OK, -1 if alloc error */
+int bf_resize(bf_t *r, limb_t len)
+{
+    limb_t *tab;
+
+    if (len != r->len) {
+        tab = bf_realloc(r->ctx, r->tab, len * sizeof(limb_t));
+        if (!tab && len != 0)
+            return -1;
+        r->tab = tab;
+        r->len = len;
+    }
+    return 0;
+}
+
+/* return 0 or BF_ST_MEM_ERROR */
+int bf_set_ui(bf_t *r, uint64_t a)
+{
+    r->sign = 0;
+    if (a == 0) {
+        r->expn = BF_EXP_ZERO;
+        bf_resize(r, 0); /* cannot fail */
+    }
+#if LIMB_BITS == 32
+    else if (a <= 0xffffffff)
+#else
+    else
+#endif
+    {
+        int shift;
+        if (bf_resize(r, 1))
+            goto fail;
+        shift = clz(a);
+        r->tab[0] = a << shift;
+        r->expn = LIMB_BITS - shift;
+    }
+#if LIMB_BITS == 32
+    else {
+        uint32_t a1, a0;
+        int shift;
+        if (bf_resize(r, 2))
+            goto fail;
+        a0 = a;
+        a1 = a >> 32;
+        shift = clz(a1);
+        r->tab[0] = a0 << shift;
+        r->tab[1] = shld(a1, a0, shift);
+        r->expn = 2 * LIMB_BITS - shift;
+    }
+#endif
+    return 0;
+ fail:
+    bf_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+/* return 0 or BF_ST_MEM_ERROR */
+int bf_set_si(bf_t *r, int64_t a)
+{
+    int ret;
+
+    if (a < 0) {
+        ret = bf_set_ui(r, -a);
+        r->sign = 1;
+    } else {
+        ret = bf_set_ui(r, a);
+    }
+    return ret;
+}
+
+void bf_set_nan(bf_t *r)
+{
+    bf_resize(r, 0); /* cannot fail */
+    r->expn = BF_EXP_NAN;
+    r->sign = 0;
+}
+
+void bf_set_zero(bf_t *r, int is_neg)
+{
+    bf_resize(r, 0); /* cannot fail */
+    r->expn = BF_EXP_ZERO;
+    r->sign = is_neg;
+}
+
+void bf_set_inf(bf_t *r, int is_neg)
+{
+    bf_resize(r, 0); /* cannot fail */
+    r->expn = BF_EXP_INF;
+    r->sign = is_neg;
+}
+
+/* return 0 or BF_ST_MEM_ERROR */
+int bf_set(bf_t *r, const bf_t *a)
+{
+    if (r == a)
+        return 0;
+    if (bf_resize(r, a->len)) {
+        bf_set_nan(r);
+        return BF_ST_MEM_ERROR;
+    }
+    r->sign = a->sign;
+    r->expn = a->expn;
+    memcpy_no_ub(r->tab, a->tab, a->len * sizeof(limb_t));
+    return 0;
+}
+
+/* equivalent to bf_set(r, a); bf_delete(a) */
+void bf_move(bf_t *r, bf_t *a)
+{
+    bf_context_t *s = r->ctx;
+    if (r == a)
+        return;
+    bf_free(s, r->tab);
+    *r = *a;
+}
+
+static limb_t get_limbz(const bf_t *a, limb_t idx)
+{
+    if (idx >= a->len)
+        return 0;
+    else
+        return a->tab[idx];
+}
+
+/* get LIMB_BITS at bit position 'pos' in tab */
+static inline limb_t get_bits(const limb_t *tab, limb_t len, slimb_t pos)
+{
+    limb_t i, a0, a1;
+    int p;
+
+    i = pos >> LIMB_LOG2_BITS;
+    p = pos & (LIMB_BITS - 1);
+    if (i < len)
+        a0 = tab[i];
+    else
+        a0 = 0;
+    if (p == 0) {
+        return a0;
+    } else {
+        i++;
+        if (i < len)
+            a1 = tab[i];
+        else
+            a1 = 0;
+        return (a0 >> p) | (a1 << (LIMB_BITS - p));
+    }
+}
+
+static inline limb_t get_bit(const limb_t *tab, limb_t len, slimb_t pos)
+{
+    slimb_t i;
+    i = pos >> LIMB_LOG2_BITS;
+    if (i < 0 || i >= len)
+        return 0;
+    return (tab[i] >> (pos & (LIMB_BITS - 1))) & 1;
+}
+
+static inline limb_t limb_mask(int start, int last)
+{
+    limb_t v;
+    int n;
+    n = last - start + 1;
+    if (n == LIMB_BITS)
+        v = -1;
+    else
+        v = (((limb_t)1 << n) - 1) << start;
+    return v;
+}
+
+static limb_t mp_scan_nz(const limb_t *tab, mp_size_t n)
+{
+    mp_size_t i;
+    for(i = 0; i < n; i++) {
+        if (tab[i] != 0)
+            return 1;
+    }
+    return 0;
+}
+
+/* return != 0 if one bit between 0 and bit_pos inclusive is not zero. */
+static inline limb_t scan_bit_nz(const bf_t *r, slimb_t bit_pos)
+{
+    slimb_t pos;
+    limb_t v;
+
+    pos = bit_pos >> LIMB_LOG2_BITS;
+    if (pos < 0)
+        return 0;
+    v = r->tab[pos] & limb_mask(0, bit_pos & (LIMB_BITS - 1));
+    if (v != 0)
+        return 1;
+    pos--;
+    while (pos >= 0) {
+        if (r->tab[pos] != 0)
+            return 1;
+        pos--;
+    }
+    return 0;
+}
+
+/* return the addend for rounding. Note that prec can be <= 0 (for
+   BF_FLAG_RADPNT_PREC) */
+static int bf_get_rnd_add(int *pret, const bf_t *r, limb_t l,
+                          slimb_t prec, int rnd_mode)
+{
+    int add_one, inexact;
+    limb_t bit1, bit0;
+
+    if (rnd_mode == BF_RNDF) {
+        bit0 = 1; /* faithful rounding does not honor the INEXACT flag */
+    } else {
+        /* starting limb for bit 'prec + 1' */
+        bit0 = scan_bit_nz(r, l * LIMB_BITS - 1 - bf_max(0, prec + 1));
+    }
+
+    /* get the bit at 'prec' */
+    bit1 = get_bit(r->tab, l, l * LIMB_BITS - 1 - prec);
+    inexact = (bit1 | bit0) != 0;
+
+    add_one = 0;
+    switch(rnd_mode) {
+    case BF_RNDZ:
+        break;
+    case BF_RNDN:
+        if (bit1) {
+            if (bit0) {
+                add_one = 1;
+            } else {
+                /* round to even */
+                add_one =
+                    get_bit(r->tab, l, l * LIMB_BITS - 1 - (prec - 1));
+            }
+        }
+        break;
+    case BF_RNDD:
+    case BF_RNDU:
+        if (r->sign == (rnd_mode == BF_RNDD))
+            add_one = inexact;
+        break;
+    case BF_RNDA:
+        add_one = inexact;
+        break;
+    case BF_RNDNA:
+    case BF_RNDF:
+        add_one = bit1;
+        break;
+    default:
+        abort();
+    }
+
+    if (inexact)
+        *pret |= BF_ST_INEXACT;
+    return add_one;
+}
+
+static int bf_set_overflow(bf_t *r, int sign, limb_t prec, bf_flags_t flags)
+{
+    slimb_t i, l, e_max;
+    int rnd_mode;
+
+    rnd_mode = flags & BF_RND_MASK;
+    if (prec == BF_PREC_INF ||
+        rnd_mode == BF_RNDN ||
+        rnd_mode == BF_RNDNA ||
+        rnd_mode == BF_RNDA ||
+        (rnd_mode == BF_RNDD && sign == 1) ||
+        (rnd_mode == BF_RNDU && sign == 0)) {
+        bf_set_inf(r, sign);
+    } else {
+        /* set to maximum finite number */
+        l = (prec + LIMB_BITS - 1) / LIMB_BITS;
+        if (bf_resize(r, l)) {
+            bf_set_nan(r);
+            return BF_ST_MEM_ERROR;
+        }
+        r->tab[0] = limb_mask((-prec) & (LIMB_BITS - 1),
+                              LIMB_BITS - 1);
+        for(i = 1; i < l; i++)
+            r->tab[i] = (limb_t)-1;
+        e_max = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
+        r->expn = e_max;
+        r->sign = sign;
+    }
+    return BF_ST_OVERFLOW | BF_ST_INEXACT;
+}
+
+/* round to prec1 bits assuming 'r' is non zero and finite. 'r' is
+   assumed to have length 'l' (1 <= l <= r->len). Note: 'prec1' can be
+   infinite (BF_PREC_INF). 'ret' is 0 or BF_ST_INEXACT if the result
+   is known to be inexact. Can fail with BF_ST_MEM_ERROR in case of
+   overflow not returning infinity. */
+static int __bf_round(bf_t *r, limb_t prec1, bf_flags_t flags, limb_t l,
+                      int ret)
+{
+    limb_t v, a;
+    int shift, add_one, rnd_mode;
+    slimb_t i, bit_pos, pos, e_min, e_max, e_range, prec;
+
+    /* e_min and e_max are computed to match the IEEE 754 conventions */
+    e_range = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
+    e_min = -e_range + 3;
+    e_max = e_range;
+
+    if (flags & BF_FLAG_RADPNT_PREC) {
+        /* 'prec' is the precision after the radix point */
+        if (prec1 != BF_PREC_INF)
+            prec = r->expn + prec1;
+        else
+            prec = prec1;
+    } else if (unlikely(r->expn < e_min) && (flags & BF_FLAG_SUBNORMAL)) {
+        /* restrict the precision in case of potentially subnormal
+           result */
+        assert(prec1 != BF_PREC_INF);
+        prec = prec1 - (e_min - r->expn);
+    } else {
+        prec = prec1;
+    }
+
+    /* round to prec bits */
+    rnd_mode = flags & BF_RND_MASK;
+    add_one = bf_get_rnd_add(&ret, r, l, prec, rnd_mode);
+
+    if (prec <= 0) {
+        if (add_one) {
+            bf_resize(r, 1); /* cannot fail */
+            r->tab[0] = (limb_t)1 << (LIMB_BITS - 1);
+            r->expn += 1 - prec;
+            ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
+            return ret;
+        } else {
+            goto underflow;
+        }
+    } else if (add_one) {
+        limb_t carry;
+
+        /* add one starting at digit 'prec - 1' */
+        bit_pos = l * LIMB_BITS - 1 - (prec - 1);
+        pos = bit_pos >> LIMB_LOG2_BITS;
+        carry = (limb_t)1 << (bit_pos & (LIMB_BITS - 1));
+
+        for(i = pos; i < l; i++) {
+            v = r->tab[i] + carry;
+            carry = (v < carry);
+            r->tab[i] = v;
+            if (carry == 0)
+                break;
+        }
+        if (carry) {
+            /* shift right by one digit */
+            v = 1;
+            for(i = l - 1; i >= pos; i--) {
+                a = r->tab[i];
+                r->tab[i] = (a >> 1) | (v << (LIMB_BITS - 1));
+                v = a;
+            }
+            r->expn++;
+        }
+    }
+
+    /* check underflow */
+    if (unlikely(r->expn < e_min)) {
+        if (flags & BF_FLAG_SUBNORMAL) {
+            /* if inexact, also set the underflow flag */
+            if (ret & BF_ST_INEXACT)
+                ret |= BF_ST_UNDERFLOW;
+        } else {
+        underflow:
+            ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
+            bf_set_zero(r, r->sign);
+            return ret;
+        }
+    }
+
+    /* check overflow */
+    if (unlikely(r->expn > e_max))
+        return bf_set_overflow(r, r->sign, prec1, flags);
+
+    /* keep the bits starting at 'prec - 1' */
+    bit_pos = l * LIMB_BITS - 1 - (prec - 1);
+    i = bit_pos >> LIMB_LOG2_BITS;
+    if (i >= 0) {
+        shift = bit_pos & (LIMB_BITS - 1);
+        if (shift != 0)
+            r->tab[i] &= limb_mask(shift, LIMB_BITS - 1);
+    } else {
+        i = 0;
+    }
+    /* remove trailing zeros */
+    while (r->tab[i] == 0)
+        i++;
+    if (i > 0) {
+        l -= i;
+        memmove(r->tab, r->tab + i, l * sizeof(limb_t));
+    }
+    bf_resize(r, l); /* cannot fail */
+    return ret;
+}
+
+/* 'r' must be a finite number. */
+int bf_normalize_and_round(bf_t *r, limb_t prec1, bf_flags_t flags)
+{
+    limb_t l, v, a;
+    int shift, ret;
+    slimb_t i;
+
+    //    bf_print_str("bf_renorm", r);
+    l = r->len;
+    while (l > 0 && r->tab[l - 1] == 0)
+        l--;
+    if (l == 0) {
+        /* zero */
+        r->expn = BF_EXP_ZERO;
+        bf_resize(r, 0); /* cannot fail */
+        ret = 0;
+    } else {
+        r->expn -= (r->len - l) * LIMB_BITS;
+        /* shift to have the MSB set to '1' */
+        v = r->tab[l - 1];
+        shift = clz(v);
+        if (shift != 0) {
+            v = 0;
+            for(i = 0; i < l; i++) {
+                a = r->tab[i];
+                r->tab[i] = (a << shift) | (v >> (LIMB_BITS - shift));
+                v = a;
+            }
+            r->expn -= shift;
+        }
+        ret = __bf_round(r, prec1, flags, l, 0);
+    }
+    //    bf_print_str("r_final", r);
+    return ret;
+}
+
+/* return true if rounding can be done at precision 'prec' assuming
+   the exact result r is such that |r-a| <= 2^(EXP(a)-k). */
+/* XXX: check the case where the exponent would be incremented by the
+   rounding */
+int bf_can_round(const bf_t *a, slimb_t prec, bf_rnd_t rnd_mode, slimb_t k)
+{
+    BOOL is_rndn;
+    slimb_t bit_pos, n;
+    limb_t bit;
+
+    if (a->expn == BF_EXP_INF || a->expn == BF_EXP_NAN)
+        return FALSE;
+    if (rnd_mode == BF_RNDF) {
+        return (k >= (prec + 1));
+    }
+    if (a->expn == BF_EXP_ZERO)
+        return FALSE;
+    is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA);
+    if (k < (prec + 2))
+        return FALSE;
+    bit_pos = a->len * LIMB_BITS - 1 - prec;
+    n = k - prec;
+    /* bit pattern for RNDN or RNDNA: 0111.. or 1000...
+       for other rounding modes: 000... or 111...
+    */
+    bit = get_bit(a->tab, a->len, bit_pos);
+    bit_pos--;
+    n--;
+    bit ^= is_rndn;
+    /* XXX: slow, but a few iterations on average */
+    while (n != 0) {
+        if (get_bit(a->tab, a->len, bit_pos) != bit)
+            return TRUE;
+        bit_pos--;
+        n--;
+    }
+    return FALSE;
+}
+
+/* Cannot fail with BF_ST_MEM_ERROR. */
+int bf_round(bf_t *r, limb_t prec, bf_flags_t flags)
+{
+    if (r->len == 0)
+        return 0;
+    return __bf_round(r, prec, flags, r->len, 0);
+}
+
+/* for debugging */
+static __maybe_unused void dump_limbs(const char *str, const limb_t *tab, limb_t n)
+{
+    limb_t i;
+    printf("%s: len=%" PRId_LIMB "\n", str, n);
+    for(i = 0; i < n; i++) {
+        printf("%" PRId_LIMB ": " FMT_LIMB "\n",
+               i, tab[i]);
+    }
+}
+
+void mp_print_str(const char *str, const limb_t *tab, limb_t n)
+{
+    slimb_t i;
+    printf("%s= 0x", str);
+    for(i = n - 1; i >= 0; i--) {
+        if (i != (n - 1))
+            printf("_");
+        printf(FMT_LIMB, tab[i]);
+    }
+    printf("\n");
+}
+
+static __maybe_unused void mp_print_str_h(const char *str,
+                                          const limb_t *tab, limb_t n,
+                                          limb_t high)
+{
+    slimb_t i;
+    printf("%s= 0x", str);
+    printf(FMT_LIMB, high);
+    for(i = n - 1; i >= 0; i--) {
+        printf("_");
+        printf(FMT_LIMB, tab[i]);
+    }
+    printf("\n");
+}
+
+/* for debugging */
+void bf_print_str(const char *str, const bf_t *a)
+{
+    slimb_t i;
+    printf("%s=", str);
+
+    if (a->expn == BF_EXP_NAN) {
+        printf("NaN");
+    } else {
+        if (a->sign)
+            putchar('-');
+        if (a->expn == BF_EXP_ZERO) {
+            putchar('0');
+        } else if (a->expn == BF_EXP_INF) {
+            printf("Inf");
+        } else {
+            printf("0x0.");
+            for(i = a->len - 1; i >= 0; i--)
+                printf(FMT_LIMB, a->tab[i]);
+            printf("p%" PRId_LIMB, a->expn);
+        }
+    }
+    printf("\n");
+}
+
+/* compare the absolute value of 'a' and 'b'. Return < 0 if a < b, 0
+   if a = b and > 0 otherwise. */
+int bf_cmpu(const bf_t *a, const bf_t *b)
+{
+    slimb_t i;
+    limb_t len, v1, v2;
+
+    if (a->expn != b->expn) {
+        if (a->expn < b->expn)
+            return -1;
+        else
+            return 1;
+    }
+    len = bf_max(a->len, b->len);
+    for(i = len - 1; i >= 0; i--) {
+        v1 = get_limbz(a, a->len - len + i);
+        v2 = get_limbz(b, b->len - len + i);
+        if (v1 != v2) {
+            if (v1 < v2)
+                return -1;
+            else
+                return 1;
+        }
+    }
+    return 0;
+}
+
+/* Full order: -0 < 0, NaN == NaN and NaN is larger than all other numbers */
+int bf_cmp_full(const bf_t *a, const bf_t *b)
+{
+    int res;
+
+    if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+        if (a->expn == b->expn)
+            res = 0;
+        else if (a->expn == BF_EXP_NAN)
+            res = 1;
+        else
+            res = -1;
+    } else if (a->sign != b->sign) {
+        res = 1 - 2 * a->sign;
+    } else {
+        res = bf_cmpu(a, b);
+        if (a->sign)
+            res = -res;
+    }
+    return res;
+}
+
+/* Standard floating point comparison: return 2 if one of the operands
+   is NaN (unordered) or -1, 0, 1 depending on the ordering assuming
+   -0 == +0 */
+int bf_cmp(const bf_t *a, const bf_t *b)
+{
+    int res;
+
+    if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+        res = 2;
+    } else if (a->sign != b->sign) {
+        if (a->expn == BF_EXP_ZERO && b->expn == BF_EXP_ZERO)
+            res = 0;
+        else
+            res = 1 - 2 * a->sign;
+    } else {
+        res = bf_cmpu(a, b);
+        if (a->sign)
+            res = -res;
+    }
+    return res;
+}
+
+/* Compute the number of bits 'n' matching the pattern:
+   a= X1000..0
+   b= X0111..1
+
+   When computing a-b, the result will have at least n leading zero
+   bits.
+
+   Precondition: a > b and a.expn - b.expn = 0 or 1
+*/
+static limb_t count_cancelled_bits(const bf_t *a, const bf_t *b)
+{
+    slimb_t bit_offset, b_offset, n;
+    int p, p1;
+    limb_t v1, v2, mask;
+
+    bit_offset = a->len * LIMB_BITS - 1;
+    b_offset = (b->len - a->len) * LIMB_BITS - (LIMB_BITS - 1) +
+        a->expn - b->expn;
+    n = 0;
+
+    /* first search the equals bits */
+    for(;;) {
+        v1 = get_limbz(a, bit_offset >> LIMB_LOG2_BITS);
+        v2 = get_bits(b->tab, b->len, bit_offset + b_offset);
+        //        printf("v1=" FMT_LIMB " v2=" FMT_LIMB "\n", v1, v2);
+        if (v1 != v2)
+            break;
+        n += LIMB_BITS;
+        bit_offset -= LIMB_BITS;
+    }
+    /* find the position of the first different bit */
+    p = clz(v1 ^ v2) + 1;
+    n += p;
+    /* then search for '0' in a and '1' in b */
+    p = LIMB_BITS - p;
+    if (p > 0) {
+        /* search in the trailing p bits of v1 and v2 */
+        mask = limb_mask(0, p - 1);
+        p1 = bf_min(clz(v1 & mask), clz((~v2) & mask)) - (LIMB_BITS - p);
+        n += p1;
+        if (p1 != p)
+            goto done;
+    }
+    bit_offset -= LIMB_BITS;
+    for(;;) {
+        v1 = get_limbz(a, bit_offset >> LIMB_LOG2_BITS);
+        v2 = get_bits(b->tab, b->len, bit_offset + b_offset);
+        //        printf("v1=" FMT_LIMB " v2=" FMT_LIMB "\n", v1, v2);
+        if (v1 != 0 || v2 != -1) {
+            /* different: count the matching bits */
+            p1 = bf_min(clz(v1), clz(~v2));
+            n += p1;
+            break;
+        }
+        n += LIMB_BITS;
+        bit_offset -= LIMB_BITS;
+    }
+ done:
+    return n;
+}
+
+static int bf_add_internal(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                           bf_flags_t flags, int b_neg)
+{
+    const bf_t *tmp;
+    int is_sub, ret, cmp_res, a_sign, b_sign;
+
+    a_sign = a->sign;
+    b_sign = b->sign ^ b_neg;
+    is_sub = a_sign ^ b_sign;
+    cmp_res = bf_cmpu(a, b);
+    if (cmp_res < 0) {
+        tmp = a;
+        a = b;
+        b = tmp;
+        a_sign = b_sign; /* b_sign is never used later */
+    }
+    /* abs(a) >= abs(b) */
+    if (cmp_res == 0 && is_sub && a->expn < BF_EXP_INF) {
+        /* zero result */
+        bf_set_zero(r, (flags & BF_RND_MASK) == BF_RNDD);
+        ret = 0;
+    } else if (a->len == 0 || b->len == 0) {
+        ret = 0;
+        if (a->expn >= BF_EXP_INF) {
+            if (a->expn == BF_EXP_NAN) {
+                /* at least one operand is NaN */
+                bf_set_nan(r);
+            } else if (b->expn == BF_EXP_INF && is_sub) {
+                /* infinities with different signs */
+                bf_set_nan(r);
+                ret = BF_ST_INVALID_OP;
+            } else {
+                bf_set_inf(r, a_sign);
+            }
+        } else {
+            /* at least one zero and not subtract */
+            bf_set(r, a);
+            r->sign = a_sign;
+            goto renorm;
+        }
+    } else {
+        slimb_t d, a_offset, b_bit_offset, i, cancelled_bits;
+        limb_t carry, v1, v2, u, r_len, carry1, precl, tot_len, z, sub_mask;
+
+        r->sign = a_sign;
+        r->expn = a->expn;
+        d = a->expn - b->expn;
+        /* must add more precision for the leading cancelled bits in
+           subtraction */
+        if (is_sub) {
+            if (d <= 1)
+                cancelled_bits = count_cancelled_bits(a, b);
+            else
+                cancelled_bits = 1;
+        } else {
+            cancelled_bits = 0;
+        }
+
+        /* add two extra bits for rounding */
+        precl = (cancelled_bits + prec + 2 + LIMB_BITS - 1) / LIMB_BITS;
+        tot_len = bf_max(a->len, b->len + (d + LIMB_BITS - 1) / LIMB_BITS);
+        r_len = bf_min(precl, tot_len);
+        if (bf_resize(r, r_len))
+            goto fail;
+        a_offset = a->len - r_len;
+        b_bit_offset = (b->len - r_len) * LIMB_BITS + d;
+
+        /* compute the bits before for the rounding */
+        carry = is_sub;
+        z = 0;
+        sub_mask = -is_sub;
+        i = r_len - tot_len;
+        while (i < 0) {
+            slimb_t ap, bp;
+            BOOL inflag;
+
+            ap = a_offset + i;
+            bp = b_bit_offset + i * LIMB_BITS;
+            inflag = FALSE;
+            if (ap >= 0 && ap < a->len) {
+                v1 = a->tab[ap];
+                inflag = TRUE;
+            } else {
+                v1 = 0;
+            }
+            if (bp + LIMB_BITS > 0 && bp < (slimb_t)(b->len * LIMB_BITS)) {
+                v2 = get_bits(b->tab, b->len, bp);
+                inflag = TRUE;
+            } else {
+                v2 = 0;
+            }
+            if (!inflag) {
+                /* outside 'a' and 'b': go directly to the next value
+                   inside a or b so that the running time does not
+                   depend on the exponent difference */
+                i = 0;
+                if (ap < 0)
+                    i = bf_min(i, -a_offset);
+                /* b_bit_offset + i * LIMB_BITS + LIMB_BITS >= 1
+                   equivalent to
+                   i >= ceil(-b_bit_offset + 1 - LIMB_BITS) / LIMB_BITS)
+                */
+                if (bp + LIMB_BITS <= 0)
+                    i = bf_min(i, (-b_bit_offset) >> LIMB_LOG2_BITS);
+            } else {
+                i++;
+            }
+            v2 ^= sub_mask;
+            u = v1 + v2;
+            carry1 = u < v1;
+            u += carry;
+            carry = (u < carry) | carry1;
+            z |= u;
+        }
+        /* and the result */
+        for(i = 0; i < r_len; i++) {
+            v1 = get_limbz(a, a_offset + i);
+            v2 = get_bits(b->tab, b->len, b_bit_offset + i * LIMB_BITS);
+            v2 ^= sub_mask;
+            u = v1 + v2;
+            carry1 = u < v1;
+            u += carry;
+            carry = (u < carry) | carry1;
+            r->tab[i] = u;
+        }
+        /* set the extra bits for the rounding */
+        r->tab[0] |= (z != 0);
+
+        /* carry is only possible in add case */
+        if (!is_sub && carry) {
+            if (bf_resize(r, r_len + 1))
+                goto fail;
+            r->tab[r_len] = 1;
+            r->expn += LIMB_BITS;
+        }
+    renorm:
+        ret = bf_normalize_and_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bf_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+static int __bf_add(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                     bf_flags_t flags)
+{
+    return bf_add_internal(r, a, b, prec, flags, 0);
+}
+
+static int __bf_sub(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                     bf_flags_t flags)
+{
+    return bf_add_internal(r, a, b, prec, flags, 1);
+}
+
+limb_t mp_add(limb_t *res, const limb_t *op1, const limb_t *op2,
+              limb_t n, limb_t carry)
+{
+    slimb_t i;
+    limb_t k, a, v, k1;
+
+    k = carry;
+    for(i=0;i<n;i++) {
+        v = op1[i];
+        a = v + op2[i];
+        k1 = a < v;
+        a = a + k;
+        k = (a < k) | k1;
+        res[i] = a;
+    }
+    return k;
+}
+
+limb_t mp_add_ui(limb_t *tab, limb_t b, size_t n)
+{
+    size_t i;
+    limb_t k, a;
+
+    k=b;
+    for(i=0;i<n;i++) {
+        if (k == 0)
+            break;
+        a = tab[i] + k;
+        k = (a < k);
+        tab[i] = a;
+    }
+    return k;
+}
+
+limb_t mp_sub(limb_t *res, const limb_t *op1, const limb_t *op2,
+              mp_size_t n, limb_t carry)
+{
+    int i;
+    limb_t k, a, v, k1;
+
+    k = carry;
+    for(i=0;i<n;i++) {
+        v = op1[i];
+        a = v - op2[i];
+        k1 = a > v;
+        v = a - k;
+        k = (v > a) | k1;
+        res[i] = v;
+    }
+    return k;
+}
+
+/* compute 0 - op2 */
+static limb_t mp_neg(limb_t *res, const limb_t *op2, mp_size_t n, limb_t carry)
+{
+    int i;
+    limb_t k, a, v, k1;
+
+    k = carry;
+    for(i=0;i<n;i++) {
+        v = 0;
+        a = v - op2[i];
+        k1 = a > v;
+        v = a - k;
+        k = (v > a) | k1;
+        res[i] = v;
+    }
+    return k;
+}
+
+limb_t mp_sub_ui(limb_t *tab, limb_t b, mp_size_t n)
+{
+    mp_size_t i;
+    limb_t k, a, v;
+
+    k=b;
+    for(i=0;i<n;i++) {
+        v = tab[i];
+        a = v - k;
+        k = a > v;
+        tab[i] = a;
+        if (k == 0)
+            break;
+    }
+    return k;
+}
+
+/* r = (a + high*B^n) >> shift. Return the remainder r (0 <= r < 2^shift).
+   1 <= shift <= LIMB_BITS - 1 */
+static limb_t mp_shr(limb_t *tab_r, const limb_t *tab, mp_size_t n,
+                     int shift, limb_t high)
+{
+    mp_size_t i;
+    limb_t l, a;
+
+    assert(shift >= 1 && shift < LIMB_BITS);
+    l = high;
+    for(i = n - 1; i >= 0; i--) {
+        a = tab[i];
+        tab_r[i] = (a >> shift) | (l << (LIMB_BITS - shift));
+        l = a;
+    }
+    return l & (((limb_t)1 << shift) - 1);
+}
+
+/* tabr[] = taba[] * b + l. Return the high carry */
+static limb_t mp_mul1(limb_t *tabr, const limb_t *taba, limb_t n,
+                      limb_t b, limb_t l)
+{
+    limb_t i;
+    dlimb_t t;
+
+    for(i = 0; i < n; i++) {
+        t = (dlimb_t)taba[i] * (dlimb_t)b + l;
+        tabr[i] = t;
+        l = t >> LIMB_BITS;
+    }
+    return l;
+}
+
+/* tabr[] += taba[] * b, return the high word. */
+static limb_t mp_add_mul1(limb_t *tabr, const limb_t *taba, limb_t n,
+                          limb_t b)
+{
+    limb_t i, l;
+    dlimb_t t;
+
+    l = 0;
+    for(i = 0; i < n; i++) {
+        t = (dlimb_t)taba[i] * (dlimb_t)b + l + tabr[i];
+        tabr[i] = t;
+        l = t >> LIMB_BITS;
+    }
+    return l;
+}
+
+/* size of the result : op1_size + op2_size. */
+static void mp_mul_basecase(limb_t *result,
+                            const limb_t *op1, limb_t op1_size,
+                            const limb_t *op2, limb_t op2_size)
+{
+    limb_t i, r;
+
+    result[op1_size] = mp_mul1(result, op1, op1_size, op2[0], 0);
+    for(i=1;i<op2_size;i++) {
+        r = mp_add_mul1(result + i, op1, op1_size, op2[i]);
+        result[i + op1_size] = r;
+    }
+}
+
+/* return 0 if OK, -1 if memory error */
+/* XXX: change API so that result can be allocated */
+int mp_mul(bf_context_t *s, limb_t *result,
+           const limb_t *op1, limb_t op1_size,
+           const limb_t *op2, limb_t op2_size)
+{
+#ifdef USE_FFT_MUL
+    if (unlikely(bf_min(op1_size, op2_size) >= FFT_MUL_THRESHOLD)) {
+        bf_t r_s, *r = &r_s;
+        r->tab = result;
+        /* XXX: optimize memory usage in API */
+        if (fft_mul(s, r, (limb_t *)op1, op1_size,
+                    (limb_t *)op2, op2_size, FFT_MUL_R_NORESIZE))
+            return -1;
+    } else
+#endif
+    {
+        mp_mul_basecase(result, op1, op1_size, op2, op2_size);
+    }
+    return 0;
+}
+
+/* tabr[] -= taba[] * b. Return the value to substract to the high
+   word. */
+static limb_t mp_sub_mul1(limb_t *tabr, const limb_t *taba, limb_t n,
+                          limb_t b)
+{
+    limb_t i, l;
+    dlimb_t t;
+
+    l = 0;
+    for(i = 0; i < n; i++) {
+        t = tabr[i] - (dlimb_t)taba[i] * (dlimb_t)b - l;
+        tabr[i] = t;
+        l = -(t >> LIMB_BITS);
+    }
+    return l;
+}
+
+/* WARNING: d must be >= 2^(LIMB_BITS-1) */
+static inline limb_t udiv1norm_init(limb_t d)
+{
+    limb_t a0, a1;
+    a1 = -d - 1;
+    a0 = -1;
+    return (((dlimb_t)a1 << LIMB_BITS) | a0) / d;
+}
+
+/* return the quotient and the remainder in '*pr'of 'a1*2^LIMB_BITS+a0
+   / d' with 0 <= a1 < d. */
+static inline limb_t udiv1norm(limb_t *pr, limb_t a1, limb_t a0,
+                                limb_t d, limb_t d_inv)
+{
+    limb_t n1m, n_adj, q, r, ah;
+    dlimb_t a;
+    n1m = ((slimb_t)a0 >> (LIMB_BITS - 1));
+    n_adj = a0 + (n1m & d);
+    a = (dlimb_t)d_inv * (a1 - n1m) + n_adj;
+    q = (a >> LIMB_BITS) + a1;
+    /* compute a - q * r and update q so that the remainder is\
+       between 0 and d - 1 */
+    a = ((dlimb_t)a1 << LIMB_BITS) | a0;
+    a = a - (dlimb_t)q * d - d;
+    ah = a >> LIMB_BITS;
+    q += 1 + ah;
+    r = (limb_t)a + (ah & d);
+    *pr = r;
+    return q;
+}
+
+/* b must be >= 1 << (LIMB_BITS - 1) */
+static limb_t mp_div1norm(limb_t *tabr, const limb_t *taba, limb_t n,
+                          limb_t b, limb_t r)
+{
+    slimb_t i;
+
+    if (n >= UDIV1NORM_THRESHOLD) {
+        limb_t b_inv;
+        b_inv = udiv1norm_init(b);
+        for(i = n - 1; i >= 0; i--) {
+            tabr[i] = udiv1norm(&r, r, taba[i], b, b_inv);
+        }
+    } else {
+        dlimb_t a1;
+        for(i = n - 1; i >= 0; i--) {
+            a1 = ((dlimb_t)r << LIMB_BITS) | taba[i];
+            tabr[i] = a1 / b;
+            r = a1 % b;
+        }
+    }
+    return r;
+}
+
+static int mp_divnorm_large(bf_context_t *s,
+                            limb_t *tabq, limb_t *taba, limb_t na,
+                            const limb_t *tabb, limb_t nb);
+
+/* base case division: divides taba[0..na-1] by tabb[0..nb-1]. tabb[nb
+   - 1] must be >= 1 << (LIMB_BITS - 1). na - nb must be >= 0. 'taba'
+   is modified and contains the remainder (nb limbs). tabq[0..na-nb]
+   contains the quotient with tabq[na - nb] <= 1. */
+static int mp_divnorm(bf_context_t *s, limb_t *tabq, limb_t *taba, limb_t na,
+                      const limb_t *tabb, limb_t nb)
+{
+    limb_t r, a, c, q, v, b1, b1_inv, n, dummy_r;
+    slimb_t i, j;
+
+    b1 = tabb[nb - 1];
+    if (nb == 1) {
+        taba[0] = mp_div1norm(tabq, taba, na, b1, 0);
+        return 0;
+    }
+    n = na - nb;
+    if (bf_min(n, nb) >= DIVNORM_LARGE_THRESHOLD) {
+        return mp_divnorm_large(s, tabq, taba, na, tabb, nb);
+    }
+
+    if (n >= UDIV1NORM_THRESHOLD)
+        b1_inv = udiv1norm_init(b1);
+    else
+        b1_inv = 0;
+
+    /* first iteration: the quotient is only 0 or 1 */
+    q = 1;
+    for(j = nb - 1; j >= 0; j--) {
+        if (taba[n + j] != tabb[j]) {
+            if (taba[n + j] < tabb[j])
+                q = 0;
+            break;
+        }
+    }
+    tabq[n] = q;
+    if (q) {
+        mp_sub(taba + n, taba + n, tabb, nb, 0);
+    }
+
+    for(i = n - 1; i >= 0; i--) {
+        if (unlikely(taba[i + nb] >= b1)) {
+            q = -1;
+        } else if (b1_inv) {
+            q = udiv1norm(&dummy_r, taba[i + nb], taba[i + nb - 1], b1, b1_inv);
+        } else {
+            dlimb_t al;
+            al = ((dlimb_t)taba[i + nb] << LIMB_BITS) | taba[i + nb - 1];
+            q = al / b1;
+            r = al % b1;
+        }
+        r = mp_sub_mul1(taba + i, tabb, nb, q);
+
+        v = taba[i + nb];
+        a = v - r;
+        c = (a > v);
+        taba[i + nb] = a;
+
+        if (c != 0) {
+            /* negative result */
+            for(;;) {
+                q--;
+                c = mp_add(taba + i, taba + i, tabb, nb, 0);
+                /* propagate carry and test if positive result */
+                if (c != 0) {
+                    if (++taba[i + nb] == 0) {
+                        break;
+                    }
+                }
+            }
+        }
+        tabq[i] = q;
+    }
+    return 0;
+}
+
+/* compute r=B^(2*n)/a such as a*r < B^(2*n) < a*r + 2 with n >= 1. 'a'
+   has n limbs with a[n-1] >= B/2 and 'r' has n+1 limbs with r[n] = 1.
+
+   See Modern Computer Arithmetic by Richard P. Brent and Paul
+   Zimmermann, algorithm 3.5 */
+int mp_recip(bf_context_t *s, limb_t *tabr, const limb_t *taba, limb_t n)
+{
+    mp_size_t l, h, k, i;
+    limb_t *tabxh, *tabt, c, *tabu;
+
+    if (n <= 2) {
+        /* return ceil(B^(2*n)/a) - 1 */
+        /* XXX: could avoid allocation */
+        tabu = bf_malloc(s, sizeof(limb_t) * (2 * n + 1));
+        tabt = bf_malloc(s, sizeof(limb_t) * (n + 2));
+        if (!tabt || !tabu)
+            goto fail;
+        for(i = 0; i < 2 * n; i++)
+            tabu[i] = 0;
+        tabu[2 * n] = 1;
+        if (mp_divnorm(s, tabt, tabu, 2 * n + 1, taba, n))
+            goto fail;
+        for(i = 0; i < n + 1; i++)
+            tabr[i] = tabt[i];
+        if (mp_scan_nz(tabu, n) == 0) {
+            /* only happens for a=B^n/2 */
+            mp_sub_ui(tabr, 1, n + 1);
+        }
+    } else {
+        l = (n - 1) / 2;
+        h = n - l;
+        /* n=2p  -> l=p-1, h = p + 1, k = p + 3
+           n=2p+1-> l=p,  h = p + 1; k = p + 2
+        */
+        tabt = bf_malloc(s, sizeof(limb_t) * (n + h + 1));
+        tabu = bf_malloc(s, sizeof(limb_t) * (n + 2 * h - l + 2));
+        if (!tabt || !tabu)
+            goto fail;
+        tabxh = tabr + l;
+        if (mp_recip(s, tabxh, taba + l, h))
+            goto fail;
+        if (mp_mul(s, tabt, taba, n, tabxh, h + 1)) /* n + h + 1 limbs */
+            goto fail;
+        while (tabt[n + h] != 0) {
+            mp_sub_ui(tabxh, 1, h + 1);
+            c = mp_sub(tabt, tabt, taba, n, 0);
+            mp_sub_ui(tabt + n, c, h + 1);
+        }
+        /* T = B^(n+h) - T */
+        mp_neg(tabt, tabt, n + h + 1, 0);
+        tabt[n + h]++;
+        if (mp_mul(s, tabu, tabt + l, n + h + 1 - l, tabxh, h + 1))
+            goto fail;
+        /* n + 2*h - l + 2 limbs */
+        k = 2 * h - l;
+        for(i = 0; i < l; i++)
+            tabr[i] = tabu[i + k];
+        mp_add(tabr + l, tabr + l, tabu + 2 * h, h, 0);
+    }
+    bf_free(s, tabt);
+    bf_free(s, tabu);
+    return 0;
+ fail:
+    bf_free(s, tabt);
+    bf_free(s, tabu);
+    return -1;
+}
+
+/* return -1, 0 or 1 */
+static int mp_cmp(const limb_t *taba, const limb_t *tabb, mp_size_t n)
+{
+    mp_size_t i;
+    for(i = n - 1; i >= 0; i--) {
+        if (taba[i] != tabb[i]) {
+            if (taba[i] < tabb[i])
+                return -1;
+            else
+                return 1;
+        }
+    }
+    return 0;
+}
+
+//#define DEBUG_DIVNORM_LARGE
+//#define DEBUG_DIVNORM_LARGE2
+
+/* subquadratic divnorm */
+static int mp_divnorm_large(bf_context_t *s,
+                            limb_t *tabq, limb_t *taba, limb_t na,
+                            const limb_t *tabb, limb_t nb)
+{
+    limb_t *tabb_inv, nq, *tabt, i, n;
+    nq = na - nb;
+#ifdef DEBUG_DIVNORM_LARGE
+    printf("na=%d nb=%d nq=%d\n", (int)na, (int)nb, (int)nq);
+    mp_print_str("a", taba, na);
+    mp_print_str("b", tabb, nb);
+#endif
+    assert(nq >= 1);
+    n = nq;
+    if (nq < nb)
+        n++;
+    tabb_inv = bf_malloc(s, sizeof(limb_t) * (n + 1));
+    tabt = bf_malloc(s, sizeof(limb_t) * 2 * (n + 1));
+    if (!tabb_inv || !tabt)
+        goto fail;
+
+    if (n >= nb) {
+        for(i = 0; i < n - nb; i++)
+            tabt[i] = 0;
+        for(i = 0; i < nb; i++)
+            tabt[i + n - nb] = tabb[i];
+    } else {
+        /* truncate B: need to increment it so that the approximate
+           inverse is smaller that the exact inverse */
+        for(i = 0; i < n; i++)
+            tabt[i] = tabb[i + nb - n];
+        if (mp_add_ui(tabt, 1, n)) {
+            /* tabt = B^n : tabb_inv = B^n */
+            memset(tabb_inv, 0, n * sizeof(limb_t));
+            tabb_inv[n] = 1;
+            goto recip_done;
+        }
+    }
+    if (mp_recip(s, tabb_inv, tabt, n))
+        goto fail;
+ recip_done:
+    /* Q=A*B^-1 */
+    if (mp_mul(s, tabt, tabb_inv, n + 1, taba + na - (n + 1), n + 1))
+        goto fail;
+
+    for(i = 0; i < nq + 1; i++)
+        tabq[i] = tabt[i + 2 * (n + 1) - (nq + 1)];
+#ifdef DEBUG_DIVNORM_LARGE
+    mp_print_str("q", tabq, nq + 1);
+#endif
+
+    bf_free(s, tabt);
+    bf_free(s, tabb_inv);
+    tabb_inv = NULL;
+
+    /* R=A-B*Q */
+    tabt = bf_malloc(s, sizeof(limb_t) * (na + 1));
+    if (!tabt)
+        goto fail;
+    if (mp_mul(s, tabt, tabq, nq + 1, tabb, nb))
+        goto fail;
+    /* we add one more limb for the result */
+    mp_sub(taba, taba, tabt, nb + 1, 0);
+    bf_free(s, tabt);
+    /* the approximated quotient is smaller than than the exact one,
+       hence we may have to increment it */
+#ifdef DEBUG_DIVNORM_LARGE2
+    int cnt = 0;
+    static int cnt_max;
+#endif
+    for(;;) {
+        if (taba[nb] == 0 && mp_cmp(taba, tabb, nb) < 0)
+            break;
+        taba[nb] -= mp_sub(taba, taba, tabb, nb, 0);
+        mp_add_ui(tabq, 1, nq + 1);
+#ifdef DEBUG_DIVNORM_LARGE2
+        cnt++;
+#endif
+    }
+#ifdef DEBUG_DIVNORM_LARGE2
+    if (cnt > cnt_max) {
+        cnt_max = cnt;
+        printf("\ncnt=%d nq=%d nb=%d\n", cnt_max, (int)nq, (int)nb);
+    }
+#endif
+    return 0;
+ fail:
+    bf_free(s, tabb_inv);
+    bf_free(s, tabt);
+    return -1;
+}
+
+int bf_mul(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+           bf_flags_t flags)
+{
+    int ret, r_sign;
+
+    if (a->len < b->len) {
+        const bf_t *tmp = a;
+        a = b;
+        b = tmp;
+    }
+    r_sign = a->sign ^ b->sign;
+    /* here b->len <= a->len */
+    if (b->len == 0) {
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            ret = 0;
+        } else if (a->expn == BF_EXP_INF || b->expn == BF_EXP_INF) {
+            if ((a->expn == BF_EXP_INF && b->expn == BF_EXP_ZERO) ||
+                (a->expn == BF_EXP_ZERO && b->expn == BF_EXP_INF)) {
+                bf_set_nan(r);
+                ret = BF_ST_INVALID_OP;
+            } else {
+                bf_set_inf(r, r_sign);
+                ret = 0;
+            }
+        } else {
+            bf_set_zero(r, r_sign);
+            ret = 0;
+        }
+    } else {
+        bf_t tmp, *r1 = NULL;
+        limb_t a_len, b_len, precl;
+        limb_t *a_tab, *b_tab;
+
+        a_len = a->len;
+        b_len = b->len;
+
+        if ((flags & BF_RND_MASK) == BF_RNDF) {
+            /* faithful rounding does not require using the full inputs */
+            precl = (prec + 2 + LIMB_BITS - 1) / LIMB_BITS;
+            a_len = bf_min(a_len, precl);
+            b_len = bf_min(b_len, precl);
+        }
+        a_tab = a->tab + a->len - a_len;
+        b_tab = b->tab + b->len - b_len;
+
+#ifdef USE_FFT_MUL
+        if (b_len >= FFT_MUL_THRESHOLD) {
+            int mul_flags = 0;
+            if (r == a)
+                mul_flags |= FFT_MUL_R_OVERLAP_A;
+            if (r == b)
+                mul_flags |= FFT_MUL_R_OVERLAP_B;
+            if (fft_mul(r->ctx, r, a_tab, a_len, b_tab, b_len, mul_flags))
+                goto fail;
+        } else
+#endif
+        {
+            if (r == a || r == b) {
+                bf_init(r->ctx, &tmp);
+                r1 = r;
+                r = &tmp;
+            }
+            if (bf_resize(r, a_len + b_len)) {
+#ifdef USE_FFT_MUL
+            fail:
+#endif
+                bf_set_nan(r);
+                ret = BF_ST_MEM_ERROR;
+                goto done;
+            }
+            mp_mul_basecase(r->tab, a_tab, a_len, b_tab, b_len);
+        }
+        r->sign = r_sign;
+        r->expn = a->expn + b->expn;
+        ret = bf_normalize_and_round(r, prec, flags);
+    done:
+        if (r == &tmp)
+            bf_move(r1, &tmp);
+    }
+    return ret;
+}
+
+/* multiply 'r' by 2^e */
+int bf_mul_2exp(bf_t *r, slimb_t e, limb_t prec, bf_flags_t flags)
+{
+    slimb_t e_max;
+    if (r->len == 0)
+        return 0;
+    e_max = ((limb_t)1 << BF_EXT_EXP_BITS_MAX) - 1;
+    e = bf_max(e, -e_max);
+    e = bf_min(e, e_max);
+    r->expn += e;
+    return __bf_round(r, prec, flags, r->len, 0);
+}
+
+/* Return e such as a=m*2^e with m odd integer. return 0 if a is zero,
+   Infinite or Nan. */
+slimb_t bf_get_exp_min(const bf_t *a)
+{
+    slimb_t i;
+    limb_t v;
+    int k;
+
+    for(i = 0; i < a->len; i++) {
+        v = a->tab[i];
+        if (v != 0) {
+            k = ctz(v);
+            return a->expn - (a->len - i) * LIMB_BITS + k;
+        }
+    }
+    return 0;
+}
+
+/* a and b must be finite numbers with a >= 0 and b > 0. 'q' is the
+   integer defined as floor(a/b) and r = a - q * b. */
+static void bf_tdivremu(bf_t *q, bf_t *r,
+                        const bf_t *a, const bf_t *b)
+{
+    if (bf_cmpu(a, b) < 0) {
+        bf_set_ui(q, 0);
+        bf_set(r, a);
+    } else {
+        bf_div(q, a, b, bf_max(a->expn - b->expn + 1, 2), BF_RNDZ);
+        bf_rint(q, BF_RNDZ);
+        bf_mul(r, q, b, BF_PREC_INF, BF_RNDZ);
+        bf_sub(r, a, r, BF_PREC_INF, BF_RNDZ);
+    }
+}
+
+static int __bf_div(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                    bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    int ret, r_sign;
+    limb_t n, nb, precl;
+
+    r_sign = a->sign ^ b->sign;
+    if (a->expn >= BF_EXP_INF || b->expn >= BF_EXP_INF) {
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF && b->expn == BF_EXP_INF) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else if (a->expn == BF_EXP_INF) {
+            bf_set_inf(r, r_sign);
+            return 0;
+        } else {
+            bf_set_zero(r, r_sign);
+            return 0;
+        }
+    } else if (a->expn == BF_EXP_ZERO) {
+        if (b->expn == BF_EXP_ZERO) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bf_set_zero(r, r_sign);
+            return 0;
+        }
+    } else if (b->expn == BF_EXP_ZERO) {
+        bf_set_inf(r, r_sign);
+        return BF_ST_DIVIDE_ZERO;
+    }
+
+    /* number of limbs of the quotient (2 extra bits for rounding) */
+    precl = (prec + 2 + LIMB_BITS - 1) / LIMB_BITS;
+    nb = b->len;
+    n = bf_max(a->len, precl);
+
+    {
+        limb_t *taba, na;
+        slimb_t d;
+
+        na = n + nb;
+        taba = bf_malloc(s, (na + 1) * sizeof(limb_t));
+        if (!taba)
+            goto fail;
+        d = na - a->len;
+        memset(taba, 0, d * sizeof(limb_t));
+        memcpy(taba + d, a->tab, a->len * sizeof(limb_t));
+        if (bf_resize(r, n + 1))
+            goto fail1;
+        if (mp_divnorm(s, r->tab, taba, na, b->tab, nb)) {
+        fail1:
+            bf_free(s, taba);
+            goto fail;
+        }
+        /* see if non zero remainder */
+        if (mp_scan_nz(taba, nb))
+            r->tab[0] |= 1;
+        bf_free(r->ctx, taba);
+        r->expn = a->expn - b->expn + LIMB_BITS;
+        r->sign = r_sign;
+        ret = bf_normalize_and_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bf_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+/* division and remainder.
+
+   rnd_mode is the rounding mode for the quotient. The additional
+   rounding mode BF_RND_EUCLIDIAN is supported.
+
+   'q' is an integer. 'r' is rounded with prec and flags (prec can be
+   BF_PREC_INF).
+*/
+int bf_divrem(bf_t *q, bf_t *r, const bf_t *a, const bf_t *b,
+              limb_t prec, bf_flags_t flags, int rnd_mode)
+{
+    bf_t a1_s, *a1 = &a1_s;
+    bf_t b1_s, *b1 = &b1_s;
+    int q_sign, ret;
+    BOOL is_ceil, is_rndn;
+
+    assert(q != a && q != b);
+    assert(r != a && r != b);
+    assert(q != r);
+
+    if (a->len == 0 || b->len == 0) {
+        bf_set_zero(q, 0);
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF || b->expn == BF_EXP_ZERO) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bf_set(r, a);
+            return bf_round(r, prec, flags);
+        }
+    }
+
+    q_sign = a->sign ^ b->sign;
+    is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA);
+    switch(rnd_mode) {
+    default:
+    case BF_RNDZ:
+    case BF_RNDN:
+    case BF_RNDNA:
+        is_ceil = FALSE;
+        break;
+    case BF_RNDD:
+        is_ceil = q_sign;
+        break;
+    case BF_RNDU:
+        is_ceil = q_sign ^ 1;
+        break;
+    case BF_RNDA:
+        is_ceil = TRUE;
+        break;
+    case BF_DIVREM_EUCLIDIAN:
+        is_ceil = a->sign;
+        break;
+    }
+
+    a1->expn = a->expn;
+    a1->tab = a->tab;
+    a1->len = a->len;
+    a1->sign = 0;
+
+    b1->expn = b->expn;
+    b1->tab = b->tab;
+    b1->len = b->len;
+    b1->sign = 0;
+
+    /* XXX: could improve to avoid having a large 'q' */
+    bf_tdivremu(q, r, a1, b1);
+    if (bf_is_nan(q) || bf_is_nan(r))
+        goto fail;
+
+    if (r->len != 0) {
+        if (is_rndn) {
+            int res;
+            b1->expn--;
+            res = bf_cmpu(r, b1);
+            b1->expn++;
+            if (res > 0 ||
+                (res == 0 &&
+                 (rnd_mode == BF_RNDNA ||
+                  get_bit(q->tab, q->len, q->len * LIMB_BITS - q->expn)))) {
+                goto do_sub_r;
+            }
+        } else if (is_ceil) {
+        do_sub_r:
+            ret = bf_add_si(q, q, 1, BF_PREC_INF, BF_RNDZ);
+            ret |= bf_sub(r, r, b1, BF_PREC_INF, BF_RNDZ);
+            if (ret & BF_ST_MEM_ERROR)
+                goto fail;
+        }
+    }
+
+    r->sign ^= a->sign;
+    q->sign = q_sign;
+    return bf_round(r, prec, flags);
+ fail:
+    bf_set_nan(q);
+    bf_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+int bf_rem(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+           bf_flags_t flags, int rnd_mode)
+{
+    bf_t q_s, *q = &q_s;
+    int ret;
+
+    bf_init(r->ctx, q);
+    ret = bf_divrem(q, r, a, b, prec, flags, rnd_mode);
+    bf_delete(q);
+    return ret;
+}
+
+static inline int bf_get_limb(slimb_t *pres, const bf_t *a, int flags)
+{
+#if LIMB_BITS == 32
+    return bf_get_int32(pres, a, flags);
+#else
+    return bf_get_int64(pres, a, flags);
+#endif
+}
+
+int bf_remquo(slimb_t *pq, bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+              bf_flags_t flags, int rnd_mode)
+{
+    bf_t q_s, *q = &q_s;
+    int ret;
+
+    bf_init(r->ctx, q);
+    ret = bf_divrem(q, r, a, b, prec, flags, rnd_mode);
+    bf_get_limb(pq, q, BF_GET_INT_MOD);
+    bf_delete(q);
+    return ret;
+}
+
+static __maybe_unused inline limb_t mul_mod(limb_t a, limb_t b, limb_t m)
+{
+    dlimb_t t;
+    t = (dlimb_t)a * (dlimb_t)b;
+    return t % m;
+}
+
+#if defined(USE_MUL_CHECK)
+static limb_t mp_mod1(const limb_t *tab, limb_t n, limb_t m, limb_t r)
+{
+    slimb_t i;
+    dlimb_t t;
+
+    for(i = n - 1; i >= 0; i--) {
+        t = ((dlimb_t)r << LIMB_BITS) | tab[i];
+        r = t % m;
+    }
+    return r;
+}
+#endif
+
+static const uint16_t sqrt_table[192] = {
+128,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,144,145,146,147,148,149,150,150,151,152,153,154,155,155,156,157,158,159,160,160,161,162,163,163,164,165,166,167,167,168,169,170,170,171,172,173,173,174,175,176,176,177,178,178,179,180,181,181,182,183,183,184,185,185,186,187,187,188,189,189,190,191,192,192,193,193,194,195,195,196,197,197,198,199,199,200,201,201,202,203,203,204,204,205,206,206,207,208,208,209,209,210,211,211,212,212,213,214,214,215,215,216,217,217,218,218,219,219,220,221,221,222,222,223,224,224,225,225,226,226,227,227,228,229,229,230,230,231,231,232,232,233,234,234,235,235,236,236,237,237,238,238,239,240,240,241,241,242,242,243,243,244,244,245,245,246,246,247,247,248,248,249,249,250,250,251,251,252,252,253,253,254,254,255,
+};
+
+/* a >= 2^(LIMB_BITS - 2).  Return (s, r) with s=floor(sqrt(a)) and
+   r=a-s^2. 0 <= r <= 2 * s */
+static limb_t mp_sqrtrem1(limb_t *pr, limb_t a)
+{
+    limb_t s1, r1, s, r, q, u, num;
+
+    /* use a table for the 16 -> 8 bit sqrt */
+    s1 = sqrt_table[(a >> (LIMB_BITS - 8)) - 64];
+    r1 = (a >> (LIMB_BITS - 16)) - s1 * s1;
+    if (r1 > 2 * s1) {
+        r1 -= 2 * s1 + 1;
+        s1++;
+    }
+
+    /* one iteration to get a 32 -> 16 bit sqrt */
+    num = (r1 << 8) | ((a >> (LIMB_BITS - 32 + 8)) & 0xff);
+    q = num / (2 * s1); /* q <= 2^8 */
+    u = num % (2 * s1);
+    s = (s1 << 8) + q;
+    r = (u << 8) | ((a >> (LIMB_BITS - 32)) & 0xff);
+    r -= q * q;
+    if ((slimb_t)r < 0) {
+        s--;
+        r += 2 * s + 1;
+    }
+
+#if LIMB_BITS == 64
+    s1 = s;
+    r1 = r;
+    /* one more iteration for 64 -> 32 bit sqrt */
+    num = (r1 << 16) | ((a >> (LIMB_BITS - 64 + 16)) & 0xffff);
+    q = num / (2 * s1); /* q <= 2^16 */
+    u = num % (2 * s1);
+    s = (s1 << 16) + q;
+    r = (u << 16) | ((a >> (LIMB_BITS - 64)) & 0xffff);
+    r -= q * q;
+    if ((slimb_t)r < 0) {
+        s--;
+        r += 2 * s + 1;
+    }
+#endif
+    *pr = r;
+    return s;
+}
+
+/* return floor(sqrt(a)) */
+limb_t bf_isqrt(limb_t a)
+{
+    limb_t s, r;
+    int k;
+
+    if (a == 0)
+        return 0;
+    k = clz(a) & ~1;
+    s = mp_sqrtrem1(&r, a << k);
+    s >>= (k >> 1);
+    return s;
+}
+
+static limb_t mp_sqrtrem2(limb_t *tabs, limb_t *taba)
+{
+    limb_t s1, r1, s, q, u, a0, a1;
+    dlimb_t r, num;
+    int l;
+
+    a0 = taba[0];
+    a1 = taba[1];
+    s1 = mp_sqrtrem1(&r1, a1);
+    l = LIMB_BITS / 2;
+    num = ((dlimb_t)r1 << l) | (a0 >> l);
+    q = num / (2 * s1);
+    u = num % (2 * s1);
+    s = (s1 << l) + q;
+    r = ((dlimb_t)u << l) | (a0 & (((limb_t)1 << l) - 1));
+    if (unlikely((q >> l) != 0))
+        r -= (dlimb_t)1 << LIMB_BITS; /* special case when q=2^l */
+    else
+        r -= q * q;
+    if ((slimb_t)(r >> LIMB_BITS) < 0) {
+        s--;
+        r += 2 * (dlimb_t)s + 1;
+    }
+    tabs[0] = s;
+    taba[0] = r;
+    return r >> LIMB_BITS;
+}
+
+//#define DEBUG_SQRTREM
+
+/* tmp_buf must contain (n / 2 + 1 limbs). *prh contains the highest
+   limb of the remainder. */
+static int mp_sqrtrem_rec(bf_context_t *s, limb_t *tabs, limb_t *taba, limb_t n,
+                          limb_t *tmp_buf, limb_t *prh)
+{
+    limb_t l, h, rh, ql, qh, c, i;
+
+    if (n == 1) {
+        *prh = mp_sqrtrem2(tabs, taba);
+        return 0;
+    }
+#ifdef DEBUG_SQRTREM
+    mp_print_str("a", taba, 2 * n);
+#endif
+    l = n / 2;
+    h = n - l;
+    if (mp_sqrtrem_rec(s, tabs + l, taba + 2 * l, h, tmp_buf, &qh))
+        return -1;
+#ifdef DEBUG_SQRTREM
+    mp_print_str("s1", tabs + l, h);
+    mp_print_str_h("r1", taba + 2 * l, h, qh);
+    mp_print_str_h("r2", taba + l, n, qh);
+#endif
+
+    /* the remainder is in taba + 2 * l. Its high bit is in qh */
+    if (qh) {
+        mp_sub(taba + 2 * l, taba + 2 * l, tabs + l, h, 0);
+    }
+    /* instead of dividing by 2*s, divide by s (which is normalized)
+       and update q and r */
+    if (mp_divnorm(s, tmp_buf, taba + l, n, tabs + l, h))
+        return -1;
+    qh += tmp_buf[l];
+    for(i = 0; i < l; i++)
+        tabs[i] = tmp_buf[i];
+    ql = mp_shr(tabs, tabs, l, 1, qh & 1);
+    qh = qh >> 1; /* 0 or 1 */
+    if (ql)
+        rh = mp_add(taba + l, taba + l, tabs + l, h, 0);
+    else
+        rh = 0;
+#ifdef DEBUG_SQRTREM
+    mp_print_str_h("q", tabs, l, qh);
+    mp_print_str_h("u", taba + l, h, rh);
+#endif
+
+    mp_add_ui(tabs + l, qh, h);
+#ifdef DEBUG_SQRTREM
+    mp_print_str_h("s2", tabs, n, sh);
+#endif
+
+    /* q = qh, tabs[l - 1 ... 0], r = taba[n - 1 ... l] */
+    /* subtract q^2. if qh = 1 then q = B^l, so we can take shortcuts */
+    if (qh) {
+        c = qh;
+    } else {
+        if (mp_mul(s, taba + n, tabs, l, tabs, l))
+            return -1;
+        c = mp_sub(taba, taba, taba + n, 2 * l, 0);
+    }
+    rh -= mp_sub_ui(taba + 2 * l, c, n - 2 * l);
+    if ((slimb_t)rh < 0) {
+        mp_sub_ui(tabs, 1, n);
+        rh += mp_add_mul1(taba, tabs, n, 2);
+        rh += mp_add_ui(taba, 1, n);
+    }
+    *prh = rh;
+    return 0;
+}
+
+/* 'taba' has 2*n limbs with n >= 1 and taba[2*n-1] >= 2 ^ (LIMB_BITS
+   - 2). Return (s, r) with s=floor(sqrt(a)) and r=a-s^2. 0 <= r <= 2
+   * s. tabs has n limbs. r is returned in the lower n limbs of
+   taba. Its r[n] is the returned value of the function. */
+/* Algorithm from the article "Karatsuba Square Root" by Paul Zimmermann and
+   inspirated from its GMP implementation */
+int mp_sqrtrem(bf_context_t *s, limb_t *tabs, limb_t *taba, limb_t n)
+{
+    limb_t tmp_buf1[8];
+    limb_t *tmp_buf;
+    mp_size_t n2;
+    int ret;
+    n2 = n / 2 + 1;
+    if (n2 <= countof(tmp_buf1)) {
+        tmp_buf = tmp_buf1;
+    } else {
+        tmp_buf = bf_malloc(s, sizeof(limb_t) * n2);
+        if (!tmp_buf)
+            return -1;
+    }
+    ret = mp_sqrtrem_rec(s, tabs, taba, n, tmp_buf, taba + n);
+    if (tmp_buf != tmp_buf1)
+        bf_free(s, tmp_buf);
+    return ret;
+}
+
+/* Integer square root with remainder. 'a' must be an integer. r =
+   floor(sqrt(a)) and rem = a - r^2.  BF_ST_INEXACT is set if the result
+   is inexact. 'rem' can be NULL if the remainder is not needed. */
+int bf_sqrtrem(bf_t *r, bf_t *rem1, const bf_t *a)
+{
+    int ret;
+
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+        } else if (a->expn == BF_EXP_INF && a->sign) {
+            goto invalid_op;
+        } else {
+            bf_set(r, a);
+        }
+        if (rem1)
+            bf_set_ui(rem1, 0);
+        ret = 0;
+    } else if (a->sign) {
+ invalid_op:
+        bf_set_nan(r);
+        if (rem1)
+            bf_set_ui(rem1, 0);
+        ret = BF_ST_INVALID_OP;
+    } else {
+        bf_t rem_s, *rem;
+
+        bf_sqrt(r, a, (a->expn + 1) / 2, BF_RNDZ);
+        bf_rint(r, BF_RNDZ);
+        /* see if the result is exact by computing the remainder */
+        if (rem1) {
+            rem = rem1;
+        } else {
+            rem = &rem_s;
+            bf_init(r->ctx, rem);
+        }
+        /* XXX: could avoid recomputing the remainder */
+        bf_mul(rem, r, r, BF_PREC_INF, BF_RNDZ);
+        bf_neg(rem);
+        bf_add(rem, rem, a, BF_PREC_INF, BF_RNDZ);
+        if (bf_is_nan(rem)) {
+            ret = BF_ST_MEM_ERROR;
+            goto done;
+        }
+        if (rem->len != 0) {
+            ret = BF_ST_INEXACT;
+        } else {
+            ret = 0;
+        }
+    done:
+        if (!rem1)
+            bf_delete(rem);
+    }
+    return ret;
+}
+
+int bf_sqrt(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = a->ctx;
+    int ret;
+
+    assert(r != a);
+
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+        } else if (a->expn == BF_EXP_INF && a->sign) {
+            goto invalid_op;
+        } else {
+            bf_set(r, a);
+        }
+        ret = 0;
+    } else if (a->sign) {
+ invalid_op:
+        bf_set_nan(r);
+        ret = BF_ST_INVALID_OP;
+    } else {
+        limb_t *a1;
+        slimb_t n, n1;
+        limb_t res;
+
+        /* convert the mantissa to an integer with at least 2 *
+           prec + 4 bits */
+        n = (2 * (prec + 2) + 2 * LIMB_BITS - 1) / (2 * LIMB_BITS);
+        if (bf_resize(r, n))
+            goto fail;
+        a1 = bf_malloc(s, sizeof(limb_t) * 2 * n);
+        if (!a1)
+            goto fail;
+        n1 = bf_min(2 * n, a->len);
+        memset(a1, 0, (2 * n - n1) * sizeof(limb_t));
+        memcpy(a1 + 2 * n - n1, a->tab + a->len - n1, n1 * sizeof(limb_t));
+        if (a->expn & 1) {
+            res = mp_shr(a1, a1, 2 * n, 1, 0);
+        } else {
+            res = 0;
+        }
+        if (mp_sqrtrem(s, r->tab, a1, n)) {
+            bf_free(s, a1);
+            goto fail;
+        }
+        if (!res) {
+            res = mp_scan_nz(a1, n + 1);
+        }
+        bf_free(s, a1);
+        if (!res) {
+            res = mp_scan_nz(a->tab, a->len - n1);
+        }
+        if (res != 0)
+            r->tab[0] |= 1;
+        r->sign = 0;
+        r->expn = (a->expn + 1) >> 1;
+        ret = bf_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bf_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+static no_inline int bf_op2(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                            bf_flags_t flags, bf_op2_func_t *func)
+{
+    bf_t tmp;
+    int ret;
+
+    if (r == a || r == b) {
+        bf_init(r->ctx, &tmp);
+        ret = func(&tmp, a, b, prec, flags);
+        bf_move(r, &tmp);
+    } else {
+        ret = func(r, a, b, prec, flags);
+    }
+    return ret;
+}
+
+int bf_add(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+            bf_flags_t flags)
+{
+    return bf_op2(r, a, b, prec, flags, __bf_add);
+}
+
+int bf_sub(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+            bf_flags_t flags)
+{
+    return bf_op2(r, a, b, prec, flags, __bf_sub);
+}
+
+int bf_div(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+           bf_flags_t flags)
+{
+    return bf_op2(r, a, b, prec, flags, __bf_div);
+}
+
+int bf_mul_ui(bf_t *r, const bf_t *a, uint64_t b1, limb_t prec,
+               bf_flags_t flags)
+{
+    bf_t b;
+    int ret;
+    bf_init(r->ctx, &b);
+    ret = bf_set_ui(&b, b1);
+    ret |= bf_mul(r, a, &b, prec, flags);
+    bf_delete(&b);
+    return ret;
+}
+
+int bf_mul_si(bf_t *r, const bf_t *a, int64_t b1, limb_t prec,
+               bf_flags_t flags)
+{
+    bf_t b;
+    int ret;
+    bf_init(r->ctx, &b);
+    ret = bf_set_si(&b, b1);
+    ret |= bf_mul(r, a, &b, prec, flags);
+    bf_delete(&b);
+    return ret;
+}
+
+int bf_add_si(bf_t *r, const bf_t *a, int64_t b1, limb_t prec,
+              bf_flags_t flags)
+{
+    bf_t b;
+    int ret;
+
+    bf_init(r->ctx, &b);
+    ret = bf_set_si(&b, b1);
+    ret |= bf_add(r, a, &b, prec, flags);
+    bf_delete(&b);
+    return ret;
+}
+
+static int bf_pow_ui(bf_t *r, const bf_t *a, limb_t b, limb_t prec,
+                     bf_flags_t flags)
+{
+    int ret, n_bits, i;
+
+    assert(r != a);
+    if (b == 0)
+        return bf_set_ui(r, 1);
+    ret = bf_set(r, a);
+    n_bits = LIMB_BITS - clz(b);
+    for(i = n_bits - 2; i >= 0; i--) {
+        ret |= bf_mul(r, r, r, prec, flags);
+        if ((b >> i) & 1)
+            ret |= bf_mul(r, r, a, prec, flags);
+    }
+    return ret;
+}
+
+static int bf_pow_ui_ui(bf_t *r, limb_t a1, limb_t b,
+                        limb_t prec, bf_flags_t flags)
+{
+    bf_t a;
+    int ret;
+
+#ifdef USE_BF_DEC
+    if (a1 == 10 && b <= LIMB_DIGITS) {
+        /* use precomputed powers. We do not round at this point
+           because we expect the caller to do it */
+        ret = bf_set_ui(r, mp_pow_dec[b]);
+    } else
+#endif
+    {
+        bf_init(r->ctx, &a);
+        ret = bf_set_ui(&a, a1);
+        ret |= bf_pow_ui(r, &a, b, prec, flags);
+        bf_delete(&a);
+    }
+    return ret;
+}
+
+/* convert to integer (infinite precision) */
+int bf_rint(bf_t *r, int rnd_mode)
+{
+    return bf_round(r, 0, rnd_mode | BF_FLAG_RADPNT_PREC);
+}
+
+/* logical operations */
+#define BF_LOGIC_OR  0
+#define BF_LOGIC_XOR 1
+#define BF_LOGIC_AND 2
+
+static inline limb_t bf_logic_op1(limb_t a, limb_t b, int op)
+{
+    switch(op) {
+    case BF_LOGIC_OR:
+        return a | b;
+    case BF_LOGIC_XOR:
+        return a ^ b;
+    default:
+    case BF_LOGIC_AND:
+        return a & b;
+    }
+}
+
+static int bf_logic_op(bf_t *r, const bf_t *a1, const bf_t *b1, int op)
+{
+    bf_t b1_s, a1_s, *a, *b;
+    limb_t a_sign, b_sign, r_sign;
+    slimb_t l, i, a_bit_offset, b_bit_offset;
+    limb_t v1, v2, v1_mask, v2_mask, r_mask;
+    int ret;
+
+    assert(r != a1 && r != b1);
+
+    if (a1->expn <= 0)
+        a_sign = 0; /* minus zero is considered as positive */
+    else
+        a_sign = a1->sign;
+
+    if (b1->expn <= 0)
+        b_sign = 0; /* minus zero is considered as positive */
+    else
+        b_sign = b1->sign;
+
+    if (a_sign) {
+        a = &a1_s;
+        bf_init(r->ctx, a);
+        if (bf_add_si(a, a1, 1, BF_PREC_INF, BF_RNDZ)) {
+            b = NULL;
+            goto fail;
+        }
+    } else {
+        a = (bf_t *)a1;
+    }
+
+    if (b_sign) {
+        b = &b1_s;
+        bf_init(r->ctx, b);
+        if (bf_add_si(b, b1, 1, BF_PREC_INF, BF_RNDZ))
+            goto fail;
+    } else {
+        b = (bf_t *)b1;
+    }
+
+    r_sign = bf_logic_op1(a_sign, b_sign, op);
+    if (op == BF_LOGIC_AND && r_sign == 0) {
+        /* no need to compute extra zeros for and */
+        if (a_sign == 0 && b_sign == 0)
+            l = bf_min(a->expn, b->expn);
+        else if (a_sign == 0)
+            l = a->expn;
+        else
+            l = b->expn;
+    } else {
+        l = bf_max(a->expn, b->expn);
+    }
+    /* Note: a or b can be zero */
+    l = (bf_max(l, 1) + LIMB_BITS - 1) / LIMB_BITS;
+    if (bf_resize(r, l))
+        goto fail;
+    a_bit_offset = a->len * LIMB_BITS - a->expn;
+    b_bit_offset = b->len * LIMB_BITS - b->expn;
+    v1_mask = -a_sign;
+    v2_mask = -b_sign;
+    r_mask = -r_sign;
+    for(i = 0; i < l; i++) {
+        v1 = get_bits(a->tab, a->len, a_bit_offset + i * LIMB_BITS) ^ v1_mask;
+        v2 = get_bits(b->tab, b->len, b_bit_offset + i * LIMB_BITS) ^ v2_mask;
+        r->tab[i] = bf_logic_op1(v1, v2, op) ^ r_mask;
+    }
+    r->expn = l * LIMB_BITS;
+    r->sign = r_sign;
+    bf_normalize_and_round(r, BF_PREC_INF, BF_RNDZ); /* cannot fail */
+    if (r_sign) {
+        if (bf_add_si(r, r, -1, BF_PREC_INF, BF_RNDZ))
+            goto fail;
+    }
+    ret = 0;
+ done:
+    if (a == &a1_s)
+        bf_delete(a);
+    if (b == &b1_s)
+        bf_delete(b);
+    return ret;
+ fail:
+    bf_set_nan(r);
+    ret = BF_ST_MEM_ERROR;
+    goto done;
+}
+
+/* 'a' and 'b' must be integers. Return 0 or BF_ST_MEM_ERROR. */
+int bf_logic_or(bf_t *r, const bf_t *a, const bf_t *b)
+{
+    return bf_logic_op(r, a, b, BF_LOGIC_OR);
+}
+
+/* 'a' and 'b' must be integers. Return 0 or BF_ST_MEM_ERROR. */
+int bf_logic_xor(bf_t *r, const bf_t *a, const bf_t *b)
+{
+    return bf_logic_op(r, a, b, BF_LOGIC_XOR);
+}
+
+/* 'a' and 'b' must be integers. Return 0 or BF_ST_MEM_ERROR. */
+int bf_logic_and(bf_t *r, const bf_t *a, const bf_t *b)
+{
+    return bf_logic_op(r, a, b, BF_LOGIC_AND);
+}
+
+/* conversion between fixed size types */
+
+typedef union {
+    double d;
+    uint64_t u;
+} Float64Union;
+
+int bf_get_float64(const bf_t *a, double *pres, bf_rnd_t rnd_mode)
+{
+    Float64Union u;
+    int e, ret;
+    uint64_t m;
+
+    ret = 0;
+    if (a->expn == BF_EXP_NAN) {
+        u.u = 0x7ff8000000000000; /* quiet nan */
+    } else {
+        bf_t b_s, *b = &b_s;
+
+        bf_init(a->ctx, b);
+        bf_set(b, a);
+        if (bf_is_finite(b)) {
+            ret = bf_round(b, 53, rnd_mode | BF_FLAG_SUBNORMAL | bf_set_exp_bits(11));
+        }
+        if (b->expn == BF_EXP_INF) {
+            e = (1 << 11) - 1;
+            m = 0;
+        } else if (b->expn == BF_EXP_ZERO) {
+            e = 0;
+            m = 0;
+        } else {
+            e = b->expn + 1023 - 1;
+#if LIMB_BITS == 32
+            if (b->len == 2) {
+                m = ((uint64_t)b->tab[1] << 32) | b->tab[0];
+            } else {
+                m = ((uint64_t)b->tab[0] << 32);
+            }
+#else
+            m = b->tab[0];
+#endif
+            if (e <= 0) {
+                /* subnormal */
+                m = m >> (12 - e);
+                e = 0;
+            } else {
+                m = (m << 1) >> 12;
+            }
+        }
+        u.u = m | ((uint64_t)e << 52) | ((uint64_t)b->sign << 63);
+        bf_delete(b);
+    }
+    *pres = u.d;
+    return ret;
+}
+
+int bf_set_float64(bf_t *a, double d)
+{
+    Float64Union u;
+    uint64_t m;
+    int shift, e, sgn;
+
+    u.d = d;
+    sgn = u.u >> 63;
+    e = (u.u >> 52) & ((1 << 11) - 1);
+    m = u.u & (((uint64_t)1 << 52) - 1);
+    if (e == ((1 << 11) - 1)) {
+        if (m != 0) {
+            bf_set_nan(a);
+        } else {
+            bf_set_inf(a, sgn);
+        }
+    } else if (e == 0) {
+        if (m == 0) {
+            bf_set_zero(a, sgn);
+        } else {
+            /* subnormal number */
+            m <<= 12;
+            shift = clz64(m);
+            m <<= shift;
+            e = -shift;
+            goto norm;
+        }
+    } else {
+        m = (m << 11) | ((uint64_t)1 << 63);
+    norm:
+        a->expn = e - 1023 + 1;
+#if LIMB_BITS == 32
+        if (bf_resize(a, 2))
+            goto fail;
+        a->tab[0] = m;
+        a->tab[1] = m >> 32;
+#else
+        if (bf_resize(a, 1))
+            goto fail;
+        a->tab[0] = m;
+#endif
+        a->sign = sgn;
+    }
+    return 0;
+fail:
+    bf_set_nan(a);
+    return BF_ST_MEM_ERROR;
+}
+
+/* The rounding mode is always BF_RNDZ. Return BF_ST_INVALID_OP if there
+   is an overflow and 0 otherwise. */
+int bf_get_int32(int *pres, const bf_t *a, int flags)
+{
+    uint32_t v;
+    int ret;
+    if (a->expn >= BF_EXP_INF) {
+        ret = BF_ST_INVALID_OP;
+        if (flags & BF_GET_INT_MOD) {
+            v = 0;
+        } else if (a->expn == BF_EXP_INF) {
+            v = (uint32_t)INT32_MAX + a->sign;
+        } else {
+            v = INT32_MAX;
+        }
+    } else if (a->expn <= 0) {
+        v = 0;
+        ret = 0;
+    } else if (a->expn <= 31) {
+        v = a->tab[a->len - 1] >> (LIMB_BITS - a->expn);
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    } else if (!(flags & BF_GET_INT_MOD)) {
+        ret = BF_ST_INVALID_OP;
+        if (a->sign) {
+            v = (uint32_t)INT32_MAX + 1;
+            if (a->expn == 32 &&
+                (a->tab[a->len - 1] >> (LIMB_BITS - 32)) == v) {
+                ret = 0;
+            }
+        } else {
+            v = INT32_MAX;
+        }
+    } else {
+        v = get_bits(a->tab, a->len, a->len * LIMB_BITS - a->expn);
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    }
+    *pres = v;
+    return ret;
+}
+
+/* The rounding mode is always BF_RNDZ. Return BF_ST_INVALID_OP if there
+   is an overflow and 0 otherwise. */
+int bf_get_int64(int64_t *pres, const bf_t *a, int flags)
+{
+    uint64_t v;
+    int ret;
+    if (a->expn >= BF_EXP_INF) {
+        ret = BF_ST_INVALID_OP;
+        if (flags & BF_GET_INT_MOD) {
+            v = 0;
+        } else if (a->expn == BF_EXP_INF) {
+            v = (uint64_t)INT64_MAX + a->sign;
+        } else {
+            v = INT64_MAX;
+        }
+    } else if (a->expn <= 0) {
+        v = 0;
+        ret = 0;
+    } else if (a->expn <= 63) {
+#if LIMB_BITS == 32
+        if (a->expn <= 32)
+            v = a->tab[a->len - 1] >> (LIMB_BITS - a->expn);
+        else
+            v = (((uint64_t)a->tab[a->len - 1] << 32) |
+                 get_limbz(a, a->len - 2)) >> (64 - a->expn);
+#else
+        v = a->tab[a->len - 1] >> (LIMB_BITS - a->expn);
+#endif
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    } else if (!(flags & BF_GET_INT_MOD)) {
+        ret = BF_ST_INVALID_OP;
+        if (a->sign) {
+            uint64_t v1;
+            v = (uint64_t)INT64_MAX + 1;
+            if (a->expn == 64) {
+                v1 = a->tab[a->len - 1];
+#if LIMB_BITS == 32
+                v1 = (v1 << 32) | get_limbz(a, a->len - 2);
+#endif
+                if (v1 == v)
+                    ret = 0;
+            }
+        } else {
+            v = INT64_MAX;
+        }
+    } else {
+        slimb_t bit_pos = a->len * LIMB_BITS - a->expn;
+        v = get_bits(a->tab, a->len, bit_pos);
+#if LIMB_BITS == 32
+        v |= (uint64_t)get_bits(a->tab, a->len, bit_pos + 32) << 32;
+#endif
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    }
+    *pres = v;
+    return ret;
+}
+
+/* The rounding mode is always BF_RNDZ. Return BF_ST_INVALID_OP if there
+   is an overflow and 0 otherwise. */
+int bf_get_uint64(uint64_t *pres, const bf_t *a)
+{
+    uint64_t v;
+    int ret;
+    if (a->expn == BF_EXP_NAN) {
+        goto overflow;
+    } else if (a->expn <= 0) {
+        v = 0;
+        ret = 0;
+    } else if (a->sign) {
+        v = 0;
+        ret = BF_ST_INVALID_OP;
+    } else if (a->expn <= 64) {
+#if LIMB_BITS == 32
+        if (a->expn <= 32)
+            v = a->tab[a->len - 1] >> (LIMB_BITS - a->expn);
+        else
+            v = (((uint64_t)a->tab[a->len - 1] << 32) |
+                 get_limbz(a, a->len - 2)) >> (64 - a->expn);
+#else
+        v = a->tab[a->len - 1] >> (LIMB_BITS - a->expn);
+#endif
+        ret = 0;
+    } else {
+    overflow:
+        v = UINT64_MAX;
+        ret = BF_ST_INVALID_OP;
+    }
+    *pres = v;
+    return ret;
+}
+
+/* base conversion from radix */
+
+static const uint8_t digits_per_limb_table[BF_RADIX_MAX - 1] = {
+#if LIMB_BITS == 32
+32,20,16,13,12,11,10,10, 9, 9, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+#else
+64,40,32,27,24,22,21,20,19,18,17,17,16,16,16,15,15,15,14,14,14,14,13,13,13,13,13,13,13,12,12,12,12,12,12,
+#endif
+};
+
+static limb_t get_limb_radix(int radix)
+{
+    int i, k;
+    limb_t radixl;
+
+    k = digits_per_limb_table[radix - 2];
+    radixl = radix;
+    for(i = 1; i < k; i++)
+        radixl *= radix;
+    return radixl;
+}
+
+/* return != 0 if error */
+static int bf_integer_from_radix_rec(bf_t *r, const limb_t *tab,
+                                     limb_t n, int level, limb_t n0,
+                                     limb_t radix, bf_t *pow_tab)
+{
+    int ret;
+    if (n == 1) {
+        ret = bf_set_ui(r, tab[0]);
+    } else {
+        bf_t T_s, *T = &T_s, *B;
+        limb_t n1, n2;
+
+        n2 = (((n0 * 2) >> (level + 1)) + 1) / 2;
+        n1 = n - n2;
+        //        printf("level=%d n0=%ld n1=%ld n2=%ld\n", level, n0, n1, n2);
+        B = &pow_tab[level];
+        if (B->len == 0) {
+            ret = bf_pow_ui_ui(B, radix, n2, BF_PREC_INF, BF_RNDZ);
+            if (ret)
+                return ret;
+        }
+        ret = bf_integer_from_radix_rec(r, tab + n2, n1, level + 1, n0,
+                                        radix, pow_tab);
+        if (ret)
+            return ret;
+        ret = bf_mul(r, r, B, BF_PREC_INF, BF_RNDZ);
+        if (ret)
+            return ret;
+        bf_init(r->ctx, T);
+        ret = bf_integer_from_radix_rec(T, tab, n2, level + 1, n0,
+                                        radix, pow_tab);
+        if (!ret)
+            ret = bf_add(r, r, T, BF_PREC_INF, BF_RNDZ);
+        bf_delete(T);
+    }
+    return ret;
+    //    bf_print_str("  r=", r);
+}
+
+/* return 0 if OK != 0 if memory error */
+static int bf_integer_from_radix(bf_t *r, const limb_t *tab,
+                                 limb_t n, limb_t radix)
+{
+    bf_context_t *s = r->ctx;
+    int pow_tab_len, i, ret;
+    limb_t radixl;
+    bf_t *pow_tab;
+
+    radixl = get_limb_radix(radix);
+    pow_tab_len = ceil_log2(n) + 2; /* XXX: check */
+    pow_tab = bf_malloc(s, sizeof(pow_tab[0]) * pow_tab_len);
+    if (!pow_tab)
+        return -1;
+    for(i = 0; i < pow_tab_len; i++)
+        bf_init(r->ctx, &pow_tab[i]);
+    ret = bf_integer_from_radix_rec(r, tab, n, 0, n, radixl, pow_tab);
+    for(i = 0; i < pow_tab_len; i++) {
+        bf_delete(&pow_tab[i]);
+    }
+    bf_free(s, pow_tab);
+    return ret;
+}
+
+/* compute and round T * radix^expn. */
+int bf_mul_pow_radix(bf_t *r, const bf_t *T, limb_t radix,
+                     slimb_t expn, limb_t prec, bf_flags_t flags)
+{
+    int ret, expn_sign, overflow;
+    slimb_t e, extra_bits, prec1, ziv_extra_bits;
+    bf_t B_s, *B = &B_s;
+
+    if (T->len == 0) {
+        return bf_set(r, T);
+    } else if (expn == 0) {
+        ret = bf_set(r, T);
+        ret |= bf_round(r, prec, flags);
+        return ret;
+    }
+
+    e = expn;
+    expn_sign = 0;
+    if (e < 0) {
+        e = -e;
+        expn_sign = 1;
+    }
+    bf_init(r->ctx, B);
+    if (prec == BF_PREC_INF) {
+        /* infinite precision: only used if the result is known to be exact */
+        ret = bf_pow_ui_ui(B, radix, e, BF_PREC_INF, BF_RNDN);
+        if (expn_sign) {
+            ret |= bf_div(r, T, B, T->len * LIMB_BITS, BF_RNDN);
+        } else {
+            ret |= bf_mul(r, T, B, BF_PREC_INF, BF_RNDN);
+        }
+    } else {
+        ziv_extra_bits = 16;
+        for(;;) {
+            prec1 = prec + ziv_extra_bits;
+            /* XXX: correct overflow/underflow handling */
+            /* XXX: rigorous error analysis needed */
+            extra_bits = ceil_log2(e) * 2 + 1;
+            ret = bf_pow_ui_ui(B, radix, e, prec1 + extra_bits, BF_RNDN | BF_FLAG_EXT_EXP);
+            overflow = !bf_is_finite(B);
+            /* XXX: if bf_pow_ui_ui returns an exact result, can stop
+               after the next operation */
+            if (expn_sign)
+                ret |= bf_div(r, T, B, prec1 + extra_bits, BF_RNDN | BF_FLAG_EXT_EXP);
+            else
+                ret |= bf_mul(r, T, B, prec1 + extra_bits, BF_RNDN | BF_FLAG_EXT_EXP);
+            if (ret & BF_ST_MEM_ERROR)
+                break;
+            if ((ret & BF_ST_INEXACT) &&
+                !bf_can_round(r, prec, flags & BF_RND_MASK, prec1) &&
+                !overflow) {
+                /* and more precision and retry */
+                ziv_extra_bits = ziv_extra_bits  + (ziv_extra_bits / 2);
+            } else {
+                /* XXX: need to use __bf_round() to pass the inexact
+                   flag for the subnormal case */
+                ret = bf_round(r, prec, flags) | (ret & BF_ST_INEXACT);
+                break;
+            }
+        }
+    }
+    bf_delete(B);
+    return ret;
+}
+
+static inline int to_digit(int c)
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    else if (c >= 'A' && c <= 'Z')
+        return c - 'A' + 10;
+    else if (c >= 'a' && c <= 'z')
+        return c - 'a' + 10;
+    else
+        return 36;
+}
+
+/* add a limb at 'pos' and decrement pos. new space is created if
+   needed. Return 0 if OK, -1 if memory error */
+static int bf_add_limb(bf_t *a, slimb_t *ppos, limb_t v)
+{
+    slimb_t pos;
+    pos = *ppos;
+    if (unlikely(pos < 0)) {
+        limb_t new_size, d, *new_tab;
+        new_size = bf_max(a->len + 1, a->len * 3 / 2);
+        new_tab = bf_realloc(a->ctx, a->tab, sizeof(limb_t) * new_size);
+        if (!new_tab)
+            return -1;
+        a->tab = new_tab;
+        d = new_size - a->len;
+        memmove(a->tab + d, a->tab, a->len * sizeof(limb_t));
+        a->len = new_size;
+        pos += d;
+    }
+    a->tab[pos--] = v;
+    *ppos = pos;
+    return 0;
+}
+
+static int bf_tolower(int c)
+{
+    if (c >= 'A' && c <= 'Z')
+        c = c - 'A' + 'a';
+    return c;
+}
+
+static int strcasestart(const char *str, const char *val, const char **ptr)
+{
+    const char *p, *q;
+    p = str;
+    q = val;
+    while (*q != '\0') {
+        if (bf_tolower(*p) != *q)
+            return 0;
+        p++;
+        q++;
+    }
+    if (ptr)
+        *ptr = p;
+    return 1;
+}
+
+static int bf_atof_internal(bf_t *r, slimb_t *pexponent,
+                            const char *str, const char **pnext, int radix,
+                            limb_t prec, bf_flags_t flags, BOOL is_dec)
+{
+    const char *p, *p_start;
+    int is_neg, radix_bits, exp_is_neg, ret, digits_per_limb, shift;
+    limb_t cur_limb;
+    slimb_t pos, expn, int_len, digit_count;
+    BOOL has_decpt, is_bin_exp;
+    bf_t a_s, *a;
+
+    *pexponent = 0;
+    p = str;
+    if (!(flags & BF_ATOF_NO_NAN_INF) && radix <= 16 &&
+        strcasestart(p, "nan", &p)) {
+        bf_set_nan(r);
+        ret = 0;
+        goto done;
+    }
+    is_neg = 0;
+
+    if (p[0] == '+') {
+        p++;
+        p_start = p;
+    } else if (p[0] == '-') {
+        is_neg = 1;
+        p++;
+        p_start = p;
+    } else {
+        p_start = p;
+    }
+    if (p[0] == '0') {
+        if ((p[1] == 'x' || p[1] == 'X') &&
+            (radix == 0 || radix == 16) &&
+            !(flags & BF_ATOF_NO_HEX)) {
+            radix = 16;
+            p += 2;
+        } else if ((p[1] == 'o' || p[1] == 'O') &&
+                   radix == 0 && (flags & BF_ATOF_BIN_OCT)) {
+            p += 2;
+            radix = 8;
+        } else if ((p[1] == 'b' || p[1] == 'B') &&
+                   radix == 0 && (flags & BF_ATOF_BIN_OCT)) {
+            p += 2;
+            radix = 2;
+        } else {
+            goto no_prefix;
+        }
+        /* there must be a digit after the prefix */
+        if (to_digit((uint8_t)*p) >= radix) {
+            bf_set_nan(r);
+            ret = 0;
+            goto done;
+        }
+    no_prefix: ;
+    } else {
+        if (!(flags & BF_ATOF_NO_NAN_INF) && radix <= 16 &&
+            strcasestart(p, "inf", &p)) {
+            bf_set_inf(r, is_neg);
+            ret = 0;
+            goto done;
+        }
+    }
+
+    if (radix == 0)
+        radix = 10;
+    if (is_dec) {
+        assert(radix == 10);
+        radix_bits = 0;
+        a = r;
+    } else if ((radix & (radix - 1)) != 0) {
+        radix_bits = 0; /* base is not a power of two */
+        a = &a_s;
+        bf_init(r->ctx, a);
+    } else {
+        radix_bits = ceil_log2(radix);
+        a = r;
+    }
+
+    /* skip leading zeros */
+    /* XXX: could also skip zeros after the decimal point */
+    while (*p == '0')
+        p++;
+
+    if (radix_bits) {
+        shift = digits_per_limb = LIMB_BITS;
+    } else {
+        radix_bits = 0;
+        shift = digits_per_limb = digits_per_limb_table[radix - 2];
+    }
+    cur_limb = 0;
+    bf_resize(a, 1);
+    pos = 0;
+    has_decpt = FALSE;
+    int_len = digit_count = 0;
+    for(;;) {
+        limb_t c;
+        if (*p == '.' && (p > p_start || to_digit(p[1]) < radix)) {
+            if (has_decpt)
+                break;
+            has_decpt = TRUE;
+            int_len = digit_count;
+            p++;
+        }
+        c = to_digit(*p);
+        if (c >= radix)
+            break;
+        digit_count++;
+        p++;
+        if (radix_bits) {
+            shift -= radix_bits;
+            if (shift <= 0) {
+                cur_limb |= c >> (-shift);
+                if (bf_add_limb(a, &pos, cur_limb))
+                    goto mem_error;
+                if (shift < 0)
+                    cur_limb = c << (LIMB_BITS + shift);
+                else
+                    cur_limb = 0;
+                shift += LIMB_BITS;
+            } else {
+                cur_limb |= c << shift;
+            }
+        } else {
+            cur_limb = cur_limb * radix + c;
+            shift--;
+            if (shift == 0) {
+                if (bf_add_limb(a, &pos, cur_limb))
+                    goto mem_error;
+                shift = digits_per_limb;
+                cur_limb = 0;
+            }
+        }
+    }
+    if (!has_decpt)
+        int_len = digit_count;
+
+    /* add the last limb and pad with zeros */
+    if (shift != digits_per_limb) {
+        if (radix_bits == 0) {
+            while (shift != 0) {
+                cur_limb *= radix;
+                shift--;
+            }
+        }
+        if (bf_add_limb(a, &pos, cur_limb)) {
+        mem_error:
+            ret = BF_ST_MEM_ERROR;
+            if (!radix_bits)
+                bf_delete(a);
+            bf_set_nan(r);
+            goto done;
+        }
+    }
+
+    /* reset the next limbs to zero (we prefer to reallocate in the
+       renormalization) */
+    memset(a->tab, 0, (pos + 1) * sizeof(limb_t));
+
+    if (p == p_start) {
+        ret = 0;
+        if (!radix_bits)
+            bf_delete(a);
+        bf_set_nan(r);
+        goto done;
+    }
+
+    /* parse the exponent, if any */
+    expn = 0;
+    is_bin_exp = FALSE;
+    if (((radix == 10 && (*p == 'e' || *p == 'E')) ||
+         (radix != 10 && (*p == '@' ||
+                          (radix_bits && (*p == 'p' || *p == 'P'))))) &&
+        p > p_start) {
+        is_bin_exp = (*p == 'p' || *p == 'P');
+        p++;
+        exp_is_neg = 0;
+        if (*p == '+') {
+            p++;
+        } else if (*p == '-') {
+            exp_is_neg = 1;
+            p++;
+        }
+        for(;;) {
+            int c;
+            c = to_digit(*p);
+            if (c >= 10)
+                break;
+            if (unlikely(expn > ((BF_RAW_EXP_MAX - 2 - 9) / 10))) {
+                /* exponent overflow */
+                if (exp_is_neg) {
+                    bf_set_zero(r, is_neg);
+                    ret = BF_ST_UNDERFLOW | BF_ST_INEXACT;
+                } else {
+                    bf_set_inf(r, is_neg);
+                    ret = BF_ST_OVERFLOW | BF_ST_INEXACT;
+                }
+                goto done;
+            }
+            p++;
+            expn = expn * 10 + c;
+        }
+        if (exp_is_neg)
+            expn = -expn;
+    }
+    if (is_dec) {
+        a->expn = expn + int_len;
+        a->sign = is_neg;
+        ret = bfdec_normalize_and_round((bfdec_t *)a, prec, flags);
+    } else if (radix_bits) {
+        /* XXX: may overflow */
+        if (!is_bin_exp)
+            expn *= radix_bits;
+        a->expn = expn + (int_len * radix_bits);
+        a->sign = is_neg;
+        ret = bf_normalize_and_round(a, prec, flags);
+    } else {
+        limb_t l;
+        pos++;
+        l = a->len - pos; /* number of limbs */
+        if (l == 0) {
+            bf_set_zero(r, is_neg);
+            ret = 0;
+        } else {
+            bf_t T_s, *T = &T_s;
+
+            expn -= l * digits_per_limb - int_len;
+            bf_init(r->ctx, T);
+            if (bf_integer_from_radix(T, a->tab + pos, l, radix)) {
+                bf_set_nan(r);
+                ret = BF_ST_MEM_ERROR;
+            } else {
+                T->sign = is_neg;
+                if (flags & BF_ATOF_EXPONENT) {
+                    /* return the exponent */
+                    *pexponent = expn;
+                    ret = bf_set(r, T);
+                } else {
+                    ret = bf_mul_pow_radix(r, T, radix, expn, prec, flags);
+                }
+            }
+            bf_delete(T);
+        }
+        bf_delete(a);
+    }
+ done:
+    if (pnext)
+        *pnext = p;
+    return ret;
+}
+
+/*
+   Return (status, n, exp). 'status' is the floating point status. 'n'
+   is the parsed number.
+
+   If (flags & BF_ATOF_EXPONENT) and if the radix is not a power of
+   two, the parsed number is equal to r *
+   (*pexponent)^radix. Otherwise *pexponent = 0.
+*/
+int bf_atof2(bf_t *r, slimb_t *pexponent,
+             const char *str, const char **pnext, int radix,
+             limb_t prec, bf_flags_t flags)
+{
+    return bf_atof_internal(r, pexponent, str, pnext, radix, prec, flags,
+                            FALSE);
+}
+
+int bf_atof(bf_t *r, const char *str, const char **pnext, int radix,
+            limb_t prec, bf_flags_t flags)
+{
+    slimb_t dummy_exp;
+    return bf_atof_internal(r, &dummy_exp, str, pnext, radix, prec, flags, FALSE);
+}
+
+/* base conversion to radix */
+
+#if LIMB_BITS == 64
+#define RADIXL_10 UINT64_C(10000000000000000000)
+#else
+#define RADIXL_10 UINT64_C(1000000000)
+#endif
+
+static const uint32_t inv_log2_radix[BF_RADIX_MAX - 1][LIMB_BITS / 32 + 1] = {
+#if LIMB_BITS == 32
+{ 0x80000000, 0x00000000,},
+{ 0x50c24e60, 0xd4d4f4a7,},
+{ 0x40000000, 0x00000000,},
+{ 0x372068d2, 0x0a1ee5ca,},
+{ 0x3184648d, 0xb8153e7a,},
+{ 0x2d983275, 0x9d5369c4,},
+{ 0x2aaaaaaa, 0xaaaaaaab,},
+{ 0x28612730, 0x6a6a7a54,},
+{ 0x268826a1, 0x3ef3fde6,},
+{ 0x25001383, 0xbac8a744,},
+{ 0x23b46706, 0x82c0c709,},
+{ 0x229729f1, 0xb2c83ded,},
+{ 0x219e7ffd, 0xa5ad572b,},
+{ 0x20c33b88, 0xda7c29ab,},
+{ 0x20000000, 0x00000000,},
+{ 0x1f50b57e, 0xac5884b3,},
+{ 0x1eb22cc6, 0x8aa6e26f,},
+{ 0x1e21e118, 0x0c5daab2,},
+{ 0x1d9dcd21, 0x439834e4,},
+{ 0x1d244c78, 0x367a0d65,},
+{ 0x1cb40589, 0xac173e0c,},
+{ 0x1c4bd95b, 0xa8d72b0d,},
+{ 0x1bead768, 0x98f8ce4c,},
+{ 0x1b903469, 0x050f72e5,},
+{ 0x1b3b433f, 0x2eb06f15,},
+{ 0x1aeb6f75, 0x9c46fc38,},
+{ 0x1aa038eb, 0x0e3bfd17,},
+{ 0x1a593062, 0xb38d8c56,},
+{ 0x1a15f4c3, 0x2b95a2e6,},
+{ 0x19d630dc, 0xcc7ddef9,},
+{ 0x19999999, 0x9999999a,},
+{ 0x195fec80, 0x8a609431,},
+{ 0x1928ee7b, 0x0b4f22f9,},
+{ 0x18f46acf, 0x8c06e318,},
+{ 0x18c23246, 0xdc0a9f3d,},
+#else
+{ 0x80000000, 0x00000000, 0x00000000,},
+{ 0x50c24e60, 0xd4d4f4a7, 0x021f57bc,},
+{ 0x40000000, 0x00000000, 0x00000000,},
+{ 0x372068d2, 0x0a1ee5ca, 0x19ea911b,},
+{ 0x3184648d, 0xb8153e7a, 0x7fc2d2e1,},
+{ 0x2d983275, 0x9d5369c4, 0x4dec1661,},
+{ 0x2aaaaaaa, 0xaaaaaaaa, 0xaaaaaaab,},
+{ 0x28612730, 0x6a6a7a53, 0x810fabde,},
+{ 0x268826a1, 0x3ef3fde6, 0x23e2566b,},
+{ 0x25001383, 0xbac8a744, 0x385a3349,},
+{ 0x23b46706, 0x82c0c709, 0x3f891718,},
+{ 0x229729f1, 0xb2c83ded, 0x15fba800,},
+{ 0x219e7ffd, 0xa5ad572a, 0xe169744b,},
+{ 0x20c33b88, 0xda7c29aa, 0x9bddee52,},
+{ 0x20000000, 0x00000000, 0x00000000,},
+{ 0x1f50b57e, 0xac5884b3, 0x70e28eee,},
+{ 0x1eb22cc6, 0x8aa6e26f, 0x06d1a2a2,},
+{ 0x1e21e118, 0x0c5daab1, 0x81b4f4bf,},
+{ 0x1d9dcd21, 0x439834e3, 0x81667575,},
+{ 0x1d244c78, 0x367a0d64, 0xc8204d6d,},
+{ 0x1cb40589, 0xac173e0c, 0x3b7b16ba,},
+{ 0x1c4bd95b, 0xa8d72b0d, 0x5879f25a,},
+{ 0x1bead768, 0x98f8ce4c, 0x66cc2858,},
+{ 0x1b903469, 0x050f72e5, 0x0cf5488e,},
+{ 0x1b3b433f, 0x2eb06f14, 0x8c89719c,},
+{ 0x1aeb6f75, 0x9c46fc37, 0xab5fc7e9,},
+{ 0x1aa038eb, 0x0e3bfd17, 0x1bd62080,},
+{ 0x1a593062, 0xb38d8c56, 0x7998ab45,},
+{ 0x1a15f4c3, 0x2b95a2e6, 0x46aed6a0,},
+{ 0x19d630dc, 0xcc7ddef9, 0x5aadd61b,},
+{ 0x19999999, 0x99999999, 0x9999999a,},
+{ 0x195fec80, 0x8a609430, 0xe1106014,},
+{ 0x1928ee7b, 0x0b4f22f9, 0x5f69791d,},
+{ 0x18f46acf, 0x8c06e318, 0x4d2aeb2c,},
+{ 0x18c23246, 0xdc0a9f3d, 0x3fe16970,},
+#endif
+};
+
+static const limb_t log2_radix[BF_RADIX_MAX - 1] = {
+#if LIMB_BITS == 32
+0x20000000,
+0x32b80347,
+0x40000000,
+0x4a4d3c26,
+0x52b80347,
+0x59d5d9fd,
+0x60000000,
+0x6570068e,
+0x6a4d3c26,
+0x6eb3a9f0,
+0x72b80347,
+0x766a008e,
+0x79d5d9fd,
+0x7d053f6d,
+0x80000000,
+0x82cc7edf,
+0x8570068e,
+0x87ef05ae,
+0x8a4d3c26,
+0x8c8ddd45,
+0x8eb3a9f0,
+0x90c10501,
+0x92b80347,
+0x949a784c,
+0x966a008e,
+0x982809d6,
+0x99d5d9fd,
+0x9b74948f,
+0x9d053f6d,
+0x9e88c6b3,
+0xa0000000,
+0xa16bad37,
+0xa2cc7edf,
+0xa4231623,
+0xa570068e,
+#else
+0x2000000000000000,
+0x32b803473f7ad0f4,
+0x4000000000000000,
+0x4a4d3c25e68dc57f,
+0x52b803473f7ad0f4,
+0x59d5d9fd5010b366,
+0x6000000000000000,
+0x6570068e7ef5a1e8,
+0x6a4d3c25e68dc57f,
+0x6eb3a9f01975077f,
+0x72b803473f7ad0f4,
+0x766a008e4788cbcd,
+0x79d5d9fd5010b366,
+0x7d053f6d26089673,
+0x8000000000000000,
+0x82cc7edf592262d0,
+0x8570068e7ef5a1e8,
+0x87ef05ae409a0289,
+0x8a4d3c25e68dc57f,
+0x8c8ddd448f8b845a,
+0x8eb3a9f01975077f,
+0x90c10500d63aa659,
+0x92b803473f7ad0f4,
+0x949a784bcd1b8afe,
+0x966a008e4788cbcd,
+0x982809d5be7072dc,
+0x99d5d9fd5010b366,
+0x9b74948f5532da4b,
+0x9d053f6d26089673,
+0x9e88c6b3626a72aa,
+0xa000000000000000,
+0xa16bad3758efd873,
+0xa2cc7edf592262d0,
+0xa4231623369e78e6,
+0xa570068e7ef5a1e8,
+#endif
+};
+
+/* compute floor(a*b) or ceil(a*b) with b = log2(radix) or
+   b=1/log2(radix). For is_inv = 0, strict accuracy is not guaranteed
+   when radix is not a power of two. */
+slimb_t bf_mul_log2_radix(slimb_t a1, unsigned int radix, int is_inv,
+                          int is_ceil1)
+{
+    int is_neg;
+    limb_t a;
+    BOOL is_ceil;
+
+    is_ceil = is_ceil1;
+    a = a1;
+    if (a1 < 0) {
+        a = -a;
+        is_neg = 1;
+    } else {
+        is_neg = 0;
+    }
+    is_ceil ^= is_neg;
+    if ((radix & (radix - 1)) == 0) {
+        int radix_bits;
+        /* radix is a power of two */
+        radix_bits = ceil_log2(radix);
+        if (is_inv) {
+            if (is_ceil)
+                a += radix_bits - 1;
+            a = a / radix_bits;
+        } else {
+            a = a * radix_bits;
+        }
+    } else {
+        const uint32_t *tab;
+        limb_t b0, b1;
+        dlimb_t t;
+
+        if (is_inv) {
+            tab = inv_log2_radix[radix - 2];
+#if LIMB_BITS == 32
+            b1 = tab[0];
+            b0 = tab[1];
+#else
+            b1 = ((limb_t)tab[0] << 32) | tab[1];
+            b0 = (limb_t)tab[2] << 32;
+#endif
+            t = (dlimb_t)b0 * (dlimb_t)a;
+            t = (dlimb_t)b1 * (dlimb_t)a + (t >> LIMB_BITS);
+            a = t >> (LIMB_BITS - 1);
+        } else {
+            b0 = log2_radix[radix - 2];
+            t = (dlimb_t)b0 * (dlimb_t)a;
+            a = t >> (LIMB_BITS - 3);
+        }
+        /* a = floor(result) and 'result' cannot be an integer */
+        a += is_ceil;
+    }
+    if (is_neg)
+        a = -a;
+    return a;
+}
+
+/* 'n' is the number of output limbs */
+static int bf_integer_to_radix_rec(bf_t *pow_tab,
+                                   limb_t *out, const bf_t *a, limb_t n,
+                                   int level, limb_t n0, limb_t radixl,
+                                   unsigned int radixl_bits)
+{
+    limb_t n1, n2, q_prec;
+    int ret;
+
+    assert(n >= 1);
+    if (n == 1) {
+        out[0] = get_bits(a->tab, a->len, a->len * LIMB_BITS - a->expn);
+    } else if (n == 2) {
+        dlimb_t t;
+        slimb_t pos;
+        pos = a->len * LIMB_BITS - a->expn;
+        t = ((dlimb_t)get_bits(a->tab, a->len, pos + LIMB_BITS) << LIMB_BITS) |
+            get_bits(a->tab, a->len, pos);
+        if (likely(radixl == RADIXL_10)) {
+            /* use division by a constant when possible */
+            out[0] = t % RADIXL_10;
+            out[1] = t / RADIXL_10;
+        } else {
+            out[0] = t % radixl;
+            out[1] = t / radixl;
+        }
+    } else {
+        bf_t Q, R, *B, *B_inv;
+        int q_add;
+        bf_init(a->ctx, &Q);
+        bf_init(a->ctx, &R);
+        n2 = (((n0 * 2) >> (level + 1)) + 1) / 2;
+        n1 = n - n2;
+        B = &pow_tab[2 * level];
+        B_inv = &pow_tab[2 * level + 1];
+        ret = 0;
+        if (B->len == 0) {
+            /* compute BASE^n2 */
+            ret |= bf_pow_ui_ui(B, radixl, n2, BF_PREC_INF, BF_RNDZ);
+            /* we use enough bits for the maximum possible 'n1' value,
+               i.e. n2 + 1 */
+            ret |= bf_set_ui(&R, 1);
+            ret |= bf_div(B_inv, &R, B, (n2 + 1) * radixl_bits + 2, BF_RNDN);
+        }
+        //        printf("%d: n1=% " PRId64 " n2=%" PRId64 "\n", level, n1, n2);
+        q_prec = n1 * radixl_bits;
+        ret |= bf_mul(&Q, a, B_inv, q_prec, BF_RNDN);
+        ret |= bf_rint(&Q, BF_RNDZ);
+
+        ret |= bf_mul(&R, &Q, B, BF_PREC_INF, BF_RNDZ);
+        ret |= bf_sub(&R, a, &R, BF_PREC_INF, BF_RNDZ);
+
+        if (ret & BF_ST_MEM_ERROR)
+            goto fail;
+        /* adjust if necessary */
+        q_add = 0;
+        while (R.sign && R.len != 0) {
+            if (bf_add(&R, &R, B, BF_PREC_INF, BF_RNDZ))
+                goto fail;
+            q_add--;
+        }
+        while (bf_cmpu(&R, B) >= 0) {
+            if (bf_sub(&R, &R, B, BF_PREC_INF, BF_RNDZ))
+                goto fail;
+            q_add++;
+        }
+        if (q_add != 0) {
+            if (bf_add_si(&Q, &Q, q_add, BF_PREC_INF, BF_RNDZ))
+                goto fail;
+        }
+        if (bf_integer_to_radix_rec(pow_tab, out + n2, &Q, n1, level + 1, n0,
+                                    radixl, radixl_bits))
+            goto fail;
+        if (bf_integer_to_radix_rec(pow_tab, out, &R, n2, level + 1, n0,
+                                    radixl, radixl_bits)) {
+        fail:
+            bf_delete(&Q);
+            bf_delete(&R);
+            return -1;
+        }
+        bf_delete(&Q);
+        bf_delete(&R);
+    }
+    return 0;
+}
+
+/* return 0 if OK != 0 if memory error */
+static int bf_integer_to_radix(bf_t *r, const bf_t *a, limb_t radixl)
+{
+    bf_context_t *s = r->ctx;
+    limb_t r_len;
+    bf_t *pow_tab;
+    int i, pow_tab_len, ret;
+
+    r_len = r->len;
+    pow_tab_len = (ceil_log2(r_len) + 2) * 2; /* XXX: check */
+    pow_tab = bf_malloc(s, sizeof(pow_tab[0]) * pow_tab_len);
+    if (!pow_tab)
+        return -1;
+    for(i = 0; i < pow_tab_len; i++)
+        bf_init(r->ctx, &pow_tab[i]);
+
+    ret = bf_integer_to_radix_rec(pow_tab, r->tab, a, r_len, 0, r_len, radixl,
+                                  ceil_log2(radixl));
+
+    for(i = 0; i < pow_tab_len; i++) {
+        bf_delete(&pow_tab[i]);
+    }
+    bf_free(s, pow_tab);
+    return ret;
+}
+
+/* a must be >= 0. 'P' is the wanted number of digits in radix
+   'radix'. 'r' is the mantissa represented as an integer. *pE
+   contains the exponent. Return != 0 if memory error. */
+static int bf_convert_to_radix(bf_t *r, slimb_t *pE,
+                               const bf_t *a, int radix,
+                               limb_t P, bf_rnd_t rnd_mode,
+                               BOOL is_fixed_exponent)
+{
+    slimb_t E, e, prec, extra_bits, ziv_extra_bits, prec0;
+    bf_t B_s, *B = &B_s;
+    int e_sign, ret, res;
+
+    if (a->len == 0) {
+        /* zero case */
+        *pE = 0;
+        return bf_set(r, a);
+    }
+
+    if (is_fixed_exponent) {
+        E = *pE;
+    } else {
+        /* compute the new exponent */
+        E = 1 + bf_mul_log2_radix(a->expn - 1, radix, TRUE, FALSE);
+    }
+    //    bf_print_str("a", a);
+    //    printf("E=%ld P=%ld radix=%d\n", E, P, radix);
+
+    for(;;) {
+        e = P - E;
+        e_sign = 0;
+        if (e < 0) {
+            e = -e;
+            e_sign = 1;
+        }
+        /* Note: precision for log2(radix) is not critical here */
+        prec0 = bf_mul_log2_radix(P, radix, FALSE, TRUE);
+        ziv_extra_bits = 16;
+        for(;;) {
+            prec = prec0 + ziv_extra_bits;
+            /* XXX: rigorous error analysis needed */
+            extra_bits = ceil_log2(e) * 2 + 1;
+            ret = bf_pow_ui_ui(r, radix, e, prec + extra_bits,
+                               BF_RNDN | BF_FLAG_EXT_EXP);
+            if (!e_sign)
+                ret |= bf_mul(r, r, a, prec + extra_bits,
+                              BF_RNDN | BF_FLAG_EXT_EXP);
+            else
+                ret |= bf_div(r, a, r, prec + extra_bits,
+                              BF_RNDN | BF_FLAG_EXT_EXP);
+            if (ret & BF_ST_MEM_ERROR)
+                return BF_ST_MEM_ERROR;
+            /* if the result is not exact, check that it can be safely
+               rounded to an integer */
+            if ((ret & BF_ST_INEXACT) &&
+                !bf_can_round(r, r->expn, rnd_mode, prec)) {
+                /* and more precision and retry */
+                ziv_extra_bits = ziv_extra_bits  + (ziv_extra_bits / 2);
+                continue;
+            } else {
+                ret = bf_rint(r, rnd_mode);
+                if (ret & BF_ST_MEM_ERROR)
+                    return BF_ST_MEM_ERROR;
+                break;
+            }
+        }
+        if (is_fixed_exponent)
+            break;
+        /* check that the result is < B^P */
+        /* XXX: do a fast approximate test first ? */
+        bf_init(r->ctx, B);
+        ret = bf_pow_ui_ui(B, radix, P, BF_PREC_INF, BF_RNDZ);
+        if (ret) {
+            bf_delete(B);
+            return ret;
+        }
+        res = bf_cmpu(r, B);
+        bf_delete(B);
+        if (res < 0)
+            break;
+        /* try a larger exponent */
+        E++;
+    }
+    *pE = E;
+    return 0;
+}
+
+static void limb_to_a(char *buf, limb_t n, unsigned int radix, int len)
+{
+    int digit, i;
+
+    if (radix == 10) {
+        /* specific case with constant divisor */
+        for(i = len - 1; i >= 0; i--) {
+            digit = (limb_t)n % 10;
+            n = (limb_t)n / 10;
+            buf[i] = digit + '0';
+        }
+    } else {
+        for(i = len - 1; i >= 0; i--) {
+            digit = (limb_t)n % radix;
+            n = (limb_t)n / radix;
+            if (digit < 10)
+                digit += '0';
+            else
+                digit += 'a' - 10;
+            buf[i] = digit;
+        }
+    }
+}
+
+/* for power of 2 radixes */
+static void limb_to_a2(char *buf, limb_t n, unsigned int radix_bits, int len)
+{
+    int digit, i;
+    unsigned int mask;
+
+    mask = (1 << radix_bits) - 1;
+    for(i = len - 1; i >= 0; i--) {
+        digit = n & mask;
+        n >>= radix_bits;
+        if (digit < 10)
+            digit += '0';
+        else
+            digit += 'a' - 10;
+        buf[i] = digit;
+    }
+}
+
+/* 'a' must be an integer if the is_dec = FALSE or if the radix is not
+   a power of two. A dot is added before the 'dot_pos' digit. dot_pos
+   = n_digits does not display the dot. 0 <= dot_pos <=
+   n_digits. n_digits >= 1. */
+static void output_digits(DynBuf *s, const bf_t *a1, int radix, limb_t n_digits,
+                          limb_t dot_pos, BOOL is_dec)
+{
+    limb_t i, v, l;
+    slimb_t pos, pos_incr;
+    int digits_per_limb, buf_pos, radix_bits, first_buf_pos;
+    char buf[65];
+    bf_t a_s, *a;
+
+    if (is_dec) {
+        digits_per_limb = LIMB_DIGITS;
+        a = (bf_t *)a1;
+        radix_bits = 0;
+        pos = a->len;
+        pos_incr = 1;
+        first_buf_pos = 0;
+    } else if ((radix & (radix - 1)) == 0) {
+        a = (bf_t *)a1;
+        radix_bits = ceil_log2(radix);
+        digits_per_limb = LIMB_BITS / radix_bits;
+        pos_incr = digits_per_limb * radix_bits;
+        /* digits are aligned relative to the radix point */
+        pos = a->len * LIMB_BITS + smod(-a->expn, radix_bits);
+        first_buf_pos = 0;
+    } else {
+        limb_t n, radixl;
+
+        digits_per_limb = digits_per_limb_table[radix - 2];
+        radixl = get_limb_radix(radix);
+        a = &a_s;
+        bf_init(a1->ctx, a);
+        n = (n_digits + digits_per_limb - 1) / digits_per_limb;
+        if (bf_resize(a, n)) {
+            dbuf_set_error(s);
+            goto done;
+        }
+        if (bf_integer_to_radix(a, a1, radixl)) {
+            dbuf_set_error(s);
+            goto done;
+        }
+        radix_bits = 0;
+        pos = n;
+        pos_incr = 1;
+        first_buf_pos = pos * digits_per_limb - n_digits;
+    }
+    buf_pos = digits_per_limb;
+    i = 0;
+    while (i < n_digits) {
+        if (buf_pos == digits_per_limb) {
+            pos -= pos_incr;
+            if (radix_bits == 0) {
+                v = get_limbz(a, pos);
+                limb_to_a(buf, v, radix, digits_per_limb);
+            } else {
+                v = get_bits(a->tab, a->len, pos);
+                limb_to_a2(buf, v, radix_bits, digits_per_limb);
+            }
+            buf_pos = first_buf_pos;
+            first_buf_pos = 0;
+        }
+        if (i < dot_pos) {
+            l = dot_pos;
+        } else {
+            if (i == dot_pos)
+                dbuf_putc(s, '.');
+            l = n_digits;
+        }
+        l = bf_min(digits_per_limb - buf_pos, l - i);
+        dbuf_put(s, (uint8_t *)(buf + buf_pos), l);
+        buf_pos += l;
+        i += l;
+    }
+ done:
+    if (a != a1)
+        bf_delete(a);
+}
+
+static void *bf_dbuf_realloc(void *opaque, void *ptr, size_t size)
+{
+    bf_context_t *s = opaque;
+    return bf_realloc(s, ptr, size);
+}
+
+/* return the length in bytes. A trailing '\0' is added */
+static char *bf_ftoa_internal(size_t *plen, const bf_t *a2, int radix,
+                              limb_t prec, bf_flags_t flags, BOOL is_dec)
+{
+    bf_context_t *ctx = a2->ctx;
+    DynBuf s_s, *s = &s_s;
+    int radix_bits;
+
+    //    bf_print_str("ftoa", a2);
+    //    printf("radix=%d\n", radix);
+    dbuf_init2(s, ctx, bf_dbuf_realloc);
+    if (a2->expn == BF_EXP_NAN) {
+        dbuf_putstr(s, "NaN");
+    } else {
+        if (a2->sign)
+            dbuf_putc(s, '-');
+        if (a2->expn == BF_EXP_INF) {
+            if (flags & BF_FTOA_JS_QUIRKS)
+                dbuf_putstr(s, "Infinity");
+            else
+                dbuf_putstr(s, "Inf");
+        } else {
+            int fmt, ret;
+            slimb_t n_digits, n, i, n_max, n1;
+            bf_t a1_s, *a1 = &a1_s;
+
+            if ((radix & (radix - 1)) != 0)
+                radix_bits = 0;
+            else
+                radix_bits = ceil_log2(radix);
+
+            fmt = flags & BF_FTOA_FORMAT_MASK;
+            bf_init(ctx, a1);
+            if (fmt == BF_FTOA_FORMAT_FRAC) {
+                if (is_dec || radix_bits != 0) {
+                    if (bf_set(a1, a2))
+                        goto fail1;
+#ifdef USE_BF_DEC
+                    if (is_dec) {
+                        if (bfdec_round((bfdec_t *)a1, prec, (flags & BF_RND_MASK) | BF_FLAG_RADPNT_PREC) & BF_ST_MEM_ERROR)
+                            goto fail1;
+                        n = a1->expn;
+                    } else
+#endif
+                    {
+                        if (bf_round(a1, prec * radix_bits, (flags & BF_RND_MASK) | BF_FLAG_RADPNT_PREC) & BF_ST_MEM_ERROR)
+                            goto fail1;
+                        n = ceil_div(a1->expn, radix_bits);
+                    }
+                    if (flags & BF_FTOA_ADD_PREFIX) {
+                        if (radix == 16)
+                            dbuf_putstr(s, "0x");
+                        else if (radix == 8)
+                            dbuf_putstr(s, "0o");
+                        else if (radix == 2)
+                            dbuf_putstr(s, "0b");
+                    }
+                    if (a1->expn == BF_EXP_ZERO) {
+                        dbuf_putstr(s, "0");
+                        if (prec > 0) {
+                            dbuf_putstr(s, ".");
+                            for(i = 0; i < prec; i++) {
+                                dbuf_putc(s, '0');
+                            }
+                        }
+                    } else {
+                        n_digits = prec + n;
+                        if (n <= 0) {
+                            /* 0.x */
+                            dbuf_putstr(s, "0.");
+                            for(i = 0; i < -n; i++) {
+                                dbuf_putc(s, '0');
+                            }
+                            if (n_digits > 0) {
+                                output_digits(s, a1, radix, n_digits, n_digits, is_dec);
+                            }
+                        } else {
+                            output_digits(s, a1, radix, n_digits, n, is_dec);
+                        }
+                    }
+                } else {
+                    size_t pos, start;
+                    bf_t a_s, *a = &a_s;
+
+                    /* make a positive number */
+                    a->tab = a2->tab;
+                    a->len = a2->len;
+                    a->expn = a2->expn;
+                    a->sign = 0;
+
+                    /* one more digit for the rounding */
+                    n = 1 + bf_mul_log2_radix(bf_max(a->expn, 0), radix, TRUE, TRUE);
+                    n_digits = n + prec;
+                    n1 = n;
+                    if (bf_convert_to_radix(a1, &n1, a, radix, n_digits,
+                                            flags & BF_RND_MASK, TRUE))
+                        goto fail1;
+                    start = s->size;
+                    output_digits(s, a1, radix, n_digits, n, is_dec);
+                    /* remove leading zeros because we allocated one more digit */
+                    pos = start;
+                    while ((pos + 1) < s->size && s->buf[pos] == '0' &&
+                           s->buf[pos + 1] != '.')
+                        pos++;
+                    if (pos > start) {
+                        memmove(s->buf + start, s->buf + pos, s->size - pos);
+                        s->size -= (pos - start);
+                    }
+                }
+            } else {
+#ifdef USE_BF_DEC
+                if (is_dec) {
+                    if (bf_set(a1, a2))
+                        goto fail1;
+                    if (fmt == BF_FTOA_FORMAT_FIXED) {
+                        n_digits = prec;
+                        n_max = n_digits;
+                        if (bfdec_round((bfdec_t *)a1, prec, (flags & BF_RND_MASK)) & BF_ST_MEM_ERROR)
+                            goto fail1;
+                    } else {
+                        /* prec is ignored */
+                        prec = n_digits = a1->len * LIMB_DIGITS;
+                        /* remove the trailing zero digits */
+                        while (n_digits > 1 &&
+                               get_digit(a1->tab, a1->len, prec - n_digits) == 0) {
+                            n_digits--;
+                        }
+                        n_max = n_digits + 4;
+                    }
+                    n = a1->expn;
+                } else
+#endif
+                if (radix_bits != 0) {
+                    if (bf_set(a1, a2))
+                        goto fail1;
+                    if (fmt == BF_FTOA_FORMAT_FIXED) {
+                        slimb_t prec_bits;
+                        n_digits = prec;
+                        n_max = n_digits;
+                        /* align to the radix point */
+                        prec_bits = prec * radix_bits -
+                            smod(-a1->expn, radix_bits);
+                        if (bf_round(a1, prec_bits,
+                                     (flags & BF_RND_MASK)) & BF_ST_MEM_ERROR)
+                            goto fail1;
+                    } else {
+                        limb_t digit_mask;
+                        slimb_t pos;
+                        /* position of the digit before the most
+                           significant digit in bits */
+                        pos = a1->len * LIMB_BITS +
+                            smod(-a1->expn, radix_bits);
+                        n_digits = ceil_div(pos, radix_bits);
+                        /* remove the trailing zero digits */
+                        digit_mask = ((limb_t)1 << radix_bits) - 1;
+                        while (n_digits > 1 &&
+                               (get_bits(a1->tab, a1->len, pos - n_digits * radix_bits) & digit_mask) == 0) {
+                            n_digits--;
+                        }
+                        n_max = n_digits + 4;
+                    }
+                    n = ceil_div(a1->expn, radix_bits);
+                } else {
+                    bf_t a_s, *a = &a_s;
+
+                    /* make a positive number */
+                    a->tab = a2->tab;
+                    a->len = a2->len;
+                    a->expn = a2->expn;
+                    a->sign = 0;
+
+                    if (fmt == BF_FTOA_FORMAT_FIXED) {
+                        n_digits = prec;
+                        n_max = n_digits;
+                    } else {
+                        slimb_t n_digits_max, n_digits_min;
+
+                        assert(prec != BF_PREC_INF);
+                        n_digits = 1 + bf_mul_log2_radix(prec, radix, TRUE, TRUE);
+                        /* max number of digits for non exponential
+                           notation. The rational is to have the same rule
+                           as JS i.e. n_max = 21 for 64 bit float in base 10. */
+                        n_max = n_digits + 4;
+                        if (fmt == BF_FTOA_FORMAT_FREE_MIN) {
+                            bf_t b_s, *b = &b_s;
+
+                            /* find the minimum number of digits by
+                               dichotomy. */
+                            /* XXX: inefficient */
+                            n_digits_max = n_digits;
+                            n_digits_min = 1;
+                            bf_init(ctx, b);
+                            while (n_digits_min < n_digits_max) {
+                                n_digits = (n_digits_min + n_digits_max) / 2;
+                                if (bf_convert_to_radix(a1, &n, a, radix, n_digits,
+                                                        flags & BF_RND_MASK, FALSE)) {
+                                    bf_delete(b);
+                                    goto fail1;
+                                }
+                                /* convert back to a number and compare */
+                                ret = bf_mul_pow_radix(b, a1, radix, n - n_digits,
+                                                       prec,
+                                                       (flags & ~BF_RND_MASK) |
+                                                       BF_RNDN);
+                                if (ret & BF_ST_MEM_ERROR) {
+                                    bf_delete(b);
+                                    goto fail1;
+                                }
+                                if (bf_cmpu(b, a) == 0) {
+                                    n_digits_max = n_digits;
+                                } else {
+                                    n_digits_min = n_digits + 1;
+                                }
+                            }
+                            bf_delete(b);
+                            n_digits = n_digits_max;
+                        }
+                    }
+                    if (bf_convert_to_radix(a1, &n, a, radix, n_digits,
+                                            flags & BF_RND_MASK, FALSE)) {
+                    fail1:
+                        bf_delete(a1);
+                        goto fail;
+                    }
+                }
+                if (a1->expn == BF_EXP_ZERO &&
+                    fmt != BF_FTOA_FORMAT_FIXED &&
+                    !(flags & BF_FTOA_FORCE_EXP)) {
+                    /* just output zero */
+                    dbuf_putstr(s, "0");
+                } else {
+                    if (flags & BF_FTOA_ADD_PREFIX) {
+                        if (radix == 16)
+                            dbuf_putstr(s, "0x");
+                        else if (radix == 8)
+                            dbuf_putstr(s, "0o");
+                        else if (radix == 2)
+                            dbuf_putstr(s, "0b");
+                    }
+                    if (a1->expn == BF_EXP_ZERO)
+                        n = 1;
+                    if ((flags & BF_FTOA_FORCE_EXP) ||
+                        n <= -6 || n > n_max) {
+                        const char *fmt;
+                        /* exponential notation */
+                        output_digits(s, a1, radix, n_digits, 1, is_dec);
+                        if (radix_bits != 0 && radix <= 16) {
+                            if (flags & BF_FTOA_JS_QUIRKS)
+                                fmt = "p%+" PRId_LIMB;
+                            else
+                                fmt = "p%" PRId_LIMB;
+                            dbuf_printf(s, fmt, (n - 1) * radix_bits);
+                        } else {
+                            if (flags & BF_FTOA_JS_QUIRKS)
+                                fmt = "%c%+" PRId_LIMB;
+                            else
+                                fmt = "%c%" PRId_LIMB;
+                            dbuf_printf(s, fmt,
+                                        radix <= 10 ? 'e' : '@', n - 1);
+                        }
+                    } else if (n <= 0) {
+                        /* 0.x */
+                        dbuf_putstr(s, "0.");
+                        for(i = 0; i < -n; i++) {
+                            dbuf_putc(s, '0');
+                        }
+                        output_digits(s, a1, radix, n_digits, n_digits, is_dec);
+                    } else {
+                        if (n_digits <= n) {
+                            /* no dot */
+                            output_digits(s, a1, radix, n_digits, n_digits, is_dec);
+                            for(i = 0; i < (n - n_digits); i++)
+                                dbuf_putc(s, '0');
+                        } else {
+                            output_digits(s, a1, radix, n_digits, n, is_dec);
+                        }
+                    }
+                }
+            }
+            bf_delete(a1);
+        }
+    }
+    dbuf_putc(s, '\0');
+    if (dbuf_error(s))
+        goto fail;
+    if (plen)
+        *plen = s->size - 1;
+    return (char *)s->buf;
+ fail:
+    bf_free(ctx, s->buf);
+    if (plen)
+        *plen = 0;
+    return NULL;
+}
+
+char *bf_ftoa(size_t *plen, const bf_t *a, int radix, limb_t prec,
+              bf_flags_t flags)
+{
+    return bf_ftoa_internal(plen, a, radix, prec, flags, FALSE);
+}
+
+/***************************************************************/
+/* transcendental functions */
+
+/* Note: the algorithm is from MPFR */
+static void bf_const_log2_rec(bf_t *T, bf_t *P, bf_t *Q, limb_t n1,
+                              limb_t n2, BOOL need_P)
+{
+    bf_context_t *s = T->ctx;
+    if ((n2 - n1) == 1) {
+        if (n1 == 0) {
+            bf_set_ui(P, 3);
+        } else {
+            bf_set_ui(P, n1);
+            P->sign = 1;
+        }
+        bf_set_ui(Q, 2 * n1 + 1);
+        Q->expn += 2;
+        bf_set(T, P);
+    } else {
+        limb_t m;
+        bf_t T1_s, *T1 = &T1_s;
+        bf_t P1_s, *P1 = &P1_s;
+        bf_t Q1_s, *Q1 = &Q1_s;
+
+        m = n1 + ((n2 - n1) >> 1);
+        bf_const_log2_rec(T, P, Q, n1, m, TRUE);
+        bf_init(s, T1);
+        bf_init(s, P1);
+        bf_init(s, Q1);
+        bf_const_log2_rec(T1, P1, Q1, m, n2, need_P);
+        bf_mul(T, T, Q1, BF_PREC_INF, BF_RNDZ);
+        bf_mul(T1, T1, P, BF_PREC_INF, BF_RNDZ);
+        bf_add(T, T, T1, BF_PREC_INF, BF_RNDZ);
+        if (need_P)
+            bf_mul(P, P, P1, BF_PREC_INF, BF_RNDZ);
+        bf_mul(Q, Q, Q1, BF_PREC_INF, BF_RNDZ);
+        bf_delete(T1);
+        bf_delete(P1);
+        bf_delete(Q1);
+    }
+}
+
+/* compute log(2) with faithful rounding at precision 'prec' */
+static void bf_const_log2_internal(bf_t *T, limb_t prec)
+{
+    limb_t w, N;
+    bf_t P_s, *P = &P_s;
+    bf_t Q_s, *Q = &Q_s;
+
+    w = prec + 15;
+    N = w / 3 + 1;
+    bf_init(T->ctx, P);
+    bf_init(T->ctx, Q);
+    bf_const_log2_rec(T, P, Q, 0, N, FALSE);
+    bf_div(T, T, Q, prec, BF_RNDN);
+    bf_delete(P);
+    bf_delete(Q);
+}
+
+/* PI constant */
+
+#define CHUD_A 13591409
+#define CHUD_B 545140134
+#define CHUD_C 640320
+#define CHUD_BITS_PER_TERM 47
+
+static void chud_bs(bf_t *P, bf_t *Q, bf_t *G, int64_t a, int64_t b, int need_g,
+                    limb_t prec)
+{
+    bf_context_t *s = P->ctx;
+    int64_t c;
+
+    if (a == (b - 1)) {
+        bf_t T0, T1;
+
+        bf_init(s, &T0);
+        bf_init(s, &T1);
+        bf_set_ui(G, 2 * b - 1);
+        bf_mul_ui(G, G, 6 * b - 1, prec, BF_RNDN);
+        bf_mul_ui(G, G, 6 * b - 5, prec, BF_RNDN);
+        bf_set_ui(&T0, CHUD_B);
+        bf_mul_ui(&T0, &T0, b, prec, BF_RNDN);
+        bf_set_ui(&T1, CHUD_A);
+        bf_add(&T0, &T0, &T1, prec, BF_RNDN);
+        bf_mul(P, G, &T0, prec, BF_RNDN);
+        P->sign = b & 1;
+
+        bf_set_ui(Q, b);
+        bf_mul_ui(Q, Q, b, prec, BF_RNDN);
+        bf_mul_ui(Q, Q, b, prec, BF_RNDN);
+        bf_mul_ui(Q, Q, (uint64_t)CHUD_C * CHUD_C * CHUD_C / 24, prec, BF_RNDN);
+        bf_delete(&T0);
+        bf_delete(&T1);
+    } else {
+        bf_t P2, Q2, G2;
+
+        bf_init(s, &P2);
+        bf_init(s, &Q2);
+        bf_init(s, &G2);
+
+        c = (a + b) / 2;
+        chud_bs(P, Q, G, a, c, 1, prec);
+        chud_bs(&P2, &Q2, &G2, c, b, need_g, prec);
+
+        /* Q = Q1 * Q2 */
+        /* G = G1 * G2 */
+        /* P = P1 * Q2 + P2 * G1 */
+        bf_mul(&P2, &P2, G, prec, BF_RNDN);
+        if (!need_g)
+            bf_set_ui(G, 0);
+        bf_mul(P, P, &Q2, prec, BF_RNDN);
+        bf_add(P, P, &P2, prec, BF_RNDN);
+        bf_delete(&P2);
+
+        bf_mul(Q, Q, &Q2, prec, BF_RNDN);
+        bf_delete(&Q2);
+        if (need_g)
+            bf_mul(G, G, &G2, prec, BF_RNDN);
+        bf_delete(&G2);
+    }
+}
+
+/* compute Pi with faithful rounding at precision 'prec' using the
+   Chudnovsky formula */
+static void bf_const_pi_internal(bf_t *Q, limb_t prec)
+{
+    bf_context_t *s = Q->ctx;
+    int64_t n, prec1;
+    bf_t P, G;
+
+    /* number of serie terms */
+    n = prec / CHUD_BITS_PER_TERM + 1;
+    /* XXX: precision analysis */
+    prec1 = prec + 32;
+
+    bf_init(s, &P);
+    bf_init(s, &G);
+
+    chud_bs(&P, Q, &G, 0, n, 0, BF_PREC_INF);
+
+    bf_mul_ui(&G, Q, CHUD_A, prec1, BF_RNDN);
+    bf_add(&P, &G, &P, prec1, BF_RNDN);
+    bf_div(Q, Q, &P, prec1, BF_RNDF);
+
+    bf_set_ui(&P, CHUD_C);
+    bf_sqrt(&G, &P, prec1, BF_RNDF);
+    bf_mul_ui(&G, &G, (uint64_t)CHUD_C / 12, prec1, BF_RNDF);
+    bf_mul(Q, Q, &G, prec, BF_RNDN);
+    bf_delete(&P);
+    bf_delete(&G);
+}
+
+static int bf_const_get(bf_t *T, limb_t prec, bf_flags_t flags,
+                        BFConstCache *c,
+                        void (*func)(bf_t *res, limb_t prec), int sign)
+{
+    limb_t ziv_extra_bits, prec1;
+
+    ziv_extra_bits = 32;
+    for(;;) {
+        prec1 = prec + ziv_extra_bits;
+        if (c->prec < prec1) {
+            if (c->val.len == 0)
+                bf_init(T->ctx, &c->val);
+            func(&c->val, prec1);
+            c->prec = prec1;
+        } else {
+            prec1 = c->prec;
+        }
+        bf_set(T, &c->val);
+        T->sign = sign;
+        if (!bf_can_round(T, prec, flags & BF_RND_MASK, prec1)) {
+            /* and more precision and retry */
+            ziv_extra_bits = ziv_extra_bits  + (ziv_extra_bits / 2);
+        } else {
+            break;
+        }
+    }
+    return bf_round(T, prec, flags);
+}
+
+static void bf_const_free(BFConstCache *c)
+{
+    bf_delete(&c->val);
+    memset(c, 0, sizeof(*c));
+}
+
+int bf_const_log2(bf_t *T, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = T->ctx;
+    return bf_const_get(T, prec, flags, &s->log2_cache, bf_const_log2_internal, 0);
+}
+
+/* return rounded pi * (1 - 2 * sign) */
+static int bf_const_pi_signed(bf_t *T, int sign, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = T->ctx;
+    return bf_const_get(T, prec, flags, &s->pi_cache, bf_const_pi_internal,
+                        sign);
+}
+
+int bf_const_pi(bf_t *T, limb_t prec, bf_flags_t flags)
+{
+    return bf_const_pi_signed(T, 0, prec, flags);
+}
+
+void bf_clear_cache(bf_context_t *s)
+{
+#ifdef USE_FFT_MUL
+    fft_clear_cache(s);
+#endif
+    bf_const_free(&s->log2_cache);
+    bf_const_free(&s->pi_cache);
+}
+
+/* ZivFunc should compute the result 'r' with faithful rounding at
+   precision 'prec'. For efficiency purposes, the final bf_round()
+   does not need to be done in the function. */
+typedef int ZivFunc(bf_t *r, const bf_t *a, limb_t prec, void *opaque);
+
+static int bf_ziv_rounding(bf_t *r, const bf_t *a,
+                           limb_t prec, bf_flags_t flags,
+                           ZivFunc *f, void *opaque)
+{
+    int rnd_mode, ret;
+    slimb_t prec1, ziv_extra_bits;
+
+    rnd_mode = flags & BF_RND_MASK;
+    if (rnd_mode == BF_RNDF) {
+        /* no need to iterate */
+        f(r, a, prec, opaque);
+        ret = 0;
+    } else {
+        ziv_extra_bits = 32;
+        for(;;) {
+            prec1 = prec + ziv_extra_bits;
+            ret = f(r, a, prec1, opaque);
+            if (ret & (BF_ST_OVERFLOW | BF_ST_UNDERFLOW | BF_ST_MEM_ERROR)) {
+                /* overflow or underflow should never happen because
+                   it indicates the rounding cannot be done correctly,
+                   but we do not catch all the cases */
+                return ret;
+            }
+            /* if the result is exact, we can stop */
+            if (!(ret & BF_ST_INEXACT)) {
+                ret = 0;
+                break;
+            }
+            if (bf_can_round(r, prec, rnd_mode, prec1)) {
+                ret = BF_ST_INEXACT;
+                break;
+            }
+            ziv_extra_bits = ziv_extra_bits * 2;
+            //            printf("ziv_extra_bits=%" PRId64 "\n", (int64_t)ziv_extra_bits);
+        }
+    }
+    if (r->len == 0)
+        return ret;
+    else
+        return __bf_round(r, prec, flags, r->len, ret);
+}
+
+/* add (1 - 2*e_sign) * 2^e */
+static int bf_add_epsilon(bf_t *r, const bf_t *a, slimb_t e, int e_sign,
+                          limb_t prec, int flags)
+{
+    bf_t T_s, *T = &T_s;
+    int ret;
+    /* small argument case: result = 1 + epsilon * sign(x) */
+    bf_init(a->ctx, T);
+    bf_set_ui(T, 1);
+    T->sign = e_sign;
+    T->expn += e;
+    ret = bf_add(r, r, T, prec, flags);
+    bf_delete(T);
+    return ret;
+}
+
+/* Compute the exponential using faithful rounding at precision 'prec'.
+   Note: the algorithm is from MPFR */
+static int bf_exp_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    slimb_t n, K, l, i, prec1;
+
+    assert(r != a);
+
+    /* argument reduction:
+       T = a - n*log(2) with 0 <= T < log(2) and n integer.
+    */
+    bf_init(s, T);
+    if (a->expn <= -1) {
+        /* 0 <= abs(a) <= 0.5 */
+        if (a->sign)
+            n = -1;
+        else
+            n = 0;
+    } else {
+        bf_const_log2(T, LIMB_BITS, BF_RNDZ);
+        bf_div(T, a, T, LIMB_BITS, BF_RNDD);
+        bf_get_limb(&n, T, 0);
+    }
+
+    K = bf_isqrt((prec + 1) / 2);
+    l = (prec - 1) / K + 1;
+    /* XXX: precision analysis ? */
+    prec1 = prec + (K + 2 * l + 18) + K + 8;
+    if (a->expn > 0)
+        prec1 += a->expn;
+    //    printf("n=%ld K=%ld prec1=%ld\n", n, K, prec1);
+
+    bf_const_log2(T, prec1, BF_RNDF);
+    bf_mul_si(T, T, n, prec1, BF_RNDN);
+    bf_sub(T, a, T, prec1, BF_RNDN);
+
+    /* reduce the range of T */
+    bf_mul_2exp(T, -K, BF_PREC_INF, BF_RNDZ);
+
+    /* Taylor expansion around zero :
+     1 + x + x^2/2 + ... + x^n/n!
+     = (1 + x * (1 + x/2 * (1 + ... (x/n))))
+    */
+    {
+        bf_t U_s, *U = &U_s;
+
+        bf_init(s, U);
+        bf_set_ui(r, 1);
+        for(i = l ; i >= 1; i--) {
+            bf_set_ui(U, i);
+            bf_div(U, T, U, prec1, BF_RNDN);
+            bf_mul(r, r, U, prec1, BF_RNDN);
+            bf_add_si(r, r, 1, prec1, BF_RNDN);
+        }
+        bf_delete(U);
+    }
+    bf_delete(T);
+
+    /* undo the range reduction */
+    for(i = 0; i < K; i++) {
+        bf_mul(r, r, r, prec1, BF_RNDN | BF_FLAG_EXT_EXP);
+    }
+
+    /* undo the argument reduction */
+    bf_mul_2exp(r, n, BF_PREC_INF, BF_RNDZ | BF_FLAG_EXT_EXP);
+
+    return BF_ST_INEXACT;
+}
+
+/* crude overflow and underflow tests for exp(a). a_low <= a <= a_high */
+static int check_exp_underflow_overflow(bf_context_t *s, bf_t *r,
+                                        const bf_t *a_low, const bf_t *a_high,
+                                        limb_t prec, bf_flags_t flags)
+{
+    bf_t T_s, *T = &T_s;
+    bf_t log2_s, *log2 = &log2_s;
+    slimb_t e_min, e_max;
+
+    if (a_high->expn <= 0)
+        return 0;
+
+    e_max = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
+    e_min = -e_max + 3;
+    if (flags & BF_FLAG_SUBNORMAL)
+        e_min -= (prec - 1);
+
+    bf_init(s, T);
+    bf_init(s, log2);
+    bf_const_log2(log2, LIMB_BITS, BF_RNDU);
+    bf_mul_ui(T, log2, e_max, LIMB_BITS, BF_RNDU);
+    /* a_low > e_max * log(2) implies exp(a) > e_max */
+    if (bf_cmp_lt(T, a_low) > 0) {
+        /* overflow */
+        bf_delete(T);
+        bf_delete(log2);
+        return bf_set_overflow(r, 0, prec, flags);
+    }
+    /* a_high < (e_min - 2) * log(2) implies exp(a) < (e_min - 2) */
+    bf_const_log2(log2, LIMB_BITS, BF_RNDD);
+    bf_mul_si(T, log2, e_min - 2, LIMB_BITS, BF_RNDD);
+    if (bf_cmp_lt(a_high, T)) {
+        int rnd_mode = flags & BF_RND_MASK;
+
+        /* underflow */
+        bf_delete(T);
+        bf_delete(log2);
+        if (rnd_mode == BF_RNDU) {
+            /* set the smallest value */
+            bf_set_ui(r, 1);
+            r->expn = e_min;
+        } else {
+            bf_set_zero(r, 0);
+        }
+        return BF_ST_UNDERFLOW | BF_ST_INEXACT;
+    }
+    bf_delete(log2);
+    bf_delete(T);
+    return 0;
+}
+
+int bf_exp(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    int ret;
+    assert(r != a);
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+        } else if (a->expn == BF_EXP_INF) {
+            if (a->sign)
+                bf_set_zero(r, 0);
+            else
+                bf_set_inf(r, 0);
+        } else {
+            bf_set_ui(r, 1);
+        }
+        return 0;
+    }
+
+    ret = check_exp_underflow_overflow(s, r, a, a, prec, flags);
+    if (ret)
+        return ret;
+    if (a->expn < 0 && (-a->expn) >= (prec + 2)) {
+        /* small argument case: result = 1 + epsilon * sign(x) */
+        bf_set_ui(r, 1);
+        return bf_add_epsilon(r, r, -(prec + 2), a->sign, prec, flags);
+    }
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_exp_internal, NULL);
+}
+
+static int bf_log_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    bf_t U_s, *U = &U_s;
+    bf_t V_s, *V = &V_s;
+    slimb_t n, prec1, l, i, K;
+
+    assert(r != a);
+
+    bf_init(s, T);
+    /* argument reduction 1 */
+    /* T=a*2^n with 2/3 <= T <= 4/3 */
+    {
+        bf_t U_s, *U = &U_s;
+        bf_set(T, a);
+        n = T->expn;
+        T->expn = 0;
+        /* U= ~ 2/3 */
+        bf_init(s, U);
+        bf_set_ui(U, 0xaaaaaaaa);
+        U->expn = 0;
+        if (bf_cmp_lt(T, U)) {
+            T->expn++;
+            n--;
+        }
+        bf_delete(U);
+    }
+    //    printf("n=%ld\n", n);
+    //    bf_print_str("T", T);
+
+    /* XXX: precision analysis */
+    /* number of iterations for argument reduction 2 */
+    K = bf_isqrt((prec + 1) / 2);
+    /* order of Taylor expansion */
+    l = prec / (2 * K) + 1;
+    /* precision of the intermediate computations */
+    prec1 = prec + K + 2 * l + 32;
+
+    bf_init(s, U);
+    bf_init(s, V);
+
+    /* Note: cancellation occurs here, so we use more precision (XXX:
+       reduce the precision by computing the exact cancellation) */
+    bf_add_si(T, T, -1, BF_PREC_INF, BF_RNDN);
+
+    /* argument reduction 2 */
+    for(i = 0; i < K; i++) {
+        /* T = T / (1 + sqrt(1 + T)) */
+        bf_add_si(U, T, 1, prec1, BF_RNDN);
+        bf_sqrt(V, U, prec1, BF_RNDF);
+        bf_add_si(U, V, 1, prec1, BF_RNDN);
+        bf_div(T, T, U, prec1, BF_RNDN);
+    }
+
+    {
+        bf_t Y_s, *Y = &Y_s;
+        bf_t Y2_s, *Y2 = &Y2_s;
+        bf_init(s, Y);
+        bf_init(s, Y2);
+
+        /* compute ln(1+x) = ln((1+y)/(1-y)) with y=x/(2+x)
+           = y + y^3/3 + ... + y^(2*l + 1) / (2*l+1)
+           with Y=Y^2
+           = y*(1+Y/3+Y^2/5+...) = y*(1+Y*(1/3+Y*(1/5 + ...)))
+        */
+        bf_add_si(Y, T, 2, prec1, BF_RNDN);
+        bf_div(Y, T, Y, prec1, BF_RNDN);
+
+        bf_mul(Y2, Y, Y, prec1, BF_RNDN);
+        bf_set_ui(r, 0);
+        for(i = l; i >= 1; i--) {
+            bf_set_ui(U, 1);
+            bf_set_ui(V, 2 * i + 1);
+            bf_div(U, U, V, prec1, BF_RNDN);
+            bf_add(r, r, U, prec1, BF_RNDN);
+            bf_mul(r, r, Y2, prec1, BF_RNDN);
+        }
+        bf_add_si(r, r, 1, prec1, BF_RNDN);
+        bf_mul(r, r, Y, prec1, BF_RNDN);
+        bf_delete(Y);
+        bf_delete(Y2);
+    }
+    bf_delete(V);
+    bf_delete(U);
+
+    /* multiplication by 2 for the Taylor expansion and undo the
+       argument reduction 2*/
+    bf_mul_2exp(r, K + 1, BF_PREC_INF, BF_RNDZ);
+
+    /* undo the argument reduction 1 */
+    bf_const_log2(T, prec1, BF_RNDF);
+    bf_mul_si(T, T, n, prec1, BF_RNDN);
+    bf_add(r, r, T, prec1, BF_RNDN);
+
+    bf_delete(T);
+    return BF_ST_INEXACT;
+}
+
+int bf_log(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+
+    assert(r != a);
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF) {
+            if (a->sign) {
+                bf_set_nan(r);
+                return BF_ST_INVALID_OP;
+            } else {
+                bf_set_inf(r, 0);
+                return 0;
+            }
+        } else {
+            bf_set_inf(r, 1);
+            return 0;
+        }
+    }
+    if (a->sign) {
+        bf_set_nan(r);
+        return BF_ST_INVALID_OP;
+    }
+    bf_init(s, T);
+    bf_set_ui(T, 1);
+    if (bf_cmp_eq(a, T)) {
+        bf_set_zero(r, 0);
+        bf_delete(T);
+        return 0;
+    }
+    bf_delete(T);
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_log_internal, NULL);
+}
+
+/* x and y finite and x > 0 */
+static int bf_pow_generic(bf_t *r, const bf_t *x, limb_t prec, void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    const bf_t *y = opaque;
+    bf_t T_s, *T = &T_s;
+    limb_t prec1;
+
+    bf_init(s, T);
+    /* XXX: proof for the added precision */
+    prec1 = prec + 32;
+    bf_log(T, x, prec1, BF_RNDF | BF_FLAG_EXT_EXP);
+    bf_mul(T, T, y, prec1, BF_RNDF | BF_FLAG_EXT_EXP);
+    if (bf_is_nan(T))
+        bf_set_nan(r);
+    else
+        bf_exp_internal(r, T, prec1, NULL); /* no overflow/underlow test needed */
+    bf_delete(T);
+    return BF_ST_INEXACT;
+}
+
+/* x and y finite, x > 0, y integer and y fits on one limb */
+static int bf_pow_int(bf_t *r, const bf_t *x, limb_t prec, void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    const bf_t *y = opaque;
+    bf_t T_s, *T = &T_s;
+    limb_t prec1;
+    int ret;
+    slimb_t y1;
+
+    bf_get_limb(&y1, y, 0);
+    if (y1 < 0)
+        y1 = -y1;
+    /* XXX: proof for the added precision */
+    prec1 = prec + ceil_log2(y1) * 2 + 8;
+    ret = bf_pow_ui(r, x, y1 < 0 ? -y1 : y1, prec1, BF_RNDN | BF_FLAG_EXT_EXP);
+    if (y->sign) {
+        bf_init(s, T);
+        bf_set_ui(T, 1);
+        ret |= bf_div(r, T, r, prec1, BF_RNDN | BF_FLAG_EXT_EXP);
+        bf_delete(T);
+    }
+    return ret;
+}
+
+/* x must be a finite non zero float. Return TRUE if there is a
+   floating point number r such as x=r^(2^n) and return this floating
+   point number 'r'. Otherwise return FALSE and r is undefined. */
+static BOOL check_exact_power2n(bf_t *r, const bf_t *x, slimb_t n)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    slimb_t e, i, er;
+    limb_t v;
+
+    /* x = m*2^e with m odd integer */
+    e = bf_get_exp_min(x);
+    /* fast check on the exponent */
+    if (n > (LIMB_BITS - 1)) {
+        if (e != 0)
+            return FALSE;
+        er = 0;
+    } else {
+        if ((e & (((limb_t)1 << n) - 1)) != 0)
+            return FALSE;
+        er = e >> n;
+    }
+    /* every perfect odd square = 1 modulo 8 */
+    v = get_bits(x->tab, x->len, x->len * LIMB_BITS - x->expn + e);
+    if ((v & 7) != 1)
+        return FALSE;
+
+    bf_init(s, T);
+    bf_set(T, x);
+    T->expn -= e;
+    for(i = 0; i < n; i++) {
+        if (i != 0)
+            bf_set(T, r);
+        if (bf_sqrtrem(r, NULL, T) != 0)
+            return FALSE;
+    }
+    r->expn += er;
+    return TRUE;
+}
+
+/* prec = BF_PREC_INF is accepted for x and y integers and y >= 0 */
+int bf_pow(bf_t *r, const bf_t *x, const bf_t *y, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    bf_t ytmp_s;
+    BOOL y_is_int, y_is_odd;
+    int r_sign, ret, rnd_mode;
+    slimb_t y_emin;
+
+    if (x->len == 0 || y->len == 0) {
+        if (y->expn == BF_EXP_ZERO) {
+            /* pow(x, 0) = 1 */
+            bf_set_ui(r, 1);
+        } else if (x->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+        } else {
+            int cmp_x_abs_1;
+            bf_set_ui(r, 1);
+            cmp_x_abs_1 = bf_cmpu(x, r);
+            if (cmp_x_abs_1 == 0 && (flags & BF_POW_JS_QUIRKS) &&
+                (y->expn >= BF_EXP_INF)) {
+                bf_set_nan(r);
+            } else if (cmp_x_abs_1 == 0 &&
+                       (!x->sign || y->expn != BF_EXP_NAN)) {
+                /* pow(1, y) = 1 even if y = NaN */
+                /* pow(-1, +/-inf) = 1 */
+            } else if (y->expn == BF_EXP_NAN) {
+                bf_set_nan(r);
+            } else if (y->expn == BF_EXP_INF) {
+                if (y->sign == (cmp_x_abs_1 > 0)) {
+                    bf_set_zero(r, 0);
+                } else {
+                    bf_set_inf(r, 0);
+                }
+            } else {
+                y_emin = bf_get_exp_min(y);
+                y_is_odd = (y_emin == 0);
+                if (y->sign == (x->expn == BF_EXP_ZERO)) {
+                    bf_set_inf(r, y_is_odd & x->sign);
+                    if (y->sign) {
+                        /* pow(0, y) with y < 0 */
+                        return BF_ST_DIVIDE_ZERO;
+                    }
+                } else {
+                    bf_set_zero(r, y_is_odd & x->sign);
+                }
+            }
+        }
+        return 0;
+    }
+    bf_init(s, T);
+    bf_set(T, x);
+    y_emin = bf_get_exp_min(y);
+    y_is_int = (y_emin >= 0);
+    rnd_mode = flags & BF_RND_MASK;
+    if (x->sign) {
+        if (!y_is_int) {
+            bf_set_nan(r);
+            bf_delete(T);
+            return BF_ST_INVALID_OP;
+        }
+        y_is_odd = (y_emin == 0);
+        r_sign = y_is_odd;
+        /* change the directed rounding mode if the sign of the result
+           is changed */
+        if (r_sign && (rnd_mode == BF_RNDD || rnd_mode == BF_RNDU))
+            flags ^= 1;
+        bf_neg(T);
+    } else {
+        r_sign = 0;
+    }
+
+    bf_set_ui(r, 1);
+    if (bf_cmp_eq(T, r)) {
+        /* abs(x) = 1: nothing more to do */
+        ret = 0;
+    } else {
+        /* check the overflow/underflow cases */
+        {
+            bf_t al_s, *al = &al_s;
+            bf_t ah_s, *ah = &ah_s;
+            limb_t precl = LIMB_BITS;
+
+            bf_init(s, al);
+            bf_init(s, ah);
+            /* compute bounds of log(abs(x)) * y with a low precision */
+            /* XXX: compute bf_log() once */
+            /* XXX: add a fast test before this slow test */
+            bf_log(al, T, precl, BF_RNDD);
+            bf_log(ah, T, precl, BF_RNDU);
+            bf_mul(al, al, y, precl, BF_RNDD ^ y->sign);
+            bf_mul(ah, ah, y, precl, BF_RNDU ^ y->sign);
+            ret = check_exp_underflow_overflow(s, r, al, ah, prec, flags);
+            bf_delete(al);
+            bf_delete(ah);
+            if (ret)
+                goto done;
+        }
+
+        if (y_is_int) {
+            slimb_t T_bits, e;
+        int_pow:
+            T_bits = T->expn - bf_get_exp_min(T);
+            if (T_bits == 1) {
+                /* pow(2^b, y) = 2^(b*y) */
+                bf_mul_si(T, y, T->expn - 1, LIMB_BITS, BF_RNDZ);
+                bf_get_limb(&e, T, 0);
+                bf_set_ui(r, 1);
+                ret = bf_mul_2exp(r, e, prec, flags);
+            } else if (prec == BF_PREC_INF) {
+                slimb_t y1;
+                /* specific case for infinite precision (integer case) */
+                bf_get_limb(&y1, y, 0);
+                assert(!y->sign);
+                /* x must be an integer, so abs(x) >= 2 */
+                if (y1 >= ((slimb_t)1 << BF_EXP_BITS_MAX)) {
+                    bf_delete(T);
+                    return bf_set_overflow(r, 0, BF_PREC_INF, flags);
+                }
+                ret = bf_pow_ui(r, T, y1, BF_PREC_INF, BF_RNDZ);
+            } else {
+                if (y->expn <= 31) {
+                    /* small enough power: use exponentiation in all cases */
+                } else if (y->sign) {
+                    /* cannot be exact */
+                    goto general_case;
+                } else {
+                    if (rnd_mode == BF_RNDF)
+                        goto general_case; /* no need to track exact results */
+                    /* see if the result has a chance to be exact:
+                       if x=a*2^b (a odd), x^y=a^y*2^(b*y)
+                       x^y needs a precision of at least floor_log2(a)*y bits
+                    */
+                    bf_mul_si(r, y, T_bits - 1, LIMB_BITS, BF_RNDZ);
+                    bf_get_limb(&e, r, 0);
+                    if (prec < e)
+                        goto general_case;
+                }
+                ret = bf_ziv_rounding(r, T, prec, flags, bf_pow_int, (void *)y);
+            }
+        } else {
+            if (rnd_mode != BF_RNDF) {
+                bf_t *y1;
+                if (y_emin < 0 && check_exact_power2n(r, T, -y_emin)) {
+                    /* the problem is reduced to a power to an integer */
+#if 0
+                    printf("\nn=%" PRId64 "\n", -(int64_t)y_emin);
+                    bf_print_str("T", T);
+                    bf_print_str("r", r);
+#endif
+                    bf_set(T, r);
+                    y1 = &ytmp_s;
+                    y1->tab = y->tab;
+                    y1->len = y->len;
+                    y1->sign = y->sign;
+                    y1->expn = y->expn - y_emin;
+                    y = y1;
+                    goto int_pow;
+                }
+            }
+        general_case:
+            ret = bf_ziv_rounding(r, T, prec, flags, bf_pow_generic, (void *)y);
+        }
+    }
+ done:
+    bf_delete(T);
+    r->sign = r_sign;
+    return ret;
+}
+
+/* compute sqrt(-2*x-x^2) to get |sin(x)| from cos(x) - 1. */
+static void bf_sqrt_sin(bf_t *r, const bf_t *x, limb_t prec1)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    bf_init(s, T);
+    bf_set(T, x);
+    bf_mul(r, T, T, prec1, BF_RNDN);
+    bf_mul_2exp(T, 1, BF_PREC_INF, BF_RNDZ);
+    bf_add(T, T, r, prec1, BF_RNDN);
+    bf_neg(T);
+    bf_sqrt(r, T, prec1, BF_RNDF);
+    bf_delete(T);
+}
+
+static int bf_sincos(bf_t *s, bf_t *c, const bf_t *a, limb_t prec)
+{
+    bf_context_t *s1 = a->ctx;
+    bf_t T_s, *T = &T_s;
+    bf_t U_s, *U = &U_s;
+    bf_t r_s, *r = &r_s;
+    slimb_t K, prec1, i, l, mod, prec2;
+    int is_neg;
+
+    assert(c != a && s != a);
+
+    bf_init(s1, T);
+    bf_init(s1, U);
+    bf_init(s1, r);
+
+    /* XXX: precision analysis */
+    K = bf_isqrt(prec / 2);
+    l = prec / (2 * K) + 1;
+    prec1 = prec + 2 * K + l + 8;
+
+    /* after the modulo reduction, -pi/4 <= T <= pi/4 */
+    if (a->expn <= -1) {
+        /* abs(a) <= 0.25: no modulo reduction needed */
+        bf_set(T, a);
+        mod = 0;
+    } else {
+        slimb_t cancel;
+        cancel = 0;
+        for(;;) {
+            prec2 = prec1 + a->expn + cancel;
+            bf_const_pi(U, prec2, BF_RNDF);
+            bf_mul_2exp(U, -1, BF_PREC_INF, BF_RNDZ);
+            bf_remquo(&mod, T, a, U, prec2, BF_RNDN, BF_RNDN);
+            //            printf("T.expn=%ld prec2=%ld\n", T->expn, prec2);
+            if (mod == 0 || (T->expn != BF_EXP_ZERO &&
+                             (T->expn + prec2) >= (prec1 - 1)))
+                break;
+            /* increase the number of bits until the precision is good enough */
+            cancel = bf_max(-T->expn, (cancel + 1) * 3 / 2);
+        }
+        mod &= 3;
+    }
+
+    is_neg = T->sign;
+
+    /* compute cosm1(x) = cos(x) - 1 */
+    bf_mul(T, T, T, prec1, BF_RNDN);
+    bf_mul_2exp(T, -2 * K, BF_PREC_INF, BF_RNDZ);
+
+    /* Taylor expansion:
+       -x^2/2 + x^4/4! - x^6/6! + ...
+    */
+    bf_set_ui(r, 1);
+    for(i = l ; i >= 1; i--) {
+        bf_set_ui(U, 2 * i - 1);
+        bf_mul_ui(U, U, 2 * i, BF_PREC_INF, BF_RNDZ);
+        bf_div(U, T, U, prec1, BF_RNDN);
+        bf_mul(r, r, U, prec1, BF_RNDN);
+        bf_neg(r);
+        if (i != 1)
+            bf_add_si(r, r, 1, prec1, BF_RNDN);
+    }
+    bf_delete(U);
+
+    /* undo argument reduction:
+       cosm1(2*x)= 2*(2*cosm1(x)+cosm1(x)^2)
+    */
+    for(i = 0; i < K; i++) {
+        bf_mul(T, r, r, prec1, BF_RNDN);
+        bf_mul_2exp(r, 1, BF_PREC_INF, BF_RNDZ);
+        bf_add(r, r, T, prec1, BF_RNDN);
+        bf_mul_2exp(r, 1, BF_PREC_INF, BF_RNDZ);
+    }
+    bf_delete(T);
+
+    if (c) {
+        if ((mod & 1) == 0) {
+            bf_add_si(c, r, 1, prec1, BF_RNDN);
+        } else {
+            bf_sqrt_sin(c, r, prec1);
+            c->sign = is_neg ^ 1;
+        }
+        c->sign ^= mod >> 1;
+    }
+    if (s) {
+        if ((mod & 1) == 0) {
+            bf_sqrt_sin(s, r, prec1);
+            s->sign = is_neg;
+        } else {
+            bf_add_si(s, r, 1, prec1, BF_RNDN);
+        }
+        s->sign ^= mod >> 1;
+    }
+    bf_delete(r);
+    return BF_ST_INEXACT;
+}
+
+static int bf_cos_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+    return bf_sincos(NULL, r, a, prec);
+}
+
+int bf_cos(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bf_set_ui(r, 1);
+            return 0;
+        }
+    }
+
+    /* small argument case: result = 1+r(x) with r(x) = -x^2/2 +
+       O(X^4). We assume r(x) < 2^(2*EXP(x) - 1). */
+    if (a->expn < 0) {
+        slimb_t e;
+        e = 2 * a->expn - 1;
+        if (e < -(prec + 2)) {
+            bf_set_ui(r, 1);
+            return bf_add_epsilon(r, r, e, 1, prec, flags);
+        }
+    }
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_cos_internal, NULL);
+}
+
+static int bf_sin_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+    return bf_sincos(r, NULL, a, prec);
+}
+
+int bf_sin(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bf_set_zero(r, a->sign);
+            return 0;
+        }
+    }
+
+    /* small argument case: result = x+r(x) with r(x) = -x^3/6 +
+       O(X^5). We assume r(x) < 2^(3*EXP(x) - 2). */
+    if (a->expn < 0) {
+        slimb_t e;
+        e = sat_add(2 * a->expn, a->expn - 2);
+        if (e < a->expn - bf_max(prec + 2, a->len * LIMB_BITS + 2)) {
+            bf_set(r, a);
+            return bf_add_epsilon(r, r, e, 1 - a->sign, prec, flags);
+        }
+    }
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_sin_internal, NULL);
+}
+
+static int bf_tan_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    limb_t prec1;
+
+    /* XXX: precision analysis */
+    prec1 = prec + 8;
+    bf_init(s, T);
+    bf_sincos(r, T, a, prec1);
+    bf_div(r, r, T, prec1, BF_RNDF);
+    bf_delete(T);
+    return BF_ST_INEXACT;
+}
+
+int bf_tan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    assert(r != a);
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bf_set_zero(r, a->sign);
+            return 0;
+        }
+    }
+
+    /* small argument case: result = x+r(x) with r(x) = x^3/3 +
+       O(X^5). We assume r(x) < 2^(3*EXP(x) - 1). */
+    if (a->expn < 0) {
+        slimb_t e;
+        e = sat_add(2 * a->expn, a->expn - 1);
+        if (e < a->expn - bf_max(prec + 2, a->len * LIMB_BITS + 2)) {
+            bf_set(r, a);
+            return bf_add_epsilon(r, r, e, a->sign, prec, flags);
+        }
+    }
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_tan_internal, NULL);
+}
+
+/* if add_pi2 is true, add pi/2 to the result (used for acos(x) to
+   avoid cancellation) */
+static int bf_atan_internal(bf_t *r, const bf_t *a, limb_t prec,
+                            void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    BOOL add_pi2 = (BOOL)(intptr_t)opaque;
+    bf_t T_s, *T = &T_s;
+    bf_t U_s, *U = &U_s;
+    bf_t V_s, *V = &V_s;
+    bf_t X2_s, *X2 = &X2_s;
+    int cmp_1;
+    slimb_t prec1, i, K, l;
+
+    /* XXX: precision analysis */
+    K = bf_isqrt((prec + 1) / 2);
+    l = prec / (2 * K) + 1;
+    prec1 = prec + K + 2 * l + 32;
+    //    printf("prec=%d K=%d l=%d prec1=%d\n", (int)prec, (int)K, (int)l, (int)prec1);
+
+    bf_init(s, T);
+    cmp_1 = (a->expn >= 1); /* a >= 1 */
+    if (cmp_1) {
+        bf_set_ui(T, 1);
+        bf_div(T, T, a, prec1, BF_RNDN);
+    } else {
+        bf_set(T, a);
+    }
+
+    /* abs(T) <= 1 */
+
+    /* argument reduction */
+
+    bf_init(s, U);
+    bf_init(s, V);
+    bf_init(s, X2);
+    for(i = 0; i < K; i++) {
+        /* T = T / (1 + sqrt(1 + T^2)) */
+        bf_mul(U, T, T, prec1, BF_RNDN);
+        bf_add_si(U, U, 1, prec1, BF_RNDN);
+        bf_sqrt(V, U, prec1, BF_RNDN);
+        bf_add_si(V, V, 1, prec1, BF_RNDN);
+        bf_div(T, T, V, prec1, BF_RNDN);
+    }
+
+    /* Taylor series:
+       x - x^3/3 + ... + (-1)^ l * y^(2*l + 1) / (2*l+1)
+    */
+    bf_mul(X2, T, T, prec1, BF_RNDN);
+    bf_set_ui(r, 0);
+    for(i = l; i >= 1; i--) {
+        bf_set_si(U, 1);
+        bf_set_ui(V, 2 * i + 1);
+        bf_div(U, U, V, prec1, BF_RNDN);
+        bf_neg(r);
+        bf_add(r, r, U, prec1, BF_RNDN);
+        bf_mul(r, r, X2, prec1, BF_RNDN);
+    }
+    bf_neg(r);
+    bf_add_si(r, r, 1, prec1, BF_RNDN);
+    bf_mul(r, r, T, prec1, BF_RNDN);
+
+    /* undo the argument reduction */
+    bf_mul_2exp(r, K, BF_PREC_INF, BF_RNDZ);
+
+    bf_delete(U);
+    bf_delete(V);
+    bf_delete(X2);
+
+    i = add_pi2;
+    if (cmp_1 > 0) {
+        /* undo the inversion : r = sign(a)*PI/2 - r */
+        bf_neg(r);
+        i += 1 - 2 * a->sign;
+    }
+    /* add i*(pi/2) with -1 <= i <= 2 */
+    if (i != 0) {
+        bf_const_pi(T, prec1, BF_RNDF);
+        if (i != 2)
+            bf_mul_2exp(T, -1, BF_PREC_INF, BF_RNDZ);
+        T->sign = (i < 0);
+        bf_add(r, T, r, prec1, BF_RNDN);
+    }
+
+    bf_delete(T);
+    return BF_ST_INEXACT;
+}
+
+int bf_atan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    int res;
+
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF)  {
+            /* -PI/2 or PI/2 */
+            bf_const_pi_signed(r, a->sign, prec, flags);
+            bf_mul_2exp(r, -1, BF_PREC_INF, BF_RNDZ);
+            return BF_ST_INEXACT;
+        } else {
+            bf_set_zero(r, a->sign);
+            return 0;
+        }
+    }
+
+    bf_init(s, T);
+    bf_set_ui(T, 1);
+    res = bf_cmpu(a, T);
+    bf_delete(T);
+    if (res == 0) {
+        /* short cut: abs(a) == 1 -> +/-pi/4 */
+        bf_const_pi_signed(r, a->sign, prec, flags);
+        bf_mul_2exp(r, -2, BF_PREC_INF, BF_RNDZ);
+        return BF_ST_INEXACT;
+    }
+
+    /* small argument case: result = x+r(x) with r(x) = -x^3/3 +
+       O(X^5). We assume r(x) < 2^(3*EXP(x) - 1). */
+    if (a->expn < 0) {
+        slimb_t e;
+        e = sat_add(2 * a->expn, a->expn - 1);
+        if (e < a->expn - bf_max(prec + 2, a->len * LIMB_BITS + 2)) {
+            bf_set(r, a);
+            return bf_add_epsilon(r, r, e, 1 - a->sign, prec, flags);
+        }
+    }
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_atan_internal, (void *)FALSE);
+}
+
+static int bf_atan2_internal(bf_t *r, const bf_t *y, limb_t prec, void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    const bf_t *x = opaque;
+    bf_t T_s, *T = &T_s;
+    limb_t prec1;
+    int ret;
+
+    if (y->expn == BF_EXP_NAN || x->expn == BF_EXP_NAN) {
+        bf_set_nan(r);
+        return 0;
+    }
+
+    /* compute atan(y/x) assumming inf/inf = 1 and 0/0 = 0 */
+    bf_init(s, T);
+    prec1 = prec + 32;
+    if (y->expn == BF_EXP_INF && x->expn == BF_EXP_INF) {
+        bf_set_ui(T, 1);
+        T->sign = y->sign ^ x->sign;
+    } else if (y->expn == BF_EXP_ZERO && x->expn == BF_EXP_ZERO) {
+        bf_set_zero(T, y->sign ^ x->sign);
+    } else {
+        bf_div(T, y, x, prec1, BF_RNDF);
+    }
+    ret = bf_atan(r, T, prec1, BF_RNDF);
+
+    if (x->sign) {
+        /* if x < 0 (it includes -0), return sign(y)*pi + atan(y/x) */
+        bf_const_pi(T, prec1, BF_RNDF);
+        T->sign = y->sign;
+        bf_add(r, r, T, prec1, BF_RNDN);
+        ret |= BF_ST_INEXACT;
+    }
+
+    bf_delete(T);
+    return ret;
+}
+
+int bf_atan2(bf_t *r, const bf_t *y, const bf_t *x,
+             limb_t prec, bf_flags_t flags)
+{
+    return bf_ziv_rounding(r, y, prec, flags, bf_atan2_internal, (void *)x);
+}
+
+static int bf_asin_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    BOOL is_acos = (BOOL)(intptr_t)opaque;
+    bf_t T_s, *T = &T_s;
+    limb_t prec1, prec2;
+
+    /* asin(x) = atan(x/sqrt(1-x^2))
+       acos(x) = pi/2 - asin(x) */
+    prec1 = prec + 8;
+    /* increase the precision in x^2 to compensate the cancellation in
+       (1-x^2) if x is close to 1 */
+    /* XXX: use less precision when possible */
+    if (a->expn >= 0)
+        prec2 = BF_PREC_INF;
+    else
+        prec2 = prec1;
+    bf_init(s, T);
+    bf_mul(T, a, a, prec2, BF_RNDN);
+    bf_neg(T);
+    bf_add_si(T, T, 1, prec2, BF_RNDN);
+
+    bf_sqrt(r, T, prec1, BF_RNDN);
+    bf_div(T, a, r, prec1, BF_RNDN);
+    if (is_acos)
+        bf_neg(T);
+    bf_atan_internal(r, T, prec1, (void *)(intptr_t)is_acos);
+    bf_delete(T);
+    return BF_ST_INEXACT;
+}
+
+int bf_asin(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    int res;
+
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bf_set_zero(r, a->sign);
+            return 0;
+        }
+    }
+    bf_init(s, T);
+    bf_set_ui(T, 1);
+    res = bf_cmpu(a, T);
+    bf_delete(T);
+    if (res > 0) {
+        bf_set_nan(r);
+        return BF_ST_INVALID_OP;
+    }
+
+    /* small argument case: result = x+r(x) with r(x) = x^3/6 +
+       O(X^5). We assume r(x) < 2^(3*EXP(x) - 2). */
+    if (a->expn < 0) {
+        slimb_t e;
+        e = sat_add(2 * a->expn, a->expn - 2);
+        if (e < a->expn - bf_max(prec + 2, a->len * LIMB_BITS + 2)) {
+            bf_set(r, a);
+            return bf_add_epsilon(r, r, e, a->sign, prec, flags);
+        }
+    }
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_asin_internal, (void *)FALSE);
+}
+
+int bf_acos(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    int res;
+
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bf_const_pi(r, prec, flags);
+            bf_mul_2exp(r, -1, BF_PREC_INF, BF_RNDZ);
+            return BF_ST_INEXACT;
+        }
+    }
+    bf_init(s, T);
+    bf_set_ui(T, 1);
+    res = bf_cmpu(a, T);
+    bf_delete(T);
+    if (res > 0) {
+        bf_set_nan(r);
+        return BF_ST_INVALID_OP;
+    } else if (res == 0 && a->sign == 0) {
+        bf_set_zero(r, 0);
+        return 0;
+    }
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_asin_internal, (void *)TRUE);
+}
+
+/***************************************************************/
+/* decimal floating point numbers */
+
+#ifdef USE_BF_DEC
+
+#define adddq(r1, r0, a1, a0)                   \
+    do {                                        \
+        limb_t __t = r0;                        \
+        r0 += (a0);                             \
+        r1 += (a1) + (r0 < __t);                \
+    } while (0)
+
+#define subdq(r1, r0, a1, a0)                   \
+    do {                                        \
+        limb_t __t = r0;                        \
+        r0 -= (a0);                             \
+        r1 -= (a1) + (r0 > __t);                \
+    } while (0)
+
+#if LIMB_BITS == 64
+
+/* Note: we assume __int128 is available */
+#define muldq(r1, r0, a, b)                     \
+    do {                                        \
+        unsigned __int128 __t;                          \
+        __t = (unsigned __int128)(a) * (unsigned __int128)(b);  \
+        r0 = __t;                               \
+        r1 = __t >> 64;                         \
+    } while (0)
+
+#define divdq(q, r, a1, a0, b)                  \
+    do {                                        \
+        unsigned __int128 __t;                  \
+        limb_t __b = (b);                       \
+        __t = ((unsigned __int128)(a1) << 64) | (a0);   \
+        q = __t / __b;                                  \
+        r = __t % __b;                                  \
+    } while (0)
+
+#else
+
+#define muldq(r1, r0, a, b)                     \
+    do {                                        \
+        uint64_t __t;                          \
+        __t = (uint64_t)(a) * (uint64_t)(b);  \
+        r0 = __t;                               \
+        r1 = __t >> 32;                         \
+    } while (0)
+
+#define divdq(q, r, a1, a0, b)                  \
+    do {                                        \
+        uint64_t __t;                  \
+        limb_t __b = (b);                       \
+        __t = ((uint64_t)(a1) << 32) | (a0);   \
+        q = __t / __b;                                  \
+        r = __t % __b;                                  \
+    } while (0)
+
+#endif /* LIMB_BITS != 64 */
+
+#if LIMB_DIGITS == 19
+
+/* WARNING: hardcoded for b = 1e19. It is assumed that:
+   0 <= a1 < 2^63 */
+#define divdq_base(q, r, a1, a0)\
+do {\
+    uint64_t __a0, __a1, __t0, __t1, __b = BF_DEC_BASE; \
+    __a0 = a0;\
+    __a1 = a1;\
+    __t0 = __a1;\
+    __t0 = shld(__t0, __a0, 1);\
+    muldq(q, __t1, __t0, UINT64_C(17014118346046923173)); \
+    muldq(__t1, __t0, q, __b);\
+    subdq(__a1, __a0, __t1, __t0);\
+    subdq(__a1, __a0, 1, __b * 2);    \
+    __t0 = (slimb_t)__a1 >> 1; \
+    q += 2 + __t0;\
+    adddq(__a1, __a0, 0, __b & __t0);\
+    q += __a1;                  \
+    __a0 += __b & __a1;           \
+    r = __a0;\
+} while(0)
+
+#elif LIMB_DIGITS == 9
+
+/* WARNING: hardcoded for b = 1e9. It is assumed that:
+   0 <= a1 < 2^29 */
+#define divdq_base(q, r, a1, a0)\
+do {\
+    uint32_t __t0, __t1, __b = BF_DEC_BASE; \
+    __t0 = a1;\
+    __t1 = a0;\
+    __t0 = (__t0 << 3) | (__t1 >> (32 - 3));    \
+    muldq(q, __t1, __t0, 2305843009U);\
+    r = a0 - q * __b;\
+    __t1 = (r >= __b);\
+    q += __t1;\
+    if (__t1)\
+        r -= __b;\
+} while(0)
+
+#endif
+
+/* fast integer division by a fixed constant */
+
+typedef struct FastDivData {
+    limb_t m1; /* multiplier */
+    int8_t shift1;
+    int8_t shift2;
+} FastDivData;
+
+/* From "Division by Invariant Integers using Multiplication" by
+   Torborn Granlund and Peter L. Montgomery */
+/* d must be != 0 */
+static inline __maybe_unused void fast_udiv_init(FastDivData *s, limb_t d)
+{
+    int l;
+    limb_t q, r, m1;
+    if (d == 1)
+        l = 0;
+    else
+        l = 64 - clz64(d - 1);
+    divdq(q, r, ((limb_t)1 << l) - d, 0, d);
+    (void)r;
+    m1 = q + 1;
+    //    printf("d=%lu l=%d m1=0x%016lx\n", d, l, m1);
+    s->m1 = m1;
+    s->shift1 = l;
+    if (s->shift1 > 1)
+        s->shift1 = 1;
+    s->shift2 = l - 1;
+    if (s->shift2 < 0)
+        s->shift2 = 0;
+}
+
+static inline limb_t fast_udiv(limb_t a, const FastDivData *s)
+{
+    limb_t t0, t1;
+    muldq(t1, t0, s->m1, a);
+    t0 = (a - t1) >> s->shift1;
+    return (t1 + t0) >> s->shift2;
+}
+
+#endif // USE_BF_DEC
+/* contains 10^i */
+const limb_t mp_pow_dec[LIMB_DIGITS + 1] = {
+    1U,
+    10U,
+    100U,
+    1000U,
+    10000U,
+    100000U,
+    1000000U,
+    10000000U,
+    100000000U,
+    1000000000U,
+#if LIMB_BITS == 64
+    10000000000U,
+    100000000000U,
+    1000000000000U,
+    10000000000000U,
+    100000000000000U,
+    1000000000000000U,
+    10000000000000000U,
+    100000000000000000U,
+    1000000000000000000U,
+    10000000000000000000U,
+#endif
+};
+#ifdef USE_BF_DEC
+
+/* precomputed from fast_udiv_init(10^i) */
+static const FastDivData mp_pow_div[LIMB_DIGITS + 1] = {
+#if LIMB_BITS == 32
+    { 0x00000001, 0, 0 },
+    { 0x9999999a, 1, 3 },
+    { 0x47ae147b, 1, 6 },
+    { 0x0624dd30, 1, 9 },
+    { 0xa36e2eb2, 1, 13 },
+    { 0x4f8b588f, 1, 16 },
+    { 0x0c6f7a0c, 1, 19 },
+    { 0xad7f29ac, 1, 23 },
+    { 0x5798ee24, 1, 26 },
+    { 0x12e0be83, 1, 29 },
+#else
+    { 0x0000000000000001, 0, 0 },
+    { 0x999999999999999a, 1, 3 },
+    { 0x47ae147ae147ae15, 1, 6 },
+    { 0x0624dd2f1a9fbe77, 1, 9 },
+    { 0xa36e2eb1c432ca58, 1, 13 },
+    { 0x4f8b588e368f0847, 1, 16 },
+    { 0x0c6f7a0b5ed8d36c, 1, 19 },
+    { 0xad7f29abcaf48579, 1, 23 },
+    { 0x5798ee2308c39dfa, 1, 26 },
+    { 0x12e0be826d694b2f, 1, 29 },
+    { 0xb7cdfd9d7bdbab7e, 1, 33 },
+    { 0x5fd7fe17964955fe, 1, 36 },
+    { 0x19799812dea11198, 1, 39 },
+    { 0xc25c268497681c27, 1, 43 },
+    { 0x6849b86a12b9b01f, 1, 46 },
+    { 0x203af9ee756159b3, 1, 49 },
+    { 0xcd2b297d889bc2b7, 1, 53 },
+    { 0x70ef54646d496893, 1, 56 },
+    { 0x2725dd1d243aba0f, 1, 59 },
+    { 0xd83c94fb6d2ac34d, 1, 63 },
+#endif
+};
+
+/* divide by 10^shift with 0 <= shift <= LIMB_DIGITS */
+static inline limb_t fast_shr_dec(limb_t a, int shift)
+{
+    return fast_udiv(a, &mp_pow_div[shift]);
+}
+
+/* division and remainder by 10^shift */
+#define fast_shr_rem_dec(q, r, a, shift) q = fast_shr_dec(a, shift), r = a - q * mp_pow_dec[shift]
+
+limb_t mp_add_dec(limb_t *res, const limb_t *op1, const limb_t *op2,
+                  mp_size_t n, limb_t carry)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t k, a, v;
+
+    k=carry;
+    for(i=0;i<n;i++) {
+        /* XXX: reuse the trick in add_mod */
+        v = op1[i];
+        a = v + op2[i] + k - base;
+        k = a <= v;
+        if (!k)
+            a += base;
+        res[i]=a;
+    }
+    return k;
+}
+
+limb_t mp_add_ui_dec(limb_t *tab, limb_t b, mp_size_t n)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t k, a, v;
+
+    k=b;
+    for(i=0;i<n;i++) {
+        v = tab[i];
+        a = v + k - base;
+        k = a <= v;
+        if (!k)
+            a += base;
+        tab[i] = a;
+        if (k == 0)
+            break;
+    }
+    return k;
+}
+
+limb_t mp_sub_dec(limb_t *res, const limb_t *op1, const limb_t *op2,
+                  mp_size_t n, limb_t carry)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t k, v, a;
+
+    k=carry;
+    for(i=0;i<n;i++) {
+        v = op1[i];
+        a = v - op2[i] - k;
+        k = a > v;
+        if (k)
+            a += base;
+        res[i] = a;
+    }
+    return k;
+}
+
+limb_t mp_sub_ui_dec(limb_t *tab, limb_t b, mp_size_t n)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t k, v, a;
+
+    k=b;
+    for(i=0;i<n;i++) {
+        v = tab[i];
+        a = v - k;
+        k = a > v;
+        if (k)
+            a += base;
+        tab[i]=a;
+        if (k == 0)
+            break;
+    }
+    return k;
+}
+
+/* taba[] = taba[] * b + l. 0 <= b, l <= base - 1. Return the high carry */
+limb_t mp_mul1_dec(limb_t *tabr, const limb_t *taba, mp_size_t n,
+                   limb_t b, limb_t l)
+{
+    mp_size_t i;
+    limb_t t0, t1, r;
+
+    for(i = 0; i < n; i++) {
+        muldq(t1, t0, taba[i], b);
+        adddq(t1, t0, 0, l);
+        divdq_base(l, r, t1, t0);
+        tabr[i] = r;
+    }
+    return l;
+}
+
+/* tabr[] += taba[] * b. 0 <= b <= base - 1. Return the value to add
+   to the high word */
+limb_t mp_add_mul1_dec(limb_t *tabr, const limb_t *taba, mp_size_t n,
+                       limb_t b)
+{
+    mp_size_t i;
+    limb_t l, t0, t1, r;
+
+    l = 0;
+    for(i = 0; i < n; i++) {
+        muldq(t1, t0, taba[i], b);
+        adddq(t1, t0, 0, l);
+        adddq(t1, t0, 0, tabr[i]);
+        divdq_base(l, r, t1, t0);
+        tabr[i] = r;
+    }
+    return l;
+}
+
+/* tabr[] -= taba[] * b. 0 <= b <= base - 1. Return the value to
+   substract to the high word. */
+limb_t mp_sub_mul1_dec(limb_t *tabr, const limb_t *taba, mp_size_t n,
+                       limb_t b)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t l, t0, t1, r, a, v, c;
+
+    /* XXX: optimize */
+    l = 0;
+    for(i = 0; i < n; i++) {
+        muldq(t1, t0, taba[i], b);
+        adddq(t1, t0, 0, l);
+        divdq_base(l, r, t1, t0);
+        v = tabr[i];
+        a = v - r;
+        c = a > v;
+        if (c)
+            a += base;
+        /* never bigger than base because r = 0 when l = base - 1 */
+        l += c;
+        tabr[i] = a;
+    }
+    return l;
+}
+
+/* size of the result : op1_size + op2_size. */
+void mp_mul_basecase_dec(limb_t *result,
+                         const limb_t *op1, mp_size_t op1_size,
+                         const limb_t *op2, mp_size_t op2_size)
+{
+    mp_size_t i;
+    limb_t r;
+
+    result[op1_size] = mp_mul1_dec(result, op1, op1_size, op2[0], 0);
+
+    for(i=1;i<op2_size;i++) {
+        r = mp_add_mul1_dec(result + i, op1, op1_size, op2[i]);
+        result[i + op1_size] = r;
+    }
+}
+
+/* taba[] = (taba[] + r*base^na) / b. 0 <= b < base. 0 <= r <
+   b. Return the remainder. */
+limb_t mp_div1_dec(limb_t *tabr, const limb_t *taba, mp_size_t na,
+                   limb_t b, limb_t r)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t t0, t1, q;
+    int shift;
+
+#if (BF_DEC_BASE % 2) == 0
+    if (b == 2) {
+        limb_t base_div2;
+        /* Note: only works if base is even */
+        base_div2 = base >> 1;
+        if (r)
+            r = base_div2;
+        for(i = na - 1; i >= 0; i--) {
+            t0 = taba[i];
+            tabr[i] = (t0 >> 1) + r;
+            r = 0;
+            if (t0 & 1)
+                r = base_div2;
+        }
+        if (r)
+            r = 1;
+    } else
+#endif
+    if (na >= UDIV1NORM_THRESHOLD) {
+        shift = clz(b);
+        if (shift == 0) {
+            /* normalized case: b >= 2^(LIMB_BITS-1) */
+            limb_t b_inv;
+            b_inv = udiv1norm_init(b);
+            for(i = na - 1; i >= 0; i--) {
+                muldq(t1, t0, r, base);
+                adddq(t1, t0, 0, taba[i]);
+                q = udiv1norm(&r, t1, t0, b, b_inv);
+                tabr[i] = q;
+            }
+        } else {
+            limb_t b_inv;
+            b <<= shift;
+            b_inv = udiv1norm_init(b);
+            for(i = na - 1; i >= 0; i--) {
+                muldq(t1, t0, r, base);
+                adddq(t1, t0, 0, taba[i]);
+                t1 = (t1 << shift) | (t0 >> (LIMB_BITS - shift));
+                t0 <<= shift;
+                q = udiv1norm(&r, t1, t0, b, b_inv);
+                r >>= shift;
+                tabr[i] = q;
+            }
+        }
+    } else {
+        for(i = na - 1; i >= 0; i--) {
+            muldq(t1, t0, r, base);
+            adddq(t1, t0, 0, taba[i]);
+            divdq(q, r, t1, t0, b);
+            tabr[i] = q;
+        }
+    }
+    return r;
+}
+
+static __maybe_unused void mp_print_str_dec(const char *str,
+                                       const limb_t *tab, slimb_t n)
+{
+    slimb_t i;
+    printf("%s=", str);
+    for(i = n - 1; i >= 0; i--) {
+        if (i != n - 1)
+            printf("_");
+        printf("%0*" PRIu_LIMB, LIMB_DIGITS, tab[i]);
+    }
+    printf("\n");
+}
+
+static __maybe_unused void mp_print_str_h_dec(const char *str,
+                                              const limb_t *tab, slimb_t n,
+                                              limb_t high)
+{
+    slimb_t i;
+    printf("%s=", str);
+    printf("%0*" PRIu_LIMB, LIMB_DIGITS, high);
+    for(i = n - 1; i >= 0; i--) {
+        printf("_");
+        printf("%0*" PRIu_LIMB, LIMB_DIGITS, tab[i]);
+    }
+    printf("\n");
+}
+
+//#define DEBUG_DIV_SLOW
+
+#define DIV_STATIC_ALLOC_LEN 16
+
+/* return q = a / b and r = a % b.
+
+   taba[na] must be allocated if tabb1[nb - 1] < B / 2.  tabb1[nb - 1]
+   must be != zero. na must be >= nb. 's' can be NULL if tabb1[nb - 1]
+   >= B / 2.
+
+   The remainder is is returned in taba and contains nb libms. tabq
+   contains na - nb + 1 limbs. No overlap is permitted.
+
+   Running time of the standard method: (na - nb + 1) * nb
+   Return 0 if OK, -1 if memory alloc error
+*/
+/* XXX: optimize */
+static int mp_div_dec(bf_context_t *s, limb_t *tabq,
+                      limb_t *taba, mp_size_t na,
+                      const limb_t *tabb1, mp_size_t nb)
+{
+    limb_t base = BF_DEC_BASE;
+    limb_t r, mult, t0, t1, a, c, q, v, *tabb;
+    mp_size_t i, j;
+    limb_t static_tabb[DIV_STATIC_ALLOC_LEN];
+
+#ifdef DEBUG_DIV_SLOW
+    mp_print_str_dec("a", taba, na);
+    mp_print_str_dec("b", tabb1, nb);
+#endif
+
+    /* normalize tabb */
+    r = tabb1[nb - 1];
+    assert(r != 0);
+    i = na - nb;
+    if (r >= BF_DEC_BASE / 2) {
+        mult = 1;
+        tabb = (limb_t *)tabb1;
+        q = 1;
+        for(j = nb - 1; j >= 0; j--) {
+            if (taba[i + j] != tabb[j]) {
+                if (taba[i + j] < tabb[j])
+                    q = 0;
+                break;
+            }
+        }
+        tabq[i] = q;
+        if (q) {
+            mp_sub_dec(taba + i, taba + i, tabb, nb, 0);
+        }
+        i--;
+    } else {
+        mult = base / (r + 1);
+        if (likely(nb <= DIV_STATIC_ALLOC_LEN)) {
+            tabb = static_tabb;
+        } else {
+            tabb = bf_malloc(s, sizeof(limb_t) * nb);
+            if (!tabb)
+                return -1;
+        }
+        mp_mul1_dec(tabb, tabb1, nb, mult, 0);
+        taba[na] = mp_mul1_dec(taba, taba, na, mult, 0);
+    }
+
+#ifdef DEBUG_DIV_SLOW
+    printf("mult=" FMT_LIMB "\n", mult);
+    mp_print_str_dec("a_norm", taba, na + 1);
+    mp_print_str_dec("b_norm", tabb, nb);
+#endif
+
+    for(; i >= 0; i--) {
+        if (unlikely(taba[i + nb] >= tabb[nb - 1])) {
+            /* XXX: check if it is really possible */
+            q = base - 1;
+        } else {
+            muldq(t1, t0, taba[i + nb], base);
+            adddq(t1, t0, 0, taba[i + nb - 1]);
+            divdq(q, r, t1, t0, tabb[nb - 1]);
+        }
+        //        printf("i=%d q1=%ld\n", i, q);
+
+        r = mp_sub_mul1_dec(taba + i, tabb, nb, q);
+        //        mp_dump("r1", taba + i, nb, bd);
+        //        printf("r2=%ld\n", r);
+
+        v = taba[i + nb];
+        a = v - r;
+        c = a > v;
+        if (c)
+            a += base;
+        taba[i + nb] = a;
+
+        if (c != 0) {
+            /* negative result */
+            for(;;) {
+                q--;
+                c = mp_add_dec(taba + i, taba + i, tabb, nb, 0);
+                /* propagate carry and test if positive result */
+                if (c != 0) {
+                    if (++taba[i + nb] == base) {
+                        break;
+                    }
+                }
+            }
+        }
+        tabq[i] = q;
+    }
+
+#ifdef DEBUG_DIV_SLOW
+    mp_print_str_dec("q", tabq, na - nb + 1);
+    mp_print_str_dec("r", taba, nb);
+#endif
+
+    /* remove the normalization */
+    if (mult != 1) {
+        mp_div1_dec(taba, taba, nb, mult, 0);
+        if (unlikely(tabb != static_tabb))
+            bf_free(s, tabb);
+    }
+    return 0;
+}
+
+/* divide by 10^shift */
+static limb_t mp_shr_dec(limb_t *tab_r, const limb_t *tab, mp_size_t n,
+                         limb_t shift, limb_t high)
+{
+    mp_size_t i;
+    limb_t l, a, q, r;
+
+    assert(shift >= 1 && shift < LIMB_DIGITS);
+    l = high;
+    for(i = n - 1; i >= 0; i--) {
+        a = tab[i];
+        fast_shr_rem_dec(q, r, a, shift);
+        tab_r[i] = q + l * mp_pow_dec[LIMB_DIGITS - shift];
+        l = r;
+    }
+    return l;
+}
+
+/* multiply by 10^shift */
+static limb_t mp_shl_dec(limb_t *tab_r, const limb_t *tab, mp_size_t n,
+                         limb_t shift, limb_t low)
+{
+    mp_size_t i;
+    limb_t l, a, q, r;
+
+    assert(shift >= 1 && shift < LIMB_DIGITS);
+    l = low;
+    for(i = 0; i < n; i++) {
+        a = tab[i];
+        fast_shr_rem_dec(q, r, a, LIMB_DIGITS - shift);
+        tab_r[i] = r * mp_pow_dec[shift] + l;
+        l = q;
+    }
+    return l;
+}
+
+static limb_t mp_sqrtrem2_dec(limb_t *tabs, limb_t *taba)
+{
+    int k;
+    dlimb_t a, b, r;
+    limb_t taba1[2], s, r0, r1;
+
+    /* convert to binary and normalize */
+    a = (dlimb_t)taba[1] * BF_DEC_BASE + taba[0];
+    k = clz(a >> LIMB_BITS) & ~1;
+    b = a << k;
+    taba1[0] = b;
+    taba1[1] = b >> LIMB_BITS;
+    mp_sqrtrem2(&s, taba1);
+    s >>= (k >> 1);
+    /* convert the remainder back to decimal */
+    r = a - (dlimb_t)s * (dlimb_t)s;
+    divdq_base(r1, r0, r >> LIMB_BITS, r);
+    taba[0] = r0;
+    tabs[0] = s;
+    return r1;
+}
+
+//#define DEBUG_SQRTREM_DEC
+
+/* tmp_buf must contain (n / 2 + 1 limbs) */
+static limb_t mp_sqrtrem_rec_dec(limb_t *tabs, limb_t *taba, limb_t n,
+                                 limb_t *tmp_buf)
+{
+    limb_t l, h, rh, ql, qh, c, i;
+
+    if (n == 1)
+        return mp_sqrtrem2_dec(tabs, taba);
+#ifdef DEBUG_SQRTREM_DEC
+    mp_print_str_dec("a", taba, 2 * n);
+#endif
+    l = n / 2;
+    h = n - l;
+    qh = mp_sqrtrem_rec_dec(tabs + l, taba + 2 * l, h, tmp_buf);
+#ifdef DEBUG_SQRTREM_DEC
+    mp_print_str_dec("s1", tabs + l, h);
+    mp_print_str_h_dec("r1", taba + 2 * l, h, qh);
+    mp_print_str_h_dec("r2", taba + l, n, qh);
+#endif
+
+    /* the remainder is in taba + 2 * l. Its high bit is in qh */
+    if (qh) {
+        mp_sub_dec(taba + 2 * l, taba + 2 * l, tabs + l, h, 0);
+    }
+    /* instead of dividing by 2*s, divide by s (which is normalized)
+       and update q and r */
+    mp_div_dec(NULL, tmp_buf, taba + l, n, tabs + l, h);
+    qh += tmp_buf[l];
+    for(i = 0; i < l; i++)
+        tabs[i] = tmp_buf[i];
+    ql = mp_div1_dec(tabs, tabs, l, 2, qh & 1);
+    qh = qh >> 1; /* 0 or 1 */
+    if (ql)
+        rh = mp_add_dec(taba + l, taba + l, tabs + l, h, 0);
+    else
+        rh = 0;
+#ifdef DEBUG_SQRTREM_DEC
+    mp_print_str_h_dec("q", tabs, l, qh);
+    mp_print_str_h_dec("u", taba + l, h, rh);
+#endif
+
+    mp_add_ui_dec(tabs + l, qh, h);
+#ifdef DEBUG_SQRTREM_DEC
+    mp_print_str_dec("s2", tabs, n);
+#endif
+
+    /* q = qh, tabs[l - 1 ... 0], r = taba[n - 1 ... l] */
+    /* subtract q^2. if qh = 1 then q = B^l, so we can take shortcuts */
+    if (qh) {
+        c = qh;
+    } else {
+        mp_mul_basecase_dec(taba + n, tabs, l, tabs, l);
+        c = mp_sub_dec(taba, taba, taba + n, 2 * l, 0);
+    }
+    rh -= mp_sub_ui_dec(taba + 2 * l, c, n - 2 * l);
+    if ((slimb_t)rh < 0) {
+        mp_sub_ui_dec(tabs, 1, n);
+        rh += mp_add_mul1_dec(taba, tabs, n, 2);
+        rh += mp_add_ui_dec(taba, 1, n);
+    }
+    return rh;
+}
+
+/* 'taba' has 2*n limbs with n >= 1 and taba[2*n-1] >= B/4. Return (s,
+   r) with s=floor(sqrt(a)) and r=a-s^2. 0 <= r <= 2 * s. tabs has n
+   limbs. r is returned in the lower n limbs of taba. Its r[n] is the
+   returned value of the function. */
+int mp_sqrtrem_dec(bf_context_t *s, limb_t *tabs, limb_t *taba, limb_t n)
+{
+    limb_t tmp_buf1[8];
+    limb_t *tmp_buf;
+    mp_size_t n2;
+    n2 = n / 2 + 1;
+    if (n2 <= countof(tmp_buf1)) {
+        tmp_buf = tmp_buf1;
+    } else {
+        tmp_buf = bf_malloc(s, sizeof(limb_t) * n2);
+        if (!tmp_buf)
+            return -1;
+    }
+    taba[n] = mp_sqrtrem_rec_dec(tabs, taba, n, tmp_buf);
+    if (tmp_buf != tmp_buf1)
+        bf_free(s, tmp_buf);
+    return 0;
+}
+
+/* return the number of leading zero digits, from 0 to LIMB_DIGITS */
+static int clz_dec(limb_t a)
+{
+    if (a == 0)
+        return LIMB_DIGITS;
+    switch(LIMB_BITS - 1 - clz(a)) {
+    case 0: /* 1-1 */
+        return LIMB_DIGITS - 1;
+    case 1: /* 2-3 */
+        return LIMB_DIGITS - 1;
+    case 2: /* 4-7 */
+        return LIMB_DIGITS - 1;
+    case 3: /* 8-15 */
+        if (a < 10)
+            return LIMB_DIGITS - 1;
+        else
+            return LIMB_DIGITS - 2;
+    case 4: /* 16-31 */
+        return LIMB_DIGITS - 2;
+    case 5: /* 32-63 */
+        return LIMB_DIGITS - 2;
+    case 6: /* 64-127 */
+        if (a < 100)
+            return LIMB_DIGITS - 2;
+        else
+            return LIMB_DIGITS - 3;
+    case 7: /* 128-255 */
+        return LIMB_DIGITS - 3;
+    case 8: /* 256-511 */
+        return LIMB_DIGITS - 3;
+    case 9: /* 512-1023 */
+        if (a < 1000)
+            return LIMB_DIGITS - 3;
+        else
+            return LIMB_DIGITS - 4;
+    case 10: /* 1024-2047 */
+        return LIMB_DIGITS - 4;
+    case 11: /* 2048-4095 */
+        return LIMB_DIGITS - 4;
+    case 12: /* 4096-8191 */
+        return LIMB_DIGITS - 4;
+    case 13: /* 8192-16383 */
+        if (a < 10000)
+            return LIMB_DIGITS - 4;
+        else
+            return LIMB_DIGITS - 5;
+    case 14: /* 16384-32767 */
+        return LIMB_DIGITS - 5;
+    case 15: /* 32768-65535 */
+        return LIMB_DIGITS - 5;
+    case 16: /* 65536-131071 */
+        if (a < 100000)
+            return LIMB_DIGITS - 5;
+        else
+            return LIMB_DIGITS - 6;
+    case 17: /* 131072-262143 */
+        return LIMB_DIGITS - 6;
+    case 18: /* 262144-524287 */
+        return LIMB_DIGITS - 6;
+    case 19: /* 524288-1048575 */
+        if (a < 1000000)
+            return LIMB_DIGITS - 6;
+        else
+            return LIMB_DIGITS - 7;
+    case 20: /* 1048576-2097151 */
+        return LIMB_DIGITS - 7;
+    case 21: /* 2097152-4194303 */
+        return LIMB_DIGITS - 7;
+    case 22: /* 4194304-8388607 */
+        return LIMB_DIGITS - 7;
+    case 23: /* 8388608-16777215 */
+        if (a < 10000000)
+            return LIMB_DIGITS - 7;
+        else
+            return LIMB_DIGITS - 8;
+    case 24: /* 16777216-33554431 */
+        return LIMB_DIGITS - 8;
+    case 25: /* 33554432-67108863 */
+        return LIMB_DIGITS - 8;
+    case 26: /* 67108864-134217727 */
+        if (a < 100000000)
+            return LIMB_DIGITS - 8;
+        else
+            return LIMB_DIGITS - 9;
+#if LIMB_BITS == 64
+    case 27: /* 134217728-268435455 */
+        return LIMB_DIGITS - 9;
+    case 28: /* 268435456-536870911 */
+        return LIMB_DIGITS - 9;
+    case 29: /* 536870912-1073741823 */
+        if (a < 1000000000)
+            return LIMB_DIGITS - 9;
+        else
+            return LIMB_DIGITS - 10;
+    case 30: /* 1073741824-2147483647 */
+        return LIMB_DIGITS - 10;
+    case 31: /* 2147483648-4294967295 */
+        return LIMB_DIGITS - 10;
+    case 32: /* 4294967296-8589934591 */
+        return LIMB_DIGITS - 10;
+    case 33: /* 8589934592-17179869183 */
+        if (a < 10000000000)
+            return LIMB_DIGITS - 10;
+        else
+            return LIMB_DIGITS - 11;
+    case 34: /* 17179869184-34359738367 */
+        return LIMB_DIGITS - 11;
+    case 35: /* 34359738368-68719476735 */
+        return LIMB_DIGITS - 11;
+    case 36: /* 68719476736-137438953471 */
+        if (a < 100000000000)
+            return LIMB_DIGITS - 11;
+        else
+            return LIMB_DIGITS - 12;
+    case 37: /* 137438953472-274877906943 */
+        return LIMB_DIGITS - 12;
+    case 38: /* 274877906944-549755813887 */
+        return LIMB_DIGITS - 12;
+    case 39: /* 549755813888-1099511627775 */
+        if (a < 1000000000000)
+            return LIMB_DIGITS - 12;
+        else
+            return LIMB_DIGITS - 13;
+    case 40: /* 1099511627776-2199023255551 */
+        return LIMB_DIGITS - 13;
+    case 41: /* 2199023255552-4398046511103 */
+        return LIMB_DIGITS - 13;
+    case 42: /* 4398046511104-8796093022207 */
+        return LIMB_DIGITS - 13;
+    case 43: /* 8796093022208-17592186044415 */
+        if (a < 10000000000000)
+            return LIMB_DIGITS - 13;
+        else
+            return LIMB_DIGITS - 14;
+    case 44: /* 17592186044416-35184372088831 */
+        return LIMB_DIGITS - 14;
+    case 45: /* 35184372088832-70368744177663 */
+        return LIMB_DIGITS - 14;
+    case 46: /* 70368744177664-140737488355327 */
+        if (a < 100000000000000)
+            return LIMB_DIGITS - 14;
+        else
+            return LIMB_DIGITS - 15;
+    case 47: /* 140737488355328-281474976710655 */
+        return LIMB_DIGITS - 15;
+    case 48: /* 281474976710656-562949953421311 */
+        return LIMB_DIGITS - 15;
+    case 49: /* 562949953421312-1125899906842623 */
+        if (a < 1000000000000000)
+            return LIMB_DIGITS - 15;
+        else
+            return LIMB_DIGITS - 16;
+    case 50: /* 1125899906842624-2251799813685247 */
+        return LIMB_DIGITS - 16;
+    case 51: /* 2251799813685248-4503599627370495 */
+        return LIMB_DIGITS - 16;
+    case 52: /* 4503599627370496-9007199254740991 */
+        return LIMB_DIGITS - 16;
+    case 53: /* 9007199254740992-18014398509481983 */
+        if (a < 10000000000000000)
+            return LIMB_DIGITS - 16;
+        else
+            return LIMB_DIGITS - 17;
+    case 54: /* 18014398509481984-36028797018963967 */
+        return LIMB_DIGITS - 17;
+    case 55: /* 36028797018963968-72057594037927935 */
+        return LIMB_DIGITS - 17;
+    case 56: /* 72057594037927936-144115188075855871 */
+        if (a < 100000000000000000)
+            return LIMB_DIGITS - 17;
+        else
+            return LIMB_DIGITS - 18;
+    case 57: /* 144115188075855872-288230376151711743 */
+        return LIMB_DIGITS - 18;
+    case 58: /* 288230376151711744-576460752303423487 */
+        return LIMB_DIGITS - 18;
+    case 59: /* 576460752303423488-1152921504606846975 */
+        if (a < 1000000000000000000)
+            return LIMB_DIGITS - 18;
+        else
+            return LIMB_DIGITS - 19;
+#endif
+    default:
+        return 0;
+    }
+}
+
+/* for debugging */
+void bfdec_print_str(const char *str, const bfdec_t *a)
+{
+    slimb_t i;
+    printf("%s=", str);
+
+    if (a->expn == BF_EXP_NAN) {
+        printf("NaN");
+    } else {
+        if (a->sign)
+            putchar('-');
+        if (a->expn == BF_EXP_ZERO) {
+            putchar('0');
+        } else if (a->expn == BF_EXP_INF) {
+            printf("Inf");
+        } else {
+            printf("0.");
+            for(i = a->len - 1; i >= 0; i--)
+                printf("%0*" PRIu_LIMB, LIMB_DIGITS, a->tab[i]);
+            printf("e%" PRId_LIMB, a->expn);
+        }
+    }
+    printf("\n");
+}
+
+/* return != 0 if one digit between 0 and bit_pos inclusive is not zero. */
+static inline limb_t scan_digit_nz(const bfdec_t *r, slimb_t bit_pos)
+{
+    slimb_t pos;
+    limb_t v, q;
+    int shift;
+
+    if (bit_pos < 0)
+        return 0;
+    pos = (limb_t)bit_pos / LIMB_DIGITS;
+    shift = (limb_t)bit_pos % LIMB_DIGITS;
+    fast_shr_rem_dec(q, v, r->tab[pos], shift + 1);
+    (void)q;
+    if (v != 0)
+        return 1;
+    pos--;
+    while (pos >= 0) {
+        if (r->tab[pos] != 0)
+            return 1;
+        pos--;
+    }
+    return 0;
+}
+
+static limb_t get_digit(const limb_t *tab, limb_t len, slimb_t pos)
+{
+    slimb_t i;
+    int shift;
+    i = floor_div(pos, LIMB_DIGITS);
+    if (i < 0 || i >= len)
+        return 0;
+    shift = pos - i * LIMB_DIGITS;
+    return fast_shr_dec(tab[i], shift) % 10;
+}
+
+#if 0
+static limb_t get_digits(const limb_t *tab, limb_t len, slimb_t pos)
+{
+    limb_t a0, a1;
+    int shift;
+    slimb_t i;
+
+    i = floor_div(pos, LIMB_DIGITS);
+    shift = pos - i * LIMB_DIGITS;
+    if (i >= 0 && i < len)
+        a0 = tab[i];
+    else
+        a0 = 0;
+    if (shift == 0) {
+        return a0;
+    } else {
+        i++;
+        if (i >= 0 && i < len)
+            a1 = tab[i];
+        else
+            a1 = 0;
+        return fast_shr_dec(a0, shift) +
+            fast_urem(a1, &mp_pow_div[LIMB_DIGITS - shift]) *
+            mp_pow_dec[shift];
+    }
+}
+#endif
+
+/* return the addend for rounding. Note that prec can be <= 0 for bf_rint() */
+static int bfdec_get_rnd_add(int *pret, const bfdec_t *r, limb_t l,
+                             slimb_t prec, int rnd_mode)
+{
+    int add_one, inexact;
+    limb_t digit1, digit0;
+
+    //    bfdec_print_str("get_rnd_add", r);
+    if (rnd_mode == BF_RNDF) {
+        digit0 = 1; /* faithful rounding does not honor the INEXACT flag */
+    } else {
+        /* starting limb for bit 'prec + 1' */
+        digit0 = scan_digit_nz(r, l * LIMB_DIGITS - 1 - bf_max(0, prec + 1));
+    }
+
+    /* get the digit at 'prec' */
+    digit1 = get_digit(r->tab, l, l * LIMB_DIGITS - 1 - prec);
+    inexact = (digit1 | digit0) != 0;
+
+    add_one = 0;
+    switch(rnd_mode) {
+    case BF_RNDZ:
+        break;
+    case BF_RNDN:
+        if (digit1 == 5) {
+            if (digit0) {
+                add_one = 1;
+            } else {
+                /* round to even */
+                add_one =
+                    get_digit(r->tab, l, l * LIMB_DIGITS - 1 - (prec - 1)) & 1;
+            }
+        } else if (digit1 > 5) {
+            add_one = 1;
+        }
+        break;
+    case BF_RNDD:
+    case BF_RNDU:
+        if (r->sign == (rnd_mode == BF_RNDD))
+            add_one = inexact;
+        break;
+    case BF_RNDNA:
+    case BF_RNDF:
+        add_one = (digit1 >= 5);
+        break;
+    case BF_RNDA:
+        add_one = inexact;
+        break;
+    default:
+        abort();
+    }
+
+    if (inexact)
+        *pret |= BF_ST_INEXACT;
+    return add_one;
+}
+
+/* round to prec1 bits assuming 'r' is non zero and finite. 'r' is
+   assumed to have length 'l' (1 <= l <= r->len). prec1 can be
+   BF_PREC_INF. BF_FLAG_SUBNORMAL is not supported. Cannot fail with
+   BF_ST_MEM_ERROR.
+ */
+static int __bfdec_round(bfdec_t *r, limb_t prec1, bf_flags_t flags, limb_t l)
+{
+    int shift, add_one, rnd_mode, ret;
+    slimb_t i, bit_pos, pos, e_min, e_max, e_range, prec;
+
+    /* XXX: align to IEEE 754 2008 for decimal numbers ? */
+    e_range = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
+    e_min = -e_range + 3;
+    e_max = e_range;
+
+    if (flags & BF_FLAG_RADPNT_PREC) {
+        /* 'prec' is the precision after the decimal point */
+        if (prec1 != BF_PREC_INF)
+            prec = r->expn + prec1;
+        else
+            prec = prec1;
+    } else if (unlikely(r->expn < e_min) && (flags & BF_FLAG_SUBNORMAL)) {
+        /* restrict the precision in case of potentially subnormal
+           result */
+        assert(prec1 != BF_PREC_INF);
+        prec = prec1 - (e_min - r->expn);
+    } else {
+        prec = prec1;
+    }
+
+    /* round to prec bits */
+    rnd_mode = flags & BF_RND_MASK;
+    ret = 0;
+    add_one = bfdec_get_rnd_add(&ret, r, l, prec, rnd_mode);
+
+    if (prec <= 0) {
+        if (add_one) {
+            bfdec_resize(r, 1); /* cannot fail because r is non zero */
+            r->tab[0] = BF_DEC_BASE / 10;
+            r->expn += 1 - prec;
+            ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
+            return ret;
+        } else {
+            goto underflow;
+        }
+    } else if (add_one) {
+        limb_t carry;
+
+        /* add one starting at digit 'prec - 1' */
+        bit_pos = l * LIMB_DIGITS - 1 - (prec - 1);
+        pos = bit_pos / LIMB_DIGITS;
+        carry = mp_pow_dec[bit_pos % LIMB_DIGITS];
+        carry = mp_add_ui_dec(r->tab + pos, carry, l - pos);
+        if (carry) {
+            /* shift right by one digit */
+            mp_shr_dec(r->tab + pos, r->tab + pos, l - pos, 1, 1);
+            r->expn++;
+        }
+    }
+
+    /* check underflow */
+    if (unlikely(r->expn < e_min)) {
+        if (flags & BF_FLAG_SUBNORMAL) {
+            /* if inexact, also set the underflow flag */
+            if (ret & BF_ST_INEXACT)
+                ret |= BF_ST_UNDERFLOW;
+        } else {
+        underflow:
+            bfdec_set_zero(r, r->sign);
+            ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
+            return ret;
+        }
+    }
+
+    /* check overflow */
+    if (unlikely(r->expn > e_max)) {
+        bfdec_set_inf(r, r->sign);
+        ret |= BF_ST_OVERFLOW | BF_ST_INEXACT;
+        return ret;
+    }
+
+    /* keep the bits starting at 'prec - 1' */
+    bit_pos = l * LIMB_DIGITS - 1 - (prec - 1);
+    i = floor_div(bit_pos, LIMB_DIGITS);
+    if (i >= 0) {
+        shift = smod(bit_pos, LIMB_DIGITS);
+        if (shift != 0) {
+            r->tab[i] = fast_shr_dec(r->tab[i], shift) *
+                mp_pow_dec[shift];
+        }
+    } else {
+        i = 0;
+    }
+    /* remove trailing zeros */
+    while (r->tab[i] == 0)
+        i++;
+    if (i > 0) {
+        l -= i;
+        memmove(r->tab, r->tab + i, l * sizeof(limb_t));
+    }
+    bfdec_resize(r, l); /* cannot fail */
+    return ret;
+}
+
+/* Cannot fail with BF_ST_MEM_ERROR. */
+int bfdec_round(bfdec_t *r, limb_t prec, bf_flags_t flags)
+{
+    if (r->len == 0)
+        return 0;
+    return __bfdec_round(r, prec, flags, r->len);
+}
+
+/* 'r' must be a finite number. Cannot fail with BF_ST_MEM_ERROR.  */
+int bfdec_normalize_and_round(bfdec_t *r, limb_t prec1, bf_flags_t flags)
+{
+    limb_t l, v;
+    int shift, ret;
+
+    //    bfdec_print_str("bf_renorm", r);
+    l = r->len;
+    while (l > 0 && r->tab[l - 1] == 0)
+        l--;
+    if (l == 0) {
+        /* zero */
+        r->expn = BF_EXP_ZERO;
+        bfdec_resize(r, 0); /* cannot fail */
+        ret = 0;
+    } else {
+        r->expn -= (r->len - l) * LIMB_DIGITS;
+        /* shift to have the MSB set to '1' */
+        v = r->tab[l - 1];
+        shift = clz_dec(v);
+        if (shift != 0) {
+            mp_shl_dec(r->tab, r->tab, l, shift, 0);
+            r->expn -= shift;
+        }
+        ret = __bfdec_round(r, prec1, flags, l);
+    }
+    //    bf_print_str("r_final", r);
+    return ret;
+}
+
+int bfdec_set_ui(bfdec_t *r, uint64_t v)
+{
+#if LIMB_BITS == 32
+    if (v >= BF_DEC_BASE * BF_DEC_BASE) {
+        if (bfdec_resize(r, 3))
+            goto fail;
+        r->tab[0] = v % BF_DEC_BASE;
+        v /= BF_DEC_BASE;
+        r->tab[1] = v % BF_DEC_BASE;
+        r->tab[2] = v / BF_DEC_BASE;
+        r->expn = 3 * LIMB_DIGITS;
+    } else
+#endif
+    if (v >= BF_DEC_BASE) {
+        if (bfdec_resize(r, 2))
+            goto fail;
+        r->tab[0] = v % BF_DEC_BASE;
+        r->tab[1] = v / BF_DEC_BASE;
+        r->expn = 2 * LIMB_DIGITS;
+    } else {
+        if (bfdec_resize(r, 1))
+            goto fail;
+        r->tab[0] = v;
+        r->expn = LIMB_DIGITS;
+    }
+    r->sign = 0;
+    return bfdec_normalize_and_round(r, BF_PREC_INF, 0);
+ fail:
+    bfdec_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+int bfdec_set_si(bfdec_t *r, int64_t v)
+{
+    int ret;
+    if (v < 0) {
+        ret = bfdec_set_ui(r, -v);
+        r->sign = 1;
+    } else {
+        ret = bfdec_set_ui(r, v);
+    }
+    return ret;
+}
+
+static int bfdec_add_internal(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec, bf_flags_t flags, int b_neg)
+{
+    bf_context_t *s = r->ctx;
+    int is_sub, cmp_res, a_sign, b_sign, ret;
+
+    a_sign = a->sign;
+    b_sign = b->sign ^ b_neg;
+    is_sub = a_sign ^ b_sign;
+    cmp_res = bfdec_cmpu(a, b);
+    if (cmp_res < 0) {
+        const bfdec_t *tmp;
+        tmp = a;
+        a = b;
+        b = tmp;
+        a_sign = b_sign; /* b_sign is never used later */
+    }
+    /* abs(a) >= abs(b) */
+    if (cmp_res == 0 && is_sub && a->expn < BF_EXP_INF) {
+        /* zero result */
+        bfdec_set_zero(r, (flags & BF_RND_MASK) == BF_RNDD);
+        ret = 0;
+    } else if (a->len == 0 || b->len == 0) {
+        ret = 0;
+        if (a->expn >= BF_EXP_INF) {
+            if (a->expn == BF_EXP_NAN) {
+                /* at least one operand is NaN */
+                bfdec_set_nan(r);
+                ret = 0;
+            } else if (b->expn == BF_EXP_INF && is_sub) {
+                /* infinities with different signs */
+                bfdec_set_nan(r);
+                ret = BF_ST_INVALID_OP;
+            } else {
+                bfdec_set_inf(r, a_sign);
+            }
+        } else {
+            /* at least one zero and not subtract */
+            if (bfdec_set(r, a))
+                return BF_ST_MEM_ERROR;
+            r->sign = a_sign;
+            goto renorm;
+        }
+    } else {
+        slimb_t d, a_offset, b_offset, i, r_len;
+        limb_t carry;
+        limb_t *b1_tab;
+        int b_shift;
+        mp_size_t b1_len;
+
+        d = a->expn - b->expn;
+
+        /* XXX: not efficient in time and memory if the precision is
+           not infinite */
+        r_len = bf_max(a->len, b->len + (d + LIMB_DIGITS - 1) / LIMB_DIGITS);
+        if (bfdec_resize(r, r_len))
+            goto fail;
+        r->sign = a_sign;
+        r->expn = a->expn;
+
+        a_offset = r_len - a->len;
+        for(i = 0; i < a_offset; i++)
+            r->tab[i] = 0;
+        for(i = 0; i < a->len; i++)
+            r->tab[a_offset + i] = a->tab[i];
+
+        b_shift = d % LIMB_DIGITS;
+        if (b_shift == 0) {
+            b1_len = b->len;
+            b1_tab = (limb_t *)b->tab;
+        } else {
+            b1_len = b->len + 1;
+            b1_tab = bf_malloc(s, sizeof(limb_t) * b1_len);
+            if (!b1_tab)
+                goto fail;
+            b1_tab[0] = mp_shr_dec(b1_tab + 1, b->tab, b->len, b_shift, 0) *
+                mp_pow_dec[LIMB_DIGITS - b_shift];
+        }
+        b_offset = r_len - (b->len + (d + LIMB_DIGITS - 1) / LIMB_DIGITS);
+
+        if (is_sub) {
+            carry = mp_sub_dec(r->tab + b_offset, r->tab + b_offset,
+                               b1_tab, b1_len, 0);
+            if (carry != 0) {
+                carry = mp_sub_ui_dec(r->tab + b_offset + b1_len, carry,
+                                      r_len - (b_offset + b1_len));
+                assert(carry == 0);
+            }
+        } else {
+            carry = mp_add_dec(r->tab + b_offset, r->tab + b_offset,
+                               b1_tab, b1_len, 0);
+            if (carry != 0) {
+                carry = mp_add_ui_dec(r->tab + b_offset + b1_len, carry,
+                                      r_len - (b_offset + b1_len));
+            }
+            if (carry != 0) {
+                if (bfdec_resize(r, r_len + 1)) {
+                    if (b_shift != 0)
+                        bf_free(s, b1_tab);
+                    goto fail;
+                }
+                r->tab[r_len] = 1;
+                r->expn += LIMB_DIGITS;
+            }
+        }
+        if (b_shift != 0)
+            bf_free(s, b1_tab);
+    renorm:
+        ret = bfdec_normalize_and_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bfdec_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+static int __bfdec_add(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+                     bf_flags_t flags)
+{
+    return bfdec_add_internal(r, a, b, prec, flags, 0);
+}
+
+static int __bfdec_sub(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+                     bf_flags_t flags)
+{
+    return bfdec_add_internal(r, a, b, prec, flags, 1);
+}
+
+int bfdec_add(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags)
+{
+    return bf_op2((bf_t *)r, (bf_t *)a, (bf_t *)b, prec, flags,
+                  (bf_op2_func_t *)__bfdec_add);
+}
+
+int bfdec_sub(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags)
+{
+    return bf_op2((bf_t *)r, (bf_t *)a, (bf_t *)b, prec, flags,
+                  (bf_op2_func_t *)__bfdec_sub);
+}
+
+int bfdec_mul(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags)
+{
+    int ret, r_sign;
+
+    if (a->len < b->len) {
+        const bfdec_t *tmp = a;
+        a = b;
+        b = tmp;
+    }
+    r_sign = a->sign ^ b->sign;
+    /* here b->len <= a->len */
+    if (b->len == 0) {
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bfdec_set_nan(r);
+            ret = 0;
+        } else if (a->expn == BF_EXP_INF || b->expn == BF_EXP_INF) {
+            if ((a->expn == BF_EXP_INF && b->expn == BF_EXP_ZERO) ||
+                (a->expn == BF_EXP_ZERO && b->expn == BF_EXP_INF)) {
+                bfdec_set_nan(r);
+                ret = BF_ST_INVALID_OP;
+            } else {
+                bfdec_set_inf(r, r_sign);
+                ret = 0;
+            }
+        } else {
+            bfdec_set_zero(r, r_sign);
+            ret = 0;
+        }
+    } else {
+        bfdec_t tmp, *r1 = NULL;
+        limb_t a_len, b_len;
+        limb_t *a_tab, *b_tab;
+
+        a_len = a->len;
+        b_len = b->len;
+        a_tab = a->tab;
+        b_tab = b->tab;
+
+        if (r == a || r == b) {
+            bfdec_init(r->ctx, &tmp);
+            r1 = r;
+            r = &tmp;
+        }
+        if (bfdec_resize(r, a_len + b_len)) {
+            bfdec_set_nan(r);
+            ret = BF_ST_MEM_ERROR;
+            goto done;
+        }
+        mp_mul_basecase_dec(r->tab, a_tab, a_len, b_tab, b_len);
+        r->sign = r_sign;
+        r->expn = a->expn + b->expn;
+        ret = bfdec_normalize_and_round(r, prec, flags);
+    done:
+        if (r == &tmp)
+            bfdec_move(r1, &tmp);
+    }
+    return ret;
+}
+
+int bfdec_mul_si(bfdec_t *r, const bfdec_t *a, int64_t b1, limb_t prec,
+                 bf_flags_t flags)
+{
+    bfdec_t b;
+    int ret;
+    bfdec_init(r->ctx, &b);
+    ret = bfdec_set_si(&b, b1);
+    ret |= bfdec_mul(r, a, &b, prec, flags);
+    bfdec_delete(&b);
+    return ret;
+}
+
+int bfdec_add_si(bfdec_t *r, const bfdec_t *a, int64_t b1, limb_t prec,
+                 bf_flags_t flags)
+{
+    bfdec_t b;
+    int ret;
+
+    bfdec_init(r->ctx, &b);
+    ret = bfdec_set_si(&b, b1);
+    ret |= bfdec_add(r, a, &b, prec, flags);
+    bfdec_delete(&b);
+    return ret;
+}
+
+static int __bfdec_div(bfdec_t *r, const bfdec_t *a, const bfdec_t *b,
+                       limb_t prec, bf_flags_t flags)
+{
+    int ret, r_sign;
+    limb_t n, nb, precl;
+
+    r_sign = a->sign ^ b->sign;
+    if (a->expn >= BF_EXP_INF || b->expn >= BF_EXP_INF) {
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bfdec_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF && b->expn == BF_EXP_INF) {
+            bfdec_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else if (a->expn == BF_EXP_INF) {
+            bfdec_set_inf(r, r_sign);
+            return 0;
+        } else {
+            bfdec_set_zero(r, r_sign);
+            return 0;
+        }
+    } else if (a->expn == BF_EXP_ZERO) {
+        if (b->expn == BF_EXP_ZERO) {
+            bfdec_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bfdec_set_zero(r, r_sign);
+            return 0;
+        }
+    } else if (b->expn == BF_EXP_ZERO) {
+        bfdec_set_inf(r, r_sign);
+        return BF_ST_DIVIDE_ZERO;
+    }
+
+    nb = b->len;
+    if (prec == BF_PREC_INF) {
+        /* infinite precision: return BF_ST_INVALID_OP if not an exact
+           result */
+        /* XXX: check */
+        precl = nb + 1;
+    } else if (flags & BF_FLAG_RADPNT_PREC) {
+        /* number of digits after the decimal point */
+        /* XXX: check (2 extra digits for rounding + 2 digits) */
+        precl = (bf_max(a->expn - b->expn, 0) + 2 +
+                 prec + 2 + LIMB_DIGITS - 1) / LIMB_DIGITS;
+    } else {
+        /* number of limbs of the quotient (2 extra digits for rounding) */
+        precl = (prec + 2 + LIMB_DIGITS - 1) / LIMB_DIGITS;
+    }
+    n = bf_max(a->len, precl);
+
+    {
+        limb_t *taba, na, i;
+        slimb_t d;
+
+        na = n + nb;
+        taba = bf_malloc(r->ctx, (na + 1) * sizeof(limb_t));
+        if (!taba)
+            goto fail;
+        d = na - a->len;
+        memset(taba, 0, d * sizeof(limb_t));
+        memcpy(taba + d, a->tab, a->len * sizeof(limb_t));
+        if (bfdec_resize(r, n + 1))
+            goto fail1;
+        if (mp_div_dec(r->ctx, r->tab, taba, na, b->tab, nb)) {
+        fail1:
+            bf_free(r->ctx, taba);
+            goto fail;
+        }
+        /* see if non zero remainder */
+        for(i = 0; i < nb; i++) {
+            if (taba[i] != 0)
+                break;
+        }
+        bf_free(r->ctx, taba);
+        if (i != nb) {
+            if (prec == BF_PREC_INF) {
+                bfdec_set_nan(r);
+                return BF_ST_INVALID_OP;
+            } else {
+                r->tab[0] |= 1;
+            }
+        }
+        r->expn = a->expn - b->expn + LIMB_DIGITS;
+        r->sign = r_sign;
+        ret = bfdec_normalize_and_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bfdec_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+int bfdec_div(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags)
+{
+    return bf_op2((bf_t *)r, (bf_t *)a, (bf_t *)b, prec, flags,
+                  (bf_op2_func_t *)__bfdec_div);
+}
+
+/* a and b must be finite numbers with a >= 0 and b > 0. 'q' is the
+   integer defined as floor(a/b) and r = a - q * b. */
+static void bfdec_tdivremu(bf_context_t *s, bfdec_t *q, bfdec_t *r,
+                           const bfdec_t *a, const bfdec_t *b)
+{
+    if (bfdec_cmpu(a, b) < 0) {
+        bfdec_set_ui(q, 0);
+        bfdec_set(r, a);
+    } else {
+        bfdec_div(q, a, b, 0, BF_RNDZ | BF_FLAG_RADPNT_PREC);
+        bfdec_mul(r, q, b, BF_PREC_INF, BF_RNDZ);
+        bfdec_sub(r, a, r, BF_PREC_INF, BF_RNDZ);
+    }
+}
+
+/* division and remainder.
+
+   rnd_mode is the rounding mode for the quotient. The additional
+   rounding mode BF_RND_EUCLIDIAN is supported.
+
+   'q' is an integer. 'r' is rounded with prec and flags (prec can be
+   BF_PREC_INF).
+*/
+int bfdec_divrem(bfdec_t *q, bfdec_t *r, const bfdec_t *a, const bfdec_t *b,
+                 limb_t prec, bf_flags_t flags, int rnd_mode)
+{
+    bf_context_t *s = q->ctx;
+    bfdec_t a1_s, *a1 = &a1_s;
+    bfdec_t b1_s, *b1 = &b1_s;
+    bfdec_t r1_s, *r1 = &r1_s;
+    int q_sign, res;
+    BOOL is_ceil, is_rndn;
+
+    assert(q != a && q != b);
+    assert(r != a && r != b);
+    assert(q != r);
+
+    if (a->len == 0 || b->len == 0) {
+        bfdec_set_zero(q, 0);
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bfdec_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF || b->expn == BF_EXP_ZERO) {
+            bfdec_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bfdec_set(r, a);
+            return bfdec_round(r, prec, flags);
+        }
+    }
+
+    q_sign = a->sign ^ b->sign;
+    is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA);
+    switch(rnd_mode) {
+    default:
+    case BF_RNDZ:
+    case BF_RNDN:
+    case BF_RNDNA:
+        is_ceil = FALSE;
+        break;
+    case BF_RNDD:
+        is_ceil = q_sign;
+        break;
+    case BF_RNDU:
+        is_ceil = q_sign ^ 1;
+        break;
+    case BF_RNDA:
+        is_ceil = TRUE;
+        break;
+    case BF_DIVREM_EUCLIDIAN:
+        is_ceil = a->sign;
+        break;
+    }
+
+    a1->expn = a->expn;
+    a1->tab = a->tab;
+    a1->len = a->len;
+    a1->sign = 0;
+
+    b1->expn = b->expn;
+    b1->tab = b->tab;
+    b1->len = b->len;
+    b1->sign = 0;
+
+    //    bfdec_print_str("a1", a1);
+    //    bfdec_print_str("b1", b1);
+    /* XXX: could improve to avoid having a large 'q' */
+    bfdec_tdivremu(s, q, r, a1, b1);
+    if (bfdec_is_nan(q) || bfdec_is_nan(r))
+        goto fail;
+    //    bfdec_print_str("q", q);
+    //    bfdec_print_str("r", r);
+
+    if (r->len != 0) {
+        if (is_rndn) {
+            bfdec_init(s, r1);
+            if (bfdec_set(r1, r))
+                goto fail;
+            if (bfdec_mul_si(r1, r1, 2, BF_PREC_INF, BF_RNDZ)) {
+                bfdec_delete(r1);
+                goto fail;
+            }
+            res = bfdec_cmpu(r1, b);
+            bfdec_delete(r1);
+            if (res > 0 ||
+                (res == 0 &&
+                 (rnd_mode == BF_RNDNA ||
+                  (get_digit(q->tab, q->len, q->len * LIMB_DIGITS - q->expn) & 1) != 0))) {
+                goto do_sub_r;
+            }
+        } else if (is_ceil) {
+        do_sub_r:
+            res = bfdec_add_si(q, q, 1, BF_PREC_INF, BF_RNDZ);
+            res |= bfdec_sub(r, r, b1, BF_PREC_INF, BF_RNDZ);
+            if (res & BF_ST_MEM_ERROR)
+                goto fail;
+        }
+    }
+
+    r->sign ^= a->sign;
+    q->sign = q_sign;
+    return bfdec_round(r, prec, flags);
+ fail:
+    bfdec_set_nan(q);
+    bfdec_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+int bfdec_rem(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags, int rnd_mode)
+{
+    bfdec_t q_s, *q = &q_s;
+    int ret;
+
+    bfdec_init(r->ctx, q);
+    ret = bfdec_divrem(q, r, a, b, prec, flags, rnd_mode);
+    bfdec_delete(q);
+    return ret;
+}
+
+/* convert to integer (infinite precision) */
+int bfdec_rint(bfdec_t *r, int rnd_mode)
+{
+    return bfdec_round(r, 0, rnd_mode | BF_FLAG_RADPNT_PREC);
+}
+
+int bfdec_sqrt(bfdec_t *r, const bfdec_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = a->ctx;
+    int ret, k;
+    limb_t *a1, v;
+    slimb_t n, n1, prec1;
+    limb_t res;
+
+    assert(r != a);
+
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bfdec_set_nan(r);
+        } else if (a->expn == BF_EXP_INF && a->sign) {
+            goto invalid_op;
+        } else {
+            bfdec_set(r, a);
+        }
+        ret = 0;
+    } else if (a->sign || prec == BF_PREC_INF) {
+ invalid_op:
+        bfdec_set_nan(r);
+        ret = BF_ST_INVALID_OP;
+    } else {
+        if (flags & BF_FLAG_RADPNT_PREC) {
+            prec1 = bf_max(floor_div(a->expn + 1, 2) + prec, 1);
+        } else {
+            prec1 = prec;
+        }
+        /* convert the mantissa to an integer with at least 2 *
+           prec + 4 digits */
+        n = (2 * (prec1 + 2) + 2 * LIMB_DIGITS - 1) / (2 * LIMB_DIGITS);
+        if (bfdec_resize(r, n))
+            goto fail;
+        a1 = bf_malloc(s, sizeof(limb_t) * 2 * n);
+        if (!a1)
+            goto fail;
+        n1 = bf_min(2 * n, a->len);
+        memset(a1, 0, (2 * n - n1) * sizeof(limb_t));
+        memcpy(a1 + 2 * n - n1, a->tab + a->len - n1, n1 * sizeof(limb_t));
+        if (a->expn & 1) {
+            res = mp_shr_dec(a1, a1, 2 * n, 1, 0);
+        } else {
+            res = 0;
+        }
+        /* normalize so that a1 >= B^(2*n)/4. Not need for n = 1
+           because mp_sqrtrem2_dec already does it */
+        k = 0;
+        if (n > 1) {
+            v = a1[2 * n - 1];
+            while (v < BF_DEC_BASE / 4) {
+                k++;
+                v *= 4;
+            }
+            if (k != 0)
+                mp_mul1_dec(a1, a1, 2 * n, 1 << (2 * k), 0);
+        }
+        if (mp_sqrtrem_dec(s, r->tab, a1, n)) {
+            bf_free(s, a1);
+            goto fail;
+        }
+        if (k != 0)
+            mp_div1_dec(r->tab, r->tab, n, 1 << k, 0);
+        if (!res) {
+            res = mp_scan_nz(a1, n + 1);
+        }
+        bf_free(s, a1);
+        if (!res) {
+            res = mp_scan_nz(a->tab, a->len - n1);
+        }
+        if (res != 0)
+            r->tab[0] |= 1;
+        r->sign = 0;
+        r->expn = (a->expn + 1) >> 1;
+        ret = bfdec_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bfdec_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+/* The rounding mode is always BF_RNDZ. Return BF_ST_OVERFLOW if there
+   is an overflow and 0 otherwise. No memory error is possible. */
+int bfdec_get_int32(int *pres, const bfdec_t *a)
+{
+    uint32_t v;
+    int ret;
+    if (a->expn >= BF_EXP_INF) {
+        ret = 0;
+        if (a->expn == BF_EXP_INF) {
+            v = (uint32_t)INT32_MAX + a->sign;
+             /* XXX: return overflow ? */
+        } else {
+            v = INT32_MAX;
+        }
+    } else if (a->expn <= 0) {
+        v = 0;
+        ret = 0;
+    } else if (a->expn <= 9) {
+        v = fast_shr_dec(a->tab[a->len - 1], LIMB_DIGITS - a->expn);
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    } else if (a->expn == 10) {
+        uint64_t v1;
+        uint32_t v_max;
+#if LIMB_BITS == 64
+        v1 = fast_shr_dec(a->tab[a->len - 1], LIMB_DIGITS - a->expn);
+#else
+        v1 = (uint64_t)a->tab[a->len - 1] * 10 +
+            get_digit(a->tab, a->len, (a->len - 1) * LIMB_DIGITS - 1);
+#endif
+        v_max = (uint32_t)INT32_MAX + a->sign;
+        if (v1 > v_max) {
+            v = v_max;
+            ret = BF_ST_OVERFLOW;
+        } else {
+            v = v1;
+            if (a->sign)
+                v = -v;
+            ret = 0;
+        }
+    } else {
+        v = (uint32_t)INT32_MAX + a->sign;
+        ret = BF_ST_OVERFLOW;
+    }
+    *pres = v;
+    return ret;
+}
+
+/* power to an integer with infinite precision */
+int bfdec_pow_ui(bfdec_t *r, const bfdec_t *a, limb_t b)
+{
+    int ret, n_bits, i;
+
+    assert(r != a);
+    if (b == 0)
+        return bfdec_set_ui(r, 1);
+    ret = bfdec_set(r, a);
+    n_bits = LIMB_BITS - clz(b);
+    for(i = n_bits - 2; i >= 0; i--) {
+        ret |= bfdec_mul(r, r, r, BF_PREC_INF, BF_RNDZ);
+        if ((b >> i) & 1)
+            ret |= bfdec_mul(r, r, a, BF_PREC_INF, BF_RNDZ);
+    }
+    return ret;
+}
+
+char *bfdec_ftoa(size_t *plen, const bfdec_t *a, limb_t prec, bf_flags_t flags)
+{
+    return bf_ftoa_internal(plen, (const bf_t *)a, 10, prec, flags, TRUE);
+}
+
+int bfdec_atof(bfdec_t *r, const char *str, const char **pnext,
+               limb_t prec, bf_flags_t flags)
+{
+    slimb_t dummy_exp;
+    return bf_atof_internal((bf_t *)r, &dummy_exp, str, pnext, 10, prec,
+                            flags, TRUE);
+}
+
+#endif /* USE_BF_DEC */
+
+#ifdef USE_FFT_MUL
+/***************************************************************/
+/* Integer multiplication with FFT */
+
+/* or LIMB_BITS at bit position 'pos' in tab */
+static inline void put_bits(limb_t *tab, limb_t len, slimb_t pos, limb_t val)
+{
+    limb_t i;
+    int p;
+
+    i = pos >> LIMB_LOG2_BITS;
+    p = pos & (LIMB_BITS - 1);
+    if (i < len)
+        tab[i] |= val << p;
+    if (p != 0) {
+        i++;
+        if (i < len) {
+            tab[i] |= val >> (LIMB_BITS - p);
+        }
+    }
+}
+
+#if defined(__AVX2__)
+
+typedef double NTTLimb;
+
+/* we must have: modulo >= 1 << NTT_MOD_LOG2_MIN */
+#define NTT_MOD_LOG2_MIN 50
+#define NTT_MOD_LOG2_MAX 51
+#define NB_MODS 5
+#define NTT_PROOT_2EXP 39
+static const int ntt_int_bits[NB_MODS] = { 254, 203, 152, 101, 50, };
+
+static const limb_t ntt_mods[NB_MODS] = { 0x00073a8000000001, 0x0007858000000001, 0x0007a38000000001, 0x0007a68000000001, 0x0007fd8000000001,
+};
+
+static const limb_t ntt_proot[2][NB_MODS] = {
+    { 0x00056198d44332c8, 0x0002eb5d640aad39, 0x00047e31eaa35fd0, 0x0005271ac118a150, 0x00075e0ce8442bd5, },
+    { 0x000461169761bcc5, 0x0002dac3cb2da688, 0x0004abc97751e3bf, 0x000656778fc8c485, 0x0000dc6469c269fa, },
+};
+
+static const limb_t ntt_mods_cr[NB_MODS * (NB_MODS - 1) / 2] = {
+ 0x00020e4da740da8e, 0x0004c3dc09c09c1d, 0x000063bd097b4271, 0x000799d8f18f18fd,
+ 0x0005384222222264, 0x000572b07c1f07fe, 0x00035cd08888889a,
+ 0x00066015555557e3, 0x000725960b60b623,
+ 0x0002fc1fa1d6ce12,
+};
+
+#else
+
+typedef limb_t NTTLimb;
+
+#if LIMB_BITS == 64
+
+#define NTT_MOD_LOG2_MIN 61
+#define NTT_MOD_LOG2_MAX 62
+#define NB_MODS 5
+#define NTT_PROOT_2EXP 51
+static const int ntt_int_bits[NB_MODS] = { 307, 246, 185, 123, 61, };
+
+static const limb_t ntt_mods[NB_MODS] = { 0x28d8000000000001, 0x2a88000000000001, 0x2ed8000000000001, 0x3508000000000001, 0x3aa8000000000001,
+};
+
+static const limb_t ntt_proot[2][NB_MODS] = {
+    { 0x1b8ea61034a2bea7, 0x21a9762de58206fb, 0x02ca782f0756a8ea, 0x278384537a3e50a1, 0x106e13fee74ce0ab, },
+    { 0x233513af133e13b8, 0x1d13140d1c6f75f1, 0x12cde57f97e3eeda, 0x0d6149e23cbe654f, 0x36cd204f522a1379, },
+};
+
+static const limb_t ntt_mods_cr[NB_MODS * (NB_MODS - 1) / 2] = {
+ 0x08a9ed097b425eea, 0x18a44aaaaaaaaab3, 0x2493f57f57f57f5d, 0x126b8d0649a7f8d4,
+ 0x09d80ed7303b5ccc, 0x25b8bcf3cf3cf3d5, 0x2ce6ce63398ce638,
+ 0x0e31fad40a57eb59, 0x02a3529fd4a7f52f,
+ 0x3a5493e93e93e94a,
+};
+
+#elif LIMB_BITS == 32
+
+/* we must have: modulo >= 1 << NTT_MOD_LOG2_MIN */
+#define NTT_MOD_LOG2_MIN 29
+#define NTT_MOD_LOG2_MAX 30
+#define NB_MODS 5
+#define NTT_PROOT_2EXP 20
+static const int ntt_int_bits[NB_MODS] = { 148, 119, 89, 59, 29, };
+
+static const limb_t ntt_mods[NB_MODS] = { 0x0000000032b00001, 0x0000000033700001, 0x0000000036d00001, 0x0000000037300001, 0x000000003e500001,
+};
+
+static const limb_t ntt_proot[2][NB_MODS] = {
+    { 0x0000000032525f31, 0x0000000005eb3b37, 0x00000000246eda9f, 0x0000000035f25901, 0x00000000022f5768, },
+    { 0x00000000051eba1a, 0x00000000107be10e, 0x000000001cd574e0, 0x00000000053806e6, 0x000000002cd6bf98, },
+};
+
+static const limb_t ntt_mods_cr[NB_MODS * (NB_MODS - 1) / 2] = {
+ 0x000000000449559a, 0x000000001eba6ca9, 0x000000002ec18e46, 0x000000000860160b,
+ 0x000000000d321307, 0x000000000bf51120, 0x000000000f662938,
+ 0x000000000932ab3e, 0x000000002f40eef8,
+ 0x000000002e760905,
+};
+
+#endif /* LIMB_BITS */
+
+#endif /* !AVX2 */
+
+#if defined(__AVX2__)
+#define NTT_TRIG_K_MAX 18
+#else
+#define NTT_TRIG_K_MAX 19
+#endif
+
+typedef struct BFNTTState {
+    bf_context_t *ctx;
+
+    /* used for mul_mod_fast() */
+    limb_t ntt_mods_div[NB_MODS];
+
+    limb_t ntt_proot_pow[NB_MODS][2][NTT_PROOT_2EXP + 1];
+    limb_t ntt_proot_pow_inv[NB_MODS][2][NTT_PROOT_2EXP + 1];
+    NTTLimb *ntt_trig[NB_MODS][2][NTT_TRIG_K_MAX + 1];
+    /* 1/2^n mod m */
+    limb_t ntt_len_inv[NB_MODS][NTT_PROOT_2EXP + 1][2];
+#if defined(__AVX2__)
+    __m256d ntt_mods_cr_vec[NB_MODS * (NB_MODS - 1) / 2];
+    __m256d ntt_mods_vec[NB_MODS];
+    __m256d ntt_mods_inv_vec[NB_MODS];
+#else
+    limb_t ntt_mods_cr_inv[NB_MODS * (NB_MODS - 1) / 2];
+#endif
+} BFNTTState;
+
+static NTTLimb *get_trig(BFNTTState *s, int k, int inverse, int m_idx);
+
+/* add modulo with up to (LIMB_BITS-1) bit modulo */
+static inline limb_t add_mod(limb_t a, limb_t b, limb_t m)
+{
+    limb_t r;
+    r = a + b;
+    if (r >= m)
+        r -= m;
+    return r;
+}
+
+/* sub modulo with up to LIMB_BITS bit modulo */
+static inline limb_t sub_mod(limb_t a, limb_t b, limb_t m)
+{
+    limb_t r;
+    r = a - b;
+    if (r > a)
+        r += m;
+    return r;
+}
+
+/* return (r0+r1*B) mod m
+   precondition: 0 <= r0+r1*B < 2^(64+NTT_MOD_LOG2_MIN)
+*/
+static inline limb_t mod_fast(dlimb_t r,
+                                limb_t m, limb_t m_inv)
+{
+    limb_t a1, q, t0, r1, r0;
+
+    a1 = r >> NTT_MOD_LOG2_MIN;
+
+    q = ((dlimb_t)a1 * m_inv) >> LIMB_BITS;
+    r = r - (dlimb_t)q * m - m * 2;
+    r1 = r >> LIMB_BITS;
+    t0 = (slimb_t)r1 >> 1;
+    r += m & t0;
+    r0 = r;
+    r1 = r >> LIMB_BITS;
+    r0 += m & r1;
+    return r0;
+}
+
+/* faster version using precomputed modulo inverse.
+   precondition: 0 <= a * b < 2^(64+NTT_MOD_LOG2_MIN) */
+static inline limb_t mul_mod_fast(limb_t a, limb_t b,
+                                    limb_t m, limb_t m_inv)
+{
+    dlimb_t r;
+    r = (dlimb_t)a * (dlimb_t)b;
+    return mod_fast(r, m, m_inv);
+}
+
+static inline limb_t init_mul_mod_fast(limb_t m)
+{
+    dlimb_t t;
+    assert(m < (limb_t)1 << NTT_MOD_LOG2_MAX);
+    assert(m >= (limb_t)1 << NTT_MOD_LOG2_MIN);
+    t = (dlimb_t)1 << (LIMB_BITS + NTT_MOD_LOG2_MIN);
+    return t / m;
+}
+
+/* Faster version used when the multiplier is constant. 0 <= a < 2^64,
+   0 <= b < m. */
+static inline limb_t mul_mod_fast2(limb_t a, limb_t b,
+                                     limb_t m, limb_t b_inv)
+{
+    limb_t r, q;
+
+    q = ((dlimb_t)a * (dlimb_t)b_inv) >> LIMB_BITS;
+    r = a * b - q * m;
+    if (r >= m)
+        r -= m;
+    return r;
+}
+
+/* Faster version used when the multiplier is constant. 0 <= a < 2^64,
+   0 <= b < m. Let r = a * b mod m. The return value is 'r' or 'r +
+   m'. */
+static inline limb_t mul_mod_fast3(limb_t a, limb_t b,
+                                     limb_t m, limb_t b_inv)
+{
+    limb_t r, q;
+
+    q = ((dlimb_t)a * (dlimb_t)b_inv) >> LIMB_BITS;
+    r = a * b - q * m;
+    return r;
+}
+
+static inline limb_t init_mul_mod_fast2(limb_t b, limb_t m)
+{
+    return ((dlimb_t)b << LIMB_BITS) / m;
+}
+
+#ifdef __AVX2__
+
+static inline limb_t ntt_limb_to_int(NTTLimb a, limb_t m)
+{
+    slimb_t v;
+    v = a;
+    if (v < 0)
+        v += m;
+    if (v >= m)
+        v -= m;
+    return v;
+}
+
+static inline NTTLimb int_to_ntt_limb(limb_t a, limb_t m)
+{
+    return (slimb_t)a;
+}
+
+static inline NTTLimb int_to_ntt_limb2(limb_t a, limb_t m)
+{
+    if (a >= (m / 2))
+        a -= m;
+    return (slimb_t)a;
+}
+
+/* return r + m if r < 0 otherwise r. */
+static inline __m256d ntt_mod1(__m256d r, __m256d m)
+{
+    return _mm256_blendv_pd(r, r + m, r);
+}
+
+/* input: abs(r) < 2 * m. Output: abs(r) < m */
+static inline __m256d ntt_mod(__m256d r, __m256d mf, __m256d m2f)
+{
+    return _mm256_blendv_pd(r, r + m2f, r) - mf;
+}
+
+/* input: abs(a*b) < 2 * m^2, output: abs(r) < m */
+static inline __m256d ntt_mul_mod(__m256d a, __m256d b, __m256d mf,
+                                  __m256d m_inv)
+{
+    __m256d r, q, ab1, ab0, qm0, qm1;
+    ab1 = a * b;
+    q = _mm256_round_pd(ab1 * m_inv, 0); /* round to nearest */
+    qm1 = q * mf;
+    qm0 = _mm256_fmsub_pd(q, mf, qm1); /* low part */
+    ab0 = _mm256_fmsub_pd(a, b, ab1); /* low part */
+    r = (ab1 - qm1) + (ab0 - qm0);
+    return r;
+}
+
+static void *bf_aligned_malloc(bf_context_t *s, size_t size, size_t align)
+{
+    void *ptr;
+    void **ptr1;
+    ptr = bf_malloc(s, size + sizeof(void *) + align - 1);
+    if (!ptr)
+        return NULL;
+    ptr1 = (void **)(((uintptr_t)ptr + sizeof(void *) + align - 1) &
+                     ~(align - 1));
+    ptr1[-1] = ptr;
+    return ptr1;
+}
+
+static void bf_aligned_free(bf_context_t *s, void *ptr)
+{
+    if (!ptr)
+        return;
+    bf_free(s, ((void **)ptr)[-1]);
+}
+
+static void *ntt_malloc(BFNTTState *s, size_t size)
+{
+    return bf_aligned_malloc(s->ctx, size, 64);
+}
+
+static void ntt_free(BFNTTState *s, void *ptr)
+{
+    bf_aligned_free(s->ctx, ptr);
+}
+
+static no_inline int ntt_fft(BFNTTState *s,
+                             NTTLimb *out_buf, NTTLimb *in_buf,
+                             NTTLimb *tmp_buf, int fft_len_log2,
+                             int inverse, int m_idx)
+{
+    limb_t nb_blocks, fft_per_block, p, k, n, stride_in, i, j;
+    NTTLimb *tab_in, *tab_out, *tmp, *trig;
+    __m256d m_inv, mf, m2f, c, a0, a1, b0, b1;
+    limb_t m;
+    int l;
+
+    m = ntt_mods[m_idx];
+
+    m_inv = _mm256_set1_pd(1.0 / (double)m);
+    mf = _mm256_set1_pd(m);
+    m2f = _mm256_set1_pd(m * 2);
+
+    n = (limb_t)1 << fft_len_log2;
+    assert(n >= 8);
+    stride_in = n / 2;
+
+    tab_in = in_buf;
+    tab_out = tmp_buf;
+    trig = get_trig(s, fft_len_log2, inverse, m_idx);
+    if (!trig)
+        return -1;
+    p = 0;
+    for(k = 0; k < stride_in; k += 4) {
+        a0 = _mm256_load_pd(&tab_in[k]);
+        a1 = _mm256_load_pd(&tab_in[k + stride_in]);
+        c = _mm256_load_pd(trig);
+        trig += 4;
+        b0 = ntt_mod(a0 + a1, mf, m2f);
+        b1 = ntt_mul_mod(a0 - a1, c, mf, m_inv);
+        a0 = _mm256_permute2f128_pd(b0, b1, 0x20);
+        a1 = _mm256_permute2f128_pd(b0, b1, 0x31);
+        a0 = _mm256_permute4x64_pd(a0, 0xd8);
+        a1 = _mm256_permute4x64_pd(a1, 0xd8);
+        _mm256_store_pd(&tab_out[p], a0);
+        _mm256_store_pd(&tab_out[p + 4], a1);
+        p += 2 * 4;
+    }
+    tmp = tab_in;
+    tab_in = tab_out;
+    tab_out = tmp;
+
+    trig = get_trig(s, fft_len_log2 - 1, inverse, m_idx);
+    if (!trig)
+        return -1;
+    p = 0;
+    for(k = 0; k < stride_in; k += 4) {
+        a0 = _mm256_load_pd(&tab_in[k]);
+        a1 = _mm256_load_pd(&tab_in[k + stride_in]);
+        c = _mm256_setr_pd(trig[0], trig[0], trig[1], trig[1]);
+        trig += 2;
+        b0 = ntt_mod(a0 + a1, mf, m2f);
+        b1 = ntt_mul_mod(a0 - a1, c, mf, m_inv);
+        a0 = _mm256_permute2f128_pd(b0, b1, 0x20);
+        a1 = _mm256_permute2f128_pd(b0, b1, 0x31);
+        _mm256_store_pd(&tab_out[p], a0);
+        _mm256_store_pd(&tab_out[p + 4], a1);
+        p += 2 * 4;
+    }
+    tmp = tab_in;
+    tab_in = tab_out;
+    tab_out = tmp;
+
+    nb_blocks = n / 4;
+    fft_per_block = 4;
+
+    l = fft_len_log2 - 2;
+    while (nb_blocks != 2) {
+        nb_blocks >>= 1;
+        p = 0;
+        k = 0;
+        trig = get_trig(s, l, inverse, m_idx);
+        if (!trig)
+            return -1;
+        for(i = 0; i < nb_blocks; i++) {
+            c = _mm256_set1_pd(trig[0]);
+            trig++;
+            for(j = 0; j < fft_per_block; j += 4) {
+                a0 = _mm256_load_pd(&tab_in[k + j]);
+                a1 = _mm256_load_pd(&tab_in[k + j + stride_in]);
+                b0 = ntt_mod(a0 + a1, mf, m2f);
+                b1 = ntt_mul_mod(a0 - a1, c, mf, m_inv);
+                _mm256_store_pd(&tab_out[p + j], b0);
+                _mm256_store_pd(&tab_out[p + j + fft_per_block], b1);
+            }
+            k += fft_per_block;
+            p += 2 * fft_per_block;
+        }
+        fft_per_block <<= 1;
+        l--;
+        tmp = tab_in;
+        tab_in = tab_out;
+        tab_out = tmp;
+    }
+
+    tab_out = out_buf;
+    for(k = 0; k < stride_in; k += 4) {
+        a0 = _mm256_load_pd(&tab_in[k]);
+        a1 = _mm256_load_pd(&tab_in[k + stride_in]);
+        b0 = ntt_mod(a0 + a1, mf, m2f);
+        b1 = ntt_mod(a0 - a1, mf, m2f);
+        _mm256_store_pd(&tab_out[k], b0);
+        _mm256_store_pd(&tab_out[k + stride_in], b1);
+    }
+    return 0;
+}
+
+static void ntt_vec_mul(BFNTTState *s,
+                        NTTLimb *tab1, NTTLimb *tab2, limb_t fft_len_log2,
+                        int k_tot, int m_idx)
+{
+    limb_t i, c_inv, n, m;
+    __m256d m_inv, mf, a, b, c;
+
+    m = ntt_mods[m_idx];
+    c_inv = s->ntt_len_inv[m_idx][k_tot][0];
+    m_inv = _mm256_set1_pd(1.0 / (double)m);
+    mf = _mm256_set1_pd(m);
+    c = _mm256_set1_pd(int_to_ntt_limb(c_inv, m));
+    n = (limb_t)1 << fft_len_log2;
+    for(i = 0; i < n; i += 4) {
+        a = _mm256_load_pd(&tab1[i]);
+        b = _mm256_load_pd(&tab2[i]);
+        a = ntt_mul_mod(a, b, mf, m_inv);
+        a = ntt_mul_mod(a, c, mf, m_inv);
+        _mm256_store_pd(&tab1[i], a);
+    }
+}
+
+static no_inline void mul_trig(NTTLimb *buf,
+                               limb_t n, limb_t c1, limb_t m, limb_t m_inv1)
+{
+    limb_t i, c2, c3, c4;
+    __m256d c, c_mul, a0, mf, m_inv;
+    assert(n >= 2);
+
+    mf = _mm256_set1_pd(m);
+    m_inv = _mm256_set1_pd(1.0 / (double)m);
+
+    c2 = mul_mod_fast(c1, c1, m, m_inv1);
+    c3 = mul_mod_fast(c2, c1, m, m_inv1);
+    c4 = mul_mod_fast(c2, c2, m, m_inv1);
+    c = _mm256_setr_pd(1, int_to_ntt_limb(c1, m),
+                       int_to_ntt_limb(c2, m), int_to_ntt_limb(c3, m));
+    c_mul = _mm256_set1_pd(int_to_ntt_limb(c4, m));
+    for(i = 0; i < n; i += 4) {
+        a0 = _mm256_load_pd(&buf[i]);
+        a0 = ntt_mul_mod(a0, c, mf, m_inv);
+        _mm256_store_pd(&buf[i], a0);
+        c = ntt_mul_mod(c, c_mul, mf, m_inv);
+    }
+}
+
+#else
+
+static void *ntt_malloc(BFNTTState *s, size_t size)
+{
+    return bf_malloc(s->ctx, size);
+}
+
+static void ntt_free(BFNTTState *s, void *ptr)
+{
+    bf_free(s->ctx, ptr);
+}
+
+static inline limb_t ntt_limb_to_int(NTTLimb a, limb_t m)
+{
+    if (a >= m)
+        a -= m;
+    return a;
+}
+
+static inline NTTLimb int_to_ntt_limb(slimb_t a, limb_t m)
+{
+    return a;
+}
+
+static no_inline int ntt_fft(BFNTTState *s, NTTLimb *out_buf, NTTLimb *in_buf,
+                             NTTLimb *tmp_buf, int fft_len_log2,
+                             int inverse, int m_idx)
+{
+    limb_t nb_blocks, fft_per_block, p, k, n, stride_in, i, j, m, m2;
+    NTTLimb *tab_in, *tab_out, *tmp, a0, a1, b0, b1, c, *trig, c_inv;
+    int l;
+
+    m = ntt_mods[m_idx];
+    m2 = 2 * m;
+    n = (limb_t)1 << fft_len_log2;
+    nb_blocks = n;
+    fft_per_block = 1;
+    stride_in = n / 2;
+    tab_in = in_buf;
+    tab_out = tmp_buf;
+    l = fft_len_log2;
+    while (nb_blocks != 2) {
+        nb_blocks >>= 1;
+        p = 0;
+        k = 0;
+        trig = get_trig(s, l, inverse, m_idx);
+        if (!trig)
+            return -1;
+        for(i = 0; i < nb_blocks; i++) {
+            c = trig[0];
+            c_inv = trig[1];
+            trig += 2;
+            for(j = 0; j < fft_per_block; j++) {
+                a0 = tab_in[k + j];
+                a1 = tab_in[k + j + stride_in];
+                b0 = add_mod(a0, a1, m2);
+                b1 = a0 - a1 + m2;
+                b1 = mul_mod_fast3(b1, c, m, c_inv);
+                tab_out[p + j] = b0;
+                tab_out[p + j + fft_per_block] = b1;
+            }
+            k += fft_per_block;
+            p += 2 * fft_per_block;
+        }
+        fft_per_block <<= 1;
+        l--;
+        tmp = tab_in;
+        tab_in = tab_out;
+        tab_out = tmp;
+    }
+    /* no twiddle in last step */
+    tab_out = out_buf;
+    for(k = 0; k < stride_in; k++) {
+        a0 = tab_in[k];
+        a1 = tab_in[k + stride_in];
+        b0 = add_mod(a0, a1, m2);
+        b1 = sub_mod(a0, a1, m2);
+        tab_out[k] = b0;
+        tab_out[k + stride_in] = b1;
+    }
+    return 0;
+}
+
+static void ntt_vec_mul(BFNTTState *s,
+                        NTTLimb *tab1, NTTLimb *tab2, int fft_len_log2,
+                        int k_tot, int m_idx)
+{
+    limb_t i, norm, norm_inv, a, n, m, m_inv;
+
+    m = ntt_mods[m_idx];
+    m_inv = s->ntt_mods_div[m_idx];
+    norm = s->ntt_len_inv[m_idx][k_tot][0];
+    norm_inv = s->ntt_len_inv[m_idx][k_tot][1];
+    n = (limb_t)1 << fft_len_log2;
+    for(i = 0; i < n; i++) {
+        a = tab1[i];
+        /* need to reduce the range so that the product is <
+           2^(LIMB_BITS+NTT_MOD_LOG2_MIN) */
+        if (a >= m)
+            a -= m;
+        a = mul_mod_fast(a, tab2[i], m, m_inv);
+        a = mul_mod_fast3(a, norm, m, norm_inv);
+        tab1[i] = a;
+    }
+}
+
+static no_inline void mul_trig(NTTLimb *buf,
+                               limb_t n, limb_t c_mul, limb_t m, limb_t m_inv)
+{
+    limb_t i, c0, c_mul_inv;
+
+    c0 = 1;
+    c_mul_inv = init_mul_mod_fast2(c_mul, m);
+    for(i = 0; i < n; i++) {
+        buf[i] = mul_mod_fast(buf[i], c0, m, m_inv);
+        c0 = mul_mod_fast2(c0, c_mul, m, c_mul_inv);
+    }
+}
+
+#endif /* !AVX2 */
+
+static no_inline NTTLimb *get_trig(BFNTTState *s,
+                                   int k, int inverse, int m_idx)
+{
+    NTTLimb *tab;
+    limb_t i, n2, c, c_mul, m, c_mul_inv;
+
+    if (k > NTT_TRIG_K_MAX)
+        return NULL;
+
+    tab = s->ntt_trig[m_idx][inverse][k];
+    if (tab)
+        return tab;
+    n2 = (limb_t)1 << (k - 1);
+    m = ntt_mods[m_idx];
+#ifdef __AVX2__
+    tab = ntt_malloc(s, sizeof(NTTLimb) * n2);
+#else
+    tab = ntt_malloc(s, sizeof(NTTLimb) * n2 * 2);
+#endif
+    if (!tab)
+        return NULL;
+    c = 1;
+    c_mul = s->ntt_proot_pow[m_idx][inverse][k];
+    c_mul_inv = s->ntt_proot_pow_inv[m_idx][inverse][k];
+    for(i = 0; i < n2; i++) {
+#ifdef __AVX2__
+        tab[i] = int_to_ntt_limb2(c, m);
+#else
+        tab[2 * i] = int_to_ntt_limb(c, m);
+        tab[2 * i + 1] = init_mul_mod_fast2(c, m);
+#endif
+        c = mul_mod_fast2(c, c_mul, m, c_mul_inv);
+    }
+    s->ntt_trig[m_idx][inverse][k] = tab;
+    return tab;
+}
+
+void fft_clear_cache(bf_context_t *s1)
+{
+    int m_idx, inverse, k;
+    BFNTTState *s = s1->ntt_state;
+    if (s) {
+        for(m_idx = 0; m_idx < NB_MODS; m_idx++) {
+            for(inverse = 0; inverse < 2; inverse++) {
+                for(k = 0; k < NTT_TRIG_K_MAX + 1; k++) {
+                    if (s->ntt_trig[m_idx][inverse][k]) {
+                        ntt_free(s, s->ntt_trig[m_idx][inverse][k]);
+                        s->ntt_trig[m_idx][inverse][k] = NULL;
+                    }
+                }
+            }
+        }
+#if defined(__AVX2__)
+        bf_aligned_free(s1, s);
+#else
+        bf_free(s1, s);
+#endif
+        s1->ntt_state = NULL;
+    }
+}
+
+#define STRIP_LEN 16
+
+/* dst = buf1, src = buf2 */
+static int ntt_fft_partial(BFNTTState *s, NTTLimb *buf1,
+                           int k1, int k2, limb_t n1, limb_t n2, int inverse,
+                           limb_t m_idx)
+{
+    limb_t i, j, c_mul, c0, m, m_inv, strip_len, l;
+    NTTLimb *buf2, *buf3;
+
+    buf2 = NULL;
+    buf3 = ntt_malloc(s, sizeof(NTTLimb) * n1);
+    if (!buf3)
+        goto fail;
+    if (k2 == 0) {
+        if (ntt_fft(s, buf1, buf1, buf3, k1, inverse, m_idx))
+            goto fail;
+    } else {
+        strip_len = STRIP_LEN;
+        buf2 = ntt_malloc(s, sizeof(NTTLimb) * n1 * strip_len);
+        if (!buf2)
+            goto fail;
+        m = ntt_mods[m_idx];
+        m_inv = s->ntt_mods_div[m_idx];
+        c0 = s->ntt_proot_pow[m_idx][inverse][k1 + k2];
+        c_mul = 1;
+        assert((n2 % strip_len) == 0);
+        for(j = 0; j < n2; j += strip_len) {
+            for(i = 0; i < n1; i++) {
+                for(l = 0; l < strip_len; l++) {
+                    buf2[i + l * n1] = buf1[i * n2 + (j + l)];
+                }
+            }
+            for(l = 0; l < strip_len; l++) {
+                if (inverse)
+                    mul_trig(buf2 + l * n1, n1, c_mul, m, m_inv);
+                if (ntt_fft(s, buf2 + l * n1, buf2 + l * n1, buf3, k1, inverse, m_idx))
+                    goto fail;
+                if (!inverse)
+                    mul_trig(buf2 + l * n1, n1, c_mul, m, m_inv);
+                c_mul = mul_mod_fast(c_mul, c0, m, m_inv);
+            }
+
+            for(i = 0; i < n1; i++) {
+                for(l = 0; l < strip_len; l++) {
+                    buf1[i * n2 + (j + l)] = buf2[i + l *n1];
+                }
+            }
+        }
+        ntt_free(s, buf2);
+    }
+    ntt_free(s, buf3);
+    return 0;
+ fail:
+    ntt_free(s, buf2);
+    ntt_free(s, buf3);
+    return -1;
+}
+
+
+/* dst = buf1, src = buf2, tmp = buf3 */
+static int ntt_conv(BFNTTState *s, NTTLimb *buf1, NTTLimb *buf2,
+                    int k, int k_tot, limb_t m_idx)
+{
+    limb_t n1, n2, i;
+    int k1, k2;
+
+    if (k <= NTT_TRIG_K_MAX) {
+        k1 = k;
+    } else {
+        /* recursive split of the FFT */
+        k1 = bf_min(k / 2, NTT_TRIG_K_MAX);
+    }
+    k2 = k - k1;
+    n1 = (limb_t)1 << k1;
+    n2 = (limb_t)1 << k2;
+
+    if (ntt_fft_partial(s, buf1, k1, k2, n1, n2, 0, m_idx))
+        return -1;
+    if (ntt_fft_partial(s, buf2, k1, k2, n1, n2, 0, m_idx))
+        return -1;
+    if (k2 == 0) {
+        ntt_vec_mul(s, buf1, buf2, k, k_tot, m_idx);
+    } else {
+        for(i = 0; i < n1; i++) {
+            ntt_conv(s, buf1 + i * n2, buf2 + i * n2, k2, k_tot, m_idx);
+        }
+    }
+    if (ntt_fft_partial(s, buf1, k1, k2, n1, n2, 1, m_idx))
+        return -1;
+    return 0;
+}
+
+
+static no_inline void limb_to_ntt(BFNTTState *s,
+                                  NTTLimb *tabr, limb_t fft_len,
+                                  const limb_t *taba, limb_t a_len, int dpl,
+                                  int first_m_idx, int nb_mods)
+{
+    slimb_t i, n;
+    dlimb_t a, b;
+    int j, shift;
+    limb_t base_mask1, a0, a1, a2, r, m, m_inv;
+
+#if 0
+    for(i = 0; i < a_len; i++) {
+        printf("%" PRId64 ": " FMT_LIMB "\n",
+               (int64_t)i, taba[i]);
+    }
+#endif
+    memset(tabr, 0, sizeof(NTTLimb) * fft_len * nb_mods);
+    shift = dpl & (LIMB_BITS - 1);
+    if (shift == 0)
+        base_mask1 = -1;
+    else
+        base_mask1 = ((limb_t)1 << shift) - 1;
+    n = bf_min(fft_len, (a_len * LIMB_BITS + dpl - 1) / dpl);
+    for(i = 0; i < n; i++) {
+        a0 = get_bits(taba, a_len, i * dpl);
+        if (dpl <= LIMB_BITS) {
+            a0 &= base_mask1;
+            a = a0;
+        } else {
+            a1 = get_bits(taba, a_len, i * dpl + LIMB_BITS);
+            if (dpl <= (LIMB_BITS + NTT_MOD_LOG2_MIN)) {
+                a = a0 | ((dlimb_t)(a1 & base_mask1) << LIMB_BITS);
+            } else {
+                if (dpl > 2 * LIMB_BITS) {
+                    a2 = get_bits(taba, a_len, i * dpl + LIMB_BITS * 2) &
+                        base_mask1;
+                } else {
+                    a1 &= base_mask1;
+                    a2 = 0;
+                }
+                //            printf("a=0x%016lx%016lx%016lx\n", a2, a1, a0);
+                a = (a0 >> (LIMB_BITS - NTT_MOD_LOG2_MAX + NTT_MOD_LOG2_MIN)) |
+                    ((dlimb_t)a1 << (NTT_MOD_LOG2_MAX - NTT_MOD_LOG2_MIN)) |
+                    ((dlimb_t)a2 << (LIMB_BITS + NTT_MOD_LOG2_MAX - NTT_MOD_LOG2_MIN));
+                a0 &= ((limb_t)1 << (LIMB_BITS - NTT_MOD_LOG2_MAX + NTT_MOD_LOG2_MIN)) - 1;
+            }
+        }
+        for(j = 0; j < nb_mods; j++) {
+            m = ntt_mods[first_m_idx + j];
+            m_inv = s->ntt_mods_div[first_m_idx + j];
+            r = mod_fast(a, m, m_inv);
+            if (dpl > (LIMB_BITS + NTT_MOD_LOG2_MIN)) {
+                b = ((dlimb_t)r << (LIMB_BITS - NTT_MOD_LOG2_MAX + NTT_MOD_LOG2_MIN)) | a0;
+                r = mod_fast(b, m, m_inv);
+            }
+            tabr[i + j * fft_len] = int_to_ntt_limb(r, m);
+        }
+    }
+}
+
+#if defined(__AVX2__)
+
+#define VEC_LEN 4
+
+typedef union {
+    __m256d v;
+    double d[4];
+} VecUnion;
+
+static no_inline void ntt_to_limb(BFNTTState *s, limb_t *tabr, limb_t r_len,
+                                  const NTTLimb *buf, int fft_len_log2, int dpl,
+                                  int nb_mods)
+{
+    const limb_t *mods = ntt_mods + NB_MODS - nb_mods;
+    const __m256d *mods_cr_vec, *mf, *m_inv;
+    VecUnion y[NB_MODS];
+    limb_t u[NB_MODS], carry[NB_MODS], fft_len, base_mask1, r;
+    slimb_t i, len, pos;
+    int j, k, l, shift, n_limb1, p;
+    dlimb_t t;
+
+    j = NB_MODS * (NB_MODS - 1) / 2 - nb_mods * (nb_mods - 1) / 2;
+    mods_cr_vec = s->ntt_mods_cr_vec + j;
+    mf = s->ntt_mods_vec + NB_MODS - nb_mods;
+    m_inv = s->ntt_mods_inv_vec + NB_MODS - nb_mods;
+
+    shift = dpl & (LIMB_BITS - 1);
+    if (shift == 0)
+        base_mask1 = -1;
+    else
+        base_mask1 = ((limb_t)1 << shift) - 1;
+    n_limb1 = ((unsigned)dpl - 1) / LIMB_BITS;
+    for(j = 0; j < NB_MODS; j++)
+        carry[j] = 0;
+    for(j = 0; j < NB_MODS; j++)
+        u[j] = 0; /* avoid warnings */
+    memset(tabr, 0, sizeof(limb_t) * r_len);
+    fft_len = (limb_t)1 << fft_len_log2;
+    len = bf_min(fft_len, (r_len * LIMB_BITS + dpl - 1) / dpl);
+    len = (len + VEC_LEN - 1) & ~(VEC_LEN - 1);
+    i = 0;
+    while (i < len) {
+        for(j = 0; j < nb_mods; j++)
+            y[j].v = *(__m256d *)&buf[i + fft_len * j];
+
+        /* Chinese remainder to get mixed radix representation */
+        l = 0;
+        for(j = 0; j < nb_mods - 1; j++) {
+            y[j].v = ntt_mod1(y[j].v, mf[j]);
+            for(k = j + 1; k < nb_mods; k++) {
+                y[k].v = ntt_mul_mod(y[k].v - y[j].v,
+                                     mods_cr_vec[l], mf[k], m_inv[k]);
+                l++;
+            }
+        }
+        y[j].v = ntt_mod1(y[j].v, mf[j]);
+
+        for(p = 0; p < VEC_LEN; p++) {
+            /* back to normal representation */
+            u[0] = (int64_t)y[nb_mods - 1].d[p];
+            l = 1;
+            for(j = nb_mods - 2; j >= 1; j--) {
+                r = (int64_t)y[j].d[p];
+                for(k = 0; k < l; k++) {
+                    t = (dlimb_t)u[k] * mods[j] + r;
+                    r = t >> LIMB_BITS;
+                    u[k] = t;
+                }
+                u[l] = r;
+                l++;
+            }
+            /* XXX: for nb_mods = 5, l should be 4 */
+
+            /* last step adds the carry */
+            r = (int64_t)y[0].d[p];
+            for(k = 0; k < l; k++) {
+                t = (dlimb_t)u[k] * mods[j] + r + carry[k];
+                r = t >> LIMB_BITS;
+                u[k] = t;
+            }
+            u[l] = r + carry[l];
+
+#if 0
+            printf("%" PRId64 ": ", i);
+            for(j = nb_mods - 1; j >= 0; j--) {
+                printf(" %019" PRIu64, u[j]);
+            }
+            printf("\n");
+#endif
+
+            /* write the digits */
+            pos = i * dpl;
+            for(j = 0; j < n_limb1; j++) {
+                put_bits(tabr, r_len, pos, u[j]);
+                pos += LIMB_BITS;
+            }
+            put_bits(tabr, r_len, pos, u[n_limb1] & base_mask1);
+            /* shift by dpl digits and set the carry */
+            if (shift == 0) {
+                for(j = n_limb1 + 1; j < nb_mods; j++)
+                    carry[j - (n_limb1 + 1)] = u[j];
+            } else {
+                for(j = n_limb1; j < nb_mods - 1; j++) {
+                    carry[j - n_limb1] = (u[j] >> shift) |
+                        (u[j + 1] << (LIMB_BITS - shift));
+                }
+                carry[nb_mods - 1 - n_limb1] = u[nb_mods - 1] >> shift;
+            }
+            i++;
+        }
+    }
+}
+#else
+static no_inline void ntt_to_limb(BFNTTState *s, limb_t *tabr, limb_t r_len,
+                                  const NTTLimb *buf, int fft_len_log2, int dpl,
+                                  int nb_mods)
+{
+    const limb_t *mods = ntt_mods + NB_MODS - nb_mods;
+    const limb_t *mods_cr, *mods_cr_inv;
+    limb_t y[NB_MODS], u[NB_MODS], carry[NB_MODS], fft_len, base_mask1, r;
+    slimb_t i, len, pos;
+    int j, k, l, shift, n_limb1;
+    dlimb_t t;
+
+    j = NB_MODS * (NB_MODS - 1) / 2 - nb_mods * (nb_mods - 1) / 2;
+    mods_cr = ntt_mods_cr + j;
+    mods_cr_inv = s->ntt_mods_cr_inv + j;
+
+    shift = dpl & (LIMB_BITS - 1);
+    if (shift == 0)
+        base_mask1 = -1;
+    else
+        base_mask1 = ((limb_t)1 << shift) - 1;
+    n_limb1 = ((unsigned)dpl - 1) / LIMB_BITS;
+    for(j = 0; j < NB_MODS; j++)
+        carry[j] = 0;
+    for(j = 0; j < NB_MODS; j++)
+        u[j] = 0; /* avoid warnings */
+    memset(tabr, 0, sizeof(limb_t) * r_len);
+    fft_len = (limb_t)1 << fft_len_log2;
+    len = bf_min(fft_len, (r_len * LIMB_BITS + dpl - 1) / dpl);
+    for(i = 0; i < len; i++) {
+        for(j = 0; j < nb_mods; j++)  {
+            y[j] = ntt_limb_to_int(buf[i + fft_len * j], mods[j]);
+        }
+
+        /* Chinese remainder to get mixed radix representation */
+        l = 0;
+        for(j = 0; j < nb_mods - 1; j++) {
+            for(k = j + 1; k < nb_mods; k++) {
+                limb_t m;
+                m = mods[k];
+                /* Note: there is no overflow in the sub_mod() because
+                   the modulos are sorted by increasing order */
+                y[k] = mul_mod_fast2(y[k] - y[j] + m,
+                                     mods_cr[l], m, mods_cr_inv[l]);
+                l++;
+            }
+        }
+
+        /* back to normal representation */
+        u[0] = y[nb_mods - 1];
+        l = 1;
+        for(j = nb_mods - 2; j >= 1; j--) {
+            r = y[j];
+            for(k = 0; k < l; k++) {
+                t = (dlimb_t)u[k] * mods[j] + r;
+                r = t >> LIMB_BITS;
+                u[k] = t;
+            }
+            u[l] = r;
+            l++;
+        }
+
+        /* last step adds the carry */
+        r = y[0];
+        for(k = 0; k < l; k++) {
+            t = (dlimb_t)u[k] * mods[j] + r + carry[k];
+            r = t >> LIMB_BITS;
+            u[k] = t;
+        }
+        u[l] = r + carry[l];
+
+#if 0
+        printf("%" PRId64 ": ", (int64_t)i);
+        for(j = nb_mods - 1; j >= 0; j--) {
+            printf(" " FMT_LIMB, u[j]);
+        }
+        printf("\n");
+#endif
+
+        /* write the digits */
+        pos = i * dpl;
+        for(j = 0; j < n_limb1; j++) {
+            put_bits(tabr, r_len, pos, u[j]);
+            pos += LIMB_BITS;
+        }
+        put_bits(tabr, r_len, pos, u[n_limb1] & base_mask1);
+        /* shift by dpl digits and set the carry */
+        if (shift == 0) {
+            for(j = n_limb1 + 1; j < nb_mods; j++)
+                carry[j - (n_limb1 + 1)] = u[j];
+        } else {
+            for(j = n_limb1; j < nb_mods - 1; j++) {
+                carry[j - n_limb1] = (u[j] >> shift) |
+                    (u[j + 1] << (LIMB_BITS - shift));
+            }
+            carry[nb_mods - 1 - n_limb1] = u[nb_mods - 1] >> shift;
+        }
+    }
+}
+#endif
+
+static int ntt_static_init(bf_context_t *s1)
+{
+    BFNTTState *s;
+    int inverse, i, j, k, l;
+    limb_t c, c_inv, c_inv2, m, m_inv;
+
+    if (s1->ntt_state)
+        return 0;
+#if defined(__AVX2__)
+    s = bf_aligned_malloc(s1, sizeof(*s), 64);
+#else
+    s = bf_malloc(s1, sizeof(*s));
+#endif
+    if (!s)
+        return -1;
+    memset(s, 0, sizeof(*s));
+    s1->ntt_state = s;
+    s->ctx = s1;
+
+    for(j = 0; j < NB_MODS; j++) {
+        m = ntt_mods[j];
+        m_inv = init_mul_mod_fast(m);
+        s->ntt_mods_div[j] = m_inv;
+#if defined(__AVX2__)
+        s->ntt_mods_vec[j] = _mm256_set1_pd(m);
+        s->ntt_mods_inv_vec[j] = _mm256_set1_pd(1.0 / (double)m);
+#endif
+        c_inv2 = (m + 1) / 2; /* 1/2 */
+        c_inv = 1;
+        for(i = 0; i <= NTT_PROOT_2EXP; i++) {
+            s->ntt_len_inv[j][i][0] = c_inv;
+            s->ntt_len_inv[j][i][1] = init_mul_mod_fast2(c_inv, m);
+            c_inv = mul_mod_fast(c_inv, c_inv2, m, m_inv);
+        }
+
+        for(inverse = 0; inverse < 2; inverse++) {
+            c = ntt_proot[inverse][j];
+            for(i = 0; i < NTT_PROOT_2EXP; i++) {
+                s->ntt_proot_pow[j][inverse][NTT_PROOT_2EXP - i] = c;
+                s->ntt_proot_pow_inv[j][inverse][NTT_PROOT_2EXP - i] =
+                    init_mul_mod_fast2(c, m);
+                c = mul_mod_fast(c, c, m, m_inv);
+            }
+        }
+    }
+
+    l = 0;
+    for(j = 0; j < NB_MODS - 1; j++) {
+        for(k = j + 1; k < NB_MODS; k++) {
+#if defined(__AVX2__)
+            s->ntt_mods_cr_vec[l] = _mm256_set1_pd(int_to_ntt_limb2(ntt_mods_cr[l],
+                                                                    ntt_mods[k]));
+#else
+            s->ntt_mods_cr_inv[l] = init_mul_mod_fast2(ntt_mods_cr[l],
+                                                       ntt_mods[k]);
+#endif
+            l++;
+        }
+    }
+    return 0;
+}
+
+int bf_get_fft_size(int *pdpl, int *pnb_mods, limb_t len)
+{
+    int dpl, fft_len_log2, n_bits, nb_mods, dpl_found, fft_len_log2_found;
+    int int_bits, nb_mods_found;
+    limb_t cost, min_cost;
+
+    min_cost = -1;
+    dpl_found = 0;
+    nb_mods_found = 4;
+    fft_len_log2_found = 0;
+    for(nb_mods = 3; nb_mods <= NB_MODS; nb_mods++) {
+        int_bits = ntt_int_bits[NB_MODS - nb_mods];
+        dpl = bf_min((int_bits - 4) / 2,
+                     2 * LIMB_BITS + 2 * NTT_MOD_LOG2_MIN - NTT_MOD_LOG2_MAX);
+        for(;;) {
+            fft_len_log2 = ceil_log2((len * LIMB_BITS + dpl - 1) / dpl);
+            if (fft_len_log2 > NTT_PROOT_2EXP)
+                goto next;
+            n_bits = fft_len_log2 + 2 * dpl;
+            if (n_bits <= int_bits) {
+                cost = ((limb_t)(fft_len_log2 + 1) << fft_len_log2) * nb_mods;
+                //                printf("n=%d dpl=%d: cost=%" PRId64 "\n", nb_mods, dpl, (int64_t)cost);
+                if (cost < min_cost) {
+                    min_cost = cost;
+                    dpl_found = dpl;
+                    nb_mods_found = nb_mods;
+                    fft_len_log2_found = fft_len_log2;
+                }
+                break;
+            }
+            dpl--;
+            if (dpl == 0)
+                break;
+        }
+    next: ;
+    }
+    if (!dpl_found)
+        abort();
+    /* limit dpl if possible to reduce fixed cost of limb/NTT conversion */
+    if (dpl_found > (LIMB_BITS + NTT_MOD_LOG2_MIN) &&
+        ((limb_t)(LIMB_BITS + NTT_MOD_LOG2_MIN) << fft_len_log2_found) >=
+        len * LIMB_BITS) {
+        dpl_found = LIMB_BITS + NTT_MOD_LOG2_MIN;
+    }
+    *pnb_mods = nb_mods_found;
+    *pdpl = dpl_found;
+    return fft_len_log2_found;
+}
+
+/* return 0 if OK, -1 if memory error */
+static no_inline int fft_mul(bf_context_t *s1,
+                             bf_t *res, limb_t *a_tab, limb_t a_len,
+                             limb_t *b_tab, limb_t b_len, int mul_flags)
+{
+    BFNTTState *s;
+    int dpl, fft_len_log2, j, nb_mods, reduced_mem;
+    slimb_t len, fft_len;
+    NTTLimb *buf1, *buf2, *ptr;
+#if defined(USE_MUL_CHECK)
+    limb_t ha, hb, hr, h_ref;
+#endif
+
+    if (ntt_static_init(s1))
+        return -1;
+    s = s1->ntt_state;
+
+    /* find the optimal number of digits per limb (dpl) */
+    len = a_len + b_len;
+    fft_len_log2 = bf_get_fft_size(&dpl, &nb_mods, len);
+    fft_len = (uint64_t)1 << fft_len_log2;
+    //    printf("len=%" PRId64 " fft_len_log2=%d dpl=%d\n", len, fft_len_log2, dpl);
+#if defined(USE_MUL_CHECK)
+    ha = mp_mod1(a_tab, a_len, BF_CHKSUM_MOD, 0);
+    hb = mp_mod1(b_tab, b_len, BF_CHKSUM_MOD, 0);
+#endif
+    if ((mul_flags & (FFT_MUL_R_OVERLAP_A | FFT_MUL_R_OVERLAP_B)) == 0) {
+        if (!(mul_flags & FFT_MUL_R_NORESIZE))
+            bf_resize(res, 0);
+    } else if (mul_flags & FFT_MUL_R_OVERLAP_B) {
+        limb_t *tmp_tab, tmp_len;
+        /* it is better to free 'b' first */
+        tmp_tab = a_tab;
+        a_tab = b_tab;
+        b_tab = tmp_tab;
+        tmp_len = a_len;
+        a_len = b_len;
+        b_len = tmp_len;
+    }
+    buf1 = ntt_malloc(s, sizeof(NTTLimb) * fft_len * nb_mods);
+    if (!buf1)
+        return -1;
+    limb_to_ntt(s, buf1, fft_len, a_tab, a_len, dpl,
+                NB_MODS - nb_mods, nb_mods);
+    if ((mul_flags & (FFT_MUL_R_OVERLAP_A | FFT_MUL_R_OVERLAP_B)) ==
+        FFT_MUL_R_OVERLAP_A) {
+        if (!(mul_flags & FFT_MUL_R_NORESIZE))
+            bf_resize(res, 0);
+    }
+    reduced_mem = (fft_len_log2 >= 14);
+    if (!reduced_mem) {
+        buf2 = ntt_malloc(s, sizeof(NTTLimb) * fft_len * nb_mods);
+        if (!buf2)
+            goto fail;
+        limb_to_ntt(s, buf2, fft_len, b_tab, b_len, dpl,
+                    NB_MODS - nb_mods, nb_mods);
+        if (!(mul_flags & FFT_MUL_R_NORESIZE))
+            bf_resize(res, 0); /* in case res == b */
+    } else {
+        buf2 = ntt_malloc(s, sizeof(NTTLimb) * fft_len);
+        if (!buf2)
+            goto fail;
+    }
+    for(j = 0; j < nb_mods; j++) {
+        if (reduced_mem) {
+            limb_to_ntt(s, buf2, fft_len, b_tab, b_len, dpl,
+                        NB_MODS - nb_mods + j, 1);
+            ptr = buf2;
+        } else {
+            ptr = buf2 + fft_len * j;
+        }
+        if (ntt_conv(s, buf1 + fft_len * j, ptr,
+                     fft_len_log2, fft_len_log2, j + NB_MODS - nb_mods))
+            goto fail;
+    }
+    if (!(mul_flags & FFT_MUL_R_NORESIZE))
+        bf_resize(res, 0); /* in case res == b and reduced mem */
+    ntt_free(s, buf2);
+    buf2 = NULL;
+    if (!(mul_flags & FFT_MUL_R_NORESIZE)) {
+        if (bf_resize(res, len))
+            goto fail;
+    }
+    ntt_to_limb(s, res->tab, len, buf1, fft_len_log2, dpl, nb_mods);
+    ntt_free(s, buf1);
+#if defined(USE_MUL_CHECK)
+    hr = mp_mod1(res->tab, len, BF_CHKSUM_MOD, 0);
+    h_ref = mul_mod(ha, hb, BF_CHKSUM_MOD);
+    if (hr != h_ref) {
+        printf("ntt_mul_error: len=%" PRId_LIMB " fft_len_log2=%d dpl=%d nb_mods=%d\n",
+               len, fft_len_log2, dpl, nb_mods);
+        //        printf("ha=0x" FMT_LIMB" hb=0x" FMT_LIMB " hr=0x" FMT_LIMB " expected=0x" FMT_LIMB "\n", ha, hb, hr, h_ref);
+        exit(1);
+    }
+#endif
+    return 0;
+ fail:
+    ntt_free(s, buf1);
+    ntt_free(s, buf2);
+    return -1;
+}
+
+#else /* USE_FFT_MUL */
+
+int bf_get_fft_size(int *pdpl, int *pnb_mods, limb_t len)
+{
+    return 0;
+}
+
+#endif /* !USE_FFT_MUL */
diff --git a/src/shared/quickjs/libbf.h b/src/shared/quickjs/libbf.h
new file mode 100644
index 000000000..b247952b1
--- /dev/null
+++ b/src/shared/quickjs/libbf.h
@@ -0,0 +1,543 @@
+/*
+ * Tiny arbitrary precision floating point library
+ * 
+ * Copyright (c) 2017-2021 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef LIBBF_H
+#define LIBBF_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__SIZEOF_INT128__) && (INTPTR_MAX >= INT64_MAX)
+#define LIMB_LOG2_BITS 6
+#else
+#define LIMB_LOG2_BITS 5
+#endif
+
+#define LIMB_BITS (1 << LIMB_LOG2_BITS)
+
+#if LIMB_BITS == 64
+typedef __int128 int128_t;
+typedef unsigned __int128 uint128_t;
+typedef int64_t slimb_t;
+typedef uint64_t limb_t;
+typedef uint128_t dlimb_t;
+#define BF_RAW_EXP_MIN INT64_MIN
+#define BF_RAW_EXP_MAX INT64_MAX
+
+#define LIMB_DIGITS 19
+#define BF_DEC_BASE UINT64_C(10000000000000000000)
+
+#else
+
+typedef int32_t slimb_t;
+typedef uint32_t limb_t;
+typedef uint64_t dlimb_t;
+#define BF_RAW_EXP_MIN INT32_MIN
+#define BF_RAW_EXP_MAX INT32_MAX
+
+#define LIMB_DIGITS 9
+#define BF_DEC_BASE 1000000000U
+
+#endif
+
+/* in bits */
+/* minimum number of bits for the exponent */
+#define BF_EXP_BITS_MIN 3
+/* maximum number of bits for the exponent */
+#define BF_EXP_BITS_MAX (LIMB_BITS - 3)
+/* extended range for exponent, used internally */
+#define BF_EXT_EXP_BITS_MAX (BF_EXP_BITS_MAX + 1)
+/* minimum possible precision */
+#define BF_PREC_MIN 2
+/* minimum possible precision */
+#define BF_PREC_MAX (((limb_t)1 << (LIMB_BITS - 2)) - 2)
+/* some operations support infinite precision */
+#define BF_PREC_INF (BF_PREC_MAX + 1) /* infinite precision */
+
+#if LIMB_BITS == 64
+#define BF_CHKSUM_MOD (UINT64_C(975620677) * UINT64_C(9795002197))
+#else
+#define BF_CHKSUM_MOD 975620677U
+#endif
+
+#define BF_EXP_ZERO BF_RAW_EXP_MIN
+#define BF_EXP_INF (BF_RAW_EXP_MAX - 1)
+#define BF_EXP_NAN BF_RAW_EXP_MAX
+
+/* +/-zero is represented with expn = BF_EXP_ZERO and len = 0,
+   +/-infinity is represented with expn = BF_EXP_INF and len = 0,
+   NaN is represented with expn = BF_EXP_NAN and len = 0 (sign is ignored)
+ */
+typedef struct {
+    struct bf_context_t *ctx;
+    int sign;
+    slimb_t expn;
+    limb_t len;
+    limb_t *tab;
+} bf_t;
+
+typedef struct {
+    /* must be kept identical to bf_t */
+    struct bf_context_t *ctx;
+    int sign;
+    slimb_t expn;
+    limb_t len;
+    limb_t *tab;
+} bfdec_t;
+
+typedef enum {
+    BF_RNDN, /* round to nearest, ties to even */
+    BF_RNDZ, /* round to zero */
+    BF_RNDD, /* round to -inf (the code relies on (BF_RNDD xor BF_RNDU) = 1) */
+    BF_RNDU, /* round to +inf */
+    BF_RNDNA, /* round to nearest, ties away from zero */
+    BF_RNDA, /* round away from zero */
+    BF_RNDF, /* faithful rounding (nondeterministic, either RNDD or RNDU,
+                inexact flag is always set)  */
+} bf_rnd_t;
+
+/* allow subnormal numbers. Only available if the number of exponent
+   bits is <= BF_EXP_BITS_USER_MAX and prec != BF_PREC_INF. */
+#define BF_FLAG_SUBNORMAL (1 << 3)
+/* 'prec' is the precision after the radix point instead of the whole
+   mantissa. Can only be used with bf_round() and
+   bfdec_[add|sub|mul|div|sqrt|round](). */
+#define BF_FLAG_RADPNT_PREC (1 << 4)
+
+#define BF_RND_MASK 0x7
+#define BF_EXP_BITS_SHIFT 5
+#define BF_EXP_BITS_MASK 0x3f
+
+/* shortcut for bf_set_exp_bits(BF_EXT_EXP_BITS_MAX) */
+#define BF_FLAG_EXT_EXP (BF_EXP_BITS_MASK << BF_EXP_BITS_SHIFT)
+
+/* contains the rounding mode and number of exponents bits */
+typedef uint32_t bf_flags_t;
+
+typedef void *bf_realloc_func_t(void *opaque, void *ptr, size_t size);
+
+typedef struct {
+    bf_t val;
+    limb_t prec;
+} BFConstCache;
+
+typedef struct bf_context_t {
+    void *realloc_opaque;
+    bf_realloc_func_t *realloc_func;
+    BFConstCache log2_cache;
+    BFConstCache pi_cache;
+    struct BFNTTState *ntt_state;
+} bf_context_t;
+
+static inline int bf_get_exp_bits(bf_flags_t flags)
+{
+    int e;
+    e = (flags >> BF_EXP_BITS_SHIFT) & BF_EXP_BITS_MASK;
+    if (e == BF_EXP_BITS_MASK)
+        return BF_EXP_BITS_MAX + 1;
+    else
+        return BF_EXP_BITS_MAX - e;
+}
+
+static inline bf_flags_t bf_set_exp_bits(int n)
+{
+    return ((BF_EXP_BITS_MAX - n) & BF_EXP_BITS_MASK) << BF_EXP_BITS_SHIFT;
+}
+
+/* returned status */
+#define BF_ST_INVALID_OP  (1 << 0)
+#define BF_ST_DIVIDE_ZERO (1 << 1)
+#define BF_ST_OVERFLOW    (1 << 2)
+#define BF_ST_UNDERFLOW   (1 << 3)
+#define BF_ST_INEXACT     (1 << 4)
+/* indicate that a memory allocation error occured. NaN is returned */
+#define BF_ST_MEM_ERROR   (1 << 5) 
+
+#define BF_RADIX_MAX 36 /* maximum radix for bf_atof() and bf_ftoa() */
+
+static inline slimb_t bf_max(slimb_t a, slimb_t b)
+{
+    if (a > b)
+        return a;
+    else
+        return b;
+}
+
+static inline slimb_t bf_min(slimb_t a, slimb_t b)
+{
+    if (a < b)
+        return a;
+    else
+        return b;
+}
+
+void bf_context_init(bf_context_t *s, bf_realloc_func_t *realloc_func,
+                     void *realloc_opaque);
+void bf_context_end(bf_context_t *s);
+/* free memory allocated for the bf cache data */
+void bf_clear_cache(bf_context_t *s);
+
+static inline void *bf_realloc(bf_context_t *s, void *ptr, size_t size)
+{
+    return s->realloc_func(s->realloc_opaque, ptr, size);
+}
+
+/* 'size' must be != 0 */
+static inline void *bf_malloc(bf_context_t *s, size_t size)
+{
+    return bf_realloc(s, NULL, size);
+}
+
+static inline void bf_free(bf_context_t *s, void *ptr)
+{
+    /* must test ptr otherwise equivalent to malloc(0) */
+    if (ptr)
+        bf_realloc(s, ptr, 0);
+}
+
+void bf_init(bf_context_t *s, bf_t *r);
+
+static inline void bf_delete(bf_t *r)
+{
+    bf_context_t *s = r->ctx;
+    /* we accept to delete a zeroed bf_t structure */
+    if (s && r->tab) {
+        bf_realloc(s, r->tab, 0);
+    }
+}
+
+static inline void bf_neg(bf_t *r)
+{
+    r->sign ^= 1;
+}
+
+static inline int bf_is_finite(const bf_t *a)
+{
+    return (a->expn < BF_EXP_INF);
+}
+
+static inline int bf_is_nan(const bf_t *a)
+{
+    return (a->expn == BF_EXP_NAN);
+}
+
+static inline int bf_is_zero(const bf_t *a)
+{
+    return (a->expn == BF_EXP_ZERO);
+}
+
+static inline void bf_memcpy(bf_t *r, const bf_t *a)
+{
+    *r = *a;
+}
+
+int bf_set_ui(bf_t *r, uint64_t a);
+int bf_set_si(bf_t *r, int64_t a);
+void bf_set_nan(bf_t *r);
+void bf_set_zero(bf_t *r, int is_neg);
+void bf_set_inf(bf_t *r, int is_neg);
+int bf_set(bf_t *r, const bf_t *a);
+void bf_move(bf_t *r, bf_t *a);
+int bf_get_float64(const bf_t *a, double *pres, bf_rnd_t rnd_mode);
+int bf_set_float64(bf_t *a, double d);
+
+int bf_cmpu(const bf_t *a, const bf_t *b);
+int bf_cmp_full(const bf_t *a, const bf_t *b);
+int bf_cmp(const bf_t *a, const bf_t *b);
+static inline int bf_cmp_eq(const bf_t *a, const bf_t *b)
+{
+    return bf_cmp(a, b) == 0;
+}
+
+static inline int bf_cmp_le(const bf_t *a, const bf_t *b)
+{
+    return bf_cmp(a, b) <= 0;
+}
+
+static inline int bf_cmp_lt(const bf_t *a, const bf_t *b)
+{
+    return bf_cmp(a, b) < 0;
+}
+
+int bf_add(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec, bf_flags_t flags);
+int bf_sub(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec, bf_flags_t flags);
+int bf_add_si(bf_t *r, const bf_t *a, int64_t b1, limb_t prec, bf_flags_t flags);
+int bf_mul(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec, bf_flags_t flags);
+int bf_mul_ui(bf_t *r, const bf_t *a, uint64_t b1, limb_t prec, bf_flags_t flags);
+int bf_mul_si(bf_t *r, const bf_t *a, int64_t b1, limb_t prec, 
+              bf_flags_t flags);
+int bf_mul_2exp(bf_t *r, slimb_t e, limb_t prec, bf_flags_t flags);
+int bf_div(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec, bf_flags_t flags);
+#define BF_DIVREM_EUCLIDIAN BF_RNDF
+int bf_divrem(bf_t *q, bf_t *r, const bf_t *a, const bf_t *b,
+              limb_t prec, bf_flags_t flags, int rnd_mode);
+int bf_rem(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+           bf_flags_t flags, int rnd_mode);
+int bf_remquo(slimb_t *pq, bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+              bf_flags_t flags, int rnd_mode);
+/* round to integer with infinite precision */
+int bf_rint(bf_t *r, int rnd_mode);
+int bf_round(bf_t *r, limb_t prec, bf_flags_t flags);
+int bf_sqrtrem(bf_t *r, bf_t *rem1, const bf_t *a);
+int bf_sqrt(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+slimb_t bf_get_exp_min(const bf_t *a);
+int bf_logic_or(bf_t *r, const bf_t *a, const bf_t *b);
+int bf_logic_xor(bf_t *r, const bf_t *a, const bf_t *b);
+int bf_logic_and(bf_t *r, const bf_t *a, const bf_t *b);
+
+/* additional flags for bf_atof */
+/* do not accept hex radix prefix (0x or 0X) if radix = 0 or radix = 16 */
+#define BF_ATOF_NO_HEX       (1 << 16)
+/* accept binary (0b or 0B) or octal (0o or 0O) radix prefix if radix = 0 */
+#define BF_ATOF_BIN_OCT      (1 << 17)
+/* Do not parse NaN or Inf */
+#define BF_ATOF_NO_NAN_INF   (1 << 18)
+/* return the exponent separately */
+#define BF_ATOF_EXPONENT       (1 << 19)
+
+int bf_atof(bf_t *a, const char *str, const char **pnext, int radix,
+            limb_t prec, bf_flags_t flags);
+/* this version accepts prec = BF_PREC_INF and returns the radix
+   exponent */
+int bf_atof2(bf_t *r, slimb_t *pexponent,
+             const char *str, const char **pnext, int radix,
+             limb_t prec, bf_flags_t flags);
+int bf_mul_pow_radix(bf_t *r, const bf_t *T, limb_t radix,
+                     slimb_t expn, limb_t prec, bf_flags_t flags);
+
+
+/* Conversion of floating point number to string. Return a null
+   terminated string or NULL if memory error. *plen contains its
+   length if plen != NULL.  The exponent letter is "e" for base 10,
+   "p" for bases 2, 8, 16 with a binary exponent and "@" for the other
+   bases. */
+
+#define BF_FTOA_FORMAT_MASK (3 << 16)
+
+/* fixed format: prec significant digits rounded with (flags &
+   BF_RND_MASK). Exponential notation is used if too many zeros are
+   needed.*/
+#define BF_FTOA_FORMAT_FIXED (0 << 16)
+/* fractional format: prec digits after the decimal point rounded with
+   (flags & BF_RND_MASK) */
+#define BF_FTOA_FORMAT_FRAC  (1 << 16)
+/* free format: 
+   
+   For binary radices with bf_ftoa() and for bfdec_ftoa(): use the minimum
+   number of digits to represent 'a'. The precision and the rounding
+   mode are ignored.
+   
+   For the non binary radices with bf_ftoa(): use as many digits as
+   necessary so that bf_atof() return the same number when using
+   precision 'prec', rounding to nearest and the subnormal
+   configuration of 'flags'. The result is meaningful only if 'a' is
+   already rounded to 'prec' bits. If the subnormal flag is set, the
+   exponent in 'flags' must also be set to the desired exponent range.
+*/
+#define BF_FTOA_FORMAT_FREE  (2 << 16)
+/* same as BF_FTOA_FORMAT_FREE but uses the minimum number of digits
+   (takes more computation time). Identical to BF_FTOA_FORMAT_FREE for
+   binary radices with bf_ftoa() and for bfdec_ftoa(). */
+#define BF_FTOA_FORMAT_FREE_MIN (3 << 16)
+
+/* force exponential notation for fixed or free format */
+#define BF_FTOA_FORCE_EXP    (1 << 20)
+/* add 0x prefix for base 16, 0o prefix for base 8 or 0b prefix for
+   base 2 if non zero value */
+#define BF_FTOA_ADD_PREFIX   (1 << 21)
+/* return "Infinity" instead of "Inf" and add a "+" for positive
+   exponents */
+#define BF_FTOA_JS_QUIRKS    (1 << 22)
+
+char *bf_ftoa(size_t *plen, const bf_t *a, int radix, limb_t prec,
+              bf_flags_t flags);
+
+/* modulo 2^n instead of saturation. NaN and infinity return 0 */
+#define BF_GET_INT_MOD (1 << 0) 
+int bf_get_int32(int *pres, const bf_t *a, int flags);
+int bf_get_int64(int64_t *pres, const bf_t *a, int flags);
+int bf_get_uint64(uint64_t *pres, const bf_t *a);
+
+/* the following functions are exported for testing only. */
+void mp_print_str(const char *str, const limb_t *tab, limb_t n);
+void bf_print_str(const char *str, const bf_t *a);
+int bf_resize(bf_t *r, limb_t len);
+int bf_get_fft_size(int *pdpl, int *pnb_mods, limb_t len);
+int bf_normalize_and_round(bf_t *r, limb_t prec1, bf_flags_t flags);
+int bf_can_round(const bf_t *a, slimb_t prec, bf_rnd_t rnd_mode, slimb_t k);
+slimb_t bf_mul_log2_radix(slimb_t a1, unsigned int radix, int is_inv,
+                          int is_ceil1);
+int mp_mul(bf_context_t *s, limb_t *result, 
+           const limb_t *op1, limb_t op1_size, 
+           const limb_t *op2, limb_t op2_size);
+limb_t mp_add(limb_t *res, const limb_t *op1, const limb_t *op2, 
+              limb_t n, limb_t carry);
+limb_t mp_add_ui(limb_t *tab, limb_t b, size_t n);
+int mp_sqrtrem(bf_context_t *s, limb_t *tabs, limb_t *taba, limb_t n);
+int mp_recip(bf_context_t *s, limb_t *tabr, const limb_t *taba, limb_t n);
+limb_t bf_isqrt(limb_t a);
+
+/* transcendental functions */
+int bf_const_log2(bf_t *T, limb_t prec, bf_flags_t flags);
+int bf_const_pi(bf_t *T, limb_t prec, bf_flags_t flags);
+int bf_exp(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_log(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+#define BF_POW_JS_QUIRKS (1 << 16) /* (+/-1)^(+/-Inf) = NaN, 1^NaN = NaN */
+int bf_pow(bf_t *r, const bf_t *x, const bf_t *y, limb_t prec, bf_flags_t flags);
+int bf_cos(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_sin(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_tan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_atan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_atan2(bf_t *r, const bf_t *y, const bf_t *x,
+             limb_t prec, bf_flags_t flags);
+int bf_asin(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_acos(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+
+/* decimal floating point */
+
+static inline void bfdec_init(bf_context_t *s, bfdec_t *r)
+{
+    bf_init(s, (bf_t *)r);
+}
+static inline void bfdec_delete(bfdec_t *r)
+{
+    bf_delete((bf_t *)r);
+}
+
+static inline void bfdec_neg(bfdec_t *r)
+{
+    r->sign ^= 1;
+}
+
+static inline int bfdec_is_finite(const bfdec_t *a)
+{
+    return (a->expn < BF_EXP_INF);
+}
+
+static inline int bfdec_is_nan(const bfdec_t *a)
+{
+    return (a->expn == BF_EXP_NAN);
+}
+
+static inline int bfdec_is_zero(const bfdec_t *a)
+{
+    return (a->expn == BF_EXP_ZERO);
+}
+
+static inline void bfdec_memcpy(bfdec_t *r, const bfdec_t *a)
+{
+    bf_memcpy((bf_t *)r, (const bf_t *)a);
+}
+
+int bfdec_set_ui(bfdec_t *r, uint64_t a);
+int bfdec_set_si(bfdec_t *r, int64_t a);
+
+static inline void bfdec_set_nan(bfdec_t *r)
+{
+    bf_set_nan((bf_t *)r);
+}
+static inline void bfdec_set_zero(bfdec_t *r, int is_neg)
+{
+    bf_set_zero((bf_t *)r, is_neg);
+}
+static inline void bfdec_set_inf(bfdec_t *r, int is_neg)
+{
+    bf_set_inf((bf_t *)r, is_neg);
+}
+static inline int bfdec_set(bfdec_t *r, const bfdec_t *a)
+{
+    return bf_set((bf_t *)r, (bf_t *)a);
+}
+static inline void bfdec_move(bfdec_t *r, bfdec_t *a)
+{
+    bf_move((bf_t *)r, (bf_t *)a);
+}
+static inline int bfdec_cmpu(const bfdec_t *a, const bfdec_t *b)
+{
+    return bf_cmpu((const bf_t *)a, (const bf_t *)b);
+}
+static inline int bfdec_cmp_full(const bfdec_t *a, const bfdec_t *b)
+{
+    return bf_cmp_full((const bf_t *)a, (const bf_t *)b);
+}
+static inline int bfdec_cmp(const bfdec_t *a, const bfdec_t *b)
+{
+    return bf_cmp((const bf_t *)a, (const bf_t *)b);
+}
+static inline int bfdec_cmp_eq(const bfdec_t *a, const bfdec_t *b)
+{
+    return bfdec_cmp(a, b) == 0;
+}
+static inline int bfdec_cmp_le(const bfdec_t *a, const bfdec_t *b)
+{
+    return bfdec_cmp(a, b) <= 0;
+}
+static inline int bfdec_cmp_lt(const bfdec_t *a, const bfdec_t *b)
+{
+    return bfdec_cmp(a, b) < 0;
+}
+
+int bfdec_add(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags);
+int bfdec_sub(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags);
+int bfdec_add_si(bfdec_t *r, const bfdec_t *a, int64_t b1, limb_t prec,
+                 bf_flags_t flags);
+int bfdec_mul(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags);
+int bfdec_mul_si(bfdec_t *r, const bfdec_t *a, int64_t b1, limb_t prec,
+                 bf_flags_t flags);
+int bfdec_div(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags);
+int bfdec_divrem(bfdec_t *q, bfdec_t *r, const bfdec_t *a, const bfdec_t *b,
+                 limb_t prec, bf_flags_t flags, int rnd_mode);
+int bfdec_rem(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags, int rnd_mode);
+int bfdec_rint(bfdec_t *r, int rnd_mode);
+int bfdec_sqrt(bfdec_t *r, const bfdec_t *a, limb_t prec, bf_flags_t flags);
+int bfdec_round(bfdec_t *r, limb_t prec, bf_flags_t flags);
+int bfdec_get_int32(int *pres, const bfdec_t *a);
+int bfdec_pow_ui(bfdec_t *r, const bfdec_t *a, limb_t b);
+
+char *bfdec_ftoa(size_t *plen, const bfdec_t *a, limb_t prec, bf_flags_t flags);
+int bfdec_atof(bfdec_t *r, const char *str, const char **pnext,
+               limb_t prec, bf_flags_t flags);
+
+/* the following functions are exported for testing only. */
+extern const limb_t mp_pow_dec[LIMB_DIGITS + 1];
+void bfdec_print_str(const char *str, const bfdec_t *a);
+static inline int bfdec_resize(bfdec_t *r, limb_t len)
+{
+    return bf_resize((bf_t *)r, len);
+}
+int bfdec_normalize_and_round(bfdec_t *r, limb_t prec1, bf_flags_t flags);
+
+#ifdef __cplusplus
+} /* extern "C" { */
+#endif
+
+#endif /* LIBBF_H */
diff --git a/src/shared/quickjs/libregexp-opcode.h b/src/shared/quickjs/libregexp-opcode.h
new file mode 100644
index 000000000..f255e09f2
--- /dev/null
+++ b/src/shared/quickjs/libregexp-opcode.h
@@ -0,0 +1,57 @@
+/*
+ * Regular Expression Engine
+ *
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifdef DEF
+
+DEF(invalid, 1) /* never used */
+DEF(char, 3)
+DEF(char32, 5)
+DEF(dot, 1)
+DEF(any, 1) /* same as dot but match any character including line terminator */
+DEF(line_start, 1)
+DEF(line_end, 1)
+DEF(goto, 5)
+DEF(split_goto_first, 5)
+DEF(split_next_first, 5)
+DEF(match, 1)
+DEF(save_start, 2) /* save start position */
+DEF(save_end, 2) /* save end position, must come after saved_start */
+DEF(save_reset, 3) /* reset save positions */
+DEF(loop, 5) /* decrement the top the stack and goto if != 0 */
+DEF(push_i32, 5) /* push integer on the stack */
+DEF(drop, 1)
+DEF(word_boundary, 1)
+DEF(not_word_boundary, 1)
+DEF(back_reference, 2)
+DEF(backward_back_reference, 2) /* must come after back_reference */
+DEF(range, 3) /* variable length */
+DEF(range32, 3) /* variable length */
+DEF(lookahead, 5)
+DEF(negative_lookahead, 5)
+DEF(push_char_pos, 1) /* push the character position on the stack */
+DEF(check_advance, 1) /* pop one stack element and check that it is different from the character position */
+DEF(prev, 1) /* go to the previous char */
+DEF(simple_greedy_quant, 17)
+
+#endif /* DEF */
diff --git a/src/shared/quickjs/libregexp.c b/src/shared/quickjs/libregexp.c
new file mode 100644
index 000000000..4db042941
--- /dev/null
+++ b/src/shared/quickjs/libregexp.c
@@ -0,0 +1,2503 @@
+/*
+ * Regular Expression Engine
+ *
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <inttypes.h>
+#include <string.h>
+#include <assert.h>
+
+#include "cutils.h"
+#include "libregexp.h"
+#include "libunicode.h"
+
+/*
+  TODO:
+
+  - Add a lock step execution mode (=linear time execution guaranteed)
+    when the regular expression is "simple" i.e. no backreference nor
+    complicated lookahead. The opcodes are designed for this execution
+    model.
+*/
+
+#if defined(TEST)
+#define DUMP_REOP
+#endif
+
+typedef enum {
+#define DEF(id, size) REOP_ ## id,
+#include "libregexp-opcode.h"
+#undef DEF
+    REOP_COUNT,
+} REOPCodeEnum;
+
+#define CAPTURE_COUNT_MAX 255
+#define STACK_SIZE_MAX 255
+
+/* unicode code points */
+#define CP_LS   0x2028
+#define CP_PS   0x2029
+
+#define TMP_BUF_SIZE 128
+
+typedef struct {
+    DynBuf byte_code;
+    const uint8_t *buf_ptr;
+    const uint8_t *buf_end;
+    const uint8_t *buf_start;
+    int re_flags;
+    BOOL is_unicode;
+    BOOL ignore_case;
+    BOOL dotall;
+    int capture_count;
+    int total_capture_count; /* -1 = not computed yet */
+    int has_named_captures; /* -1 = don't know, 0 = no, 1 = yes */
+    void *opaque;
+    DynBuf group_names;
+    union {
+        char error_msg[TMP_BUF_SIZE];
+        char tmp_buf[TMP_BUF_SIZE];
+    } u;
+} REParseState;
+
+typedef struct {
+#ifdef DUMP_REOP
+    const char *name;
+#endif
+    uint8_t size;
+} REOpCode;
+
+static const REOpCode reopcode_info[REOP_COUNT] = {
+#ifdef DUMP_REOP
+#define DEF(id, size) { #id, size },
+#else
+#define DEF(id, size) { size },
+#endif
+#include "libregexp-opcode.h"
+#undef DEF
+};
+
+#define RE_HEADER_FLAGS         0
+#define RE_HEADER_CAPTURE_COUNT 1
+#define RE_HEADER_STACK_SIZE    2
+#define RE_HEADER_BYTECODE_LEN  3
+
+#define RE_HEADER_LEN 7
+
+static inline int is_digit(int c) {
+    return c >= '0' && c <= '9';
+}
+
+/* insert 'len' bytes at position 'pos'. Return < 0 if error. */
+static int dbuf_insert(DynBuf *s, int pos, int len)
+{
+    if (dbuf_realloc(s, s->size + len))
+        return -1;
+    memmove(s->buf + pos + len, s->buf + pos, s->size - pos);
+    s->size += len;
+    return 0;
+}
+
+static const uint16_t char_range_d[] = {
+    1,
+    0x0030, 0x0039 + 1,
+};
+
+/* code point ranges for Zs,Zl or Zp property */
+static const uint16_t char_range_s[] = {
+    10,
+    0x0009, 0x000D + 1,
+    0x0020, 0x0020 + 1,
+    0x00A0, 0x00A0 + 1,
+    0x1680, 0x1680 + 1,
+    0x2000, 0x200A + 1,
+    /* 2028;LINE SEPARATOR;Zl;0;WS;;;;;N;;;;; */
+    /* 2029;PARAGRAPH SEPARATOR;Zp;0;B;;;;;N;;;;; */
+    0x2028, 0x2029 + 1,
+    0x202F, 0x202F + 1,
+    0x205F, 0x205F + 1,
+    0x3000, 0x3000 + 1,
+    /* FEFF;ZERO WIDTH NO-BREAK SPACE;Cf;0;BN;;;;;N;BYTE ORDER MARK;;;; */
+    0xFEFF, 0xFEFF + 1,
+};
+
+static const uint16_t char_range_w[] = {
+    4,
+    0x0030, 0x0039 + 1,
+    0x0041, 0x005A + 1,
+    0x005F, 0x005F + 1,
+    0x0061, 0x007A + 1,
+};
+
+#define CLASS_RANGE_BASE 0x40000000
+
+typedef enum {
+    CHAR_RANGE_d,
+    CHAR_RANGE_D,
+    CHAR_RANGE_s,
+    CHAR_RANGE_S,
+    CHAR_RANGE_w,
+    CHAR_RANGE_W,
+} CharRangeEnum;
+
+static const uint16_t * const char_range_table[] = {
+    char_range_d,
+    char_range_s,
+    char_range_w,
+};
+
+static int cr_init_char_range(REParseState *s, CharRange *cr, uint32_t c)
+{
+    BOOL invert;
+    const uint16_t *c_pt;
+    int len, i;
+
+    invert = c & 1;
+    c_pt = char_range_table[c >> 1];
+    len = *c_pt++;
+    cr_init(cr, s->opaque, lre_realloc);
+    for(i = 0; i < len * 2; i++) {
+        if (cr_add_point(cr, c_pt[i]))
+            goto fail;
+    }
+    if (invert) {
+        if (cr_invert(cr))
+            goto fail;
+    }
+    return 0;
+ fail:
+    cr_free(cr);
+    return -1;
+}
+
+#ifdef DUMP_REOP
+static __maybe_unused void lre_dump_bytecode(const uint8_t *buf,
+                                                     int buf_len)
+{
+    int pos, len, opcode, bc_len, re_flags, i;
+    uint32_t val;
+
+    assert(buf_len >= RE_HEADER_LEN);
+
+    re_flags = lre_get_flags(buf);
+    bc_len = get_u32(buf + RE_HEADER_BYTECODE_LEN);
+    assert(bc_len + RE_HEADER_LEN <= buf_len);
+    printf("flags: 0x%x capture_count=%d stack_size=%d\n",
+           re_flags, buf[RE_HEADER_CAPTURE_COUNT], buf[RE_HEADER_STACK_SIZE]);
+    if (re_flags & LRE_FLAG_NAMED_GROUPS) {
+        const char *p;
+        p = (char *)buf + RE_HEADER_LEN + bc_len;
+        printf("named groups: ");
+        for(i = 1; i < buf[RE_HEADER_CAPTURE_COUNT]; i++) {
+            if (i != 1)
+                printf(",");
+            printf("<%s>", p);
+            p += strlen(p) + 1;
+        }
+        printf("\n");
+        assert(p == (char *)(buf + buf_len));
+    }
+    printf("bytecode_len=%d\n", bc_len);
+
+    buf += RE_HEADER_LEN;
+    pos = 0;
+    while (pos < bc_len) {
+        printf("%5u: ", pos);
+        opcode = buf[pos];
+        len = reopcode_info[opcode].size;
+        if (opcode >= REOP_COUNT) {
+            printf(" invalid opcode=0x%02x\n", opcode);
+            break;
+        }
+        if ((pos + len) > bc_len) {
+            printf(" buffer overflow (opcode=0x%02x)\n", opcode);
+            break;
+        }
+        printf("%s", reopcode_info[opcode].name);
+        switch(opcode) {
+        case REOP_char:
+            val = get_u16(buf + pos + 1);
+            if (val >= ' ' && val <= 126)
+                printf(" '%c'", val);
+            else
+                printf(" 0x%04x", val);
+            break;
+        case REOP_char32:
+            val = get_u32(buf + pos + 1);
+            if (val >= ' ' && val <= 126)
+                printf(" '%c'", val);
+            else
+                printf(" 0x%08x", val);
+            break;
+        case REOP_goto:
+        case REOP_split_goto_first:
+        case REOP_split_next_first:
+        case REOP_loop:
+        case REOP_lookahead:
+        case REOP_negative_lookahead:
+            val = get_u32(buf + pos + 1);
+            val += (pos + 5);
+            printf(" %u", val);
+            break;
+        case REOP_simple_greedy_quant:
+            printf(" %u %u %u %u",
+                   get_u32(buf + pos + 1) + (pos + 17),
+                   get_u32(buf + pos + 1 + 4),
+                   get_u32(buf + pos + 1 + 8),
+                   get_u32(buf + pos + 1 + 12));
+            break;
+        case REOP_save_start:
+        case REOP_save_end:
+        case REOP_back_reference:
+        case REOP_backward_back_reference:
+            printf(" %u", buf[pos + 1]);
+            break;
+        case REOP_save_reset:
+            printf(" %u %u", buf[pos + 1], buf[pos + 2]);
+            break;
+        case REOP_push_i32:
+            val = get_u32(buf + pos + 1);
+            printf(" %d", val);
+            break;
+        case REOP_range:
+            {
+                int n, i;
+                n = get_u16(buf + pos + 1);
+                len += n * 4;
+                for(i = 0; i < n * 2; i++) {
+                    val = get_u16(buf + pos + 3 + i * 2);
+                    printf(" 0x%04x", val);
+                }
+            }
+            break;
+        case REOP_range32:
+            {
+                int n, i;
+                n = get_u16(buf + pos + 1);
+                len += n * 8;
+                for(i = 0; i < n * 2; i++) {
+                    val = get_u32(buf + pos + 3 + i * 4);
+                    printf(" 0x%08x", val);
+                }
+            }
+            break;
+        default:
+            break;
+        }
+        printf("\n");
+        pos += len;
+    }
+}
+#endif
+
+static void re_emit_op(REParseState *s, int op)
+{
+    dbuf_putc(&s->byte_code, op);
+}
+
+/* return the offset of the u32 value */
+static int re_emit_op_u32(REParseState *s, int op, uint32_t val)
+{
+    int pos;
+    dbuf_putc(&s->byte_code, op);
+    pos = s->byte_code.size;
+    dbuf_put_u32(&s->byte_code, val);
+    return pos;
+}
+
+static int re_emit_goto(REParseState *s, int op, uint32_t val)
+{
+    int pos;
+    dbuf_putc(&s->byte_code, op);
+    pos = s->byte_code.size;
+    dbuf_put_u32(&s->byte_code, val - (pos + 4));
+    return pos;
+}
+
+static void re_emit_op_u8(REParseState *s, int op, uint32_t val)
+{
+    dbuf_putc(&s->byte_code, op);
+    dbuf_putc(&s->byte_code, val);
+}
+
+static void re_emit_op_u16(REParseState *s, int op, uint32_t val)
+{
+    dbuf_putc(&s->byte_code, op);
+    dbuf_put_u16(&s->byte_code, val);
+}
+
+static int FORMAT_ATTR(2, 3) re_parse_error(REParseState *s, const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    vsnprintf(s->u.error_msg, sizeof(s->u.error_msg), fmt, ap);
+    va_end(ap);
+    return -1;
+}
+
+static int re_parse_out_of_memory(REParseState *s)
+{
+    return re_parse_error(s, "out of memory");
+}
+
+/* If allow_overflow is false, return -1 in case of
+   overflow. Otherwise return INT32_MAX. */
+static int parse_digits(const uint8_t **pp, BOOL allow_overflow)
+{
+    const uint8_t *p;
+    uint64_t v;
+    int c;
+
+    p = *pp;
+    v = 0;
+    for(;;) {
+        c = *p;
+        if (c < '0' || c > '9')
+            break;
+        v = v * 10 + c - '0';
+        if (v >= INT32_MAX) {
+            if (allow_overflow)
+                v = INT32_MAX;
+            else
+                return -1;
+        }
+        p++;
+    }
+    *pp = p;
+    return v;
+}
+
+static int re_parse_expect(REParseState *s, const uint8_t **pp, int c)
+{
+    const uint8_t *p;
+    p = *pp;
+    if (*p != c)
+        return re_parse_error(s, "expecting '%c'", c);
+    p++;
+    *pp = p;
+    return 0;
+}
+
+/* Parse an escape sequence, *pp points after the '\':
+   allow_utf16 value:
+   0 : no UTF-16 escapes allowed
+   1 : UTF-16 escapes allowed
+   2 : UTF-16 escapes allowed and escapes of surrogate pairs are
+   converted to a unicode character (unicode regexp case).
+
+   Return the unicode char and update *pp if recognized,
+   return -1 if malformed escape,
+   return -2 otherwise. */
+int lre_parse_escape(const uint8_t **pp, int allow_utf16)
+{
+    const uint8_t *p;
+    uint32_t c;
+
+    p = *pp;
+    c = *p++;
+    switch(c) {
+    case 'b':
+        c = '\b';
+        break;
+    case 'f':
+        c = '\f';
+        break;
+    case 'n':
+        c = '\n';
+        break;
+    case 'r':
+        c = '\r';
+        break;
+    case 't':
+        c = '\t';
+        break;
+    case 'v':
+        c = '\v';
+        break;
+    case 'x':
+    case 'u':
+        {
+            int h, n, i;
+            uint32_t c1;
+
+            if (*p == '{' && allow_utf16) {
+                p++;
+                c = 0;
+                for(;;) {
+                    h = from_hex(*p++);
+                    if (h < 0)
+                        return -1;
+                    c = (c << 4) | h;
+                    if (c > 0x10FFFF)
+                        return -1;
+                    if (*p == '}')
+                        break;
+                }
+                p++;
+            } else {
+                if (c == 'x') {
+                    n = 2;
+                } else {
+                    n = 4;
+                }
+
+                c = 0;
+                for(i = 0; i < n; i++) {
+                    h = from_hex(*p++);
+                    if (h < 0) {
+                        return -1;
+                    }
+                    c = (c << 4) | h;
+                }
+                if (is_hi_surrogate(c) &&
+                    allow_utf16 == 2 && p[0] == '\\' && p[1] == 'u') {
+                    /* convert an escaped surrogate pair into a
+                       unicode char */
+                    c1 = 0;
+                    for(i = 0; i < 4; i++) {
+                        h = from_hex(p[2 + i]);
+                        if (h < 0)
+                            break;
+                        c1 = (c1 << 4) | h;
+                    }
+                    if (i == 4 && is_lo_surrogate(c1)) {
+                        p += 6;
+                        c = from_surrogate(c, c1);
+                    }
+                }
+            }
+        }
+        break;
+    case '0': case '1': case '2': case '3':
+    case '4': case '5': case '6': case '7':
+        c -= '0';
+        if (allow_utf16 == 2) {
+            /* only accept \0 not followed by digit */
+            if (c != 0 || is_digit(*p))
+                return -1;
+        } else {
+            /* parse a legacy octal sequence */
+            uint32_t v;
+            v = *p - '0';
+            if (v > 7)
+                break;
+            c = (c << 3) | v;
+            p++;
+            if (c >= 32)
+                break;
+            v = *p - '0';
+            if (v > 7)
+                break;
+            c = (c << 3) | v;
+            p++;
+        }
+        break;
+    default:
+        return -2;
+    }
+    *pp = p;
+    return c;
+}
+
+#ifdef CONFIG_ALL_UNICODE
+/* XXX: we use the same chars for name and value */
+static BOOL is_unicode_char(int c)
+{
+    return ((c >= '0' && c <= '9') ||
+            (c >= 'A' && c <= 'Z') ||
+            (c >= 'a' && c <= 'z') ||
+            (c == '_'));
+}
+
+static int parse_unicode_property(REParseState *s, CharRange *cr,
+                                  const uint8_t **pp, BOOL is_inv)
+{
+    const uint8_t *p;
+    char name[64], value[64];
+    char *q;
+    BOOL script_ext;
+    int ret;
+
+    p = *pp;
+    if (*p != '{')
+        return re_parse_error(s, "expecting '{' after \\p");
+    p++;
+    q = name;
+    while (is_unicode_char(*p)) {
+        if ((q - name) >= sizeof(name) - 1)
+            goto unknown_property_name;
+        *q++ = *p++;
+    }
+    *q = '\0';
+    q = value;
+    if (*p == '=') {
+        p++;
+        while (is_unicode_char(*p)) {
+            if ((q - value) >= sizeof(value) - 1)
+                return re_parse_error(s, "unknown unicode property value");
+            *q++ = *p++;
+        }
+    }
+    *q = '\0';
+    if (*p != '}')
+        return re_parse_error(s, "expecting '}'");
+    p++;
+    //    printf("name=%s value=%s\n", name, value);
+
+    if (!strcmp(name, "Script") || !strcmp(name, "sc")) {
+        script_ext = FALSE;
+        goto do_script;
+    } else if (!strcmp(name, "Script_Extensions") || !strcmp(name, "scx")) {
+        script_ext = TRUE;
+    do_script:
+        cr_init(cr, s->opaque, lre_realloc);
+        ret = unicode_script(cr, value, script_ext);
+        if (ret) {
+            cr_free(cr);
+            if (ret == -2)
+                return re_parse_error(s, "unknown unicode script");
+            else
+                goto out_of_memory;
+        }
+    } else if (!strcmp(name, "General_Category") || !strcmp(name, "gc")) {
+        cr_init(cr, s->opaque, lre_realloc);
+        ret = unicode_general_category(cr, value);
+        if (ret) {
+            cr_free(cr);
+            if (ret == -2)
+                return re_parse_error(s, "unknown unicode general category");
+            else
+                goto out_of_memory;
+        }
+    } else if (value[0] == '\0') {
+        cr_init(cr, s->opaque, lre_realloc);
+        ret = unicode_general_category(cr, name);
+        if (ret == -1) {
+            cr_free(cr);
+            goto out_of_memory;
+        }
+        if (ret < 0) {
+            ret = unicode_prop(cr, name);
+            if (ret) {
+                cr_free(cr);
+                if (ret == -2)
+                    goto unknown_property_name;
+                else
+                    goto out_of_memory;
+            }
+        }
+    } else {
+    unknown_property_name:
+        return re_parse_error(s, "unknown unicode property name");
+    }
+
+    if (is_inv) {
+        if (cr_invert(cr)) {
+            cr_free(cr);
+            return -1;
+        }
+    }
+    *pp = p;
+    return 0;
+ out_of_memory:
+    return re_parse_out_of_memory(s);
+}
+#endif /* CONFIG_ALL_UNICODE */
+
+/* return -1 if error otherwise the character or a class range
+   (CLASS_RANGE_BASE). In case of class range, 'cr' is
+   initialized. Otherwise, it is ignored. */
+static int get_class_atom(REParseState *s, CharRange *cr,
+                          const uint8_t **pp, BOOL inclass)
+{
+    const uint8_t *p;
+    uint32_t c;
+    int ret;
+
+    p = *pp;
+
+    c = *p;
+    switch(c) {
+    case '\\':
+        p++;
+        if (p >= s->buf_end)
+            goto unexpected_end;
+        c = *p++;
+        switch(c) {
+        case 'd':
+            c = CHAR_RANGE_d;
+            goto class_range;
+        case 'D':
+            c = CHAR_RANGE_D;
+            goto class_range;
+        case 's':
+            c = CHAR_RANGE_s;
+            goto class_range;
+        case 'S':
+            c = CHAR_RANGE_S;
+            goto class_range;
+        case 'w':
+            c = CHAR_RANGE_w;
+            goto class_range;
+        case 'W':
+            c = CHAR_RANGE_W;
+        class_range:
+            if (cr_init_char_range(s, cr, c))
+                return -1;
+            c = CLASS_RANGE_BASE;
+            break;
+        case 'c':
+            c = *p;
+            if ((c >= 'a' && c <= 'z') ||
+                (c >= 'A' && c <= 'Z') ||
+                (((c >= '0' && c <= '9') || c == '_') &&
+                 inclass && !s->is_unicode)) {   /* Annex B.1.4 */
+                c &= 0x1f;
+                p++;
+            } else if (s->is_unicode) {
+                goto invalid_escape;
+            } else {
+                /* otherwise return '\' and 'c' */
+                p--;
+                c = '\\';
+            }
+            break;
+#ifdef CONFIG_ALL_UNICODE
+        case 'p':
+        case 'P':
+            if (s->is_unicode) {
+                if (parse_unicode_property(s, cr, &p, (c == 'P')))
+                    return -1;
+                c = CLASS_RANGE_BASE;
+                break;
+            }
+            /* fall thru */
+#endif
+        default:
+            p--;
+            ret = lre_parse_escape(&p, s->is_unicode * 2);
+            if (ret >= 0) {
+                c = ret;
+            } else {
+                if (ret == -2 && *p != '\0' && strchr("^$\\.*+?()[]{}|/", *p)) {
+                    /* always valid to escape these characters */
+                    goto normal_char;
+                } else if (s->is_unicode) {
+                invalid_escape:
+                    return re_parse_error(s, "invalid escape sequence in regular expression");
+                } else {
+                    /* just ignore the '\' */
+                    goto normal_char;
+                }
+            }
+            break;
+        }
+        break;
+    case '\0':
+        if (p >= s->buf_end) {
+        unexpected_end:
+            return re_parse_error(s, "unexpected end");
+        }
+        /* fall thru */
+    default:
+    normal_char:
+        /* normal char */
+        if (c >= 128) {
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+            if ((unsigned)c > 0xffff && !s->is_unicode) {
+                /* XXX: should handle non BMP-1 code points */
+                return re_parse_error(s, "malformed unicode char");
+            }
+        } else {
+            p++;
+        }
+        break;
+    }
+    *pp = p;
+    return c;
+}
+
+static int re_emit_range(REParseState *s, const CharRange *cr)
+{
+    int len, i;
+    uint32_t high;
+
+    len = (unsigned)cr->len / 2;
+    if (len >= 65535)
+        return re_parse_error(s, "too many ranges");
+    if (len == 0) {
+        /* not sure it can really happen. Emit a match that is always
+           false */
+        re_emit_op_u32(s, REOP_char32, -1);
+    } else {
+        high = cr->points[cr->len - 1];
+        if (high == UINT32_MAX)
+            high = cr->points[cr->len - 2];
+        if (high <= 0xffff) {
+            /* can use 16 bit ranges with the conversion that 0xffff =
+               infinity */
+            re_emit_op_u16(s, REOP_range, len);
+            for(i = 0; i < cr->len; i += 2) {
+                dbuf_put_u16(&s->byte_code, cr->points[i]);
+                high = cr->points[i + 1] - 1;
+                if (high == UINT32_MAX - 1)
+                    high = 0xffff;
+                dbuf_put_u16(&s->byte_code, high);
+            }
+        } else {
+            re_emit_op_u16(s, REOP_range32, len);
+            for(i = 0; i < cr->len; i += 2) {
+                dbuf_put_u32(&s->byte_code, cr->points[i]);
+                dbuf_put_u32(&s->byte_code, cr->points[i + 1] - 1);
+            }
+        }
+    }
+    return 0;
+}
+
+static int re_parse_char_class(REParseState *s, const uint8_t **pp)
+{
+    const uint8_t *p;
+    uint32_t c1, c2;
+    CharRange cr_s, *cr = &cr_s;
+    CharRange cr1_s, *cr1 = &cr1_s;
+    BOOL invert;
+
+    cr_init(cr, s->opaque, lre_realloc);
+    p = *pp;
+    p++;    /* skip '[' */
+
+    invert = FALSE;
+    if (*p == '^') {
+        p++;
+        invert = TRUE;
+    }
+
+    for(;;) {
+        if (*p == ']')
+            break;
+        c1 = get_class_atom(s, cr1, &p, TRUE);
+        if ((int)c1 < 0)
+            goto fail;
+        if (*p == '-' && p[1] != ']') {
+            const uint8_t *p0 = p + 1;
+            if (c1 >= CLASS_RANGE_BASE) {
+                if (s->is_unicode) {
+                    cr_free(cr1);
+                    goto invalid_class_range;
+                }
+                /* Annex B: match '-' character */
+                goto class_atom;
+            }
+            c2 = get_class_atom(s, cr1, &p0, TRUE);
+            if ((int)c2 < 0)
+                goto fail;
+            if (c2 >= CLASS_RANGE_BASE) {
+                cr_free(cr1);
+                if (s->is_unicode) {
+                    goto invalid_class_range;
+                }
+                /* Annex B: match '-' character */
+                goto class_atom;
+            }
+            p = p0;
+            if (c2 < c1) {
+            invalid_class_range:
+                re_parse_error(s, "invalid class range");
+                goto fail;
+            }
+            if (cr_union_interval(cr, c1, c2))
+                goto memory_error;
+        } else {
+        class_atom:
+            if (c1 >= CLASS_RANGE_BASE) {
+                int ret;
+                ret = cr_union1(cr, cr1->points, cr1->len);
+                cr_free(cr1);
+                if (ret)
+                    goto memory_error;
+            } else {
+                if (cr_union_interval(cr, c1, c1))
+                    goto memory_error;
+            }
+        }
+    }
+    if (s->ignore_case) {
+        if (cr_regexp_canonicalize(cr, s->is_unicode))
+            goto memory_error;
+    }
+    if (invert) {
+        if (cr_invert(cr))
+            goto memory_error;
+    }
+    if (re_emit_range(s, cr))
+        goto fail;
+    cr_free(cr);
+    p++;    /* skip ']' */
+    *pp = p;
+    return 0;
+ memory_error:
+    re_parse_out_of_memory(s);
+ fail:
+    cr_free(cr);
+    return -1;
+}
+
+/* Return:
+   - true if the opcodes may not advance the char pointer
+   - false if the opcodes always advance the char pointer
+*/
+static BOOL re_need_check_advance(const uint8_t *bc_buf, int bc_buf_len)
+{
+    int pos, opcode, len;
+    uint32_t val;
+    BOOL ret;
+
+    ret = TRUE;
+    pos = 0;
+    while (pos < bc_buf_len) {
+        opcode = bc_buf[pos];
+        len = reopcode_info[opcode].size;
+        switch(opcode) {
+        case REOP_range:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 4;
+            goto simple_char;
+        case REOP_range32:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 8;
+            goto simple_char;
+        case REOP_char:
+        case REOP_char32:
+        case REOP_dot:
+        case REOP_any:
+        simple_char:
+            ret = FALSE;
+            break;
+        case REOP_line_start:
+        case REOP_line_end:
+        case REOP_push_i32:
+        case REOP_push_char_pos:
+        case REOP_drop:
+        case REOP_word_boundary:
+        case REOP_not_word_boundary:
+        case REOP_prev:
+            /* no effect */
+            break;
+        case REOP_save_start:
+        case REOP_save_end:
+        case REOP_save_reset:
+        case REOP_back_reference:
+        case REOP_backward_back_reference:
+            break;
+        default:
+            /* safe behavior: we cannot predict the outcome */
+            return TRUE;
+        }
+        pos += len;
+    }
+    return ret;
+}
+
+/* return -1 if a simple quantifier cannot be used. Otherwise return
+   the number of characters in the atom. */
+static int re_is_simple_quantifier(const uint8_t *bc_buf, int bc_buf_len)
+{
+    int pos, opcode, len, count;
+    uint32_t val;
+
+    count = 0;
+    pos = 0;
+    while (pos < bc_buf_len) {
+        opcode = bc_buf[pos];
+        len = reopcode_info[opcode].size;
+        switch(opcode) {
+        case REOP_range:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 4;
+            goto simple_char;
+        case REOP_range32:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 8;
+            goto simple_char;
+        case REOP_char:
+        case REOP_char32:
+        case REOP_dot:
+        case REOP_any:
+        simple_char:
+            count++;
+            break;
+        case REOP_line_start:
+        case REOP_line_end:
+        case REOP_word_boundary:
+        case REOP_not_word_boundary:
+            break;
+        default:
+            return -1;
+        }
+        pos += len;
+    }
+    return count;
+}
+
+/* '*pp' is the first char after '<' */
+static int re_parse_group_name(char *buf, int buf_size, const uint8_t **pp)
+{
+    const uint8_t *p, *p1;
+    uint32_t c, d;
+    char *q;
+
+    p = *pp;
+    q = buf;
+    for(;;) {
+        c = *p;
+        if (c == '\\') {
+            p++;
+            if (*p != 'u')
+                return -1;
+            c = lre_parse_escape(&p, 2); // accept surrogate pairs
+        } else if (c == '>') {
+            break;
+        } else if (c >= 128) {
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+            if (is_hi_surrogate(c)) {
+                d = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p1);
+                if (is_lo_surrogate(d)) {
+                    c = from_surrogate(c, d);
+                    p = p1;
+                }
+            }
+        } else {
+            p++;
+        }
+        if (c > 0x10FFFF)
+            return -1;
+        if (q == buf) {
+            if (!lre_js_is_ident_first(c))
+                return -1;
+        } else {
+            if (!lre_js_is_ident_next(c))
+                return -1;
+        }
+        if ((q - buf + UTF8_CHAR_LEN_MAX + 1) > buf_size)
+            return -1;
+        if (c < 128) {
+            *q++ = c;
+        } else {
+            q += unicode_to_utf8((uint8_t*)q, c);
+        }
+    }
+    if (q == buf)
+        return -1;
+    *q = '\0';
+    p++;
+    *pp = p;
+    return 0;
+}
+
+/* if capture_name = NULL: return the number of captures + 1.
+   Otherwise, return the capture index corresponding to capture_name
+   or -1 if none */
+static int re_parse_captures(REParseState *s, int *phas_named_captures,
+                             const char *capture_name)
+{
+    const uint8_t *p;
+    int capture_index;
+    char name[TMP_BUF_SIZE];
+
+    capture_index = 1;
+    *phas_named_captures = 0;
+    for (p = s->buf_start; p < s->buf_end; p++) {
+        switch (*p) {
+        case '(':
+            if (p[1] == '?') {
+                if (p[2] == '<' && p[3] != '=' && p[3] != '!') {
+                    *phas_named_captures = 1;
+                    /* potential named capture */
+                    if (capture_name) {
+                        p += 3;
+                        if (re_parse_group_name(name, sizeof(name), &p) == 0) {
+                            if (!strcmp(name, capture_name))
+                                return capture_index;
+                        }
+                    }
+                    capture_index++;
+                    if (capture_index >= CAPTURE_COUNT_MAX)
+                        goto done;
+                }
+            } else {
+                capture_index++;
+                if (capture_index >= CAPTURE_COUNT_MAX)
+                    goto done;
+            }
+            break;
+        case '\\':
+            p++;
+            break;
+        case '[':
+            for (p += 1 + (*p == ']'); p < s->buf_end && *p != ']'; p++) {
+                if (*p == '\\')
+                    p++;
+            }
+            break;
+        }
+    }
+ done:
+    if (capture_name)
+        return -1;
+    else
+        return capture_index;
+}
+
+static int re_count_captures(REParseState *s)
+{
+    if (s->total_capture_count < 0) {
+        s->total_capture_count = re_parse_captures(s, &s->has_named_captures,
+                                                   NULL);
+    }
+    return s->total_capture_count;
+}
+
+static BOOL re_has_named_captures(REParseState *s)
+{
+    if (s->has_named_captures < 0)
+        re_count_captures(s);
+    return s->has_named_captures;
+}
+
+static int find_group_name(REParseState *s, const char *name)
+{
+    const char *p, *buf_end;
+    size_t len, name_len;
+    int capture_index;
+
+    p = (char *)s->group_names.buf;
+    if (!p) return -1;
+    buf_end = (char *)s->group_names.buf + s->group_names.size;
+    name_len = strlen(name);
+    capture_index = 1;
+    while (p < buf_end) {
+        len = strlen(p);
+        if (len == name_len && memcmp(name, p, name_len) == 0)
+            return capture_index;
+        p += len + 1;
+        capture_index++;
+    }
+    return -1;
+}
+
+static int re_parse_disjunction(REParseState *s, BOOL is_backward_dir);
+
+static int re_parse_term(REParseState *s, BOOL is_backward_dir)
+{
+    const uint8_t *p;
+    int c, last_atom_start, quant_min, quant_max, last_capture_count;
+    BOOL greedy, add_zero_advance_check, is_neg, is_backward_lookahead;
+    CharRange cr_s, *cr = &cr_s;
+
+    last_atom_start = -1;
+    last_capture_count = 0;
+    p = s->buf_ptr;
+    c = *p;
+    switch(c) {
+    case '^':
+        p++;
+        re_emit_op(s, REOP_line_start);
+        break;
+    case '$':
+        p++;
+        re_emit_op(s, REOP_line_end);
+        break;
+    case '.':
+        p++;
+        last_atom_start = s->byte_code.size;
+        last_capture_count = s->capture_count;
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        re_emit_op(s, s->dotall ? REOP_any : REOP_dot);
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        break;
+    case '{':
+        if (s->is_unicode) {
+            return re_parse_error(s, "syntax error");
+        } else if (!is_digit(p[1])) {
+            /* Annex B: we accept '{' not followed by digits as a
+               normal atom */
+            goto parse_class_atom;
+        } else {
+            const uint8_t *p1 = p + 1;
+            /* Annex B: error if it is like a repetition count */
+            parse_digits(&p1, TRUE);
+            if (*p1 == ',') {
+                p1++;
+                if (is_digit(*p1)) {
+                    parse_digits(&p1, TRUE);
+                }
+            }
+            if (*p1 != '}') {
+                goto parse_class_atom;
+            }
+        }
+        /* fall thru */
+    case '*':
+    case '+':
+    case '?':
+        return re_parse_error(s, "nothing to repeat");
+    case '(':
+        if (p[1] == '?') {
+            if (p[2] == ':') {
+                p += 3;
+                last_atom_start = s->byte_code.size;
+                last_capture_count = s->capture_count;
+                s->buf_ptr = p;
+                if (re_parse_disjunction(s, is_backward_dir))
+                    return -1;
+                p = s->buf_ptr;
+                if (re_parse_expect(s, &p, ')'))
+                    return -1;
+            } else if ((p[2] == '=' || p[2] == '!')) {
+                is_neg = (p[2] == '!');
+                is_backward_lookahead = FALSE;
+                p += 3;
+                goto lookahead;
+            } else if (p[2] == '<' &&
+                       (p[3] == '=' || p[3] == '!')) {
+                int pos;
+                is_neg = (p[3] == '!');
+                is_backward_lookahead = TRUE;
+                p += 4;
+                /* lookahead */
+            lookahead:
+                /* Annex B allows lookahead to be used as an atom for
+                   the quantifiers */
+                if (!s->is_unicode && !is_backward_lookahead)  {
+                    last_atom_start = s->byte_code.size;
+                    last_capture_count = s->capture_count;
+                }
+                pos = re_emit_op_u32(s, REOP_lookahead + is_neg, 0);
+                s->buf_ptr = p;
+                if (re_parse_disjunction(s, is_backward_lookahead))
+                    return -1;
+                p = s->buf_ptr;
+                if (re_parse_expect(s, &p, ')'))
+                    return -1;
+                re_emit_op(s, REOP_match);
+                /* jump after the 'match' after the lookahead is successful */
+                if (dbuf_error(&s->byte_code))
+                    return -1;
+                put_u32(s->byte_code.buf + pos, s->byte_code.size - (pos + 4));
+            } else if (p[2] == '<') {
+                p += 3;
+                if (re_parse_group_name(s->u.tmp_buf, sizeof(s->u.tmp_buf),
+                                        &p)) {
+                    return re_parse_error(s, "invalid group name");
+                }
+                if (find_group_name(s, s->u.tmp_buf) > 0) {
+                    return re_parse_error(s, "duplicate group name");
+                }
+                /* group name with a trailing zero */
+                dbuf_put(&s->group_names, (uint8_t *)s->u.tmp_buf,
+                         strlen(s->u.tmp_buf) + 1);
+                s->has_named_captures = 1;
+                goto parse_capture;
+            } else {
+                return re_parse_error(s, "invalid group");
+            }
+        } else {
+            int capture_index;
+            p++;
+            /* capture without group name */
+            dbuf_putc(&s->group_names, 0);
+        parse_capture:
+            if (s->capture_count >= CAPTURE_COUNT_MAX)
+                return re_parse_error(s, "too many captures");
+            last_atom_start = s->byte_code.size;
+            last_capture_count = s->capture_count;
+            capture_index = s->capture_count++;
+            re_emit_op_u8(s, REOP_save_start + is_backward_dir,
+                          capture_index);
+
+            s->buf_ptr = p;
+            if (re_parse_disjunction(s, is_backward_dir))
+                return -1;
+            p = s->buf_ptr;
+
+            re_emit_op_u8(s, REOP_save_start + 1 - is_backward_dir,
+                          capture_index);
+
+            if (re_parse_expect(s, &p, ')'))
+                return -1;
+        }
+        break;
+    case '\\':
+        switch(p[1]) {
+        case 'b':
+        case 'B':
+            re_emit_op(s, REOP_word_boundary + (p[1] != 'b'));
+            p += 2;
+            break;
+        case 'k':
+            {
+                const uint8_t *p1;
+                int dummy_res;
+
+                p1 = p;
+                if (p1[2] != '<') {
+                    /* annex B: we tolerate invalid group names in non
+                       unicode mode if there is no named capture
+                       definition */
+                    if (s->is_unicode || re_has_named_captures(s))
+                        return re_parse_error(s, "expecting group name");
+                    else
+                        goto parse_class_atom;
+                }
+                p1 += 3;
+                if (re_parse_group_name(s->u.tmp_buf, sizeof(s->u.tmp_buf),
+                                        &p1)) {
+                    if (s->is_unicode || re_has_named_captures(s))
+                        return re_parse_error(s, "invalid group name");
+                    else
+                        goto parse_class_atom;
+                }
+                c = find_group_name(s, s->u.tmp_buf);
+                if (c < 0) {
+                    /* no capture name parsed before, try to look
+                       after (inefficient, but hopefully not common */
+                    c = re_parse_captures(s, &dummy_res, s->u.tmp_buf);
+                    if (c < 0) {
+                        if (s->is_unicode || re_has_named_captures(s))
+                            return re_parse_error(s, "group name not defined");
+                        else
+                            goto parse_class_atom;
+                    }
+                }
+                p = p1;
+            }
+            goto emit_back_reference;
+        case '0':
+            p += 2;
+            c = 0;
+            if (s->is_unicode) {
+                if (is_digit(*p)) {
+                    return re_parse_error(s, "invalid decimal escape in regular expression");
+                }
+            } else {
+                /* Annex B.1.4: accept legacy octal */
+                if (*p >= '0' && *p <= '7') {
+                    c = *p++ - '0';
+                    if (*p >= '0' && *p <= '7') {
+                        c = (c << 3) + *p++ - '0';
+                    }
+                }
+            }
+            goto normal_char;
+        case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8':
+        case '9':
+            {
+                const uint8_t *q = ++p;
+
+                c = parse_digits(&p, FALSE);
+                if (c < 0 || (c >= s->capture_count && c >= re_count_captures(s))) {
+                    if (!s->is_unicode) {
+                        /* Annex B.1.4: accept legacy octal */
+                        p = q;
+                        if (*p <= '7') {
+                            c = 0;
+                            if (*p <= '3')
+                                c = *p++ - '0';
+                            if (*p >= '0' && *p <= '7') {
+                                c = (c << 3) + *p++ - '0';
+                                if (*p >= '0' && *p <= '7') {
+                                    c = (c << 3) + *p++ - '0';
+                                }
+                            }
+                        } else {
+                            c = *p++;
+                        }
+                        goto normal_char;
+                    }
+                    return re_parse_error(s, "back reference out of range in regular expression");
+                }
+            emit_back_reference:
+                last_atom_start = s->byte_code.size;
+                last_capture_count = s->capture_count;
+                re_emit_op_u8(s, REOP_back_reference + is_backward_dir, c);
+            }
+            break;
+        default:
+            goto parse_class_atom;
+        }
+        break;
+    case '[':
+        last_atom_start = s->byte_code.size;
+        last_capture_count = s->capture_count;
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        if (re_parse_char_class(s, &p))
+            return -1;
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        break;
+    case ']':
+    case '}':
+        if (s->is_unicode)
+            return re_parse_error(s, "syntax error");
+        goto parse_class_atom;
+    default:
+    parse_class_atom:
+        c = get_class_atom(s, cr, &p, FALSE);
+        if ((int)c < 0)
+            return -1;
+    normal_char:
+        last_atom_start = s->byte_code.size;
+        last_capture_count = s->capture_count;
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        if (c >= CLASS_RANGE_BASE) {
+            int ret;
+            /* Note: canonicalization is not needed */
+            ret = re_emit_range(s, cr);
+            cr_free(cr);
+            if (ret)
+                return -1;
+        } else {
+            if (s->ignore_case)
+                c = lre_canonicalize(c, s->is_unicode);
+            if (c <= 0xffff)
+                re_emit_op_u16(s, REOP_char, c);
+            else
+                re_emit_op_u32(s, REOP_char32, c);
+        }
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        break;
+    }
+
+    /* quantifier */
+    if (last_atom_start >= 0) {
+        c = *p;
+        switch(c) {
+        case '*':
+            p++;
+            quant_min = 0;
+            quant_max = INT32_MAX;
+            goto quantifier;
+        case '+':
+            p++;
+            quant_min = 1;
+            quant_max = INT32_MAX;
+            goto quantifier;
+        case '?':
+            p++;
+            quant_min = 0;
+            quant_max = 1;
+            goto quantifier;
+        case '{':
+            {
+                const uint8_t *p1 = p;
+                /* As an extension (see ES6 annex B), we accept '{' not
+                   followed by digits as a normal atom */
+                if (!is_digit(p[1])) {
+                    if (s->is_unicode)
+                        goto invalid_quant_count;
+                    break;
+                }
+                p++;
+                quant_min = parse_digits(&p, TRUE);
+                quant_max = quant_min;
+                if (*p == ',') {
+                    p++;
+                    if (is_digit(*p)) {
+                        quant_max = parse_digits(&p, TRUE);
+                        if (quant_max < quant_min) {
+                        invalid_quant_count:
+                            return re_parse_error(s, "invalid repetition count");
+                        }
+                    } else {
+                        quant_max = INT32_MAX; /* infinity */
+                    }
+                }
+                if (*p != '}' && !s->is_unicode) {
+                    /* Annex B: normal atom if invalid '{' syntax */
+                    p = p1;
+                    break;
+                }
+                if (re_parse_expect(s, &p, '}'))
+                    return -1;
+            }
+        quantifier:
+            greedy = TRUE;
+            if (*p == '?') {
+                p++;
+                greedy = FALSE;
+            }
+            if (last_atom_start < 0) {
+                return re_parse_error(s, "nothing to repeat");
+            }
+            if (greedy) {
+                int len, pos;
+
+                if (quant_max > 0) {
+                    /* specific optimization for simple quantifiers */
+                    if (dbuf_error(&s->byte_code))
+                        goto out_of_memory;
+                    len = re_is_simple_quantifier(s->byte_code.buf + last_atom_start,
+                                                 s->byte_code.size - last_atom_start);
+                    if (len > 0) {
+                        re_emit_op(s, REOP_match);
+
+                        if (dbuf_insert(&s->byte_code, last_atom_start, 17))
+                            goto out_of_memory;
+                        pos = last_atom_start;
+                        s->byte_code.buf[pos++] = REOP_simple_greedy_quant;
+                        put_u32(&s->byte_code.buf[pos],
+                                s->byte_code.size - last_atom_start - 17);
+                        pos += 4;
+                        put_u32(&s->byte_code.buf[pos], quant_min);
+                        pos += 4;
+                        put_u32(&s->byte_code.buf[pos], quant_max);
+                        pos += 4;
+                        put_u32(&s->byte_code.buf[pos], len);
+                        pos += 4;
+                        goto done;
+                    }
+                }
+
+                if (dbuf_error(&s->byte_code))
+                    goto out_of_memory;
+                /* the spec tells that if there is no advance when
+                   running the atom after the first quant_min times,
+                   then there is no match. We remove this test when we
+                   are sure the atom always advances the position. */
+                add_zero_advance_check = re_need_check_advance(s->byte_code.buf + last_atom_start,
+                                                               s->byte_code.size - last_atom_start);
+            } else {
+                add_zero_advance_check = FALSE;
+            }
+
+            {
+                int len, pos;
+                len = s->byte_code.size - last_atom_start;
+                if (quant_min == 0) {
+                    /* need to reset the capture in case the atom is
+                       not executed */
+                    if (last_capture_count != s->capture_count) {
+                        if (dbuf_insert(&s->byte_code, last_atom_start, 3))
+                            goto out_of_memory;
+                        s->byte_code.buf[last_atom_start++] = REOP_save_reset;
+                        s->byte_code.buf[last_atom_start++] = last_capture_count;
+                        s->byte_code.buf[last_atom_start++] = s->capture_count - 1;
+                    }
+                    if (quant_max == 0) {
+                        s->byte_code.size = last_atom_start;
+                    } else if (quant_max == 1 || quant_max == INT32_MAX) {
+                        BOOL has_goto = (quant_max == INT32_MAX);
+                        if (dbuf_insert(&s->byte_code, last_atom_start, 5 + add_zero_advance_check))
+                            goto out_of_memory;
+                        s->byte_code.buf[last_atom_start] = REOP_split_goto_first +
+                            greedy;
+                        put_u32(s->byte_code.buf + last_atom_start + 1,
+                                len + 5 * has_goto + add_zero_advance_check * 2);
+                        if (add_zero_advance_check) {
+                            s->byte_code.buf[last_atom_start + 1 + 4] = REOP_push_char_pos;
+                            re_emit_op(s, REOP_check_advance);
+                        }
+                        if (has_goto)
+                            re_emit_goto(s, REOP_goto, last_atom_start);
+                    } else {
+                        if (dbuf_insert(&s->byte_code, last_atom_start, 10 + add_zero_advance_check))
+                            goto out_of_memory;
+                        pos = last_atom_start;
+                        s->byte_code.buf[pos++] = REOP_push_i32;
+                        put_u32(s->byte_code.buf + pos, quant_max);
+                        pos += 4;
+                        s->byte_code.buf[pos++] = REOP_split_goto_first + greedy;
+                        put_u32(s->byte_code.buf + pos, len + 5 + add_zero_advance_check * 2);
+                        pos += 4;
+                        if (add_zero_advance_check) {
+                            s->byte_code.buf[pos++] = REOP_push_char_pos;
+                            re_emit_op(s, REOP_check_advance);
+                        }
+                        re_emit_goto(s, REOP_loop, last_atom_start + 5);
+                        re_emit_op(s, REOP_drop);
+                    }
+                } else if (quant_min == 1 && quant_max == INT32_MAX &&
+                           !add_zero_advance_check) {
+                    re_emit_goto(s, REOP_split_next_first - greedy,
+                                 last_atom_start);
+                } else {
+                    if (quant_min == 1) {
+                        /* nothing to add */
+                    } else {
+                        if (dbuf_insert(&s->byte_code, last_atom_start, 5))
+                            goto out_of_memory;
+                        s->byte_code.buf[last_atom_start] = REOP_push_i32;
+                        put_u32(s->byte_code.buf + last_atom_start + 1,
+                                quant_min);
+                        last_atom_start += 5;
+                        re_emit_goto(s, REOP_loop, last_atom_start);
+                        re_emit_op(s, REOP_drop);
+                    }
+                    if (quant_max == INT32_MAX) {
+                        pos = s->byte_code.size;
+                        re_emit_op_u32(s, REOP_split_goto_first + greedy,
+                                       len + 5 + add_zero_advance_check * 2);
+                        if (add_zero_advance_check)
+                            re_emit_op(s, REOP_push_char_pos);
+                        /* copy the atom */
+                        dbuf_put_self(&s->byte_code, last_atom_start, len);
+                        if (add_zero_advance_check)
+                            re_emit_op(s, REOP_check_advance);
+                        re_emit_goto(s, REOP_goto, pos);
+                    } else if (quant_max > quant_min) {
+                        re_emit_op_u32(s, REOP_push_i32, quant_max - quant_min);
+                        pos = s->byte_code.size;
+                        re_emit_op_u32(s, REOP_split_goto_first + greedy,
+                                       len + 5 + add_zero_advance_check * 2);
+                        if (add_zero_advance_check)
+                            re_emit_op(s, REOP_push_char_pos);
+                        /* copy the atom */
+                        dbuf_put_self(&s->byte_code, last_atom_start, len);
+                        if (add_zero_advance_check)
+                            re_emit_op(s, REOP_check_advance);
+                        re_emit_goto(s, REOP_loop, pos);
+                        re_emit_op(s, REOP_drop);
+                    }
+                }
+                last_atom_start = -1;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+ done:
+    s->buf_ptr = p;
+    return 0;
+ out_of_memory:
+    return re_parse_out_of_memory(s);
+}
+
+static int re_parse_alternative(REParseState *s, BOOL is_backward_dir)
+{
+    const uint8_t *p;
+    int ret;
+    size_t start, term_start, end, term_size;
+
+    start = s->byte_code.size;
+    for(;;) {
+        p = s->buf_ptr;
+        if (p >= s->buf_end)
+            break;
+        if (*p == '|' || *p == ')')
+            break;
+        term_start = s->byte_code.size;
+        ret = re_parse_term(s, is_backward_dir);
+        if (ret)
+            return ret;
+        if (is_backward_dir) {
+            /* reverse the order of the terms (XXX: inefficient, but
+               speed is not really critical here) */
+            end = s->byte_code.size;
+            term_size = end - term_start;
+            if (dbuf_realloc(&s->byte_code, end + term_size))
+                return -1;
+            memmove(s->byte_code.buf + start + term_size,
+                    s->byte_code.buf + start,
+                    end - start);
+            memcpy(s->byte_code.buf + start, s->byte_code.buf + end,
+                   term_size);
+        }
+    }
+    return 0;
+}
+
+static int re_parse_disjunction(REParseState *s, BOOL is_backward_dir)
+{
+    int start, len, pos;
+
+    if (lre_check_stack_overflow(s->opaque, 0))
+        return re_parse_error(s, "stack overflow");
+
+    start = s->byte_code.size;
+    if (re_parse_alternative(s, is_backward_dir))
+        return -1;
+    while (*s->buf_ptr == '|') {
+        s->buf_ptr++;
+
+        len = s->byte_code.size - start;
+
+        /* insert a split before the first alternative */
+        if (dbuf_insert(&s->byte_code, start, 5)) {
+            return re_parse_out_of_memory(s);
+        }
+        s->byte_code.buf[start] = REOP_split_next_first;
+        put_u32(s->byte_code.buf + start + 1, len + 5);
+
+        pos = re_emit_op_u32(s, REOP_goto, 0);
+
+        if (re_parse_alternative(s, is_backward_dir))
+            return -1;
+
+        /* patch the goto */
+        len = s->byte_code.size - (pos + 4);
+        put_u32(s->byte_code.buf + pos, len);
+    }
+    return 0;
+}
+
+/* the control flow is recursive so the analysis can be linear */
+static int compute_stack_size(const uint8_t *bc_buf, int bc_buf_len)
+{
+    int stack_size, stack_size_max, pos, opcode, len;
+    uint32_t val;
+
+    stack_size = 0;
+    stack_size_max = 0;
+    bc_buf += RE_HEADER_LEN;
+    bc_buf_len -= RE_HEADER_LEN;
+    pos = 0;
+    while (pos < bc_buf_len) {
+        opcode = bc_buf[pos];
+        len = reopcode_info[opcode].size;
+        assert(opcode < REOP_COUNT);
+        assert((pos + len) <= bc_buf_len);
+        switch(opcode) {
+        case REOP_push_i32:
+        case REOP_push_char_pos:
+            stack_size++;
+            if (stack_size > stack_size_max) {
+                if (stack_size > STACK_SIZE_MAX)
+                    return -1;
+                stack_size_max = stack_size;
+            }
+            break;
+        case REOP_drop:
+        case REOP_check_advance:
+            assert(stack_size > 0);
+            stack_size--;
+            break;
+        case REOP_range:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 4;
+            break;
+        case REOP_range32:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 8;
+            break;
+        }
+        pos += len;
+    }
+    return stack_size_max;
+}
+
+/* 'buf' must be a zero terminated UTF-8 string of length buf_len.
+   Return NULL if error and allocate an error message in *perror_msg,
+   otherwise the compiled bytecode and its length in plen.
+*/
+uint8_t *lre_compile(int *plen, char *error_msg, int error_msg_size,
+                     const char *buf, size_t buf_len, int re_flags,
+                     void *opaque)
+{
+    REParseState s_s, *s = &s_s;
+    int stack_size;
+    BOOL is_sticky;
+
+    memset(s, 0, sizeof(*s));
+    s->opaque = opaque;
+    s->buf_ptr = (const uint8_t *)buf;
+    s->buf_end = s->buf_ptr + buf_len;
+    s->buf_start = s->buf_ptr;
+    s->re_flags = re_flags;
+    s->is_unicode = ((re_flags & LRE_FLAG_UNICODE) != 0);
+    is_sticky = ((re_flags & LRE_FLAG_STICKY) != 0);
+    s->ignore_case = ((re_flags & LRE_FLAG_IGNORECASE) != 0);
+    s->dotall = ((re_flags & LRE_FLAG_DOTALL) != 0);
+    s->capture_count = 1;
+    s->total_capture_count = -1;
+    s->has_named_captures = -1;
+
+    dbuf_init2(&s->byte_code, opaque, lre_realloc);
+    dbuf_init2(&s->group_names, opaque, lre_realloc);
+
+    dbuf_putc(&s->byte_code, re_flags); /* first element is the flags */
+    dbuf_putc(&s->byte_code, 0); /* second element is the number of captures */
+    dbuf_putc(&s->byte_code, 0); /* stack size */
+    dbuf_put_u32(&s->byte_code, 0); /* bytecode length */
+
+    if (!is_sticky) {
+        /* iterate thru all positions (about the same as .*?( ... ) )
+           .  We do it without an explicit loop so that lock step
+           thread execution will be possible in an optimized
+           implementation */
+        re_emit_op_u32(s, REOP_split_goto_first, 1 + 5);
+        re_emit_op(s, REOP_any);
+        re_emit_op_u32(s, REOP_goto, -(5 + 1 + 5));
+    }
+    re_emit_op_u8(s, REOP_save_start, 0);
+
+    if (re_parse_disjunction(s, FALSE)) {
+    error:
+        dbuf_free(&s->byte_code);
+        dbuf_free(&s->group_names);
+        pstrcpy(error_msg, error_msg_size, s->u.error_msg);
+        *plen = 0;
+        return NULL;
+    }
+
+    re_emit_op_u8(s, REOP_save_end, 0);
+
+    re_emit_op(s, REOP_match);
+
+    if (*s->buf_ptr != '\0') {
+        re_parse_error(s, "extraneous characters at the end");
+        goto error;
+    }
+
+    if (dbuf_error(&s->byte_code)) {
+        re_parse_out_of_memory(s);
+        goto error;
+    }
+
+    stack_size = compute_stack_size(s->byte_code.buf, s->byte_code.size);
+    if (stack_size < 0) {
+        re_parse_error(s, "too many imbricated quantifiers");
+        goto error;
+    }
+
+    s->byte_code.buf[RE_HEADER_CAPTURE_COUNT] = s->capture_count;
+    s->byte_code.buf[RE_HEADER_STACK_SIZE] = stack_size;
+    put_u32(s->byte_code.buf + RE_HEADER_BYTECODE_LEN,
+            s->byte_code.size - RE_HEADER_LEN);
+
+    /* add the named groups if needed */
+    if (s->group_names.size > (s->capture_count - 1)) {
+        dbuf_put(&s->byte_code, s->group_names.buf, s->group_names.size);
+        s->byte_code.buf[RE_HEADER_FLAGS] |= LRE_FLAG_NAMED_GROUPS;
+    }
+    dbuf_free(&s->group_names);
+
+#ifdef DUMP_REOP
+    lre_dump_bytecode(s->byte_code.buf, s->byte_code.size);
+#endif
+
+    error_msg[0] = '\0';
+    *plen = s->byte_code.size;
+    return s->byte_code.buf;
+}
+
+static BOOL is_line_terminator(uint32_t c)
+{
+    return (c == '\n' || c == '\r' || c == CP_LS || c == CP_PS);
+}
+
+static BOOL is_word_char(uint32_t c)
+{
+    return ((c >= '0' && c <= '9') ||
+            (c >= 'a' && c <= 'z') ||
+            (c >= 'A' && c <= 'Z') ||
+            (c == '_'));
+}
+
+#define GET_CHAR(c, cptr, cbuf_end, cbuf_type)                          \
+    do {                                                                \
+        if (cbuf_type == 0) {                                           \
+            c = *cptr++;                                                \
+        } else {                                                        \
+            const uint16_t *_p = (const uint16_t *)cptr;                \
+            const uint16_t *_end = (const uint16_t *)cbuf_end;          \
+            c = *_p++;                                                  \
+            if (is_hi_surrogate(c) && cbuf_type == 2) {                 \
+                if (_p < _end && is_lo_surrogate(*_p)) {                \
+                    c = from_surrogate(c, *_p++);                       \
+                }                                                       \
+            }                                                           \
+            cptr = (const void *)_p;                                    \
+        }                                                               \
+    } while (0)
+
+#define PEEK_CHAR(c, cptr, cbuf_end, cbuf_type)                         \
+    do {                                                                \
+        if (cbuf_type == 0) {                                           \
+            c = cptr[0];                                                \
+        } else {                                                        \
+            const uint16_t *_p = (const uint16_t *)cptr;                \
+            const uint16_t *_end = (const uint16_t *)cbuf_end;          \
+            c = *_p++;                                                  \
+            if (is_hi_surrogate(c) && cbuf_type == 2) {                 \
+                if (_p < _end && is_lo_surrogate(*_p)) {                \
+                    c = from_surrogate(c, *_p);                         \
+                }                                                       \
+            }                                                           \
+        }                                                               \
+    } while (0)
+
+#define PEEK_PREV_CHAR(c, cptr, cbuf_start, cbuf_type)                  \
+    do {                                                                \
+        if (cbuf_type == 0) {                                           \
+            c = cptr[-1];                                               \
+        } else {                                                        \
+            const uint16_t *_p = (const uint16_t *)cptr - 1;            \
+            const uint16_t *_start = (const uint16_t *)cbuf_start;      \
+            c = *_p;                                                    \
+            if (is_lo_surrogate(c) && cbuf_type == 2) {                 \
+                if (_p > _start && is_hi_surrogate(_p[-1])) {           \
+                    c = from_surrogate(*--_p, c);                       \
+                }                                                       \
+            }                                                           \
+        }                                                               \
+    } while (0)
+
+#define GET_PREV_CHAR(c, cptr, cbuf_start, cbuf_type)                   \
+    do {                                                                \
+        if (cbuf_type == 0) {                                           \
+            cptr--;                                                     \
+            c = cptr[0];                                                \
+        } else {                                                        \
+            const uint16_t *_p = (const uint16_t *)cptr - 1;            \
+            const uint16_t *_start = (const uint16_t *)cbuf_start;      \
+            c = *_p;                                                    \
+            if (is_lo_surrogate(c) && cbuf_type == 2) {                 \
+                if (_p > _start && is_hi_surrogate(_p[-1])) {           \
+                    c = from_surrogate(*--_p, c);                       \
+                }                                                       \
+            }                                                           \
+            cptr = (const void *)_p;                                    \
+        }                                                               \
+    } while (0)
+
+#define PREV_CHAR(cptr, cbuf_start, cbuf_type)                          \
+    do {                                                                \
+        if (cbuf_type == 0) {                                           \
+            cptr--;                                                     \
+        } else {                                                        \
+            const uint16_t *_p = (const uint16_t *)cptr - 1;            \
+            const uint16_t *_start = (const uint16_t *)cbuf_start;      \
+            if (is_lo_surrogate(*_p) && cbuf_type == 2) {               \
+                if (_p > _start && is_hi_surrogate(_p[-1])) {           \
+                    --_p;                                               \
+                }                                                       \
+            }                                                           \
+            cptr = (const void *)_p;                                    \
+        }                                                               \
+    } while (0)
+
+typedef uintptr_t StackInt;
+
+typedef enum {
+    RE_EXEC_STATE_SPLIT,
+    RE_EXEC_STATE_LOOKAHEAD,
+    RE_EXEC_STATE_NEGATIVE_LOOKAHEAD,
+    RE_EXEC_STATE_GREEDY_QUANT,
+} REExecStateEnum;
+
+typedef struct REExecState {
+    REExecStateEnum type : 8;
+    uint8_t stack_len;
+    size_t count; /* only used for RE_EXEC_STATE_GREEDY_QUANT */
+    const uint8_t *cptr;
+    const uint8_t *pc;
+    void *buf[0];
+} REExecState;
+
+typedef struct {
+    const uint8_t *cbuf;
+    const uint8_t *cbuf_end;
+    /* 0 = 8 bit chars, 1 = 16 bit chars, 2 = 16 bit chars, UTF-16 */
+    int cbuf_type;
+    int capture_count;
+    int stack_size_max;
+    BOOL multi_line;
+    BOOL ignore_case;
+    BOOL is_unicode;
+    void *opaque; /* used for stack overflow check */
+
+    size_t state_size;
+    uint8_t *state_stack;
+    size_t state_stack_size;
+    size_t state_stack_len;
+} REExecContext;
+
+static int push_state(REExecContext *s,
+                      uint8_t **capture,
+                      StackInt *stack, size_t stack_len,
+                      const uint8_t *pc, const uint8_t *cptr,
+                      REExecStateEnum type, size_t count)
+{
+    REExecState *rs;
+    uint8_t *new_stack;
+    size_t new_size, i, n;
+    StackInt *stack_buf;
+
+    if (unlikely((s->state_stack_len + 1) > s->state_stack_size)) {
+        /* reallocate the stack */
+        new_size = s->state_stack_size * 3 / 2;
+        if (new_size < 8)
+            new_size = 8;
+        new_stack = lre_realloc(s->opaque, s->state_stack, new_size * s->state_size);
+        if (!new_stack)
+            return -1;
+        s->state_stack_size = new_size;
+        s->state_stack = new_stack;
+    }
+    rs = (REExecState *)(s->state_stack + s->state_stack_len * s->state_size);
+    s->state_stack_len++;
+    rs->type = type;
+    rs->count = count;
+    rs->stack_len = stack_len;
+    rs->cptr = cptr;
+    rs->pc = pc;
+    n = 2 * s->capture_count;
+    for(i = 0; i < n; i++)
+        rs->buf[i] = capture[i];
+    stack_buf = (StackInt *)(rs->buf + n);
+    for(i = 0; i < stack_len; i++)
+        stack_buf[i] = stack[i];
+    return 0;
+}
+
+/* return 1 if match, 0 if not match or -1 if error. */
+static intptr_t lre_exec_backtrack(REExecContext *s, uint8_t **capture,
+                                   StackInt *stack, int stack_len,
+                                   const uint8_t *pc, const uint8_t *cptr,
+                                   BOOL no_recurse)
+{
+    int opcode, ret;
+    int cbuf_type;
+    uint32_t val, c;
+    const uint8_t *cbuf_end;
+
+    cbuf_type = s->cbuf_type;
+    cbuf_end = s->cbuf_end;
+
+    for(;;) {
+        //        printf("top=%p: pc=%d\n", th_list.top, (int)(pc - (bc_buf + RE_HEADER_LEN)));
+        opcode = *pc++;
+        switch(opcode) {
+        case REOP_match:
+            {
+                REExecState *rs;
+                if (no_recurse)
+                    return (intptr_t)cptr;
+                ret = 1;
+                goto recurse;
+            no_match:
+                if (no_recurse)
+                    return 0;
+                ret = 0;
+            recurse:
+                for(;;) {
+                    if (s->state_stack_len == 0)
+                        return ret;
+                    rs = (REExecState *)(s->state_stack +
+                                         (s->state_stack_len - 1) * s->state_size);
+                    if (rs->type == RE_EXEC_STATE_SPLIT) {
+                        if (!ret) {
+                        pop_state:
+                            memcpy(capture, rs->buf,
+                                   sizeof(capture[0]) * 2 * s->capture_count);
+                        pop_state1:
+                            pc = rs->pc;
+                            cptr = rs->cptr;
+                            stack_len = rs->stack_len;
+                            memcpy(stack, rs->buf + 2 * s->capture_count,
+                                   stack_len * sizeof(stack[0]));
+                            s->state_stack_len--;
+                            break;
+                        }
+                    } else if (rs->type == RE_EXEC_STATE_GREEDY_QUANT) {
+                        if (!ret) {
+                            uint32_t char_count, i;
+                            memcpy(capture, rs->buf,
+                                   sizeof(capture[0]) * 2 * s->capture_count);
+                            stack_len = rs->stack_len;
+                            memcpy(stack, rs->buf + 2 * s->capture_count,
+                                   stack_len * sizeof(stack[0]));
+                            pc = rs->pc;
+                            cptr = rs->cptr;
+                            /* go backward */
+                            char_count = get_u32(pc + 12);
+                            for(i = 0; i < char_count; i++) {
+                                PREV_CHAR(cptr, s->cbuf, cbuf_type);
+                            }
+                            pc = (pc + 16) + (int)get_u32(pc);
+                            rs->cptr = cptr;
+                            rs->count--;
+                            if (rs->count == 0) {
+                                s->state_stack_len--;
+                            }
+                            break;
+                        }
+                    } else {
+                        ret = ((rs->type == RE_EXEC_STATE_LOOKAHEAD && ret) ||
+                               (rs->type == RE_EXEC_STATE_NEGATIVE_LOOKAHEAD && !ret));
+                        if (ret) {
+                            /* keep the capture in case of positive lookahead */
+                            if (rs->type == RE_EXEC_STATE_LOOKAHEAD)
+                                goto pop_state1;
+                            else
+                                goto pop_state;
+                        }
+                    }
+                    s->state_stack_len--;
+                }
+            }
+            break;
+        case REOP_char32:
+            val = get_u32(pc);
+            pc += 4;
+            goto test_char;
+        case REOP_char:
+            val = get_u16(pc);
+            pc += 2;
+        test_char:
+            if (cptr >= cbuf_end)
+                goto no_match;
+            GET_CHAR(c, cptr, cbuf_end, cbuf_type);
+            if (s->ignore_case) {
+                c = lre_canonicalize(c, s->is_unicode);
+            }
+            if (val != c)
+                goto no_match;
+            break;
+        case REOP_split_goto_first:
+        case REOP_split_next_first:
+            {
+                const uint8_t *pc1;
+
+                val = get_u32(pc);
+                pc += 4;
+                if (opcode == REOP_split_next_first) {
+                    pc1 = pc + (int)val;
+                } else {
+                    pc1 = pc;
+                    pc = pc + (int)val;
+                }
+                ret = push_state(s, capture, stack, stack_len,
+                                 pc1, cptr, RE_EXEC_STATE_SPLIT, 0);
+                if (ret < 0)
+                    return -1;
+                break;
+            }
+        case REOP_lookahead:
+        case REOP_negative_lookahead:
+            val = get_u32(pc);
+            pc += 4;
+            ret = push_state(s, capture, stack, stack_len,
+                             pc + (int)val, cptr,
+                             RE_EXEC_STATE_LOOKAHEAD + opcode - REOP_lookahead,
+                             0);
+            if (ret < 0)
+                return -1;
+            break;
+
+        case REOP_goto:
+            val = get_u32(pc);
+            pc += 4 + (int)val;
+            break;
+        case REOP_line_start:
+            if (cptr == s->cbuf)
+                break;
+            if (!s->multi_line)
+                goto no_match;
+            PEEK_PREV_CHAR(c, cptr, s->cbuf, cbuf_type);
+            if (!is_line_terminator(c))
+                goto no_match;
+            break;
+        case REOP_line_end:
+            if (cptr == cbuf_end)
+                break;
+            if (!s->multi_line)
+                goto no_match;
+            PEEK_CHAR(c, cptr, cbuf_end, cbuf_type);
+            if (!is_line_terminator(c))
+                goto no_match;
+            break;
+        case REOP_dot:
+            if (cptr == cbuf_end)
+                goto no_match;
+            GET_CHAR(c, cptr, cbuf_end, cbuf_type);
+            if (is_line_terminator(c))
+                goto no_match;
+            break;
+        case REOP_any:
+            if (cptr == cbuf_end)
+                goto no_match;
+            GET_CHAR(c, cptr, cbuf_end, cbuf_type);
+            break;
+        case REOP_save_start:
+        case REOP_save_end:
+            val = *pc++;
+            assert(val < s->capture_count);
+            capture[2 * val + opcode - REOP_save_start] = (uint8_t *)cptr;
+            break;
+        case REOP_save_reset:
+            {
+                uint32_t val2;
+                val = pc[0];
+                val2 = pc[1];
+                pc += 2;
+                assert(val2 < s->capture_count);
+                while (val <= val2) {
+                    capture[2 * val] = NULL;
+                    capture[2 * val + 1] = NULL;
+                    val++;
+                }
+            }
+            break;
+        case REOP_push_i32:
+            val = get_u32(pc);
+            pc += 4;
+            stack[stack_len++] = val;
+            break;
+        case REOP_drop:
+            stack_len--;
+            break;
+        case REOP_loop:
+            val = get_u32(pc);
+            pc += 4;
+            if (--stack[stack_len - 1] != 0) {
+                pc += (int)val;
+            }
+            break;
+        case REOP_push_char_pos:
+            stack[stack_len++] = (uintptr_t)cptr;
+            break;
+        case REOP_check_advance:
+            if (stack[--stack_len] == (uintptr_t)cptr)
+                goto no_match;
+            break;
+        case REOP_word_boundary:
+        case REOP_not_word_boundary:
+            {
+                BOOL v1, v2;
+                /* char before */
+                if (cptr == s->cbuf) {
+                    v1 = FALSE;
+                } else {
+                    PEEK_PREV_CHAR(c, cptr, s->cbuf, cbuf_type);
+                    v1 = is_word_char(c);
+                }
+                /* current char */
+                if (cptr >= cbuf_end) {
+                    v2 = FALSE;
+                } else {
+                    PEEK_CHAR(c, cptr, cbuf_end, cbuf_type);
+                    v2 = is_word_char(c);
+                }
+                if (v1 ^ v2 ^ (REOP_not_word_boundary - opcode))
+                    goto no_match;
+            }
+            break;
+        case REOP_back_reference:
+        case REOP_backward_back_reference:
+            {
+                const uint8_t *cptr1, *cptr1_end, *cptr1_start;
+                uint32_t c1, c2;
+
+                val = *pc++;
+                if (val >= s->capture_count)
+                    goto no_match;
+                cptr1_start = capture[2 * val];
+                cptr1_end = capture[2 * val + 1];
+                if (!cptr1_start || !cptr1_end)
+                    break;
+                if (opcode == REOP_back_reference) {
+                    cptr1 = cptr1_start;
+                    while (cptr1 < cptr1_end) {
+                        if (cptr >= cbuf_end)
+                            goto no_match;
+                        GET_CHAR(c1, cptr1, cptr1_end, cbuf_type);
+                        GET_CHAR(c2, cptr, cbuf_end, cbuf_type);
+                        if (s->ignore_case) {
+                            c1 = lre_canonicalize(c1, s->is_unicode);
+                            c2 = lre_canonicalize(c2, s->is_unicode);
+                        }
+                        if (c1 != c2)
+                            goto no_match;
+                    }
+                } else {
+                    cptr1 = cptr1_end;
+                    while (cptr1 > cptr1_start) {
+                        if (cptr == s->cbuf)
+                            goto no_match;
+                        GET_PREV_CHAR(c1, cptr1, cptr1_start, cbuf_type);
+                        GET_PREV_CHAR(c2, cptr, s->cbuf, cbuf_type);
+                        if (s->ignore_case) {
+                            c1 = lre_canonicalize(c1, s->is_unicode);
+                            c2 = lre_canonicalize(c2, s->is_unicode);
+                        }
+                        if (c1 != c2)
+                            goto no_match;
+                    }
+                }
+            }
+            break;
+        case REOP_range:
+            {
+                int n;
+                uint32_t low, high, idx_min, idx_max, idx;
+
+                n = get_u16(pc); /* n must be >= 1 */
+                pc += 2;
+                if (cptr >= cbuf_end)
+                    goto no_match;
+                GET_CHAR(c, cptr, cbuf_end, cbuf_type);
+                if (s->ignore_case) {
+                    c = lre_canonicalize(c, s->is_unicode);
+                }
+                idx_min = 0;
+                low = get_u16(pc + 0 * 4);
+                if (c < low)
+                    goto no_match;
+                idx_max = n - 1;
+                high = get_u16(pc + idx_max * 4 + 2);
+                /* 0xffff in for last value means +infinity */
+                if (unlikely(c >= 0xffff) && high == 0xffff)
+                    goto range_match;
+                if (c > high)
+                    goto no_match;
+                while (idx_min <= idx_max) {
+                    idx = (idx_min + idx_max) / 2;
+                    low = get_u16(pc + idx * 4);
+                    high = get_u16(pc + idx * 4 + 2);
+                    if (c < low)
+                        idx_max = idx - 1;
+                    else if (c > high)
+                        idx_min = idx + 1;
+                    else
+                        goto range_match;
+                }
+                goto no_match;
+            range_match:
+                pc += 4 * n;
+            }
+            break;
+        case REOP_range32:
+            {
+                int n;
+                uint32_t low, high, idx_min, idx_max, idx;
+
+                n = get_u16(pc); /* n must be >= 1 */
+                pc += 2;
+                if (cptr >= cbuf_end)
+                    goto no_match;
+                GET_CHAR(c, cptr, cbuf_end, cbuf_type);
+                if (s->ignore_case) {
+                    c = lre_canonicalize(c, s->is_unicode);
+                }
+                idx_min = 0;
+                low = get_u32(pc + 0 * 8);
+                if (c < low)
+                    goto no_match;
+                idx_max = n - 1;
+                high = get_u32(pc + idx_max * 8 + 4);
+                if (c > high)
+                    goto no_match;
+                while (idx_min <= idx_max) {
+                    idx = (idx_min + idx_max) / 2;
+                    low = get_u32(pc + idx * 8);
+                    high = get_u32(pc + idx * 8 + 4);
+                    if (c < low)
+                        idx_max = idx - 1;
+                    else if (c > high)
+                        idx_min = idx + 1;
+                    else
+                        goto range32_match;
+                }
+                goto no_match;
+            range32_match:
+                pc += 8 * n;
+            }
+            break;
+        case REOP_prev:
+            /* go to the previous char */
+            if (cptr == s->cbuf)
+                goto no_match;
+            PREV_CHAR(cptr, s->cbuf, cbuf_type);
+            break;
+        case REOP_simple_greedy_quant:
+            {
+                uint32_t next_pos, quant_min, quant_max;
+                size_t q;
+                intptr_t res;
+                const uint8_t *pc1;
+
+                next_pos = get_u32(pc);
+                quant_min = get_u32(pc + 4);
+                quant_max = get_u32(pc + 8);
+                pc += 16;
+                pc1 = pc;
+                pc += (int)next_pos;
+
+                q = 0;
+                for(;;) {
+                    res = lre_exec_backtrack(s, capture, stack, stack_len,
+                                             pc1, cptr, TRUE);
+                    if (res == -1)
+                        return res;
+                    if (!res)
+                        break;
+                    cptr = (uint8_t *)res;
+                    q++;
+                    if (q >= quant_max && quant_max != INT32_MAX)
+                        break;
+                }
+                if (q < quant_min)
+                    goto no_match;
+                if (q > quant_min) {
+                    /* will examine all matches down to quant_min */
+                    ret = push_state(s, capture, stack, stack_len,
+                                     pc1 - 16, cptr,
+                                     RE_EXEC_STATE_GREEDY_QUANT,
+                                     q - quant_min);
+                    if (ret < 0)
+                        return -1;
+                }
+            }
+            break;
+        default:
+            abort();
+        }
+    }
+}
+
+/* Return 1 if match, 0 if not match or -1 if error. cindex is the
+   starting position of the match and must be such as 0 <= cindex <=
+   clen. */
+int lre_exec(uint8_t **capture,
+             const uint8_t *bc_buf, const uint8_t *cbuf, int cindex, int clen,
+             int cbuf_type, void *opaque)
+{
+    REExecContext s_s, *s = &s_s;
+    int re_flags, i, alloca_size, ret;
+    StackInt *stack_buf;
+
+    re_flags = lre_get_flags(bc_buf);
+    s->multi_line = (re_flags & LRE_FLAG_MULTILINE) != 0;
+    s->ignore_case = (re_flags & LRE_FLAG_IGNORECASE) != 0;
+    s->is_unicode = (re_flags & LRE_FLAG_UNICODE) != 0;
+    s->capture_count = bc_buf[RE_HEADER_CAPTURE_COUNT];
+    s->stack_size_max = bc_buf[RE_HEADER_STACK_SIZE];
+    s->cbuf = cbuf;
+    s->cbuf_end = cbuf + (clen << cbuf_type);
+    s->cbuf_type = cbuf_type;
+    if (s->cbuf_type == 1 && s->is_unicode)
+        s->cbuf_type = 2;
+    s->opaque = opaque;
+
+    s->state_size = sizeof(REExecState) +
+        s->capture_count * sizeof(capture[0]) * 2 +
+        s->stack_size_max * sizeof(stack_buf[0]);
+    s->state_stack = NULL;
+    s->state_stack_len = 0;
+    s->state_stack_size = 0;
+
+    for(i = 0; i < s->capture_count * 2; i++)
+        capture[i] = NULL;
+    alloca_size = s->stack_size_max * sizeof(stack_buf[0]);
+    stack_buf = alloca(alloca_size);
+    ret = lre_exec_backtrack(s, capture, stack_buf, 0, bc_buf + RE_HEADER_LEN,
+                             cbuf + (cindex << cbuf_type), FALSE);
+    lre_realloc(s->opaque, s->state_stack, 0);
+    return ret;
+}
+
+int lre_get_capture_count(const uint8_t *bc_buf)
+{
+    return bc_buf[RE_HEADER_CAPTURE_COUNT];
+}
+
+int lre_get_flags(const uint8_t *bc_buf)
+{
+    return bc_buf[RE_HEADER_FLAGS];
+}
+
+/* Return NULL if no group names. Otherwise, return a pointer to
+   'capture_count - 1' zero terminated UTF-8 strings. */
+const char *lre_get_groupnames(const uint8_t *bc_buf)
+{
+    uint32_t re_bytecode_len;
+    if ((lre_get_flags(bc_buf) & LRE_FLAG_NAMED_GROUPS) == 0)
+        return NULL;
+    re_bytecode_len = get_u32(bc_buf + RE_HEADER_BYTECODE_LEN);
+    return (const char *)(bc_buf + RE_HEADER_LEN + re_bytecode_len);
+}
+
+#ifdef TEST
+
+BOOL lre_check_stack_overflow(void *opaque, size_t alloca_size)
+{
+    return FALSE;
+}
+
+void *lre_realloc(void *opaque, void *ptr, size_t size)
+{
+    return realloc(ptr, size);
+}
+
+int main(int argc, char **argv)
+{
+    int len, flags, ret, i;
+    uint8_t *bc;
+    char error_msg[64];
+    uint8_t *capture[CAPTURE_COUNT_MAX * 2];
+    const char *input;
+    int input_len, capture_count;
+
+    if (argc < 4) {
+        printf("usage: %s regexp flags input\n", argv[0]);
+        return 1;
+    }
+    flags = atoi(argv[2]);
+    bc = lre_compile(&len, error_msg, sizeof(error_msg), argv[1],
+                     strlen(argv[1]), flags, NULL);
+    if (!bc) {
+        fprintf(stderr, "error: %s\n", error_msg);
+        exit(1);
+    }
+
+    input = argv[3];
+    input_len = strlen(input);
+
+    ret = lre_exec(capture, bc, (uint8_t *)input, 0, input_len, 0, NULL);
+    printf("ret=%d\n", ret);
+    if (ret == 1) {
+        capture_count = lre_get_capture_count(bc);
+        for(i = 0; i < 2 * capture_count; i++) {
+            uint8_t *ptr;
+            ptr = capture[i];
+            printf("%d: ", i);
+            if (!ptr)
+                printf("<nil>");
+            else
+                printf("%u", (int)(ptr - (uint8_t *)input));
+            printf("\n");
+        }
+    }
+    return 0;
+}
+#endif
diff --git a/src/shared/quickjs/libregexp.h b/src/shared/quickjs/libregexp.h
new file mode 100644
index 000000000..7af7ece0f
--- /dev/null
+++ b/src/shared/quickjs/libregexp.h
@@ -0,0 +1,55 @@
+/*
+ * Regular Expression Engine
+ *
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef LIBREGEXP_H
+#define LIBREGEXP_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define LRE_FLAG_GLOBAL     (1 << 0)
+#define LRE_FLAG_IGNORECASE (1 << 1)
+#define LRE_FLAG_MULTILINE  (1 << 2)
+#define LRE_FLAG_DOTALL     (1 << 3)
+#define LRE_FLAG_UNICODE    (1 << 4)
+#define LRE_FLAG_STICKY     (1 << 5)
+#define LRE_FLAG_INDICES    (1 << 6) /* Unused by libregexp, just recorded. */
+#define LRE_FLAG_NAMED_GROUPS (1 << 7) /* named groups are present in the regexp */
+
+uint8_t *lre_compile(int *plen, char *error_msg, int error_msg_size,
+                     const char *buf, size_t buf_len, int re_flags,
+                     void *opaque);
+int lre_get_capture_count(const uint8_t *bc_buf);
+int lre_get_flags(const uint8_t *bc_buf);
+const char *lre_get_groupnames(const uint8_t *bc_buf);
+int lre_exec(uint8_t **capture,
+             const uint8_t *bc_buf, const uint8_t *cbuf, int cindex, int clen,
+             int cbuf_type, void *opaque);
+
+int lre_parse_escape(const uint8_t **pp, int allow_utf16);
+
+/* must be provided by the user, return non zero if overflow */
+int lre_check_stack_overflow(void *opaque, size_t alloca_size);
+void *lre_realloc(void *opaque, void *ptr, size_t size);
+
+#endif /* LIBREGEXP_H */
diff --git a/src/shared/quickjs/libunicode-table.h b/src/shared/quickjs/libunicode-table.h
new file mode 100644
index 000000000..72d495e78
--- /dev/null
+++ b/src/shared/quickjs/libunicode-table.h
@@ -0,0 +1,4557 @@
+/* Compressed unicode tables */
+/* Automatically generated file - do not edit */
+
+#include <stdint.h>
+
+static const uint32_t case_conv_table1[370] = {
+    0x00209a30, 0x00309a00, 0x005a8173, 0x00601730,
+    0x006c0730, 0x006f81b3, 0x00701700, 0x007c0700,
+    0x007f8100, 0x00803040, 0x009801c3, 0x00988190,
+    0x00990640, 0x009c9040, 0x00a481b4, 0x00a52e40,
+    0x00bc0130, 0x00bc8640, 0x00bf8170, 0x00c00100,
+    0x00c08130, 0x00c10440, 0x00c30130, 0x00c38240,
+    0x00c48230, 0x00c58240, 0x00c70130, 0x00c78130,
+    0x00c80130, 0x00c88240, 0x00c98130, 0x00ca0130,
+    0x00ca8100, 0x00cb0130, 0x00cb8130, 0x00cc0240,
+    0x00cd0100, 0x00ce0130, 0x00ce8130, 0x00cf0100,
+    0x00cf8130, 0x00d00640, 0x00d30130, 0x00d38240,
+    0x00d48130, 0x00d60240, 0x00d70130, 0x00d78240,
+    0x00d88230, 0x00d98440, 0x00db8130, 0x00dc0240,
+    0x00de0240, 0x00df8100, 0x00e20350, 0x00e38350,
+    0x00e50350, 0x00e69040, 0x00ee8100, 0x00ef1240,
+    0x00f801b4, 0x00f88350, 0x00fa0240, 0x00fb0130,
+    0x00fb8130, 0x00fc2840, 0x01100130, 0x01111240,
+    0x011d0131, 0x011d8240, 0x011e8130, 0x011f0131,
+    0x011f8201, 0x01208240, 0x01218130, 0x01220130,
+    0x01228130, 0x01230a40, 0x01280101, 0x01288101,
+    0x01290101, 0x01298100, 0x012a0100, 0x012b0200,
+    0x012c8100, 0x012d8100, 0x012e0101, 0x01300100,
+    0x01308101, 0x01318100, 0x01328101, 0x01330101,
+    0x01340100, 0x01348100, 0x01350101, 0x01358101,
+    0x01360101, 0x01378100, 0x01388101, 0x01390100,
+    0x013a8100, 0x013e8101, 0x01400100, 0x01410101,
+    0x01418100, 0x01438101, 0x01440100, 0x01448100,
+    0x01450200, 0x01460100, 0x01490100, 0x014e8101,
+    0x014f0101, 0x01a28173, 0x01b80440, 0x01bb0240,
+    0x01bd8300, 0x01bf8130, 0x01c30130, 0x01c40330,
+    0x01c60130, 0x01c70230, 0x01c801d0, 0x01c89130,
+    0x01d18930, 0x01d60100, 0x01d68300, 0x01d801d3,
+    0x01d89100, 0x01e10173, 0x01e18900, 0x01e60100,
+    0x01e68200, 0x01e78130, 0x01e80173, 0x01e88173,
+    0x01ea8173, 0x01eb0173, 0x01eb8100, 0x01ec1840,
+    0x01f80173, 0x01f88173, 0x01f90100, 0x01f98100,
+    0x01fa01a0, 0x01fa8173, 0x01fb8240, 0x01fc8130,
+    0x01fd0240, 0x01fe8330, 0x02001030, 0x02082030,
+    0x02182000, 0x02281000, 0x02302240, 0x02453640,
+    0x02600130, 0x02608e40, 0x02678100, 0x02686040,
+    0x0298a630, 0x02b0a600, 0x02c381b5, 0x08502631,
+    0x08638131, 0x08668131, 0x08682b00, 0x087e8300,
+    0x09d05011, 0x09f80610, 0x09fc0620, 0x0e400174,
+    0x0e408174, 0x0e410174, 0x0e418174, 0x0e420174,
+    0x0e428174, 0x0e430174, 0x0e438180, 0x0e440180,
+    0x0e482b30, 0x0e5e8330, 0x0ebc8101, 0x0ebe8101,
+    0x0ec70101, 0x0f007e40, 0x0f3f1840, 0x0f4b01b5,
+    0x0f4b81b6, 0x0f4c01b6, 0x0f4c81b6, 0x0f4d01b7,
+    0x0f4d8180, 0x0f4f0130, 0x0f506040, 0x0f800800,
+    0x0f840830, 0x0f880600, 0x0f8c0630, 0x0f900800,
+    0x0f940830, 0x0f980800, 0x0f9c0830, 0x0fa00600,
+    0x0fa40630, 0x0fa801b0, 0x0fa88100, 0x0fa901d3,
+    0x0fa98100, 0x0faa01d3, 0x0faa8100, 0x0fab01d3,
+    0x0fab8100, 0x0fac8130, 0x0fad8130, 0x0fae8130,
+    0x0faf8130, 0x0fb00800, 0x0fb40830, 0x0fb80200,
+    0x0fb90400, 0x0fbb0200, 0x0fbc0201, 0x0fbd0201,
+    0x0fbe0201, 0x0fc008b7, 0x0fc40867, 0x0fc808b8,
+    0x0fcc0868, 0x0fd008b8, 0x0fd40868, 0x0fd80200,
+    0x0fd901b9, 0x0fd981b1, 0x0fda01b9, 0x0fdb01b1,
+    0x0fdb81d7, 0x0fdc0230, 0x0fdd0230, 0x0fde0161,
+    0x0fdf0173, 0x0fe101b9, 0x0fe181b2, 0x0fe201ba,
+    0x0fe301b2, 0x0fe381d8, 0x0fe40430, 0x0fe60162,
+    0x0fe80200, 0x0fe901d0, 0x0fe981d0, 0x0feb01b0,
+    0x0feb81d0, 0x0fec0230, 0x0fed0230, 0x0ff00201,
+    0x0ff101d3, 0x0ff181d3, 0x0ff201ba, 0x0ff28101,
+    0x0ff301b0, 0x0ff381d3, 0x0ff40230, 0x0ff50230,
+    0x0ff60131, 0x0ff901ba, 0x0ff981b2, 0x0ffa01bb,
+    0x0ffb01b2, 0x0ffb81d9, 0x0ffc0230, 0x0ffd0230,
+    0x0ffe0162, 0x109301a0, 0x109501a0, 0x109581a0,
+    0x10990131, 0x10a70101, 0x10b01031, 0x10b81001,
+    0x10c18240, 0x125b1a31, 0x12681a01, 0x16003031,
+    0x16183001, 0x16300240, 0x16310130, 0x16318130,
+    0x16320130, 0x16328100, 0x16330100, 0x16338640,
+    0x16368130, 0x16370130, 0x16378130, 0x16380130,
+    0x16390240, 0x163a8240, 0x163f0230, 0x16406440,
+    0x16758440, 0x16790240, 0x16802600, 0x16938100,
+    0x16968100, 0x53202e40, 0x53401c40, 0x53910e40,
+    0x53993e40, 0x53bc8440, 0x53be8130, 0x53bf0a40,
+    0x53c58240, 0x53c68130, 0x53c80440, 0x53ca0101,
+    0x53cb1440, 0x53d50130, 0x53d58130, 0x53d60130,
+    0x53d68130, 0x53d70130, 0x53d80130, 0x53d88130,
+    0x53d90130, 0x53d98131, 0x53da1040, 0x53e20131,
+    0x53e28130, 0x53e30130, 0x53e38440, 0x53e80240,
+    0x53eb0440, 0x53fa8240, 0x55a98101, 0x55b85020,
+    0x7d8001b2, 0x7d8081b2, 0x7d8101b2, 0x7d8181da,
+    0x7d8201da, 0x7d8281b3, 0x7d8301b3, 0x7d8981bb,
+    0x7d8a01bb, 0x7d8a81bb, 0x7d8b01bc, 0x7d8b81bb,
+    0x7f909a31, 0x7fa09a01, 0x82002831, 0x82142801,
+    0x82582431, 0x826c2401, 0x82b80b31, 0x82be0f31,
+    0x82c60731, 0x82ca0231, 0x82cb8b01, 0x82d18f01,
+    0x82d98701, 0x82dd8201, 0x86403331, 0x86603301,
+    0x8c502031, 0x8c602001, 0xb7202031, 0xb7302001,
+    0xf4802231, 0xf4912201,
+};
+
+static const uint8_t case_conv_table2[370] = {
+    0x01, 0x00, 0x9c, 0x06, 0x07, 0x4d, 0x03, 0x04,
+    0x10, 0x00, 0x8f, 0x0b, 0x00, 0x00, 0x11, 0x00,
+    0x08, 0x00, 0x53, 0x4a, 0x51, 0x00, 0x52, 0x00,
+    0x53, 0x00, 0x3a, 0x54, 0x55, 0x00, 0x57, 0x59,
+    0x3f, 0x5d, 0x5c, 0x00, 0x46, 0x61, 0x63, 0x42,
+    0x64, 0x00, 0x66, 0x00, 0x68, 0x00, 0x6a, 0x00,
+    0x6c, 0x00, 0x6e, 0x00, 0x00, 0x40, 0x00, 0x00,
+    0x00, 0x00, 0x1a, 0x00, 0x93, 0x00, 0x00, 0x20,
+    0x35, 0x00, 0x27, 0x00, 0x21, 0x00, 0x24, 0x22,
+    0x2a, 0x00, 0x13, 0x6b, 0x6d, 0x00, 0x26, 0x24,
+    0x27, 0x14, 0x16, 0x18, 0x1b, 0x1c, 0x3e, 0x1e,
+    0x3f, 0x1f, 0x39, 0x3d, 0x22, 0x21, 0x41, 0x1e,
+    0x40, 0x25, 0x25, 0x26, 0x28, 0x20, 0x2a, 0x48,
+    0x2c, 0x43, 0x2e, 0x4b, 0x30, 0x4c, 0x32, 0x44,
+    0x42, 0x99, 0x00, 0x00, 0x95, 0x8f, 0x7d, 0x7e,
+    0x83, 0x84, 0x12, 0x80, 0x82, 0x76, 0x77, 0x12,
+    0x7b, 0xa3, 0x7c, 0x78, 0x79, 0x8a, 0x92, 0x98,
+    0xa6, 0xa0, 0x85, 0x00, 0x9a, 0xa1, 0x93, 0x75,
+    0x33, 0x95, 0x00, 0x8e, 0x00, 0x74, 0x99, 0x98,
+    0x97, 0x96, 0x00, 0x00, 0x9e, 0x00, 0x9c, 0x00,
+    0xa1, 0xa0, 0x15, 0x2e, 0x2f, 0x30, 0xb4, 0xb5,
+    0x4f, 0xaa, 0xa9, 0x12, 0x14, 0x1e, 0x21, 0x22,
+    0x22, 0x2a, 0x34, 0x35, 0xa6, 0xa7, 0x36, 0x1f,
+    0x49, 0x00, 0x00, 0x97, 0x01, 0x5a, 0xda, 0x1d,
+    0x36, 0x05, 0x00, 0xc4, 0xc3, 0xc6, 0xc5, 0xc8,
+    0xc7, 0xca, 0xc9, 0xcc, 0xcb, 0xc4, 0xd5, 0x45,
+    0xd6, 0x42, 0xd7, 0x46, 0xd8, 0xce, 0xd0, 0xd2,
+    0xd4, 0xda, 0xd9, 0xee, 0xf6, 0xfe, 0x0e, 0x07,
+    0x0f, 0x80, 0x9f, 0x00, 0x21, 0x80, 0xa3, 0xed,
+    0x00, 0xc0, 0x40, 0xc6, 0x60, 0xe7, 0xdb, 0xe6,
+    0x99, 0xc0, 0x00, 0x00, 0x06, 0x60, 0xdc, 0x29,
+    0xfd, 0x15, 0x12, 0x06, 0x16, 0xf8, 0xdd, 0x06,
+    0x15, 0x12, 0x84, 0x08, 0xc6, 0x16, 0xff, 0xdf,
+    0x03, 0xc0, 0x40, 0x00, 0x46, 0x60, 0xde, 0xe0,
+    0x6d, 0x37, 0x38, 0x39, 0x15, 0x14, 0x17, 0x16,
+    0x00, 0x1a, 0x19, 0x1c, 0x1b, 0x00, 0x5f, 0xb7,
+    0x65, 0x44, 0x47, 0x00, 0x4f, 0x62, 0x4e, 0x50,
+    0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0xa3, 0xa4,
+    0xa5, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb6, 0x00,
+    0x00, 0x5a, 0x00, 0x47, 0x00, 0x5b, 0x56, 0x58,
+    0x60, 0x5e, 0x70, 0x69, 0x6f, 0x4e, 0x00, 0x3b,
+    0x67, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x45, 0xa8,
+    0x8a, 0x8b, 0x8c, 0xab, 0xac, 0x58, 0x58, 0xaf,
+    0x94, 0xb0, 0x6f, 0xb2, 0x5d, 0x5c, 0x5f, 0x5e,
+    0x61, 0x60, 0x66, 0x67, 0x68, 0x69, 0x62, 0x63,
+    0x64, 0x65, 0x6b, 0x6a, 0x6d, 0x6c, 0x6f, 0x6e,
+    0x71, 0x70,
+};
+
+static const uint16_t case_conv_ext[58] = {
+    0x0399, 0x0308, 0x0301, 0x03a5, 0x0313, 0x0300, 0x0342, 0x0391,
+    0x0397, 0x03a9, 0x0046, 0x0049, 0x004c, 0x0053, 0x0069, 0x0307,
+    0x02bc, 0x004e, 0x004a, 0x030c, 0x0535, 0x0552, 0x0048, 0x0331,
+    0x0054, 0x0057, 0x030a, 0x0059, 0x0041, 0x02be, 0x1f08, 0x1f80,
+    0x1f28, 0x1f90, 0x1f68, 0x1fa0, 0x1fba, 0x0386, 0x1fb3, 0x1fca,
+    0x0389, 0x1fc3, 0x03a1, 0x1ffa, 0x038f, 0x1ff3, 0x0544, 0x0546,
+    0x053b, 0x054e, 0x053d, 0x03b8, 0x0462, 0xa64a, 0x1e60, 0x03c9,
+    0x006b, 0x00e5,
+};
+
+static const uint8_t unicode_prop_Cased1_table[196] = {
+    0x40, 0xa9, 0x80, 0x8e, 0x80, 0xfc, 0x80, 0xd3,
+    0x80, 0x8c, 0x80, 0x8d, 0x81, 0x8d, 0x02, 0x80,
+    0xe1, 0x80, 0x91, 0x85, 0x9a, 0x01, 0x00, 0x01,
+    0x11, 0x00, 0x01, 0x04, 0x08, 0x01, 0x08, 0x30,
+    0x08, 0x01, 0x15, 0x20, 0x00, 0x39, 0x99, 0x31,
+    0x9d, 0x84, 0x40, 0x94, 0x80, 0xd6, 0x82, 0xa6,
+    0x80, 0x41, 0x62, 0x80, 0xa6, 0x80, 0x4b, 0x72,
+    0x80, 0x4c, 0x02, 0xf8, 0x02, 0x80, 0x8f, 0x80,
+    0xb0, 0x40, 0xdb, 0x08, 0x80, 0x41, 0xd0, 0x80,
+    0x8c, 0x80, 0x8f, 0x8c, 0xe4, 0x03, 0x01, 0x89,
+    0x00, 0x14, 0x28, 0x10, 0x11, 0x02, 0x01, 0x18,
+    0x0b, 0x24, 0x4b, 0x26, 0x01, 0x01, 0x86, 0xe5,
+    0x80, 0x60, 0x79, 0xb6, 0x81, 0x40, 0x91, 0x81,
+    0xbd, 0x88, 0x94, 0x05, 0x80, 0x98, 0x80, 0xa2,
+    0x00, 0x80, 0x9b, 0x12, 0x82, 0x43, 0x34, 0xa2,
+    0x06, 0x80, 0x8d, 0x60, 0x5c, 0x15, 0x01, 0x10,
+    0xa9, 0x80, 0x88, 0x60, 0xcc, 0x44, 0xd4, 0x80,
+    0xc6, 0x01, 0x08, 0x09, 0x0b, 0x80, 0x8b, 0x00,
+    0x06, 0x80, 0xc0, 0x03, 0x0f, 0x06, 0x80, 0x9b,
+    0x03, 0x04, 0x00, 0x16, 0x80, 0x41, 0x53, 0x81,
+    0x98, 0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x80,
+    0x9e, 0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x80,
+    0x9e, 0x80, 0x98, 0x07, 0x47, 0x33, 0x89, 0x80,
+    0x93, 0x2d, 0x41, 0x04, 0xbd, 0x50, 0xc1, 0x99,
+    0x85, 0x99, 0x85, 0x99,
+};
+
+static const uint8_t unicode_prop_Cased1_index[21] = {
+    0xb9, 0x02, 0xe0,  //  002B9 at 39
+    0xc0, 0x1d, 0x20,  //  01DC0 at 65
+    0xe5, 0x2c, 0x20,  //  02CE5 at 97
+    0xb1, 0x07, 0x21,  //  107B1 at 129
+    0xc1, 0xd6, 0x21,  //  1D6C1 at 161
+    0x4a, 0xf1, 0x01,  //  1F14A at 192
+    0x8a, 0xf1, 0x01,  //  1F18A at 224 (upper bound)
+};
+
+static const uint8_t unicode_prop_Case_Ignorable_table[737] = {
+    0xa6, 0x05, 0x80, 0x8a, 0x80, 0xa2, 0x00, 0x80,
+    0xc6, 0x03, 0x00, 0x03, 0x01, 0x81, 0x41, 0xf6,
+    0x40, 0xbf, 0x19, 0x18, 0x88, 0x08, 0x80, 0x40,
+    0xfa, 0x86, 0x40, 0xce, 0x04, 0x80, 0xb0, 0xac,
+    0x00, 0x01, 0x01, 0x00, 0xab, 0x80, 0x8a, 0x85,
+    0x89, 0x8a, 0x00, 0xa2, 0x80, 0x89, 0x94, 0x8f,
+    0x80, 0xe4, 0x38, 0x89, 0x03, 0xa0, 0x00, 0x80,
+    0x9d, 0x9a, 0xda, 0x8a, 0xb9, 0x8a, 0x18, 0x08,
+    0x97, 0x97, 0xaa, 0x82, 0xab, 0x06, 0x0d, 0x87,
+    0xa8, 0xb9, 0xb6, 0x00, 0x03, 0x3b, 0x02, 0x86,
+    0x89, 0x81, 0x8c, 0x80, 0x8e, 0x80, 0xb9, 0x03,
+    0x1f, 0x80, 0x93, 0x81, 0x99, 0x01, 0x81, 0xb8,
+    0x03, 0x0b, 0x09, 0x12, 0x80, 0x9d, 0x0a, 0x80,
+    0x8a, 0x81, 0xb8, 0x03, 0x20, 0x0b, 0x80, 0x93,
+    0x81, 0x95, 0x28, 0x80, 0xb9, 0x01, 0x00, 0x1f,
+    0x06, 0x81, 0x8a, 0x81, 0x9d, 0x80, 0xbc, 0x80,
+    0x8b, 0x80, 0xb1, 0x02, 0x80, 0xb6, 0x00, 0x14,
+    0x10, 0x1e, 0x81, 0x8a, 0x81, 0x9c, 0x80, 0xb9,
+    0x01, 0x05, 0x04, 0x81, 0x93, 0x81, 0x9b, 0x81,
+    0xb8, 0x0b, 0x1f, 0x80, 0x93, 0x81, 0x9c, 0x80,
+    0xc7, 0x06, 0x10, 0x80, 0xd9, 0x01, 0x86, 0x8a,
+    0x88, 0xe1, 0x01, 0x88, 0x88, 0x00, 0x86, 0xc8,
+    0x81, 0x9a, 0x00, 0x00, 0x80, 0xb6, 0x8d, 0x04,
+    0x01, 0x84, 0x8a, 0x80, 0xa3, 0x88, 0x80, 0xe5,
+    0x18, 0x28, 0x09, 0x81, 0x98, 0x0b, 0x82, 0x8f,
+    0x83, 0x8c, 0x01, 0x0d, 0x80, 0x8e, 0x80, 0xdd,
+    0x80, 0x42, 0x5f, 0x82, 0x43, 0xb1, 0x82, 0x9c,
+    0x81, 0x9d, 0x81, 0x9d, 0x81, 0xbf, 0x08, 0x37,
+    0x01, 0x8a, 0x10, 0x20, 0xac, 0x84, 0xb2, 0x80,
+    0xc0, 0x81, 0xa1, 0x80, 0xf5, 0x13, 0x81, 0x88,
+    0x05, 0x82, 0x40, 0xda, 0x09, 0x80, 0xb9, 0x00,
+    0x30, 0x00, 0x01, 0x3d, 0x89, 0x08, 0xa6, 0x07,
+    0x9e, 0xb0, 0x83, 0xaf, 0x00, 0x20, 0x04, 0x80,
+    0xa7, 0x88, 0x8b, 0x81, 0x9f, 0x19, 0x08, 0x82,
+    0xb7, 0x00, 0x0a, 0x00, 0x82, 0xb9, 0x39, 0x81,
+    0xbf, 0x85, 0xd1, 0x10, 0x8c, 0x06, 0x18, 0x28,
+    0x11, 0xb1, 0xbe, 0x8c, 0x80, 0xa1, 0xe4, 0x41,
+    0xbc, 0x00, 0x82, 0x8a, 0x82, 0x8c, 0x82, 0x8c,
+    0x82, 0x8c, 0x81, 0x8b, 0x27, 0x81, 0x89, 0x01,
+    0x01, 0x84, 0xb0, 0x20, 0x89, 0x00, 0x8c, 0x80,
+    0x8f, 0x8c, 0xb2, 0xa0, 0x4b, 0x8a, 0x81, 0xf0,
+    0x82, 0xfc, 0x80, 0x8e, 0x80, 0xdf, 0x9f, 0xae,
+    0x80, 0x41, 0xd4, 0x80, 0xa3, 0x1a, 0x24, 0x80,
+    0xdc, 0x85, 0xdc, 0x82, 0x60, 0x6f, 0x15, 0x80,
+    0x44, 0xe1, 0x85, 0x41, 0x0d, 0x80, 0xe1, 0x18,
+    0x89, 0x00, 0x9b, 0x83, 0xcf, 0x81, 0x8d, 0xa1,
+    0xcd, 0x80, 0x96, 0x82, 0xe6, 0x12, 0x0f, 0x02,
+    0x03, 0x80, 0x98, 0x0c, 0x80, 0x40, 0x96, 0x81,
+    0x99, 0x91, 0x8c, 0x80, 0xa5, 0x87, 0x98, 0x8a,
+    0xad, 0x82, 0xaf, 0x01, 0x19, 0x81, 0x90, 0x80,
+    0x94, 0x81, 0xc1, 0x29, 0x09, 0x81, 0x8b, 0x07,
+    0x80, 0xa2, 0x80, 0x8a, 0x80, 0xb2, 0x00, 0x11,
+    0x0c, 0x08, 0x80, 0x9a, 0x80, 0x8d, 0x0c, 0x08,
+    0x80, 0xe3, 0x84, 0x88, 0x82, 0xf8, 0x01, 0x03,
+    0x80, 0x60, 0x4f, 0x2f, 0x80, 0x40, 0x92, 0x90,
+    0x42, 0x3c, 0x8f, 0x10, 0x8b, 0x8f, 0xa1, 0x01,
+    0x80, 0x40, 0xa8, 0x06, 0x05, 0x80, 0x8a, 0x80,
+    0xa2, 0x00, 0x80, 0xae, 0x80, 0xac, 0x81, 0xc2,
+    0x80, 0x94, 0x82, 0x42, 0x00, 0x80, 0x40, 0xe1,
+    0x80, 0x40, 0x94, 0x84, 0x44, 0x04, 0x28, 0xa9,
+    0x80, 0x88, 0x42, 0x45, 0x10, 0x0c, 0x83, 0xa7,
+    0x13, 0x80, 0x40, 0xa4, 0x81, 0x42, 0x3c, 0x83,
+    0x41, 0x82, 0x81, 0xcf, 0x82, 0xc5, 0x8a, 0xb0,
+    0x83, 0xfa, 0x80, 0xb5, 0x8e, 0xa8, 0x01, 0x81,
+    0x89, 0x82, 0xb0, 0x19, 0x09, 0x03, 0x80, 0x89,
+    0x80, 0xb1, 0x82, 0xa3, 0x20, 0x87, 0xbd, 0x80,
+    0x8b, 0x81, 0xb3, 0x88, 0x89, 0x19, 0x80, 0xde,
+    0x11, 0x00, 0x0d, 0x01, 0x80, 0x40, 0x9c, 0x02,
+    0x87, 0x94, 0x81, 0xb8, 0x0a, 0x80, 0xa4, 0x32,
+    0x84, 0x40, 0xc2, 0x39, 0x10, 0x80, 0x96, 0x80,
+    0xd3, 0x28, 0x03, 0x08, 0x81, 0x40, 0xed, 0x1d,
+    0x08, 0x81, 0x9a, 0x81, 0xd4, 0x39, 0x00, 0x81,
+    0xe9, 0x00, 0x01, 0x28, 0x80, 0xe4, 0x11, 0x18,
+    0x84, 0x41, 0x02, 0x88, 0x01, 0x40, 0xff, 0x08,
+    0x03, 0x80, 0x40, 0x8f, 0x19, 0x0b, 0x80, 0x9f,
+    0x89, 0xa7, 0x29, 0x1f, 0x80, 0x88, 0x29, 0x82,
+    0xad, 0x8c, 0x01, 0x41, 0x95, 0x30, 0x28, 0x80,
+    0xd1, 0x95, 0x0e, 0x01, 0x01, 0xf9, 0x2a, 0x00,
+    0x08, 0x30, 0x80, 0xc7, 0x0a, 0x00, 0x80, 0x41,
+    0x5a, 0x81, 0x8a, 0x81, 0xb3, 0x24, 0x00, 0x80,
+    0x54, 0xec, 0x90, 0x85, 0x8e, 0x60, 0x36, 0x99,
+    0x84, 0xba, 0x86, 0x88, 0x83, 0x44, 0x0a, 0x80,
+    0xbe, 0x90, 0xbf, 0x08, 0x81, 0x60, 0x40, 0x0a,
+    0x18, 0x30, 0x81, 0x4c, 0x9d, 0x08, 0x83, 0x52,
+    0x5b, 0xad, 0x81, 0x96, 0x42, 0x1f, 0x82, 0x88,
+    0x8f, 0x0e, 0x9d, 0x83, 0x40, 0x93, 0x82, 0x47,
+    0xba, 0xb6, 0x83, 0xb1, 0x38, 0x8d, 0x80, 0x95,
+    0x20, 0x8e, 0x45, 0x4f, 0x30, 0x90, 0x0e, 0x01,
+    0x04, 0x84, 0xbd, 0xa0, 0x80, 0x40, 0x9f, 0x8d,
+    0x41, 0x6f, 0x80, 0xbc, 0x83, 0x41, 0xfa, 0x84,
+    0x43, 0xdf, 0x86, 0xec, 0x87, 0x4a, 0xae, 0x84,
+    0x6c, 0x0c, 0x00, 0x80, 0x9d, 0xdf, 0xff, 0x40,
+    0xef,
+};
+
+static const uint8_t unicode_prop_Case_Ignorable_index[69] = {
+    0xbe, 0x05, 0x00,  //  005BE at 32
+    0xfe, 0x07, 0x00,  //  007FE at 64
+    0x52, 0x0a, 0xa0,  //  00A52 at 101
+    0xc1, 0x0b, 0x00,  //  00BC1 at 128
+    0x82, 0x0d, 0x00,  //  00D82 at 160
+    0x3f, 0x10, 0x80,  //  0103F at 196
+    0xd4, 0x17, 0x40,  //  017D4 at 226
+    0xcf, 0x1a, 0x20,  //  01ACF at 257
+    0xf5, 0x1c, 0x00,  //  01CF5 at 288
+    0x80, 0x20, 0x00,  //  02080 at 320
+    0x16, 0xa0, 0x00,  //  0A016 at 352
+    0xc6, 0xa8, 0x00,  //  0A8C6 at 384
+    0xc2, 0xaa, 0x60,  //  0AAC2 at 419
+    0x56, 0xfe, 0x20,  //  0FE56 at 449
+    0xb1, 0x07, 0x01,  //  107B1 at 480
+    0x75, 0x10, 0x01,  //  11075 at 512
+    0xeb, 0x12, 0x21,  //  112EB at 545
+    0x41, 0x16, 0x01,  //  11641 at 576
+    0x5c, 0x1a, 0x01,  //  11A5C at 608
+    0x43, 0x1f, 0x01,  //  11F43 at 640
+    0x2e, 0xcf, 0x41,  //  1CF2E at 674
+    0x25, 0xe0, 0x01,  //  1E025 at 704
+    0xf0, 0x01, 0x0e,  //  E01F0 at 736 (upper bound)
+};
+
+static const uint8_t unicode_prop_ID_Start_table[1100] = {
+    0xc0, 0x99, 0x85, 0x99, 0xae, 0x80, 0x89, 0x03,
+    0x04, 0x96, 0x80, 0x9e, 0x80, 0x41, 0xc9, 0x83,
+    0x8b, 0x8d, 0x26, 0x00, 0x80, 0x40, 0x80, 0x20,
+    0x09, 0x18, 0x05, 0x00, 0x10, 0x00, 0x93, 0x80,
+    0xd2, 0x80, 0x40, 0x8a, 0x87, 0x40, 0xa5, 0x80,
+    0xa5, 0x08, 0x85, 0xa8, 0xc6, 0x9a, 0x1b, 0xac,
+    0xaa, 0xa2, 0x08, 0xe2, 0x00, 0x8e, 0x0e, 0x81,
+    0x89, 0x11, 0x80, 0x8f, 0x00, 0x9d, 0x9c, 0xd8,
+    0x8a, 0x80, 0x97, 0xa0, 0x88, 0x0b, 0x04, 0x95,
+    0x18, 0x88, 0x02, 0x80, 0x96, 0x98, 0x86, 0x8a,
+    0x84, 0x97, 0x05, 0x90, 0xa9, 0xb9, 0xb5, 0x10,
+    0x91, 0x06, 0x89, 0x8e, 0x8f, 0x1f, 0x09, 0x81,
+    0x95, 0x06, 0x00, 0x13, 0x10, 0x8f, 0x80, 0x8c,
+    0x08, 0x82, 0x8d, 0x81, 0x89, 0x07, 0x2b, 0x09,
+    0x95, 0x06, 0x01, 0x01, 0x01, 0x9e, 0x18, 0x80,
+    0x92, 0x82, 0x8f, 0x88, 0x02, 0x80, 0x95, 0x06,
+    0x01, 0x04, 0x10, 0x91, 0x80, 0x8e, 0x81, 0x96,
+    0x80, 0x8a, 0x39, 0x09, 0x95, 0x06, 0x01, 0x04,
+    0x10, 0x9d, 0x08, 0x82, 0x8e, 0x80, 0x90, 0x00,
+    0x2a, 0x10, 0x1a, 0x08, 0x00, 0x0a, 0x0a, 0x12,
+    0x8b, 0x95, 0x80, 0xb3, 0x38, 0x10, 0x96, 0x80,
+    0x8f, 0x10, 0x99, 0x11, 0x01, 0x81, 0x9d, 0x03,
+    0x38, 0x10, 0x96, 0x80, 0x89, 0x04, 0x10, 0x9e,
+    0x08, 0x81, 0x8e, 0x81, 0x90, 0x88, 0x02, 0x80,
+    0xa8, 0x08, 0x8f, 0x04, 0x17, 0x82, 0x97, 0x2c,
+    0x91, 0x82, 0x97, 0x80, 0x88, 0x00, 0x0e, 0xb9,
+    0xaf, 0x01, 0x8b, 0x86, 0xb9, 0x08, 0x00, 0x20,
+    0x97, 0x00, 0x80, 0x89, 0x01, 0x88, 0x01, 0x20,
+    0x80, 0x94, 0x83, 0x9f, 0x80, 0xbe, 0x38, 0xa3,
+    0x9a, 0x84, 0xf2, 0xaa, 0x93, 0x80, 0x8f, 0x2b,
+    0x1a, 0x02, 0x0e, 0x13, 0x8c, 0x8b, 0x80, 0x90,
+    0xa5, 0x00, 0x20, 0x81, 0xaa, 0x80, 0x41, 0x4c,
+    0x03, 0x0e, 0x00, 0x03, 0x81, 0xa8, 0x03, 0x81,
+    0xa0, 0x03, 0x0e, 0x00, 0x03, 0x81, 0x8e, 0x80,
+    0xb8, 0x03, 0x81, 0xc2, 0xa4, 0x8f, 0x8f, 0xd5,
+    0x0d, 0x82, 0x42, 0x6b, 0x81, 0x90, 0x80, 0x99,
+    0x84, 0xca, 0x82, 0x8a, 0x86, 0x91, 0x8c, 0x92,
+    0x8d, 0x91, 0x8d, 0x8c, 0x02, 0x8e, 0xb3, 0xa2,
+    0x03, 0x80, 0xc2, 0xd8, 0x86, 0xa8, 0x00, 0x84,
+    0xc5, 0x89, 0x9e, 0xb0, 0x9d, 0x0c, 0x8a, 0xab,
+    0x83, 0x99, 0xb5, 0x96, 0x88, 0xb4, 0xd1, 0x80,
+    0xdc, 0xae, 0x90, 0x87, 0xb5, 0x9d, 0x8c, 0x81,
+    0x89, 0xab, 0x99, 0xa3, 0xa8, 0x82, 0x89, 0xa3,
+    0x81, 0x88, 0x86, 0xaa, 0x0a, 0xa8, 0x18, 0x28,
+    0x0a, 0x04, 0x40, 0xbf, 0xbf, 0x41, 0x15, 0x0d,
+    0x81, 0xa5, 0x0d, 0x0f, 0x00, 0x00, 0x00, 0x80,
+    0x9e, 0x81, 0xb4, 0x06, 0x00, 0x12, 0x06, 0x13,
+    0x0d, 0x83, 0x8c, 0x22, 0x06, 0xf3, 0x80, 0x8c,
+    0x80, 0x8f, 0x8c, 0xe4, 0x03, 0x01, 0x89, 0x00,
+    0x0d, 0x28, 0x00, 0x00, 0x80, 0x8f, 0x0b, 0x24,
+    0x18, 0x90, 0xa8, 0x4a, 0x76, 0x40, 0xe4, 0x2b,
+    0x11, 0x8b, 0xa5, 0x00, 0x20, 0x81, 0xb7, 0x30,
+    0x8f, 0x96, 0x88, 0x30, 0x30, 0x30, 0x30, 0x30,
+    0x30, 0x30, 0x86, 0x42, 0x25, 0x82, 0x98, 0x88,
+    0x34, 0x0c, 0x83, 0xd5, 0x1c, 0x80, 0xd9, 0x03,
+    0x84, 0xaa, 0x80, 0xdd, 0x90, 0x9f, 0xaf, 0x8f,
+    0x41, 0xff, 0x59, 0xbf, 0xbf, 0x60, 0x56, 0x8c,
+    0xc2, 0xad, 0x81, 0x41, 0x0c, 0x82, 0x8f, 0x89,
+    0x81, 0x93, 0xae, 0x8f, 0x9e, 0x81, 0xcf, 0xa6,
+    0x88, 0x81, 0xe6, 0x81, 0xbf, 0x21, 0x00, 0x04,
+    0x97, 0x8f, 0x02, 0x03, 0x80, 0x96, 0x9c, 0xb3,
+    0x8d, 0xb1, 0xbd, 0x2a, 0x00, 0x81, 0x8a, 0x9b,
+    0x89, 0x96, 0x98, 0x9c, 0x86, 0xae, 0x9b, 0x80,
+    0x8f, 0x20, 0x89, 0x89, 0x20, 0xa8, 0x96, 0x10,
+    0x87, 0x93, 0x96, 0x10, 0x82, 0xb1, 0x00, 0x11,
+    0x0c, 0x08, 0x00, 0x97, 0x11, 0x8a, 0x32, 0x8b,
+    0x29, 0x29, 0x85, 0x88, 0x30, 0x30, 0xaa, 0x80,
+    0x8d, 0x85, 0xf2, 0x9c, 0x60, 0x2b, 0xa3, 0x8b,
+    0x96, 0x83, 0xb0, 0x60, 0x21, 0x03, 0x41, 0x6d,
+    0x81, 0xe9, 0xa5, 0x86, 0x8b, 0x24, 0x00, 0x89,
+    0x80, 0x8c, 0x04, 0x00, 0x01, 0x01, 0x80, 0xeb,
+    0xa0, 0x41, 0x6a, 0x91, 0xbf, 0x81, 0xb5, 0xa7,
+    0x8b, 0xf3, 0x20, 0x40, 0x86, 0xa3, 0x99, 0x85,
+    0x99, 0x8a, 0xd8, 0x15, 0x0d, 0x0d, 0x0a, 0xa2,
+    0x8b, 0x80, 0x99, 0x80, 0x92, 0x01, 0x80, 0x8e,
+    0x81, 0x8d, 0xa1, 0xfa, 0xc4, 0xb4, 0x41, 0x0a,
+    0x9c, 0x82, 0xb0, 0xae, 0x9f, 0x8c, 0x9d, 0x84,
+    0xa5, 0x89, 0x9d, 0x81, 0xa3, 0x1f, 0x04, 0xa9,
+    0x40, 0x9d, 0x91, 0xa3, 0x83, 0xa3, 0x83, 0xa7,
+    0x87, 0xb3, 0x8b, 0x8a, 0x80, 0x8e, 0x06, 0x01,
+    0x80, 0x8a, 0x80, 0x8e, 0x06, 0x01, 0xc2, 0x41,
+    0x36, 0x88, 0x95, 0x89, 0x87, 0x97, 0x28, 0xa9,
+    0x80, 0x88, 0xc4, 0x29, 0x00, 0xab, 0x01, 0x10,
+    0x81, 0x96, 0x89, 0x96, 0x88, 0x9e, 0xc0, 0x92,
+    0x01, 0x89, 0x95, 0x89, 0x99, 0xc5, 0xb7, 0x29,
+    0xbf, 0x80, 0x8e, 0x18, 0x10, 0x9c, 0xa9, 0x9c,
+    0x82, 0x9c, 0xa2, 0x38, 0x9b, 0x9a, 0xb5, 0x89,
+    0x95, 0x89, 0x92, 0x8c, 0x91, 0xed, 0xc8, 0xb6,
+    0xb2, 0x8c, 0xb2, 0x8c, 0xa3, 0x41, 0x5b, 0xa9,
+    0x29, 0xcd, 0x9c, 0x89, 0x07, 0x95, 0xa9, 0x91,
+    0xad, 0x94, 0x9a, 0x96, 0x8b, 0xb4, 0xb8, 0x09,
+    0x80, 0x8c, 0xac, 0x9f, 0x98, 0x99, 0xa3, 0x9c,
+    0x01, 0x07, 0xa2, 0x10, 0x8b, 0xaf, 0x8d, 0x83,
+    0x94, 0x00, 0x80, 0xa2, 0x91, 0x80, 0x98, 0x92,
+    0x81, 0xbe, 0x30, 0x00, 0x18, 0x8e, 0x80, 0x89,
+    0x86, 0xae, 0xa5, 0x39, 0x09, 0x95, 0x06, 0x01,
+    0x04, 0x10, 0x91, 0x80, 0x8b, 0x84, 0x40, 0x9d,
+    0xb4, 0x91, 0x83, 0x93, 0x82, 0x9d, 0xaf, 0x93,
+    0x08, 0x80, 0x40, 0xb7, 0xae, 0xa8, 0x83, 0xa3,
+    0xaf, 0x93, 0x80, 0xba, 0xaa, 0x8c, 0x80, 0xc6,
+    0x9a, 0xa4, 0x86, 0x40, 0xb8, 0xab, 0xf3, 0xbf,
+    0x9e, 0x39, 0x01, 0x38, 0x08, 0x97, 0x8e, 0x00,
+    0x80, 0xdd, 0x39, 0xa6, 0x8f, 0x00, 0x80, 0x9b,
+    0x80, 0x89, 0xa7, 0x30, 0x94, 0x80, 0x8a, 0xad,
+    0x92, 0x80, 0x91, 0xc8, 0x41, 0x06, 0x88, 0x80,
+    0xa4, 0x90, 0x80, 0xb0, 0x9d, 0xef, 0x30, 0x08,
+    0xa5, 0x94, 0x80, 0x98, 0x28, 0x08, 0x9f, 0x8d,
+    0x80, 0x41, 0x46, 0x92, 0x8e, 0x00, 0x8c, 0x80,
+    0xa1, 0xfb, 0x80, 0xce, 0x43, 0x99, 0xe5, 0xee,
+    0x90, 0x40, 0xc3, 0x4a, 0x4b, 0xe0, 0x8e, 0x44,
+    0x2f, 0x90, 0x85, 0x4f, 0xb8, 0x42, 0x46, 0x60,
+    0x21, 0xb8, 0x42, 0x38, 0x86, 0x9e, 0x90, 0xce,
+    0x90, 0x9d, 0x91, 0xaf, 0x8f, 0x83, 0x9e, 0x94,
+    0x84, 0x92, 0x42, 0xaf, 0xbf, 0xff, 0xca, 0x20,
+    0xc1, 0x8c, 0xbf, 0x08, 0x80, 0x9b, 0x57, 0xf7,
+    0x87, 0x44, 0xd5, 0xa9, 0x88, 0x60, 0x22, 0xe6,
+    0x18, 0x30, 0x08, 0x41, 0x22, 0x8e, 0x80, 0x9c,
+    0x11, 0x80, 0x8d, 0x1f, 0x41, 0x8b, 0x49, 0x03,
+    0xea, 0x84, 0x8c, 0x82, 0x88, 0x86, 0x89, 0x57,
+    0x65, 0xd4, 0x80, 0xc6, 0x01, 0x08, 0x09, 0x0b,
+    0x80, 0x8b, 0x00, 0x06, 0x80, 0xc0, 0x03, 0x0f,
+    0x06, 0x80, 0x9b, 0x03, 0x04, 0x00, 0x16, 0x80,
+    0x41, 0x53, 0x81, 0x98, 0x80, 0x98, 0x80, 0x9e,
+    0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x80, 0x9e,
+    0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x07, 0x47,
+    0x33, 0x9e, 0x2d, 0x41, 0x04, 0xbd, 0x40, 0x91,
+    0xac, 0x89, 0x86, 0x8f, 0x80, 0x41, 0x40, 0x9d,
+    0x91, 0xab, 0x41, 0xe3, 0x9b, 0x42, 0xf3, 0x30,
+    0x18, 0x08, 0x8e, 0x80, 0x40, 0xc4, 0xba, 0xc3,
+    0x30, 0x44, 0xb3, 0x18, 0x9a, 0x01, 0x00, 0x08,
+    0x80, 0x89, 0x03, 0x00, 0x00, 0x28, 0x18, 0x00,
+    0x00, 0x02, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x0b, 0x06, 0x03, 0x03, 0x00,
+    0x80, 0x89, 0x80, 0x90, 0x22, 0x04, 0x80, 0x90,
+    0x51, 0x43, 0x60, 0xa6, 0xdf, 0x9f, 0x50, 0x39,
+    0x85, 0x40, 0xdd, 0x81, 0x56, 0x81, 0x8d, 0x5d,
+    0x30, 0x4c, 0x1e, 0x42, 0x1d, 0x45, 0xe1, 0x53,
+    0x4a, 0x84, 0x50, 0x5f,
+};
+
+static const uint8_t unicode_prop_ID_Start_index[105] = {
+    0xf6, 0x03, 0x20,  //  003F6 at 33
+    0xa6, 0x07, 0x00,  //  007A6 at 64
+    0xa9, 0x09, 0x20,  //  009A9 at 97
+    0xb1, 0x0a, 0x00,  //  00AB1 at 128
+    0xba, 0x0b, 0x20,  //  00BBA at 161
+    0x3b, 0x0d, 0x20,  //  00D3B at 193
+    0xc7, 0x0e, 0x20,  //  00EC7 at 225
+    0x49, 0x12, 0x00,  //  01249 at 256
+    0x9b, 0x16, 0x00,  //  0169B at 288
+    0xac, 0x19, 0x00,  //  019AC at 320
+    0xc0, 0x1d, 0x80,  //  01DC0 at 356
+    0x80, 0x20, 0x20,  //  02080 at 385
+    0x70, 0x2d, 0x00,  //  02D70 at 416
+    0x00, 0x32, 0x00,  //  03200 at 448
+    0xda, 0xa7, 0x00,  //  0A7DA at 480
+    0x4c, 0xaa, 0x20,  //  0AA4C at 513
+    0xc7, 0xd7, 0x20,  //  0D7C7 at 545
+    0xfc, 0xfd, 0x20,  //  0FDFC at 577
+    0x9d, 0x02, 0x21,  //  1029D at 609
+    0x96, 0x05, 0x01,  //  10596 at 640
+    0xf3, 0x08, 0x01,  //  108F3 at 672
+    0xb3, 0x0c, 0x21,  //  10CB3 at 705
+    0x73, 0x11, 0x61,  //  11173 at 739
+    0x34, 0x13, 0x01,  //  11334 at 768
+    0x1b, 0x17, 0x21,  //  1171B at 801
+    0x8a, 0x1a, 0x01,  //  11A8A at 832
+    0x34, 0x1f, 0x21,  //  11F34 at 865
+    0xbf, 0x6a, 0x01,  //  16ABF at 896
+    0x23, 0xb1, 0xa1,  //  1B123 at 933
+    0xad, 0xd4, 0x01,  //  1D4AD at 960
+    0x6f, 0xd7, 0x01,  //  1D76F at 992
+    0xff, 0xe7, 0x61,  //  1E7FF at 1027
+    0x5e, 0xee, 0x01,  //  1EE5E at 1056
+    0xe1, 0xeb, 0x22,  //  2EBE1 at 1089
+    0xb0, 0x23, 0x03,  //  323B0 at 1120 (upper bound)
+};
+
+static const uint8_t unicode_prop_ID_Continue1_table[660] = {
+    0xaf, 0x89, 0xa4, 0x80, 0xd6, 0x80, 0x42, 0x47,
+    0xef, 0x96, 0x80, 0x40, 0xfa, 0x84, 0x41, 0x08,
+    0xac, 0x00, 0x01, 0x01, 0x00, 0xc7, 0x8a, 0xaf,
+    0x9e, 0x28, 0xe4, 0x31, 0x29, 0x08, 0x19, 0x89,
+    0x96, 0x80, 0x9d, 0x9a, 0xda, 0x8a, 0x8e, 0x89,
+    0xa0, 0x88, 0x88, 0x80, 0x97, 0x18, 0x88, 0x02,
+    0x04, 0xaa, 0x82, 0xbb, 0x87, 0xa9, 0x97, 0x80,
+    0xa0, 0xb5, 0x10, 0x91, 0x06, 0x89, 0x09, 0x89,
+    0x90, 0x82, 0xb7, 0x00, 0x31, 0x09, 0x82, 0x88,
+    0x80, 0x89, 0x09, 0x89, 0x8d, 0x01, 0x82, 0xb7,
+    0x00, 0x23, 0x09, 0x12, 0x80, 0x93, 0x8b, 0x10,
+    0x8a, 0x82, 0xb7, 0x00, 0x38, 0x10, 0x82, 0x93,
+    0x09, 0x89, 0x89, 0x28, 0x82, 0xb7, 0x00, 0x31,
+    0x09, 0x16, 0x82, 0x89, 0x09, 0x89, 0x91, 0x80,
+    0xba, 0x22, 0x10, 0x83, 0x88, 0x80, 0x8d, 0x89,
+    0x8f, 0x84, 0xb6, 0x00, 0x30, 0x10, 0x1e, 0x81,
+    0x8a, 0x09, 0x89, 0x90, 0x82, 0xb7, 0x00, 0x30,
+    0x10, 0x1e, 0x81, 0x8a, 0x09, 0x89, 0x10, 0x8b,
+    0x83, 0xb6, 0x08, 0x30, 0x10, 0x83, 0x88, 0x80,
+    0x89, 0x09, 0x89, 0x90, 0x82, 0xc5, 0x03, 0x28,
+    0x00, 0x3d, 0x89, 0x09, 0xbc, 0x01, 0x86, 0x8b,
+    0x38, 0x89, 0xd6, 0x01, 0x88, 0x8a, 0x30, 0x89,
+    0xbd, 0x0d, 0x89, 0x8a, 0x00, 0x00, 0x03, 0x81,
+    0xb0, 0x93, 0x01, 0x84, 0x8a, 0x80, 0xa3, 0x88,
+    0x80, 0xe3, 0x93, 0x80, 0x89, 0x8b, 0x1b, 0x10,
+    0x11, 0x32, 0x83, 0x8c, 0x8b, 0x80, 0x8e, 0x42,
+    0xbe, 0x82, 0x88, 0x88, 0x43, 0x9f, 0x83, 0x9b,
+    0x82, 0x9c, 0x81, 0x9d, 0x81, 0xbf, 0x9f, 0x88,
+    0x01, 0x89, 0xa0, 0x10, 0x8a, 0x40, 0x8e, 0x80,
+    0xf5, 0x8b, 0x83, 0x8b, 0x89, 0x89, 0xff, 0x8a,
+    0xbb, 0x84, 0xb8, 0x89, 0x80, 0x9c, 0x81, 0x8a,
+    0x85, 0x89, 0x95, 0x8d, 0x80, 0x8f, 0xb0, 0x84,
+    0xae, 0x90, 0x8a, 0x89, 0x90, 0x88, 0x8b, 0x82,
+    0x9d, 0x8c, 0x81, 0x89, 0xab, 0x8d, 0xaf, 0x93,
+    0x87, 0x89, 0x85, 0x89, 0xf5, 0x10, 0x94, 0x18,
+    0x28, 0x0a, 0x40, 0xc5, 0xbf, 0x42, 0x3e, 0x81,
+    0x92, 0x80, 0xfa, 0x8c, 0x18, 0x82, 0x8b, 0x4b,
+    0xfd, 0x82, 0x40, 0x8c, 0x80, 0xdf, 0x9f, 0x42,
+    0x29, 0x85, 0xe8, 0x81, 0x60, 0x75, 0x84, 0x89,
+    0xc4, 0x03, 0x89, 0x9f, 0x81, 0xcf, 0x81, 0x41,
+    0x0f, 0x02, 0x03, 0x80, 0x96, 0x23, 0x80, 0xd2,
+    0x81, 0xb1, 0x91, 0x89, 0x89, 0x85, 0x91, 0x8c,
+    0x8a, 0x9b, 0x87, 0x98, 0x8c, 0xab, 0x83, 0xae,
+    0x8d, 0x8e, 0x89, 0x8a, 0x80, 0x89, 0x89, 0xae,
+    0x8d, 0x8b, 0x07, 0x09, 0x89, 0xa0, 0x82, 0xb1,
+    0x00, 0x11, 0x0c, 0x08, 0x80, 0xa8, 0x24, 0x81,
+    0x40, 0xeb, 0x38, 0x09, 0x89, 0x60, 0x4f, 0x23,
+    0x80, 0x42, 0xe0, 0x8f, 0x8f, 0x8f, 0x11, 0x97,
+    0x82, 0x40, 0xbf, 0x89, 0xa4, 0x80, 0x42, 0xbc,
+    0x80, 0x40, 0xe1, 0x80, 0x40, 0x94, 0x84, 0x41,
+    0x24, 0x89, 0x45, 0x56, 0x10, 0x0c, 0x83, 0xa7,
+    0x13, 0x80, 0x40, 0xa4, 0x81, 0x42, 0x3c, 0x1f,
+    0x89, 0x41, 0x70, 0x81, 0xcf, 0x82, 0xc5, 0x8a,
+    0xb0, 0x83, 0xf9, 0x82, 0xb4, 0x8e, 0x9e, 0x8a,
+    0x09, 0x89, 0x83, 0xac, 0x8a, 0x30, 0xac, 0x89,
+    0x2a, 0xa3, 0x8d, 0x80, 0x89, 0x21, 0xab, 0x80,
+    0x8b, 0x82, 0xaf, 0x8d, 0x3b, 0x80, 0x8b, 0xd1,
+    0x8b, 0x28, 0x08, 0x40, 0x9c, 0x8b, 0x84, 0x89,
+    0x2b, 0xb6, 0x08, 0x31, 0x09, 0x82, 0x88, 0x80,
+    0x89, 0x09, 0x32, 0x84, 0x40, 0xbf, 0x91, 0x88,
+    0x89, 0x18, 0xd0, 0x93, 0x8b, 0x89, 0x40, 0xd4,
+    0x31, 0x88, 0x9a, 0x81, 0xd1, 0x90, 0x8e, 0x89,
+    0xd0, 0x8c, 0x87, 0x89, 0xd2, 0x8e, 0x83, 0x89,
+    0x40, 0xf1, 0x8e, 0x40, 0xa4, 0x89, 0xc5, 0x28,
+    0x09, 0x18, 0x00, 0x81, 0x8b, 0x89, 0xf6, 0x31,
+    0x32, 0x80, 0x9b, 0x89, 0xa7, 0x30, 0x1f, 0x80,
+    0x88, 0x8a, 0xad, 0x8f, 0x41, 0x94, 0x38, 0x87,
+    0x8f, 0x89, 0xb7, 0x95, 0x80, 0x8d, 0xf9, 0x2a,
+    0x00, 0x08, 0x30, 0x07, 0x89, 0xaf, 0x20, 0x08,
+    0x27, 0x89, 0x41, 0x48, 0x83, 0x88, 0x08, 0x80,
+    0xaf, 0x32, 0x84, 0x8c, 0x89, 0x54, 0xe5, 0x05,
+    0x8e, 0x60, 0x36, 0x09, 0x89, 0xd5, 0x89, 0xa5,
+    0x84, 0xba, 0x86, 0x98, 0x89, 0x43, 0xf4, 0x00,
+    0xb6, 0x33, 0xd0, 0x80, 0x8a, 0x81, 0x60, 0x4c,
+    0xaa, 0x81, 0x52, 0x60, 0xad, 0x81, 0x96, 0x42,
+    0x1d, 0x22, 0x2f, 0x39, 0x86, 0x9d, 0x83, 0x40,
+    0x93, 0x82, 0x45, 0x88, 0xb1, 0x41, 0xff, 0xb6,
+    0x83, 0xb1, 0x38, 0x8d, 0x80, 0x95, 0x20, 0x8e,
+    0x45, 0x4f, 0x30, 0x90, 0x0e, 0x01, 0x04, 0xe3,
+    0x80, 0x40, 0x9f, 0x86, 0x88, 0x89, 0x41, 0x63,
+    0x80, 0xbc, 0x8d, 0x41, 0xf1, 0x8d, 0x43, 0xd5,
+    0x86, 0xec, 0x34, 0x89, 0x52, 0x95, 0x89, 0x6c,
+    0x05, 0x05, 0x40, 0xef,
+};
+
+static const uint8_t unicode_prop_ID_Continue1_index[63] = {
+    0xfa, 0x06, 0x00,  //  006FA at 32
+    0x70, 0x09, 0x00,  //  00970 at 64
+    0xf0, 0x0a, 0x40,  //  00AF0 at 98
+    0x57, 0x0c, 0x00,  //  00C57 at 128
+    0xf0, 0x0d, 0x60,  //  00DF0 at 163
+    0xc7, 0x0f, 0x20,  //  00FC7 at 193
+    0xea, 0x17, 0x40,  //  017EA at 226
+    0x05, 0x1b, 0x00,  //  01B05 at 256
+    0x41, 0x20, 0x00,  //  02041 at 288
+    0x0c, 0xa8, 0x80,  //  0A80C at 324
+    0x37, 0xaa, 0x20,  //  0AA37 at 353
+    0x50, 0xfe, 0x20,  //  0FE50 at 385
+    0x3a, 0x0d, 0x21,  //  10D3A at 417
+    0x74, 0x11, 0x01,  //  11174 at 448
+    0x5a, 0x14, 0x21,  //  1145A at 481
+    0x44, 0x19, 0x81,  //  11944 at 516
+    0x5a, 0x1d, 0xa1,  //  11D5A at 549
+    0xf5, 0x6a, 0x21,  //  16AF5 at 577
+    0x45, 0xd2, 0x41,  //  1D245 at 610
+    0xaf, 0xe2, 0x21,  //  1E2AF at 641
+    0xf0, 0x01, 0x0e,  //  E01F0 at 672 (upper bound)
+};
+
+#ifdef CONFIG_ALL_UNICODE
+
+static const uint8_t unicode_cc_table[899] = {
+    0xb2, 0xcf, 0xd4, 0x00, 0xe8, 0x03, 0xdc, 0x00,
+    0xe8, 0x00, 0xd8, 0x04, 0xdc, 0x01, 0xca, 0x03,
+    0xdc, 0x01, 0xca, 0x0a, 0xdc, 0x04, 0x01, 0x03,
+    0xdc, 0xc7, 0x00, 0xf0, 0xc0, 0x02, 0xdc, 0xc2,
+    0x01, 0xdc, 0x80, 0xc2, 0x03, 0xdc, 0xc0, 0x00,
+    0xe8, 0x01, 0xdc, 0xc0, 0x41, 0xe9, 0x00, 0xea,
+    0x41, 0xe9, 0x00, 0xea, 0x00, 0xe9, 0xcc, 0xb0,
+    0xe2, 0xc4, 0xb0, 0xd8, 0x00, 0xdc, 0xc3, 0x00,
+    0xdc, 0xc2, 0x00, 0xde, 0x00, 0xdc, 0xc5, 0x05,
+    0xdc, 0xc1, 0x00, 0xdc, 0xc1, 0x00, 0xde, 0x00,
+    0xe4, 0xc0, 0x49, 0x0a, 0x43, 0x13, 0x80, 0x00,
+    0x17, 0x80, 0x41, 0x18, 0x80, 0xc0, 0x00, 0xdc,
+    0x80, 0x00, 0x12, 0xb0, 0x17, 0xc7, 0x42, 0x1e,
+    0xaf, 0x47, 0x1b, 0xc1, 0x01, 0xdc, 0xc4, 0x00,
+    0xdc, 0xc1, 0x00, 0xdc, 0x8f, 0x00, 0x23, 0xb0,
+    0x34, 0xc6, 0x81, 0xc3, 0x00, 0xdc, 0xc0, 0x81,
+    0xc1, 0x80, 0x00, 0xdc, 0xc1, 0x00, 0xdc, 0xa2,
+    0x00, 0x24, 0x9d, 0xc0, 0x00, 0xdc, 0xc1, 0x00,
+    0xdc, 0xc1, 0x02, 0xdc, 0xc0, 0x01, 0xdc, 0xc0,
+    0x00, 0xdc, 0xc2, 0x00, 0xdc, 0xc0, 0x00, 0xdc,
+    0xc0, 0x00, 0xdc, 0xc0, 0x00, 0xdc, 0xc1, 0xb0,
+    0x6f, 0xc6, 0x00, 0xdc, 0xc0, 0x88, 0x00, 0xdc,
+    0x97, 0xc3, 0x80, 0xc8, 0x80, 0xc2, 0x80, 0xc4,
+    0xaa, 0x02, 0xdc, 0xb0, 0x0b, 0xc0, 0x02, 0xdc,
+    0xc3, 0xa9, 0xc4, 0x04, 0xdc, 0xcd, 0x80, 0x00,
+    0xdc, 0xc1, 0x00, 0xdc, 0xc1, 0x00, 0xdc, 0xc2,
+    0x02, 0xdc, 0x42, 0x1b, 0xc2, 0x00, 0xdc, 0xc1,
+    0x01, 0xdc, 0xc4, 0xb0, 0x0b, 0x00, 0x07, 0x8f,
+    0x00, 0x09, 0x82, 0xc0, 0x00, 0xdc, 0xc1, 0xb0,
+    0x36, 0x00, 0x07, 0x8f, 0x00, 0x09, 0xaf, 0xc0,
+    0xb0, 0x0c, 0x00, 0x07, 0x8f, 0x00, 0x09, 0xb0,
+    0x3d, 0x00, 0x07, 0x8f, 0x00, 0x09, 0xb0, 0x3d,
+    0x00, 0x07, 0x8f, 0x00, 0x09, 0xb0, 0x4e, 0x00,
+    0x09, 0xb0, 0x3d, 0x00, 0x07, 0x8f, 0x00, 0x09,
+    0x86, 0x00, 0x54, 0x00, 0x5b, 0xb0, 0x34, 0x00,
+    0x07, 0x8f, 0x00, 0x09, 0xb0, 0x3c, 0x01, 0x09,
+    0x8f, 0x00, 0x09, 0xb0, 0x4b, 0x00, 0x09, 0xb0,
+    0x3c, 0x01, 0x67, 0x00, 0x09, 0x8c, 0x03, 0x6b,
+    0xb0, 0x3b, 0x01, 0x76, 0x00, 0x09, 0x8c, 0x03,
+    0x7a, 0xb0, 0x1b, 0x01, 0xdc, 0x9a, 0x00, 0xdc,
+    0x80, 0x00, 0xdc, 0x80, 0x00, 0xd8, 0xb0, 0x06,
+    0x41, 0x81, 0x80, 0x00, 0x84, 0x84, 0x03, 0x82,
+    0x81, 0x00, 0x82, 0x80, 0xc1, 0x00, 0x09, 0x80,
+    0xc1, 0xb0, 0x0d, 0x00, 0xdc, 0xb0, 0x3f, 0x00,
+    0x07, 0x80, 0x01, 0x09, 0xb0, 0x21, 0x00, 0xdc,
+    0xb2, 0x9e, 0xc2, 0xb3, 0x83, 0x01, 0x09, 0x9d,
+    0x00, 0x09, 0xb0, 0x6c, 0x00, 0x09, 0x89, 0xc0,
+    0xb0, 0x9a, 0x00, 0xe4, 0xb0, 0x5e, 0x00, 0xde,
+    0xc0, 0x00, 0xdc, 0xb0, 0xaa, 0xc0, 0x00, 0xdc,
+    0xb0, 0x16, 0x00, 0x09, 0x93, 0xc7, 0x81, 0x00,
+    0xdc, 0xaf, 0xc4, 0x05, 0xdc, 0xc1, 0x00, 0xdc,
+    0x80, 0x01, 0xdc, 0xc1, 0x01, 0xdc, 0xc4, 0x00,
+    0xdc, 0xc3, 0xb0, 0x34, 0x00, 0x07, 0x8e, 0x00,
+    0x09, 0xa5, 0xc0, 0x00, 0xdc, 0xc6, 0xb0, 0x05,
+    0x01, 0x09, 0xb0, 0x09, 0x00, 0x07, 0x8a, 0x01,
+    0x09, 0xb0, 0x12, 0x00, 0x07, 0xb0, 0x67, 0xc2,
+    0x41, 0x00, 0x04, 0xdc, 0xc1, 0x03, 0xdc, 0xc0,
+    0x41, 0x00, 0x05, 0x01, 0x83, 0x00, 0xdc, 0x85,
+    0xc0, 0x82, 0xc1, 0xb0, 0x95, 0xc1, 0x00, 0xdc,
+    0xc6, 0x00, 0xdc, 0xc1, 0x00, 0xea, 0x00, 0xd6,
+    0x00, 0xdc, 0x00, 0xca, 0xe4, 0x00, 0xe8, 0x01,
+    0xe4, 0x00, 0xdc, 0x00, 0xda, 0xc0, 0x00, 0xe9,
+    0x00, 0xdc, 0xc0, 0x00, 0xdc, 0xb2, 0x9f, 0xc1,
+    0x01, 0x01, 0xc3, 0x02, 0x01, 0xc1, 0x83, 0xc0,
+    0x82, 0x01, 0x01, 0xc0, 0x00, 0xdc, 0xc0, 0x01,
+    0x01, 0x03, 0xdc, 0xc0, 0xb8, 0x03, 0xcd, 0xc2,
+    0xb0, 0x5c, 0x00, 0x09, 0xb0, 0x2f, 0xdf, 0xb1,
+    0xf9, 0x00, 0xda, 0x00, 0xe4, 0x00, 0xe8, 0x00,
+    0xde, 0x01, 0xe0, 0xb0, 0x38, 0x01, 0x08, 0xb8,
+    0x6d, 0xa3, 0xc0, 0x83, 0xc9, 0x9f, 0xc1, 0xb0,
+    0x1f, 0xc1, 0xb0, 0xe3, 0x00, 0x09, 0xa4, 0x00,
+    0x09, 0xb0, 0x66, 0x00, 0x09, 0x9a, 0xd1, 0xb0,
+    0x08, 0x02, 0xdc, 0xa4, 0x00, 0x09, 0xb0, 0x2e,
+    0x00, 0x07, 0x8b, 0x00, 0x09, 0xb0, 0xbe, 0xc0,
+    0x80, 0xc1, 0x00, 0xdc, 0x81, 0xc1, 0x84, 0xc1,
+    0x80, 0xc0, 0xb0, 0x03, 0x00, 0x09, 0xb0, 0xc5,
+    0x00, 0x09, 0xb8, 0x46, 0xff, 0x00, 0x1a, 0xb2,
+    0xd0, 0xc6, 0x06, 0xdc, 0xc1, 0xb3, 0x9c, 0x00,
+    0xdc, 0xb0, 0xb1, 0x00, 0xdc, 0xb0, 0x64, 0xc4,
+    0xb6, 0x61, 0x00, 0xdc, 0x80, 0xc0, 0xa7, 0xc0,
+    0x00, 0x01, 0x00, 0xdc, 0x83, 0x00, 0x09, 0xb0,
+    0x74, 0xc0, 0x00, 0xdc, 0xb2, 0x0c, 0xc3, 0xb1,
+    0x52, 0xc1, 0xb0, 0x1f, 0x02, 0xdc, 0xb0, 0x15,
+    0x01, 0xdc, 0xc2, 0x00, 0xdc, 0xc0, 0x03, 0xdc,
+    0xb0, 0x00, 0xc0, 0x00, 0xdc, 0xc0, 0x00, 0xdc,
+    0xb0, 0x8f, 0x00, 0x09, 0xa8, 0x00, 0x09, 0x8d,
+    0x00, 0x09, 0xb0, 0x08, 0x00, 0x09, 0x00, 0x07,
+    0xb0, 0x14, 0xc2, 0xaf, 0x01, 0x09, 0xb0, 0x0d,
+    0x00, 0x07, 0xb0, 0x1b, 0x00, 0x09, 0x88, 0x00,
+    0x07, 0xb0, 0x39, 0x00, 0x09, 0x00, 0x07, 0xb0,
+    0x81, 0x00, 0x07, 0x00, 0x09, 0xb0, 0x1f, 0x01,
+    0x07, 0x8f, 0x00, 0x09, 0x97, 0xc6, 0x82, 0xc4,
+    0xb0, 0x9c, 0x00, 0x09, 0x82, 0x00, 0x07, 0x96,
+    0xc0, 0xb0, 0x32, 0x00, 0x09, 0x00, 0x07, 0xb0,
+    0xca, 0x00, 0x09, 0x00, 0x07, 0xb0, 0x4d, 0x00,
+    0x09, 0xb0, 0x45, 0x00, 0x09, 0x00, 0x07, 0xb0,
+    0x42, 0x00, 0x09, 0xb0, 0xdc, 0x00, 0x09, 0x00,
+    0x07, 0xb0, 0xd1, 0x01, 0x09, 0x83, 0x00, 0x07,
+    0xb0, 0x6b, 0x00, 0x09, 0xb0, 0x22, 0x00, 0x09,
+    0x91, 0x00, 0x09, 0xb0, 0x20, 0x00, 0x09, 0xb1,
+    0x74, 0x00, 0x09, 0xb0, 0xd1, 0x00, 0x07, 0x80,
+    0x01, 0x09, 0xb0, 0x20, 0x00, 0x09, 0xb1, 0x78,
+    0x01, 0x09, 0xb8, 0x43, 0x7c, 0x04, 0x01, 0xb0,
+    0x0a, 0xc6, 0xb4, 0x88, 0x01, 0x06, 0xb8, 0x44,
+    0x7b, 0x00, 0x01, 0xb8, 0x0c, 0x95, 0x01, 0xd8,
+    0x02, 0x01, 0x82, 0x00, 0xe2, 0x04, 0xd8, 0x87,
+    0x07, 0xdc, 0x81, 0xc4, 0x01, 0xdc, 0x9d, 0xc3,
+    0xb0, 0x63, 0xc2, 0xb8, 0x05, 0x8a, 0xc6, 0x80,
+    0xd0, 0x81, 0xc6, 0x80, 0xc1, 0x80, 0xc4, 0xb0,
+    0x33, 0xc0, 0xb0, 0x6f, 0xc6, 0xb1, 0x46, 0xc0,
+    0xb0, 0x0c, 0xc3, 0xb1, 0xcb, 0x01, 0xe8, 0x00,
+    0xdc, 0xc0, 0xb3, 0xaf, 0x06, 0xdc, 0xb0, 0x3c,
+    0xc5, 0x00, 0x07,
+};
+
+static const uint8_t unicode_cc_index[87] = {
+    0x4d, 0x03, 0x00,  //  0034D at 32
+    0x97, 0x05, 0x20,  //  00597 at 65
+    0xc6, 0x05, 0x00,  //  005C6 at 96
+    0xe7, 0x06, 0x00,  //  006E7 at 128
+    0x45, 0x07, 0x00,  //  00745 at 160
+    0x9c, 0x08, 0x00,  //  0089C at 192
+    0x4d, 0x09, 0x00,  //  0094D at 224
+    0x3c, 0x0b, 0x00,  //  00B3C at 256
+    0x3d, 0x0d, 0x00,  //  00D3D at 288
+    0x36, 0x0f, 0x00,  //  00F36 at 320
+    0x38, 0x10, 0x20,  //  01038 at 353
+    0x3a, 0x19, 0x00,  //  0193A at 384
+    0xcb, 0x1a, 0x20,  //  01ACB at 417
+    0xd3, 0x1c, 0x00,  //  01CD3 at 448
+    0xcf, 0x1d, 0x00,  //  01DCF at 480
+    0xe2, 0x20, 0x00,  //  020E2 at 512
+    0x2e, 0x30, 0x20,  //  0302E at 545
+    0x2b, 0xa9, 0x20,  //  0A92B at 577
+    0xed, 0xab, 0x00,  //  0ABED at 608
+    0x39, 0x0a, 0x01,  //  10A39 at 640
+    0x51, 0x0f, 0x01,  //  10F51 at 672
+    0x73, 0x11, 0x01,  //  11173 at 704
+    0x75, 0x13, 0x01,  //  11375 at 736
+    0x2b, 0x17, 0x21,  //  1172B at 769
+    0x3f, 0x1c, 0x21,  //  11C3F at 801
+    0x9e, 0xbc, 0x21,  //  1BC9E at 833
+    0x08, 0xe0, 0x01,  //  1E008 at 864
+    0x44, 0xe9, 0x01,  //  1E944 at 896
+    0x4b, 0xe9, 0x01,  //  1E94B at 928 (upper bound)
+};
+
+static const uint32_t unicode_decomp_table1[699] = {
+    0x00280081, 0x002a0097, 0x002a8081, 0x002bc097,
+    0x002c8115, 0x002d0097, 0x002d4081, 0x002e0097,
+    0x002e4115, 0x002f0199, 0x00302016, 0x00400842,
+    0x00448a42, 0x004a0442, 0x004c0096, 0x004c8117,
+    0x004d0242, 0x004e4342, 0x004fc12f, 0x0050c342,
+    0x005240bf, 0x00530342, 0x00550942, 0x005a0842,
+    0x005e0096, 0x005e4342, 0x005fc081, 0x00680142,
+    0x006bc142, 0x00710185, 0x0071c317, 0x00734844,
+    0x00778344, 0x00798342, 0x007b02be, 0x007c4197,
+    0x007d0142, 0x007e0444, 0x00800e42, 0x00878142,
+    0x00898744, 0x00ac0483, 0x00b60317, 0x00b80283,
+    0x00d00214, 0x00d10096, 0x00dd0080, 0x00de8097,
+    0x00df8080, 0x00e10097, 0x00e1413e, 0x00e1c080,
+    0x00e204be, 0x00ea83ae, 0x00f282ae, 0x00f401ad,
+    0x00f4c12e, 0x00f54103, 0x00fc0303, 0x00fe4081,
+    0x0100023e, 0x0101c0be, 0x010301be, 0x010640be,
+    0x010e40be, 0x0114023e, 0x0115c0be, 0x011701be,
+    0x011d8144, 0x01304144, 0x01340244, 0x01358144,
+    0x01368344, 0x01388344, 0x013a8644, 0x013e0144,
+    0x0161c085, 0x018882ae, 0x019d422f, 0x01b00184,
+    0x01b4c084, 0x024a4084, 0x024c4084, 0x024d0084,
+    0x0256042e, 0x0272c12e, 0x02770120, 0x0277c084,
+    0x028cc084, 0x028d8084, 0x029641ae, 0x02978084,
+    0x02d20084, 0x02d2c12e, 0x02d70120, 0x02e50084,
+    0x02f281ae, 0x03120084, 0x03300084, 0x0331c122,
+    0x0332812e, 0x035281ae, 0x03768084, 0x037701ae,
+    0x038cc085, 0x03acc085, 0x03b7012f, 0x03c30081,
+    0x03d0c084, 0x03d34084, 0x03d48084, 0x03d5c084,
+    0x03d70084, 0x03da4084, 0x03dcc084, 0x03dd412e,
+    0x03ddc085, 0x03de0084, 0x03de4085, 0x03e04084,
+    0x03e4c084, 0x03e74084, 0x03e88084, 0x03e9c084,
+    0x03eb0084, 0x03ee4084, 0x04098084, 0x043f0081,
+    0x06c18484, 0x06c48084, 0x06cec184, 0x06d00120,
+    0x06d0c084, 0x074b0383, 0x074cc41f, 0x074f1783,
+    0x075e0081, 0x0766d283, 0x07801d44, 0x078e8942,
+    0x07931844, 0x079f0d42, 0x07a58216, 0x07a68085,
+    0x07a6c0be, 0x07a80d44, 0x07aea044, 0x07c00122,
+    0x07c08344, 0x07c20122, 0x07c28344, 0x07c40122,
+    0x07c48244, 0x07c60122, 0x07c68244, 0x07c8113e,
+    0x07d08244, 0x07d20122, 0x07d28244, 0x07d40122,
+    0x07d48344, 0x07d64c3e, 0x07dc4080, 0x07dc80be,
+    0x07dcc080, 0x07dd00be, 0x07dd4080, 0x07dd80be,
+    0x07ddc080, 0x07de00be, 0x07de4080, 0x07de80be,
+    0x07dec080, 0x07df00be, 0x07df4080, 0x07e00820,
+    0x07e40820, 0x07e80820, 0x07ec05be, 0x07eec080,
+    0x07ef00be, 0x07ef4097, 0x07ef8080, 0x07efc117,
+    0x07f0443e, 0x07f24080, 0x07f280be, 0x07f2c080,
+    0x07f303be, 0x07f4c080, 0x07f582ae, 0x07f6c080,
+    0x07f7433e, 0x07f8c080, 0x07f903ae, 0x07fac080,
+    0x07fb013e, 0x07fb8102, 0x07fc83be, 0x07fe4080,
+    0x07fe80be, 0x07fec080, 0x07ff00be, 0x07ff4080,
+    0x07ff8097, 0x0800011e, 0x08008495, 0x08044081,
+    0x0805c097, 0x08090081, 0x08094097, 0x08098099,
+    0x080bc081, 0x080cc085, 0x080d00b1, 0x080d8085,
+    0x080dc0b1, 0x080f0197, 0x0811c197, 0x0815c0b3,
+    0x0817c081, 0x081c0595, 0x081ec081, 0x081f0215,
+    0x0820051f, 0x08228583, 0x08254415, 0x082a0097,
+    0x08400119, 0x08408081, 0x0840c0bf, 0x08414119,
+    0x0841c081, 0x084240bf, 0x0842852d, 0x08454081,
+    0x08458097, 0x08464295, 0x08480097, 0x08484099,
+    0x08488097, 0x08490081, 0x08498080, 0x084a0081,
+    0x084a8102, 0x084b0495, 0x084d421f, 0x084e4081,
+    0x084ec099, 0x084f0283, 0x08514295, 0x08540119,
+    0x0854809b, 0x0854c619, 0x0857c097, 0x08580081,
+    0x08584097, 0x08588099, 0x0858c097, 0x08590081,
+    0x08594097, 0x08598099, 0x0859c09b, 0x085a0097,
+    0x085a4081, 0x085a8097, 0x085ac099, 0x085b0295,
+    0x085c4097, 0x085c8099, 0x085cc097, 0x085d0081,
+    0x085d4097, 0x085d8099, 0x085dc09b, 0x085e0097,
+    0x085e4081, 0x085e8097, 0x085ec099, 0x085f0215,
+    0x08624099, 0x0866813e, 0x086b80be, 0x087341be,
+    0x088100be, 0x088240be, 0x088300be, 0x088901be,
+    0x088b0085, 0x088b40b1, 0x088bc085, 0x088c00b1,
+    0x089040be, 0x089100be, 0x0891c1be, 0x089801be,
+    0x089b42be, 0x089d0144, 0x089e0144, 0x08a00144,
+    0x08a10144, 0x08a20144, 0x08ab023e, 0x08b80244,
+    0x08ba8220, 0x08ca411e, 0x0918049f, 0x091a4523,
+    0x091cc097, 0x091d04a5, 0x091f452b, 0x0921c09b,
+    0x092204a1, 0x09244525, 0x0926c099, 0x09270d25,
+    0x092d8d1f, 0x09340d1f, 0x093a8081, 0x0a8300b3,
+    0x0a9d0099, 0x0a9d4097, 0x0a9d8099, 0x0ab700be,
+    0x0b1f0115, 0x0b5bc081, 0x0ba7c081, 0x0bbcc081,
+    0x0bc004ad, 0x0bc244ad, 0x0bc484ad, 0x0bc6f383,
+    0x0be0852d, 0x0be31d03, 0x0bf1882d, 0x0c000081,
+    0x0c0d8283, 0x0c130b84, 0x0c194284, 0x0c1c0122,
+    0x0c1cc122, 0x0c1d8122, 0x0c1e4122, 0x0c1f0122,
+    0x0c250084, 0x0c26c123, 0x0c278084, 0x0c27c085,
+    0x0c2b0b84, 0x0c314284, 0x0c340122, 0x0c34c122,
+    0x0c358122, 0x0c364122, 0x0c370122, 0x0c3d0084,
+    0x0c3dc220, 0x0c3f8084, 0x0c3fc085, 0x0c4c4a2d,
+    0x0c51451f, 0x0c53ca9f, 0x0c5915ad, 0x0c648703,
+    0x0c800741, 0x0c838089, 0x0c83c129, 0x0c8441a9,
+    0x0c850089, 0x0c854129, 0x0c85c2a9, 0x0c870089,
+    0x0c87408f, 0x0c87808d, 0x0c881241, 0x0c910203,
+    0x0c940099, 0x0c9444a3, 0x0c968323, 0x0c98072d,
+    0x0c9b84af, 0x0c9dc2a1, 0x0c9f00b5, 0x0c9f40b3,
+    0x0c9f8085, 0x0ca01883, 0x0cac4223, 0x0cad4523,
+    0x0cafc097, 0x0cb004a1, 0x0cb241a5, 0x0cb30097,
+    0x0cb34099, 0x0cb38097, 0x0cb3c099, 0x0cb417ad,
+    0x0cbfc085, 0x0cc001b3, 0x0cc0c0b1, 0x0cc100b3,
+    0x0cc14131, 0x0cc1c0b5, 0x0cc200b3, 0x0cc241b1,
+    0x0cc30133, 0x0cc38131, 0x0cc40085, 0x0cc440b1,
+    0x0cc48133, 0x0cc50085, 0x0cc540b5, 0x0cc580b7,
+    0x0cc5c0b5, 0x0cc600b1, 0x0cc64135, 0x0cc6c0b3,
+    0x0cc701b1, 0x0cc7c0b3, 0x0cc800b5, 0x0cc840b3,
+    0x0cc881b1, 0x0cc9422f, 0x0cca4131, 0x0ccac0b5,
+    0x0ccb00b1, 0x0ccb40b3, 0x0ccb80b5, 0x0ccbc0b1,
+    0x0ccc012f, 0x0ccc80b5, 0x0cccc0b3, 0x0ccd00b5,
+    0x0ccd40b1, 0x0ccd80b5, 0x0ccdc085, 0x0cce02b1,
+    0x0ccf40b3, 0x0ccf80b1, 0x0ccfc085, 0x0cd001b1,
+    0x0cd0c0b3, 0x0cd101b1, 0x0cd1c0b5, 0x0cd200b3,
+    0x0cd24085, 0x0cd280b5, 0x0cd2c085, 0x0cd30133,
+    0x0cd381b1, 0x0cd440b3, 0x0cd48085, 0x0cd4c0b1,
+    0x0cd500b3, 0x0cd54085, 0x0cd580b5, 0x0cd5c0b1,
+    0x0cd60521, 0x0cd88525, 0x0cdb02a5, 0x0cdc4099,
+    0x0cdc8117, 0x0cdd0099, 0x0cdd4197, 0x0cde0127,
+    0x0cde8285, 0x0cdfc089, 0x0ce0043f, 0x0ce20099,
+    0x0ce2409b, 0x0ce283bf, 0x0ce44219, 0x0ce54205,
+    0x0ce6433f, 0x0ce7c131, 0x0ce84085, 0x0ce881b1,
+    0x0ce94085, 0x0ce98107, 0x0cea0089, 0x0cea4097,
+    0x0cea8219, 0x0ceb809d, 0x0cebc08d, 0x0cec083f,
+    0x0cf00105, 0x0cf0809b, 0x0cf0c197, 0x0cf1809b,
+    0x0cf1c099, 0x0cf20517, 0x0cf48099, 0x0cf4c117,
+    0x0cf54119, 0x0cf5c097, 0x0cf6009b, 0x0cf64099,
+    0x0cf68217, 0x0cf78119, 0x0cf804a1, 0x0cfa4525,
+    0x0cfcc525, 0x0cff4125, 0x0cffc099, 0x29a70103,
+    0x29dc0081, 0x29fc8195, 0x29fe0103, 0x2ad70203,
+    0x2ada4081, 0x3e401482, 0x3e4a7f82, 0x3e6a3f82,
+    0x3e8aa102, 0x3e9b0110, 0x3e9c2f82, 0x3eb3c590,
+    0x3ec00197, 0x3ec0c119, 0x3ec1413f, 0x3ec4c2af,
+    0x3ec74184, 0x3ec804ad, 0x3eca4081, 0x3eca8304,
+    0x3ecc03a0, 0x3ece02a0, 0x3ecf8084, 0x3ed00120,
+    0x3ed0c120, 0x3ed184ae, 0x3ed3c085, 0x3ed4312d,
+    0x3ef4cbad, 0x3efa892f, 0x3eff022d, 0x3f002f2f,
+    0x3f1782a5, 0x3f18c0b1, 0x3f1907af, 0x3f1cffaf,
+    0x3f3c81a5, 0x3f3d64af, 0x3f542031, 0x3f649b31,
+    0x3f7c0131, 0x3f7c83b3, 0x3f7e40b1, 0x3f7e80bd,
+    0x3f7ec0bb, 0x3f7f00b3, 0x3f840503, 0x3f8c01ad,
+    0x3f8cc315, 0x3f8e462d, 0x3f91cc03, 0x3f97c695,
+    0x3f9c01af, 0x3f9d0085, 0x3f9d852f, 0x3fa03aad,
+    0x3fbd442f, 0x3fc06f1f, 0x3fd7c11f, 0x3fd85fad,
+    0x3fe80081, 0x3fe84f1f, 0x3ff0831f, 0x3ff2831f,
+    0x3ff4831f, 0x3ff6819f, 0x3ff80783, 0x41e04d83,
+    0x41e70f91, 0x44268192, 0x442ac092, 0x444b8112,
+    0x44d2c112, 0x452ec212, 0x456e8112, 0x464e0092,
+    0x74578392, 0x746ec312, 0x75000d1f, 0x75068d1f,
+    0x750d0d1f, 0x7513839f, 0x7515891f, 0x751a0d1f,
+    0x75208d1f, 0x75271015, 0x752f439f, 0x7531459f,
+    0x75340d1f, 0x753a8d1f, 0x75410395, 0x7543441f,
+    0x7545839f, 0x75478d1f, 0x754e0795, 0x7552839f,
+    0x75548d1f, 0x755b0d1f, 0x75618d1f, 0x75680d1f,
+    0x756e8d1f, 0x75750d1f, 0x757b8d1f, 0x75820d1f,
+    0x75888d1f, 0x758f0d1f, 0x75958d1f, 0x759c0d1f,
+    0x75a28d1f, 0x75a90103, 0x75aa089f, 0x75ae4081,
+    0x75ae839f, 0x75b04081, 0x75b08c9f, 0x75b6c081,
+    0x75b7032d, 0x75b8889f, 0x75bcc081, 0x75bd039f,
+    0x75bec081, 0x75bf0c9f, 0x75c54081, 0x75c5832d,
+    0x75c7089f, 0x75cb4081, 0x75cb839f, 0x75cd4081,
+    0x75cd8c9f, 0x75d3c081, 0x75d4032d, 0x75d5889f,
+    0x75d9c081, 0x75da039f, 0x75dbc081, 0x75dc0c9f,
+    0x75e24081, 0x75e2832d, 0x75e4089f, 0x75e84081,
+    0x75e8839f, 0x75ea4081, 0x75ea8c9f, 0x75f0c081,
+    0x75f1042d, 0x75f3851f, 0x75f6051f, 0x75f8851f,
+    0x75fb051f, 0x75fd851f, 0x780c049f, 0x780e419f,
+    0x780f059f, 0x7811c203, 0x7812d0ad, 0x781b0103,
+    0x7b80022d, 0x7b814dad, 0x7b884203, 0x7b89c081,
+    0x7b8a452d, 0x7b8d0403, 0x7b908081, 0x7b91dc03,
+    0x7ba0052d, 0x7ba2c8ad, 0x7ba84483, 0x7baac8ad,
+    0x7c400097, 0x7c404521, 0x7c440d25, 0x7c4a8087,
+    0x7c4ac115, 0x7c4b4117, 0x7c4c0d1f, 0x7c528217,
+    0x7c538099, 0x7c53c097, 0x7c5a8197, 0x7c640097,
+    0x7c80012f, 0x7c808081, 0x7c841603, 0x7c9004c1,
+    0x7c940103, 0x7efc051f, 0xbe0001ac, 0xbe00d110,
+    0xbe0947ac, 0xbe0d3910, 0xbe29872c, 0xbe2d022c,
+    0xbe2e3790, 0xbe49ff90, 0xbe69bc10,
+};
+
+static const uint16_t unicode_decomp_table2[699] = {
+    0x0020, 0x0000, 0x0061, 0x0002, 0x0004, 0x0006, 0x03bc, 0x0008,
+    0x000a, 0x000c, 0x0015, 0x0095, 0x00a5, 0x00b9, 0x00c1, 0x00c3,
+    0x00c7, 0x00cb, 0x00d1, 0x00d7, 0x00dd, 0x00e0, 0x00e6, 0x00f8,
+    0x0108, 0x010a, 0x0073, 0x0110, 0x0112, 0x0114, 0x0120, 0x012c,
+    0x0144, 0x014d, 0x0153, 0x0162, 0x0168, 0x016a, 0x0176, 0x0192,
+    0x0194, 0x01a9, 0x01bb, 0x01c7, 0x01d1, 0x01d5, 0x02b9, 0x01d7,
+    0x003b, 0x01d9, 0x01db, 0x00b7, 0x01e1, 0x01fc, 0x020c, 0x0218,
+    0x021d, 0x0223, 0x0227, 0x03a3, 0x0233, 0x023f, 0x0242, 0x024b,
+    0x024e, 0x0251, 0x025d, 0x0260, 0x0269, 0x026c, 0x026f, 0x0275,
+    0x0278, 0x0281, 0x028a, 0x029c, 0x029f, 0x02a3, 0x02af, 0x02b9,
+    0x02c5, 0x02c9, 0x02cd, 0x02d1, 0x02d5, 0x02e7, 0x02ed, 0x02f1,
+    0x02f5, 0x02f9, 0x02fd, 0x0305, 0x0309, 0x030d, 0x0313, 0x0317,
+    0x031b, 0x0323, 0x0327, 0x032b, 0x032f, 0x0335, 0x033d, 0x0341,
+    0x0349, 0x034d, 0x0351, 0x0f0b, 0x0357, 0x035b, 0x035f, 0x0363,
+    0x0367, 0x036b, 0x036f, 0x0373, 0x0379, 0x037d, 0x0381, 0x0385,
+    0x0389, 0x038d, 0x0391, 0x0395, 0x0399, 0x039d, 0x03a1, 0x10dc,
+    0x03a5, 0x03c9, 0x03cd, 0x03d9, 0x03dd, 0x03e1, 0x03ef, 0x03f1,
+    0x043d, 0x044f, 0x0499, 0x04f0, 0x0502, 0x054a, 0x0564, 0x056c,
+    0x0570, 0x0573, 0x059a, 0x05fa, 0x05fe, 0x0607, 0x060b, 0x0614,
+    0x0618, 0x061e, 0x0622, 0x0628, 0x068e, 0x0694, 0x0698, 0x069e,
+    0x06a2, 0x06ab, 0x03ac, 0x06f3, 0x03ad, 0x06f6, 0x03ae, 0x06f9,
+    0x03af, 0x06fc, 0x03cc, 0x06ff, 0x03cd, 0x0702, 0x03ce, 0x0705,
+    0x0709, 0x070d, 0x0711, 0x0386, 0x0732, 0x0735, 0x03b9, 0x0737,
+    0x073b, 0x0388, 0x0753, 0x0389, 0x0756, 0x0390, 0x076b, 0x038a,
+    0x0777, 0x03b0, 0x0789, 0x038e, 0x0799, 0x079f, 0x07a3, 0x038c,
+    0x07b8, 0x038f, 0x07bb, 0x00b4, 0x07be, 0x07c0, 0x07c2, 0x2010,
+    0x07cb, 0x002e, 0x07cd, 0x07cf, 0x0020, 0x07d2, 0x07d6, 0x07db,
+    0x07df, 0x07e4, 0x07ea, 0x07f0, 0x0020, 0x07f6, 0x2212, 0x0801,
+    0x0805, 0x0807, 0x081d, 0x0825, 0x0827, 0x0043, 0x082d, 0x0830,
+    0x0190, 0x0836, 0x0839, 0x004e, 0x0845, 0x0847, 0x084c, 0x084e,
+    0x0851, 0x005a, 0x03a9, 0x005a, 0x0853, 0x0857, 0x0860, 0x0069,
+    0x0862, 0x0865, 0x086f, 0x0874, 0x087a, 0x087e, 0x08a2, 0x0049,
+    0x08a4, 0x08a6, 0x08a9, 0x0056, 0x08ab, 0x08ad, 0x08b0, 0x08b4,
+    0x0058, 0x08b6, 0x08b8, 0x08bb, 0x08c0, 0x08c2, 0x08c5, 0x0076,
+    0x08c7, 0x08c9, 0x08cc, 0x08d0, 0x0078, 0x08d2, 0x08d4, 0x08d7,
+    0x08db, 0x08de, 0x08e4, 0x08e7, 0x08f0, 0x08f3, 0x08f6, 0x08f9,
+    0x0902, 0x0906, 0x090b, 0x090f, 0x0914, 0x0917, 0x091a, 0x0923,
+    0x092c, 0x093b, 0x093e, 0x0941, 0x0944, 0x0947, 0x094a, 0x0956,
+    0x095c, 0x0960, 0x0962, 0x0964, 0x0968, 0x096a, 0x0970, 0x0978,
+    0x097c, 0x0980, 0x0986, 0x0989, 0x098f, 0x0991, 0x0030, 0x0993,
+    0x0999, 0x099c, 0x099e, 0x09a1, 0x09a4, 0x2d61, 0x6bcd, 0x9f9f,
+    0x09a6, 0x09b1, 0x09bc, 0x09c7, 0x0a95, 0x0aa1, 0x0b15, 0x0020,
+    0x0b27, 0x0b31, 0x0b8d, 0x0ba1, 0x0ba5, 0x0ba9, 0x0bad, 0x0bb1,
+    0x0bb5, 0x0bb9, 0x0bbd, 0x0bc1, 0x0bc5, 0x0c21, 0x0c35, 0x0c39,
+    0x0c3d, 0x0c41, 0x0c45, 0x0c49, 0x0c4d, 0x0c51, 0x0c55, 0x0c59,
+    0x0c6f, 0x0c71, 0x0c73, 0x0ca0, 0x0cbc, 0x0cdc, 0x0ce4, 0x0cec,
+    0x0cf4, 0x0cfc, 0x0d04, 0x0d0c, 0x0d14, 0x0d22, 0x0d2e, 0x0d7a,
+    0x0d82, 0x0d85, 0x0d89, 0x0d8d, 0x0d9d, 0x0db1, 0x0db5, 0x0dbc,
+    0x0dc2, 0x0dc6, 0x0e28, 0x0e2c, 0x0e30, 0x0e32, 0x0e36, 0x0e3c,
+    0x0e3e, 0x0e41, 0x0e43, 0x0e46, 0x0e77, 0x0e7b, 0x0e89, 0x0e8e,
+    0x0e94, 0x0e9c, 0x0ea3, 0x0ea9, 0x0eb4, 0x0ebe, 0x0ec6, 0x0eca,
+    0x0ecf, 0x0ed9, 0x0edd, 0x0ee4, 0x0eec, 0x0ef3, 0x0ef8, 0x0f04,
+    0x0f0a, 0x0f15, 0x0f1b, 0x0f22, 0x0f28, 0x0f33, 0x0f3d, 0x0f45,
+    0x0f4c, 0x0f51, 0x0f57, 0x0f5e, 0x0f63, 0x0f69, 0x0f70, 0x0f76,
+    0x0f7d, 0x0f82, 0x0f89, 0x0f8d, 0x0f9e, 0x0fa4, 0x0fa9, 0x0fad,
+    0x0fb8, 0x0fbe, 0x0fc9, 0x0fd0, 0x0fd6, 0x0fda, 0x0fe1, 0x0fe5,
+    0x0fef, 0x0ffa, 0x1000, 0x1004, 0x1009, 0x100f, 0x1013, 0x101a,
+    0x101f, 0x1023, 0x1029, 0x102f, 0x1032, 0x1036, 0x1039, 0x103f,
+    0x1045, 0x1059, 0x1061, 0x1079, 0x107c, 0x1080, 0x1095, 0x10a1,
+    0x10b1, 0x10c3, 0x10cb, 0x10cf, 0x10da, 0x10de, 0x10ea, 0x10f2,
+    0x10f4, 0x1100, 0x1105, 0x1111, 0x1141, 0x1149, 0x114d, 0x1153,
+    0x1157, 0x115a, 0x116e, 0x1171, 0x1175, 0x117b, 0x117d, 0x1181,
+    0x1184, 0x118c, 0x1192, 0x1196, 0x119c, 0x11a2, 0x11a8, 0x11ab,
+    0xa76f, 0x11af, 0x11b2, 0x11b6, 0x028d, 0x11be, 0x1210, 0x130e,
+    0x140c, 0x1490, 0x1495, 0x1553, 0x156c, 0x1572, 0x1578, 0x157e,
+    0x158a, 0x1596, 0x002b, 0x15a1, 0x15b9, 0x15bd, 0x15c1, 0x15c5,
+    0x15c9, 0x15cd, 0x15e1, 0x15e5, 0x1649, 0x1662, 0x1688, 0x168e,
+    0x174c, 0x1752, 0x1757, 0x1777, 0x1877, 0x187d, 0x1911, 0x19d3,
+    0x1a77, 0x1a7f, 0x1a9d, 0x1aa2, 0x1ab6, 0x1ac0, 0x1ac6, 0x1ada,
+    0x1adf, 0x1ae5, 0x1af3, 0x1b23, 0x1b30, 0x1b38, 0x1b3c, 0x1b52,
+    0x1bc9, 0x1bdb, 0x1bdd, 0x1bdf, 0x3164, 0x1c20, 0x1c22, 0x1c24,
+    0x1c26, 0x1c28, 0x1c2a, 0x1c48, 0x1c7e, 0x1cc4, 0x1cd2, 0x1cd7,
+    0x1ce0, 0x1ce9, 0x1cfb, 0x1d04, 0x1d09, 0x1d29, 0x1d44, 0x1d46,
+    0x1d48, 0x1d4a, 0x1d4c, 0x1d4e, 0x1d50, 0x1d52, 0x1d72, 0x1d74,
+    0x1d76, 0x1d78, 0x1d7a, 0x1d81, 0x1d83, 0x1d85, 0x1d87, 0x1d96,
+    0x1d98, 0x1d9a, 0x1d9c, 0x1d9e, 0x1da0, 0x1da2, 0x1da4, 0x1da6,
+    0x1da8, 0x1daa, 0x1dac, 0x1dae, 0x1db0, 0x1db2, 0x1db6, 0x03f4,
+    0x1db8, 0x2207, 0x1dba, 0x2202, 0x1dbc, 0x1dc4, 0x03f4, 0x1dc6,
+    0x2207, 0x1dc8, 0x2202, 0x1dca, 0x1dd2, 0x03f4, 0x1dd4, 0x2207,
+    0x1dd6, 0x2202, 0x1dd8, 0x1de0, 0x03f4, 0x1de2, 0x2207, 0x1de4,
+    0x2202, 0x1de6, 0x1dee, 0x03f4, 0x1df0, 0x2207, 0x1df2, 0x2202,
+    0x1df4, 0x1dfe, 0x1e00, 0x1e02, 0x1e04, 0x1e06, 0x1e08, 0x1e0a,
+    0x1e0c, 0x1e0e, 0x1e16, 0x1e39, 0x1e3d, 0x1e43, 0x1e60, 0x062d,
+    0x1e68, 0x1e74, 0x062c, 0x1e84, 0x1ef4, 0x1f00, 0x1f13, 0x1f25,
+    0x1f38, 0x1f3a, 0x1f3e, 0x1f44, 0x1f4a, 0x1f4c, 0x1f50, 0x1f52,
+    0x1f5a, 0x1f5d, 0x1f5f, 0x1f65, 0x1f67, 0x30b5, 0x1f6d, 0x1fc5,
+    0x1fdb, 0x1fdf, 0x1fe1, 0x1fe6, 0x2033, 0x2044, 0x2145, 0x2155,
+    0x215b, 0x2255, 0x2373,
+};
+
+static const uint8_t unicode_decomp_data[9345] = {
+    0x20, 0x88, 0x20, 0x84, 0x32, 0x33, 0x20, 0x81,
+    0x20, 0xa7, 0x31, 0x6f, 0x31, 0xd0, 0x34, 0x31,
+    0xd0, 0x32, 0x33, 0xd0, 0x34, 0x41, 0x80, 0x41,
+    0x81, 0x41, 0x82, 0x41, 0x83, 0x41, 0x88, 0x41,
+    0x8a, 0x00, 0x00, 0x43, 0xa7, 0x45, 0x80, 0x45,
+    0x81, 0x45, 0x82, 0x45, 0x88, 0x49, 0x80, 0x49,
+    0x81, 0x49, 0x82, 0x49, 0x88, 0x00, 0x00, 0x4e,
+    0x83, 0x4f, 0x80, 0x4f, 0x81, 0x4f, 0x82, 0x4f,
+    0x83, 0x4f, 0x88, 0x00, 0x00, 0x00, 0x00, 0x55,
+    0x80, 0x55, 0x81, 0x55, 0x82, 0x55, 0x88, 0x59,
+    0x81, 0x00, 0x00, 0x00, 0x00, 0x61, 0x80, 0x61,
+    0x81, 0x61, 0x82, 0x61, 0x83, 0x61, 0x88, 0x61,
+    0x8a, 0x00, 0x00, 0x63, 0xa7, 0x65, 0x80, 0x65,
+    0x81, 0x65, 0x82, 0x65, 0x88, 0x69, 0x80, 0x69,
+    0x81, 0x69, 0x82, 0x69, 0x88, 0x00, 0x00, 0x6e,
+    0x83, 0x6f, 0x80, 0x6f, 0x81, 0x6f, 0x82, 0x6f,
+    0x83, 0x6f, 0x88, 0x00, 0x00, 0x00, 0x00, 0x75,
+    0x80, 0x75, 0x81, 0x75, 0x82, 0x75, 0x88, 0x79,
+    0x81, 0x00, 0x00, 0x79, 0x88, 0x41, 0x84, 0x41,
+    0x86, 0x41, 0xa8, 0x43, 0x81, 0x43, 0x82, 0x43,
+    0x87, 0x43, 0x8c, 0x44, 0x8c, 0x45, 0x84, 0x45,
+    0x86, 0x45, 0x87, 0x45, 0xa8, 0x45, 0x8c, 0x47,
+    0x82, 0x47, 0x86, 0x47, 0x87, 0x47, 0xa7, 0x48,
+    0x82, 0x49, 0x83, 0x49, 0x84, 0x49, 0x86, 0x49,
+    0xa8, 0x49, 0x87, 0x49, 0x4a, 0x69, 0x6a, 0x4a,
+    0x82, 0x4b, 0xa7, 0x4c, 0x81, 0x4c, 0xa7, 0x4c,
+    0x8c, 0x4c, 0x00, 0x00, 0x6b, 0x20, 0x6b, 0x4e,
+    0x81, 0x4e, 0xa7, 0x4e, 0x8c, 0xbc, 0x02, 0x6e,
+    0x4f, 0x84, 0x4f, 0x86, 0x4f, 0x8b, 0x52, 0x81,
+    0x52, 0xa7, 0x52, 0x8c, 0x53, 0x81, 0x53, 0x82,
+    0x53, 0xa7, 0x53, 0x8c, 0x54, 0xa7, 0x54, 0x8c,
+    0x55, 0x83, 0x55, 0x84, 0x55, 0x86, 0x55, 0x8a,
+    0x55, 0x8b, 0x55, 0xa8, 0x57, 0x82, 0x59, 0x82,
+    0x59, 0x88, 0x5a, 0x81, 0x5a, 0x87, 0x5a, 0x8c,
+    0x4f, 0x9b, 0x55, 0x9b, 0x44, 0x00, 0x7d, 0x01,
+    0x44, 0x00, 0x7e, 0x01, 0x64, 0x00, 0x7e, 0x01,
+    0x4c, 0x4a, 0x4c, 0x6a, 0x6c, 0x6a, 0x4e, 0x4a,
+    0x4e, 0x6a, 0x6e, 0x6a, 0x41, 0x00, 0x8c, 0x49,
+    0x00, 0x8c, 0x4f, 0x00, 0x8c, 0x55, 0x00, 0x8c,
+    0xdc, 0x00, 0x84, 0xdc, 0x00, 0x81, 0xdc, 0x00,
+    0x8c, 0xdc, 0x00, 0x80, 0xc4, 0x00, 0x84, 0x26,
+    0x02, 0x84, 0xc6, 0x00, 0x84, 0x47, 0x8c, 0x4b,
+    0x8c, 0x4f, 0xa8, 0xea, 0x01, 0x84, 0xeb, 0x01,
+    0x84, 0xb7, 0x01, 0x8c, 0x92, 0x02, 0x8c, 0x6a,
+    0x00, 0x8c, 0x44, 0x5a, 0x44, 0x7a, 0x64, 0x7a,
+    0x47, 0x81, 0x4e, 0x00, 0x80, 0xc5, 0x00, 0x81,
+    0xc6, 0x00, 0x81, 0xd8, 0x00, 0x81, 0x41, 0x8f,
+    0x41, 0x91, 0x45, 0x8f, 0x45, 0x91, 0x49, 0x8f,
+    0x49, 0x91, 0x4f, 0x8f, 0x4f, 0x91, 0x52, 0x8f,
+    0x52, 0x91, 0x55, 0x8f, 0x55, 0x91, 0x53, 0xa6,
+    0x54, 0xa6, 0x48, 0x8c, 0x41, 0x00, 0x87, 0x45,
+    0x00, 0xa7, 0xd6, 0x00, 0x84, 0xd5, 0x00, 0x84,
+    0x4f, 0x00, 0x87, 0x2e, 0x02, 0x84, 0x59, 0x00,
+    0x84, 0x68, 0x00, 0x66, 0x02, 0x6a, 0x00, 0x72,
+    0x00, 0x79, 0x02, 0x7b, 0x02, 0x81, 0x02, 0x77,
+    0x00, 0x79, 0x00, 0x20, 0x86, 0x20, 0x87, 0x20,
+    0x8a, 0x20, 0xa8, 0x20, 0x83, 0x20, 0x8b, 0x63,
+    0x02, 0x6c, 0x00, 0x73, 0x00, 0x78, 0x00, 0x95,
+    0x02, 0x80, 0x81, 0x00, 0x93, 0x88, 0x81, 0x20,
+    0xc5, 0x20, 0x81, 0xa8, 0x00, 0x81, 0x91, 0x03,
+    0x81, 0x95, 0x03, 0x81, 0x97, 0x03, 0x81, 0x99,
+    0x03, 0x81, 0x00, 0x00, 0x00, 0x9f, 0x03, 0x81,
+    0x00, 0x00, 0x00, 0xa5, 0x03, 0x81, 0xa9, 0x03,
+    0x81, 0xca, 0x03, 0x81, 0x01, 0x03, 0x98, 0x07,
+    0xa4, 0x07, 0xb0, 0x00, 0xb4, 0x00, 0xb6, 0x00,
+    0xb8, 0x00, 0xca, 0x00, 0x01, 0x03, 0xb8, 0x07,
+    0xc4, 0x07, 0xbe, 0x00, 0xc4, 0x00, 0xc8, 0x00,
+    0xa5, 0x03, 0x0d, 0x13, 0x00, 0x01, 0x03, 0xd1,
+    0x00, 0xd1, 0x07, 0xc6, 0x03, 0xc0, 0x03, 0xba,
+    0x03, 0xc1, 0x03, 0xc2, 0x03, 0x00, 0x00, 0x98,
+    0x03, 0xb5, 0x03, 0x15, 0x04, 0x80, 0x15, 0x04,
+    0x88, 0x00, 0x00, 0x00, 0x13, 0x04, 0x81, 0x06,
+    0x04, 0x88, 0x1a, 0x04, 0x81, 0x18, 0x04, 0x80,
+    0x23, 0x04, 0x86, 0x18, 0x04, 0x86, 0x38, 0x04,
+    0x86, 0x35, 0x04, 0x80, 0x35, 0x04, 0x88, 0x00,
+    0x00, 0x00, 0x33, 0x04, 0x81, 0x56, 0x04, 0x88,
+    0x3a, 0x04, 0x81, 0x38, 0x04, 0x80, 0x43, 0x04,
+    0x86, 0x74, 0x04, 0x8f, 0x16, 0x04, 0x86, 0x10,
+    0x04, 0x86, 0x10, 0x04, 0x88, 0x15, 0x04, 0x86,
+    0xd8, 0x04, 0x88, 0x16, 0x04, 0x88, 0x17, 0x04,
+    0x88, 0x18, 0x04, 0x84, 0x18, 0x04, 0x88, 0x1e,
+    0x04, 0x88, 0xe8, 0x04, 0x88, 0x2d, 0x04, 0x88,
+    0x23, 0x04, 0x84, 0x23, 0x04, 0x88, 0x23, 0x04,
+    0x8b, 0x27, 0x04, 0x88, 0x2b, 0x04, 0x88, 0x65,
+    0x05, 0x82, 0x05, 0x27, 0x06, 0x00, 0x2c, 0x00,
+    0x2d, 0x21, 0x2d, 0x00, 0x2e, 0x23, 0x2d, 0x27,
+    0x06, 0x00, 0x4d, 0x21, 0x4d, 0xa0, 0x4d, 0x23,
+    0x4d, 0xd5, 0x06, 0x54, 0x06, 0x00, 0x00, 0x00,
+    0x00, 0xc1, 0x06, 0x54, 0x06, 0xd2, 0x06, 0x54,
+    0x06, 0x28, 0x09, 0x3c, 0x09, 0x30, 0x09, 0x3c,
+    0x09, 0x33, 0x09, 0x3c, 0x09, 0x15, 0x09, 0x00,
+    0x27, 0x01, 0x27, 0x02, 0x27, 0x07, 0x27, 0x0c,
+    0x27, 0x0d, 0x27, 0x16, 0x27, 0x1a, 0x27, 0xbe,
+    0x09, 0x09, 0x00, 0x09, 0x19, 0xa1, 0x09, 0xbc,
+    0x09, 0xaf, 0x09, 0xbc, 0x09, 0x32, 0x0a, 0x3c,
+    0x0a, 0x38, 0x0a, 0x3c, 0x0a, 0x16, 0x0a, 0x00,
+    0x26, 0x01, 0x26, 0x06, 0x26, 0x2b, 0x0a, 0x3c,
+    0x0a, 0x47, 0x0b, 0x56, 0x0b, 0x3e, 0x0b, 0x09,
+    0x00, 0x09, 0x19, 0x21, 0x0b, 0x3c, 0x0b, 0x92,
+    0x0b, 0xd7, 0x0b, 0xbe, 0x0b, 0x08, 0x00, 0x09,
+    0x00, 0x08, 0x19, 0x46, 0x0c, 0x56, 0x0c, 0xbf,
+    0x0c, 0xd5, 0x0c, 0xc6, 0x0c, 0xd5, 0x0c, 0xc2,
+    0x0c, 0x04, 0x00, 0x08, 0x13, 0x3e, 0x0d, 0x08,
+    0x00, 0x09, 0x00, 0x08, 0x19, 0xd9, 0x0d, 0xca,
+    0x0d, 0xca, 0x0d, 0x0f, 0x05, 0x12, 0x00, 0x0f,
+    0x15, 0x4d, 0x0e, 0x32, 0x0e, 0xcd, 0x0e, 0xb2,
+    0x0e, 0x99, 0x0e, 0x12, 0x00, 0x12, 0x08, 0x42,
+    0x0f, 0xb7, 0x0f, 0x4c, 0x0f, 0xb7, 0x0f, 0x51,
+    0x0f, 0xb7, 0x0f, 0x56, 0x0f, 0xb7, 0x0f, 0x5b,
+    0x0f, 0xb7, 0x0f, 0x40, 0x0f, 0xb5, 0x0f, 0x71,
+    0x0f, 0x72, 0x0f, 0x71, 0x0f, 0x00, 0x03, 0x41,
+    0x0f, 0xb2, 0x0f, 0x81, 0x0f, 0xb3, 0x0f, 0x80,
+    0x0f, 0xb3, 0x0f, 0x81, 0x0f, 0x71, 0x0f, 0x80,
+    0x0f, 0x92, 0x0f, 0xb7, 0x0f, 0x9c, 0x0f, 0xb7,
+    0x0f, 0xa1, 0x0f, 0xb7, 0x0f, 0xa6, 0x0f, 0xb7,
+    0x0f, 0xab, 0x0f, 0xb7, 0x0f, 0x90, 0x0f, 0xb5,
+    0x0f, 0x25, 0x10, 0x2e, 0x10, 0x05, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x09, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x1b, 0x35,
+    0x1b, 0x11, 0x1b, 0x35, 0x1b, 0x3a, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x1b, 0x35,
+    0x1b, 0x3e, 0x1b, 0x35, 0x1b, 0x42, 0x1b, 0x35,
+    0x1b, 0x41, 0x00, 0xc6, 0x00, 0x42, 0x00, 0x00,
+    0x00, 0x44, 0x00, 0x45, 0x00, 0x8e, 0x01, 0x47,
+    0x00, 0x4f, 0x00, 0x22, 0x02, 0x50, 0x00, 0x52,
+    0x00, 0x54, 0x00, 0x55, 0x00, 0x57, 0x00, 0x61,
+    0x00, 0x50, 0x02, 0x51, 0x02, 0x02, 0x1d, 0x62,
+    0x00, 0x64, 0x00, 0x65, 0x00, 0x59, 0x02, 0x5b,
+    0x02, 0x5c, 0x02, 0x67, 0x00, 0x00, 0x00, 0x6b,
+    0x00, 0x6d, 0x00, 0x4b, 0x01, 0x6f, 0x00, 0x54,
+    0x02, 0x16, 0x1d, 0x17, 0x1d, 0x70, 0x00, 0x74,
+    0x00, 0x75, 0x00, 0x1d, 0x1d, 0x6f, 0x02, 0x76,
+    0x00, 0x25, 0x1d, 0xb2, 0x03, 0xb3, 0x03, 0xb4,
+    0x03, 0xc6, 0x03, 0xc7, 0x03, 0x69, 0x00, 0x72,
+    0x00, 0x75, 0x00, 0x76, 0x00, 0xb2, 0x03, 0xb3,
+    0x03, 0xc1, 0x03, 0xc6, 0x03, 0xc7, 0x03, 0x52,
+    0x02, 0x63, 0x00, 0x55, 0x02, 0xf0, 0x00, 0x5c,
+    0x02, 0x66, 0x00, 0x5f, 0x02, 0x61, 0x02, 0x65,
+    0x02, 0x68, 0x02, 0x69, 0x02, 0x6a, 0x02, 0x7b,
+    0x1d, 0x9d, 0x02, 0x6d, 0x02, 0x85, 0x1d, 0x9f,
+    0x02, 0x71, 0x02, 0x70, 0x02, 0x72, 0x02, 0x73,
+    0x02, 0x74, 0x02, 0x75, 0x02, 0x78, 0x02, 0x82,
+    0x02, 0x83, 0x02, 0xab, 0x01, 0x89, 0x02, 0x8a,
+    0x02, 0x1c, 0x1d, 0x8b, 0x02, 0x8c, 0x02, 0x7a,
+    0x00, 0x90, 0x02, 0x91, 0x02, 0x92, 0x02, 0xb8,
+    0x03, 0x41, 0x00, 0xa5, 0x42, 0x00, 0x87, 0x42,
+    0x00, 0xa3, 0x42, 0x00, 0xb1, 0xc7, 0x00, 0x81,
+    0x44, 0x00, 0x87, 0x44, 0x00, 0xa3, 0x44, 0x00,
+    0xb1, 0x44, 0x00, 0xa7, 0x44, 0x00, 0xad, 0x12,
+    0x01, 0x80, 0x12, 0x01, 0x81, 0x45, 0x00, 0xad,
+    0x45, 0x00, 0xb0, 0x28, 0x02, 0x86, 0x46, 0x00,
+    0x87, 0x47, 0x00, 0x84, 0x48, 0x00, 0x87, 0x48,
+    0x00, 0xa3, 0x48, 0x00, 0x88, 0x48, 0x00, 0xa7,
+    0x48, 0x00, 0xae, 0x49, 0x00, 0xb0, 0xcf, 0x00,
+    0x81, 0x4b, 0x00, 0x81, 0x4b, 0x00, 0xa3, 0x4b,
+    0x00, 0xb1, 0x4c, 0x00, 0xa3, 0x36, 0x1e, 0x84,
+    0x4c, 0xb1, 0x4c, 0xad, 0x4d, 0x81, 0x4d, 0x87,
+    0x4d, 0xa3, 0x4e, 0x87, 0x4e, 0xa3, 0x4e, 0xb1,
+    0x4e, 0xad, 0xd5, 0x00, 0x81, 0xd5, 0x00, 0x88,
+    0x4c, 0x01, 0x80, 0x4c, 0x01, 0x81, 0x50, 0x00,
+    0x81, 0x50, 0x00, 0x87, 0x52, 0x00, 0x87, 0x52,
+    0x00, 0xa3, 0x5a, 0x1e, 0x84, 0x52, 0x00, 0xb1,
+    0x53, 0x00, 0x87, 0x53, 0x00, 0xa3, 0x5a, 0x01,
+    0x87, 0x60, 0x01, 0x87, 0x62, 0x1e, 0x87, 0x54,
+    0x00, 0x87, 0x54, 0x00, 0xa3, 0x54, 0x00, 0xb1,
+    0x54, 0x00, 0xad, 0x55, 0x00, 0xa4, 0x55, 0x00,
+    0xb0, 0x55, 0x00, 0xad, 0x68, 0x01, 0x81, 0x6a,
+    0x01, 0x88, 0x56, 0x83, 0x56, 0xa3, 0x57, 0x80,
+    0x57, 0x81, 0x57, 0x88, 0x57, 0x87, 0x57, 0xa3,
+    0x58, 0x87, 0x58, 0x88, 0x59, 0x87, 0x5a, 0x82,
+    0x5a, 0xa3, 0x5a, 0xb1, 0x68, 0xb1, 0x74, 0x88,
+    0x77, 0x8a, 0x79, 0x8a, 0x61, 0x00, 0xbe, 0x02,
+    0x7f, 0x01, 0x87, 0x41, 0x00, 0xa3, 0x41, 0x00,
+    0x89, 0xc2, 0x00, 0x81, 0xc2, 0x00, 0x80, 0xc2,
+    0x00, 0x89, 0xc2, 0x00, 0x83, 0xa0, 0x1e, 0x82,
+    0x02, 0x01, 0x81, 0x02, 0x01, 0x80, 0x02, 0x01,
+    0x89, 0x02, 0x01, 0x83, 0xa0, 0x1e, 0x86, 0x45,
+    0x00, 0xa3, 0x45, 0x00, 0x89, 0x45, 0x00, 0x83,
+    0xca, 0x00, 0x81, 0xca, 0x00, 0x80, 0xca, 0x00,
+    0x89, 0xca, 0x00, 0x83, 0xb8, 0x1e, 0x82, 0x49,
+    0x00, 0x89, 0x49, 0x00, 0xa3, 0x4f, 0x00, 0xa3,
+    0x4f, 0x00, 0x89, 0xd4, 0x00, 0x81, 0xd4, 0x00,
+    0x80, 0xd4, 0x00, 0x89, 0xd4, 0x00, 0x83, 0xcc,
+    0x1e, 0x82, 0xa0, 0x01, 0x81, 0xa0, 0x01, 0x80,
+    0xa0, 0x01, 0x89, 0xa0, 0x01, 0x83, 0xa0, 0x01,
+    0xa3, 0x55, 0x00, 0xa3, 0x55, 0x00, 0x89, 0xaf,
+    0x01, 0x81, 0xaf, 0x01, 0x80, 0xaf, 0x01, 0x89,
+    0xaf, 0x01, 0x83, 0xaf, 0x01, 0xa3, 0x59, 0x00,
+    0x80, 0x59, 0x00, 0xa3, 0x59, 0x00, 0x89, 0x59,
+    0x00, 0x83, 0xb1, 0x03, 0x13, 0x03, 0x00, 0x1f,
+    0x80, 0x00, 0x1f, 0x81, 0x00, 0x1f, 0xc2, 0x91,
+    0x03, 0x13, 0x03, 0x08, 0x1f, 0x80, 0x08, 0x1f,
+    0x81, 0x08, 0x1f, 0xc2, 0xb5, 0x03, 0x13, 0x03,
+    0x10, 0x1f, 0x80, 0x10, 0x1f, 0x81, 0x95, 0x03,
+    0x13, 0x03, 0x18, 0x1f, 0x80, 0x18, 0x1f, 0x81,
+    0xb7, 0x03, 0x93, 0xb7, 0x03, 0x94, 0x20, 0x1f,
+    0x80, 0x21, 0x1f, 0x80, 0x20, 0x1f, 0x81, 0x21,
+    0x1f, 0x81, 0x20, 0x1f, 0xc2, 0x21, 0x1f, 0xc2,
+    0x97, 0x03, 0x93, 0x97, 0x03, 0x94, 0x28, 0x1f,
+    0x80, 0x29, 0x1f, 0x80, 0x28, 0x1f, 0x81, 0x29,
+    0x1f, 0x81, 0x28, 0x1f, 0xc2, 0x29, 0x1f, 0xc2,
+    0xb9, 0x03, 0x93, 0xb9, 0x03, 0x94, 0x30, 0x1f,
+    0x80, 0x31, 0x1f, 0x80, 0x30, 0x1f, 0x81, 0x31,
+    0x1f, 0x81, 0x30, 0x1f, 0xc2, 0x31, 0x1f, 0xc2,
+    0x99, 0x03, 0x93, 0x99, 0x03, 0x94, 0x38, 0x1f,
+    0x80, 0x39, 0x1f, 0x80, 0x38, 0x1f, 0x81, 0x39,
+    0x1f, 0x81, 0x38, 0x1f, 0xc2, 0x39, 0x1f, 0xc2,
+    0xbf, 0x03, 0x93, 0xbf, 0x03, 0x94, 0x40, 0x1f,
+    0x80, 0x40, 0x1f, 0x81, 0x9f, 0x03, 0x13, 0x03,
+    0x48, 0x1f, 0x80, 0x48, 0x1f, 0x81, 0xc5, 0x03,
+    0x13, 0x03, 0x50, 0x1f, 0x80, 0x50, 0x1f, 0x81,
+    0x50, 0x1f, 0xc2, 0xa5, 0x03, 0x94, 0x00, 0x00,
+    0x00, 0x59, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x59,
+    0x1f, 0x81, 0x00, 0x00, 0x00, 0x59, 0x1f, 0xc2,
+    0xc9, 0x03, 0x93, 0xc9, 0x03, 0x94, 0x60, 0x1f,
+    0x80, 0x61, 0x1f, 0x80, 0x60, 0x1f, 0x81, 0x61,
+    0x1f, 0x81, 0x60, 0x1f, 0xc2, 0x61, 0x1f, 0xc2,
+    0xa9, 0x03, 0x93, 0xa9, 0x03, 0x94, 0x68, 0x1f,
+    0x80, 0x69, 0x1f, 0x80, 0x68, 0x1f, 0x81, 0x69,
+    0x1f, 0x81, 0x68, 0x1f, 0xc2, 0x69, 0x1f, 0xc2,
+    0xb1, 0x03, 0x80, 0xb5, 0x03, 0x80, 0xb7, 0x03,
+    0x80, 0xb9, 0x03, 0x80, 0xbf, 0x03, 0x80, 0xc5,
+    0x03, 0x80, 0xc9, 0x03, 0x80, 0x00, 0x1f, 0x45,
+    0x03, 0x20, 0x1f, 0x45, 0x03, 0x60, 0x1f, 0x45,
+    0x03, 0xb1, 0x03, 0x86, 0xb1, 0x03, 0x84, 0x70,
+    0x1f, 0xc5, 0xb1, 0x03, 0xc5, 0xac, 0x03, 0xc5,
+    0x00, 0x00, 0x00, 0xb1, 0x03, 0xc2, 0xb6, 0x1f,
+    0xc5, 0x91, 0x03, 0x86, 0x91, 0x03, 0x84, 0x91,
+    0x03, 0x80, 0x91, 0x03, 0xc5, 0x20, 0x93, 0x20,
+    0x93, 0x20, 0xc2, 0xa8, 0x00, 0xc2, 0x74, 0x1f,
+    0xc5, 0xb7, 0x03, 0xc5, 0xae, 0x03, 0xc5, 0x00,
+    0x00, 0x00, 0xb7, 0x03, 0xc2, 0xc6, 0x1f, 0xc5,
+    0x95, 0x03, 0x80, 0x97, 0x03, 0x80, 0x97, 0x03,
+    0xc5, 0xbf, 0x1f, 0x80, 0xbf, 0x1f, 0x81, 0xbf,
+    0x1f, 0xc2, 0xb9, 0x03, 0x86, 0xb9, 0x03, 0x84,
+    0xca, 0x03, 0x80, 0x00, 0x03, 0xb9, 0x42, 0xca,
+    0x42, 0x99, 0x06, 0x99, 0x04, 0x99, 0x00, 0xfe,
+    0x1f, 0x80, 0xfe, 0x1f, 0x81, 0xfe, 0x1f, 0xc2,
+    0xc5, 0x03, 0x86, 0xc5, 0x03, 0x84, 0xcb, 0x03,
+    0x80, 0x00, 0x03, 0xc1, 0x13, 0xc1, 0x14, 0xc5,
+    0x42, 0xcb, 0x42, 0xa5, 0x06, 0xa5, 0x04, 0xa5,
+    0x00, 0xa1, 0x03, 0x94, 0xa8, 0x00, 0x80, 0x85,
+    0x03, 0x60, 0x00, 0x7c, 0x1f, 0xc5, 0xc9, 0x03,
+    0xc5, 0xce, 0x03, 0xc5, 0x00, 0x00, 0x00, 0xc9,
+    0x03, 0xc2, 0xf6, 0x1f, 0xc5, 0x9f, 0x03, 0x80,
+    0xa9, 0x03, 0x80, 0xa9, 0x03, 0xc5, 0x20, 0x94,
+    0x02, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+    0x20, 0x20, 0x20, 0x20, 0xb3, 0x2e, 0x2e, 0x2e,
+    0x2e, 0x2e, 0x32, 0x20, 0x32, 0x20, 0x32, 0x20,
+    0x00, 0x00, 0x00, 0x35, 0x20, 0x35, 0x20, 0x35,
+    0x20, 0x00, 0x00, 0x00, 0x21, 0x21, 0x00, 0x00,
+    0x20, 0x85, 0x3f, 0x3f, 0x3f, 0x21, 0x21, 0x3f,
+    0x32, 0x20, 0x00, 0x00, 0x00, 0x00, 0x30, 0x69,
+    0x00, 0x00, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+    0x2b, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x00, 0x2b,
+    0x00, 0x12, 0x22, 0x3d, 0x00, 0x28, 0x00, 0x29,
+    0x00, 0x00, 0x00, 0x61, 0x00, 0x65, 0x00, 0x6f,
+    0x00, 0x78, 0x00, 0x59, 0x02, 0x68, 0x6b, 0x6c,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x52, 0x73, 0x61,
+    0x2f, 0x63, 0x61, 0x2f, 0x73, 0xb0, 0x00, 0x43,
+    0x63, 0x2f, 0x6f, 0x63, 0x2f, 0x75, 0xb0, 0x00,
+    0x46, 0x48, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x20,
+    0xdf, 0x01, 0x01, 0x04, 0x24, 0x4e, 0x6f, 0x50,
+    0x51, 0x52, 0x52, 0x52, 0x53, 0x4d, 0x54, 0x45,
+    0x4c, 0x54, 0x4d, 0x4b, 0x00, 0xc5, 0x00, 0x42,
+    0x43, 0x00, 0x65, 0x45, 0x46, 0x00, 0x4d, 0x6f,
+    0xd0, 0x05, 0x46, 0x41, 0x58, 0xc0, 0x03, 0xb3,
+    0x03, 0x93, 0x03, 0xa0, 0x03, 0x11, 0x22, 0x44,
+    0x64, 0x65, 0x69, 0x6a, 0x31, 0xd0, 0x37, 0x31,
+    0xd0, 0x39, 0x31, 0xd0, 0x31, 0x30, 0x31, 0xd0,
+    0x33, 0x32, 0xd0, 0x33, 0x31, 0xd0, 0x35, 0x32,
+    0xd0, 0x35, 0x33, 0xd0, 0x35, 0x34, 0xd0, 0x35,
+    0x31, 0xd0, 0x36, 0x35, 0xd0, 0x36, 0x31, 0xd0,
+    0x38, 0x33, 0xd0, 0x38, 0x35, 0xd0, 0x38, 0x37,
+    0xd0, 0x38, 0x31, 0xd0, 0x49, 0x49, 0x49, 0x49,
+    0x49, 0x49, 0x56, 0x56, 0x49, 0x56, 0x49, 0x49,
+    0x56, 0x49, 0x49, 0x49, 0x49, 0x58, 0x58, 0x49,
+    0x58, 0x49, 0x49, 0x4c, 0x43, 0x44, 0x4d, 0x69,
+    0x69, 0x69, 0x69, 0x69, 0x69, 0x69, 0x76, 0x76,
+    0x69, 0x76, 0x69, 0x69, 0x76, 0x69, 0x69, 0x69,
+    0x69, 0x78, 0x78, 0x69, 0x78, 0x69, 0x69, 0x6c,
+    0x63, 0x64, 0x6d, 0x30, 0xd0, 0x33, 0x90, 0x21,
+    0xb8, 0x92, 0x21, 0xb8, 0x94, 0x21, 0xb8, 0xd0,
+    0x21, 0xb8, 0xd4, 0x21, 0xb8, 0xd2, 0x21, 0xb8,
+    0x03, 0x22, 0xb8, 0x08, 0x22, 0xb8, 0x0b, 0x22,
+    0xb8, 0x23, 0x22, 0xb8, 0x00, 0x00, 0x00, 0x25,
+    0x22, 0xb8, 0x2b, 0x22, 0x2b, 0x22, 0x2b, 0x22,
+    0x00, 0x00, 0x00, 0x2e, 0x22, 0x2e, 0x22, 0x2e,
+    0x22, 0x00, 0x00, 0x00, 0x3c, 0x22, 0xb8, 0x43,
+    0x22, 0xb8, 0x45, 0x22, 0xb8, 0x00, 0x00, 0x00,
+    0x48, 0x22, 0xb8, 0x3d, 0x00, 0xb8, 0x00, 0x00,
+    0x00, 0x61, 0x22, 0xb8, 0x4d, 0x22, 0xb8, 0x3c,
+    0x00, 0xb8, 0x3e, 0x00, 0xb8, 0x64, 0x22, 0xb8,
+    0x65, 0x22, 0xb8, 0x72, 0x22, 0xb8, 0x76, 0x22,
+    0xb8, 0x7a, 0x22, 0xb8, 0x82, 0x22, 0xb8, 0x86,
+    0x22, 0xb8, 0xa2, 0x22, 0xb8, 0xa8, 0x22, 0xb8,
+    0xa9, 0x22, 0xb8, 0xab, 0x22, 0xb8, 0x7c, 0x22,
+    0xb8, 0x91, 0x22, 0xb8, 0xb2, 0x22, 0x38, 0x03,
+    0x08, 0x30, 0x31, 0x00, 0x31, 0x00, 0x30, 0x00,
+    0x32, 0x30, 0x28, 0x00, 0x31, 0x00, 0x29, 0x00,
+    0x28, 0x00, 0x31, 0x00, 0x30, 0x00, 0x29, 0x00,
+    0x28, 0x32, 0x30, 0x29, 0x31, 0x00, 0x2e, 0x00,
+    0x31, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x32, 0x30,
+    0x2e, 0x28, 0x00, 0x61, 0x00, 0x29, 0x00, 0x41,
+    0x00, 0x61, 0x00, 0x2b, 0x22, 0x00, 0x00, 0x00,
+    0x00, 0x3a, 0x3a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
+    0x3d, 0xdd, 0x2a, 0xb8, 0x6a, 0x56, 0x00, 0x4e,
+    0x00, 0x28, 0x36, 0x3f, 0x59, 0x85, 0x8c, 0xa0,
+    0xba, 0x3f, 0x51, 0x00, 0x26, 0x2c, 0x43, 0x57,
+    0x6c, 0xa1, 0xb6, 0xc1, 0x9b, 0x52, 0x00, 0x5e,
+    0x7a, 0x7f, 0x9d, 0xa6, 0xc1, 0xce, 0xe7, 0xb6,
+    0x53, 0xc8, 0x53, 0xe3, 0x53, 0xd7, 0x56, 0x1f,
+    0x57, 0xeb, 0x58, 0x02, 0x59, 0x0a, 0x59, 0x15,
+    0x59, 0x27, 0x59, 0x73, 0x59, 0x50, 0x5b, 0x80,
+    0x5b, 0xf8, 0x5b, 0x0f, 0x5c, 0x22, 0x5c, 0x38,
+    0x5c, 0x6e, 0x5c, 0x71, 0x5c, 0xdb, 0x5d, 0xe5,
+    0x5d, 0xf1, 0x5d, 0xfe, 0x5d, 0x72, 0x5e, 0x7a,
+    0x5e, 0x7f, 0x5e, 0xf4, 0x5e, 0xfe, 0x5e, 0x0b,
+    0x5f, 0x13, 0x5f, 0x50, 0x5f, 0x61, 0x5f, 0x73,
+    0x5f, 0xc3, 0x5f, 0x08, 0x62, 0x36, 0x62, 0x4b,
+    0x62, 0x2f, 0x65, 0x34, 0x65, 0x87, 0x65, 0x97,
+    0x65, 0xa4, 0x65, 0xb9, 0x65, 0xe0, 0x65, 0xe5,
+    0x65, 0xf0, 0x66, 0x08, 0x67, 0x28, 0x67, 0x20,
+    0x6b, 0x62, 0x6b, 0x79, 0x6b, 0xb3, 0x6b, 0xcb,
+    0x6b, 0xd4, 0x6b, 0xdb, 0x6b, 0x0f, 0x6c, 0x14,
+    0x6c, 0x34, 0x6c, 0x6b, 0x70, 0x2a, 0x72, 0x36,
+    0x72, 0x3b, 0x72, 0x3f, 0x72, 0x47, 0x72, 0x59,
+    0x72, 0x5b, 0x72, 0xac, 0x72, 0x84, 0x73, 0x89,
+    0x73, 0xdc, 0x74, 0xe6, 0x74, 0x18, 0x75, 0x1f,
+    0x75, 0x28, 0x75, 0x30, 0x75, 0x8b, 0x75, 0x92,
+    0x75, 0x76, 0x76, 0x7d, 0x76, 0xae, 0x76, 0xbf,
+    0x76, 0xee, 0x76, 0xdb, 0x77, 0xe2, 0x77, 0xf3,
+    0x77, 0x3a, 0x79, 0xb8, 0x79, 0xbe, 0x79, 0x74,
+    0x7a, 0xcb, 0x7a, 0xf9, 0x7a, 0x73, 0x7c, 0xf8,
+    0x7c, 0x36, 0x7f, 0x51, 0x7f, 0x8a, 0x7f, 0xbd,
+    0x7f, 0x01, 0x80, 0x0c, 0x80, 0x12, 0x80, 0x33,
+    0x80, 0x7f, 0x80, 0x89, 0x80, 0xe3, 0x81, 0x00,
+    0x07, 0x10, 0x19, 0x29, 0x38, 0x3c, 0x8b, 0x8f,
+    0x95, 0x4d, 0x86, 0x6b, 0x86, 0x40, 0x88, 0x4c,
+    0x88, 0x63, 0x88, 0x7e, 0x89, 0x8b, 0x89, 0xd2,
+    0x89, 0x00, 0x8a, 0x37, 0x8c, 0x46, 0x8c, 0x55,
+    0x8c, 0x78, 0x8c, 0x9d, 0x8c, 0x64, 0x8d, 0x70,
+    0x8d, 0xb3, 0x8d, 0xab, 0x8e, 0xca, 0x8e, 0x9b,
+    0x8f, 0xb0, 0x8f, 0xb5, 0x8f, 0x91, 0x90, 0x49,
+    0x91, 0xc6, 0x91, 0xcc, 0x91, 0xd1, 0x91, 0x77,
+    0x95, 0x80, 0x95, 0x1c, 0x96, 0xb6, 0x96, 0xb9,
+    0x96, 0xe8, 0x96, 0x51, 0x97, 0x5e, 0x97, 0x62,
+    0x97, 0x69, 0x97, 0xcb, 0x97, 0xed, 0x97, 0xf3,
+    0x97, 0x01, 0x98, 0xa8, 0x98, 0xdb, 0x98, 0xdf,
+    0x98, 0x96, 0x99, 0x99, 0x99, 0xac, 0x99, 0xa8,
+    0x9a, 0xd8, 0x9a, 0xdf, 0x9a, 0x25, 0x9b, 0x2f,
+    0x9b, 0x32, 0x9b, 0x3c, 0x9b, 0x5a, 0x9b, 0xe5,
+    0x9c, 0x75, 0x9e, 0x7f, 0x9e, 0xa5, 0x9e, 0x00,
+    0x16, 0x1e, 0x28, 0x2c, 0x54, 0x58, 0x69, 0x6e,
+    0x7b, 0x96, 0xa5, 0xad, 0xe8, 0xf7, 0xfb, 0x12,
+    0x30, 0x00, 0x00, 0x41, 0x53, 0x44, 0x53, 0x45,
+    0x53, 0x4b, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x4d, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x4f, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x51, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x53, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x55, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x57, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x59, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x5b, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x5d, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x5f, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x61, 0x30, 0x99, 0x30, 0x64, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0x66, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0x68, 0x30, 0x99,
+    0x30, 0x6f, 0x30, 0x99, 0x30, 0x72, 0x30, 0x99,
+    0x30, 0x75, 0x30, 0x99, 0x30, 0x78, 0x30, 0x99,
+    0x30, 0x7b, 0x30, 0x99, 0x30, 0x46, 0x30, 0x99,
+    0x30, 0x20, 0x00, 0x99, 0x30, 0x9d, 0x30, 0x99,
+    0x30, 0x88, 0x30, 0x8a, 0x30, 0xab, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xad, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xaf, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb1, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb3, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb7, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xbd, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x30, 0x99,
+    0x30, 0xc4, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0xc6, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0xc8, 0x30, 0x99, 0x30, 0xcf, 0x30, 0x99,
+    0x30, 0xd2, 0x30, 0x99, 0x30, 0xd5, 0x30, 0x99,
+    0x30, 0xd8, 0x30, 0x99, 0x30, 0xdb, 0x30, 0x99,
+    0x30, 0xa6, 0x30, 0x99, 0x30, 0xef, 0x30, 0x99,
+    0x30, 0xfd, 0x30, 0x99, 0x30, 0xb3, 0x30, 0xc8,
+    0x30, 0x00, 0x11, 0x00, 0x01, 0xaa, 0x02, 0xac,
+    0xad, 0x03, 0x04, 0x05, 0xb0, 0xb1, 0xb2, 0xb3,
+    0xb4, 0xb5, 0x1a, 0x06, 0x07, 0x08, 0x21, 0x09,
+    0x11, 0x61, 0x11, 0x14, 0x11, 0x4c, 0x00, 0x01,
+    0xb3, 0xb4, 0xb8, 0xba, 0xbf, 0xc3, 0xc5, 0x08,
+    0xc9, 0xcb, 0x09, 0x0a, 0x0c, 0x0e, 0x0f, 0x13,
+    0x15, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1e, 0x22,
+    0x2c, 0x33, 0x38, 0xdd, 0xde, 0x43, 0x44, 0x45,
+    0x70, 0x71, 0x74, 0x7d, 0x7e, 0x80, 0x8a, 0x8d,
+    0x00, 0x4e, 0x8c, 0x4e, 0x09, 0x4e, 0xdb, 0x56,
+    0x0a, 0x4e, 0x2d, 0x4e, 0x0b, 0x4e, 0x32, 0x75,
+    0x59, 0x4e, 0x19, 0x4e, 0x01, 0x4e, 0x29, 0x59,
+    0x30, 0x57, 0xba, 0x4e, 0x28, 0x00, 0x29, 0x00,
+    0x00, 0x11, 0x02, 0x11, 0x03, 0x11, 0x05, 0x11,
+    0x06, 0x11, 0x07, 0x11, 0x09, 0x11, 0x0b, 0x11,
+    0x0c, 0x11, 0x0e, 0x11, 0x0f, 0x11, 0x10, 0x11,
+    0x11, 0x11, 0x12, 0x11, 0x28, 0x00, 0x00, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x02, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x05, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x09, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x0b, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x0e, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x0c, 0x11,
+    0x6e, 0x11, 0x29, 0x00, 0x28, 0x00, 0x0b, 0x11,
+    0x69, 0x11, 0x0c, 0x11, 0x65, 0x11, 0xab, 0x11,
+    0x29, 0x00, 0x28, 0x00, 0x0b, 0x11, 0x69, 0x11,
+    0x12, 0x11, 0x6e, 0x11, 0x29, 0x00, 0x28, 0x00,
+    0x29, 0x00, 0x00, 0x4e, 0x8c, 0x4e, 0x09, 0x4e,
+    0xdb, 0x56, 0x94, 0x4e, 0x6d, 0x51, 0x03, 0x4e,
+    0x6b, 0x51, 0x5d, 0x4e, 0x41, 0x53, 0x08, 0x67,
+    0x6b, 0x70, 0x34, 0x6c, 0x28, 0x67, 0xd1, 0x91,
+    0x1f, 0x57, 0xe5, 0x65, 0x2a, 0x68, 0x09, 0x67,
+    0x3e, 0x79, 0x0d, 0x54, 0x79, 0x72, 0xa1, 0x8c,
+    0x5d, 0x79, 0xb4, 0x52, 0xe3, 0x4e, 0x7c, 0x54,
+    0x66, 0x5b, 0xe3, 0x76, 0x01, 0x4f, 0xc7, 0x8c,
+    0x54, 0x53, 0x6d, 0x79, 0x11, 0x4f, 0xea, 0x81,
+    0xf3, 0x81, 0x4f, 0x55, 0x7c, 0x5e, 0x87, 0x65,
+    0x8f, 0x7b, 0x50, 0x54, 0x45, 0x32, 0x00, 0x31,
+    0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x11, 0x00,
+    0x02, 0x03, 0x05, 0x06, 0x07, 0x09, 0x0b, 0x0c,
+    0x0e, 0x0f, 0x10, 0x11, 0x12, 0x00, 0x11, 0x00,
+    0x61, 0x02, 0x61, 0x03, 0x61, 0x05, 0x61, 0x06,
+    0x61, 0x07, 0x61, 0x09, 0x61, 0x0b, 0x61, 0x0c,
+    0x61, 0x0e, 0x11, 0x61, 0x11, 0x00, 0x11, 0x0e,
+    0x61, 0xb7, 0x00, 0x69, 0x0b, 0x11, 0x01, 0x63,
+    0x00, 0x69, 0x0b, 0x11, 0x6e, 0x11, 0x00, 0x4e,
+    0x8c, 0x4e, 0x09, 0x4e, 0xdb, 0x56, 0x94, 0x4e,
+    0x6d, 0x51, 0x03, 0x4e, 0x6b, 0x51, 0x5d, 0x4e,
+    0x41, 0x53, 0x08, 0x67, 0x6b, 0x70, 0x34, 0x6c,
+    0x28, 0x67, 0xd1, 0x91, 0x1f, 0x57, 0xe5, 0x65,
+    0x2a, 0x68, 0x09, 0x67, 0x3e, 0x79, 0x0d, 0x54,
+    0x79, 0x72, 0xa1, 0x8c, 0x5d, 0x79, 0xb4, 0x52,
+    0xd8, 0x79, 0x37, 0x75, 0x73, 0x59, 0x69, 0x90,
+    0x2a, 0x51, 0x70, 0x53, 0xe8, 0x6c, 0x05, 0x98,
+    0x11, 0x4f, 0x99, 0x51, 0x63, 0x6b, 0x0a, 0x4e,
+    0x2d, 0x4e, 0x0b, 0x4e, 0xe6, 0x5d, 0xf3, 0x53,
+    0x3b, 0x53, 0x97, 0x5b, 0x66, 0x5b, 0xe3, 0x76,
+    0x01, 0x4f, 0xc7, 0x8c, 0x54, 0x53, 0x1c, 0x59,
+    0x33, 0x00, 0x36, 0x00, 0x34, 0x00, 0x30, 0x00,
+    0x35, 0x30, 0x31, 0x00, 0x08, 0x67, 0x31, 0x00,
+    0x30, 0x00, 0x08, 0x67, 0x48, 0x67, 0x65, 0x72,
+    0x67, 0x65, 0x56, 0x4c, 0x54, 0x44, 0xa2, 0x30,
+    0x00, 0x02, 0x04, 0x06, 0x08, 0x09, 0x0b, 0x0d,
+    0x0f, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1b, 0x1d,
+    0x1f, 0x22, 0x24, 0x26, 0x28, 0x29, 0x2a, 0x2b,
+    0x2c, 0x2d, 0x30, 0x33, 0x36, 0x39, 0x3c, 0x3d,
+    0x3e, 0x3f, 0x40, 0x42, 0x44, 0x46, 0x47, 0x48,
+    0x49, 0x4a, 0x4b, 0x4d, 0x4e, 0x4f, 0x50, 0xe4,
+    0x4e, 0x8c, 0x54, 0xa1, 0x30, 0x01, 0x30, 0x5b,
+    0x27, 0x01, 0x4a, 0x34, 0x00, 0x01, 0x52, 0x39,
+    0x01, 0xa2, 0x30, 0x00, 0x5a, 0x49, 0xa4, 0x30,
+    0x00, 0x27, 0x4f, 0x0c, 0xa4, 0x30, 0x00, 0x4f,
+    0x1d, 0x02, 0x05, 0x4f, 0xa8, 0x30, 0x00, 0x11,
+    0x07, 0x54, 0x21, 0xa8, 0x30, 0x00, 0x54, 0x03,
+    0x54, 0xa4, 0x30, 0x06, 0x4f, 0x15, 0x06, 0x58,
+    0x3c, 0x07, 0x00, 0x46, 0xab, 0x30, 0x00, 0x3e,
+    0x18, 0x1d, 0x00, 0x42, 0x3f, 0x51, 0xac, 0x30,
+    0x00, 0x41, 0x47, 0x00, 0x47, 0x32, 0xae, 0x30,
+    0xac, 0x30, 0xae, 0x30, 0x00, 0x1d, 0x4e, 0xad,
+    0x30, 0x00, 0x38, 0x3d, 0x4f, 0x01, 0x3e, 0x13,
+    0x4f, 0xad, 0x30, 0xed, 0x30, 0xad, 0x30, 0x00,
+    0x40, 0x03, 0x3c, 0x33, 0xad, 0x30, 0x00, 0x40,
+    0x34, 0x4f, 0x1b, 0x3e, 0xad, 0x30, 0x00, 0x40,
+    0x42, 0x16, 0x1b, 0xb0, 0x30, 0x00, 0x39, 0x30,
+    0xa4, 0x30, 0x0c, 0x45, 0x3c, 0x24, 0x4f, 0x0b,
+    0x47, 0x18, 0x00, 0x49, 0xaf, 0x30, 0x00, 0x3e,
+    0x4d, 0x1e, 0xb1, 0x30, 0x00, 0x4b, 0x08, 0x02,
+    0x3a, 0x19, 0x02, 0x4b, 0x2c, 0xa4, 0x30, 0x11,
+    0x00, 0x0b, 0x47, 0xb5, 0x30, 0x00, 0x3e, 0x0c,
+    0x47, 0x2b, 0xb0, 0x30, 0x07, 0x3a, 0x43, 0x00,
+    0xb9, 0x30, 0x02, 0x3a, 0x08, 0x02, 0x3a, 0x0f,
+    0x07, 0x43, 0x00, 0xb7, 0x30, 0x10, 0x00, 0x12,
+    0x34, 0x11, 0x3c, 0x13, 0x17, 0xa4, 0x30, 0x2a,
+    0x1f, 0x24, 0x2b, 0x00, 0x20, 0xbb, 0x30, 0x16,
+    0x41, 0x00, 0x38, 0x0d, 0xc4, 0x30, 0x0d, 0x38,
+    0x00, 0xd0, 0x30, 0x00, 0x2c, 0x1c, 0x1b, 0xa2,
+    0x30, 0x32, 0x00, 0x17, 0x26, 0x49, 0xaf, 0x30,
+    0x25, 0x00, 0x3c, 0xb3, 0x30, 0x21, 0x00, 0x20,
+    0x38, 0xa1, 0x30, 0x34, 0x00, 0x48, 0x22, 0x28,
+    0xa3, 0x30, 0x32, 0x00, 0x59, 0x25, 0xa7, 0x30,
+    0x2f, 0x1c, 0x10, 0x00, 0x44, 0xd5, 0x30, 0x00,
+    0x14, 0x1e, 0xaf, 0x30, 0x29, 0x00, 0x10, 0x4d,
+    0x3c, 0xda, 0x30, 0xbd, 0x30, 0xb8, 0x30, 0x22,
+    0x13, 0x1a, 0x20, 0x33, 0x0c, 0x22, 0x3b, 0x01,
+    0x22, 0x44, 0x00, 0x21, 0x44, 0x07, 0xa4, 0x30,
+    0x39, 0x00, 0x4f, 0x24, 0xc8, 0x30, 0x14, 0x23,
+    0x00, 0xdb, 0x30, 0xf3, 0x30, 0xc9, 0x30, 0x14,
+    0x2a, 0x00, 0x12, 0x33, 0x22, 0x12, 0x33, 0x2a,
+    0xa4, 0x30, 0x3a, 0x00, 0x0b, 0x49, 0xa4, 0x30,
+    0x3a, 0x00, 0x47, 0x3a, 0x1f, 0x2b, 0x3a, 0x47,
+    0x0b, 0xb7, 0x30, 0x27, 0x3c, 0x00, 0x30, 0x3c,
+    0xaf, 0x30, 0x30, 0x00, 0x3e, 0x44, 0xdf, 0x30,
+    0xea, 0x30, 0xd0, 0x30, 0x0f, 0x1a, 0x00, 0x2c,
+    0x1b, 0xe1, 0x30, 0xac, 0x30, 0xac, 0x30, 0x35,
+    0x00, 0x1c, 0x47, 0x35, 0x50, 0x1c, 0x3f, 0xa2,
+    0x30, 0x42, 0x5a, 0x27, 0x42, 0x5a, 0x49, 0x44,
+    0x00, 0x51, 0xc3, 0x30, 0x27, 0x00, 0x05, 0x28,
+    0xea, 0x30, 0xe9, 0x30, 0xd4, 0x30, 0x17, 0x00,
+    0x28, 0xd6, 0x30, 0x15, 0x26, 0x00, 0x15, 0xec,
+    0x30, 0xe0, 0x30, 0xb2, 0x30, 0x3a, 0x41, 0x16,
+    0x00, 0x41, 0xc3, 0x30, 0x2c, 0x00, 0x05, 0x30,
+    0x00, 0xb9, 0x70, 0x31, 0x00, 0x30, 0x00, 0xb9,
+    0x70, 0x32, 0x00, 0x30, 0x00, 0xb9, 0x70, 0x68,
+    0x50, 0x61, 0x64, 0x61, 0x41, 0x55, 0x62, 0x61,
+    0x72, 0x6f, 0x56, 0x70, 0x63, 0x64, 0x6d, 0x64,
+    0x00, 0x6d, 0x00, 0xb2, 0x00, 0x49, 0x00, 0x55,
+    0x00, 0x73, 0x5e, 0x10, 0x62, 0x2d, 0x66, 0x8c,
+    0x54, 0x27, 0x59, 0x63, 0x6b, 0x0e, 0x66, 0xbb,
+    0x6c, 0x2a, 0x68, 0x0f, 0x5f, 0x1a, 0x4f, 0x3e,
+    0x79, 0x70, 0x00, 0x41, 0x6e, 0x00, 0x41, 0xbc,
+    0x03, 0x41, 0x6d, 0x00, 0x41, 0x6b, 0x00, 0x41,
+    0x4b, 0x00, 0x42, 0x4d, 0x00, 0x42, 0x47, 0x00,
+    0x42, 0x63, 0x61, 0x6c, 0x6b, 0x63, 0x61, 0x6c,
+    0x70, 0x00, 0x46, 0x6e, 0x00, 0x46, 0xbc, 0x03,
+    0x46, 0xbc, 0x03, 0x67, 0x6d, 0x00, 0x67, 0x6b,
+    0x00, 0x67, 0x48, 0x00, 0x7a, 0x6b, 0x48, 0x7a,
+    0x4d, 0x48, 0x7a, 0x47, 0x48, 0x7a, 0x54, 0x48,
+    0x7a, 0xbc, 0x03, 0x13, 0x21, 0x6d, 0x00, 0x13,
+    0x21, 0x64, 0x00, 0x13, 0x21, 0x6b, 0x00, 0x13,
+    0x21, 0x66, 0x00, 0x6d, 0x6e, 0x00, 0x6d, 0xbc,
+    0x03, 0x6d, 0x6d, 0x00, 0x6d, 0x63, 0x00, 0x6d,
+    0x6b, 0x00, 0x6d, 0x63, 0x00, 0x0a, 0x0a, 0x4f,
+    0x00, 0x0a, 0x4f, 0x6d, 0x00, 0xb2, 0x00, 0x63,
+    0x00, 0x08, 0x0a, 0x4f, 0x0a, 0x0a, 0x50, 0x00,
+    0x0a, 0x50, 0x6d, 0x00, 0xb3, 0x00, 0x6b, 0x00,
+    0x6d, 0x00, 0xb3, 0x00, 0x6d, 0x00, 0x15, 0x22,
+    0x73, 0x00, 0x6d, 0x00, 0x15, 0x22, 0x73, 0x00,
+    0xb2, 0x00, 0x50, 0x61, 0x6b, 0x50, 0x61, 0x4d,
+    0x50, 0x61, 0x47, 0x50, 0x61, 0x72, 0x61, 0x64,
+    0x72, 0x61, 0x64, 0xd1, 0x73, 0x72, 0x00, 0x61,
+    0x00, 0x64, 0x00, 0x15, 0x22, 0x73, 0x00, 0xb2,
+    0x00, 0x70, 0x00, 0x73, 0x6e, 0x00, 0x73, 0xbc,
+    0x03, 0x73, 0x6d, 0x00, 0x73, 0x70, 0x00, 0x56,
+    0x6e, 0x00, 0x56, 0xbc, 0x03, 0x56, 0x6d, 0x00,
+    0x56, 0x6b, 0x00, 0x56, 0x4d, 0x00, 0x56, 0x70,
+    0x00, 0x57, 0x6e, 0x00, 0x57, 0xbc, 0x03, 0x57,
+    0x6d, 0x00, 0x57, 0x6b, 0x00, 0x57, 0x4d, 0x00,
+    0x57, 0x6b, 0x00, 0xa9, 0x03, 0x4d, 0x00, 0xa9,
+    0x03, 0x61, 0x2e, 0x6d, 0x2e, 0x42, 0x71, 0x63,
+    0x63, 0x63, 0x64, 0x43, 0xd1, 0x6b, 0x67, 0x43,
+    0x6f, 0x2e, 0x64, 0x42, 0x47, 0x79, 0x68, 0x61,
+    0x48, 0x50, 0x69, 0x6e, 0x4b, 0x4b, 0x4b, 0x4d,
+    0x6b, 0x74, 0x6c, 0x6d, 0x6c, 0x6e, 0x6c, 0x6f,
+    0x67, 0x6c, 0x78, 0x6d, 0x62, 0x6d, 0x69, 0x6c,
+    0x6d, 0x6f, 0x6c, 0x50, 0x48, 0x70, 0x2e, 0x6d,
+    0x2e, 0x50, 0x50, 0x4d, 0x50, 0x52, 0x73, 0x72,
+    0x53, 0x76, 0x57, 0x62, 0x56, 0xd1, 0x6d, 0x41,
+    0xd1, 0x6d, 0x31, 0x00, 0xe5, 0x65, 0x31, 0x00,
+    0x30, 0x00, 0xe5, 0x65, 0x32, 0x00, 0x30, 0x00,
+    0xe5, 0x65, 0x33, 0x00, 0x30, 0x00, 0xe5, 0x65,
+    0x67, 0x61, 0x6c, 0x4a, 0x04, 0x4c, 0x04, 0x43,
+    0x46, 0x51, 0x26, 0x01, 0x53, 0x01, 0x27, 0xa7,
+    0x37, 0xab, 0x6b, 0x02, 0x52, 0xab, 0x48, 0x8c,
+    0xf4, 0x66, 0xca, 0x8e, 0xc8, 0x8c, 0xd1, 0x6e,
+    0x32, 0x4e, 0xe5, 0x53, 0x9c, 0x9f, 0x9c, 0x9f,
+    0x51, 0x59, 0xd1, 0x91, 0x87, 0x55, 0x48, 0x59,
+    0xf6, 0x61, 0x69, 0x76, 0x85, 0x7f, 0x3f, 0x86,
+    0xba, 0x87, 0xf8, 0x88, 0x8f, 0x90, 0x02, 0x6a,
+    0x1b, 0x6d, 0xd9, 0x70, 0xde, 0x73, 0x3d, 0x84,
+    0x6a, 0x91, 0xf1, 0x99, 0x82, 0x4e, 0x75, 0x53,
+    0x04, 0x6b, 0x1b, 0x72, 0x2d, 0x86, 0x1e, 0x9e,
+    0x50, 0x5d, 0xeb, 0x6f, 0xcd, 0x85, 0x64, 0x89,
+    0xc9, 0x62, 0xd8, 0x81, 0x1f, 0x88, 0xca, 0x5e,
+    0x17, 0x67, 0x6a, 0x6d, 0xfc, 0x72, 0xce, 0x90,
+    0x86, 0x4f, 0xb7, 0x51, 0xde, 0x52, 0xc4, 0x64,
+    0xd3, 0x6a, 0x10, 0x72, 0xe7, 0x76, 0x01, 0x80,
+    0x06, 0x86, 0x5c, 0x86, 0xef, 0x8d, 0x32, 0x97,
+    0x6f, 0x9b, 0xfa, 0x9d, 0x8c, 0x78, 0x7f, 0x79,
+    0xa0, 0x7d, 0xc9, 0x83, 0x04, 0x93, 0x7f, 0x9e,
+    0xd6, 0x8a, 0xdf, 0x58, 0x04, 0x5f, 0x60, 0x7c,
+    0x7e, 0x80, 0x62, 0x72, 0xca, 0x78, 0xc2, 0x8c,
+    0xf7, 0x96, 0xd8, 0x58, 0x62, 0x5c, 0x13, 0x6a,
+    0xda, 0x6d, 0x0f, 0x6f, 0x2f, 0x7d, 0x37, 0x7e,
+    0x4b, 0x96, 0xd2, 0x52, 0x8b, 0x80, 0xdc, 0x51,
+    0xcc, 0x51, 0x1c, 0x7a, 0xbe, 0x7d, 0xf1, 0x83,
+    0x75, 0x96, 0x80, 0x8b, 0xcf, 0x62, 0x02, 0x6a,
+    0xfe, 0x8a, 0x39, 0x4e, 0xe7, 0x5b, 0x12, 0x60,
+    0x87, 0x73, 0x70, 0x75, 0x17, 0x53, 0xfb, 0x78,
+    0xbf, 0x4f, 0xa9, 0x5f, 0x0d, 0x4e, 0xcc, 0x6c,
+    0x78, 0x65, 0x22, 0x7d, 0xc3, 0x53, 0x5e, 0x58,
+    0x01, 0x77, 0x49, 0x84, 0xaa, 0x8a, 0xba, 0x6b,
+    0xb0, 0x8f, 0x88, 0x6c, 0xfe, 0x62, 0xe5, 0x82,
+    0xa0, 0x63, 0x65, 0x75, 0xae, 0x4e, 0x69, 0x51,
+    0xc9, 0x51, 0x81, 0x68, 0xe7, 0x7c, 0x6f, 0x82,
+    0xd2, 0x8a, 0xcf, 0x91, 0xf5, 0x52, 0x42, 0x54,
+    0x73, 0x59, 0xec, 0x5e, 0xc5, 0x65, 0xfe, 0x6f,
+    0x2a, 0x79, 0xad, 0x95, 0x6a, 0x9a, 0x97, 0x9e,
+    0xce, 0x9e, 0x9b, 0x52, 0xc6, 0x66, 0x77, 0x6b,
+    0x62, 0x8f, 0x74, 0x5e, 0x90, 0x61, 0x00, 0x62,
+    0x9a, 0x64, 0x23, 0x6f, 0x49, 0x71, 0x89, 0x74,
+    0xca, 0x79, 0xf4, 0x7d, 0x6f, 0x80, 0x26, 0x8f,
+    0xee, 0x84, 0x23, 0x90, 0x4a, 0x93, 0x17, 0x52,
+    0xa3, 0x52, 0xbd, 0x54, 0xc8, 0x70, 0xc2, 0x88,
+    0xaa, 0x8a, 0xc9, 0x5e, 0xf5, 0x5f, 0x7b, 0x63,
+    0xae, 0x6b, 0x3e, 0x7c, 0x75, 0x73, 0xe4, 0x4e,
+    0xf9, 0x56, 0xe7, 0x5b, 0xba, 0x5d, 0x1c, 0x60,
+    0xb2, 0x73, 0x69, 0x74, 0x9a, 0x7f, 0x46, 0x80,
+    0x34, 0x92, 0xf6, 0x96, 0x48, 0x97, 0x18, 0x98,
+    0x8b, 0x4f, 0xae, 0x79, 0xb4, 0x91, 0xb8, 0x96,
+    0xe1, 0x60, 0x86, 0x4e, 0xda, 0x50, 0xee, 0x5b,
+    0x3f, 0x5c, 0x99, 0x65, 0x02, 0x6a, 0xce, 0x71,
+    0x42, 0x76, 0xfc, 0x84, 0x7c, 0x90, 0x8d, 0x9f,
+    0x88, 0x66, 0x2e, 0x96, 0x89, 0x52, 0x7b, 0x67,
+    0xf3, 0x67, 0x41, 0x6d, 0x9c, 0x6e, 0x09, 0x74,
+    0x59, 0x75, 0x6b, 0x78, 0x10, 0x7d, 0x5e, 0x98,
+    0x6d, 0x51, 0x2e, 0x62, 0x78, 0x96, 0x2b, 0x50,
+    0x19, 0x5d, 0xea, 0x6d, 0x2a, 0x8f, 0x8b, 0x5f,
+    0x44, 0x61, 0x17, 0x68, 0x87, 0x73, 0x86, 0x96,
+    0x29, 0x52, 0x0f, 0x54, 0x65, 0x5c, 0x13, 0x66,
+    0x4e, 0x67, 0xa8, 0x68, 0xe5, 0x6c, 0x06, 0x74,
+    0xe2, 0x75, 0x79, 0x7f, 0xcf, 0x88, 0xe1, 0x88,
+    0xcc, 0x91, 0xe2, 0x96, 0x3f, 0x53, 0xba, 0x6e,
+    0x1d, 0x54, 0xd0, 0x71, 0x98, 0x74, 0xfa, 0x85,
+    0xa3, 0x96, 0x57, 0x9c, 0x9f, 0x9e, 0x97, 0x67,
+    0xcb, 0x6d, 0xe8, 0x81, 0xcb, 0x7a, 0x20, 0x7b,
+    0x92, 0x7c, 0xc0, 0x72, 0x99, 0x70, 0x58, 0x8b,
+    0xc0, 0x4e, 0x36, 0x83, 0x3a, 0x52, 0x07, 0x52,
+    0xa6, 0x5e, 0xd3, 0x62, 0xd6, 0x7c, 0x85, 0x5b,
+    0x1e, 0x6d, 0xb4, 0x66, 0x3b, 0x8f, 0x4c, 0x88,
+    0x4d, 0x96, 0x8b, 0x89, 0xd3, 0x5e, 0x40, 0x51,
+    0xc0, 0x55, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x58,
+    0x00, 0x00, 0x74, 0x66, 0x00, 0x00, 0x00, 0x00,
+    0xde, 0x51, 0x2a, 0x73, 0xca, 0x76, 0x3c, 0x79,
+    0x5e, 0x79, 0x65, 0x79, 0x8f, 0x79, 0x56, 0x97,
+    0xbe, 0x7c, 0xbd, 0x7f, 0x00, 0x00, 0x12, 0x86,
+    0x00, 0x00, 0xf8, 0x8a, 0x00, 0x00, 0x00, 0x00,
+    0x38, 0x90, 0xfd, 0x90, 0xef, 0x98, 0xfc, 0x98,
+    0x28, 0x99, 0xb4, 0x9d, 0xde, 0x90, 0xb7, 0x96,
+    0xae, 0x4f, 0xe7, 0x50, 0x4d, 0x51, 0xc9, 0x52,
+    0xe4, 0x52, 0x51, 0x53, 0x9d, 0x55, 0x06, 0x56,
+    0x68, 0x56, 0x40, 0x58, 0xa8, 0x58, 0x64, 0x5c,
+    0x6e, 0x5c, 0x94, 0x60, 0x68, 0x61, 0x8e, 0x61,
+    0xf2, 0x61, 0x4f, 0x65, 0xe2, 0x65, 0x91, 0x66,
+    0x85, 0x68, 0x77, 0x6d, 0x1a, 0x6e, 0x22, 0x6f,
+    0x6e, 0x71, 0x2b, 0x72, 0x22, 0x74, 0x91, 0x78,
+    0x3e, 0x79, 0x49, 0x79, 0x48, 0x79, 0x50, 0x79,
+    0x56, 0x79, 0x5d, 0x79, 0x8d, 0x79, 0x8e, 0x79,
+    0x40, 0x7a, 0x81, 0x7a, 0xc0, 0x7b, 0xf4, 0x7d,
+    0x09, 0x7e, 0x41, 0x7e, 0x72, 0x7f, 0x05, 0x80,
+    0xed, 0x81, 0x79, 0x82, 0x79, 0x82, 0x57, 0x84,
+    0x10, 0x89, 0x96, 0x89, 0x01, 0x8b, 0x39, 0x8b,
+    0xd3, 0x8c, 0x08, 0x8d, 0xb6, 0x8f, 0x38, 0x90,
+    0xe3, 0x96, 0xff, 0x97, 0x3b, 0x98, 0x75, 0x60,
+    0xee, 0x42, 0x18, 0x82, 0x02, 0x26, 0x4e, 0xb5,
+    0x51, 0x68, 0x51, 0x80, 0x4f, 0x45, 0x51, 0x80,
+    0x51, 0xc7, 0x52, 0xfa, 0x52, 0x9d, 0x55, 0x55,
+    0x55, 0x99, 0x55, 0xe2, 0x55, 0x5a, 0x58, 0xb3,
+    0x58, 0x44, 0x59, 0x54, 0x59, 0x62, 0x5a, 0x28,
+    0x5b, 0xd2, 0x5e, 0xd9, 0x5e, 0x69, 0x5f, 0xad,
+    0x5f, 0xd8, 0x60, 0x4e, 0x61, 0x08, 0x61, 0x8e,
+    0x61, 0x60, 0x61, 0xf2, 0x61, 0x34, 0x62, 0xc4,
+    0x63, 0x1c, 0x64, 0x52, 0x64, 0x56, 0x65, 0x74,
+    0x66, 0x17, 0x67, 0x1b, 0x67, 0x56, 0x67, 0x79,
+    0x6b, 0xba, 0x6b, 0x41, 0x6d, 0xdb, 0x6e, 0xcb,
+    0x6e, 0x22, 0x6f, 0x1e, 0x70, 0x6e, 0x71, 0xa7,
+    0x77, 0x35, 0x72, 0xaf, 0x72, 0x2a, 0x73, 0x71,
+    0x74, 0x06, 0x75, 0x3b, 0x75, 0x1d, 0x76, 0x1f,
+    0x76, 0xca, 0x76, 0xdb, 0x76, 0xf4, 0x76, 0x4a,
+    0x77, 0x40, 0x77, 0xcc, 0x78, 0xb1, 0x7a, 0xc0,
+    0x7b, 0x7b, 0x7c, 0x5b, 0x7d, 0xf4, 0x7d, 0x3e,
+    0x7f, 0x05, 0x80, 0x52, 0x83, 0xef, 0x83, 0x79,
+    0x87, 0x41, 0x89, 0x86, 0x89, 0x96, 0x89, 0xbf,
+    0x8a, 0xf8, 0x8a, 0xcb, 0x8a, 0x01, 0x8b, 0xfe,
+    0x8a, 0xed, 0x8a, 0x39, 0x8b, 0x8a, 0x8b, 0x08,
+    0x8d, 0x38, 0x8f, 0x72, 0x90, 0x99, 0x91, 0x76,
+    0x92, 0x7c, 0x96, 0xe3, 0x96, 0x56, 0x97, 0xdb,
+    0x97, 0xff, 0x97, 0x0b, 0x98, 0x3b, 0x98, 0x12,
+    0x9b, 0x9c, 0x9f, 0x4a, 0x28, 0x44, 0x28, 0xd5,
+    0x33, 0x9d, 0x3b, 0x18, 0x40, 0x39, 0x40, 0x49,
+    0x52, 0xd0, 0x5c, 0xd3, 0x7e, 0x43, 0x9f, 0x8e,
+    0x9f, 0x2a, 0xa0, 0x02, 0x66, 0x66, 0x66, 0x69,
+    0x66, 0x6c, 0x66, 0x66, 0x69, 0x66, 0x66, 0x6c,
+    0x7f, 0x01, 0x74, 0x73, 0x00, 0x74, 0x65, 0x05,
+    0x0f, 0x11, 0x0f, 0x00, 0x0f, 0x06, 0x19, 0x11,
+    0x0f, 0x08, 0xd9, 0x05, 0xb4, 0x05, 0x00, 0x00,
+    0x00, 0x00, 0xf2, 0x05, 0xb7, 0x05, 0xd0, 0x05,
+    0x12, 0x00, 0x03, 0x04, 0x0b, 0x0c, 0x0d, 0x18,
+    0x1a, 0xe9, 0x05, 0xc1, 0x05, 0xe9, 0x05, 0xc2,
+    0x05, 0x49, 0xfb, 0xc1, 0x05, 0x49, 0xfb, 0xc2,
+    0x05, 0xd0, 0x05, 0xb7, 0x05, 0xd0, 0x05, 0xb8,
+    0x05, 0xd0, 0x05, 0xbc, 0x05, 0xd8, 0x05, 0xbc,
+    0x05, 0xde, 0x05, 0xbc, 0x05, 0xe0, 0x05, 0xbc,
+    0x05, 0xe3, 0x05, 0xbc, 0x05, 0xb9, 0x05, 0x2d,
+    0x03, 0x2e, 0x03, 0x2f, 0x03, 0x30, 0x03, 0x31,
+    0x03, 0x1c, 0x00, 0x18, 0x06, 0x22, 0x06, 0x2b,
+    0x06, 0xd0, 0x05, 0xdc, 0x05, 0x71, 0x06, 0x00,
+    0x00, 0x0a, 0x0a, 0x0a, 0x0a, 0x0d, 0x0d, 0x0d,
+    0x0d, 0x0f, 0x0f, 0x0f, 0x0f, 0x09, 0x09, 0x09,
+    0x09, 0x0e, 0x0e, 0x0e, 0x0e, 0x08, 0x08, 0x08,
+    0x08, 0x33, 0x33, 0x33, 0x33, 0x35, 0x35, 0x35,
+    0x35, 0x13, 0x13, 0x13, 0x13, 0x12, 0x12, 0x12,
+    0x12, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16,
+    0x16, 0x1c, 0x1c, 0x1b, 0x1b, 0x1d, 0x1d, 0x17,
+    0x17, 0x27, 0x27, 0x20, 0x20, 0x38, 0x38, 0x38,
+    0x38, 0x3e, 0x3e, 0x3e, 0x3e, 0x42, 0x42, 0x42,
+    0x42, 0x40, 0x40, 0x40, 0x40, 0x49, 0x49, 0x4a,
+    0x4a, 0x4a, 0x4a, 0x4f, 0x4f, 0x50, 0x50, 0x50,
+    0x50, 0x4d, 0x4d, 0x4d, 0x4d, 0x61, 0x61, 0x62,
+    0x62, 0x49, 0x06, 0x64, 0x64, 0x64, 0x64, 0x7e,
+    0x7e, 0x7d, 0x7d, 0x7f, 0x7f, 0x2e, 0x82, 0x82,
+    0x7c, 0x7c, 0x80, 0x80, 0x87, 0x87, 0x87, 0x87,
+    0x00, 0x00, 0x26, 0x06, 0x00, 0x01, 0x00, 0x01,
+    0x00, 0xaf, 0x00, 0xaf, 0x00, 0x22, 0x00, 0x22,
+    0x00, 0xa1, 0x00, 0xa1, 0x00, 0xa0, 0x00, 0xa0,
+    0x00, 0xa2, 0x00, 0xa2, 0x00, 0xaa, 0x00, 0xaa,
+    0x00, 0xaa, 0x00, 0x23, 0x00, 0x23, 0x00, 0x23,
+    0xcc, 0x06, 0x00, 0x00, 0x00, 0x00, 0x26, 0x06,
+    0x00, 0x06, 0x00, 0x07, 0x00, 0x1f, 0x00, 0x23,
+    0x00, 0x24, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08,
+    0x02, 0x1f, 0x02, 0x23, 0x02, 0x24, 0x04, 0x06,
+    0x04, 0x07, 0x04, 0x08, 0x04, 0x1f, 0x04, 0x23,
+    0x04, 0x24, 0x05, 0x06, 0x05, 0x1f, 0x05, 0x23,
+    0x05, 0x24, 0x06, 0x07, 0x06, 0x1f, 0x07, 0x06,
+    0x07, 0x1f, 0x08, 0x06, 0x08, 0x07, 0x08, 0x1f,
+    0x0d, 0x06, 0x0d, 0x07, 0x0d, 0x08, 0x0d, 0x1f,
+    0x0f, 0x07, 0x0f, 0x1f, 0x10, 0x06, 0x10, 0x07,
+    0x10, 0x08, 0x10, 0x1f, 0x11, 0x07, 0x11, 0x1f,
+    0x12, 0x1f, 0x13, 0x06, 0x13, 0x1f, 0x14, 0x06,
+    0x14, 0x1f, 0x1b, 0x06, 0x1b, 0x07, 0x1b, 0x08,
+    0x1b, 0x1f, 0x1b, 0x23, 0x1b, 0x24, 0x1c, 0x07,
+    0x1c, 0x1f, 0x1c, 0x23, 0x1c, 0x24, 0x1d, 0x01,
+    0x1d, 0x06, 0x1d, 0x07, 0x1d, 0x08, 0x1d, 0x1e,
+    0x1d, 0x1f, 0x1d, 0x23, 0x1d, 0x24, 0x1e, 0x06,
+    0x1e, 0x07, 0x1e, 0x08, 0x1e, 0x1f, 0x1e, 0x23,
+    0x1e, 0x24, 0x1f, 0x06, 0x1f, 0x07, 0x1f, 0x08,
+    0x1f, 0x1f, 0x1f, 0x23, 0x1f, 0x24, 0x20, 0x06,
+    0x20, 0x07, 0x20, 0x08, 0x20, 0x1f, 0x20, 0x23,
+    0x20, 0x24, 0x21, 0x06, 0x21, 0x1f, 0x21, 0x23,
+    0x21, 0x24, 0x24, 0x06, 0x24, 0x07, 0x24, 0x08,
+    0x24, 0x1f, 0x24, 0x23, 0x24, 0x24, 0x0a, 0x4a,
+    0x0b, 0x4a, 0x23, 0x4a, 0x20, 0x00, 0x4c, 0x06,
+    0x51, 0x06, 0x51, 0x06, 0xff, 0x00, 0x1f, 0x26,
+    0x06, 0x00, 0x0b, 0x00, 0x0c, 0x00, 0x1f, 0x00,
+    0x20, 0x00, 0x23, 0x00, 0x24, 0x02, 0x0b, 0x02,
+    0x0c, 0x02, 0x1f, 0x02, 0x20, 0x02, 0x23, 0x02,
+    0x24, 0x04, 0x0b, 0x04, 0x0c, 0x04, 0x1f, 0x26,
+    0x06, 0x04, 0x20, 0x04, 0x23, 0x04, 0x24, 0x05,
+    0x0b, 0x05, 0x0c, 0x05, 0x1f, 0x05, 0x20, 0x05,
+    0x23, 0x05, 0x24, 0x1b, 0x23, 0x1b, 0x24, 0x1c,
+    0x23, 0x1c, 0x24, 0x1d, 0x01, 0x1d, 0x1e, 0x1d,
+    0x1f, 0x1d, 0x23, 0x1d, 0x24, 0x1e, 0x1f, 0x1e,
+    0x23, 0x1e, 0x24, 0x1f, 0x01, 0x1f, 0x1f, 0x20,
+    0x0b, 0x20, 0x0c, 0x20, 0x1f, 0x20, 0x20, 0x20,
+    0x23, 0x20, 0x24, 0x23, 0x4a, 0x24, 0x0b, 0x24,
+    0x0c, 0x24, 0x1f, 0x24, 0x20, 0x24, 0x23, 0x24,
+    0x24, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08, 0x00,
+    0x1f, 0x00, 0x21, 0x02, 0x06, 0x02, 0x07, 0x02,
+    0x08, 0x02, 0x1f, 0x02, 0x21, 0x04, 0x06, 0x04,
+    0x07, 0x04, 0x08, 0x04, 0x1f, 0x04, 0x21, 0x05,
+    0x1f, 0x06, 0x07, 0x06, 0x1f, 0x07, 0x06, 0x07,
+    0x1f, 0x08, 0x06, 0x08, 0x1f, 0x0d, 0x06, 0x0d,
+    0x07, 0x0d, 0x08, 0x0d, 0x1f, 0x0f, 0x07, 0x0f,
+    0x08, 0x0f, 0x1f, 0x10, 0x06, 0x10, 0x07, 0x10,
+    0x08, 0x10, 0x1f, 0x11, 0x07, 0x12, 0x1f, 0x13,
+    0x06, 0x13, 0x1f, 0x14, 0x06, 0x14, 0x1f, 0x1b,
+    0x06, 0x1b, 0x07, 0x1b, 0x08, 0x1b, 0x1f, 0x1c,
+    0x07, 0x1c, 0x1f, 0x1d, 0x06, 0x1d, 0x07, 0x1d,
+    0x08, 0x1d, 0x1e, 0x1d, 0x1f, 0x1e, 0x06, 0x1e,
+    0x07, 0x1e, 0x08, 0x1e, 0x1f, 0x1e, 0x21, 0x1f,
+    0x06, 0x1f, 0x07, 0x1f, 0x08, 0x1f, 0x1f, 0x20,
+    0x06, 0x20, 0x07, 0x20, 0x08, 0x20, 0x1f, 0x20,
+    0x21, 0x21, 0x06, 0x21, 0x1f, 0x21, 0x4a, 0x24,
+    0x06, 0x24, 0x07, 0x24, 0x08, 0x24, 0x1f, 0x24,
+    0x21, 0x00, 0x1f, 0x00, 0x21, 0x02, 0x1f, 0x02,
+    0x21, 0x04, 0x1f, 0x04, 0x21, 0x05, 0x1f, 0x05,
+    0x21, 0x0d, 0x1f, 0x0d, 0x21, 0x0e, 0x1f, 0x0e,
+    0x21, 0x1d, 0x1e, 0x1d, 0x1f, 0x1e, 0x1f, 0x20,
+    0x1f, 0x20, 0x21, 0x24, 0x1f, 0x24, 0x21, 0x40,
+    0x06, 0x4e, 0x06, 0x51, 0x06, 0x27, 0x06, 0x10,
+    0x22, 0x10, 0x23, 0x12, 0x22, 0x12, 0x23, 0x13,
+    0x22, 0x13, 0x23, 0x0c, 0x22, 0x0c, 0x23, 0x0d,
+    0x22, 0x0d, 0x23, 0x06, 0x22, 0x06, 0x23, 0x05,
+    0x22, 0x05, 0x23, 0x07, 0x22, 0x07, 0x23, 0x0e,
+    0x22, 0x0e, 0x23, 0x0f, 0x22, 0x0f, 0x23, 0x0d,
+    0x05, 0x0d, 0x06, 0x0d, 0x07, 0x0d, 0x1e, 0x0d,
+    0x0a, 0x0c, 0x0a, 0x0e, 0x0a, 0x0f, 0x0a, 0x10,
+    0x22, 0x10, 0x23, 0x12, 0x22, 0x12, 0x23, 0x13,
+    0x22, 0x13, 0x23, 0x0c, 0x22, 0x0c, 0x23, 0x0d,
+    0x22, 0x0d, 0x23, 0x06, 0x22, 0x06, 0x23, 0x05,
+    0x22, 0x05, 0x23, 0x07, 0x22, 0x07, 0x23, 0x0e,
+    0x22, 0x0e, 0x23, 0x0f, 0x22, 0x0f, 0x23, 0x0d,
+    0x05, 0x0d, 0x06, 0x0d, 0x07, 0x0d, 0x1e, 0x0d,
+    0x0a, 0x0c, 0x0a, 0x0e, 0x0a, 0x0f, 0x0a, 0x0d,
+    0x05, 0x0d, 0x06, 0x0d, 0x07, 0x0d, 0x1e, 0x0c,
+    0x20, 0x0d, 0x20, 0x10, 0x1e, 0x0c, 0x05, 0x0c,
+    0x06, 0x0c, 0x07, 0x0d, 0x05, 0x0d, 0x06, 0x0d,
+    0x07, 0x10, 0x1e, 0x11, 0x1e, 0x00, 0x24, 0x00,
+    0x24, 0x2a, 0x06, 0x00, 0x02, 0x1b, 0x00, 0x03,
+    0x02, 0x00, 0x03, 0x02, 0x00, 0x03, 0x1b, 0x00,
+    0x04, 0x1b, 0x00, 0x1b, 0x02, 0x00, 0x1b, 0x03,
+    0x00, 0x1b, 0x04, 0x02, 0x1b, 0x03, 0x02, 0x1b,
+    0x03, 0x03, 0x1b, 0x20, 0x03, 0x1b, 0x1f, 0x09,
+    0x03, 0x02, 0x09, 0x02, 0x03, 0x09, 0x02, 0x1f,
+    0x09, 0x1b, 0x03, 0x09, 0x1b, 0x03, 0x09, 0x1b,
+    0x02, 0x09, 0x1b, 0x1b, 0x09, 0x1b, 0x1b, 0x0b,
+    0x03, 0x03, 0x0b, 0x03, 0x03, 0x0b, 0x1b, 0x1b,
+    0x0a, 0x03, 0x1b, 0x0a, 0x03, 0x1b, 0x0a, 0x02,
+    0x20, 0x0a, 0x1b, 0x04, 0x0a, 0x1b, 0x04, 0x0a,
+    0x1b, 0x1b, 0x0a, 0x1b, 0x1b, 0x0c, 0x03, 0x1f,
+    0x0c, 0x04, 0x1b, 0x0c, 0x04, 0x1b, 0x0d, 0x1b,
+    0x03, 0x0d, 0x1b, 0x03, 0x0d, 0x1b, 0x1b, 0x0d,
+    0x1b, 0x20, 0x0f, 0x02, 0x1b, 0x0f, 0x1b, 0x1b,
+    0x0f, 0x1b, 0x1b, 0x0f, 0x1b, 0x1f, 0x10, 0x1b,
+    0x1b, 0x10, 0x1b, 0x20, 0x10, 0x1b, 0x1f, 0x17,
+    0x04, 0x1b, 0x17, 0x04, 0x1b, 0x18, 0x1b, 0x03,
+    0x18, 0x1b, 0x1b, 0x1a, 0x03, 0x1b, 0x1a, 0x03,
+    0x20, 0x1a, 0x03, 0x1f, 0x1a, 0x02, 0x02, 0x1a,
+    0x02, 0x02, 0x1a, 0x04, 0x1b, 0x1a, 0x04, 0x1b,
+    0x1a, 0x1b, 0x03, 0x1a, 0x1b, 0x03, 0x1b, 0x03,
+    0x02, 0x1b, 0x03, 0x1b, 0x1b, 0x03, 0x20, 0x1b,
+    0x02, 0x03, 0x1b, 0x02, 0x1b, 0x1b, 0x04, 0x02,
+    0x1b, 0x04, 0x1b, 0x28, 0x06, 0x1d, 0x04, 0x06,
+    0x1f, 0x1d, 0x04, 0x1f, 0x1d, 0x1d, 0x1e, 0x05,
+    0x1d, 0x1e, 0x05, 0x21, 0x1e, 0x04, 0x1d, 0x1e,
+    0x04, 0x1d, 0x1e, 0x04, 0x21, 0x1e, 0x1d, 0x22,
+    0x1e, 0x1d, 0x21, 0x22, 0x1d, 0x1d, 0x22, 0x1d,
+    0x1d, 0x00, 0x06, 0x22, 0x02, 0x04, 0x22, 0x02,
+    0x04, 0x21, 0x02, 0x06, 0x22, 0x02, 0x06, 0x21,
+    0x02, 0x1d, 0x22, 0x02, 0x1d, 0x21, 0x04, 0x1d,
+    0x22, 0x04, 0x05, 0x21, 0x04, 0x1d, 0x21, 0x0b,
+    0x06, 0x21, 0x0d, 0x05, 0x22, 0x0c, 0x05, 0x22,
+    0x0e, 0x05, 0x22, 0x1c, 0x04, 0x22, 0x1c, 0x1d,
+    0x22, 0x22, 0x05, 0x22, 0x22, 0x04, 0x22, 0x22,
+    0x1d, 0x22, 0x1d, 0x1d, 0x22, 0x1a, 0x1d, 0x22,
+    0x1e, 0x05, 0x22, 0x1a, 0x1d, 0x05, 0x1c, 0x05,
+    0x1d, 0x11, 0x1d, 0x22, 0x1b, 0x1d, 0x22, 0x1e,
+    0x04, 0x05, 0x1d, 0x06, 0x22, 0x1c, 0x04, 0x1d,
+    0x1b, 0x1d, 0x1d, 0x1c, 0x04, 0x1d, 0x1e, 0x04,
+    0x05, 0x04, 0x05, 0x22, 0x05, 0x04, 0x22, 0x1d,
+    0x04, 0x22, 0x19, 0x1d, 0x22, 0x00, 0x05, 0x22,
+    0x1b, 0x1d, 0x1d, 0x11, 0x04, 0x1d, 0x0d, 0x1d,
+    0x1d, 0x0b, 0x06, 0x22, 0x1e, 0x04, 0x22, 0x35,
+    0x06, 0x00, 0x0f, 0x9d, 0x0d, 0x0f, 0x9d, 0x27,
+    0x06, 0x00, 0x1d, 0x1d, 0x20, 0x00, 0x1c, 0x01,
+    0x0a, 0x1e, 0x06, 0x1e, 0x08, 0x0e, 0x1d, 0x12,
+    0x1e, 0x0a, 0x0c, 0x21, 0x1d, 0x12, 0x1d, 0x23,
+    0x20, 0x21, 0x0c, 0x1d, 0x1e, 0x35, 0x06, 0x00,
+    0x0f, 0x14, 0x27, 0x06, 0x0e, 0x1d, 0x22, 0xff,
+    0x00, 0x1d, 0x1d, 0x20, 0xff, 0x12, 0x1d, 0x23,
+    0x20, 0xff, 0x21, 0x0c, 0x1d, 0x1e, 0x27, 0x06,
+    0x05, 0x1d, 0xff, 0x05, 0x1d, 0x00, 0x1d, 0x20,
+    0x27, 0x06, 0x0a, 0xa5, 0x00, 0x1d, 0x2c, 0x00,
+    0x01, 0x30, 0x02, 0x30, 0x3a, 0x00, 0x3b, 0x00,
+    0x21, 0x00, 0x3f, 0x00, 0x16, 0x30, 0x17, 0x30,
+    0x26, 0x20, 0x13, 0x20, 0x12, 0x01, 0x00, 0x5f,
+    0x5f, 0x28, 0x29, 0x7b, 0x7d, 0x08, 0x30, 0x0c,
+    0x0d, 0x08, 0x09, 0x02, 0x03, 0x00, 0x01, 0x04,
+    0x05, 0x06, 0x07, 0x5b, 0x00, 0x5d, 0x00, 0x3e,
+    0x20, 0x3e, 0x20, 0x3e, 0x20, 0x3e, 0x20, 0x5f,
+    0x00, 0x5f, 0x00, 0x5f, 0x00, 0x2c, 0x00, 0x01,
+    0x30, 0x2e, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x3a,
+    0x00, 0x3f, 0x00, 0x21, 0x00, 0x14, 0x20, 0x28,
+    0x00, 0x29, 0x00, 0x7b, 0x00, 0x7d, 0x00, 0x14,
+    0x30, 0x15, 0x30, 0x23, 0x26, 0x2a, 0x2b, 0x2d,
+    0x3c, 0x3e, 0x3d, 0x00, 0x5c, 0x24, 0x25, 0x40,
+    0x40, 0x06, 0xff, 0x0b, 0x00, 0x0b, 0xff, 0x0c,
+    0x20, 0x00, 0x4d, 0x06, 0x40, 0x06, 0xff, 0x0e,
+    0x00, 0x0e, 0xff, 0x0f, 0x00, 0x0f, 0xff, 0x10,
+    0x00, 0x10, 0xff, 0x11, 0x00, 0x11, 0xff, 0x12,
+    0x00, 0x12, 0x21, 0x06, 0x00, 0x01, 0x01, 0x02,
+    0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x05,
+    0x05, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x08,
+    0x08, 0x09, 0x09, 0x09, 0x09, 0x0a, 0x0a, 0x0a,
+    0x0a, 0x0b, 0x0b, 0x0b, 0x0b, 0x0c, 0x0c, 0x0c,
+    0x0c, 0x0d, 0x0d, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f,
+    0x0f, 0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x12,
+    0x12, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14,
+    0x14, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16,
+    0x16, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18,
+    0x18, 0x19, 0x19, 0x19, 0x19, 0x20, 0x20, 0x20,
+    0x20, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22,
+    0x22, 0x23, 0x23, 0x23, 0x23, 0x24, 0x24, 0x24,
+    0x24, 0x25, 0x25, 0x25, 0x25, 0x26, 0x26, 0x26,
+    0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29, 0x29,
+    0x29, 0x22, 0x06, 0x22, 0x00, 0x22, 0x00, 0x22,
+    0x01, 0x22, 0x01, 0x22, 0x03, 0x22, 0x03, 0x22,
+    0x05, 0x22, 0x05, 0x21, 0x00, 0x85, 0x29, 0x01,
+    0x30, 0x01, 0x0b, 0x0c, 0x00, 0xfa, 0xf1, 0xa0,
+    0xa2, 0xa4, 0xa6, 0xa8, 0xe2, 0xe4, 0xe6, 0xc2,
+    0xfb, 0xa1, 0xa3, 0xa5, 0xa7, 0xa9, 0xaa, 0xac,
+    0xae, 0xb0, 0xb2, 0xb4, 0xb6, 0xb8, 0xba, 0xbc,
+    0xbe, 0xc0, 0xc3, 0xc5, 0xc7, 0xc9, 0xca, 0xcb,
+    0xcc, 0xcd, 0xce, 0xd1, 0xd4, 0xd7, 0xda, 0xdd,
+    0xde, 0xdf, 0xe0, 0xe1, 0xe3, 0xe5, 0xe7, 0xe8,
+    0xe9, 0xea, 0xeb, 0xec, 0xee, 0xf2, 0x98, 0x99,
+    0x31, 0x31, 0x4f, 0x31, 0x55, 0x31, 0x5b, 0x31,
+    0x61, 0x31, 0xa2, 0x00, 0xa3, 0x00, 0xac, 0x00,
+    0xaf, 0x00, 0xa6, 0x00, 0xa5, 0x00, 0xa9, 0x20,
+    0x00, 0x00, 0x02, 0x25, 0x90, 0x21, 0x91, 0x21,
+    0x92, 0x21, 0x93, 0x21, 0xa0, 0x25, 0xcb, 0x25,
+    0xd0, 0x02, 0xd1, 0x02, 0xe6, 0x00, 0x99, 0x02,
+    0x53, 0x02, 0x00, 0x00, 0xa3, 0x02, 0x66, 0xab,
+    0xa5, 0x02, 0xa4, 0x02, 0x56, 0x02, 0x57, 0x02,
+    0x91, 0x1d, 0x58, 0x02, 0x5e, 0x02, 0xa9, 0x02,
+    0x64, 0x02, 0x62, 0x02, 0x60, 0x02, 0x9b, 0x02,
+    0x27, 0x01, 0x9c, 0x02, 0x67, 0x02, 0x84, 0x02,
+    0xaa, 0x02, 0xab, 0x02, 0x6c, 0x02, 0x04, 0xdf,
+    0x8e, 0xa7, 0x6e, 0x02, 0x05, 0xdf, 0x8e, 0x02,
+    0x06, 0xdf, 0xf8, 0x00, 0x76, 0x02, 0x77, 0x02,
+    0x71, 0x00, 0x7a, 0x02, 0x08, 0xdf, 0x7d, 0x02,
+    0x7e, 0x02, 0x80, 0x02, 0xa8, 0x02, 0xa6, 0x02,
+    0x67, 0xab, 0xa7, 0x02, 0x88, 0x02, 0x71, 0x2c,
+    0x00, 0x00, 0x8f, 0x02, 0xa1, 0x02, 0xa2, 0x02,
+    0x98, 0x02, 0xc0, 0x01, 0xc1, 0x01, 0xc2, 0x01,
+    0x0a, 0xdf, 0x1e, 0xdf, 0x41, 0x04, 0x40, 0x00,
+    0x00, 0x00, 0x00, 0x14, 0x99, 0x10, 0xba, 0x10,
+    0x00, 0x00, 0x00, 0x00, 0x9b, 0x10, 0xba, 0x10,
+    0x05, 0x05, 0xa5, 0x10, 0xba, 0x10, 0x05, 0x31,
+    0x11, 0x27, 0x11, 0x32, 0x11, 0x27, 0x11, 0x55,
+    0x47, 0x13, 0x3e, 0x13, 0x47, 0x13, 0x57, 0x13,
+    0x55, 0xb9, 0x14, 0xba, 0x14, 0xb9, 0x14, 0xb0,
+    0x14, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x14, 0xbd,
+    0x14, 0x55, 0x50, 0xb8, 0x15, 0xaf, 0x15, 0xb9,
+    0x15, 0xaf, 0x15, 0x55, 0x35, 0x19, 0x30, 0x19,
+    0x05, 0x57, 0xd1, 0x65, 0xd1, 0x58, 0xd1, 0x65,
+    0xd1, 0x5f, 0xd1, 0x6e, 0xd1, 0x5f, 0xd1, 0x6f,
+    0xd1, 0x5f, 0xd1, 0x70, 0xd1, 0x5f, 0xd1, 0x71,
+    0xd1, 0x5f, 0xd1, 0x72, 0xd1, 0x55, 0x55, 0x55,
+    0x05, 0xb9, 0xd1, 0x65, 0xd1, 0xba, 0xd1, 0x65,
+    0xd1, 0xbb, 0xd1, 0x6e, 0xd1, 0xbc, 0xd1, 0x6e,
+    0xd1, 0xbb, 0xd1, 0x6f, 0xd1, 0xbc, 0xd1, 0x6f,
+    0xd1, 0x55, 0x55, 0x55, 0x41, 0x00, 0x61, 0x00,
+    0x41, 0x00, 0x61, 0x00, 0x69, 0x00, 0x41, 0x00,
+    0x61, 0x00, 0x41, 0x00, 0x43, 0x44, 0x00, 0x00,
+    0x47, 0x00, 0x00, 0x4a, 0x4b, 0x00, 0x00, 0x4e,
+    0x4f, 0x50, 0x51, 0x00, 0x53, 0x54, 0x55, 0x56,
+    0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63, 0x64,
+    0x00, 0x66, 0x68, 0x00, 0x70, 0x00, 0x41, 0x00,
+    0x61, 0x00, 0x41, 0x42, 0x00, 0x44, 0x45, 0x46,
+    0x47, 0x4a, 0x00, 0x53, 0x00, 0x61, 0x00, 0x41,
+    0x42, 0x00, 0x44, 0x45, 0x46, 0x47, 0x00, 0x49,
+    0x4a, 0x4b, 0x4c, 0x4d, 0x00, 0x4f, 0x53, 0x00,
+    0x61, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41, 0x00,
+    0x61, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41, 0x00,
+    0x61, 0x00, 0x41, 0x00, 0x61, 0x00, 0x41, 0x00,
+    0x61, 0x00, 0x31, 0x01, 0x37, 0x02, 0x91, 0x03,
+    0xa3, 0x03, 0xb1, 0x03, 0xd1, 0x03, 0x24, 0x00,
+    0x1f, 0x04, 0x20, 0x05, 0x91, 0x03, 0xa3, 0x03,
+    0xb1, 0x03, 0xd1, 0x03, 0x24, 0x00, 0x1f, 0x04,
+    0x20, 0x05, 0x91, 0x03, 0xa3, 0x03, 0xb1, 0x03,
+    0xd1, 0x03, 0x24, 0x00, 0x1f, 0x04, 0x20, 0x05,
+    0x91, 0x03, 0xa3, 0x03, 0xb1, 0x03, 0xd1, 0x03,
+    0x24, 0x00, 0x1f, 0x04, 0x20, 0x05, 0x91, 0x03,
+    0xa3, 0x03, 0xb1, 0x03, 0xd1, 0x03, 0x24, 0x00,
+    0x1f, 0x04, 0x20, 0x05, 0x0b, 0x0c, 0x30, 0x00,
+    0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00,
+    0x30, 0x04, 0x3a, 0x04, 0x3e, 0x04, 0x4b, 0x04,
+    0x4d, 0x04, 0x4e, 0x04, 0x89, 0xa6, 0x30, 0x04,
+    0xa9, 0x26, 0x28, 0xb9, 0x7f, 0x9f, 0x00, 0x01,
+    0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0a,
+    0x0b, 0x0e, 0x0f, 0x11, 0x13, 0x14, 0x15, 0x16,
+    0x17, 0x18, 0x1a, 0x1b, 0x61, 0x26, 0x25, 0x2f,
+    0x7b, 0x51, 0xa6, 0xb1, 0x04, 0x27, 0x06, 0x00,
+    0x01, 0x05, 0x08, 0x2a, 0x06, 0x1e, 0x08, 0x03,
+    0x0d, 0x20, 0x19, 0x1a, 0x1b, 0x1c, 0x09, 0x0f,
+    0x17, 0x0b, 0x18, 0x07, 0x0a, 0x00, 0x01, 0x04,
+    0x06, 0x0c, 0x0e, 0x10, 0x44, 0x90, 0x77, 0x45,
+    0x28, 0x06, 0x2c, 0x06, 0x00, 0x00, 0x47, 0x06,
+    0x33, 0x06, 0x17, 0x10, 0x11, 0x12, 0x13, 0x00,
+    0x06, 0x0e, 0x02, 0x0f, 0x34, 0x06, 0x2a, 0x06,
+    0x2b, 0x06, 0x2e, 0x06, 0x00, 0x00, 0x36, 0x06,
+    0x00, 0x00, 0x3a, 0x06, 0x2d, 0x06, 0x00, 0x00,
+    0x4a, 0x06, 0x00, 0x00, 0x44, 0x06, 0x00, 0x00,
+    0x46, 0x06, 0x33, 0x06, 0x39, 0x06, 0x00, 0x00,
+    0x35, 0x06, 0x42, 0x06, 0x00, 0x00, 0x34, 0x06,
+    0x00, 0x00, 0x00, 0x00, 0x2e, 0x06, 0x00, 0x00,
+    0x36, 0x06, 0x00, 0x00, 0x3a, 0x06, 0x00, 0x00,
+    0xba, 0x06, 0x00, 0x00, 0x6f, 0x06, 0x00, 0x00,
+    0x28, 0x06, 0x2c, 0x06, 0x00, 0x00, 0x47, 0x06,
+    0x00, 0x00, 0x00, 0x00, 0x2d, 0x06, 0x37, 0x06,
+    0x4a, 0x06, 0x43, 0x06, 0x00, 0x00, 0x45, 0x06,
+    0x46, 0x06, 0x33, 0x06, 0x39, 0x06, 0x41, 0x06,
+    0x35, 0x06, 0x42, 0x06, 0x00, 0x00, 0x34, 0x06,
+    0x2a, 0x06, 0x2b, 0x06, 0x2e, 0x06, 0x00, 0x00,
+    0x36, 0x06, 0x38, 0x06, 0x3a, 0x06, 0x6e, 0x06,
+    0x00, 0x00, 0xa1, 0x06, 0x27, 0x06, 0x00, 0x01,
+    0x05, 0x08, 0x20, 0x21, 0x0b, 0x06, 0x10, 0x23,
+    0x2a, 0x06, 0x1a, 0x1b, 0x1c, 0x09, 0x0f, 0x17,
+    0x0b, 0x18, 0x07, 0x0a, 0x00, 0x01, 0x04, 0x06,
+    0x0c, 0x0e, 0x10, 0x28, 0x06, 0x2c, 0x06, 0x2f,
+    0x06, 0x00, 0x00, 0x48, 0x06, 0x32, 0x06, 0x2d,
+    0x06, 0x37, 0x06, 0x4a, 0x06, 0x2a, 0x06, 0x1a,
+    0x1b, 0x1c, 0x09, 0x0f, 0x17, 0x0b, 0x18, 0x07,
+    0x0a, 0x00, 0x01, 0x04, 0x06, 0x0c, 0x0e, 0x10,
+    0x30, 0x2e, 0x30, 0x00, 0x2c, 0x00, 0x28, 0x00,
+    0x41, 0x00, 0x29, 0x00, 0x14, 0x30, 0x53, 0x00,
+    0x15, 0x30, 0x43, 0x52, 0x43, 0x44, 0x57, 0x5a,
+    0x41, 0x00, 0x48, 0x56, 0x4d, 0x56, 0x53, 0x44,
+    0x53, 0x53, 0x50, 0x50, 0x56, 0x57, 0x43, 0x4d,
+    0x43, 0x4d, 0x44, 0x4d, 0x52, 0x44, 0x4a, 0x4b,
+    0x30, 0x30, 0x00, 0x68, 0x68, 0x4b, 0x62, 0x57,
+    0x5b, 0xcc, 0x53, 0xc7, 0x30, 0x8c, 0x4e, 0x1a,
+    0x59, 0xe3, 0x89, 0x29, 0x59, 0xa4, 0x4e, 0x20,
+    0x66, 0x21, 0x71, 0x99, 0x65, 0x4d, 0x52, 0x8c,
+    0x5f, 0x8d, 0x51, 0xb0, 0x65, 0x1d, 0x52, 0x42,
+    0x7d, 0x1f, 0x75, 0xa9, 0x8c, 0xf0, 0x58, 0x39,
+    0x54, 0x14, 0x6f, 0x95, 0x62, 0x55, 0x63, 0x00,
+    0x4e, 0x09, 0x4e, 0x4a, 0x90, 0xe6, 0x5d, 0x2d,
+    0x4e, 0xf3, 0x53, 0x07, 0x63, 0x70, 0x8d, 0x53,
+    0x62, 0x81, 0x79, 0x7a, 0x7a, 0x08, 0x54, 0x80,
+    0x6e, 0x09, 0x67, 0x08, 0x67, 0x33, 0x75, 0x72,
+    0x52, 0xb6, 0x55, 0x4d, 0x91, 0x14, 0x30, 0x15,
+    0x30, 0x2c, 0x67, 0x09, 0x4e, 0x8c, 0x4e, 0x89,
+    0x5b, 0xb9, 0x70, 0x53, 0x62, 0xd7, 0x76, 0xdd,
+    0x52, 0x57, 0x65, 0x97, 0x5f, 0xef, 0x53, 0x30,
+    0x00, 0x38, 0x4e, 0x05, 0x00, 0x09, 0x22, 0x01,
+    0x60, 0x4f, 0xae, 0x4f, 0xbb, 0x4f, 0x02, 0x50,
+    0x7a, 0x50, 0x99, 0x50, 0xe7, 0x50, 0xcf, 0x50,
+    0x9e, 0x34, 0x3a, 0x06, 0x4d, 0x51, 0x54, 0x51,
+    0x64, 0x51, 0x77, 0x51, 0x1c, 0x05, 0xb9, 0x34,
+    0x67, 0x51, 0x8d, 0x51, 0x4b, 0x05, 0x97, 0x51,
+    0xa4, 0x51, 0xcc, 0x4e, 0xac, 0x51, 0xb5, 0x51,
+    0xdf, 0x91, 0xf5, 0x51, 0x03, 0x52, 0xdf, 0x34,
+    0x3b, 0x52, 0x46, 0x52, 0x72, 0x52, 0x77, 0x52,
+    0x15, 0x35, 0x02, 0x00, 0x20, 0x80, 0x80, 0x00,
+    0x08, 0x00, 0x00, 0xc7, 0x52, 0x00, 0x02, 0x1d,
+    0x33, 0x3e, 0x3f, 0x50, 0x82, 0x8a, 0x93, 0xac,
+    0xb6, 0xb8, 0xb8, 0xb8, 0x2c, 0x0a, 0x70, 0x70,
+    0xca, 0x53, 0xdf, 0x53, 0x63, 0x0b, 0xeb, 0x53,
+    0xf1, 0x53, 0x06, 0x54, 0x9e, 0x54, 0x38, 0x54,
+    0x48, 0x54, 0x68, 0x54, 0xa2, 0x54, 0xf6, 0x54,
+    0x10, 0x55, 0x53, 0x55, 0x63, 0x55, 0x84, 0x55,
+    0x84, 0x55, 0x99, 0x55, 0xab, 0x55, 0xb3, 0x55,
+    0xc2, 0x55, 0x16, 0x57, 0x06, 0x56, 0x17, 0x57,
+    0x51, 0x56, 0x74, 0x56, 0x07, 0x52, 0xee, 0x58,
+    0xce, 0x57, 0xf4, 0x57, 0x0d, 0x58, 0x8b, 0x57,
+    0x32, 0x58, 0x31, 0x58, 0xac, 0x58, 0xe4, 0x14,
+    0xf2, 0x58, 0xf7, 0x58, 0x06, 0x59, 0x1a, 0x59,
+    0x22, 0x59, 0x62, 0x59, 0xa8, 0x16, 0xea, 0x16,
+    0xec, 0x59, 0x1b, 0x5a, 0x27, 0x5a, 0xd8, 0x59,
+    0x66, 0x5a, 0xee, 0x36, 0xfc, 0x36, 0x08, 0x5b,
+    0x3e, 0x5b, 0x3e, 0x5b, 0xc8, 0x19, 0xc3, 0x5b,
+    0xd8, 0x5b, 0xe7, 0x5b, 0xf3, 0x5b, 0x18, 0x1b,
+    0xff, 0x5b, 0x06, 0x5c, 0x53, 0x5f, 0x22, 0x5c,
+    0x81, 0x37, 0x60, 0x5c, 0x6e, 0x5c, 0xc0, 0x5c,
+    0x8d, 0x5c, 0xe4, 0x1d, 0x43, 0x5d, 0xe6, 0x1d,
+    0x6e, 0x5d, 0x6b, 0x5d, 0x7c, 0x5d, 0xe1, 0x5d,
+    0xe2, 0x5d, 0x2f, 0x38, 0xfd, 0x5d, 0x28, 0x5e,
+    0x3d, 0x5e, 0x69, 0x5e, 0x62, 0x38, 0x83, 0x21,
+    0x7c, 0x38, 0xb0, 0x5e, 0xb3, 0x5e, 0xb6, 0x5e,
+    0xca, 0x5e, 0x92, 0xa3, 0xfe, 0x5e, 0x31, 0x23,
+    0x31, 0x23, 0x01, 0x82, 0x22, 0x5f, 0x22, 0x5f,
+    0xc7, 0x38, 0xb8, 0x32, 0xda, 0x61, 0x62, 0x5f,
+    0x6b, 0x5f, 0xe3, 0x38, 0x9a, 0x5f, 0xcd, 0x5f,
+    0xd7, 0x5f, 0xf9, 0x5f, 0x81, 0x60, 0x3a, 0x39,
+    0x1c, 0x39, 0x94, 0x60, 0xd4, 0x26, 0xc7, 0x60,
+    0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x00, 0x0a, 0x00, 0x00, 0x02, 0x08,
+    0x00, 0x80, 0x08, 0x00, 0x00, 0x08, 0x80, 0x28,
+    0x80, 0x02, 0x00, 0x00, 0x02, 0x48, 0x61, 0x00,
+    0x04, 0x06, 0x04, 0x32, 0x46, 0x6a, 0x5c, 0x67,
+    0x96, 0xaa, 0xae, 0xc8, 0xd3, 0x5d, 0x62, 0x00,
+    0x54, 0x77, 0xf3, 0x0c, 0x2b, 0x3d, 0x63, 0xfc,
+    0x62, 0x68, 0x63, 0x83, 0x63, 0xe4, 0x63, 0xf1,
+    0x2b, 0x22, 0x64, 0xc5, 0x63, 0xa9, 0x63, 0x2e,
+    0x3a, 0x69, 0x64, 0x7e, 0x64, 0x9d, 0x64, 0x77,
+    0x64, 0x6c, 0x3a, 0x4f, 0x65, 0x6c, 0x65, 0x0a,
+    0x30, 0xe3, 0x65, 0xf8, 0x66, 0x49, 0x66, 0x19,
+    0x3b, 0x91, 0x66, 0x08, 0x3b, 0xe4, 0x3a, 0x92,
+    0x51, 0x95, 0x51, 0x00, 0x67, 0x9c, 0x66, 0xad,
+    0x80, 0xd9, 0x43, 0x17, 0x67, 0x1b, 0x67, 0x21,
+    0x67, 0x5e, 0x67, 0x53, 0x67, 0xc3, 0x33, 0x49,
+    0x3b, 0xfa, 0x67, 0x85, 0x67, 0x52, 0x68, 0x85,
+    0x68, 0x6d, 0x34, 0x8e, 0x68, 0x1f, 0x68, 0x14,
+    0x69, 0x9d, 0x3b, 0x42, 0x69, 0xa3, 0x69, 0xea,
+    0x69, 0xa8, 0x6a, 0xa3, 0x36, 0xdb, 0x6a, 0x18,
+    0x3c, 0x21, 0x6b, 0xa7, 0x38, 0x54, 0x6b, 0x4e,
+    0x3c, 0x72, 0x6b, 0x9f, 0x6b, 0xba, 0x6b, 0xbb,
+    0x6b, 0x8d, 0x3a, 0x0b, 0x1d, 0xfa, 0x3a, 0x4e,
+    0x6c, 0xbc, 0x3c, 0xbf, 0x6c, 0xcd, 0x6c, 0x67,
+    0x6c, 0x16, 0x6d, 0x3e, 0x6d, 0x77, 0x6d, 0x41,
+    0x6d, 0x69, 0x6d, 0x78, 0x6d, 0x85, 0x6d, 0x1e,
+    0x3d, 0x34, 0x6d, 0x2f, 0x6e, 0x6e, 0x6e, 0x33,
+    0x3d, 0xcb, 0x6e, 0xc7, 0x6e, 0xd1, 0x3e, 0xf9,
+    0x6d, 0x6e, 0x6f, 0x5e, 0x3f, 0x8e, 0x3f, 0xc6,
+    0x6f, 0x39, 0x70, 0x1e, 0x70, 0x1b, 0x70, 0x96,
+    0x3d, 0x4a, 0x70, 0x7d, 0x70, 0x77, 0x70, 0xad,
+    0x70, 0x25, 0x05, 0x45, 0x71, 0x63, 0x42, 0x9c,
+    0x71, 0xab, 0x43, 0x28, 0x72, 0x35, 0x72, 0x50,
+    0x72, 0x08, 0x46, 0x80, 0x72, 0x95, 0x72, 0x35,
+    0x47, 0x02, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00,
+    0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0x02, 0x02,
+    0x80, 0x8a, 0x00, 0x00, 0x20, 0x00, 0x08, 0x0a,
+    0x00, 0x80, 0x88, 0x80, 0x20, 0x14, 0x48, 0x7a,
+    0x73, 0x8b, 0x73, 0xac, 0x3e, 0xa5, 0x73, 0xb8,
+    0x3e, 0xb8, 0x3e, 0x47, 0x74, 0x5c, 0x74, 0x71,
+    0x74, 0x85, 0x74, 0xca, 0x74, 0x1b, 0x3f, 0x24,
+    0x75, 0x36, 0x4c, 0x3e, 0x75, 0x92, 0x4c, 0x70,
+    0x75, 0x9f, 0x21, 0x10, 0x76, 0xa1, 0x4f, 0xb8,
+    0x4f, 0x44, 0x50, 0xfc, 0x3f, 0x08, 0x40, 0xf4,
+    0x76, 0xf3, 0x50, 0xf2, 0x50, 0x19, 0x51, 0x33,
+    0x51, 0x1e, 0x77, 0x1f, 0x77, 0x1f, 0x77, 0x4a,
+    0x77, 0x39, 0x40, 0x8b, 0x77, 0x46, 0x40, 0x96,
+    0x40, 0x1d, 0x54, 0x4e, 0x78, 0x8c, 0x78, 0xcc,
+    0x78, 0xe3, 0x40, 0x26, 0x56, 0x56, 0x79, 0x9a,
+    0x56, 0xc5, 0x56, 0x8f, 0x79, 0xeb, 0x79, 0x2f,
+    0x41, 0x40, 0x7a, 0x4a, 0x7a, 0x4f, 0x7a, 0x7c,
+    0x59, 0xa7, 0x5a, 0xa7, 0x5a, 0xee, 0x7a, 0x02,
+    0x42, 0xab, 0x5b, 0xc6, 0x7b, 0xc9, 0x7b, 0x27,
+    0x42, 0x80, 0x5c, 0xd2, 0x7c, 0xa0, 0x42, 0xe8,
+    0x7c, 0xe3, 0x7c, 0x00, 0x7d, 0x86, 0x5f, 0x63,
+    0x7d, 0x01, 0x43, 0xc7, 0x7d, 0x02, 0x7e, 0x45,
+    0x7e, 0x34, 0x43, 0x28, 0x62, 0x47, 0x62, 0x59,
+    0x43, 0xd9, 0x62, 0x7a, 0x7f, 0x3e, 0x63, 0x95,
+    0x7f, 0xfa, 0x7f, 0x05, 0x80, 0xda, 0x64, 0x23,
+    0x65, 0x60, 0x80, 0xa8, 0x65, 0x70, 0x80, 0x5f,
+    0x33, 0xd5, 0x43, 0xb2, 0x80, 0x03, 0x81, 0x0b,
+    0x44, 0x3e, 0x81, 0xb5, 0x5a, 0xa7, 0x67, 0xb5,
+    0x67, 0x93, 0x33, 0x9c, 0x33, 0x01, 0x82, 0x04,
+    0x82, 0x9e, 0x8f, 0x6b, 0x44, 0x91, 0x82, 0x8b,
+    0x82, 0x9d, 0x82, 0xb3, 0x52, 0xb1, 0x82, 0xb3,
+    0x82, 0xbd, 0x82, 0xe6, 0x82, 0x3c, 0x6b, 0xe5,
+    0x82, 0x1d, 0x83, 0x63, 0x83, 0xad, 0x83, 0x23,
+    0x83, 0xbd, 0x83, 0xe7, 0x83, 0x57, 0x84, 0x53,
+    0x83, 0xca, 0x83, 0xcc, 0x83, 0xdc, 0x83, 0x36,
+    0x6c, 0x6b, 0x6d, 0x02, 0x00, 0x00, 0x20, 0x22,
+    0x2a, 0xa0, 0x0a, 0x00, 0x20, 0x80, 0x28, 0x00,
+    0xa8, 0x20, 0x20, 0x00, 0x02, 0x80, 0x22, 0x02,
+    0x8a, 0x08, 0x00, 0xaa, 0x00, 0x00, 0x00, 0x02,
+    0x00, 0x00, 0x28, 0xd5, 0x6c, 0x2b, 0x45, 0xf1,
+    0x84, 0xf3, 0x84, 0x16, 0x85, 0xca, 0x73, 0x64,
+    0x85, 0x2c, 0x6f, 0x5d, 0x45, 0x61, 0x45, 0xb1,
+    0x6f, 0xd2, 0x70, 0x6b, 0x45, 0x50, 0x86, 0x5c,
+    0x86, 0x67, 0x86, 0x69, 0x86, 0xa9, 0x86, 0x88,
+    0x86, 0x0e, 0x87, 0xe2, 0x86, 0x79, 0x87, 0x28,
+    0x87, 0x6b, 0x87, 0x86, 0x87, 0xd7, 0x45, 0xe1,
+    0x87, 0x01, 0x88, 0xf9, 0x45, 0x60, 0x88, 0x63,
+    0x88, 0x67, 0x76, 0xd7, 0x88, 0xde, 0x88, 0x35,
+    0x46, 0xfa, 0x88, 0xbb, 0x34, 0xae, 0x78, 0x66,
+    0x79, 0xbe, 0x46, 0xc7, 0x46, 0xa0, 0x8a, 0xed,
+    0x8a, 0x8a, 0x8b, 0x55, 0x8c, 0xa8, 0x7c, 0xab,
+    0x8c, 0xc1, 0x8c, 0x1b, 0x8d, 0x77, 0x8d, 0x2f,
+    0x7f, 0x04, 0x08, 0xcb, 0x8d, 0xbc, 0x8d, 0xf0,
+    0x8d, 0xde, 0x08, 0xd4, 0x8e, 0x38, 0x8f, 0xd2,
+    0x85, 0xed, 0x85, 0x94, 0x90, 0xf1, 0x90, 0x11,
+    0x91, 0x2e, 0x87, 0x1b, 0x91, 0x38, 0x92, 0xd7,
+    0x92, 0xd8, 0x92, 0x7c, 0x92, 0xf9, 0x93, 0x15,
+    0x94, 0xfa, 0x8b, 0x8b, 0x95, 0x95, 0x49, 0xb7,
+    0x95, 0x77, 0x8d, 0xe6, 0x49, 0xc3, 0x96, 0xb2,
+    0x5d, 0x23, 0x97, 0x45, 0x91, 0x1a, 0x92, 0x6e,
+    0x4a, 0x76, 0x4a, 0xe0, 0x97, 0x0a, 0x94, 0xb2,
+    0x4a, 0x96, 0x94, 0x0b, 0x98, 0x0b, 0x98, 0x29,
+    0x98, 0xb6, 0x95, 0xe2, 0x98, 0x33, 0x4b, 0x29,
+    0x99, 0xa7, 0x99, 0xc2, 0x99, 0xfe, 0x99, 0xce,
+    0x4b, 0x30, 0x9b, 0x12, 0x9b, 0x40, 0x9c, 0xfd,
+    0x9c, 0xce, 0x4c, 0xed, 0x4c, 0x67, 0x9d, 0xce,
+    0xa0, 0xf8, 0x4c, 0x05, 0xa1, 0x0e, 0xa2, 0x91,
+    0xa2, 0xbb, 0x9e, 0x56, 0x4d, 0xf9, 0x9e, 0xfe,
+    0x9e, 0x05, 0x9f, 0x0f, 0x9f, 0x16, 0x9f, 0x3b,
+    0x9f, 0x00, 0xa6, 0x02, 0x88, 0xa0, 0x00, 0x00,
+    0x00, 0x00, 0x80, 0x00, 0x28, 0x00, 0x08, 0xa0,
+    0x80, 0xa0, 0x80, 0x00, 0x80, 0x80, 0x00, 0x0a,
+    0x88, 0x80, 0x00, 0x80, 0x00, 0x20, 0x2a, 0x00,
+    0x80,
+};
+
+static const uint16_t unicode_comp_table[945] = {
+    0x4a01, 0x49c0, 0x4a02, 0x0280, 0x0281, 0x0282, 0x0283, 0x02c0,
+    0x02c2, 0x0a00, 0x0284, 0x2442, 0x0285, 0x07c0, 0x0980, 0x0982,
+    0x2440, 0x2280, 0x02c4, 0x2282, 0x2284, 0x2286, 0x02c6, 0x02c8,
+    0x02ca, 0x02cc, 0x0287, 0x228a, 0x02ce, 0x228c, 0x2290, 0x2292,
+    0x228e, 0x0288, 0x0289, 0x028a, 0x2482, 0x0300, 0x0302, 0x0304,
+    0x028b, 0x2480, 0x0308, 0x0984, 0x0986, 0x2458, 0x0a02, 0x0306,
+    0x2298, 0x229a, 0x229e, 0x0900, 0x030a, 0x22a0, 0x030c, 0x030e,
+    0x0840, 0x0310, 0x0312, 0x22a2, 0x22a6, 0x09c0, 0x22a4, 0x22a8,
+    0x22aa, 0x028c, 0x028d, 0x028e, 0x0340, 0x0342, 0x0344, 0x0380,
+    0x028f, 0x248e, 0x07c2, 0x0988, 0x098a, 0x2490, 0x0346, 0x22ac,
+    0x0400, 0x22b0, 0x0842, 0x22b2, 0x0402, 0x22b4, 0x0440, 0x0444,
+    0x22b6, 0x0442, 0x22c2, 0x22c0, 0x22c4, 0x22c6, 0x22c8, 0x0940,
+    0x04c0, 0x0291, 0x22ca, 0x04c4, 0x22cc, 0x04c2, 0x22d0, 0x22ce,
+    0x0292, 0x0293, 0x0294, 0x0295, 0x0540, 0x0542, 0x0a08, 0x0296,
+    0x2494, 0x0544, 0x07c4, 0x098c, 0x098e, 0x06c0, 0x2492, 0x0844,
+    0x2308, 0x230a, 0x0580, 0x230c, 0x0584, 0x0990, 0x0992, 0x230e,
+    0x0582, 0x2312, 0x0586, 0x0588, 0x2314, 0x058c, 0x2316, 0x0998,
+    0x058a, 0x231e, 0x0590, 0x2320, 0x099a, 0x058e, 0x2324, 0x2322,
+    0x0299, 0x029a, 0x029b, 0x05c0, 0x05c2, 0x05c4, 0x029c, 0x24ac,
+    0x05c6, 0x05c8, 0x07c6, 0x0994, 0x0996, 0x0700, 0x24aa, 0x2326,
+    0x05ca, 0x232a, 0x2328, 0x2340, 0x2342, 0x2344, 0x2346, 0x05cc,
+    0x234a, 0x2348, 0x234c, 0x234e, 0x2350, 0x24b8, 0x029d, 0x05ce,
+    0x24be, 0x0a0c, 0x2352, 0x0600, 0x24bc, 0x24ba, 0x0640, 0x2354,
+    0x0642, 0x0644, 0x2356, 0x2358, 0x02a0, 0x02a1, 0x02a2, 0x02a3,
+    0x02c1, 0x02c3, 0x0a01, 0x02a4, 0x2443, 0x02a5, 0x07c1, 0x0981,
+    0x0983, 0x2441, 0x2281, 0x02c5, 0x2283, 0x2285, 0x2287, 0x02c7,
+    0x02c9, 0x02cb, 0x02cd, 0x02a7, 0x228b, 0x02cf, 0x228d, 0x2291,
+    0x2293, 0x228f, 0x02a8, 0x02a9, 0x02aa, 0x2483, 0x0301, 0x0303,
+    0x0305, 0x02ab, 0x2481, 0x0309, 0x0985, 0x0987, 0x2459, 0x0a03,
+    0x0307, 0x2299, 0x229b, 0x229f, 0x0901, 0x030b, 0x22a1, 0x030d,
+    0x030f, 0x0841, 0x0311, 0x0313, 0x22a3, 0x22a7, 0x09c1, 0x22a5,
+    0x22a9, 0x22ab, 0x2380, 0x02ac, 0x02ad, 0x02ae, 0x0341, 0x0343,
+    0x0345, 0x02af, 0x248f, 0x07c3, 0x0989, 0x098b, 0x2491, 0x0347,
+    0x22ad, 0x0401, 0x0884, 0x22b1, 0x0843, 0x22b3, 0x0403, 0x22b5,
+    0x0441, 0x0445, 0x22b7, 0x0443, 0x22c3, 0x22c1, 0x22c5, 0x22c7,
+    0x22c9, 0x0941, 0x04c1, 0x02b1, 0x22cb, 0x04c5, 0x22cd, 0x04c3,
+    0x22d1, 0x22cf, 0x02b2, 0x02b3, 0x02b4, 0x02b5, 0x0541, 0x0543,
+    0x0a09, 0x02b6, 0x2495, 0x0545, 0x07c5, 0x098d, 0x098f, 0x06c1,
+    0x2493, 0x0845, 0x2309, 0x230b, 0x0581, 0x230d, 0x0585, 0x0991,
+    0x0993, 0x230f, 0x0583, 0x2313, 0x0587, 0x0589, 0x2315, 0x058d,
+    0x2317, 0x0999, 0x058b, 0x231f, 0x2381, 0x0591, 0x2321, 0x099b,
+    0x058f, 0x2325, 0x2323, 0x02b9, 0x02ba, 0x02bb, 0x05c1, 0x05c3,
+    0x05c5, 0x02bc, 0x24ad, 0x05c7, 0x05c9, 0x07c7, 0x0995, 0x0997,
+    0x0701, 0x24ab, 0x2327, 0x05cb, 0x232b, 0x2329, 0x2341, 0x2343,
+    0x2345, 0x2347, 0x05cd, 0x234b, 0x2349, 0x2382, 0x234d, 0x234f,
+    0x2351, 0x24b9, 0x02bd, 0x05cf, 0x24bf, 0x0a0d, 0x2353, 0x02bf,
+    0x24bd, 0x2383, 0x24bb, 0x0641, 0x2355, 0x0643, 0x0645, 0x2357,
+    0x2359, 0x3101, 0x0c80, 0x2e00, 0x2446, 0x2444, 0x244a, 0x2448,
+    0x0800, 0x0942, 0x0944, 0x0804, 0x2288, 0x2486, 0x2484, 0x248a,
+    0x2488, 0x22ae, 0x2498, 0x2496, 0x249c, 0x249a, 0x2300, 0x0a06,
+    0x2302, 0x0a04, 0x0946, 0x07ce, 0x07ca, 0x07c8, 0x07cc, 0x2447,
+    0x2445, 0x244b, 0x2449, 0x0801, 0x0943, 0x0945, 0x0805, 0x2289,
+    0x2487, 0x2485, 0x248b, 0x2489, 0x22af, 0x2499, 0x2497, 0x249d,
+    0x249b, 0x2301, 0x0a07, 0x2303, 0x0a05, 0x0947, 0x07cf, 0x07cb,
+    0x07c9, 0x07cd, 0x2450, 0x244e, 0x2454, 0x2452, 0x2451, 0x244f,
+    0x2455, 0x2453, 0x2294, 0x2296, 0x2295, 0x2297, 0x2304, 0x2306,
+    0x2305, 0x2307, 0x2318, 0x2319, 0x231a, 0x231b, 0x232c, 0x232d,
+    0x232e, 0x232f, 0x2400, 0x24a2, 0x24a0, 0x24a6, 0x24a4, 0x24a8,
+    0x24a3, 0x24a1, 0x24a7, 0x24a5, 0x24a9, 0x24b0, 0x24ae, 0x24b4,
+    0x24b2, 0x24b6, 0x24b1, 0x24af, 0x24b5, 0x24b3, 0x24b7, 0x0882,
+    0x0880, 0x0881, 0x0802, 0x0803, 0x229c, 0x229d, 0x0a0a, 0x0a0b,
+    0x0883, 0x0b40, 0x2c8a, 0x0c81, 0x2c89, 0x2c88, 0x2540, 0x2541,
+    0x2d00, 0x2e07, 0x0d00, 0x2640, 0x2641, 0x2e80, 0x0d01, 0x26c8,
+    0x26c9, 0x2f00, 0x2f84, 0x0d02, 0x2f83, 0x2f82, 0x0d40, 0x26d8,
+    0x26d9, 0x3186, 0x0d04, 0x2740, 0x2741, 0x3100, 0x3086, 0x0d06,
+    0x3085, 0x3084, 0x0d41, 0x2840, 0x3200, 0x0d07, 0x284f, 0x2850,
+    0x3280, 0x2c84, 0x2e03, 0x2857, 0x0d42, 0x2c81, 0x2c80, 0x24c0,
+    0x24c1, 0x2c86, 0x2c83, 0x28c0, 0x0d43, 0x25c0, 0x25c1, 0x2940,
+    0x0d44, 0x26c0, 0x26c1, 0x2e05, 0x2e02, 0x29c0, 0x0d45, 0x2f05,
+    0x2f04, 0x0d80, 0x26d0, 0x26d1, 0x2f80, 0x2a40, 0x0d82, 0x26e0,
+    0x26e1, 0x3080, 0x3081, 0x2ac0, 0x0d83, 0x3004, 0x3003, 0x0d81,
+    0x27c0, 0x27c1, 0x3082, 0x2b40, 0x0d84, 0x2847, 0x2848, 0x3184,
+    0x3181, 0x2f06, 0x0d08, 0x2f81, 0x3005, 0x0d46, 0x3083, 0x3182,
+    0x0e00, 0x0e01, 0x0f40, 0x1180, 0x1182, 0x0f03, 0x0f00, 0x11c0,
+    0x0f01, 0x1140, 0x1202, 0x1204, 0x0f81, 0x1240, 0x0fc0, 0x1242,
+    0x0f80, 0x1244, 0x1284, 0x0f82, 0x1286, 0x1288, 0x128a, 0x12c0,
+    0x1282, 0x1181, 0x1183, 0x1043, 0x1040, 0x11c1, 0x1041, 0x1141,
+    0x1203, 0x1205, 0x10c1, 0x1241, 0x1000, 0x1243, 0x10c0, 0x1245,
+    0x1285, 0x10c2, 0x1287, 0x1289, 0x128b, 0x12c1, 0x1283, 0x1080,
+    0x1100, 0x1101, 0x1200, 0x1201, 0x1280, 0x1281, 0x1340, 0x1341,
+    0x1343, 0x1342, 0x1344, 0x13c2, 0x1400, 0x13c0, 0x1440, 0x1480,
+    0x14c0, 0x1540, 0x1541, 0x1740, 0x1700, 0x1741, 0x17c0, 0x1800,
+    0x1802, 0x1801, 0x1840, 0x1880, 0x1900, 0x18c0, 0x18c1, 0x1901,
+    0x1940, 0x1942, 0x1941, 0x1980, 0x19c0, 0x19c2, 0x19c1, 0x1c80,
+    0x1cc0, 0x1dc0, 0x1f80, 0x2000, 0x2002, 0x2004, 0x2006, 0x2008,
+    0x2040, 0x2080, 0x2082, 0x20c0, 0x20c1, 0x2100, 0x22b8, 0x22b9,
+    0x2310, 0x2311, 0x231c, 0x231d, 0x244c, 0x2456, 0x244d, 0x2457,
+    0x248c, 0x248d, 0x249e, 0x249f, 0x2500, 0x2502, 0x2504, 0x2bc0,
+    0x2501, 0x2503, 0x2505, 0x2bc1, 0x2bc2, 0x2bc3, 0x2bc4, 0x2bc5,
+    0x2bc6, 0x2bc7, 0x2580, 0x2582, 0x2584, 0x2bc8, 0x2581, 0x2583,
+    0x2585, 0x2bc9, 0x2bca, 0x2bcb, 0x2bcc, 0x2bcd, 0x2bce, 0x2bcf,
+    0x2600, 0x2602, 0x2601, 0x2603, 0x2680, 0x2682, 0x2681, 0x2683,
+    0x26c2, 0x26c4, 0x26c6, 0x2c00, 0x26c3, 0x26c5, 0x26c7, 0x2c01,
+    0x2c02, 0x2c03, 0x2c04, 0x2c05, 0x2c06, 0x2c07, 0x26ca, 0x26cc,
+    0x26ce, 0x2c08, 0x26cb, 0x26cd, 0x26cf, 0x2c09, 0x2c0a, 0x2c0b,
+    0x2c0c, 0x2c0d, 0x2c0e, 0x2c0f, 0x26d2, 0x26d4, 0x26d6, 0x26d3,
+    0x26d5, 0x26d7, 0x26da, 0x26dc, 0x26de, 0x26db, 0x26dd, 0x26df,
+    0x2700, 0x2702, 0x2701, 0x2703, 0x2780, 0x2782, 0x2781, 0x2783,
+    0x2800, 0x2802, 0x2804, 0x2801, 0x2803, 0x2805, 0x2842, 0x2844,
+    0x2846, 0x2849, 0x284b, 0x284d, 0x2c40, 0x284a, 0x284c, 0x284e,
+    0x2c41, 0x2c42, 0x2c43, 0x2c44, 0x2c45, 0x2c46, 0x2c47, 0x2851,
+    0x2853, 0x2855, 0x2c48, 0x2852, 0x2854, 0x2856, 0x2c49, 0x2c4a,
+    0x2c4b, 0x2c4c, 0x2c4d, 0x2c4e, 0x2c4f, 0x2c82, 0x2e01, 0x3180,
+    0x2c87, 0x2f01, 0x2f02, 0x2f03, 0x2e06, 0x3185, 0x3000, 0x3001,
+    0x3002, 0x4640, 0x4641, 0x4680, 0x46c0, 0x46c2, 0x46c1, 0x4700,
+    0x4740, 0x4780, 0x47c0, 0x47c2, 0x4900, 0x4940, 0x4980, 0x4982,
+    0x4a00, 0x49c2, 0x4a03, 0x4a04, 0x4a40, 0x4a41, 0x4a80, 0x4a81,
+    0x4ac0, 0x4ac1, 0x4bc0, 0x4bc1, 0x4b00, 0x4b01, 0x4b40, 0x4b41,
+    0x4bc2, 0x4bc3, 0x4b80, 0x4b81, 0x4b82, 0x4b83, 0x4c00, 0x4c01,
+    0x4c02, 0x4c03, 0x5600, 0x5440, 0x5442, 0x5444, 0x5446, 0x5448,
+    0x544a, 0x544c, 0x544e, 0x5450, 0x5452, 0x5454, 0x5456, 0x5480,
+    0x5482, 0x5484, 0x54c0, 0x54c1, 0x5500, 0x5501, 0x5540, 0x5541,
+    0x5580, 0x5581, 0x55c0, 0x55c1, 0x5680, 0x58c0, 0x5700, 0x5702,
+    0x5704, 0x5706, 0x5708, 0x570a, 0x570c, 0x570e, 0x5710, 0x5712,
+    0x5714, 0x5716, 0x5740, 0x5742, 0x5744, 0x5780, 0x5781, 0x57c0,
+    0x57c1, 0x5800, 0x5801, 0x5840, 0x5841, 0x5880, 0x5881, 0x5900,
+    0x5901, 0x5902, 0x5903, 0x5940, 0x8f40, 0x8f42, 0x8f80, 0x8fc0,
+    0x8fc1, 0x9000, 0x9001, 0x9041, 0x9040, 0x9043, 0x9080, 0x9081,
+    0x90c0,
+};
+
+typedef enum {
+    UNICODE_GC_Cn,
+    UNICODE_GC_Lu,
+    UNICODE_GC_Ll,
+    UNICODE_GC_Lt,
+    UNICODE_GC_Lm,
+    UNICODE_GC_Lo,
+    UNICODE_GC_Mn,
+    UNICODE_GC_Mc,
+    UNICODE_GC_Me,
+    UNICODE_GC_Nd,
+    UNICODE_GC_Nl,
+    UNICODE_GC_No,
+    UNICODE_GC_Sm,
+    UNICODE_GC_Sc,
+    UNICODE_GC_Sk,
+    UNICODE_GC_So,
+    UNICODE_GC_Pc,
+    UNICODE_GC_Pd,
+    UNICODE_GC_Ps,
+    UNICODE_GC_Pe,
+    UNICODE_GC_Pi,
+    UNICODE_GC_Pf,
+    UNICODE_GC_Po,
+    UNICODE_GC_Zs,
+    UNICODE_GC_Zl,
+    UNICODE_GC_Zp,
+    UNICODE_GC_Cc,
+    UNICODE_GC_Cf,
+    UNICODE_GC_Cs,
+    UNICODE_GC_Co,
+    UNICODE_GC_LC,
+    UNICODE_GC_L,
+    UNICODE_GC_M,
+    UNICODE_GC_N,
+    UNICODE_GC_S,
+    UNICODE_GC_P,
+    UNICODE_GC_Z,
+    UNICODE_GC_C,
+    UNICODE_GC_COUNT,
+} UnicodeGCEnum;
+
+static const char unicode_gc_name_table[] =
+    "Cn,Unassigned"            "\0"
+    "Lu,Uppercase_Letter"      "\0"
+    "Ll,Lowercase_Letter"      "\0"
+    "Lt,Titlecase_Letter"      "\0"
+    "Lm,Modifier_Letter"       "\0"
+    "Lo,Other_Letter"          "\0"
+    "Mn,Nonspacing_Mark"       "\0"
+    "Mc,Spacing_Mark"          "\0"
+    "Me,Enclosing_Mark"        "\0"
+    "Nd,Decimal_Number,digit"  "\0"
+    "Nl,Letter_Number"         "\0"
+    "No,Other_Number"          "\0"
+    "Sm,Math_Symbol"           "\0"
+    "Sc,Currency_Symbol"       "\0"
+    "Sk,Modifier_Symbol"       "\0"
+    "So,Other_Symbol"          "\0"
+    "Pc,Connector_Punctuation" "\0"
+    "Pd,Dash_Punctuation"      "\0"
+    "Ps,Open_Punctuation"      "\0"
+    "Pe,Close_Punctuation"     "\0"
+    "Pi,Initial_Punctuation"   "\0"
+    "Pf,Final_Punctuation"     "\0"
+    "Po,Other_Punctuation"     "\0"
+    "Zs,Space_Separator"       "\0"
+    "Zl,Line_Separator"        "\0"
+    "Zp,Paragraph_Separator"   "\0"
+    "Cc,Control,cntrl"         "\0"
+    "Cf,Format"                "\0"
+    "Cs,Surrogate"             "\0"
+    "Co,Private_Use"           "\0"
+    "LC,Cased_Letter"          "\0"
+    "L,Letter"                 "\0"
+    "M,Mark,Combining_Mark"    "\0"
+    "N,Number"                 "\0"
+    "S,Symbol"                 "\0"
+    "P,Punctuation,punct"      "\0"
+    "Z,Separator"              "\0"
+    "C,Other"                  "\0"
+;
+
+static const uint8_t unicode_gc_table[3948] = {
+    0xfa, 0x18, 0x17, 0x56, 0x0d, 0x56, 0x12, 0x13,
+    0x16, 0x0c, 0x16, 0x11, 0x36, 0xe9, 0x02, 0x36,
+    0x4c, 0x36, 0xe1, 0x12, 0x12, 0x16, 0x13, 0x0e,
+    0x10, 0x0e, 0xe2, 0x12, 0x12, 0x0c, 0x13, 0x0c,
+    0xfa, 0x19, 0x17, 0x16, 0x6d, 0x0f, 0x16, 0x0e,
+    0x0f, 0x05, 0x14, 0x0c, 0x1b, 0x0f, 0x0e, 0x0f,
+    0x0c, 0x2b, 0x0e, 0x02, 0x36, 0x0e, 0x0b, 0x05,
+    0x15, 0x4b, 0x16, 0xe1, 0x0f, 0x0c, 0xc1, 0xe2,
+    0x10, 0x0c, 0xe2, 0x00, 0xff, 0x30, 0x02, 0xff,
+    0x08, 0x02, 0xff, 0x27, 0xbf, 0x22, 0x21, 0x02,
+    0x5f, 0x5f, 0x21, 0x22, 0x61, 0x02, 0x21, 0x02,
+    0x41, 0x42, 0x21, 0x02, 0x21, 0x02, 0x9f, 0x7f,
+    0x02, 0x5f, 0x5f, 0x21, 0x02, 0x5f, 0x3f, 0x02,
+    0x05, 0x3f, 0x22, 0x65, 0x01, 0x03, 0x02, 0x01,
+    0x03, 0x02, 0x01, 0x03, 0x02, 0xff, 0x08, 0x02,
+    0xff, 0x0a, 0x02, 0x01, 0x03, 0x02, 0x5f, 0x21,
+    0x02, 0xff, 0x32, 0xa2, 0x21, 0x02, 0x21, 0x22,
+    0x5f, 0x41, 0x02, 0xff, 0x00, 0xe2, 0x3c, 0x05,
+    0xe2, 0x13, 0xe4, 0x0a, 0x6e, 0xe4, 0x04, 0xee,
+    0x06, 0x84, 0xce, 0x04, 0x0e, 0x04, 0xee, 0x09,
+    0xe6, 0x68, 0x7f, 0x04, 0x0e, 0x3f, 0x20, 0x04,
+    0x42, 0x16, 0x01, 0x60, 0x2e, 0x01, 0x16, 0x41,
+    0x00, 0x01, 0x00, 0x21, 0x02, 0xe1, 0x09, 0x00,
+    0xe1, 0x01, 0xe2, 0x1b, 0x3f, 0x02, 0x41, 0x42,
+    0xff, 0x10, 0x62, 0x3f, 0x0c, 0x5f, 0x3f, 0x02,
+    0xe1, 0x2b, 0xe2, 0x28, 0xff, 0x1a, 0x0f, 0x86,
+    0x28, 0xff, 0x2f, 0xff, 0x06, 0x02, 0xff, 0x58,
+    0x00, 0xe1, 0x1e, 0x20, 0x04, 0xb6, 0xe2, 0x21,
+    0x16, 0x11, 0x20, 0x2f, 0x0d, 0x00, 0xe6, 0x25,
+    0x11, 0x06, 0x16, 0x26, 0x16, 0x26, 0x16, 0x06,
+    0xe0, 0x00, 0xe5, 0x13, 0x60, 0x65, 0x36, 0xe0,
+    0x03, 0xbb, 0x4c, 0x36, 0x0d, 0x36, 0x2f, 0xe6,
+    0x03, 0x16, 0x1b, 0x56, 0xe5, 0x18, 0x04, 0xe5,
+    0x02, 0xe6, 0x0d, 0xe9, 0x02, 0x76, 0x25, 0x06,
+    0xe5, 0x5b, 0x16, 0x05, 0xc6, 0x1b, 0x0f, 0xa6,
+    0x24, 0x26, 0x0f, 0x66, 0x25, 0xe9, 0x02, 0x45,
+    0x2f, 0x05, 0xf6, 0x06, 0x00, 0x1b, 0x05, 0x06,
+    0xe5, 0x16, 0xe6, 0x13, 0x20, 0xe5, 0x51, 0xe6,
+    0x03, 0x05, 0xe0, 0x06, 0xe9, 0x02, 0xe5, 0x19,
+    0xe6, 0x01, 0x24, 0x0f, 0x56, 0x04, 0x20, 0x06,
+    0x2d, 0xe5, 0x0e, 0x66, 0x04, 0xe6, 0x01, 0x04,
+    0x46, 0x04, 0x86, 0x20, 0xf6, 0x07, 0x00, 0xe5,
+    0x11, 0x46, 0x20, 0x16, 0x00, 0xe5, 0x03, 0x80,
+    0xe5, 0x10, 0x0e, 0xa5, 0x00, 0x3b, 0xa0, 0xe6,
+    0x00, 0xe5, 0x21, 0x04, 0xe6, 0x10, 0x1b, 0xe6,
+    0x18, 0x07, 0xe5, 0x2e, 0x06, 0x07, 0x06, 0x05,
+    0x47, 0xe6, 0x00, 0x67, 0x06, 0x27, 0x05, 0xc6,
+    0xe5, 0x02, 0x26, 0x36, 0xe9, 0x02, 0x16, 0x04,
+    0xe5, 0x07, 0x06, 0x27, 0x00, 0xe5, 0x00, 0x20,
+    0x25, 0x20, 0xe5, 0x0e, 0x00, 0xc5, 0x00, 0x05,
+    0x40, 0x65, 0x20, 0x06, 0x05, 0x47, 0x66, 0x20,
+    0x27, 0x20, 0x27, 0x06, 0x05, 0xe0, 0x00, 0x07,
+    0x60, 0x25, 0x00, 0x45, 0x26, 0x20, 0xe9, 0x02,
+    0x25, 0x2d, 0xab, 0x0f, 0x0d, 0x05, 0x16, 0x06,
+    0x20, 0x26, 0x07, 0x00, 0xa5, 0x60, 0x25, 0x20,
+    0xe5, 0x0e, 0x00, 0xc5, 0x00, 0x25, 0x00, 0x25,
+    0x00, 0x25, 0x20, 0x06, 0x00, 0x47, 0x26, 0x60,
+    0x26, 0x20, 0x46, 0x40, 0x06, 0xc0, 0x65, 0x00,
+    0x05, 0xc0, 0xe9, 0x02, 0x26, 0x45, 0x06, 0x16,
+    0xe0, 0x02, 0x26, 0x07, 0x00, 0xe5, 0x01, 0x00,
+    0x45, 0x00, 0xe5, 0x0e, 0x00, 0xc5, 0x00, 0x25,
+    0x00, 0x85, 0x20, 0x06, 0x05, 0x47, 0x86, 0x00,
+    0x26, 0x07, 0x00, 0x27, 0x06, 0x20, 0x05, 0xe0,
+    0x07, 0x25, 0x26, 0x20, 0xe9, 0x02, 0x16, 0x0d,
+    0xc0, 0x05, 0xa6, 0x00, 0x06, 0x27, 0x00, 0xe5,
+    0x00, 0x20, 0x25, 0x20, 0xe5, 0x0e, 0x00, 0xc5,
+    0x00, 0x25, 0x00, 0x85, 0x20, 0x06, 0x05, 0x07,
+    0x06, 0x07, 0x66, 0x20, 0x27, 0x20, 0x27, 0x06,
+    0xc0, 0x26, 0x07, 0x60, 0x25, 0x00, 0x45, 0x26,
+    0x20, 0xe9, 0x02, 0x0f, 0x05, 0xab, 0xe0, 0x02,
+    0x06, 0x05, 0x00, 0xa5, 0x40, 0x45, 0x00, 0x65,
+    0x40, 0x25, 0x00, 0x05, 0x00, 0x25, 0x40, 0x25,
+    0x40, 0x45, 0x40, 0xe5, 0x04, 0x60, 0x27, 0x06,
+    0x27, 0x40, 0x47, 0x00, 0x47, 0x06, 0x20, 0x05,
+    0xa0, 0x07, 0xe0, 0x06, 0xe9, 0x02, 0x4b, 0xaf,
+    0x0d, 0x0f, 0x80, 0x06, 0x47, 0x06, 0xe5, 0x00,
+    0x00, 0x45, 0x00, 0xe5, 0x0f, 0x00, 0xe5, 0x08,
+    0x20, 0x06, 0x05, 0x46, 0x67, 0x00, 0x46, 0x00,
+    0x66, 0xc0, 0x26, 0x00, 0x45, 0x20, 0x05, 0x20,
+    0x25, 0x26, 0x20, 0xe9, 0x02, 0xc0, 0x16, 0xcb,
+    0x0f, 0x05, 0x06, 0x27, 0x16, 0xe5, 0x00, 0x00,
+    0x45, 0x00, 0xe5, 0x0f, 0x00, 0xe5, 0x02, 0x00,
+    0x85, 0x20, 0x06, 0x05, 0x07, 0x06, 0x87, 0x00,
+    0x06, 0x27, 0x00, 0x27, 0x26, 0xc0, 0x27, 0xa0,
+    0x25, 0x00, 0x25, 0x26, 0x20, 0xe9, 0x02, 0x00,
+    0x25, 0x07, 0xe0, 0x04, 0x26, 0x27, 0xe5, 0x01,
+    0x00, 0x45, 0x00, 0xe5, 0x21, 0x26, 0x05, 0x47,
+    0x66, 0x00, 0x47, 0x00, 0x47, 0x06, 0x05, 0x0f,
+    0x60, 0x45, 0x07, 0xcb, 0x45, 0x26, 0x20, 0xe9,
+    0x02, 0xeb, 0x01, 0x0f, 0xa5, 0x00, 0x06, 0x27,
+    0x00, 0xe5, 0x0a, 0x40, 0xe5, 0x10, 0x00, 0xe5,
+    0x01, 0x00, 0x05, 0x20, 0xc5, 0x40, 0x06, 0x60,
+    0x47, 0x46, 0x00, 0x06, 0x00, 0xe7, 0x00, 0xa0,
+    0xe9, 0x02, 0x20, 0x27, 0x16, 0xe0, 0x04, 0xe5,
+    0x28, 0x06, 0x25, 0xc6, 0x60, 0x0d, 0xa5, 0x04,
+    0xe6, 0x00, 0x16, 0xe9, 0x02, 0x36, 0xe0, 0x1d,
+    0x25, 0x00, 0x05, 0x00, 0x85, 0x00, 0xe5, 0x10,
+    0x00, 0x05, 0x00, 0xe5, 0x02, 0x06, 0x25, 0xe6,
+    0x01, 0x05, 0x20, 0x85, 0x00, 0x04, 0x00, 0xc6,
+    0x00, 0xe9, 0x02, 0x20, 0x65, 0xe0, 0x18, 0x05,
+    0x4f, 0xf6, 0x07, 0x0f, 0x16, 0x4f, 0x26, 0xaf,
+    0xe9, 0x02, 0xeb, 0x02, 0x0f, 0x06, 0x0f, 0x06,
+    0x0f, 0x06, 0x12, 0x13, 0x12, 0x13, 0x27, 0xe5,
+    0x00, 0x00, 0xe5, 0x1c, 0x60, 0xe6, 0x06, 0x07,
+    0x86, 0x16, 0x26, 0x85, 0xe6, 0x03, 0x00, 0xe6,
+    0x1c, 0x00, 0xef, 0x00, 0x06, 0xaf, 0x00, 0x2f,
+    0x96, 0x6f, 0x36, 0xe0, 0x1d, 0xe5, 0x23, 0x27,
+    0x66, 0x07, 0xa6, 0x07, 0x26, 0x27, 0x26, 0x05,
+    0xe9, 0x02, 0xb6, 0xa5, 0x27, 0x26, 0x65, 0x46,
+    0x05, 0x47, 0x25, 0xc7, 0x45, 0x66, 0xe5, 0x05,
+    0x06, 0x27, 0x26, 0xa7, 0x06, 0x05, 0x07, 0xe9,
+    0x02, 0x47, 0x06, 0x2f, 0xe1, 0x1e, 0x00, 0x01,
+    0x80, 0x01, 0x20, 0xe2, 0x23, 0x16, 0x04, 0x42,
+    0xe5, 0x80, 0xc1, 0x00, 0x65, 0x20, 0xc5, 0x00,
+    0x05, 0x00, 0x65, 0x20, 0xe5, 0x21, 0x00, 0x65,
+    0x20, 0xe5, 0x19, 0x00, 0x65, 0x20, 0xc5, 0x00,
+    0x05, 0x00, 0x65, 0x20, 0xe5, 0x07, 0x00, 0xe5,
+    0x31, 0x00, 0x65, 0x20, 0xe5, 0x3b, 0x20, 0x46,
+    0xf6, 0x01, 0xeb, 0x0c, 0x40, 0xe5, 0x08, 0xef,
+    0x02, 0xa0, 0xe1, 0x4e, 0x20, 0xa2, 0x20, 0x11,
+    0xe5, 0x81, 0xe4, 0x0f, 0x16, 0xe5, 0x09, 0x17,
+    0xe5, 0x12, 0x12, 0x13, 0x40, 0xe5, 0x43, 0x56,
+    0x4a, 0xe5, 0x00, 0xc0, 0xe5, 0x0a, 0x46, 0x07,
+    0xe0, 0x01, 0xe5, 0x0b, 0x26, 0x07, 0x36, 0xe0,
+    0x01, 0xe5, 0x0a, 0x26, 0xe0, 0x04, 0xe5, 0x05,
+    0x00, 0x45, 0x00, 0x26, 0xe0, 0x04, 0xe5, 0x2c,
+    0x26, 0x07, 0xc6, 0xe7, 0x00, 0x06, 0x27, 0xe6,
+    0x03, 0x56, 0x04, 0x56, 0x0d, 0x05, 0x06, 0x20,
+    0xe9, 0x02, 0xa0, 0xeb, 0x02, 0xa0, 0xb6, 0x11,
+    0x76, 0x46, 0x1b, 0x06, 0xe9, 0x02, 0xa0, 0xe5,
+    0x1b, 0x04, 0xe5, 0x2d, 0xc0, 0x85, 0x26, 0xe5,
+    0x1a, 0x06, 0x05, 0x80, 0xe5, 0x3e, 0xe0, 0x02,
+    0xe5, 0x17, 0x00, 0x46, 0x67, 0x26, 0x47, 0x60,
+    0x27, 0x06, 0xa7, 0x46, 0x60, 0x0f, 0x40, 0x36,
+    0xe9, 0x02, 0xe5, 0x16, 0x20, 0x85, 0xe0, 0x03,
+    0xe5, 0x24, 0x60, 0xe5, 0x12, 0xa0, 0xe9, 0x02,
+    0x0b, 0x40, 0xef, 0x1a, 0xe5, 0x0f, 0x26, 0x27,
+    0x06, 0x20, 0x36, 0xe5, 0x2d, 0x07, 0x06, 0x07,
+    0xc6, 0x00, 0x06, 0x07, 0x06, 0x27, 0xe6, 0x00,
+    0xa7, 0xe6, 0x02, 0x20, 0x06, 0xe9, 0x02, 0xa0,
+    0xe9, 0x02, 0xa0, 0xd6, 0x04, 0xb6, 0x20, 0xe6,
+    0x06, 0x08, 0xe6, 0x08, 0xe0, 0x29, 0x66, 0x07,
+    0xe5, 0x27, 0x06, 0x07, 0x86, 0x07, 0x06, 0x87,
+    0x06, 0x27, 0xe5, 0x00, 0x40, 0xe9, 0x02, 0xd6,
+    0xef, 0x02, 0xe6, 0x01, 0xef, 0x01, 0x36, 0x00,
+    0x26, 0x07, 0xe5, 0x16, 0x07, 0x66, 0x27, 0x26,
+    0x07, 0x46, 0x25, 0xe9, 0x02, 0xe5, 0x24, 0x06,
+    0x07, 0x26, 0x47, 0x06, 0x07, 0x46, 0x27, 0xe0,
+    0x00, 0x76, 0xe5, 0x1c, 0xe7, 0x00, 0xe6, 0x00,
+    0x27, 0x26, 0x40, 0x96, 0xe9, 0x02, 0x40, 0x45,
+    0xe9, 0x02, 0xe5, 0x16, 0xa4, 0x36, 0xe2, 0x01,
+    0xc0, 0xe1, 0x23, 0x20, 0x41, 0xf6, 0x00, 0xe0,
+    0x00, 0x46, 0x16, 0xe6, 0x05, 0x07, 0xc6, 0x65,
+    0x06, 0xa5, 0x06, 0x25, 0x07, 0x26, 0x05, 0x80,
+    0xe2, 0x24, 0xe4, 0x37, 0xe2, 0x05, 0x04, 0xe2,
+    0x1a, 0xe4, 0x1d, 0xe6, 0x38, 0xff, 0x80, 0x0e,
+    0xe2, 0x00, 0xff, 0x5a, 0xe2, 0x00, 0xe1, 0x00,
+    0xa2, 0x20, 0xa1, 0x20, 0xe2, 0x00, 0xe1, 0x00,
+    0xe2, 0x00, 0xe1, 0x00, 0xa2, 0x20, 0xa1, 0x20,
+    0xe2, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
+    0x00, 0x3f, 0xc2, 0xe1, 0x00, 0xe2, 0x06, 0x20,
+    0xe2, 0x00, 0xe3, 0x00, 0xe2, 0x00, 0xe3, 0x00,
+    0xe2, 0x00, 0xe3, 0x00, 0x82, 0x00, 0x22, 0x61,
+    0x03, 0x0e, 0x02, 0x4e, 0x42, 0x00, 0x22, 0x61,
+    0x03, 0x4e, 0x62, 0x20, 0x22, 0x61, 0x00, 0x4e,
+    0xe2, 0x00, 0x81, 0x4e, 0x20, 0x42, 0x00, 0x22,
+    0x61, 0x03, 0x2e, 0x00, 0xf7, 0x03, 0x9b, 0xb1,
+    0x36, 0x14, 0x15, 0x12, 0x34, 0x15, 0x12, 0x14,
+    0xf6, 0x00, 0x18, 0x19, 0x9b, 0x17, 0xf6, 0x01,
+    0x14, 0x15, 0x76, 0x30, 0x56, 0x0c, 0x12, 0x13,
+    0xf6, 0x03, 0x0c, 0x16, 0x10, 0xf6, 0x02, 0x17,
+    0x9b, 0x00, 0xfb, 0x02, 0x0b, 0x04, 0x20, 0xab,
+    0x4c, 0x12, 0x13, 0x04, 0xeb, 0x02, 0x4c, 0x12,
+    0x13, 0x00, 0xe4, 0x05, 0x40, 0xed, 0x19, 0xe0,
+    0x07, 0xe6, 0x05, 0x68, 0x06, 0x48, 0xe6, 0x04,
+    0xe0, 0x07, 0x2f, 0x01, 0x6f, 0x01, 0x2f, 0x02,
+    0x41, 0x22, 0x41, 0x02, 0x0f, 0x01, 0x2f, 0x0c,
+    0x81, 0xaf, 0x01, 0x0f, 0x01, 0x0f, 0x01, 0x0f,
+    0x61, 0x0f, 0x02, 0x61, 0x02, 0x65, 0x02, 0x2f,
+    0x22, 0x21, 0x8c, 0x3f, 0x42, 0x0f, 0x0c, 0x2f,
+    0x02, 0x0f, 0xeb, 0x08, 0xea, 0x1b, 0x3f, 0x6a,
+    0x0b, 0x2f, 0x60, 0x8c, 0x8f, 0x2c, 0x6f, 0x0c,
+    0x2f, 0x0c, 0x2f, 0x0c, 0xcf, 0x0c, 0xef, 0x17,
+    0x2c, 0x2f, 0x0c, 0x0f, 0x0c, 0xef, 0x17, 0xec,
+    0x80, 0x84, 0xef, 0x00, 0x12, 0x13, 0x12, 0x13,
+    0xef, 0x0c, 0x2c, 0xcf, 0x12, 0x13, 0xef, 0x49,
+    0x0c, 0xef, 0x16, 0xec, 0x11, 0xef, 0x20, 0xac,
+    0xef, 0x3d, 0xe0, 0x11, 0xef, 0x03, 0xe0, 0x0d,
+    0xeb, 0x34, 0xef, 0x46, 0xeb, 0x0e, 0xef, 0x80,
+    0x2f, 0x0c, 0xef, 0x01, 0x0c, 0xef, 0x2e, 0xec,
+    0x00, 0xef, 0x67, 0x0c, 0xef, 0x80, 0x70, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0xeb, 0x16, 0xef,
+    0x24, 0x8c, 0x12, 0x13, 0xec, 0x17, 0x12, 0x13,
+    0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13,
+    0xec, 0x08, 0xef, 0x80, 0x78, 0xec, 0x7b, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0xec, 0x37, 0x12,
+    0x13, 0x12, 0x13, 0xec, 0x18, 0x12, 0x13, 0xec,
+    0x80, 0x7a, 0xef, 0x28, 0xec, 0x0d, 0x2f, 0xac,
+    0xef, 0x1f, 0x20, 0xef, 0x18, 0x00, 0xef, 0x61,
+    0xe1, 0x28, 0xe2, 0x28, 0x5f, 0x21, 0x22, 0xdf,
+    0x41, 0x02, 0x3f, 0x02, 0x3f, 0x82, 0x24, 0x41,
+    0x02, 0xff, 0x5a, 0x02, 0xaf, 0x7f, 0x46, 0x3f,
+    0x80, 0x76, 0x0b, 0x36, 0xe2, 0x1e, 0x00, 0x02,
+    0x80, 0x02, 0x20, 0xe5, 0x30, 0xc0, 0x04, 0x16,
+    0xe0, 0x06, 0x06, 0xe5, 0x0f, 0xe0, 0x01, 0xc5,
+    0x00, 0xc5, 0x00, 0xc5, 0x00, 0xc5, 0x00, 0xc5,
+    0x00, 0xc5, 0x00, 0xc5, 0x00, 0xc5, 0x00, 0xe6,
+    0x18, 0x36, 0x14, 0x15, 0x14, 0x15, 0x56, 0x14,
+    0x15, 0x16, 0x14, 0x15, 0xf6, 0x01, 0x11, 0x36,
+    0x11, 0x16, 0x14, 0x15, 0x36, 0x14, 0x15, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x96,
+    0x04, 0xf6, 0x02, 0x31, 0x76, 0x11, 0x16, 0x12,
+    0xf6, 0x05, 0x2f, 0x56, 0x12, 0x13, 0x12, 0x13,
+    0x12, 0x13, 0x12, 0x13, 0x11, 0xe0, 0x1a, 0xef,
+    0x12, 0x00, 0xef, 0x51, 0xe0, 0x04, 0xef, 0x80,
+    0x4e, 0xe0, 0x12, 0xef, 0x04, 0x60, 0x17, 0x56,
+    0x0f, 0x04, 0x05, 0x0a, 0x12, 0x13, 0x12, 0x13,
+    0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x2f, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x11,
+    0x12, 0x33, 0x0f, 0xea, 0x01, 0x66, 0x27, 0x11,
+    0x84, 0x2f, 0x4a, 0x04, 0x05, 0x16, 0x2f, 0x00,
+    0xe5, 0x4e, 0x20, 0x26, 0x2e, 0x24, 0x05, 0x11,
+    0xe5, 0x52, 0x16, 0x44, 0x05, 0x80, 0xe5, 0x23,
+    0x00, 0xe5, 0x56, 0x00, 0x2f, 0x6b, 0xef, 0x02,
+    0xe5, 0x18, 0xef, 0x1c, 0xe0, 0x04, 0xe5, 0x08,
+    0xef, 0x17, 0x00, 0xeb, 0x02, 0xef, 0x16, 0xeb,
+    0x00, 0x0f, 0xeb, 0x07, 0xef, 0x18, 0xeb, 0x02,
+    0xef, 0x1f, 0xeb, 0x07, 0xef, 0x80, 0xb8, 0xe5,
+    0x99, 0x38, 0xef, 0x38, 0xe5, 0xc0, 0x11, 0x8d,
+    0x04, 0xe5, 0x83, 0xef, 0x40, 0xef, 0x2f, 0xe0,
+    0x01, 0xe5, 0x20, 0xa4, 0x36, 0xe5, 0x80, 0x84,
+    0x04, 0x56, 0xe5, 0x08, 0xe9, 0x02, 0x25, 0xe0,
+    0x0c, 0xff, 0x26, 0x05, 0x06, 0x48, 0x16, 0xe6,
+    0x02, 0x16, 0x04, 0xff, 0x14, 0x24, 0x26, 0xe5,
+    0x3e, 0xea, 0x02, 0x26, 0xb6, 0xe0, 0x00, 0xee,
+    0x0f, 0xe4, 0x01, 0x2e, 0xff, 0x06, 0x22, 0xff,
+    0x36, 0x04, 0xe2, 0x00, 0x9f, 0xff, 0x02, 0x04,
+    0x2e, 0x7f, 0x05, 0x7f, 0x22, 0xff, 0x0d, 0x61,
+    0x02, 0x81, 0x02, 0xff, 0x07, 0x41, 0x02, 0x3f,
+    0x80, 0x3f, 0x00, 0x02, 0x00, 0x02, 0x7f, 0xe0,
+    0x10, 0x44, 0x3f, 0x05, 0x24, 0x02, 0xc5, 0x06,
+    0x45, 0x06, 0x65, 0x06, 0xe5, 0x0f, 0x27, 0x26,
+    0x07, 0x6f, 0x06, 0x40, 0xab, 0x2f, 0x0d, 0x0f,
+    0xa0, 0xe5, 0x2c, 0x76, 0xe0, 0x00, 0x27, 0xe5,
+    0x2a, 0xe7, 0x08, 0x26, 0xe0, 0x00, 0x36, 0xe9,
+    0x02, 0xa0, 0xe6, 0x0a, 0xa5, 0x56, 0x05, 0x16,
+    0x25, 0x06, 0xe9, 0x02, 0xe5, 0x14, 0xe6, 0x00,
+    0x36, 0xe5, 0x0f, 0xe6, 0x03, 0x27, 0xe0, 0x03,
+    0x16, 0xe5, 0x15, 0x40, 0x46, 0x07, 0xe5, 0x27,
+    0x06, 0x27, 0x66, 0x27, 0x26, 0x47, 0xf6, 0x05,
+    0x00, 0x04, 0xe9, 0x02, 0x60, 0x36, 0x85, 0x06,
+    0x04, 0xe5, 0x01, 0xe9, 0x02, 0x85, 0x00, 0xe5,
+    0x21, 0xa6, 0x27, 0x26, 0x27, 0x26, 0xe0, 0x01,
+    0x45, 0x06, 0xe5, 0x00, 0x06, 0x07, 0x20, 0xe9,
+    0x02, 0x20, 0x76, 0xe5, 0x08, 0x04, 0xa5, 0x4f,
+    0x05, 0x07, 0x06, 0x07, 0xe5, 0x2a, 0x06, 0x05,
+    0x46, 0x25, 0x26, 0x85, 0x26, 0x05, 0x06, 0x05,
+    0xe0, 0x10, 0x25, 0x04, 0x36, 0xe5, 0x03, 0x07,
+    0x26, 0x27, 0x36, 0x05, 0x24, 0x07, 0x06, 0xe0,
+    0x02, 0xa5, 0x20, 0xa5, 0x20, 0xa5, 0xe0, 0x01,
+    0xc5, 0x00, 0xc5, 0x00, 0xe2, 0x23, 0x0e, 0x64,
+    0xe2, 0x01, 0x04, 0x2e, 0x60, 0xe2, 0x48, 0xe5,
+    0x1b, 0x27, 0x06, 0x27, 0x06, 0x27, 0x16, 0x07,
+    0x06, 0x20, 0xe9, 0x02, 0xa0, 0xe5, 0xab, 0x1c,
+    0xe0, 0x04, 0xe5, 0x0f, 0x60, 0xe5, 0x29, 0x60,
+    0xfc, 0x87, 0x78, 0xfd, 0x98, 0x78, 0xe5, 0x80,
+    0xe6, 0x20, 0xe5, 0x62, 0xe0, 0x1e, 0xc2, 0xe0,
+    0x04, 0x82, 0x80, 0x05, 0x06, 0xe5, 0x02, 0x0c,
+    0xe5, 0x05, 0x00, 0x85, 0x00, 0x05, 0x00, 0x25,
+    0x00, 0x25, 0x00, 0xe5, 0x64, 0xee, 0x09, 0xe0,
+    0x08, 0xe5, 0x80, 0xe3, 0x13, 0x12, 0xef, 0x08,
+    0xe5, 0x38, 0x20, 0xe5, 0x2e, 0xc0, 0x0f, 0xe0,
+    0x18, 0xe5, 0x04, 0x0d, 0x4f, 0xe6, 0x08, 0xd6,
+    0x12, 0x13, 0x16, 0xa0, 0xe6, 0x08, 0x16, 0x31,
+    0x30, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
+    0x13, 0x36, 0x12, 0x13, 0x76, 0x50, 0x56, 0x00,
+    0x76, 0x11, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13,
+    0x56, 0x0c, 0x11, 0x4c, 0x00, 0x16, 0x0d, 0x36,
+    0x60, 0x85, 0x00, 0xe5, 0x7f, 0x20, 0x1b, 0x00,
+    0x56, 0x0d, 0x56, 0x12, 0x13, 0x16, 0x0c, 0x16,
+    0x11, 0x36, 0xe9, 0x02, 0x36, 0x4c, 0x36, 0xe1,
+    0x12, 0x12, 0x16, 0x13, 0x0e, 0x10, 0x0e, 0xe2,
+    0x12, 0x12, 0x0c, 0x13, 0x0c, 0x12, 0x13, 0x16,
+    0x12, 0x13, 0x36, 0xe5, 0x02, 0x04, 0xe5, 0x25,
+    0x24, 0xe5, 0x17, 0x40, 0xa5, 0x20, 0xa5, 0x20,
+    0xa5, 0x20, 0x45, 0x40, 0x2d, 0x0c, 0x0e, 0x0f,
+    0x2d, 0x00, 0x0f, 0x6c, 0x2f, 0xe0, 0x02, 0x5b,
+    0x2f, 0x20, 0xe5, 0x04, 0x00, 0xe5, 0x12, 0x00,
+    0xe5, 0x0b, 0x00, 0x25, 0x00, 0xe5, 0x07, 0x20,
+    0xe5, 0x06, 0xe0, 0x1a, 0xe5, 0x73, 0x80, 0x56,
+    0x60, 0xeb, 0x25, 0x40, 0xef, 0x01, 0xea, 0x2d,
+    0x6b, 0xef, 0x09, 0x2b, 0x4f, 0x00, 0xef, 0x05,
+    0x40, 0x0f, 0xe0, 0x27, 0xef, 0x25, 0x06, 0xe0,
+    0x7a, 0xe5, 0x15, 0x40, 0xe5, 0x29, 0xe0, 0x07,
+    0x06, 0xeb, 0x13, 0x60, 0xe5, 0x18, 0x6b, 0xe0,
+    0x01, 0xe5, 0x0c, 0x0a, 0xe5, 0x00, 0x0a, 0x80,
+    0xe5, 0x1e, 0x86, 0x80, 0xe5, 0x16, 0x00, 0x16,
+    0xe5, 0x1c, 0x60, 0xe5, 0x00, 0x16, 0x8a, 0xe0,
+    0x22, 0xe1, 0x20, 0xe2, 0x20, 0xe5, 0x46, 0x20,
+    0xe9, 0x02, 0xa0, 0xe1, 0x1c, 0x60, 0xe2, 0x1c,
+    0x60, 0xe5, 0x20, 0xe0, 0x00, 0xe5, 0x2c, 0xe0,
+    0x03, 0x16, 0xe1, 0x03, 0x00, 0xe1, 0x07, 0x00,
+    0xc1, 0x00, 0x21, 0x00, 0xe2, 0x03, 0x00, 0xe2,
+    0x07, 0x00, 0xc2, 0x00, 0x22, 0xe0, 0x3b, 0xe5,
+    0x80, 0xaf, 0xe0, 0x01, 0xe5, 0x0e, 0xe0, 0x02,
+    0xe5, 0x00, 0xe0, 0x10, 0xa4, 0x00, 0xe4, 0x22,
+    0x00, 0xe4, 0x01, 0xe0, 0x3d, 0xa5, 0x20, 0x05,
+    0x00, 0xe5, 0x24, 0x00, 0x25, 0x40, 0x05, 0x20,
+    0xe5, 0x0f, 0x00, 0x16, 0xeb, 0x00, 0xe5, 0x0f,
+    0x2f, 0xcb, 0xe5, 0x17, 0xe0, 0x00, 0xeb, 0x01,
+    0xe0, 0x28, 0xe5, 0x0b, 0x00, 0x25, 0x80, 0x8b,
+    0xe5, 0x0e, 0xab, 0x40, 0x16, 0xe5, 0x12, 0x80,
+    0x16, 0xe0, 0x38, 0xe5, 0x30, 0x60, 0x2b, 0x25,
+    0xeb, 0x08, 0x20, 0xeb, 0x26, 0x05, 0x46, 0x00,
+    0x26, 0x80, 0x66, 0x65, 0x00, 0x45, 0x00, 0xe5,
+    0x15, 0x20, 0x46, 0x60, 0x06, 0xeb, 0x01, 0xc0,
+    0xf6, 0x01, 0xc0, 0xe5, 0x15, 0x2b, 0x16, 0xe5,
+    0x15, 0x4b, 0xe0, 0x18, 0xe5, 0x00, 0x0f, 0xe5,
+    0x14, 0x26, 0x60, 0x8b, 0xd6, 0xe0, 0x01, 0xe5,
+    0x2e, 0x40, 0xd6, 0xe5, 0x0e, 0x20, 0xeb, 0x00,
+    0xe5, 0x0b, 0x80, 0xeb, 0x00, 0xe5, 0x0a, 0xc0,
+    0x76, 0xe0, 0x04, 0xcb, 0xe0, 0x48, 0xe5, 0x41,
+    0xe0, 0x2f, 0xe1, 0x2b, 0xe0, 0x05, 0xe2, 0x2b,
+    0xc0, 0xab, 0xe5, 0x1c, 0x66, 0xe0, 0x00, 0xe9,
+    0x02, 0xe0, 0x80, 0x9e, 0xeb, 0x17, 0x00, 0xe5,
+    0x22, 0x00, 0x26, 0x11, 0x20, 0x25, 0xe0, 0x43,
+    0x46, 0xe5, 0x15, 0xeb, 0x02, 0x05, 0xe0, 0x00,
+    0xe5, 0x0e, 0xe6, 0x03, 0x6b, 0x96, 0xe0, 0x0e,
+    0xe5, 0x0a, 0x66, 0x76, 0xe0, 0x1e, 0xe5, 0x0d,
+    0xcb, 0xe0, 0x0c, 0xe5, 0x0f, 0xe0, 0x01, 0x07,
+    0x06, 0x07, 0xe5, 0x2d, 0xe6, 0x07, 0xd6, 0x60,
+    0xeb, 0x0c, 0xe9, 0x02, 0x06, 0x25, 0x26, 0x05,
+    0xe0, 0x01, 0x46, 0x07, 0xe5, 0x25, 0x47, 0x66,
+    0x27, 0x26, 0x36, 0x1b, 0x76, 0x06, 0xe0, 0x02,
+    0x1b, 0x20, 0xe5, 0x11, 0xc0, 0xe9, 0x02, 0xa0,
+    0x46, 0xe5, 0x1c, 0x86, 0x07, 0xe6, 0x00, 0x00,
+    0xe9, 0x02, 0x76, 0x05, 0x27, 0x05, 0xe0, 0x00,
+    0xe5, 0x1b, 0x06, 0x36, 0x05, 0xe0, 0x01, 0x26,
+    0x07, 0xe5, 0x28, 0x47, 0xe6, 0x01, 0x27, 0x65,
+    0x76, 0x66, 0x16, 0x07, 0x06, 0xe9, 0x02, 0x05,
+    0x16, 0x05, 0x56, 0x00, 0xeb, 0x0c, 0xe0, 0x03,
+    0xe5, 0x0a, 0x00, 0xe5, 0x11, 0x47, 0x46, 0x27,
+    0x06, 0x07, 0x26, 0xb6, 0x06, 0x25, 0x06, 0xe0,
+    0x36, 0xc5, 0x00, 0x05, 0x00, 0x65, 0x00, 0xe5,
+    0x07, 0x00, 0xe5, 0x02, 0x16, 0xa0, 0xe5, 0x27,
+    0x06, 0x47, 0xe6, 0x00, 0x80, 0xe9, 0x02, 0xa0,
+    0x26, 0x27, 0x00, 0xe5, 0x00, 0x20, 0x25, 0x20,
+    0xe5, 0x0e, 0x00, 0xc5, 0x00, 0x25, 0x00, 0x85,
+    0x00, 0x26, 0x05, 0x27, 0x06, 0x67, 0x20, 0x27,
+    0x20, 0x47, 0x20, 0x05, 0xa0, 0x07, 0x80, 0x85,
+    0x27, 0x20, 0xc6, 0x40, 0x86, 0xe0, 0x80, 0x03,
+    0xe5, 0x2d, 0x47, 0xe6, 0x00, 0x27, 0x46, 0x07,
+    0x06, 0x65, 0x96, 0xe9, 0x02, 0x36, 0x00, 0x16,
+    0x06, 0x45, 0xe0, 0x16, 0xe5, 0x28, 0x47, 0xa6,
+    0x07, 0x06, 0x67, 0x26, 0x07, 0x26, 0x25, 0x16,
+    0x05, 0xe0, 0x00, 0xe9, 0x02, 0xe0, 0x80, 0x1e,
+    0xe5, 0x27, 0x47, 0x66, 0x20, 0x67, 0x26, 0x07,
+    0x26, 0xf6, 0x0f, 0x65, 0x26, 0xe0, 0x1a, 0xe5,
+    0x28, 0x47, 0xe6, 0x00, 0x27, 0x06, 0x07, 0x26,
+    0x56, 0x05, 0xe0, 0x03, 0xe9, 0x02, 0xa0, 0xf6,
+    0x05, 0xe0, 0x0b, 0xe5, 0x23, 0x06, 0x07, 0x06,
+    0x27, 0xa6, 0x07, 0x06, 0x05, 0x16, 0xa0, 0xe9,
+    0x02, 0xe0, 0x2e, 0xe5, 0x13, 0x20, 0x46, 0x27,
+    0x66, 0x07, 0x86, 0x60, 0xe9, 0x02, 0x2b, 0x56,
+    0x0f, 0xc5, 0xe0, 0x80, 0x31, 0xe5, 0x24, 0x47,
+    0xe6, 0x01, 0x07, 0x26, 0x16, 0xe0, 0x5c, 0xe1,
+    0x18, 0xe2, 0x18, 0xe9, 0x02, 0xeb, 0x01, 0xe0,
+    0x04, 0xe5, 0x00, 0x20, 0x05, 0x20, 0xe5, 0x00,
+    0x00, 0x25, 0x00, 0xe5, 0x10, 0xa7, 0x00, 0x27,
+    0x20, 0x26, 0x07, 0x06, 0x05, 0x07, 0x05, 0x07,
+    0x06, 0x56, 0xe0, 0x01, 0xe9, 0x02, 0xe0, 0x3e,
+    0xe5, 0x00, 0x20, 0xe5, 0x1f, 0x47, 0x66, 0x20,
+    0x26, 0x67, 0x06, 0x05, 0x16, 0x05, 0x07, 0xe0,
+    0x13, 0x05, 0xe6, 0x02, 0xe5, 0x20, 0xa6, 0x07,
+    0x05, 0x66, 0xf6, 0x00, 0x06, 0xe0, 0x00, 0x05,
+    0xa6, 0x27, 0x46, 0xe5, 0x26, 0xe6, 0x05, 0x07,
+    0x26, 0x56, 0x05, 0x96, 0xe0, 0x05, 0xe5, 0x41,
+    0xc0, 0xf6, 0x02, 0xe0, 0x80, 0x6e, 0xe5, 0x01,
+    0x00, 0xe5, 0x1d, 0x07, 0xc6, 0x00, 0xa6, 0x07,
+    0x06, 0x05, 0x96, 0xe0, 0x02, 0xe9, 0x02, 0xeb,
+    0x0b, 0x40, 0x36, 0xe5, 0x16, 0x20, 0xe6, 0x0e,
+    0x00, 0x07, 0xc6, 0x07, 0x26, 0x07, 0x26, 0xe0,
+    0x41, 0xc5, 0x00, 0x25, 0x00, 0xe5, 0x1e, 0xa6,
+    0x40, 0x06, 0x00, 0x26, 0x00, 0xc6, 0x05, 0x06,
+    0xe0, 0x00, 0xe9, 0x02, 0xa0, 0xa5, 0x00, 0x25,
+    0x00, 0xe5, 0x18, 0x87, 0x00, 0x26, 0x00, 0x27,
+    0x06, 0x07, 0x06, 0x05, 0xc0, 0xe9, 0x02, 0xe0,
+    0x80, 0xae, 0xe5, 0x0b, 0x26, 0x27, 0x36, 0xc0,
+    0x26, 0x05, 0x07, 0xe5, 0x05, 0x00, 0xe5, 0x1a,
+    0x27, 0x86, 0x40, 0x27, 0x06, 0x07, 0x06, 0xf6,
+    0x05, 0xe9, 0x02, 0xe0, 0x4e, 0x05, 0xe0, 0x07,
+    0xeb, 0x0d, 0xef, 0x00, 0x6d, 0xef, 0x09, 0xe0,
+    0x05, 0x16, 0xe5, 0x83, 0x12, 0xe0, 0x5e, 0xea,
+    0x67, 0x00, 0x96, 0xe0, 0x03, 0xe5, 0x80, 0x3c,
+    0xe0, 0x89, 0xc4, 0xe5, 0x59, 0x36, 0xe0, 0x05,
+    0xe5, 0x83, 0xa8, 0xfb, 0x08, 0x06, 0xa5, 0xe6,
+    0x07, 0xe0, 0x8f, 0x22, 0xe5, 0x81, 0xbf, 0xe0,
+    0xa1, 0x31, 0xe5, 0x81, 0xb1, 0xc0, 0xe5, 0x17,
+    0x00, 0xe9, 0x02, 0x60, 0x36, 0xe5, 0x47, 0x00,
+    0xe9, 0x02, 0xa0, 0xe5, 0x16, 0x20, 0x86, 0x16,
+    0xe0, 0x02, 0xe5, 0x28, 0xc6, 0x96, 0x6f, 0x64,
+    0x16, 0x0f, 0xe0, 0x02, 0xe9, 0x02, 0x00, 0xcb,
+    0x00, 0xe5, 0x0d, 0x80, 0xe5, 0x0b, 0xe0, 0x82,
+    0x28, 0xe1, 0x18, 0xe2, 0x18, 0xeb, 0x0f, 0x76,
+    0xe0, 0x5d, 0xe5, 0x43, 0x60, 0x06, 0x05, 0xe7,
+    0x2f, 0xc0, 0x66, 0xe4, 0x05, 0xe0, 0x38, 0x24,
+    0x16, 0x04, 0x06, 0xe0, 0x03, 0x27, 0xe0, 0x06,
+    0xe5, 0x97, 0x70, 0xe0, 0x00, 0xe5, 0x84, 0x4e,
+    0xe0, 0x22, 0xe5, 0x01, 0xe0, 0xa2, 0x5f, 0x64,
+    0x00, 0xc4, 0x00, 0x24, 0x00, 0xe5, 0x80, 0x9b,
+    0xe0, 0x07, 0x05, 0xe0, 0x15, 0x45, 0x20, 0x05,
+    0xe0, 0x06, 0x65, 0xe0, 0x00, 0xe5, 0x81, 0x04,
+    0xe0, 0x88, 0x7c, 0xe5, 0x63, 0x80, 0xe5, 0x05,
+    0x40, 0xe5, 0x01, 0xc0, 0xe5, 0x02, 0x20, 0x0f,
+    0x26, 0x16, 0x7b, 0xe0, 0x91, 0xd4, 0xe6, 0x26,
+    0x20, 0xe6, 0x0f, 0xe0, 0x01, 0xef, 0x6c, 0xe0,
+    0x34, 0xef, 0x80, 0x6e, 0xe0, 0x02, 0xef, 0x1f,
+    0x20, 0xef, 0x34, 0x27, 0x46, 0x4f, 0xa7, 0xfb,
+    0x00, 0xe6, 0x00, 0x2f, 0xc6, 0xef, 0x16, 0x66,
+    0xef, 0x35, 0xe0, 0x0d, 0xef, 0x3a, 0x46, 0x0f,
+    0xe0, 0x72, 0xeb, 0x0c, 0xe0, 0x04, 0xeb, 0x0c,
+    0xe0, 0x04, 0xef, 0x4f, 0xe0, 0x01, 0xeb, 0x11,
+    0xe0, 0x7f, 0xe1, 0x12, 0xe2, 0x12, 0xe1, 0x12,
+    0xc2, 0x00, 0xe2, 0x0a, 0xe1, 0x12, 0xe2, 0x12,
+    0x01, 0x00, 0x21, 0x20, 0x01, 0x20, 0x21, 0x20,
+    0x61, 0x00, 0xe1, 0x00, 0x62, 0x00, 0x02, 0x00,
+    0xc2, 0x00, 0xe2, 0x03, 0xe1, 0x12, 0xe2, 0x12,
+    0x21, 0x00, 0x61, 0x20, 0xe1, 0x00, 0x00, 0xc1,
+    0x00, 0xe2, 0x12, 0x21, 0x00, 0x61, 0x00, 0x81,
+    0x00, 0x01, 0x40, 0xc1, 0x00, 0xe2, 0x12, 0xe1,
+    0x12, 0xe2, 0x12, 0xe1, 0x12, 0xe2, 0x12, 0xe1,
+    0x12, 0xe2, 0x12, 0xe1, 0x12, 0xe2, 0x12, 0xe1,
+    0x12, 0xe2, 0x12, 0xe1, 0x12, 0xe2, 0x14, 0x20,
+    0xe1, 0x11, 0x0c, 0xe2, 0x11, 0x0c, 0xa2, 0xe1,
+    0x11, 0x0c, 0xe2, 0x11, 0x0c, 0xa2, 0xe1, 0x11,
+    0x0c, 0xe2, 0x11, 0x0c, 0xa2, 0xe1, 0x11, 0x0c,
+    0xe2, 0x11, 0x0c, 0xa2, 0xe1, 0x11, 0x0c, 0xe2,
+    0x11, 0x0c, 0xa2, 0x3f, 0x20, 0xe9, 0x2a, 0xef,
+    0x81, 0x78, 0xe6, 0x2f, 0x6f, 0xe6, 0x2a, 0xef,
+    0x00, 0x06, 0xef, 0x06, 0x06, 0x2f, 0x96, 0xe0,
+    0x07, 0x86, 0x00, 0xe6, 0x07, 0xe0, 0x83, 0xc8,
+    0xe2, 0x02, 0x05, 0xe2, 0x0c, 0xa0, 0xa2, 0xe0,
+    0x80, 0x4d, 0xc6, 0x00, 0xe6, 0x09, 0x20, 0xc6,
+    0x00, 0x26, 0x00, 0x86, 0x80, 0xe4, 0x36, 0xe0,
+    0x19, 0x06, 0xe0, 0x68, 0xe5, 0x25, 0x40, 0xc6,
+    0xc4, 0x20, 0xe9, 0x02, 0x60, 0x05, 0x0f, 0xe0,
+    0x80, 0xb8, 0xe5, 0x16, 0x06, 0xe0, 0x09, 0xe5,
+    0x24, 0x66, 0xe9, 0x02, 0x80, 0x0d, 0xe0, 0x81,
+    0x48, 0xe5, 0x13, 0x04, 0x66, 0xe9, 0x02, 0xe0,
+    0x82, 0x5e, 0xc5, 0x00, 0x65, 0x00, 0x25, 0x00,
+    0xe5, 0x07, 0x00, 0xe5, 0x80, 0x3d, 0x20, 0xeb,
+    0x01, 0xc6, 0xe0, 0x21, 0xe1, 0x1a, 0xe2, 0x1a,
+    0xc6, 0x04, 0x60, 0xe9, 0x02, 0x60, 0x36, 0xe0,
+    0x82, 0x89, 0xeb, 0x33, 0x0f, 0x4b, 0x0d, 0x6b,
+    0xe0, 0x44, 0xeb, 0x25, 0x0f, 0xeb, 0x07, 0xe0,
+    0x80, 0x3a, 0x65, 0x00, 0xe5, 0x13, 0x00, 0x25,
+    0x00, 0x05, 0x20, 0x05, 0x00, 0xe5, 0x02, 0x00,
+    0x65, 0x00, 0x05, 0x00, 0x05, 0xa0, 0x05, 0x60,
+    0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x45, 0x00,
+    0x25, 0x00, 0x05, 0x20, 0x05, 0x00, 0x05, 0x00,
+    0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x25, 0x00,
+    0x05, 0x20, 0x65, 0x00, 0xc5, 0x00, 0x65, 0x00,
+    0x65, 0x00, 0x05, 0x00, 0xe5, 0x02, 0x00, 0xe5,
+    0x09, 0x80, 0x45, 0x00, 0x85, 0x00, 0xe5, 0x09,
+    0xe0, 0x2c, 0x2c, 0xe0, 0x80, 0x86, 0xef, 0x24,
+    0x60, 0xef, 0x5c, 0xe0, 0x04, 0xef, 0x07, 0x20,
+    0xef, 0x07, 0x00, 0xef, 0x07, 0x00, 0xef, 0x1d,
+    0xe0, 0x02, 0xeb, 0x05, 0xef, 0x80, 0x19, 0xe0,
+    0x30, 0xef, 0x15, 0xe0, 0x05, 0xef, 0x24, 0x60,
+    0xef, 0x01, 0xc0, 0x2f, 0xe0, 0x06, 0xaf, 0xe0,
+    0x80, 0x12, 0xef, 0x80, 0x73, 0x8e, 0xef, 0x82,
+    0x50, 0x60, 0xef, 0x09, 0x40, 0xef, 0x05, 0x40,
+    0xef, 0x6f, 0x60, 0xef, 0x57, 0xa0, 0xef, 0x04,
+    0x60, 0x0f, 0xe0, 0x07, 0xef, 0x04, 0x60, 0xef,
+    0x30, 0xe0, 0x00, 0xef, 0x02, 0xa0, 0xef, 0x20,
+    0xe0, 0x00, 0xef, 0x16, 0x20, 0x2f, 0xe0, 0x46,
+    0xef, 0x80, 0xcc, 0xe0, 0x04, 0xef, 0x06, 0x20,
+    0xef, 0x05, 0x40, 0xef, 0x01, 0xc0, 0xef, 0x26,
+    0x00, 0xcf, 0xe0, 0x00, 0xef, 0x06, 0x60, 0xef,
+    0x01, 0xc0, 0xef, 0x01, 0xc0, 0xef, 0x80, 0x0b,
+    0x00, 0xef, 0x2f, 0xe0, 0x1d, 0xe9, 0x02, 0xe0,
+    0x83, 0x7e, 0xe5, 0xc0, 0x66, 0x58, 0xe0, 0x18,
+    0xe5, 0x8f, 0xb2, 0xa0, 0xe5, 0x80, 0x56, 0x20,
+    0xe5, 0x95, 0xfa, 0xe0, 0x06, 0xe5, 0x9c, 0xa9,
+    0xe0, 0x8b, 0x97, 0xe5, 0x81, 0x96, 0xe0, 0x85,
+    0x5a, 0xe5, 0x92, 0xc3, 0x80, 0xe5, 0x8f, 0xd8,
+    0xe0, 0xca, 0x9b, 0xc9, 0x1b, 0xe0, 0x16, 0xfb,
+    0x58, 0xe0, 0x78, 0xe6, 0x80, 0x68, 0xe0, 0xc0,
+    0xbd, 0x88, 0xfd, 0xc0, 0xbf, 0x76, 0x20, 0xfd,
+    0xc0, 0xbf, 0x76, 0x20,
+};
+
+typedef enum {
+    UNICODE_SCRIPT_Unknown,
+    UNICODE_SCRIPT_Adlam,
+    UNICODE_SCRIPT_Ahom,
+    UNICODE_SCRIPT_Anatolian_Hieroglyphs,
+    UNICODE_SCRIPT_Arabic,
+    UNICODE_SCRIPT_Armenian,
+    UNICODE_SCRIPT_Avestan,
+    UNICODE_SCRIPT_Balinese,
+    UNICODE_SCRIPT_Bamum,
+    UNICODE_SCRIPT_Bassa_Vah,
+    UNICODE_SCRIPT_Batak,
+    UNICODE_SCRIPT_Bengali,
+    UNICODE_SCRIPT_Bhaiksuki,
+    UNICODE_SCRIPT_Bopomofo,
+    UNICODE_SCRIPT_Brahmi,
+    UNICODE_SCRIPT_Braille,
+    UNICODE_SCRIPT_Buginese,
+    UNICODE_SCRIPT_Buhid,
+    UNICODE_SCRIPT_Canadian_Aboriginal,
+    UNICODE_SCRIPT_Carian,
+    UNICODE_SCRIPT_Caucasian_Albanian,
+    UNICODE_SCRIPT_Chakma,
+    UNICODE_SCRIPT_Cham,
+    UNICODE_SCRIPT_Cherokee,
+    UNICODE_SCRIPT_Chorasmian,
+    UNICODE_SCRIPT_Common,
+    UNICODE_SCRIPT_Coptic,
+    UNICODE_SCRIPT_Cuneiform,
+    UNICODE_SCRIPT_Cypriot,
+    UNICODE_SCRIPT_Cyrillic,
+    UNICODE_SCRIPT_Cypro_Minoan,
+    UNICODE_SCRIPT_Deseret,
+    UNICODE_SCRIPT_Devanagari,
+    UNICODE_SCRIPT_Dives_Akuru,
+    UNICODE_SCRIPT_Dogra,
+    UNICODE_SCRIPT_Duployan,
+    UNICODE_SCRIPT_Egyptian_Hieroglyphs,
+    UNICODE_SCRIPT_Elbasan,
+    UNICODE_SCRIPT_Elymaic,
+    UNICODE_SCRIPT_Ethiopic,
+    UNICODE_SCRIPT_Georgian,
+    UNICODE_SCRIPT_Glagolitic,
+    UNICODE_SCRIPT_Gothic,
+    UNICODE_SCRIPT_Grantha,
+    UNICODE_SCRIPT_Greek,
+    UNICODE_SCRIPT_Gujarati,
+    UNICODE_SCRIPT_Gunjala_Gondi,
+    UNICODE_SCRIPT_Gurmukhi,
+    UNICODE_SCRIPT_Han,
+    UNICODE_SCRIPT_Hangul,
+    UNICODE_SCRIPT_Hanifi_Rohingya,
+    UNICODE_SCRIPT_Hanunoo,
+    UNICODE_SCRIPT_Hatran,
+    UNICODE_SCRIPT_Hebrew,
+    UNICODE_SCRIPT_Hiragana,
+    UNICODE_SCRIPT_Imperial_Aramaic,
+    UNICODE_SCRIPT_Inherited,
+    UNICODE_SCRIPT_Inscriptional_Pahlavi,
+    UNICODE_SCRIPT_Inscriptional_Parthian,
+    UNICODE_SCRIPT_Javanese,
+    UNICODE_SCRIPT_Kaithi,
+    UNICODE_SCRIPT_Kannada,
+    UNICODE_SCRIPT_Katakana,
+    UNICODE_SCRIPT_Kawi,
+    UNICODE_SCRIPT_Kayah_Li,
+    UNICODE_SCRIPT_Kharoshthi,
+    UNICODE_SCRIPT_Khmer,
+    UNICODE_SCRIPT_Khojki,
+    UNICODE_SCRIPT_Khitan_Small_Script,
+    UNICODE_SCRIPT_Khudawadi,
+    UNICODE_SCRIPT_Lao,
+    UNICODE_SCRIPT_Latin,
+    UNICODE_SCRIPT_Lepcha,
+    UNICODE_SCRIPT_Limbu,
+    UNICODE_SCRIPT_Linear_A,
+    UNICODE_SCRIPT_Linear_B,
+    UNICODE_SCRIPT_Lisu,
+    UNICODE_SCRIPT_Lycian,
+    UNICODE_SCRIPT_Lydian,
+    UNICODE_SCRIPT_Makasar,
+    UNICODE_SCRIPT_Mahajani,
+    UNICODE_SCRIPT_Malayalam,
+    UNICODE_SCRIPT_Mandaic,
+    UNICODE_SCRIPT_Manichaean,
+    UNICODE_SCRIPT_Marchen,
+    UNICODE_SCRIPT_Masaram_Gondi,
+    UNICODE_SCRIPT_Medefaidrin,
+    UNICODE_SCRIPT_Meetei_Mayek,
+    UNICODE_SCRIPT_Mende_Kikakui,
+    UNICODE_SCRIPT_Meroitic_Cursive,
+    UNICODE_SCRIPT_Meroitic_Hieroglyphs,
+    UNICODE_SCRIPT_Miao,
+    UNICODE_SCRIPT_Modi,
+    UNICODE_SCRIPT_Mongolian,
+    UNICODE_SCRIPT_Mro,
+    UNICODE_SCRIPT_Multani,
+    UNICODE_SCRIPT_Myanmar,
+    UNICODE_SCRIPT_Nabataean,
+    UNICODE_SCRIPT_Nag_Mundari,
+    UNICODE_SCRIPT_Nandinagari,
+    UNICODE_SCRIPT_New_Tai_Lue,
+    UNICODE_SCRIPT_Newa,
+    UNICODE_SCRIPT_Nko,
+    UNICODE_SCRIPT_Nushu,
+    UNICODE_SCRIPT_Nyiakeng_Puachue_Hmong,
+    UNICODE_SCRIPT_Ogham,
+    UNICODE_SCRIPT_Ol_Chiki,
+    UNICODE_SCRIPT_Old_Hungarian,
+    UNICODE_SCRIPT_Old_Italic,
+    UNICODE_SCRIPT_Old_North_Arabian,
+    UNICODE_SCRIPT_Old_Permic,
+    UNICODE_SCRIPT_Old_Persian,
+    UNICODE_SCRIPT_Old_Sogdian,
+    UNICODE_SCRIPT_Old_South_Arabian,
+    UNICODE_SCRIPT_Old_Turkic,
+    UNICODE_SCRIPT_Old_Uyghur,
+    UNICODE_SCRIPT_Oriya,
+    UNICODE_SCRIPT_Osage,
+    UNICODE_SCRIPT_Osmanya,
+    UNICODE_SCRIPT_Pahawh_Hmong,
+    UNICODE_SCRIPT_Palmyrene,
+    UNICODE_SCRIPT_Pau_Cin_Hau,
+    UNICODE_SCRIPT_Phags_Pa,
+    UNICODE_SCRIPT_Phoenician,
+    UNICODE_SCRIPT_Psalter_Pahlavi,
+    UNICODE_SCRIPT_Rejang,
+    UNICODE_SCRIPT_Runic,
+    UNICODE_SCRIPT_Samaritan,
+    UNICODE_SCRIPT_Saurashtra,
+    UNICODE_SCRIPT_Sharada,
+    UNICODE_SCRIPT_Shavian,
+    UNICODE_SCRIPT_Siddham,
+    UNICODE_SCRIPT_SignWriting,
+    UNICODE_SCRIPT_Sinhala,
+    UNICODE_SCRIPT_Sogdian,
+    UNICODE_SCRIPT_Sora_Sompeng,
+    UNICODE_SCRIPT_Soyombo,
+    UNICODE_SCRIPT_Sundanese,
+    UNICODE_SCRIPT_Syloti_Nagri,
+    UNICODE_SCRIPT_Syriac,
+    UNICODE_SCRIPT_Tagalog,
+    UNICODE_SCRIPT_Tagbanwa,
+    UNICODE_SCRIPT_Tai_Le,
+    UNICODE_SCRIPT_Tai_Tham,
+    UNICODE_SCRIPT_Tai_Viet,
+    UNICODE_SCRIPT_Takri,
+    UNICODE_SCRIPT_Tamil,
+    UNICODE_SCRIPT_Tangut,
+    UNICODE_SCRIPT_Telugu,
+    UNICODE_SCRIPT_Thaana,
+    UNICODE_SCRIPT_Thai,
+    UNICODE_SCRIPT_Tibetan,
+    UNICODE_SCRIPT_Tifinagh,
+    UNICODE_SCRIPT_Tirhuta,
+    UNICODE_SCRIPT_Tangsa,
+    UNICODE_SCRIPT_Toto,
+    UNICODE_SCRIPT_Ugaritic,
+    UNICODE_SCRIPT_Vai,
+    UNICODE_SCRIPT_Vithkuqi,
+    UNICODE_SCRIPT_Wancho,
+    UNICODE_SCRIPT_Warang_Citi,
+    UNICODE_SCRIPT_Yezidi,
+    UNICODE_SCRIPT_Yi,
+    UNICODE_SCRIPT_Zanabazar_Square,
+    UNICODE_SCRIPT_COUNT,
+} UnicodeScriptEnum;
+
+static const char unicode_script_name_table[] =
+    "Adlam,Adlm"                  "\0"
+    "Ahom,Ahom"                   "\0"
+    "Anatolian_Hieroglyphs,Hluw"  "\0"
+    "Arabic,Arab"                 "\0"
+    "Armenian,Armn"               "\0"
+    "Avestan,Avst"                "\0"
+    "Balinese,Bali"               "\0"
+    "Bamum,Bamu"                  "\0"
+    "Bassa_Vah,Bass"              "\0"
+    "Batak,Batk"                  "\0"
+    "Bengali,Beng"                "\0"
+    "Bhaiksuki,Bhks"              "\0"
+    "Bopomofo,Bopo"               "\0"
+    "Brahmi,Brah"                 "\0"
+    "Braille,Brai"                "\0"
+    "Buginese,Bugi"               "\0"
+    "Buhid,Buhd"                  "\0"
+    "Canadian_Aboriginal,Cans"    "\0"
+    "Carian,Cari"                 "\0"
+    "Caucasian_Albanian,Aghb"     "\0"
+    "Chakma,Cakm"                 "\0"
+    "Cham,Cham"                   "\0"
+    "Cherokee,Cher"               "\0"
+    "Chorasmian,Chrs"             "\0"
+    "Common,Zyyy"                 "\0"
+    "Coptic,Copt,Qaac"            "\0"
+    "Cuneiform,Xsux"              "\0"
+    "Cypriot,Cprt"                "\0"
+    "Cyrillic,Cyrl"               "\0"
+    "Cypro_Minoan,Cpmn"           "\0"
+    "Deseret,Dsrt"                "\0"
+    "Devanagari,Deva"             "\0"
+    "Dives_Akuru,Diak"            "\0"
+    "Dogra,Dogr"                  "\0"
+    "Duployan,Dupl"               "\0"
+    "Egyptian_Hieroglyphs,Egyp"   "\0"
+    "Elbasan,Elba"                "\0"
+    "Elymaic,Elym"                "\0"
+    "Ethiopic,Ethi"               "\0"
+    "Georgian,Geor"               "\0"
+    "Glagolitic,Glag"             "\0"
+    "Gothic,Goth"                 "\0"
+    "Grantha,Gran"                "\0"
+    "Greek,Grek"                  "\0"
+    "Gujarati,Gujr"               "\0"
+    "Gunjala_Gondi,Gong"          "\0"
+    "Gurmukhi,Guru"               "\0"
+    "Han,Hani"                    "\0"
+    "Hangul,Hang"                 "\0"
+    "Hanifi_Rohingya,Rohg"        "\0"
+    "Hanunoo,Hano"                "\0"
+    "Hatran,Hatr"                 "\0"
+    "Hebrew,Hebr"                 "\0"
+    "Hiragana,Hira"               "\0"
+    "Imperial_Aramaic,Armi"       "\0"
+    "Inherited,Zinh,Qaai"         "\0"
+    "Inscriptional_Pahlavi,Phli"  "\0"
+    "Inscriptional_Parthian,Prti" "\0"
+    "Javanese,Java"               "\0"
+    "Kaithi,Kthi"                 "\0"
+    "Kannada,Knda"                "\0"
+    "Katakana,Kana"               "\0"
+    "Kawi,Kawi"                   "\0"
+    "Kayah_Li,Kali"               "\0"
+    "Kharoshthi,Khar"             "\0"
+    "Khmer,Khmr"                  "\0"
+    "Khojki,Khoj"                 "\0"
+    "Khitan_Small_Script,Kits"    "\0"
+    "Khudawadi,Sind"              "\0"
+    "Lao,Laoo"                    "\0"
+    "Latin,Latn"                  "\0"
+    "Lepcha,Lepc"                 "\0"
+    "Limbu,Limb"                  "\0"
+    "Linear_A,Lina"               "\0"
+    "Linear_B,Linb"               "\0"
+    "Lisu,Lisu"                   "\0"
+    "Lycian,Lyci"                 "\0"
+    "Lydian,Lydi"                 "\0"
+    "Makasar,Maka"                "\0"
+    "Mahajani,Mahj"               "\0"
+    "Malayalam,Mlym"              "\0"
+    "Mandaic,Mand"                "\0"
+    "Manichaean,Mani"             "\0"
+    "Marchen,Marc"                "\0"
+    "Masaram_Gondi,Gonm"          "\0"
+    "Medefaidrin,Medf"            "\0"
+    "Meetei_Mayek,Mtei"           "\0"
+    "Mende_Kikakui,Mend"          "\0"
+    "Meroitic_Cursive,Merc"       "\0"
+    "Meroitic_Hieroglyphs,Mero"   "\0"
+    "Miao,Plrd"                   "\0"
+    "Modi,Modi"                   "\0"
+    "Mongolian,Mong"              "\0"
+    "Mro,Mroo"                    "\0"
+    "Multani,Mult"                "\0"
+    "Myanmar,Mymr"                "\0"
+    "Nabataean,Nbat"              "\0"
+    "Nag_Mundari,Nagm"            "\0"
+    "Nandinagari,Nand"            "\0"
+    "New_Tai_Lue,Talu"            "\0"
+    "Newa,Newa"                   "\0"
+    "Nko,Nkoo"                    "\0"
+    "Nushu,Nshu"                  "\0"
+    "Nyiakeng_Puachue_Hmong,Hmnp" "\0"
+    "Ogham,Ogam"                  "\0"
+    "Ol_Chiki,Olck"               "\0"
+    "Old_Hungarian,Hung"          "\0"
+    "Old_Italic,Ital"             "\0"
+    "Old_North_Arabian,Narb"      "\0"
+    "Old_Permic,Perm"             "\0"
+    "Old_Persian,Xpeo"            "\0"
+    "Old_Sogdian,Sogo"            "\0"
+    "Old_South_Arabian,Sarb"      "\0"
+    "Old_Turkic,Orkh"             "\0"
+    "Old_Uyghur,Ougr"             "\0"
+    "Oriya,Orya"                  "\0"
+    "Osage,Osge"                  "\0"
+    "Osmanya,Osma"                "\0"
+    "Pahawh_Hmong,Hmng"           "\0"
+    "Palmyrene,Palm"              "\0"
+    "Pau_Cin_Hau,Pauc"            "\0"
+    "Phags_Pa,Phag"               "\0"
+    "Phoenician,Phnx"             "\0"
+    "Psalter_Pahlavi,Phlp"        "\0"
+    "Rejang,Rjng"                 "\0"
+    "Runic,Runr"                  "\0"
+    "Samaritan,Samr"              "\0"
+    "Saurashtra,Saur"             "\0"
+    "Sharada,Shrd"                "\0"
+    "Shavian,Shaw"                "\0"
+    "Siddham,Sidd"                "\0"
+    "SignWriting,Sgnw"            "\0"
+    "Sinhala,Sinh"                "\0"
+    "Sogdian,Sogd"                "\0"
+    "Sora_Sompeng,Sora"           "\0"
+    "Soyombo,Soyo"                "\0"
+    "Sundanese,Sund"              "\0"
+    "Syloti_Nagri,Sylo"           "\0"
+    "Syriac,Syrc"                 "\0"
+    "Tagalog,Tglg"                "\0"
+    "Tagbanwa,Tagb"               "\0"
+    "Tai_Le,Tale"                 "\0"
+    "Tai_Tham,Lana"               "\0"
+    "Tai_Viet,Tavt"               "\0"
+    "Takri,Takr"                  "\0"
+    "Tamil,Taml"                  "\0"
+    "Tangut,Tang"                 "\0"
+    "Telugu,Telu"                 "\0"
+    "Thaana,Thaa"                 "\0"
+    "Thai,Thai"                   "\0"
+    "Tibetan,Tibt"                "\0"
+    "Tifinagh,Tfng"               "\0"
+    "Tirhuta,Tirh"                "\0"
+    "Tangsa,Tnsa"                 "\0"
+    "Toto,Toto"                   "\0"
+    "Ugaritic,Ugar"               "\0"
+    "Vai,Vaii"                    "\0"
+    "Vithkuqi,Vith"               "\0"
+    "Wancho,Wcho"                 "\0"
+    "Warang_Citi,Wara"            "\0"
+    "Yezidi,Yezi"                 "\0"
+    "Yi,Yiii"                     "\0"
+    "Zanabazar_Square,Zanb"       "\0"
+;
+
+static const uint8_t unicode_script_table[2720] = {
+    0xc0, 0x19, 0x99, 0x47, 0x85, 0x19, 0x99, 0x47,
+    0xae, 0x19, 0x80, 0x47, 0x8e, 0x19, 0x80, 0x47,
+    0x84, 0x19, 0x96, 0x47, 0x80, 0x19, 0x9e, 0x47,
+    0x80, 0x19, 0xe1, 0x60, 0x47, 0xa6, 0x19, 0x84,
+    0x47, 0x84, 0x19, 0x81, 0x0d, 0x93, 0x19, 0xe0,
+    0x0f, 0x38, 0x83, 0x2c, 0x80, 0x19, 0x82, 0x2c,
+    0x01, 0x83, 0x2c, 0x80, 0x19, 0x80, 0x2c, 0x03,
+    0x80, 0x2c, 0x80, 0x19, 0x80, 0x2c, 0x80, 0x19,
+    0x82, 0x2c, 0x00, 0x80, 0x2c, 0x00, 0x93, 0x2c,
+    0x00, 0xbe, 0x2c, 0x8d, 0x1a, 0x8f, 0x2c, 0xe0,
+    0x24, 0x1d, 0x81, 0x38, 0xe0, 0x48, 0x1d, 0x00,
+    0xa5, 0x05, 0x01, 0xb1, 0x05, 0x01, 0x82, 0x05,
+    0x00, 0xb6, 0x35, 0x07, 0x9a, 0x35, 0x03, 0x85,
+    0x35, 0x0a, 0x84, 0x04, 0x80, 0x19, 0x85, 0x04,
+    0x80, 0x19, 0x8d, 0x04, 0x80, 0x19, 0x82, 0x04,
+    0x80, 0x19, 0x9f, 0x04, 0x80, 0x19, 0x89, 0x04,
+    0x8a, 0x38, 0x99, 0x04, 0x80, 0x38, 0xe0, 0x0b,
+    0x04, 0x80, 0x19, 0xa1, 0x04, 0x8d, 0x8b, 0x00,
+    0xbb, 0x8b, 0x01, 0x82, 0x8b, 0xaf, 0x04, 0xb1,
+    0x95, 0x0d, 0xba, 0x66, 0x01, 0x82, 0x66, 0xad,
+    0x7f, 0x01, 0x8e, 0x7f, 0x00, 0x9b, 0x52, 0x01,
+    0x80, 0x52, 0x00, 0x8a, 0x8b, 0x04, 0x9e, 0x04,
+    0x00, 0x81, 0x04, 0x05, 0xc9, 0x04, 0x80, 0x19,
+    0x9c, 0x04, 0xd0, 0x20, 0x83, 0x38, 0x8e, 0x20,
+    0x81, 0x19, 0x99, 0x20, 0x83, 0x0b, 0x00, 0x87,
+    0x0b, 0x01, 0x81, 0x0b, 0x01, 0x95, 0x0b, 0x00,
+    0x86, 0x0b, 0x00, 0x80, 0x0b, 0x02, 0x83, 0x0b,
+    0x01, 0x88, 0x0b, 0x01, 0x81, 0x0b, 0x01, 0x83,
+    0x0b, 0x07, 0x80, 0x0b, 0x03, 0x81, 0x0b, 0x00,
+    0x84, 0x0b, 0x01, 0x98, 0x0b, 0x01, 0x82, 0x2f,
+    0x00, 0x85, 0x2f, 0x03, 0x81, 0x2f, 0x01, 0x95,
+    0x2f, 0x00, 0x86, 0x2f, 0x00, 0x81, 0x2f, 0x00,
+    0x81, 0x2f, 0x00, 0x81, 0x2f, 0x01, 0x80, 0x2f,
+    0x00, 0x84, 0x2f, 0x03, 0x81, 0x2f, 0x01, 0x82,
+    0x2f, 0x02, 0x80, 0x2f, 0x06, 0x83, 0x2f, 0x00,
+    0x80, 0x2f, 0x06, 0x90, 0x2f, 0x09, 0x82, 0x2d,
+    0x00, 0x88, 0x2d, 0x00, 0x82, 0x2d, 0x00, 0x95,
+    0x2d, 0x00, 0x86, 0x2d, 0x00, 0x81, 0x2d, 0x00,
+    0x84, 0x2d, 0x01, 0x89, 0x2d, 0x00, 0x82, 0x2d,
+    0x00, 0x82, 0x2d, 0x01, 0x80, 0x2d, 0x0e, 0x83,
+    0x2d, 0x01, 0x8b, 0x2d, 0x06, 0x86, 0x2d, 0x00,
+    0x82, 0x74, 0x00, 0x87, 0x74, 0x01, 0x81, 0x74,
+    0x01, 0x95, 0x74, 0x00, 0x86, 0x74, 0x00, 0x81,
+    0x74, 0x00, 0x84, 0x74, 0x01, 0x88, 0x74, 0x01,
+    0x81, 0x74, 0x01, 0x82, 0x74, 0x06, 0x82, 0x74,
+    0x03, 0x81, 0x74, 0x00, 0x84, 0x74, 0x01, 0x91,
+    0x74, 0x09, 0x81, 0x92, 0x00, 0x85, 0x92, 0x02,
+    0x82, 0x92, 0x00, 0x83, 0x92, 0x02, 0x81, 0x92,
+    0x00, 0x80, 0x92, 0x00, 0x81, 0x92, 0x02, 0x81,
+    0x92, 0x02, 0x82, 0x92, 0x02, 0x8b, 0x92, 0x03,
+    0x84, 0x92, 0x02, 0x82, 0x92, 0x00, 0x83, 0x92,
+    0x01, 0x80, 0x92, 0x05, 0x80, 0x92, 0x0d, 0x94,
+    0x92, 0x04, 0x8c, 0x94, 0x00, 0x82, 0x94, 0x00,
+    0x96, 0x94, 0x00, 0x8f, 0x94, 0x01, 0x88, 0x94,
+    0x00, 0x82, 0x94, 0x00, 0x83, 0x94, 0x06, 0x81,
+    0x94, 0x00, 0x82, 0x94, 0x01, 0x80, 0x94, 0x01,
+    0x83, 0x94, 0x01, 0x89, 0x94, 0x06, 0x88, 0x94,
+    0x8c, 0x3d, 0x00, 0x82, 0x3d, 0x00, 0x96, 0x3d,
+    0x00, 0x89, 0x3d, 0x00, 0x84, 0x3d, 0x01, 0x88,
+    0x3d, 0x00, 0x82, 0x3d, 0x00, 0x83, 0x3d, 0x06,
+    0x81, 0x3d, 0x05, 0x81, 0x3d, 0x00, 0x83, 0x3d,
+    0x01, 0x89, 0x3d, 0x00, 0x82, 0x3d, 0x0b, 0x8c,
+    0x51, 0x00, 0x82, 0x51, 0x00, 0xb2, 0x51, 0x00,
+    0x82, 0x51, 0x00, 0x85, 0x51, 0x03, 0x8f, 0x51,
+    0x01, 0x99, 0x51, 0x00, 0x82, 0x85, 0x00, 0x91,
+    0x85, 0x02, 0x97, 0x85, 0x00, 0x88, 0x85, 0x00,
+    0x80, 0x85, 0x01, 0x86, 0x85, 0x02, 0x80, 0x85,
+    0x03, 0x85, 0x85, 0x00, 0x80, 0x85, 0x00, 0x87,
+    0x85, 0x05, 0x89, 0x85, 0x01, 0x82, 0x85, 0x0b,
+    0xb9, 0x96, 0x03, 0x80, 0x19, 0x9b, 0x96, 0x24,
+    0x81, 0x46, 0x00, 0x80, 0x46, 0x00, 0x84, 0x46,
+    0x00, 0x97, 0x46, 0x00, 0x80, 0x46, 0x00, 0x96,
+    0x46, 0x01, 0x84, 0x46, 0x00, 0x80, 0x46, 0x00,
+    0x86, 0x46, 0x00, 0x89, 0x46, 0x01, 0x83, 0x46,
+    0x1f, 0xc7, 0x97, 0x00, 0xa3, 0x97, 0x03, 0xa6,
+    0x97, 0x00, 0xa3, 0x97, 0x00, 0x8e, 0x97, 0x00,
+    0x86, 0x97, 0x83, 0x19, 0x81, 0x97, 0x24, 0xe0,
+    0x3f, 0x60, 0xa5, 0x28, 0x00, 0x80, 0x28, 0x04,
+    0x80, 0x28, 0x01, 0xaa, 0x28, 0x80, 0x19, 0x83,
+    0x28, 0xe0, 0x9f, 0x31, 0xc8, 0x27, 0x00, 0x83,
+    0x27, 0x01, 0x86, 0x27, 0x00, 0x80, 0x27, 0x00,
+    0x83, 0x27, 0x01, 0xa8, 0x27, 0x00, 0x83, 0x27,
+    0x01, 0xa0, 0x27, 0x00, 0x83, 0x27, 0x01, 0x86,
+    0x27, 0x00, 0x80, 0x27, 0x00, 0x83, 0x27, 0x01,
+    0x8e, 0x27, 0x00, 0xb8, 0x27, 0x00, 0x83, 0x27,
+    0x01, 0xc2, 0x27, 0x01, 0x9f, 0x27, 0x02, 0x99,
+    0x27, 0x05, 0xd5, 0x17, 0x01, 0x85, 0x17, 0x01,
+    0xe2, 0x1f, 0x12, 0x9c, 0x69, 0x02, 0xca, 0x7e,
+    0x82, 0x19, 0x8a, 0x7e, 0x06, 0x95, 0x8c, 0x08,
+    0x80, 0x8c, 0x94, 0x33, 0x81, 0x19, 0x08, 0x93,
+    0x11, 0x0b, 0x8c, 0x8d, 0x00, 0x82, 0x8d, 0x00,
+    0x81, 0x8d, 0x0b, 0xdd, 0x42, 0x01, 0x89, 0x42,
+    0x05, 0x89, 0x42, 0x05, 0x81, 0x5d, 0x81, 0x19,
+    0x80, 0x5d, 0x80, 0x19, 0x93, 0x5d, 0x05, 0xd8,
+    0x5d, 0x06, 0xaa, 0x5d, 0x04, 0xc5, 0x12, 0x09,
+    0x9e, 0x49, 0x00, 0x8b, 0x49, 0x03, 0x8b, 0x49,
+    0x03, 0x80, 0x49, 0x02, 0x8b, 0x49, 0x9d, 0x8e,
+    0x01, 0x84, 0x8e, 0x0a, 0xab, 0x64, 0x03, 0x99,
+    0x64, 0x05, 0x8a, 0x64, 0x02, 0x81, 0x64, 0x9f,
+    0x42, 0x9b, 0x10, 0x01, 0x81, 0x10, 0xbe, 0x8f,
+    0x00, 0x9c, 0x8f, 0x01, 0x8a, 0x8f, 0x05, 0x89,
+    0x8f, 0x05, 0x8d, 0x8f, 0x01, 0x9e, 0x38, 0x30,
+    0xcc, 0x07, 0x02, 0xae, 0x07, 0x00, 0xbf, 0x89,
+    0xb3, 0x0a, 0x07, 0x83, 0x0a, 0xb7, 0x48, 0x02,
+    0x8e, 0x48, 0x02, 0x82, 0x48, 0xaf, 0x6a, 0x88,
+    0x1d, 0x06, 0xaa, 0x28, 0x01, 0x82, 0x28, 0x87,
+    0x89, 0x07, 0x82, 0x38, 0x80, 0x19, 0x8c, 0x38,
+    0x80, 0x19, 0x86, 0x38, 0x83, 0x19, 0x80, 0x38,
+    0x85, 0x19, 0x80, 0x38, 0x82, 0x19, 0x81, 0x38,
+    0x80, 0x19, 0x04, 0xa5, 0x47, 0x84, 0x2c, 0x80,
+    0x1d, 0xb0, 0x47, 0x84, 0x2c, 0x83, 0x47, 0x84,
+    0x2c, 0x8c, 0x47, 0x80, 0x1d, 0xc5, 0x47, 0x80,
+    0x2c, 0xbf, 0x38, 0xe0, 0x9f, 0x47, 0x95, 0x2c,
+    0x01, 0x85, 0x2c, 0x01, 0xa5, 0x2c, 0x01, 0x85,
+    0x2c, 0x01, 0x87, 0x2c, 0x00, 0x80, 0x2c, 0x00,
+    0x80, 0x2c, 0x00, 0x80, 0x2c, 0x00, 0x9e, 0x2c,
+    0x01, 0xb4, 0x2c, 0x00, 0x8e, 0x2c, 0x00, 0x8d,
+    0x2c, 0x01, 0x85, 0x2c, 0x00, 0x92, 0x2c, 0x01,
+    0x82, 0x2c, 0x00, 0x88, 0x2c, 0x00, 0x8b, 0x19,
+    0x81, 0x38, 0xd6, 0x19, 0x00, 0x8a, 0x19, 0x80,
+    0x47, 0x01, 0x8a, 0x19, 0x80, 0x47, 0x8e, 0x19,
+    0x00, 0x8c, 0x47, 0x02, 0xa0, 0x19, 0x0e, 0xa0,
+    0x38, 0x0e, 0xa5, 0x19, 0x80, 0x2c, 0x82, 0x19,
+    0x81, 0x47, 0x85, 0x19, 0x80, 0x47, 0x9a, 0x19,
+    0x80, 0x47, 0x90, 0x19, 0xa8, 0x47, 0x82, 0x19,
+    0x03, 0xe2, 0x36, 0x19, 0x18, 0x8a, 0x19, 0x14,
+    0xe3, 0x3f, 0x19, 0xe0, 0x9f, 0x0f, 0xe2, 0x13,
+    0x19, 0x01, 0x9f, 0x19, 0x00, 0xe0, 0x08, 0x19,
+    0xdf, 0x29, 0x9f, 0x47, 0xe0, 0x13, 0x1a, 0x04,
+    0x86, 0x1a, 0xa5, 0x28, 0x00, 0x80, 0x28, 0x04,
+    0x80, 0x28, 0x01, 0xb7, 0x98, 0x06, 0x81, 0x98,
+    0x0d, 0x80, 0x98, 0x96, 0x27, 0x08, 0x86, 0x27,
+    0x00, 0x86, 0x27, 0x00, 0x86, 0x27, 0x00, 0x86,
+    0x27, 0x00, 0x86, 0x27, 0x00, 0x86, 0x27, 0x00,
+    0x86, 0x27, 0x00, 0x86, 0x27, 0x00, 0x9f, 0x1d,
+    0xdd, 0x19, 0x21, 0x99, 0x30, 0x00, 0xd8, 0x30,
+    0x0b, 0xe0, 0x75, 0x30, 0x19, 0x8b, 0x19, 0x03,
+    0x84, 0x19, 0x80, 0x30, 0x80, 0x19, 0x80, 0x30,
+    0x98, 0x19, 0x88, 0x30, 0x83, 0x38, 0x81, 0x31,
+    0x87, 0x19, 0x83, 0x30, 0x83, 0x19, 0x00, 0xd5,
+    0x36, 0x01, 0x81, 0x38, 0x81, 0x19, 0x82, 0x36,
+    0x80, 0x19, 0xd9, 0x3e, 0x81, 0x19, 0x82, 0x3e,
+    0x04, 0xaa, 0x0d, 0x00, 0xdd, 0x31, 0x00, 0x8f,
+    0x19, 0x9f, 0x0d, 0xa3, 0x19, 0x0b, 0x8f, 0x3e,
+    0x9e, 0x31, 0x00, 0xbf, 0x19, 0x9e, 0x31, 0xd0,
+    0x19, 0xae, 0x3e, 0x80, 0x19, 0xd7, 0x3e, 0xe0,
+    0x47, 0x19, 0xf0, 0x09, 0x5f, 0x30, 0xbf, 0x19,
+    0xf0, 0x41, 0x9f, 0x30, 0xe4, 0x2c, 0xa2, 0x02,
+    0xb6, 0xa2, 0x08, 0xaf, 0x4c, 0xe0, 0xcb, 0x9d,
+    0x13, 0xdf, 0x1d, 0xd7, 0x08, 0x07, 0xa1, 0x19,
+    0xe0, 0x05, 0x47, 0x82, 0x19, 0xbf, 0x47, 0x04,
+    0x81, 0x47, 0x00, 0x80, 0x47, 0x00, 0x84, 0x47,
+    0x17, 0x8d, 0x47, 0xac, 0x8a, 0x02, 0x89, 0x19,
+    0x05, 0xb7, 0x7a, 0x07, 0xc5, 0x80, 0x07, 0x8b,
+    0x80, 0x05, 0x9f, 0x20, 0xad, 0x40, 0x80, 0x19,
+    0x80, 0x40, 0xa3, 0x7d, 0x0a, 0x80, 0x7d, 0x9c,
+    0x31, 0x02, 0xcd, 0x3b, 0x00, 0x80, 0x19, 0x89,
+    0x3b, 0x03, 0x81, 0x3b, 0x9e, 0x60, 0x00, 0xb6,
+    0x16, 0x08, 0x8d, 0x16, 0x01, 0x89, 0x16, 0x01,
+    0x83, 0x16, 0x9f, 0x60, 0xc2, 0x90, 0x17, 0x84,
+    0x90, 0x96, 0x57, 0x09, 0x85, 0x27, 0x01, 0x85,
+    0x27, 0x01, 0x85, 0x27, 0x08, 0x86, 0x27, 0x00,
+    0x86, 0x27, 0x00, 0xaa, 0x47, 0x80, 0x19, 0x88,
+    0x47, 0x80, 0x2c, 0x83, 0x47, 0x81, 0x19, 0x03,
+    0xcf, 0x17, 0xad, 0x57, 0x01, 0x89, 0x57, 0x05,
+    0xf0, 0x1b, 0x43, 0x31, 0x0b, 0x96, 0x31, 0x03,
+    0xb0, 0x31, 0x70, 0x10, 0xa3, 0xe1, 0x0d, 0x30,
+    0x01, 0xe0, 0x09, 0x30, 0x25, 0x86, 0x47, 0x0b,
+    0x84, 0x05, 0x04, 0x99, 0x35, 0x00, 0x84, 0x35,
+    0x00, 0x80, 0x35, 0x00, 0x81, 0x35, 0x00, 0x81,
+    0x35, 0x00, 0x89, 0x35, 0xe0, 0x12, 0x04, 0x0f,
+    0xe1, 0x0a, 0x04, 0x81, 0x19, 0xcf, 0x04, 0x01,
+    0xb5, 0x04, 0x06, 0x80, 0x04, 0x1f, 0x8f, 0x04,
+    0x8f, 0x38, 0x89, 0x19, 0x05, 0x8d, 0x38, 0x81,
+    0x1d, 0xa2, 0x19, 0x00, 0x92, 0x19, 0x00, 0x83,
+    0x19, 0x03, 0x84, 0x04, 0x00, 0xe0, 0x26, 0x04,
+    0x01, 0x80, 0x19, 0x00, 0x9f, 0x19, 0x99, 0x47,
+    0x85, 0x19, 0x99, 0x47, 0x8a, 0x19, 0x89, 0x3e,
+    0x80, 0x19, 0xac, 0x3e, 0x81, 0x19, 0x9e, 0x31,
+    0x02, 0x85, 0x31, 0x01, 0x85, 0x31, 0x01, 0x85,
+    0x31, 0x01, 0x82, 0x31, 0x02, 0x86, 0x19, 0x00,
+    0x86, 0x19, 0x09, 0x84, 0x19, 0x01, 0x8b, 0x4b,
+    0x00, 0x99, 0x4b, 0x00, 0x92, 0x4b, 0x00, 0x81,
+    0x4b, 0x00, 0x8e, 0x4b, 0x01, 0x8d, 0x4b, 0x21,
+    0xe0, 0x1a, 0x4b, 0x04, 0x82, 0x19, 0x03, 0xac,
+    0x19, 0x02, 0x88, 0x19, 0xce, 0x2c, 0x00, 0x8c,
+    0x19, 0x02, 0x80, 0x2c, 0x2e, 0xac, 0x19, 0x80,
+    0x38, 0x60, 0x21, 0x9c, 0x4d, 0x02, 0xb0, 0x13,
+    0x0e, 0x80, 0x38, 0x9a, 0x19, 0x03, 0xa3, 0x6c,
+    0x08, 0x82, 0x6c, 0x9a, 0x2a, 0x04, 0xaa, 0x6e,
+    0x04, 0x9d, 0x9c, 0x00, 0x80, 0x9c, 0xa3, 0x6f,
+    0x03, 0x8d, 0x6f, 0x29, 0xcf, 0x1f, 0xaf, 0x82,
+    0x9d, 0x76, 0x01, 0x89, 0x76, 0x05, 0xa3, 0x75,
+    0x03, 0xa3, 0x75, 0x03, 0xa7, 0x25, 0x07, 0xb3,
+    0x14, 0x0a, 0x80, 0x14, 0x8a, 0x9e, 0x00, 0x8e,
+    0x9e, 0x00, 0x86, 0x9e, 0x00, 0x81, 0x9e, 0x00,
+    0x8a, 0x9e, 0x00, 0x8e, 0x9e, 0x00, 0x86, 0x9e,
+    0x00, 0x81, 0x9e, 0x42, 0xe0, 0xd6, 0x4a, 0x08,
+    0x95, 0x4a, 0x09, 0x87, 0x4a, 0x17, 0x85, 0x47,
+    0x00, 0xa9, 0x47, 0x00, 0x88, 0x47, 0x44, 0x85,
+    0x1c, 0x01, 0x80, 0x1c, 0x00, 0xab, 0x1c, 0x00,
+    0x81, 0x1c, 0x02, 0x80, 0x1c, 0x01, 0x80, 0x1c,
+    0x95, 0x37, 0x00, 0x88, 0x37, 0x9f, 0x78, 0x9e,
+    0x61, 0x07, 0x88, 0x61, 0x2f, 0x92, 0x34, 0x00,
+    0x81, 0x34, 0x04, 0x84, 0x34, 0x9b, 0x7b, 0x02,
+    0x80, 0x7b, 0x99, 0x4e, 0x04, 0x80, 0x4e, 0x3f,
+    0x9f, 0x5a, 0x97, 0x59, 0x03, 0x93, 0x59, 0x01,
+    0xad, 0x59, 0x83, 0x41, 0x00, 0x81, 0x41, 0x04,
+    0x87, 0x41, 0x00, 0x82, 0x41, 0x00, 0x9c, 0x41,
+    0x01, 0x82, 0x41, 0x03, 0x89, 0x41, 0x06, 0x88,
+    0x41, 0x06, 0x9f, 0x71, 0x9f, 0x6d, 0x1f, 0xa6,
+    0x53, 0x03, 0x8b, 0x53, 0x08, 0xb5, 0x06, 0x02,
+    0x86, 0x06, 0x95, 0x3a, 0x01, 0x87, 0x3a, 0x92,
+    0x39, 0x04, 0x87, 0x39, 0x91, 0x7c, 0x06, 0x83,
+    0x7c, 0x0b, 0x86, 0x7c, 0x4f, 0xc8, 0x72, 0x36,
+    0xb2, 0x6b, 0x0c, 0xb2, 0x6b, 0x06, 0x85, 0x6b,
+    0xa7, 0x32, 0x07, 0x89, 0x32, 0x60, 0xc5, 0x9e,
+    0x04, 0x00, 0xa9, 0xa1, 0x00, 0x82, 0xa1, 0x01,
+    0x81, 0xa1, 0x4a, 0x82, 0x04, 0xa7, 0x70, 0x07,
+    0xa9, 0x86, 0x15, 0x99, 0x73, 0x25, 0x9b, 0x18,
+    0x13, 0x96, 0x26, 0x08, 0xcd, 0x0e, 0x03, 0xa3,
+    0x0e, 0x08, 0x80, 0x0e, 0xc2, 0x3c, 0x09, 0x80,
+    0x3c, 0x01, 0x98, 0x87, 0x06, 0x89, 0x87, 0x05,
+    0xb4, 0x15, 0x00, 0x91, 0x15, 0x07, 0xa6, 0x50,
+    0x08, 0xdf, 0x81, 0x00, 0x93, 0x85, 0x0a, 0x91,
+    0x43, 0x00, 0xae, 0x43, 0x3d, 0x86, 0x5f, 0x00,
+    0x80, 0x5f, 0x00, 0x83, 0x5f, 0x00, 0x8e, 0x5f,
+    0x00, 0x8a, 0x5f, 0x05, 0xba, 0x45, 0x04, 0x89,
+    0x45, 0x05, 0x83, 0x2b, 0x00, 0x87, 0x2b, 0x01,
+    0x81, 0x2b, 0x01, 0x95, 0x2b, 0x00, 0x86, 0x2b,
+    0x00, 0x81, 0x2b, 0x00, 0x84, 0x2b, 0x00, 0x80,
+    0x38, 0x88, 0x2b, 0x01, 0x81, 0x2b, 0x01, 0x82,
+    0x2b, 0x01, 0x80, 0x2b, 0x05, 0x80, 0x2b, 0x04,
+    0x86, 0x2b, 0x01, 0x86, 0x2b, 0x02, 0x84, 0x2b,
+    0x60, 0x2a, 0xdb, 0x65, 0x00, 0x84, 0x65, 0x1d,
+    0xc7, 0x99, 0x07, 0x89, 0x99, 0x60, 0x45, 0xb5,
+    0x83, 0x01, 0xa5, 0x83, 0x21, 0xc4, 0x5c, 0x0a,
+    0x89, 0x5c, 0x05, 0x8c, 0x5d, 0x12, 0xb9, 0x91,
+    0x05, 0x89, 0x91, 0x35, 0x9a, 0x02, 0x01, 0x8e,
+    0x02, 0x03, 0x96, 0x02, 0x60, 0x58, 0xbb, 0x22,
+    0x60, 0x03, 0xd2, 0xa0, 0x0b, 0x80, 0xa0, 0x86,
+    0x21, 0x01, 0x80, 0x21, 0x01, 0x87, 0x21, 0x00,
+    0x81, 0x21, 0x00, 0x9d, 0x21, 0x00, 0x81, 0x21,
+    0x01, 0x8b, 0x21, 0x08, 0x89, 0x21, 0x45, 0x87,
+    0x63, 0x01, 0xad, 0x63, 0x01, 0x8a, 0x63, 0x1a,
+    0xc7, 0xa3, 0x07, 0xd2, 0x88, 0x0c, 0x8f, 0x12,
+    0xb8, 0x79, 0x06, 0x89, 0x20, 0x60, 0x95, 0x88,
+    0x0c, 0x00, 0xac, 0x0c, 0x00, 0x8d, 0x0c, 0x09,
+    0x9c, 0x0c, 0x02, 0x9f, 0x54, 0x01, 0x95, 0x54,
+    0x00, 0x8d, 0x54, 0x48, 0x86, 0x55, 0x00, 0x81,
+    0x55, 0x00, 0xab, 0x55, 0x02, 0x80, 0x55, 0x00,
+    0x81, 0x55, 0x00, 0x88, 0x55, 0x07, 0x89, 0x55,
+    0x05, 0x85, 0x2e, 0x00, 0x81, 0x2e, 0x00, 0xa4,
+    0x2e, 0x00, 0x81, 0x2e, 0x00, 0x85, 0x2e, 0x06,
+    0x89, 0x2e, 0x60, 0xd5, 0x98, 0x4f, 0x06, 0x90,
+    0x3f, 0x00, 0xa8, 0x3f, 0x02, 0x9b, 0x3f, 0x55,
+    0x80, 0x4c, 0x0e, 0xb1, 0x92, 0x0c, 0x80, 0x92,
+    0xe3, 0x39, 0x1b, 0x60, 0x05, 0xe0, 0x0e, 0x1b,
+    0x00, 0x84, 0x1b, 0x0a, 0xe0, 0x63, 0x1b, 0x69,
+    0xeb, 0xe0, 0x02, 0x1e, 0x0c, 0xe3, 0xf5, 0x24,
+    0x6f, 0x49, 0xe1, 0xe6, 0x03, 0x70, 0x11, 0x58,
+    0xe1, 0xd8, 0x08, 0x06, 0x9e, 0x5e, 0x00, 0x89,
+    0x5e, 0x03, 0x81, 0x5e, 0xce, 0x9a, 0x00, 0x89,
+    0x9a, 0x05, 0x9d, 0x09, 0x01, 0x85, 0x09, 0x09,
+    0xc5, 0x77, 0x09, 0x89, 0x77, 0x00, 0x86, 0x77,
+    0x00, 0x94, 0x77, 0x04, 0x92, 0x77, 0x62, 0x4f,
+    0xda, 0x56, 0x60, 0x04, 0xca, 0x5b, 0x03, 0xb8,
+    0x5b, 0x06, 0x90, 0x5b, 0x3f, 0x80, 0x93, 0x80,
+    0x67, 0x81, 0x30, 0x80, 0x44, 0x0a, 0x81, 0x30,
+    0x0d, 0xf0, 0x07, 0x97, 0x93, 0x07, 0xe2, 0x9f,
+    0x93, 0xe1, 0x75, 0x44, 0x29, 0x88, 0x93, 0x70,
+    0x12, 0x86, 0x83, 0x3e, 0x00, 0x86, 0x3e, 0x00,
+    0x81, 0x3e, 0x00, 0x80, 0x3e, 0xe0, 0xbe, 0x36,
+    0x82, 0x3e, 0x0e, 0x80, 0x36, 0x1c, 0x82, 0x36,
+    0x01, 0x80, 0x3e, 0x0d, 0x83, 0x3e, 0x07, 0xe1,
+    0x2b, 0x67, 0x68, 0xa3, 0xe0, 0x0a, 0x23, 0x04,
+    0x8c, 0x23, 0x02, 0x88, 0x23, 0x06, 0x89, 0x23,
+    0x01, 0x83, 0x23, 0x83, 0x19, 0x70, 0x01, 0xfb,
+    0xad, 0x38, 0x01, 0x96, 0x38, 0x08, 0xe0, 0x13,
+    0x19, 0x3b, 0xe0, 0x95, 0x19, 0x09, 0xa6, 0x19,
+    0x01, 0xbd, 0x19, 0x82, 0x38, 0x90, 0x19, 0x87,
+    0x38, 0x81, 0x19, 0x86, 0x38, 0x9d, 0x19, 0x83,
+    0x38, 0xbc, 0x19, 0x14, 0xc5, 0x2c, 0x60, 0x19,
+    0x93, 0x19, 0x0b, 0x93, 0x19, 0x0b, 0xd6, 0x19,
+    0x08, 0x98, 0x19, 0x60, 0x26, 0xd4, 0x19, 0x00,
+    0xc6, 0x19, 0x00, 0x81, 0x19, 0x01, 0x80, 0x19,
+    0x01, 0x81, 0x19, 0x01, 0x83, 0x19, 0x00, 0x8b,
+    0x19, 0x00, 0x80, 0x19, 0x00, 0x86, 0x19, 0x00,
+    0xc0, 0x19, 0x00, 0x83, 0x19, 0x01, 0x87, 0x19,
+    0x00, 0x86, 0x19, 0x00, 0x9b, 0x19, 0x00, 0x83,
+    0x19, 0x00, 0x84, 0x19, 0x00, 0x80, 0x19, 0x02,
+    0x86, 0x19, 0x00, 0xe0, 0xf3, 0x19, 0x01, 0xe0,
+    0xc3, 0x19, 0x01, 0xb1, 0x19, 0xe2, 0x2b, 0x84,
+    0x0e, 0x84, 0x84, 0x00, 0x8e, 0x84, 0x63, 0xef,
+    0x9e, 0x47, 0x05, 0x85, 0x47, 0x60, 0x74, 0x86,
+    0x29, 0x00, 0x90, 0x29, 0x01, 0x86, 0x29, 0x00,
+    0x81, 0x29, 0x00, 0x84, 0x29, 0x04, 0xbd, 0x1d,
+    0x20, 0x80, 0x1d, 0x60, 0x0f, 0xac, 0x68, 0x02,
+    0x8d, 0x68, 0x01, 0x89, 0x68, 0x03, 0x81, 0x68,
+    0x60, 0xdf, 0x9e, 0x9b, 0x10, 0xb9, 0x9f, 0x04,
+    0x80, 0x9f, 0x61, 0x6f, 0xa9, 0x62, 0x62, 0x85,
+    0x86, 0x27, 0x00, 0x83, 0x27, 0x00, 0x81, 0x27,
+    0x00, 0x8e, 0x27, 0x00, 0xe0, 0x64, 0x58, 0x01,
+    0x8f, 0x58, 0x28, 0xcb, 0x01, 0x03, 0x89, 0x01,
+    0x03, 0x81, 0x01, 0x62, 0xb0, 0xc3, 0x19, 0x4b,
+    0xbc, 0x19, 0x60, 0x61, 0x83, 0x04, 0x00, 0x9a,
+    0x04, 0x00, 0x81, 0x04, 0x00, 0x80, 0x04, 0x01,
+    0x80, 0x04, 0x00, 0x89, 0x04, 0x00, 0x83, 0x04,
+    0x00, 0x80, 0x04, 0x00, 0x80, 0x04, 0x05, 0x80,
+    0x04, 0x03, 0x80, 0x04, 0x00, 0x80, 0x04, 0x00,
+    0x80, 0x04, 0x00, 0x82, 0x04, 0x00, 0x81, 0x04,
+    0x00, 0x80, 0x04, 0x01, 0x80, 0x04, 0x00, 0x80,
+    0x04, 0x00, 0x80, 0x04, 0x00, 0x80, 0x04, 0x00,
+    0x80, 0x04, 0x00, 0x81, 0x04, 0x00, 0x80, 0x04,
+    0x01, 0x83, 0x04, 0x00, 0x86, 0x04, 0x00, 0x83,
+    0x04, 0x00, 0x83, 0x04, 0x00, 0x80, 0x04, 0x00,
+    0x89, 0x04, 0x00, 0x90, 0x04, 0x04, 0x82, 0x04,
+    0x00, 0x84, 0x04, 0x00, 0x90, 0x04, 0x33, 0x81,
+    0x04, 0x60, 0xad, 0xab, 0x19, 0x03, 0xe0, 0x03,
+    0x19, 0x0b, 0x8e, 0x19, 0x01, 0x8e, 0x19, 0x00,
+    0x8e, 0x19, 0x00, 0xa4, 0x19, 0x09, 0xe0, 0x4d,
+    0x19, 0x37, 0x99, 0x19, 0x80, 0x36, 0x81, 0x19,
+    0x0c, 0xab, 0x19, 0x03, 0x88, 0x19, 0x06, 0x81,
+    0x19, 0x0d, 0x85, 0x19, 0x60, 0x39, 0xe3, 0x77,
+    0x19, 0x03, 0x90, 0x19, 0x02, 0x8c, 0x19, 0x02,
+    0xe0, 0x16, 0x19, 0x03, 0xde, 0x19, 0x05, 0x8b,
+    0x19, 0x03, 0x80, 0x19, 0x0e, 0x8b, 0x19, 0x03,
+    0xb7, 0x19, 0x07, 0x89, 0x19, 0x05, 0xa7, 0x19,
+    0x07, 0x9d, 0x19, 0x01, 0x81, 0x19, 0x4d, 0xe0,
+    0xf3, 0x19, 0x0b, 0x8d, 0x19, 0x01, 0x8c, 0x19,
+    0x02, 0x88, 0x19, 0x06, 0xad, 0x19, 0x00, 0x86,
+    0x19, 0x07, 0x8d, 0x19, 0x03, 0x88, 0x19, 0x06,
+    0x88, 0x19, 0x06, 0xe0, 0x32, 0x19, 0x00, 0xb6,
+    0x19, 0x24, 0x89, 0x19, 0x63, 0xa5, 0xf0, 0x96,
+    0x7f, 0x30, 0x1f, 0xef, 0xd9, 0x30, 0x05, 0xe0,
+    0x7d, 0x30, 0x01, 0xf0, 0x06, 0x21, 0x30, 0x0d,
+    0xf0, 0x0c, 0xd0, 0x30, 0x6b, 0xbe, 0xe1, 0xbd,
+    0x30, 0x65, 0x81, 0xf0, 0x02, 0xea, 0x30, 0x04,
+    0xef, 0xff, 0x30, 0x7a, 0xcb, 0xf0, 0x80, 0x19,
+    0x1d, 0xdf, 0x19, 0x60, 0x1f, 0xe0, 0x8f, 0x38,
+};
+
+static const uint8_t unicode_script_ext_table[828] = {
+    0x82, 0xc1, 0x00, 0x00, 0x01, 0x2c, 0x01, 0x00,
+    0x00, 0x01, 0x2c, 0x1c, 0x00, 0x0c, 0x01, 0x47,
+    0x80, 0x92, 0x00, 0x00, 0x02, 0x1d, 0x6e, 0x00,
+    0x02, 0x1d, 0x29, 0x01, 0x02, 0x1d, 0x47, 0x00,
+    0x02, 0x1d, 0x29, 0x81, 0x03, 0x00, 0x00, 0x06,
+    0x04, 0x66, 0x32, 0x8b, 0x95, 0xa1, 0x0d, 0x00,
+    0x00, 0x06, 0x04, 0x66, 0x32, 0x8b, 0x95, 0xa1,
+    0x00, 0x03, 0x04, 0x8b, 0x95, 0x01, 0x00, 0x00,
+    0x07, 0x01, 0x04, 0x66, 0x32, 0x8b, 0x95, 0xa1,
+    0x1f, 0x00, 0x00, 0x09, 0x01, 0x04, 0x52, 0x53,
+    0x73, 0x7c, 0x32, 0x86, 0x8b, 0x09, 0x00, 0x0a,
+    0x02, 0x04, 0x8b, 0x09, 0x00, 0x09, 0x03, 0x04,
+    0x95, 0xa1, 0x05, 0x00, 0x00, 0x02, 0x04, 0x8b,
+    0x62, 0x00, 0x00, 0x02, 0x04, 0x32, 0x81, 0xfb,
+    0x00, 0x00, 0x0d, 0x0b, 0x20, 0x2b, 0x2d, 0x2f,
+    0x3d, 0x47, 0x51, 0x74, 0x81, 0x92, 0x94, 0x99,
+    0x00, 0x0c, 0x0b, 0x20, 0x2b, 0x2d, 0x2f, 0x3d,
+    0x47, 0x51, 0x74, 0x92, 0x94, 0x99, 0x10, 0x00,
+    0x00, 0x14, 0x0b, 0x20, 0x22, 0x2e, 0x55, 0x2b,
+    0x2d, 0x2f, 0x3d, 0x50, 0x51, 0x63, 0x74, 0x45,
+    0x85, 0x8a, 0x91, 0x92, 0x94, 0x99, 0x00, 0x15,
+    0x0b, 0x20, 0x22, 0x2e, 0x55, 0x2b, 0x2d, 0x2f,
+    0x3d, 0x49, 0x50, 0x51, 0x63, 0x74, 0x45, 0x85,
+    0x8a, 0x91, 0x92, 0x94, 0x99, 0x09, 0x04, 0x20,
+    0x22, 0x3c, 0x50, 0x75, 0x00, 0x09, 0x03, 0x0b,
+    0x15, 0x8a, 0x75, 0x00, 0x09, 0x02, 0x2f, 0x5f,
+    0x75, 0x00, 0x09, 0x02, 0x2d, 0x43, 0x80, 0x75,
+    0x00, 0x0d, 0x02, 0x2b, 0x92, 0x80, 0x71, 0x00,
+    0x09, 0x02, 0x3d, 0x63, 0x82, 0xcf, 0x00, 0x09,
+    0x03, 0x15, 0x60, 0x8e, 0x80, 0x30, 0x00, 0x00,
+    0x02, 0x28, 0x47, 0x85, 0xb8, 0x00, 0x01, 0x04,
+    0x11, 0x33, 0x8d, 0x8c, 0x80, 0x4a, 0x00, 0x01,
+    0x02, 0x5d, 0x7a, 0x00, 0x00, 0x00, 0x02, 0x5d,
+    0x7a, 0x84, 0x49, 0x00, 0x00, 0x04, 0x0b, 0x20,
+    0x2b, 0x3d, 0x00, 0x01, 0x20, 0x00, 0x04, 0x0b,
+    0x20, 0x2b, 0x3d, 0x00, 0x02, 0x20, 0x2b, 0x00,
+    0x01, 0x20, 0x01, 0x02, 0x0b, 0x20, 0x00, 0x02,
+    0x20, 0x81, 0x00, 0x02, 0x0b, 0x20, 0x00, 0x02,
+    0x20, 0x81, 0x00, 0x06, 0x20, 0x3d, 0x51, 0x74,
+    0x92, 0x94, 0x00, 0x01, 0x20, 0x01, 0x02, 0x20,
+    0x81, 0x01, 0x01, 0x20, 0x00, 0x02, 0x20, 0x81,
+    0x00, 0x02, 0x0b, 0x20, 0x06, 0x01, 0x20, 0x00,
+    0x02, 0x20, 0x63, 0x00, 0x02, 0x0b, 0x20, 0x01,
+    0x01, 0x20, 0x00, 0x02, 0x0b, 0x20, 0x03, 0x01,
+    0x20, 0x00, 0x08, 0x0b, 0x20, 0x2b, 0x3d, 0x63,
+    0x74, 0x94, 0x99, 0x00, 0x02, 0x20, 0x2b, 0x00,
+    0x03, 0x20, 0x2b, 0x3d, 0x01, 0x02, 0x0b, 0x20,
+    0x00, 0x01, 0x0b, 0x01, 0x02, 0x20, 0x2b, 0x00,
+    0x01, 0x63, 0x80, 0x44, 0x00, 0x01, 0x01, 0x2c,
+    0x35, 0x00, 0x00, 0x02, 0x1d, 0x8b, 0x00, 0x00,
+    0x00, 0x01, 0x8b, 0x81, 0xb3, 0x00, 0x00, 0x02,
+    0x47, 0x5d, 0x80, 0x3f, 0x00, 0x00, 0x03, 0x20,
+    0x2b, 0x47, 0x8c, 0xd1, 0x00, 0x00, 0x02, 0x1d,
+    0x29, 0x81, 0x3c, 0x00, 0x01, 0x06, 0x0d, 0x31,
+    0x30, 0x36, 0x3e, 0xa2, 0x00, 0x05, 0x0d, 0x31,
+    0x30, 0x36, 0x3e, 0x01, 0x00, 0x00, 0x01, 0x30,
+    0x00, 0x00, 0x09, 0x06, 0x0d, 0x31, 0x30, 0x36,
+    0x3e, 0xa2, 0x00, 0x00, 0x00, 0x05, 0x0d, 0x31,
+    0x30, 0x36, 0x3e, 0x07, 0x06, 0x0d, 0x31, 0x30,
+    0x36, 0x3e, 0xa2, 0x03, 0x05, 0x0d, 0x31, 0x30,
+    0x36, 0x3e, 0x09, 0x00, 0x03, 0x02, 0x0d, 0x30,
+    0x01, 0x00, 0x00, 0x05, 0x0d, 0x31, 0x30, 0x36,
+    0x3e, 0x04, 0x02, 0x36, 0x3e, 0x00, 0x00, 0x00,
+    0x05, 0x0d, 0x31, 0x30, 0x36, 0x3e, 0x03, 0x00,
+    0x01, 0x03, 0x30, 0x36, 0x3e, 0x01, 0x01, 0x30,
+    0x58, 0x00, 0x03, 0x02, 0x36, 0x3e, 0x02, 0x00,
+    0x00, 0x02, 0x36, 0x3e, 0x59, 0x00, 0x00, 0x06,
+    0x0d, 0x31, 0x30, 0x36, 0x3e, 0xa2, 0x00, 0x02,
+    0x36, 0x3e, 0x80, 0x12, 0x00, 0x0f, 0x01, 0x30,
+    0x1f, 0x00, 0x23, 0x01, 0x30, 0x3b, 0x00, 0x27,
+    0x01, 0x30, 0x37, 0x00, 0x30, 0x01, 0x30, 0x0e,
+    0x00, 0x0b, 0x01, 0x30, 0x32, 0x00, 0x00, 0x01,
+    0x30, 0x57, 0x00, 0x18, 0x01, 0x30, 0x09, 0x00,
+    0x04, 0x01, 0x30, 0x5f, 0x00, 0x1e, 0x01, 0x30,
+    0xc0, 0x31, 0xef, 0x00, 0x00, 0x02, 0x1d, 0x29,
+    0x80, 0x0f, 0x00, 0x07, 0x02, 0x30, 0x47, 0x80,
+    0xa7, 0x00, 0x02, 0x0e, 0x20, 0x22, 0x2d, 0x2f,
+    0x43, 0x3d, 0x3c, 0x50, 0x51, 0x5c, 0x63, 0x45,
+    0x91, 0x99, 0x02, 0x0d, 0x20, 0x22, 0x2d, 0x2f,
+    0x43, 0x3d, 0x3c, 0x50, 0x5c, 0x63, 0x45, 0x91,
+    0x99, 0x03, 0x0b, 0x20, 0x22, 0x2d, 0x2f, 0x43,
+    0x3c, 0x50, 0x5c, 0x45, 0x91, 0x99, 0x80, 0x36,
+    0x00, 0x00, 0x02, 0x0b, 0x20, 0x00, 0x00, 0x00,
+    0x02, 0x20, 0x92, 0x39, 0x00, 0x00, 0x03, 0x40,
+    0x47, 0x60, 0x80, 0x1f, 0x00, 0x00, 0x02, 0x10,
+    0x3b, 0xc0, 0x12, 0xed, 0x00, 0x01, 0x02, 0x04,
+    0x66, 0x80, 0x31, 0x00, 0x00, 0x02, 0x04, 0x95,
+    0x09, 0x00, 0x00, 0x02, 0x04, 0x95, 0x46, 0x00,
+    0x01, 0x05, 0x0d, 0x31, 0x30, 0x36, 0x3e, 0x80,
+    0x99, 0x00, 0x04, 0x06, 0x0d, 0x31, 0x30, 0x36,
+    0x3e, 0xa2, 0x09, 0x00, 0x00, 0x02, 0x36, 0x3e,
+    0x2c, 0x00, 0x01, 0x02, 0x36, 0x3e, 0x80, 0xdf,
+    0x00, 0x01, 0x03, 0x1e, 0x1c, 0x4b, 0x00, 0x02,
+    0x1c, 0x4b, 0x03, 0x00, 0x2c, 0x03, 0x1c, 0x4a,
+    0x4b, 0x02, 0x00, 0x08, 0x02, 0x1c, 0x4b, 0x81,
+    0x1f, 0x00, 0x1b, 0x02, 0x04, 0x1a, 0x87, 0x75,
+    0x00, 0x00, 0x02, 0x53, 0x73, 0x87, 0x8d, 0x00,
+    0x00, 0x02, 0x2b, 0x92, 0x00, 0x00, 0x00, 0x02,
+    0x2b, 0x92, 0x36, 0x00, 0x01, 0x02, 0x2b, 0x92,
+    0x8c, 0x12, 0x00, 0x01, 0x02, 0x2b, 0x92, 0x00,
+    0x00, 0x00, 0x02, 0x2b, 0x92, 0xc0, 0x5c, 0x4b,
+    0x00, 0x03, 0x01, 0x23, 0x96, 0x3b, 0x00, 0x11,
+    0x01, 0x30, 0x9e, 0x5d, 0x00, 0x01, 0x01, 0x30,
+    0xce, 0xcd, 0x2d, 0x00,
+};
+
+static const uint8_t unicode_prop_Hyphen_table[28] = {
+    0xac, 0x80, 0xfe, 0x80, 0x44, 0xdb, 0x80, 0x52,
+    0x7a, 0x80, 0x48, 0x08, 0x81, 0x4e, 0x04, 0x80,
+    0x42, 0xe2, 0x80, 0x60, 0xcd, 0x66, 0x80, 0x40,
+    0xa8, 0x80, 0xd6, 0x80,
+};
+
+static const uint8_t unicode_prop_Other_Math_table[200] = {
+    0xdd, 0x80, 0x43, 0x70, 0x11, 0x80, 0x99, 0x09,
+    0x81, 0x5c, 0x1f, 0x80, 0x9a, 0x82, 0x8a, 0x80,
+    0x9f, 0x83, 0x97, 0x81, 0x8d, 0x81, 0xc0, 0x8c,
+    0x18, 0x11, 0x1c, 0x91, 0x03, 0x01, 0x89, 0x00,
+    0x14, 0x28, 0x11, 0x09, 0x02, 0x05, 0x13, 0x24,
+    0xca, 0x21, 0x18, 0x08, 0x08, 0x00, 0x21, 0x0b,
+    0x0b, 0x91, 0x09, 0x00, 0x06, 0x00, 0x29, 0x41,
+    0x21, 0x83, 0x40, 0xa7, 0x08, 0x80, 0x97, 0x80,
+    0x90, 0x80, 0x41, 0xbc, 0x81, 0x8b, 0x88, 0x24,
+    0x21, 0x09, 0x14, 0x8d, 0x00, 0x01, 0x85, 0x97,
+    0x81, 0xb8, 0x00, 0x80, 0x9c, 0x83, 0x88, 0x81,
+    0x41, 0x55, 0x81, 0x9e, 0x89, 0x41, 0x92, 0x95,
+    0xbe, 0x83, 0x9f, 0x81, 0x60, 0xd4, 0x62, 0x00,
+    0x03, 0x80, 0x40, 0xd2, 0x00, 0x80, 0x60, 0xd4,
+    0xc0, 0xd4, 0x80, 0xc6, 0x01, 0x08, 0x09, 0x0b,
+    0x80, 0x8b, 0x00, 0x06, 0x80, 0xc0, 0x03, 0x0f,
+    0x06, 0x80, 0x9b, 0x03, 0x04, 0x00, 0x16, 0x80,
+    0x41, 0x53, 0x81, 0x98, 0x80, 0x98, 0x80, 0x9e,
+    0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x80, 0x9e,
+    0x80, 0x98, 0x80, 0x9e, 0x80, 0x98, 0x07, 0x81,
+    0xb1, 0x55, 0xff, 0x18, 0x9a, 0x01, 0x00, 0x08,
+    0x80, 0x89, 0x03, 0x00, 0x00, 0x28, 0x18, 0x00,
+    0x00, 0x02, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x0b, 0x06, 0x03, 0x03, 0x00,
+    0x80, 0x89, 0x80, 0x90, 0x22, 0x04, 0x80, 0x90,
+};
+
+static const uint8_t unicode_prop_Other_Alphabetic_table[428] = {
+    0x43, 0x44, 0x80, 0x42, 0x69, 0x8d, 0x00, 0x01,
+    0x01, 0x00, 0xc7, 0x8a, 0xaf, 0x8c, 0x06, 0x8f,
+    0x80, 0xe4, 0x33, 0x19, 0x0b, 0x80, 0xa2, 0x80,
+    0x9d, 0x8f, 0xe5, 0x8a, 0xe4, 0x0a, 0x88, 0x02,
+    0x03, 0x40, 0xa6, 0x8b, 0x16, 0x85, 0x93, 0xb5,
+    0x09, 0x8e, 0x01, 0x22, 0x89, 0x81, 0x9c, 0x82,
+    0xb9, 0x31, 0x09, 0x81, 0x89, 0x80, 0x89, 0x81,
+    0x9c, 0x82, 0xb9, 0x23, 0x09, 0x0b, 0x80, 0x9d,
+    0x0a, 0x80, 0x8a, 0x82, 0xb9, 0x38, 0x10, 0x81,
+    0x94, 0x81, 0x95, 0x13, 0x82, 0xb9, 0x31, 0x09,
+    0x81, 0x88, 0x81, 0x89, 0x81, 0x9d, 0x80, 0xba,
+    0x22, 0x10, 0x82, 0x89, 0x80, 0xa7, 0x84, 0xb8,
+    0x30, 0x10, 0x17, 0x81, 0x8a, 0x81, 0x9c, 0x82,
+    0xb9, 0x30, 0x10, 0x17, 0x81, 0x8a, 0x81, 0x8e,
+    0x80, 0x8b, 0x83, 0xb9, 0x30, 0x10, 0x82, 0x89,
+    0x80, 0x89, 0x81, 0x9c, 0x82, 0xca, 0x28, 0x00,
+    0x87, 0x91, 0x81, 0xbc, 0x01, 0x86, 0x91, 0x80,
+    0xe2, 0x01, 0x28, 0x81, 0x8f, 0x80, 0x40, 0xa2,
+    0x92, 0x88, 0x8a, 0x80, 0xa3, 0xed, 0x8b, 0x00,
+    0x0b, 0x96, 0x1b, 0x10, 0x11, 0x32, 0x83, 0x8c,
+    0x8b, 0x00, 0x89, 0x83, 0x46, 0x73, 0x81, 0x9d,
+    0x81, 0x9d, 0x81, 0x9d, 0x81, 0xc1, 0x92, 0x40,
+    0xbb, 0x81, 0xa1, 0x80, 0xf5, 0x8b, 0x83, 0x88,
+    0x40, 0xdd, 0x84, 0xb8, 0x89, 0x81, 0x93, 0xc9,
+    0x81, 0x8a, 0x82, 0xb0, 0x84, 0xaf, 0x8e, 0xbb,
+    0x82, 0x9d, 0x88, 0x09, 0xb8, 0x8a, 0xb1, 0x92,
+    0x41, 0xaf, 0x8d, 0x46, 0xc0, 0xb3, 0x48, 0xf5,
+    0x9f, 0x60, 0x78, 0x73, 0x87, 0xa1, 0x81, 0x41,
+    0x61, 0x07, 0x80, 0x96, 0x84, 0xd7, 0x81, 0xb1,
+    0x8f, 0x00, 0xb8, 0x80, 0xa5, 0x84, 0x9b, 0x8b,
+    0xac, 0x83, 0xaf, 0x8b, 0xa4, 0x80, 0xc2, 0x8d,
+    0x8b, 0x07, 0x81, 0xac, 0x82, 0xb1, 0x00, 0x11,
+    0x0c, 0x80, 0xab, 0x24, 0x80, 0x40, 0xec, 0x87,
+    0x60, 0x4f, 0x32, 0x80, 0x48, 0x56, 0x84, 0x46,
+    0x85, 0x10, 0x0c, 0x83, 0x43, 0x13, 0x83, 0x41,
+    0x82, 0x81, 0x41, 0x52, 0x82, 0xb4, 0x8d, 0xac,
+    0x81, 0x8a, 0x82, 0xac, 0x88, 0x88, 0x80, 0xbc,
+    0x82, 0xa3, 0x8b, 0x91, 0x81, 0xb8, 0x82, 0xaf,
+    0x8c, 0x8d, 0x81, 0xdb, 0x88, 0x08, 0x28, 0x08,
+    0x40, 0x9c, 0x89, 0x96, 0x83, 0xb9, 0x31, 0x09,
+    0x81, 0x89, 0x80, 0x89, 0x81, 0x40, 0xd0, 0x8c,
+    0x02, 0xe9, 0x91, 0x40, 0xec, 0x31, 0x86, 0x9c,
+    0x81, 0xd1, 0x8e, 0x00, 0xe9, 0x8a, 0xe6, 0x8d,
+    0x41, 0x00, 0x8c, 0x40, 0xf6, 0x28, 0x09, 0x0a,
+    0x00, 0x80, 0x40, 0x8d, 0x31, 0x2b, 0x80, 0x9b,
+    0x89, 0xa9, 0x20, 0x83, 0x91, 0x8a, 0xad, 0x8d,
+    0x41, 0x96, 0x38, 0x86, 0xd2, 0x95, 0x80, 0x8d,
+    0xf9, 0x2a, 0x00, 0x08, 0x10, 0x02, 0x80, 0xc1,
+    0x20, 0x08, 0x83, 0x41, 0x5b, 0x83, 0x88, 0x08,
+    0x80, 0xaf, 0x32, 0x82, 0x60, 0x50, 0x0d, 0x00,
+    0xb6, 0x33, 0xdc, 0x81, 0x60, 0x4c, 0xab, 0x80,
+    0x60, 0x23, 0x60, 0x30, 0x90, 0x0e, 0x01, 0x04,
+    0xe3, 0x80, 0x48, 0xb6, 0x80, 0x47, 0xe7, 0x99,
+    0x85, 0x99, 0x85, 0x99,
+};
+
+static const uint8_t unicode_prop_Other_Lowercase_table[69] = {
+    0x40, 0xa9, 0x80, 0x8e, 0x80, 0x41, 0xf4, 0x88,
+    0x31, 0x9d, 0x84, 0xdf, 0x80, 0xb3, 0x80, 0x4d,
+    0x80, 0x80, 0x4c, 0x2e, 0xbe, 0x8c, 0x80, 0xa1,
+    0xa4, 0x42, 0xb0, 0x80, 0x8c, 0x80, 0x8f, 0x8c,
+    0x40, 0xd2, 0x8f, 0x43, 0x4f, 0x99, 0x47, 0x91,
+    0x81, 0x60, 0x7a, 0x1d, 0x81, 0x40, 0xd1, 0x80,
+    0x40, 0x80, 0x12, 0x81, 0x43, 0x61, 0x83, 0x88,
+    0x80, 0x60, 0x5c, 0x15, 0x01, 0x10, 0xa9, 0x80,
+    0x88, 0x60, 0xd8, 0x74, 0xbd,
+};
+
+static const uint8_t unicode_prop_Other_Uppercase_table[15] = {
+    0x60, 0x21, 0x5f, 0x8f, 0x43, 0x45, 0x99, 0x61,
+    0xcc, 0x5f, 0x99, 0x85, 0x99, 0x85, 0x99,
+};
+
+static const uint8_t unicode_prop_Other_Grapheme_Extend_table[65] = {
+    0x49, 0xbd, 0x80, 0x97, 0x80, 0x41, 0x65, 0x80,
+    0x97, 0x80, 0xe5, 0x80, 0x97, 0x80, 0x40, 0xe9,
+    0x80, 0x91, 0x81, 0xe6, 0x80, 0x97, 0x80, 0xf6,
+    0x80, 0x8e, 0x80, 0x4d, 0x54, 0x80, 0x44, 0xd5,
+    0x80, 0x50, 0x20, 0x81, 0x60, 0xcf, 0x6d, 0x81,
+    0x53, 0x9d, 0x80, 0x97, 0x80, 0x41, 0x57, 0x80,
+    0x8b, 0x80, 0x40, 0xf0, 0x80, 0x43, 0x7f, 0x80,
+    0x60, 0xb8, 0x33, 0x07, 0x84, 0x6c, 0x2e, 0xac,
+    0xdf,
+};
+
+static const uint8_t unicode_prop_Other_Default_Ignorable_Code_Point_table[32] = {
+    0x43, 0x4e, 0x80, 0x4e, 0x0e, 0x81, 0x46, 0x52,
+    0x81, 0x48, 0xae, 0x80, 0x50, 0xfd, 0x80, 0x60,
+    0xce, 0x3a, 0x80, 0xce, 0x88, 0x6d, 0x00, 0x06,
+    0x00, 0x9d, 0xdf, 0xff, 0x40, 0xef, 0x4e, 0x0f,
+};
+
+static const uint8_t unicode_prop_Other_ID_Start_table[11] = {
+    0x58, 0x84, 0x81, 0x48, 0x90, 0x80, 0x94, 0x80,
+    0x4f, 0x6b, 0x81,
+};
+
+static const uint8_t unicode_prop_Other_ID_Continue_table[12] = {
+    0x40, 0xb6, 0x80, 0x42, 0xce, 0x80, 0x4f, 0xe0,
+    0x88, 0x46, 0x67, 0x80,
+};
+
+static const uint8_t unicode_prop_Prepended_Concatenation_Mark_table[19] = {
+    0x45, 0xff, 0x85, 0x40, 0xd6, 0x80, 0xb0, 0x80,
+    0x41, 0x7f, 0x81, 0xcf, 0x80, 0x61, 0x07, 0xd9,
+    0x80, 0x8e, 0x80,
+};
+
+static const uint8_t unicode_prop_XID_Start1_table[31] = {
+    0x43, 0x79, 0x80, 0x4a, 0xb7, 0x80, 0xfe, 0x80,
+    0x60, 0x21, 0xe6, 0x81, 0x60, 0xcb, 0xc0, 0x85,
+    0x41, 0x95, 0x81, 0xf3, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x80, 0x41, 0x1e, 0x81,
+};
+
+static const uint8_t unicode_prop_XID_Continue1_table[23] = {
+    0x43, 0x79, 0x80, 0x60, 0x2d, 0x1f, 0x81, 0x60,
+    0xcb, 0xc0, 0x85, 0x41, 0x95, 0x81, 0xf3, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+};
+
+static const uint8_t unicode_prop_Changes_When_Titlecased1_table[22] = {
+    0x41, 0xc3, 0x08, 0x08, 0x81, 0xa4, 0x81, 0x4e,
+    0xdc, 0xaa, 0x0a, 0x4e, 0x87, 0x3f, 0x3f, 0x87,
+    0x8b, 0x80, 0x8e, 0x80, 0xae, 0x80,
+};
+
+static const uint8_t unicode_prop_Changes_When_Casefolded1_table[29] = {
+    0x41, 0xef, 0x80, 0x41, 0x9e, 0x80, 0x9e, 0x80,
+    0x5a, 0xe4, 0x83, 0x40, 0xb5, 0x00, 0x00, 0x00,
+    0x80, 0xde, 0x06, 0x06, 0x80, 0x8a, 0x09, 0x81,
+    0x89, 0x10, 0x81, 0x8d, 0x80,
+};
+
+static const uint8_t unicode_prop_Changes_When_NFKC_Casefolded1_table[447] = {
+    0x40, 0x9f, 0x06, 0x00, 0x01, 0x00, 0x01, 0x12,
+    0x10, 0x82, 0xf3, 0x80, 0x8b, 0x80, 0x40, 0x84,
+    0x01, 0x01, 0x80, 0xa2, 0x01, 0x80, 0x40, 0xbb,
+    0x88, 0x9e, 0x29, 0x84, 0xda, 0x08, 0x81, 0x89,
+    0x80, 0xa3, 0x04, 0x02, 0x04, 0x08, 0x07, 0x80,
+    0x9e, 0x80, 0xa0, 0x82, 0x9c, 0x80, 0x42, 0x28,
+    0x80, 0xd7, 0x83, 0x42, 0xde, 0x87, 0xfb, 0x08,
+    0x80, 0xd2, 0x01, 0x80, 0xa1, 0x11, 0x80, 0x40,
+    0xfc, 0x81, 0x42, 0xd4, 0x80, 0xfe, 0x80, 0xa7,
+    0x81, 0xad, 0x80, 0xb5, 0x80, 0x88, 0x03, 0x03,
+    0x03, 0x80, 0x8b, 0x80, 0x88, 0x00, 0x26, 0x80,
+    0x90, 0x80, 0x88, 0x03, 0x03, 0x03, 0x80, 0x8b,
+    0x80, 0x41, 0x41, 0x80, 0xe1, 0x81, 0x46, 0x52,
+    0x81, 0xd4, 0x84, 0x45, 0x1b, 0x10, 0x8a, 0x80,
+    0x91, 0x80, 0x9b, 0x8c, 0x80, 0xa1, 0xa4, 0x40,
+    0xd5, 0x83, 0x40, 0xb5, 0x00, 0x00, 0x00, 0x80,
+    0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+    0xb7, 0x05, 0x00, 0x13, 0x05, 0x11, 0x02, 0x0c,
+    0x11, 0x00, 0x00, 0x0c, 0x15, 0x05, 0x08, 0x8f,
+    0x00, 0x20, 0x8b, 0x12, 0x2a, 0x08, 0x0b, 0x00,
+    0x07, 0x82, 0x8c, 0x06, 0x92, 0x81, 0x9a, 0x80,
+    0x8c, 0x8a, 0x80, 0xd6, 0x18, 0x10, 0x8a, 0x01,
+    0x0c, 0x0a, 0x00, 0x10, 0x11, 0x02, 0x06, 0x05,
+    0x1c, 0x85, 0x8f, 0x8f, 0x8f, 0x88, 0x80, 0x40,
+    0xa1, 0x08, 0x81, 0x40, 0xf7, 0x81, 0x41, 0x34,
+    0xd5, 0x99, 0x9a, 0x45, 0x20, 0x80, 0xe6, 0x82,
+    0xe4, 0x80, 0x41, 0x9e, 0x81, 0x40, 0xf0, 0x80,
+    0x41, 0x2e, 0x80, 0xd2, 0x80, 0x8b, 0x40, 0xd5,
+    0xa9, 0x80, 0xb4, 0x00, 0x82, 0xdf, 0x09, 0x80,
+    0xde, 0x80, 0xb0, 0xdd, 0x82, 0x8d, 0xdf, 0x9e,
+    0x80, 0xa7, 0x87, 0xae, 0x80, 0x41, 0x7f, 0x60,
+    0x72, 0x9b, 0x81, 0x40, 0xd1, 0x80, 0x40, 0x80,
+    0x12, 0x81, 0x43, 0x61, 0x83, 0x88, 0x80, 0x60,
+    0x4d, 0x95, 0x41, 0x0d, 0x08, 0x00, 0x81, 0x89,
+    0x00, 0x00, 0x09, 0x82, 0xc3, 0x81, 0xe9, 0xc2,
+    0x00, 0x97, 0x04, 0x00, 0x01, 0x01, 0x80, 0xeb,
+    0xa0, 0x41, 0x6a, 0x91, 0xbf, 0x81, 0xb5, 0xa7,
+    0x8c, 0x82, 0x99, 0x95, 0x94, 0x81, 0x8b, 0x80,
+    0x92, 0x03, 0x1a, 0x00, 0x80, 0x40, 0x86, 0x08,
+    0x80, 0x9f, 0x99, 0x40, 0x83, 0x15, 0x0d, 0x0d,
+    0x0a, 0x16, 0x06, 0x80, 0x88, 0x47, 0x87, 0x20,
+    0xa9, 0x80, 0x88, 0x60, 0xb4, 0xe4, 0x83, 0x54,
+    0xb9, 0x86, 0x8d, 0x87, 0xbf, 0x85, 0x42, 0x3e,
+    0xd4, 0x80, 0xc6, 0x01, 0x08, 0x09, 0x0b, 0x80,
+    0x8b, 0x00, 0x06, 0x80, 0xc0, 0x03, 0x0f, 0x06,
+    0x80, 0x9b, 0x03, 0x04, 0x00, 0x16, 0x80, 0x41,
+    0x53, 0x81, 0x41, 0x23, 0x81, 0xb1, 0x48, 0x2f,
+    0xbd, 0x4d, 0x91, 0x18, 0x9a, 0x01, 0x00, 0x08,
+    0x80, 0x89, 0x03, 0x00, 0x00, 0x28, 0x18, 0x00,
+    0x00, 0x02, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x0b, 0x06, 0x03, 0x03, 0x00,
+    0x80, 0x89, 0x80, 0x90, 0x22, 0x04, 0x80, 0x90,
+    0x42, 0x43, 0x8a, 0x84, 0x9e, 0x80, 0x9f, 0x99,
+    0x82, 0xa2, 0x80, 0xee, 0x82, 0x8c, 0xab, 0x83,
+    0x88, 0x31, 0x49, 0x9d, 0x89, 0x60, 0xfc, 0x05,
+    0x42, 0x1d, 0x6b, 0x05, 0xe1, 0x4f, 0xff,
+};
+
+static const uint8_t unicode_prop_ASCII_Hex_Digit_table[5] = {
+    0xaf, 0x89, 0x35, 0x99, 0x85,
+};
+
+static const uint8_t unicode_prop_Bidi_Control_table[10] = {
+    0x46, 0x1b, 0x80, 0x59, 0xf0, 0x81, 0x99, 0x84,
+    0xb6, 0x83,
+};
+
+static const uint8_t unicode_prop_Dash_table[55] = {
+    0xac, 0x80, 0x45, 0x5b, 0x80, 0xb2, 0x80, 0x4e,
+    0x40, 0x80, 0x44, 0x04, 0x80, 0x48, 0x08, 0x85,
+    0xbc, 0x80, 0xa6, 0x80, 0x8e, 0x80, 0x41, 0x85,
+    0x80, 0x4c, 0x03, 0x01, 0x80, 0x9e, 0x0b, 0x80,
+    0x9b, 0x80, 0x41, 0xbd, 0x80, 0x92, 0x80, 0xee,
+    0x80, 0x60, 0xcd, 0x8f, 0x81, 0xa4, 0x80, 0x89,
+    0x80, 0x40, 0xa8, 0x80, 0x4f, 0x9e, 0x80,
+};
+
+static const uint8_t unicode_prop_Deprecated_table[23] = {
+    0x41, 0x48, 0x80, 0x45, 0x28, 0x80, 0x49, 0x02,
+    0x00, 0x80, 0x48, 0x28, 0x81, 0x48, 0xc4, 0x85,
+    0x42, 0xb8, 0x81, 0x6d, 0xdc, 0xd5, 0x80,
+};
+
+static const uint8_t unicode_prop_Diacritic_table[399] = {
+    0xdd, 0x00, 0x80, 0xc6, 0x05, 0x03, 0x01, 0x81,
+    0x41, 0xf6, 0x40, 0x9e, 0x07, 0x25, 0x90, 0x0b,
+    0x80, 0x88, 0x81, 0x40, 0xfc, 0x84, 0x40, 0xd0,
+    0x80, 0xb6, 0x90, 0x80, 0x9a, 0x00, 0x01, 0x00,
+    0x40, 0x85, 0x3b, 0x81, 0x40, 0x85, 0x0b, 0x0a,
+    0x82, 0xc2, 0x9a, 0xda, 0x8a, 0xb9, 0x8a, 0xa1,
+    0x81, 0xfd, 0x87, 0xa8, 0x89, 0x8f, 0x9b, 0xbc,
+    0x80, 0x8f, 0x02, 0x83, 0x9b, 0x80, 0xc9, 0x80,
+    0x8f, 0x80, 0xed, 0x80, 0x8f, 0x80, 0xed, 0x80,
+    0x8f, 0x80, 0xae, 0x82, 0xbb, 0x80, 0x8f, 0x06,
+    0x80, 0xf6, 0x80, 0xed, 0x80, 0x8f, 0x80, 0xed,
+    0x80, 0x8f, 0x80, 0xec, 0x81, 0x8f, 0x80, 0xfb,
+    0x80, 0xfb, 0x28, 0x80, 0xea, 0x80, 0x8c, 0x84,
+    0xca, 0x81, 0x9a, 0x00, 0x00, 0x03, 0x81, 0xc1,
+    0x10, 0x81, 0xbd, 0x80, 0xef, 0x00, 0x81, 0xa7,
+    0x0b, 0x84, 0x98, 0x30, 0x80, 0x89, 0x81, 0x42,
+    0xc0, 0x82, 0x43, 0xb3, 0x81, 0x40, 0xb2, 0x8a,
+    0x88, 0x80, 0x41, 0x5a, 0x82, 0x41, 0x38, 0x39,
+    0x80, 0xaf, 0x8e, 0x81, 0x8a, 0xe7, 0x80, 0x8e,
+    0x80, 0xa5, 0x88, 0xb5, 0x81, 0x40, 0x89, 0x81,
+    0xbf, 0x85, 0xd1, 0x98, 0x18, 0x28, 0x0a, 0xb1,
+    0xbe, 0xd8, 0x8b, 0xa4, 0x8a, 0x41, 0xbc, 0x00,
+    0x82, 0x8a, 0x82, 0x8c, 0x82, 0x8c, 0x82, 0x8c,
+    0x81, 0x4c, 0xef, 0x82, 0x41, 0x3c, 0x80, 0x41,
+    0xf9, 0x85, 0xe8, 0x83, 0xde, 0x80, 0x60, 0x75,
+    0x71, 0x80, 0x8b, 0x08, 0x80, 0x9b, 0x81, 0xd1,
+    0x81, 0x8d, 0xa1, 0xe5, 0x82, 0xec, 0x81, 0x40,
+    0xc9, 0x80, 0x9a, 0x91, 0xb8, 0x83, 0xa3, 0x80,
+    0xde, 0x80, 0x8b, 0x80, 0xa3, 0x80, 0x40, 0x94,
+    0x82, 0xc0, 0x83, 0xb2, 0x80, 0xe3, 0x84, 0x88,
+    0x82, 0xff, 0x81, 0x60, 0x4f, 0x2f, 0x80, 0x43,
+    0x00, 0x8f, 0x41, 0x0d, 0x00, 0x80, 0xae, 0x80,
+    0xac, 0x81, 0xc2, 0x80, 0x42, 0xfb, 0x80, 0x44,
+    0x9e, 0x28, 0xa9, 0x80, 0x88, 0x43, 0x29, 0x81,
+    0x42, 0x3a, 0x85, 0x41, 0xd4, 0x82, 0xc5, 0x8a,
+    0xb0, 0x83, 0x40, 0xbf, 0x80, 0xa8, 0x80, 0xc7,
+    0x81, 0xf7, 0x81, 0xbd, 0x80, 0xcb, 0x80, 0x88,
+    0x82, 0xe7, 0x81, 0x40, 0xb1, 0x81, 0xd0, 0x80,
+    0x8f, 0x80, 0x97, 0x32, 0x84, 0x40, 0xcc, 0x02,
+    0x80, 0xfa, 0x81, 0x40, 0xfa, 0x81, 0xfd, 0x80,
+    0xf5, 0x81, 0xf2, 0x80, 0x41, 0x0c, 0x81, 0x41,
+    0x01, 0x0b, 0x80, 0x40, 0x9b, 0x80, 0xd2, 0x80,
+    0x91, 0x80, 0xd0, 0x80, 0x41, 0xa4, 0x80, 0x41,
+    0x01, 0x00, 0x81, 0xd0, 0x80, 0x56, 0xae, 0x8e,
+    0x60, 0x36, 0x99, 0x84, 0xba, 0x86, 0x44, 0x57,
+    0x90, 0xcf, 0x81, 0x60, 0x3f, 0xfd, 0x18, 0x30,
+    0x81, 0x5f, 0x00, 0xad, 0x81, 0x96, 0x42, 0x1f,
+    0x12, 0x2f, 0x39, 0x86, 0x9d, 0x83, 0x4e, 0x81,
+    0xbd, 0x40, 0xc1, 0x86, 0x41, 0x76, 0x80, 0xbc,
+    0x83, 0x45, 0xdf, 0x86, 0xec, 0x10, 0x82,
+};
+
+static const uint8_t unicode_prop_Extender_table[92] = {
+    0x40, 0xb6, 0x80, 0x42, 0x17, 0x81, 0x43, 0x6d,
+    0x80, 0x41, 0xb8, 0x80, 0x43, 0x59, 0x80, 0x42,
+    0xef, 0x80, 0xfe, 0x80, 0x49, 0x42, 0x80, 0xb7,
+    0x80, 0x42, 0x62, 0x80, 0x41, 0x8d, 0x80, 0xc3,
+    0x80, 0x53, 0x88, 0x80, 0xaa, 0x84, 0xe6, 0x81,
+    0xdc, 0x82, 0x60, 0x6f, 0x15, 0x80, 0x45, 0xf5,
+    0x80, 0x43, 0xc1, 0x80, 0x95, 0x80, 0x40, 0x88,
+    0x80, 0xeb, 0x80, 0x94, 0x81, 0x60, 0x54, 0x7a,
+    0x80, 0x48, 0x0f, 0x81, 0x4b, 0xd9, 0x80, 0x42,
+    0x67, 0x82, 0x44, 0xce, 0x80, 0x60, 0x50, 0xa8,
+    0x81, 0x44, 0x9b, 0x08, 0x80, 0x60, 0x71, 0x57,
+    0x81, 0x48, 0x05, 0x82,
+};
+
+static const uint8_t unicode_prop_Hex_Digit_table[12] = {
+    0xaf, 0x89, 0x35, 0x99, 0x85, 0x60, 0xfe, 0xa8,
+    0x89, 0x35, 0x99, 0x85,
+};
+
+static const uint8_t unicode_prop_IDS_Binary_Operator_table[5] = {
+    0x60, 0x2f, 0xef, 0x09, 0x87,
+};
+
+static const uint8_t unicode_prop_IDS_Trinary_Operator_table[4] = {
+    0x60, 0x2f, 0xf1, 0x81,
+};
+
+static const uint8_t unicode_prop_Ideographic_table[69] = {
+    0x60, 0x30, 0x05, 0x81, 0x98, 0x88, 0x8d, 0x82,
+    0x43, 0xc4, 0x59, 0xbf, 0xbf, 0x60, 0x51, 0xff,
+    0x60, 0x58, 0xff, 0x41, 0x6d, 0x81, 0xe9, 0x60,
+    0x75, 0x09, 0x80, 0x9a, 0x57, 0xf7, 0x87, 0x44,
+    0xd5, 0xa9, 0x88, 0x60, 0x24, 0x66, 0x41, 0x8b,
+    0x60, 0x4d, 0x03, 0x60, 0xa6, 0xdf, 0x9f, 0x50,
+    0x39, 0x85, 0x40, 0xdd, 0x81, 0x56, 0x81, 0x8d,
+    0x5d, 0x30, 0x4c, 0x1e, 0x42, 0x1d, 0x45, 0xe1,
+    0x53, 0x4a, 0x84, 0x50, 0x5f,
+};
+
+static const uint8_t unicode_prop_Join_Control_table[4] = {
+    0x60, 0x20, 0x0b, 0x81,
+};
+
+static const uint8_t unicode_prop_Logical_Order_Exception_table[15] = {
+    0x4e, 0x3f, 0x84, 0xfa, 0x84, 0x4a, 0xef, 0x11,
+    0x80, 0x60, 0x90, 0xf9, 0x09, 0x00, 0x81,
+};
+
+static const uint8_t unicode_prop_Noncharacter_Code_Point_table[71] = {
+    0x60, 0xfd, 0xcf, 0x9f, 0x42, 0x0d, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81,
+};
+
+static const uint8_t unicode_prop_Pattern_Syntax_table[58] = {
+    0xa0, 0x8e, 0x89, 0x86, 0x99, 0x18, 0x80, 0x99,
+    0x83, 0xa1, 0x30, 0x00, 0x08, 0x00, 0x0b, 0x03,
+    0x02, 0x80, 0x96, 0x80, 0x9e, 0x80, 0x5f, 0x17,
+    0x97, 0x87, 0x8e, 0x81, 0x92, 0x80, 0x89, 0x41,
+    0x30, 0x42, 0xcf, 0x40, 0x9f, 0x42, 0x75, 0x9d,
+    0x44, 0x6b, 0x41, 0xff, 0xff, 0x41, 0x80, 0x13,
+    0x98, 0x8e, 0x80, 0x60, 0xcd, 0x0c, 0x81, 0x41,
+    0x04, 0x81,
+};
+
+static const uint8_t unicode_prop_Pattern_White_Space_table[11] = {
+    0x88, 0x84, 0x91, 0x80, 0xe3, 0x80, 0x5f, 0x87,
+    0x81, 0x97, 0x81,
+};
+
+static const uint8_t unicode_prop_Quotation_Mark_table[31] = {
+    0xa1, 0x03, 0x80, 0x40, 0x82, 0x80, 0x8e, 0x80,
+    0x5f, 0x5b, 0x87, 0x98, 0x81, 0x4e, 0x06, 0x80,
+    0x41, 0xc8, 0x83, 0x8c, 0x82, 0x60, 0xce, 0x20,
+    0x83, 0x40, 0xbc, 0x03, 0x80, 0xd9, 0x81,
+};
+
+static const uint8_t unicode_prop_Radical_table[9] = {
+    0x60, 0x2e, 0x7f, 0x99, 0x80, 0xd8, 0x8b, 0x40,
+    0xd5,
+};
+
+static const uint8_t unicode_prop_Regional_Indicator_table[4] = {
+    0x61, 0xf1, 0xe5, 0x99,
+};
+
+static const uint8_t unicode_prop_Sentence_Terminal_table[196] = {
+    0xa0, 0x80, 0x8b, 0x80, 0x8f, 0x80, 0x45, 0x48,
+    0x80, 0x40, 0x92, 0x82, 0x40, 0xb3, 0x80, 0xaa,
+    0x82, 0x40, 0xf5, 0x80, 0xbc, 0x00, 0x02, 0x81,
+    0x41, 0x24, 0x81, 0x46, 0xe3, 0x81, 0x43, 0x15,
+    0x03, 0x81, 0x43, 0x04, 0x80, 0x40, 0xc5, 0x81,
+    0x40, 0xcb, 0x04, 0x80, 0x41, 0x39, 0x81, 0x41,
+    0x61, 0x83, 0x40, 0xad, 0x09, 0x81, 0x9c, 0x81,
+    0x40, 0xbb, 0x81, 0xc0, 0x81, 0x43, 0xbb, 0x81,
+    0x88, 0x82, 0x4d, 0xe3, 0x80, 0x8c, 0x80, 0x95,
+    0x81, 0x41, 0xac, 0x80, 0x60, 0x74, 0xfb, 0x80,
+    0x41, 0x0d, 0x81, 0x40, 0xe2, 0x02, 0x80, 0x41,
+    0x7d, 0x81, 0xd5, 0x81, 0xde, 0x80, 0x40, 0x97,
+    0x81, 0x40, 0x92, 0x82, 0x40, 0x8f, 0x81, 0x40,
+    0xf8, 0x80, 0x60, 0x52, 0x65, 0x02, 0x81, 0x40,
+    0xa8, 0x80, 0x8b, 0x80, 0x8f, 0x80, 0xc0, 0x80,
+    0x4a, 0xf3, 0x81, 0x44, 0xfc, 0x84, 0xab, 0x83,
+    0x40, 0xbc, 0x81, 0xf4, 0x83, 0xfe, 0x82, 0x40,
+    0x80, 0x0d, 0x80, 0x8f, 0x81, 0xd7, 0x08, 0x81,
+    0xeb, 0x80, 0x41, 0xa0, 0x81, 0x41, 0x74, 0x0c,
+    0x8e, 0xe8, 0x81, 0x40, 0xf8, 0x82, 0x42, 0x04,
+    0x00, 0x80, 0x40, 0xfa, 0x81, 0xd6, 0x81, 0x41,
+    0xa3, 0x81, 0x42, 0xb3, 0x81, 0xc9, 0x81, 0x60,
+    0x4b, 0x28, 0x81, 0x40, 0x84, 0x80, 0xc0, 0x81,
+    0x8a, 0x80, 0x43, 0x52, 0x80, 0x60, 0x4e, 0x05,
+    0x80, 0x5d, 0xe7, 0x80,
+};
+
+static const uint8_t unicode_prop_Soft_Dotted_table[79] = {
+    0xe8, 0x81, 0x40, 0xc3, 0x80, 0x41, 0x18, 0x80,
+    0x9d, 0x80, 0xb3, 0x80, 0x93, 0x80, 0x41, 0x3f,
+    0x80, 0xe1, 0x00, 0x80, 0x59, 0x08, 0x80, 0xb2,
+    0x80, 0x8c, 0x02, 0x80, 0x40, 0x83, 0x80, 0x40,
+    0x9c, 0x80, 0x41, 0xa4, 0x80, 0x40, 0xd5, 0x81,
+    0x4b, 0x31, 0x80, 0x61, 0xa7, 0xa4, 0x81, 0xb1,
+    0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1,
+    0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1,
+    0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1, 0x81, 0x48,
+    0x85, 0x80, 0x41, 0x30, 0x81, 0x99, 0x80,
+};
+
+static const uint8_t unicode_prop_Terminal_Punctuation_table[248] = {
+    0xa0, 0x80, 0x89, 0x00, 0x80, 0x8a, 0x0a, 0x80,
+    0x43, 0x3d, 0x07, 0x80, 0x42, 0x00, 0x80, 0xb8,
+    0x80, 0xc7, 0x80, 0x8d, 0x00, 0x82, 0x40, 0xb3,
+    0x80, 0xaa, 0x8a, 0x00, 0x40, 0xea, 0x81, 0xb5,
+    0x8e, 0x9e, 0x80, 0x41, 0x04, 0x81, 0x44, 0xf3,
+    0x81, 0x40, 0xab, 0x03, 0x85, 0x41, 0x36, 0x81,
+    0x43, 0x14, 0x87, 0x43, 0x04, 0x80, 0xfb, 0x82,
+    0xc6, 0x81, 0x40, 0x9c, 0x12, 0x80, 0xa6, 0x19,
+    0x81, 0x41, 0x39, 0x81, 0x41, 0x61, 0x83, 0x40,
+    0xad, 0x08, 0x82, 0x9c, 0x81, 0x40, 0xbb, 0x84,
+    0xbd, 0x81, 0x43, 0xbb, 0x81, 0x88, 0x82, 0x4d,
+    0xe3, 0x80, 0x8c, 0x03, 0x80, 0x89, 0x00, 0x0a,
+    0x81, 0x41, 0xab, 0x81, 0x60, 0x74, 0xfa, 0x81,
+    0x41, 0x0c, 0x82, 0x40, 0xe2, 0x84, 0x41, 0x7d,
+    0x81, 0xd5, 0x81, 0xde, 0x80, 0x40, 0x96, 0x82,
+    0x40, 0x92, 0x82, 0xfe, 0x80, 0x8f, 0x81, 0x40,
+    0xf8, 0x80, 0x60, 0x52, 0x63, 0x10, 0x83, 0x40,
+    0xa8, 0x80, 0x89, 0x00, 0x80, 0x8a, 0x0a, 0x80,
+    0xc0, 0x01, 0x80, 0x44, 0x39, 0x80, 0xaf, 0x80,
+    0x44, 0x85, 0x80, 0x40, 0xc6, 0x80, 0x41, 0x35,
+    0x81, 0x40, 0x97, 0x85, 0xc3, 0x85, 0xd8, 0x83,
+    0x43, 0xb7, 0x84, 0xab, 0x83, 0x40, 0xbc, 0x86,
+    0xef, 0x83, 0xfe, 0x82, 0x40, 0x80, 0x0d, 0x80,
+    0x8f, 0x81, 0xd7, 0x84, 0xeb, 0x80, 0x41, 0xa0,
+    0x82, 0x8b, 0x81, 0x41, 0x65, 0x1a, 0x8e, 0xe8,
+    0x81, 0x40, 0xf8, 0x82, 0x42, 0x04, 0x00, 0x80,
+    0x40, 0xfa, 0x81, 0xd6, 0x0b, 0x81, 0x41, 0x9d,
+    0x82, 0xac, 0x80, 0x42, 0x84, 0x81, 0xc9, 0x81,
+    0x45, 0x2a, 0x84, 0x60, 0x45, 0xf8, 0x81, 0x40,
+    0x84, 0x80, 0xc0, 0x82, 0x89, 0x80, 0x43, 0x51,
+    0x81, 0x60, 0x4e, 0x05, 0x80, 0x5d, 0xe6, 0x83,
+};
+
+static const uint8_t unicode_prop_Unified_Ideograph_table[45] = {
+    0x60, 0x33, 0xff, 0x59, 0xbf, 0xbf, 0x60, 0x51,
+    0xff, 0x60, 0x5a, 0x0d, 0x08, 0x00, 0x81, 0x89,
+    0x00, 0x00, 0x09, 0x82, 0x61, 0x05, 0xd5, 0x60,
+    0xa6, 0xdf, 0x9f, 0x50, 0x39, 0x85, 0x40, 0xdd,
+    0x81, 0x56, 0x81, 0x8d, 0x5d, 0x30, 0x54, 0x1e,
+    0x53, 0x4a, 0x84, 0x50, 0x5f,
+};
+
+static const uint8_t unicode_prop_Variation_Selector_table[13] = {
+    0x58, 0x0a, 0x10, 0x80, 0x60, 0xe5, 0xef, 0x8f,
+    0x6d, 0x02, 0xef, 0x40, 0xef,
+};
+
+static const uint8_t unicode_prop_White_Space_table[22] = {
+    0x88, 0x84, 0x91, 0x80, 0xe3, 0x80, 0x99, 0x80,
+    0x55, 0xde, 0x80, 0x49, 0x7e, 0x8a, 0x9c, 0x0c,
+    0x80, 0xae, 0x80, 0x4f, 0x9f, 0x80,
+};
+
+static const uint8_t unicode_prop_Bidi_Mirrored_table[173] = {
+    0xa7, 0x81, 0x91, 0x00, 0x80, 0x9b, 0x00, 0x80,
+    0x9c, 0x00, 0x80, 0xac, 0x80, 0x8e, 0x80, 0x4e,
+    0x7d, 0x83, 0x47, 0x5c, 0x81, 0x49, 0x9b, 0x81,
+    0x89, 0x81, 0xb5, 0x81, 0x8d, 0x81, 0x40, 0xb0,
+    0x80, 0x40, 0xbf, 0x1a, 0x2a, 0x02, 0x0a, 0x18,
+    0x18, 0x00, 0x03, 0x88, 0x20, 0x80, 0x91, 0x23,
+    0x88, 0x08, 0x00, 0x39, 0x9e, 0x0b, 0x20, 0x88,
+    0x09, 0x92, 0x21, 0x88, 0x21, 0x0b, 0x97, 0x81,
+    0x8f, 0x3b, 0x93, 0x0e, 0x81, 0x44, 0x3c, 0x8d,
+    0xc9, 0x01, 0x18, 0x08, 0x14, 0x1c, 0x12, 0x8d,
+    0x41, 0x92, 0x95, 0x0d, 0x80, 0x8d, 0x38, 0x35,
+    0x10, 0x1c, 0x01, 0x0c, 0x18, 0x02, 0x09, 0x89,
+    0x29, 0x81, 0x8b, 0x92, 0x03, 0x08, 0x00, 0x08,
+    0x03, 0x21, 0x2a, 0x97, 0x81, 0x8a, 0x0b, 0x18,
+    0x09, 0x0b, 0xaa, 0x0f, 0x80, 0xa7, 0x20, 0x00,
+    0x14, 0x22, 0x18, 0x14, 0x00, 0x40, 0xff, 0x80,
+    0x42, 0x02, 0x1a, 0x08, 0x81, 0x8d, 0x09, 0x89,
+    0xaa, 0x87, 0x41, 0xaa, 0x89, 0x0f, 0x60, 0xce,
+    0x3c, 0x2c, 0x81, 0x40, 0xa1, 0x81, 0x91, 0x00,
+    0x80, 0x9b, 0x00, 0x80, 0x9c, 0x00, 0x00, 0x08,
+    0x81, 0x60, 0xd7, 0x76, 0x80, 0xb8, 0x80, 0xb8,
+    0x80, 0xb8, 0x80, 0xb8, 0x80,
+};
+
+static const uint8_t unicode_prop_Emoji_table[239] = {
+    0xa2, 0x05, 0x04, 0x89, 0xee, 0x03, 0x80, 0x5f,
+    0x8c, 0x80, 0x8b, 0x80, 0x40, 0xd7, 0x80, 0x95,
+    0x80, 0xd9, 0x85, 0x8e, 0x81, 0x41, 0x6e, 0x81,
+    0x8b, 0x80, 0x40, 0xa5, 0x80, 0x98, 0x8a, 0x1a,
+    0x40, 0xc6, 0x80, 0x40, 0xe6, 0x81, 0x89, 0x80,
+    0x88, 0x80, 0xb9, 0x18, 0x84, 0x88, 0x01, 0x01,
+    0x09, 0x03, 0x01, 0x00, 0x09, 0x02, 0x02, 0x0f,
+    0x14, 0x00, 0x04, 0x8b, 0x8a, 0x09, 0x00, 0x08,
+    0x80, 0x91, 0x01, 0x81, 0x91, 0x28, 0x00, 0x0a,
+    0x0c, 0x01, 0x0b, 0x81, 0x8a, 0x0c, 0x09, 0x04,
+    0x08, 0x00, 0x81, 0x93, 0x0c, 0x28, 0x19, 0x03,
+    0x01, 0x01, 0x28, 0x01, 0x00, 0x00, 0x05, 0x02,
+    0x05, 0x80, 0x89, 0x81, 0x8e, 0x01, 0x03, 0x00,
+    0x03, 0x10, 0x80, 0x8a, 0x81, 0xaf, 0x82, 0x88,
+    0x80, 0x8d, 0x80, 0x8d, 0x80, 0x41, 0x73, 0x81,
+    0x41, 0xce, 0x82, 0x92, 0x81, 0xb2, 0x03, 0x80,
+    0x44, 0xd9, 0x80, 0x8b, 0x80, 0x42, 0x58, 0x00,
+    0x80, 0x61, 0xbd, 0x69, 0x80, 0x40, 0xc9, 0x80,
+    0x40, 0x9f, 0x81, 0x8b, 0x81, 0x8d, 0x01, 0x89,
+    0xca, 0x99, 0x01, 0x96, 0x80, 0x93, 0x01, 0x88,
+    0x94, 0x81, 0x40, 0xad, 0xa1, 0x81, 0xef, 0x09,
+    0x02, 0x81, 0xd2, 0x0a, 0x80, 0x41, 0x06, 0x80,
+    0xbe, 0x8a, 0x28, 0x97, 0x31, 0x0f, 0x8b, 0x01,
+    0x19, 0x03, 0x81, 0x8c, 0x09, 0x07, 0x81, 0x88,
+    0x04, 0x82, 0x8b, 0x17, 0x11, 0x00, 0x03, 0x05,
+    0x02, 0x05, 0xd5, 0xaf, 0xc5, 0x27, 0x0a, 0x83,
+    0x89, 0x10, 0x01, 0x10, 0x81, 0x89, 0x40, 0xe2,
+    0x8b, 0x18, 0x41, 0x1a, 0xae, 0x80, 0x89, 0x80,
+    0x40, 0xb8, 0xef, 0x8c, 0x82, 0x88, 0x86, 0xad,
+    0x06, 0x87, 0x8d, 0x83, 0x88, 0x86, 0x88,
+};
+
+static const uint8_t unicode_prop_Emoji_Component_table[28] = {
+    0xa2, 0x05, 0x04, 0x89, 0x5f, 0xd2, 0x80, 0x40,
+    0xd4, 0x80, 0x60, 0xdd, 0x2a, 0x80, 0x60, 0xf3,
+    0xd5, 0x99, 0x41, 0xfa, 0x84, 0x45, 0xaf, 0x83,
+    0x6c, 0x06, 0x6b, 0xdf,
+};
+
+static const uint8_t unicode_prop_Emoji_Modifier_table[4] = {
+    0x61, 0xf3, 0xfa, 0x84,
+};
+
+static const uint8_t unicode_prop_Emoji_Modifier_Base_table[71] = {
+    0x60, 0x26, 0x1c, 0x80, 0x40, 0xda, 0x80, 0x8f,
+    0x83, 0x61, 0xcc, 0x76, 0x80, 0xbb, 0x11, 0x01,
+    0x82, 0xf4, 0x09, 0x8a, 0x94, 0x92, 0x10, 0x1a,
+    0x02, 0x30, 0x00, 0x97, 0x80, 0x40, 0xc8, 0x0b,
+    0x80, 0x94, 0x03, 0x81, 0x40, 0xad, 0x12, 0x84,
+    0xd2, 0x80, 0x8f, 0x82, 0x88, 0x80, 0x8a, 0x80,
+    0x42, 0x3e, 0x01, 0x07, 0x3d, 0x80, 0x88, 0x89,
+    0x0a, 0xb7, 0x80, 0xbc, 0x08, 0x08, 0x80, 0x90,
+    0x10, 0x8c, 0x40, 0xe4, 0x82, 0xa9, 0x88,
+};
+
+static const uint8_t unicode_prop_Emoji_Presentation_table[145] = {
+    0x60, 0x23, 0x19, 0x81, 0x40, 0xcc, 0x1a, 0x01,
+    0x80, 0x42, 0x08, 0x81, 0x94, 0x81, 0xb1, 0x8b,
+    0xaa, 0x80, 0x92, 0x80, 0x8c, 0x07, 0x81, 0x90,
+    0x0c, 0x0f, 0x04, 0x80, 0x94, 0x06, 0x08, 0x03,
+    0x01, 0x06, 0x03, 0x81, 0x9b, 0x80, 0xa2, 0x00,
+    0x03, 0x10, 0x80, 0xbc, 0x82, 0x97, 0x80, 0x8d,
+    0x80, 0x43, 0x5a, 0x81, 0xb2, 0x03, 0x80, 0x61,
+    0xc4, 0xad, 0x80, 0x40, 0xc9, 0x80, 0x40, 0xbd,
+    0x01, 0x89, 0xca, 0x99, 0x00, 0x97, 0x80, 0x93,
+    0x01, 0x20, 0x82, 0x94, 0x81, 0x40, 0xad, 0xa0,
+    0x8b, 0x88, 0x80, 0xc5, 0x80, 0x95, 0x8b, 0xaa,
+    0x1c, 0x8b, 0x90, 0x10, 0x82, 0xc6, 0x00, 0x80,
+    0x40, 0xba, 0x81, 0xbe, 0x8c, 0x18, 0x97, 0x91,
+    0x80, 0x99, 0x81, 0x8c, 0x80, 0xd5, 0xd4, 0xaf,
+    0xc5, 0x28, 0x12, 0x0a, 0x1b, 0x8a, 0x0e, 0x88,
+    0x40, 0xe2, 0x8b, 0x18, 0x41, 0x1a, 0xae, 0x80,
+    0x89, 0x80, 0x40, 0xb8, 0xef, 0x8c, 0x82, 0x88,
+    0x86, 0xad, 0x06, 0x87, 0x8d, 0x83, 0x88, 0x86,
+    0x88,
+};
+
+static const uint8_t unicode_prop_Extended_Pictographic_table[156] = {
+    0x40, 0xa8, 0x03, 0x80, 0x5f, 0x8c, 0x80, 0x8b,
+    0x80, 0x40, 0xd7, 0x80, 0x95, 0x80, 0xd9, 0x85,
+    0x8e, 0x81, 0x41, 0x6e, 0x81, 0x8b, 0x80, 0xde,
+    0x80, 0xc5, 0x80, 0x98, 0x8a, 0x1a, 0x40, 0xc6,
+    0x80, 0x40, 0xe6, 0x81, 0x89, 0x80, 0x88, 0x80,
+    0xb9, 0x18, 0x28, 0x8b, 0x80, 0xf1, 0x89, 0xf5,
+    0x81, 0x8a, 0x00, 0x00, 0x28, 0x10, 0x28, 0x89,
+    0x81, 0x8e, 0x01, 0x03, 0x00, 0x03, 0x10, 0x80,
+    0x8a, 0x84, 0xac, 0x82, 0x88, 0x80, 0x8d, 0x80,
+    0x8d, 0x80, 0x41, 0x73, 0x81, 0x41, 0xce, 0x82,
+    0x92, 0x81, 0xb2, 0x03, 0x80, 0x44, 0xd9, 0x80,
+    0x8b, 0x80, 0x42, 0x58, 0x00, 0x80, 0x61, 0xbd,
+    0x65, 0x40, 0xff, 0x8c, 0x82, 0x9e, 0x80, 0xbb,
+    0x85, 0x8b, 0x81, 0x8d, 0x01, 0x89, 0x91, 0xb8,
+    0x9a, 0x8e, 0x89, 0x80, 0x93, 0x01, 0x88, 0x03,
+    0x88, 0x41, 0xb1, 0x84, 0x41, 0x3d, 0x87, 0x41,
+    0x09, 0xaf, 0xff, 0xf3, 0x8b, 0xd4, 0xaa, 0x8b,
+    0x83, 0xb7, 0x87, 0x89, 0x85, 0xa7, 0x87, 0x9d,
+    0xd1, 0x8b, 0xae, 0x80, 0x89, 0x80, 0x41, 0xb8,
+    0x40, 0xff, 0x43, 0xfd,
+};
+
+static const uint8_t unicode_prop_Default_Ignorable_Code_Point_table[51] = {
+    0x40, 0xac, 0x80, 0x42, 0xa0, 0x80, 0x42, 0xcb,
+    0x80, 0x4b, 0x41, 0x81, 0x46, 0x52, 0x81, 0xd4,
+    0x84, 0x47, 0xfa, 0x84, 0x99, 0x84, 0xb0, 0x8f,
+    0x50, 0xf3, 0x80, 0x60, 0xcc, 0x9a, 0x8f, 0x40,
+    0xee, 0x80, 0x40, 0x9f, 0x80, 0xce, 0x88, 0x60,
+    0xbc, 0xa6, 0x83, 0x54, 0xce, 0x87, 0x6c, 0x2e,
+    0x84, 0x4f, 0xff,
+};
+
+typedef enum {
+    UNICODE_PROP_Hyphen,
+    UNICODE_PROP_Other_Math,
+    UNICODE_PROP_Other_Alphabetic,
+    UNICODE_PROP_Other_Lowercase,
+    UNICODE_PROP_Other_Uppercase,
+    UNICODE_PROP_Other_Grapheme_Extend,
+    UNICODE_PROP_Other_Default_Ignorable_Code_Point,
+    UNICODE_PROP_Other_ID_Start,
+    UNICODE_PROP_Other_ID_Continue,
+    UNICODE_PROP_Prepended_Concatenation_Mark,
+    UNICODE_PROP_ID_Continue1,
+    UNICODE_PROP_XID_Start1,
+    UNICODE_PROP_XID_Continue1,
+    UNICODE_PROP_Changes_When_Titlecased1,
+    UNICODE_PROP_Changes_When_Casefolded1,
+    UNICODE_PROP_Changes_When_NFKC_Casefolded1,
+    UNICODE_PROP_ASCII_Hex_Digit,
+    UNICODE_PROP_Bidi_Control,
+    UNICODE_PROP_Dash,
+    UNICODE_PROP_Deprecated,
+    UNICODE_PROP_Diacritic,
+    UNICODE_PROP_Extender,
+    UNICODE_PROP_Hex_Digit,
+    UNICODE_PROP_IDS_Binary_Operator,
+    UNICODE_PROP_IDS_Trinary_Operator,
+    UNICODE_PROP_Ideographic,
+    UNICODE_PROP_Join_Control,
+    UNICODE_PROP_Logical_Order_Exception,
+    UNICODE_PROP_Noncharacter_Code_Point,
+    UNICODE_PROP_Pattern_Syntax,
+    UNICODE_PROP_Pattern_White_Space,
+    UNICODE_PROP_Quotation_Mark,
+    UNICODE_PROP_Radical,
+    UNICODE_PROP_Regional_Indicator,
+    UNICODE_PROP_Sentence_Terminal,
+    UNICODE_PROP_Soft_Dotted,
+    UNICODE_PROP_Terminal_Punctuation,
+    UNICODE_PROP_Unified_Ideograph,
+    UNICODE_PROP_Variation_Selector,
+    UNICODE_PROP_White_Space,
+    UNICODE_PROP_Bidi_Mirrored,
+    UNICODE_PROP_Emoji,
+    UNICODE_PROP_Emoji_Component,
+    UNICODE_PROP_Emoji_Modifier,
+    UNICODE_PROP_Emoji_Modifier_Base,
+    UNICODE_PROP_Emoji_Presentation,
+    UNICODE_PROP_Extended_Pictographic,
+    UNICODE_PROP_Default_Ignorable_Code_Point,
+    UNICODE_PROP_ID_Start,
+    UNICODE_PROP_Case_Ignorable,
+    UNICODE_PROP_ASCII,
+    UNICODE_PROP_Alphabetic,
+    UNICODE_PROP_Any,
+    UNICODE_PROP_Assigned,
+    UNICODE_PROP_Cased,
+    UNICODE_PROP_Changes_When_Casefolded,
+    UNICODE_PROP_Changes_When_Casemapped,
+    UNICODE_PROP_Changes_When_Lowercased,
+    UNICODE_PROP_Changes_When_NFKC_Casefolded,
+    UNICODE_PROP_Changes_When_Titlecased,
+    UNICODE_PROP_Changes_When_Uppercased,
+    UNICODE_PROP_Grapheme_Base,
+    UNICODE_PROP_Grapheme_Extend,
+    UNICODE_PROP_ID_Continue,
+    UNICODE_PROP_Lowercase,
+    UNICODE_PROP_Math,
+    UNICODE_PROP_Uppercase,
+    UNICODE_PROP_XID_Continue,
+    UNICODE_PROP_XID_Start,
+    UNICODE_PROP_Cased1,
+    UNICODE_PROP_COUNT,
+} UnicodePropertyEnum;
+
+static const char unicode_prop_name_table[] =
+    "ASCII_Hex_Digit,AHex"               "\0"
+    "Bidi_Control,Bidi_C"                "\0"
+    "Dash"                               "\0"
+    "Deprecated,Dep"                     "\0"
+    "Diacritic,Dia"                      "\0"
+    "Extender,Ext"                       "\0"
+    "Hex_Digit,Hex"                      "\0"
+    "IDS_Binary_Operator,IDSB"           "\0"
+    "IDS_Trinary_Operator,IDST"          "\0"
+    "Ideographic,Ideo"                   "\0"
+    "Join_Control,Join_C"                "\0"
+    "Logical_Order_Exception,LOE"        "\0"
+    "Noncharacter_Code_Point,NChar"      "\0"
+    "Pattern_Syntax,Pat_Syn"             "\0"
+    "Pattern_White_Space,Pat_WS"         "\0"
+    "Quotation_Mark,QMark"               "\0"
+    "Radical"                            "\0"
+    "Regional_Indicator,RI"              "\0"
+    "Sentence_Terminal,STerm"            "\0"
+    "Soft_Dotted,SD"                     "\0"
+    "Terminal_Punctuation,Term"          "\0"
+    "Unified_Ideograph,UIdeo"            "\0"
+    "Variation_Selector,VS"              "\0"
+    "White_Space,space"                  "\0"
+    "Bidi_Mirrored,Bidi_M"               "\0"
+    "Emoji"                              "\0"
+    "Emoji_Component,EComp"              "\0"
+    "Emoji_Modifier,EMod"                "\0"
+    "Emoji_Modifier_Base,EBase"          "\0"
+    "Emoji_Presentation,EPres"           "\0"
+    "Extended_Pictographic,ExtPict"      "\0"
+    "Default_Ignorable_Code_Point,DI"    "\0"
+    "ID_Start,IDS"                       "\0"
+    "Case_Ignorable,CI"                  "\0"
+    "ASCII"                              "\0"
+    "Alphabetic,Alpha"                   "\0"
+    "Any"                                "\0"
+    "Assigned"                           "\0"
+    "Cased"                              "\0"
+    "Changes_When_Casefolded,CWCF"       "\0"
+    "Changes_When_Casemapped,CWCM"       "\0"
+    "Changes_When_Lowercased,CWL"        "\0"
+    "Changes_When_NFKC_Casefolded,CWKCF" "\0"
+    "Changes_When_Titlecased,CWT"        "\0"
+    "Changes_When_Uppercased,CWU"        "\0"
+    "Grapheme_Base,Gr_Base"              "\0"
+    "Grapheme_Extend,Gr_Ext"             "\0"
+    "ID_Continue,IDC"                    "\0"
+    "Lowercase,Lower"                    "\0"
+    "Math"                               "\0"
+    "Uppercase,Upper"                    "\0"
+    "XID_Continue,XIDC"                  "\0"
+    "XID_Start,XIDS"                     "\0"
+;
+
+static const uint8_t * const unicode_prop_table[] = {
+    unicode_prop_Hyphen_table,
+    unicode_prop_Other_Math_table,
+    unicode_prop_Other_Alphabetic_table,
+    unicode_prop_Other_Lowercase_table,
+    unicode_prop_Other_Uppercase_table,
+    unicode_prop_Other_Grapheme_Extend_table,
+    unicode_prop_Other_Default_Ignorable_Code_Point_table,
+    unicode_prop_Other_ID_Start_table,
+    unicode_prop_Other_ID_Continue_table,
+    unicode_prop_Prepended_Concatenation_Mark_table,
+    unicode_prop_ID_Continue1_table,
+    unicode_prop_XID_Start1_table,
+    unicode_prop_XID_Continue1_table,
+    unicode_prop_Changes_When_Titlecased1_table,
+    unicode_prop_Changes_When_Casefolded1_table,
+    unicode_prop_Changes_When_NFKC_Casefolded1_table,
+    unicode_prop_ASCII_Hex_Digit_table,
+    unicode_prop_Bidi_Control_table,
+    unicode_prop_Dash_table,
+    unicode_prop_Deprecated_table,
+    unicode_prop_Diacritic_table,
+    unicode_prop_Extender_table,
+    unicode_prop_Hex_Digit_table,
+    unicode_prop_IDS_Binary_Operator_table,
+    unicode_prop_IDS_Trinary_Operator_table,
+    unicode_prop_Ideographic_table,
+    unicode_prop_Join_Control_table,
+    unicode_prop_Logical_Order_Exception_table,
+    unicode_prop_Noncharacter_Code_Point_table,
+    unicode_prop_Pattern_Syntax_table,
+    unicode_prop_Pattern_White_Space_table,
+    unicode_prop_Quotation_Mark_table,
+    unicode_prop_Radical_table,
+    unicode_prop_Regional_Indicator_table,
+    unicode_prop_Sentence_Terminal_table,
+    unicode_prop_Soft_Dotted_table,
+    unicode_prop_Terminal_Punctuation_table,
+    unicode_prop_Unified_Ideograph_table,
+    unicode_prop_Variation_Selector_table,
+    unicode_prop_White_Space_table,
+    unicode_prop_Bidi_Mirrored_table,
+    unicode_prop_Emoji_table,
+    unicode_prop_Emoji_Component_table,
+    unicode_prop_Emoji_Modifier_table,
+    unicode_prop_Emoji_Modifier_Base_table,
+    unicode_prop_Emoji_Presentation_table,
+    unicode_prop_Extended_Pictographic_table,
+    unicode_prop_Default_Ignorable_Code_Point_table,
+    unicode_prop_ID_Start_table,
+    unicode_prop_Case_Ignorable_table,
+};
+
+static const uint16_t unicode_prop_len_table[] = {
+    countof(unicode_prop_Hyphen_table),
+    countof(unicode_prop_Other_Math_table),
+    countof(unicode_prop_Other_Alphabetic_table),
+    countof(unicode_prop_Other_Lowercase_table),
+    countof(unicode_prop_Other_Uppercase_table),
+    countof(unicode_prop_Other_Grapheme_Extend_table),
+    countof(unicode_prop_Other_Default_Ignorable_Code_Point_table),
+    countof(unicode_prop_Other_ID_Start_table),
+    countof(unicode_prop_Other_ID_Continue_table),
+    countof(unicode_prop_Prepended_Concatenation_Mark_table),
+    countof(unicode_prop_ID_Continue1_table),
+    countof(unicode_prop_XID_Start1_table),
+    countof(unicode_prop_XID_Continue1_table),
+    countof(unicode_prop_Changes_When_Titlecased1_table),
+    countof(unicode_prop_Changes_When_Casefolded1_table),
+    countof(unicode_prop_Changes_When_NFKC_Casefolded1_table),
+    countof(unicode_prop_ASCII_Hex_Digit_table),
+    countof(unicode_prop_Bidi_Control_table),
+    countof(unicode_prop_Dash_table),
+    countof(unicode_prop_Deprecated_table),
+    countof(unicode_prop_Diacritic_table),
+    countof(unicode_prop_Extender_table),
+    countof(unicode_prop_Hex_Digit_table),
+    countof(unicode_prop_IDS_Binary_Operator_table),
+    countof(unicode_prop_IDS_Trinary_Operator_table),
+    countof(unicode_prop_Ideographic_table),
+    countof(unicode_prop_Join_Control_table),
+    countof(unicode_prop_Logical_Order_Exception_table),
+    countof(unicode_prop_Noncharacter_Code_Point_table),
+    countof(unicode_prop_Pattern_Syntax_table),
+    countof(unicode_prop_Pattern_White_Space_table),
+    countof(unicode_prop_Quotation_Mark_table),
+    countof(unicode_prop_Radical_table),
+    countof(unicode_prop_Regional_Indicator_table),
+    countof(unicode_prop_Sentence_Terminal_table),
+    countof(unicode_prop_Soft_Dotted_table),
+    countof(unicode_prop_Terminal_Punctuation_table),
+    countof(unicode_prop_Unified_Ideograph_table),
+    countof(unicode_prop_Variation_Selector_table),
+    countof(unicode_prop_White_Space_table),
+    countof(unicode_prop_Bidi_Mirrored_table),
+    countof(unicode_prop_Emoji_table),
+    countof(unicode_prop_Emoji_Component_table),
+    countof(unicode_prop_Emoji_Modifier_table),
+    countof(unicode_prop_Emoji_Modifier_Base_table),
+    countof(unicode_prop_Emoji_Presentation_table),
+    countof(unicode_prop_Extended_Pictographic_table),
+    countof(unicode_prop_Default_Ignorable_Code_Point_table),
+    countof(unicode_prop_ID_Start_table),
+    countof(unicode_prop_Case_Ignorable_table),
+};
+
+#endif /* CONFIG_ALL_UNICODE */
+/* 62 tables / 32261 bytes, 5 index / 345 bytes */
diff --git a/src/shared/quickjs/libunicode.c b/src/shared/quickjs/libunicode.c
new file mode 100644
index 000000000..482c51944
--- /dev/null
+++ b/src/shared/quickjs/libunicode.c
@@ -0,0 +1,1912 @@
+/*
+ * Unicode utilities
+ *
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <assert.h>
+
+#include "cutils.h"
+#include "libunicode.h"
+#include "libunicode-table.h"
+
+enum {
+    RUN_TYPE_U,
+    RUN_TYPE_L,
+    RUN_TYPE_UF,
+    RUN_TYPE_LF,
+    RUN_TYPE_UL,
+    RUN_TYPE_LSU,
+    RUN_TYPE_U2L_399_EXT2,
+    RUN_TYPE_UF_D20,
+    RUN_TYPE_UF_D1_EXT,
+    RUN_TYPE_U_EXT,
+    RUN_TYPE_LF_EXT,
+    RUN_TYPE_UF_EXT2,
+    RUN_TYPE_LF_EXT2,
+    RUN_TYPE_UF_EXT3,
+};
+
+static int lre_case_conv1(uint32_t c, int conv_type)
+{
+    uint32_t res[LRE_CC_RES_LEN_MAX];
+    lre_case_conv(res, c, conv_type);
+    return res[0];
+}
+
+/* case conversion using the table entry 'idx' with value 'v' */
+static int lre_case_conv_entry(uint32_t *res, uint32_t c, int conv_type, uint32_t idx, uint32_t v)
+{
+    uint32_t code, data, type, a, is_lower;
+    is_lower = (conv_type != 0);
+    type = (v >> (32 - 17 - 7 - 4)) & 0xf;
+    data = ((v & 0xf) << 8) | case_conv_table2[idx];
+    code = v >> (32 - 17);
+    switch(type) {
+    case RUN_TYPE_U:
+    case RUN_TYPE_L:
+    case RUN_TYPE_UF:
+    case RUN_TYPE_LF:
+        if (conv_type == (type & 1) ||
+            (type >= RUN_TYPE_UF && conv_type == 2)) {
+            c = c - code + (case_conv_table1[data] >> (32 - 17));
+        }
+        break;
+    case RUN_TYPE_UL:
+        a = c - code;
+        if ((a & 1) != (1 - is_lower))
+            break;
+        c = (a ^ 1) + code;
+        break;
+    case RUN_TYPE_LSU:
+        a = c - code;
+        if (a == 1) {
+            c += 2 * is_lower - 1;
+        } else if (a == (1 - is_lower) * 2) {
+            c += (2 * is_lower - 1) * 2;
+        }
+        break;
+    case RUN_TYPE_U2L_399_EXT2:
+        if (!is_lower) {
+            res[0] = c - code + case_conv_ext[data >> 6];
+            res[1] = 0x399;
+            return 2;
+        } else {
+            c = c - code + case_conv_ext[data & 0x3f];
+        }
+        break;
+    case RUN_TYPE_UF_D20:
+        if (conv_type == 1)
+            break;
+        c = data + (conv_type == 2) * 0x20;
+        break;
+    case RUN_TYPE_UF_D1_EXT:
+        if (conv_type == 1)
+            break;
+        c = case_conv_ext[data] + (conv_type == 2);
+        break;
+    case RUN_TYPE_U_EXT:
+    case RUN_TYPE_LF_EXT:
+        if (is_lower != (type - RUN_TYPE_U_EXT))
+            break;
+        c = case_conv_ext[data];
+        break;
+    case RUN_TYPE_LF_EXT2:
+        if (!is_lower)
+            break;
+        res[0] = c - code + case_conv_ext[data >> 6];
+        res[1] = case_conv_ext[data & 0x3f];
+        return 2;
+    case RUN_TYPE_UF_EXT2:
+        if (conv_type == 1)
+            break;
+        res[0] = c - code + case_conv_ext[data >> 6];
+        res[1] = case_conv_ext[data & 0x3f];
+        if (conv_type == 2) {
+            /* convert to lower */
+            res[0] = lre_case_conv1(res[0], 1);
+            res[1] = lre_case_conv1(res[1], 1);
+        }
+        return 2;
+    default:
+    case RUN_TYPE_UF_EXT3:
+        if (conv_type == 1)
+            break;
+        res[0] = case_conv_ext[data >> 8];
+        res[1] = case_conv_ext[(data >> 4) & 0xf];
+        res[2] = case_conv_ext[data & 0xf];
+        if (conv_type == 2) {
+            /* convert to lower */
+            res[0] = lre_case_conv1(res[0], 1);
+            res[1] = lre_case_conv1(res[1], 1);
+            res[2] = lre_case_conv1(res[2], 1);
+        }
+        return 3;
+    }
+    res[0] = c;
+    return 1;
+}
+
+/* conv_type:
+   0 = to upper
+   1 = to lower
+   2 = case folding (= to lower with modifications)
+*/
+int lre_case_conv(uint32_t *res, uint32_t c, int conv_type)
+{
+    if (c < 128) {
+        if (conv_type) {
+            if (c >= 'A' && c <= 'Z') {
+                c = c - 'A' + 'a';
+            }
+        } else {
+            if (c >= 'a' && c <= 'z') {
+                c = c - 'a' + 'A';
+            }
+        }
+    } else {
+        uint32_t v, code, len;
+        int idx, idx_min, idx_max;
+
+        idx_min = 0;
+        idx_max = countof(case_conv_table1) - 1;
+        while (idx_min <= idx_max) {
+            idx = (unsigned)(idx_max + idx_min) / 2;
+            v = case_conv_table1[idx];
+            code = v >> (32 - 17);
+            len = (v >> (32 - 17 - 7)) & 0x7f;
+            if (c < code) {
+                idx_max = idx - 1;
+            } else if (c >= code + len) {
+                idx_min = idx + 1;
+            } else {
+                return lre_case_conv_entry(res, c, conv_type, idx, v);
+            }
+        }
+    }
+    res[0] = c;
+    return 1;
+}
+
+static int lre_case_folding_entry(uint32_t c, uint32_t idx, uint32_t v, BOOL is_unicode)
+{
+    uint32_t res[LRE_CC_RES_LEN_MAX];
+    int len;
+
+    if (is_unicode) {
+        len = lre_case_conv_entry(res, c, 2, idx, v);
+        if (len == 1) {
+            c = res[0];
+        } else {
+            /* handle the few specific multi-character cases (see
+               unicode_gen.c:dump_case_folding_special_cases()) */
+            if (c == 0xfb06) {
+                c = 0xfb05;
+            } else if (c == 0x01fd3) {
+                c = 0x390;
+            } else if (c == 0x01fe3) {
+                c = 0x3b0;
+            }
+        }
+    } else {
+        if (likely(c < 128)) {
+            if (c >= 'a' && c <= 'z')
+                c = c - 'a' + 'A';
+        } else {
+            /* legacy regexp: to upper case if single char >= 128 */
+            len = lre_case_conv_entry(res, c, FALSE, idx, v);
+            if (len == 1 && res[0] >= 128)
+                c = res[0];
+        }
+    }
+    return c;
+}
+
+/* JS regexp specific rules for case folding */
+int lre_canonicalize(uint32_t c, BOOL is_unicode)
+{
+    if (c < 128) {
+        /* fast case */
+        if (is_unicode) {
+            if (c >= 'A' && c <= 'Z') {
+                c = c - 'A' + 'a';
+            }
+        } else {
+            if (c >= 'a' && c <= 'z') {
+                c = c - 'a' + 'A';
+            }
+        }
+    } else {
+        uint32_t v, code, len;
+        int idx, idx_min, idx_max;
+
+        idx_min = 0;
+        idx_max = countof(case_conv_table1) - 1;
+        while (idx_min <= idx_max) {
+            idx = (unsigned)(idx_max + idx_min) / 2;
+            v = case_conv_table1[idx];
+            code = v >> (32 - 17);
+            len = (v >> (32 - 17 - 7)) & 0x7f;
+            if (c < code) {
+                idx_max = idx - 1;
+            } else if (c >= code + len) {
+                idx_min = idx + 1;
+            } else {
+                return lre_case_folding_entry(c, idx, v, is_unicode);
+            }
+        }
+    }
+    return c;
+}
+
+static uint32_t get_le24(const uint8_t *ptr)
+{
+    return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16);
+}
+
+#define UNICODE_INDEX_BLOCK_LEN 32
+
+/* return -1 if not in table, otherwise the offset in the block */
+static int get_index_pos(uint32_t *pcode, uint32_t c,
+                         const uint8_t *index_table, int index_table_len)
+{
+    uint32_t code, v;
+    int idx_min, idx_max, idx;
+
+    idx_min = 0;
+    v = get_le24(index_table);
+    code = v & ((1 << 21) - 1);
+    if (c < code) {
+        *pcode = 0;
+        return 0;
+    }
+    idx_max = index_table_len - 1;
+    code = get_le24(index_table + idx_max * 3);
+    if (c >= code)
+        return -1;
+    /* invariant: tab[idx_min] <= c < tab2[idx_max] */
+    while ((idx_max - idx_min) > 1) {
+        idx = (idx_max + idx_min) / 2;
+        v = get_le24(index_table + idx * 3);
+        code = v & ((1 << 21) - 1);
+        if (c < code) {
+            idx_max = idx;
+        } else {
+            idx_min = idx;
+        }
+    }
+    v = get_le24(index_table + idx_min * 3);
+    *pcode = v & ((1 << 21) - 1);
+    return (idx_min + 1) * UNICODE_INDEX_BLOCK_LEN + (v >> 21);
+}
+
+static BOOL lre_is_in_table(uint32_t c, const uint8_t *table,
+                            const uint8_t *index_table, int index_table_len)
+{
+    uint32_t code, b, bit;
+    int pos;
+    const uint8_t *p;
+
+    pos = get_index_pos(&code, c, index_table, index_table_len);
+    if (pos < 0)
+        return FALSE; /* outside the table */
+    p = table + pos;
+    bit = 0;
+    /* Compressed run length encoding:
+       00..3F: 2 packed lengths: 3-bit + 3-bit
+       40..5F: 5-bits plus extra byte for length
+       60..7F: 5-bits plus 2 extra bytes for length
+       80..FF: 7-bit length
+       lengths must be incremented to get character count
+       Ranges alternate between false and true return value.
+     */
+    for(;;) {
+        b = *p++;
+        if (b < 64) {
+            code += (b >> 3) + 1;
+            if (c < code)
+                return bit;
+            bit ^= 1;
+            code += (b & 7) + 1;
+        } else if (b >= 0x80) {
+            code += b - 0x80 + 1;
+        } else if (b < 0x60) {
+            code += (((b - 0x40) << 8) | p[0]) + 1;
+            p++;
+        } else {
+            code += (((b - 0x60) << 16) | (p[0] << 8) | p[1]) + 1;
+            p += 2;
+        }
+        if (c < code)
+            return bit;
+        bit ^= 1;
+    }
+}
+
+BOOL lre_is_cased(uint32_t c)
+{
+    uint32_t v, code, len;
+    int idx, idx_min, idx_max;
+
+    idx_min = 0;
+    idx_max = countof(case_conv_table1) - 1;
+    while (idx_min <= idx_max) {
+        idx = (unsigned)(idx_max + idx_min) / 2;
+        v = case_conv_table1[idx];
+        code = v >> (32 - 17);
+        len = (v >> (32 - 17 - 7)) & 0x7f;
+        if (c < code) {
+            idx_max = idx - 1;
+        } else if (c >= code + len) {
+            idx_min = idx + 1;
+        } else {
+            return TRUE;
+        }
+    }
+    return lre_is_in_table(c, unicode_prop_Cased1_table,
+                           unicode_prop_Cased1_index,
+                           sizeof(unicode_prop_Cased1_index) / 3);
+}
+
+BOOL lre_is_case_ignorable(uint32_t c)
+{
+    return lre_is_in_table(c, unicode_prop_Case_Ignorable_table,
+                           unicode_prop_Case_Ignorable_index,
+                           sizeof(unicode_prop_Case_Ignorable_index) / 3);
+}
+
+/* character range */
+
+static __maybe_unused void cr_dump(CharRange *cr)
+{
+    int i;
+    for(i = 0; i < cr->len; i++)
+        printf("%d: 0x%04x\n", i, cr->points[i]);
+}
+
+static void *cr_default_realloc(void *opaque, void *ptr, size_t size)
+{
+    return realloc(ptr, size);
+}
+
+void cr_init(CharRange *cr, void *mem_opaque, DynBufReallocFunc *realloc_func)
+{
+    cr->len = cr->size = 0;
+    cr->points = NULL;
+    cr->mem_opaque = mem_opaque;
+    cr->realloc_func = realloc_func ? realloc_func : cr_default_realloc;
+}
+
+void cr_free(CharRange *cr)
+{
+    cr->realloc_func(cr->mem_opaque, cr->points, 0);
+}
+
+int cr_realloc(CharRange *cr, int size)
+{
+    int new_size;
+    uint32_t *new_buf;
+
+    if (size > cr->size) {
+        new_size = max_int(size, cr->size * 3 / 2);
+        new_buf = cr->realloc_func(cr->mem_opaque, cr->points,
+                                   new_size * sizeof(cr->points[0]));
+        if (!new_buf)
+            return -1;
+        cr->points = new_buf;
+        cr->size = new_size;
+    }
+    return 0;
+}
+
+int cr_copy(CharRange *cr, const CharRange *cr1)
+{
+    if (cr_realloc(cr, cr1->len))
+        return -1;
+    memcpy(cr->points, cr1->points, sizeof(cr->points[0]) * cr1->len);
+    cr->len = cr1->len;
+    return 0;
+}
+
+/* merge consecutive intervals and remove empty intervals */
+static void cr_compress(CharRange *cr)
+{
+    int i, j, k, len;
+    uint32_t *pt;
+
+    pt = cr->points;
+    len = cr->len;
+    i = 0;
+    j = 0;
+    k = 0;
+    while ((i + 1) < len) {
+        if (pt[i] == pt[i + 1]) {
+            /* empty interval */
+            i += 2;
+        } else {
+            j = i;
+            while ((j + 3) < len && pt[j + 1] == pt[j + 2])
+                j += 2;
+            /* just copy */
+            pt[k] = pt[i];
+            pt[k + 1] = pt[j + 1];
+            k += 2;
+            i = j + 2;
+        }
+    }
+    cr->len = k;
+}
+
+/* union or intersection */
+int cr_op(CharRange *cr, const uint32_t *a_pt, int a_len,
+          const uint32_t *b_pt, int b_len, int op)
+{
+    int a_idx, b_idx, is_in;
+    uint32_t v;
+
+    a_idx = 0;
+    b_idx = 0;
+    for(;;) {
+        /* get one more point from a or b in increasing order */
+        if (a_idx < a_len && b_idx < b_len) {
+            if (a_pt[a_idx] < b_pt[b_idx]) {
+                goto a_add;
+            } else if (a_pt[a_idx] == b_pt[b_idx]) {
+                v = a_pt[a_idx];
+                a_idx++;
+                b_idx++;
+            } else {
+                goto b_add;
+            }
+        } else if (a_idx < a_len) {
+        a_add:
+            v = a_pt[a_idx++];
+        } else if (b_idx < b_len) {
+        b_add:
+            v = b_pt[b_idx++];
+        } else {
+            break;
+        }
+        /* add the point if the in/out status changes */
+        switch(op) {
+        case CR_OP_UNION:
+            is_in = (a_idx & 1) | (b_idx & 1);
+            break;
+        case CR_OP_INTER:
+            is_in = (a_idx & 1) & (b_idx & 1);
+            break;
+        case CR_OP_XOR:
+            is_in = (a_idx & 1) ^ (b_idx & 1);
+            break;
+        default:
+            abort();
+        }
+        if (is_in != (cr->len & 1)) {
+            if (cr_add_point(cr, v))
+                return -1;
+        }
+    }
+    cr_compress(cr);
+    return 0;
+}
+
+int cr_union1(CharRange *cr, const uint32_t *b_pt, int b_len)
+{
+    CharRange a = *cr;
+    int ret;
+    cr->len = 0;
+    cr->size = 0;
+    cr->points = NULL;
+    ret = cr_op(cr, a.points, a.len, b_pt, b_len, CR_OP_UNION);
+    cr_free(&a);
+    return ret;
+}
+
+int cr_invert(CharRange *cr)
+{
+    int len;
+    len = cr->len;
+    if (cr_realloc(cr, len + 2))
+        return -1;
+    memmove(cr->points + 1, cr->points, len * sizeof(cr->points[0]));
+    cr->points[0] = 0;
+    cr->points[len + 1] = UINT32_MAX;
+    cr->len = len + 2;
+    cr_compress(cr);
+    return 0;
+}
+
+#ifdef CONFIG_ALL_UNICODE
+
+BOOL lre_is_id_start(uint32_t c)
+{
+    return lre_is_in_table(c, unicode_prop_ID_Start_table,
+                           unicode_prop_ID_Start_index,
+                           sizeof(unicode_prop_ID_Start_index) / 3);
+}
+
+BOOL lre_is_id_continue(uint32_t c)
+{
+    return lre_is_id_start(c) ||
+        lre_is_in_table(c, unicode_prop_ID_Continue1_table,
+                        unicode_prop_ID_Continue1_index,
+                        sizeof(unicode_prop_ID_Continue1_index) / 3);
+}
+
+#define UNICODE_DECOMP_LEN_MAX 18
+
+typedef enum {
+    DECOMP_TYPE_C1, /* 16 bit char */
+    DECOMP_TYPE_L1, /* 16 bit char table */
+    DECOMP_TYPE_L2,
+    DECOMP_TYPE_L3,
+    DECOMP_TYPE_L4,
+    DECOMP_TYPE_L5, /* XXX: not used */
+    DECOMP_TYPE_L6, /* XXX: could remove */
+    DECOMP_TYPE_L7, /* XXX: could remove */
+    DECOMP_TYPE_LL1, /* 18 bit char table */
+    DECOMP_TYPE_LL2,
+    DECOMP_TYPE_S1, /* 8 bit char table */
+    DECOMP_TYPE_S2,
+    DECOMP_TYPE_S3,
+    DECOMP_TYPE_S4,
+    DECOMP_TYPE_S5,
+    DECOMP_TYPE_I1, /* increment 16 bit char value */
+    DECOMP_TYPE_I2_0,
+    DECOMP_TYPE_I2_1,
+    DECOMP_TYPE_I3_1,
+    DECOMP_TYPE_I3_2,
+    DECOMP_TYPE_I4_1,
+    DECOMP_TYPE_I4_2,
+    DECOMP_TYPE_B1, /* 16 bit base + 8 bit offset */
+    DECOMP_TYPE_B2,
+    DECOMP_TYPE_B3,
+    DECOMP_TYPE_B4,
+    DECOMP_TYPE_B5,
+    DECOMP_TYPE_B6,
+    DECOMP_TYPE_B7,
+    DECOMP_TYPE_B8,
+    DECOMP_TYPE_B18,
+    DECOMP_TYPE_LS2,
+    DECOMP_TYPE_PAT3,
+    DECOMP_TYPE_S2_UL,
+    DECOMP_TYPE_LS2_UL,
+} DecompTypeEnum;
+
+static uint32_t unicode_get_short_code(uint32_t c)
+{
+    static const uint16_t unicode_short_table[2] = { 0x2044, 0x2215 };
+
+    if (c < 0x80)
+        return c;
+    else if (c < 0x80 + 0x50)
+        return c - 0x80 + 0x300;
+    else
+        return unicode_short_table[c - 0x80 - 0x50];
+}
+
+static uint32_t unicode_get_lower_simple(uint32_t c)
+{
+    if (c < 0x100 || (c >= 0x410 && c <= 0x42f))
+        c += 0x20;
+    else
+        c++;
+    return c;
+}
+
+static uint16_t unicode_get16(const uint8_t *p)
+{
+    return p[0] | (p[1] << 8);
+}
+
+static int unicode_decomp_entry(uint32_t *res, uint32_t c,
+                                int idx, uint32_t code, uint32_t len,
+                                uint32_t type)
+{
+    uint32_t c1;
+    int l, i, p;
+    const uint8_t *d;
+
+    if (type == DECOMP_TYPE_C1) {
+        res[0] = unicode_decomp_table2[idx];
+        return 1;
+    } else {
+        d = unicode_decomp_data + unicode_decomp_table2[idx];
+        switch(type) {
+        case DECOMP_TYPE_L1:
+        case DECOMP_TYPE_L2:
+        case DECOMP_TYPE_L3:
+        case DECOMP_TYPE_L4:
+        case DECOMP_TYPE_L5:
+        case DECOMP_TYPE_L6:
+        case DECOMP_TYPE_L7:
+            l = type - DECOMP_TYPE_L1 + 1;
+            d += (c - code) * l * 2;
+            for(i = 0; i < l; i++) {
+                if ((res[i] = unicode_get16(d + 2 * i)) == 0)
+                    return 0;
+            }
+            return l;
+        case DECOMP_TYPE_LL1:
+        case DECOMP_TYPE_LL2:
+            {
+                uint32_t k, p;
+                l = type - DECOMP_TYPE_LL1 + 1;
+                k = (c - code) * l;
+                p = len * l * 2;
+                for(i = 0; i < l; i++) {
+                    c1 = unicode_get16(d + 2 * k) |
+                        (((d[p + (k / 4)] >> ((k % 4) * 2)) & 3) << 16);
+                    if (!c1)
+                        return 0;
+                    res[i] = c1;
+                    k++;
+                }
+            }
+            return l;
+        case DECOMP_TYPE_S1:
+        case DECOMP_TYPE_S2:
+        case DECOMP_TYPE_S3:
+        case DECOMP_TYPE_S4:
+        case DECOMP_TYPE_S5:
+            l = type - DECOMP_TYPE_S1 + 1;
+            d += (c - code) * l;
+            for(i = 0; i < l; i++) {
+                if ((res[i] = unicode_get_short_code(d[i])) == 0)
+                    return 0;
+            }
+            return l;
+        case DECOMP_TYPE_I1:
+            l = 1;
+            p = 0;
+            goto decomp_type_i;
+        case DECOMP_TYPE_I2_0:
+        case DECOMP_TYPE_I2_1:
+        case DECOMP_TYPE_I3_1:
+        case DECOMP_TYPE_I3_2:
+        case DECOMP_TYPE_I4_1:
+        case DECOMP_TYPE_I4_2:
+            l = 2 + ((type - DECOMP_TYPE_I2_0) >> 1);
+            p = ((type - DECOMP_TYPE_I2_0) & 1) + (l > 2);
+        decomp_type_i:
+            for(i = 0; i < l; i++) {
+                c1 = unicode_get16(d + 2 * i);
+                if (i == p)
+                    c1 += c - code;
+                res[i] = c1;
+            }
+            return l;
+        case DECOMP_TYPE_B18:
+            l = 18;
+            goto decomp_type_b;
+        case DECOMP_TYPE_B1:
+        case DECOMP_TYPE_B2:
+        case DECOMP_TYPE_B3:
+        case DECOMP_TYPE_B4:
+        case DECOMP_TYPE_B5:
+        case DECOMP_TYPE_B6:
+        case DECOMP_TYPE_B7:
+        case DECOMP_TYPE_B8:
+            l = type - DECOMP_TYPE_B1 + 1;
+        decomp_type_b:
+            {
+                uint32_t c_min;
+                c_min = unicode_get16(d);
+                d += 2 + (c - code) * l;
+                for(i = 0; i < l; i++) {
+                    c1 = d[i];
+                    if (c1 == 0xff)
+                        c1 = 0x20;
+                    else
+                        c1 += c_min;
+                    res[i] = c1;
+                }
+            }
+            return l;
+        case DECOMP_TYPE_LS2:
+            d += (c - code) * 3;
+            if (!(res[0] = unicode_get16(d)))
+                return 0;
+            res[1] = unicode_get_short_code(d[2]);
+            return 2;
+        case DECOMP_TYPE_PAT3:
+            res[0] = unicode_get16(d);
+            res[2] = unicode_get16(d + 2);
+            d += 4 + (c - code) * 2;
+            res[1] = unicode_get16(d);
+            return 3;
+        case DECOMP_TYPE_S2_UL:
+        case DECOMP_TYPE_LS2_UL:
+            c1 = c - code;
+            if (type == DECOMP_TYPE_S2_UL) {
+                d += c1 & ~1;
+                c = unicode_get_short_code(*d);
+                d++;
+            } else {
+                d += (c1 >> 1) * 3;
+                c = unicode_get16(d);
+                d += 2;
+            }
+            if (c1 & 1)
+                c = unicode_get_lower_simple(c);
+            res[0] = c;
+            res[1] = unicode_get_short_code(*d);
+            return 2;
+        }
+    }
+    return 0;
+}
+
+
+/* return the length of the decomposition (length <=
+   UNICODE_DECOMP_LEN_MAX) or 0 if no decomposition */
+static int unicode_decomp_char(uint32_t *res, uint32_t c, BOOL is_compat1)
+{
+    uint32_t v, type, is_compat, code, len;
+    int idx_min, idx_max, idx;
+
+    idx_min = 0;
+    idx_max = countof(unicode_decomp_table1) - 1;
+    while (idx_min <= idx_max) {
+        idx = (idx_max + idx_min) / 2;
+        v = unicode_decomp_table1[idx];
+        code = v >> (32 - 18);
+        len = (v >> (32 - 18 - 7)) & 0x7f;
+        //        printf("idx=%d code=%05x len=%d\n", idx, code, len);
+        if (c < code) {
+            idx_max = idx - 1;
+        } else if (c >= code + len) {
+            idx_min = idx + 1;
+        } else {
+            is_compat = v & 1;
+            if (is_compat1 < is_compat)
+                break;
+            type = (v >> (32 - 18 - 7 - 6)) & 0x3f;
+            return unicode_decomp_entry(res, c, idx, code, len, type);
+        }
+    }
+    return 0;
+}
+
+/* return 0 if no pair found */
+static int unicode_compose_pair(uint32_t c0, uint32_t c1)
+{
+    uint32_t code, len, type, v, idx1, d_idx, d_offset, ch;
+    int idx_min, idx_max, idx, d;
+    uint32_t pair[2];
+
+    idx_min = 0;
+    idx_max = countof(unicode_comp_table) - 1;
+    while (idx_min <= idx_max) {
+        idx = (idx_max + idx_min) / 2;
+        idx1 = unicode_comp_table[idx];
+
+        /* idx1 represent an entry of the decomposition table */
+        d_idx = idx1 >> 6;
+        d_offset = idx1 & 0x3f;
+        v = unicode_decomp_table1[d_idx];
+        code = v >> (32 - 18);
+        len = (v >> (32 - 18 - 7)) & 0x7f;
+        type = (v >> (32 - 18 - 7 - 6)) & 0x3f;
+        ch = code + d_offset;
+        unicode_decomp_entry(pair, ch, d_idx, code, len, type);
+        d = c0 - pair[0];
+        if (d == 0)
+            d = c1 - pair[1];
+        if (d < 0) {
+            idx_max = idx - 1;
+        } else if (d > 0) {
+            idx_min = idx + 1;
+        } else {
+            return ch;
+        }
+    }
+    return 0;
+}
+
+/* return the combining class of character c (between 0 and 255) */
+static int unicode_get_cc(uint32_t c)
+{
+    uint32_t code, n, type, cc, c1, b;
+    int pos;
+    const uint8_t *p;
+
+    pos = get_index_pos(&code, c,
+                        unicode_cc_index, sizeof(unicode_cc_index) / 3);
+    if (pos < 0)
+        return 0;
+    p = unicode_cc_table + pos;
+    /* Compressed run length encoding:
+       - 2 high order bits are combining class type
+       -         0:0, 1:230, 2:extra byte linear progression, 3:extra byte
+       - 00..2F: range length (add 1)
+       - 30..37: 3-bit range-length + 1 extra byte
+       - 38..3F: 3-bit range-length + 2 extra byte
+     */
+    for(;;) {
+        b = *p++;
+        type = b >> 6;
+        n = b & 0x3f;
+        if (n < 48) {
+        } else if (n < 56) {
+            n = (n - 48) << 8;
+            n |= *p++;
+            n += 48;
+        } else {
+            n = (n - 56) << 8;
+            n |= *p++ << 8;
+            n |= *p++;
+            n += 48 + (1 << 11);
+        }
+        if (type <= 1)
+            p++;
+        c1 = code + n + 1;
+        if (c < c1) {
+            switch(type) {
+            case 0:
+                cc = p[-1];
+                break;
+            case 1:
+                cc = p[-1] + c - code;
+                break;
+            case 2:
+                cc = 0;
+                break;
+            default:
+            case 3:
+                cc = 230;
+                break;
+            }
+            return cc;
+        }
+        code = c1;
+    }
+}
+
+static void sort_cc(int *buf, int len)
+{
+    int i, j, k, cc, cc1, start, ch1;
+
+    for(i = 0; i < len; i++) {
+        cc = unicode_get_cc(buf[i]);
+        if (cc != 0) {
+            start = i;
+            j = i + 1;
+            while (j < len) {
+                ch1 = buf[j];
+                cc1 = unicode_get_cc(ch1);
+                if (cc1 == 0)
+                    break;
+                k = j - 1;
+                while (k >= start) {
+                    if (unicode_get_cc(buf[k]) <= cc1)
+                        break;
+                    buf[k + 1] = buf[k];
+                    k--;
+                }
+                buf[k + 1] = ch1;
+                j++;
+            }
+#if 0
+            printf("cc:");
+            for(k = start; k < j; k++) {
+                printf(" %3d", unicode_get_cc(buf[k]));
+            }
+            printf("\n");
+#endif
+            i = j;
+        }
+    }
+}
+
+static void to_nfd_rec(DynBuf *dbuf,
+                       const int *src, int src_len, int is_compat)
+{
+    uint32_t c, v;
+    int i, l;
+    uint32_t res[UNICODE_DECOMP_LEN_MAX];
+
+    for(i = 0; i < src_len; i++) {
+        c = src[i];
+        if (c >= 0xac00 && c < 0xd7a4) {
+            /* Hangul decomposition */
+            c -= 0xac00;
+            dbuf_put_u32(dbuf, 0x1100 + c / 588);
+            dbuf_put_u32(dbuf, 0x1161 + (c % 588) / 28);
+            v = c % 28;
+            if (v != 0)
+                dbuf_put_u32(dbuf, 0x11a7 + v);
+        } else {
+            l = unicode_decomp_char(res, c, is_compat);
+            if (l) {
+                to_nfd_rec(dbuf, (int *)res, l, is_compat);
+            } else {
+                dbuf_put_u32(dbuf, c);
+            }
+        }
+    }
+}
+
+/* return 0 if not found */
+static int compose_pair(uint32_t c0, uint32_t c1)
+{
+    /* Hangul composition */
+    if (c0 >= 0x1100 && c0 < 0x1100 + 19 &&
+        c1 >= 0x1161 && c1 < 0x1161 + 21) {
+        return 0xac00 + (c0 - 0x1100) * 588 + (c1 - 0x1161) * 28;
+    } else if (c0 >= 0xac00 && c0 < 0xac00 + 11172 &&
+               (c0 - 0xac00) % 28 == 0 &&
+               c1 >= 0x11a7 && c1 < 0x11a7 + 28) {
+        return c0 + c1 - 0x11a7;
+    } else {
+        return unicode_compose_pair(c0, c1);
+    }
+}
+
+int unicode_normalize(uint32_t **pdst, const uint32_t *src, int src_len,
+                      UnicodeNormalizationEnum n_type,
+                      void *opaque, DynBufReallocFunc *realloc_func)
+{
+    int *buf, buf_len, i, p, starter_pos, cc, last_cc, out_len;
+    BOOL is_compat;
+    DynBuf dbuf_s, *dbuf = &dbuf_s;
+
+    is_compat = n_type >> 1;
+
+    dbuf_init2(dbuf, opaque, realloc_func);
+    if (dbuf_realloc(dbuf, sizeof(int) * src_len))
+        goto fail;
+
+    /* common case: latin1 is unaffected by NFC */
+    if (n_type == UNICODE_NFC) {
+        for(i = 0; i < src_len; i++) {
+            if (src[i] >= 0x100)
+                goto not_latin1;
+        }
+        buf = (int *)dbuf->buf;
+        memcpy(buf, src, src_len * sizeof(int));
+        *pdst = (uint32_t *)buf;
+        return src_len;
+    not_latin1: ;
+    }
+
+    to_nfd_rec(dbuf, (const int *)src, src_len, is_compat);
+    if (dbuf_error(dbuf)) {
+    fail:
+        *pdst = NULL;
+        return -1;
+    }
+    buf = (int *)dbuf->buf;
+    buf_len = dbuf->size / sizeof(int);
+
+    sort_cc(buf, buf_len);
+
+    if (buf_len <= 1 || (n_type & 1) != 0) {
+        /* NFD / NFKD */
+        *pdst = (uint32_t *)buf;
+        return buf_len;
+    }
+
+    i = 1;
+    out_len = 1;
+    while (i < buf_len) {
+        /* find the starter character and test if it is blocked from
+           the character at 'i' */
+        last_cc = unicode_get_cc(buf[i]);
+        starter_pos = out_len - 1;
+        while (starter_pos >= 0) {
+            cc = unicode_get_cc(buf[starter_pos]);
+            if (cc == 0)
+                break;
+            if (cc >= last_cc)
+                goto next;
+            last_cc = 256;
+            starter_pos--;
+        }
+        if (starter_pos >= 0 &&
+            (p = compose_pair(buf[starter_pos], buf[i])) != 0) {
+            buf[starter_pos] = p;
+            i++;
+        } else {
+        next:
+            buf[out_len++] = buf[i++];
+        }
+    }
+    *pdst = (uint32_t *)buf;
+    return out_len;
+}
+
+/* char ranges for various unicode properties */
+
+static int unicode_find_name(const char *name_table, const char *name)
+{
+    const char *p, *r;
+    int pos;
+    size_t name_len, len;
+
+    p = name_table;
+    pos = 0;
+    name_len = strlen(name);
+    while (*p) {
+        for(;;) {
+            r = strchr(p, ',');
+            if (!r)
+                len = strlen(p);
+            else
+                len = r - p;
+            if (len == name_len && !memcmp(p, name, name_len))
+                return pos;
+            p += len + 1;
+            if (!r)
+                break;
+        }
+        pos++;
+    }
+    return -1;
+}
+
+/* 'cr' must be initialized and empty. Return 0 if OK, -1 if error, -2
+   if not found */
+int unicode_script(CharRange *cr,
+                   const char *script_name, BOOL is_ext)
+{
+    int script_idx;
+    const uint8_t *p, *p_end;
+    uint32_t c, c1, b, n, v, v_len, i, type;
+    CharRange cr1_s, *cr1;
+    CharRange cr2_s, *cr2 = &cr2_s;
+    BOOL is_common;
+
+    script_idx = unicode_find_name(unicode_script_name_table, script_name);
+    if (script_idx < 0)
+        return -2;
+    /* Note: we remove the "Unknown" Script */
+    script_idx += UNICODE_SCRIPT_Unknown + 1;
+
+    is_common = (script_idx == UNICODE_SCRIPT_Common ||
+                 script_idx == UNICODE_SCRIPT_Inherited);
+    if (is_ext) {
+        cr1 = &cr1_s;
+        cr_init(cr1, cr->mem_opaque, cr->realloc_func);
+        cr_init(cr2, cr->mem_opaque, cr->realloc_func);
+    } else {
+        cr1 = cr;
+    }
+
+    p = unicode_script_table;
+    p_end = unicode_script_table + countof(unicode_script_table);
+    c = 0;
+    while (p < p_end) {
+        b = *p++;
+        type = b >> 7;
+        n = b & 0x7f;
+        if (n < 96) {
+        } else if (n < 112) {
+            n = (n - 96) << 8;
+            n |= *p++;
+            n += 96;
+        } else {
+            n = (n - 112) << 16;
+            n |= *p++ << 8;
+            n |= *p++;
+            n += 96 + (1 << 12);
+        }
+        if (type == 0)
+            v = 0;
+        else
+            v = *p++;
+        c1 = c + n + 1;
+        if (v == script_idx) {
+            if (cr_add_interval(cr1, c, c1))
+                goto fail;
+        }
+        c = c1;
+    }
+
+    if (is_ext) {
+        /* add the script extensions */
+        p = unicode_script_ext_table;
+        p_end = unicode_script_ext_table + countof(unicode_script_ext_table);
+        c = 0;
+        while (p < p_end) {
+            b = *p++;
+            if (b < 128) {
+                n = b;
+            } else if (b < 128 + 64) {
+                n = (b - 128) << 8;
+                n |= *p++;
+                n += 128;
+            } else {
+                n = (b - 128 - 64) << 16;
+                n |= *p++ << 8;
+                n |= *p++;
+                n += 128 + (1 << 14);
+            }
+            c1 = c + n + 1;
+            v_len = *p++;
+            if (is_common) {
+                if (v_len != 0) {
+                    if (cr_add_interval(cr2, c, c1))
+                        goto fail;
+                }
+            } else {
+                for(i = 0; i < v_len; i++) {
+                    if (p[i] == script_idx) {
+                        if (cr_add_interval(cr2, c, c1))
+                            goto fail;
+                        break;
+                    }
+                }
+            }
+            p += v_len;
+            c = c1;
+        }
+        if (is_common) {
+            /* remove all the characters with script extensions */
+            if (cr_invert(cr2))
+                goto fail;
+            if (cr_op(cr, cr1->points, cr1->len, cr2->points, cr2->len,
+                      CR_OP_INTER))
+                goto fail;
+        } else {
+            if (cr_op(cr, cr1->points, cr1->len, cr2->points, cr2->len,
+                      CR_OP_UNION))
+                goto fail;
+        }
+        cr_free(cr1);
+        cr_free(cr2);
+    }
+    return 0;
+ fail:
+    if (is_ext) {
+        cr_free(cr1);
+        cr_free(cr2);
+    }
+    goto fail;
+}
+
+#define M(id) (1U << UNICODE_GC_ ## id)
+
+static int unicode_general_category1(CharRange *cr, uint32_t gc_mask)
+{
+    const uint8_t *p, *p_end;
+    uint32_t c, c0, b, n, v;
+
+    p = unicode_gc_table;
+    p_end = unicode_gc_table + countof(unicode_gc_table);
+    c = 0;
+    /* Compressed range encoding:
+       initial byte:
+       bits 0..4: category number (special case 31)
+       bits 5..7: range length (add 1)
+       special case bits 5..7 == 7: read an extra byte
+       - 00..7F: range length (add 7 + 1)
+       - 80..BF: 6-bits plus extra byte for range length (add 7 + 128)
+       - C0..FF: 6-bits plus 2 extra bytes for range length (add 7 + 128 + 16384)
+     */
+    while (p < p_end) {
+        b = *p++;
+        n = b >> 5;
+        v = b & 0x1f;
+        if (n == 7) {
+            n = *p++;
+            if (n < 128) {
+                n += 7;
+            } else if (n < 128 + 64) {
+                n = (n - 128) << 8;
+                n |= *p++;
+                n += 7 + 128;
+            } else {
+                n = (n - 128 - 64) << 16;
+                n |= *p++ << 8;
+                n |= *p++;
+                n += 7 + 128 + (1 << 14);
+            }
+        }
+        c0 = c;
+        c += n + 1;
+        if (v == 31) {
+            /* run of Lu / Ll */
+            b = gc_mask & (M(Lu) | M(Ll));
+            if (b != 0) {
+                if (b == (M(Lu) | M(Ll))) {
+                    goto add_range;
+                } else {
+                    c0 += ((gc_mask & M(Ll)) != 0);
+                    for(; c0 < c; c0 += 2) {
+                        if (cr_add_interval(cr, c0, c0 + 1))
+                            return -1;
+                    }
+                }
+            }
+        } else if ((gc_mask >> v) & 1) {
+        add_range:
+            if (cr_add_interval(cr, c0, c))
+                return -1;
+        }
+    }
+    return 0;
+}
+
+static int unicode_prop1(CharRange *cr, int prop_idx)
+{
+    const uint8_t *p, *p_end;
+    uint32_t c, c0, b, bit;
+
+    p = unicode_prop_table[prop_idx];
+    p_end = p + unicode_prop_len_table[prop_idx];
+    c = 0;
+    bit = 0;
+    /* Compressed range encoding:
+       00..3F: 2 packed lengths: 3-bit + 3-bit
+       40..5F: 5-bits plus extra byte for length
+       60..7F: 5-bits plus 2 extra bytes for length
+       80..FF: 7-bit length
+       lengths must be incremented to get character count
+       Ranges alternate between false and true return value.
+     */
+    while (p < p_end) {
+        c0 = c;
+        b = *p++;
+        if (b < 64) {
+            c += (b >> 3) + 1;
+            if (bit)  {
+                if (cr_add_interval(cr, c0, c))
+                    return -1;
+            }
+            bit ^= 1;
+            c0 = c;
+            c += (b & 7) + 1;
+        } else if (b >= 0x80) {
+            c += b - 0x80 + 1;
+        } else if (b < 0x60) {
+            c += (((b - 0x40) << 8) | p[0]) + 1;
+            p++;
+        } else {
+            c += (((b - 0x60) << 16) | (p[0] << 8) | p[1]) + 1;
+            p += 2;
+        }
+        if (bit)  {
+            if (cr_add_interval(cr, c0, c))
+                return -1;
+        }
+        bit ^= 1;
+    }
+    return 0;
+}
+
+#define CASE_U (1 << 0)
+#define CASE_L (1 << 1)
+#define CASE_F (1 << 2)
+
+/* use the case conversion table to generate range of characters.
+   CASE_U: set char if modified by uppercasing,
+   CASE_L: set char if modified by lowercasing,
+   CASE_F: set char if modified by case folding,
+ */
+static int unicode_case1(CharRange *cr, int case_mask)
+{
+#define MR(x) (1 << RUN_TYPE_ ## x)
+    const uint32_t tab_run_mask[3] = {
+        MR(U) | MR(UF) | MR(UL) | MR(LSU) | MR(U2L_399_EXT2) | MR(UF_D20) |
+        MR(UF_D1_EXT) | MR(U_EXT) | MR(UF_EXT2) | MR(UF_EXT3),
+
+        MR(L) | MR(LF) | MR(UL) | MR(LSU) | MR(U2L_399_EXT2) | MR(LF_EXT) | MR(LF_EXT2),
+
+        MR(UF) | MR(LF) | MR(UL) | MR(LSU) | MR(U2L_399_EXT2) | MR(LF_EXT) | MR(LF_EXT2) | MR(UF_D20) | MR(UF_D1_EXT) | MR(LF_EXT) | MR(UF_EXT2) | MR(UF_EXT3),
+    };
+#undef MR
+    uint32_t mask, v, code, type, len, i, idx;
+
+    if (case_mask == 0)
+        return 0;
+    mask = 0;
+    for(i = 0; i < 3; i++) {
+        if ((case_mask >> i) & 1)
+            mask |= tab_run_mask[i];
+    }
+    for(idx = 0; idx < countof(case_conv_table1); idx++) {
+        v = case_conv_table1[idx];
+        type = (v >> (32 - 17 - 7 - 4)) & 0xf;
+        code = v >> (32 - 17);
+        len = (v >> (32 - 17 - 7)) & 0x7f;
+        if ((mask >> type) & 1) {
+            //            printf("%d: type=%d %04x %04x\n", idx, type, code, code + len - 1);
+            switch(type) {
+            case RUN_TYPE_UL:
+                if ((case_mask & CASE_U) && (case_mask & (CASE_L | CASE_F)))
+                    goto def_case;
+                code += ((case_mask & CASE_U) != 0);
+                for(i = 0; i < len; i += 2) {
+                    if (cr_add_interval(cr, code + i, code + i + 1))
+                        return -1;
+                }
+                break;
+            case RUN_TYPE_LSU:
+                if ((case_mask & CASE_U) && (case_mask & (CASE_L | CASE_F)))
+                    goto def_case;
+                if (!(case_mask & CASE_U)) {
+                    if (cr_add_interval(cr, code, code + 1))
+                        return -1;
+                }
+                if (cr_add_interval(cr, code + 1, code + 2))
+                    return -1;
+                if (case_mask & CASE_U) {
+                    if (cr_add_interval(cr, code + 2, code + 3))
+                        return -1;
+                }
+                break;
+            default:
+            def_case:
+                if (cr_add_interval(cr, code, code + len))
+                    return -1;
+                break;
+            }
+        }
+    }
+    return 0;
+}
+
+static int point_cmp(const void *p1, const void *p2, void *arg)
+{
+    uint32_t v1 = *(uint32_t *)p1;
+    uint32_t v2 = *(uint32_t *)p2;
+    return (v1 > v2) - (v1 < v2);
+}
+
+static void cr_sort_and_remove_overlap(CharRange *cr)
+{
+    uint32_t start, end, start1, end1, i, j;
+
+    /* the resulting ranges are not necessarily sorted and may overlap */
+    rqsort(cr->points, cr->len / 2, sizeof(cr->points[0]) * 2, point_cmp, NULL);
+    j = 0;
+    for(i = 0; i < cr->len; ) {
+        start = cr->points[i];
+        end = cr->points[i + 1];
+        i += 2;
+        while (i < cr->len) {
+            start1 = cr->points[i];
+            end1 = cr->points[i + 1];
+            if (start1 > end) {
+                /* |------|
+                 *           |-------| */
+                break;
+            } else if (end1 <= end) {
+                /* |------|
+                 *    |--| */
+                i += 2;
+            } else {
+                /* |------|
+                 *     |-------| */
+                end = end1;
+                i += 2;
+            }
+        }
+        cr->points[j] = start;
+        cr->points[j + 1] = end;
+        j += 2;
+    }
+    cr->len = j;
+}
+
+/* canonicalize a character set using the JS regex case folding rules
+   (see lre_canonicalize()) */
+int cr_regexp_canonicalize(CharRange *cr, BOOL is_unicode)
+{
+    CharRange cr_inter, cr_mask, cr_result, cr_sub;
+    uint32_t v, code, len, i, idx, start, end, c, d_start, d_end, d;
+
+    cr_init(&cr_mask, cr->mem_opaque, cr->realloc_func);
+    cr_init(&cr_inter, cr->mem_opaque, cr->realloc_func);
+    cr_init(&cr_result, cr->mem_opaque, cr->realloc_func);
+    cr_init(&cr_sub, cr->mem_opaque, cr->realloc_func);
+
+    if (unicode_case1(&cr_mask, is_unicode ? CASE_F : CASE_U))
+        goto fail;
+    if (cr_op(&cr_inter, cr_mask.points, cr_mask.len, cr->points, cr->len, CR_OP_INTER))
+        goto fail;
+
+    if (cr_invert(&cr_mask))
+        goto fail;
+    if (cr_op(&cr_sub, cr_mask.points, cr_mask.len, cr->points, cr->len, CR_OP_INTER))
+        goto fail;
+
+    /* cr_inter = cr & cr_mask */
+    /* cr_sub = cr & ~cr_mask */
+
+    /* use the case conversion table to compute the result */
+    d_start = -1;
+    d_end = -1;
+    idx = 0;
+    v = case_conv_table1[idx];
+    code = v >> (32 - 17);
+    len = (v >> (32 - 17 - 7)) & 0x7f;
+    for(i = 0; i < cr_inter.len; i += 2) {
+        start = cr_inter.points[i];
+        end = cr_inter.points[i + 1];
+
+        for(c = start; c < end; c++) {
+            for(;;) {
+                if (c >= code && c < code + len)
+                    break;
+                idx++;
+                assert(idx < countof(case_conv_table1));
+                v = case_conv_table1[idx];
+                code = v >> (32 - 17);
+                len = (v >> (32 - 17 - 7)) & 0x7f;
+            }
+            d = lre_case_folding_entry(c, idx, v, is_unicode);
+            /* try to merge with the current interval */
+            if (d_start == -1) {
+                d_start = d;
+                d_end = d + 1;
+            } else if (d_end == d) {
+                d_end++;
+            } else {
+                cr_add_interval(&cr_result, d_start, d_end);
+                d_start = d;
+                d_end = d + 1;
+            }
+        }
+    }
+    if (d_start != -1) {
+        if (cr_add_interval(&cr_result, d_start, d_end))
+            goto fail;
+    }
+
+    /* the resulting ranges are not necessarily sorted and may overlap */
+    cr_sort_and_remove_overlap(&cr_result);
+
+    /* or with the character not affected by the case folding */
+    cr->len = 0;
+    if (cr_op(cr, cr_result.points, cr_result.len, cr_sub.points, cr_sub.len, CR_OP_UNION))
+        goto fail;
+
+    cr_free(&cr_inter);
+    cr_free(&cr_mask);
+    cr_free(&cr_result);
+    cr_free(&cr_sub);
+    return 0;
+ fail:
+    cr_free(&cr_inter);
+    cr_free(&cr_mask);
+    cr_free(&cr_result);
+    cr_free(&cr_sub);
+    return -1;
+}
+
+typedef enum {
+    POP_GC,
+    POP_PROP,
+    POP_CASE,
+    POP_UNION,
+    POP_INTER,
+    POP_XOR,
+    POP_INVERT,
+    POP_END,
+} PropOPEnum;
+
+#define POP_STACK_LEN_MAX 4
+
+static int unicode_prop_ops(CharRange *cr, ...)
+{
+    va_list ap;
+    CharRange stack[POP_STACK_LEN_MAX];
+    int stack_len, op, ret, i;
+    uint32_t a;
+
+    va_start(ap, cr);
+    stack_len = 0;
+    for(;;) {
+        op = va_arg(ap, int);
+        switch(op) {
+        case POP_GC:
+            assert(stack_len < POP_STACK_LEN_MAX);
+            a = va_arg(ap, int);
+            cr_init(&stack[stack_len++], cr->mem_opaque, cr->realloc_func);
+            if (unicode_general_category1(&stack[stack_len - 1], a))
+                goto fail;
+            break;
+        case POP_PROP:
+            assert(stack_len < POP_STACK_LEN_MAX);
+            a = va_arg(ap, int);
+            cr_init(&stack[stack_len++], cr->mem_opaque, cr->realloc_func);
+            if (unicode_prop1(&stack[stack_len - 1], a))
+                goto fail;
+            break;
+        case POP_CASE:
+            assert(stack_len < POP_STACK_LEN_MAX);
+            a = va_arg(ap, int);
+            cr_init(&stack[stack_len++], cr->mem_opaque, cr->realloc_func);
+            if (unicode_case1(&stack[stack_len - 1], a))
+                goto fail;
+            break;
+        case POP_UNION:
+        case POP_INTER:
+        case POP_XOR:
+            {
+                CharRange *cr1, *cr2, *cr3;
+                assert(stack_len >= 2);
+                assert(stack_len < POP_STACK_LEN_MAX);
+                cr1 = &stack[stack_len - 2];
+                cr2 = &stack[stack_len - 1];
+                cr3 = &stack[stack_len++];
+                cr_init(cr3, cr->mem_opaque, cr->realloc_func);
+                if (cr_op(cr3, cr1->points, cr1->len,
+                          cr2->points, cr2->len, op - POP_UNION + CR_OP_UNION))
+                    goto fail;
+                cr_free(cr1);
+                cr_free(cr2);
+                *cr1 = *cr3;
+                stack_len -= 2;
+            }
+            break;
+        case POP_INVERT:
+            assert(stack_len >= 1);
+            if (cr_invert(&stack[stack_len - 1]))
+                goto fail;
+            break;
+        case POP_END:
+            goto done;
+        default:
+            abort();
+        }
+    }
+ done:
+    va_end(ap);
+    assert(stack_len == 1);
+    ret = cr_copy(cr, &stack[0]);
+    cr_free(&stack[0]);
+    return ret;
+ fail:
+    va_end(ap);
+    for(i = 0; i < stack_len; i++)
+        cr_free(&stack[i]);
+    return -1;
+}
+
+static const uint32_t unicode_gc_mask_table[] = {
+    M(Lu) | M(Ll) | M(Lt), /* LC */
+    M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo), /* L */
+    M(Mn) | M(Mc) | M(Me), /* M */
+    M(Nd) | M(Nl) | M(No), /* N */
+    M(Sm) | M(Sc) | M(Sk) | M(So), /* S */
+    M(Pc) | M(Pd) | M(Ps) | M(Pe) | M(Pi) | M(Pf) | M(Po), /* P */
+    M(Zs) | M(Zl) | M(Zp), /* Z */
+    M(Cc) | M(Cf) | M(Cs) | M(Co) | M(Cn), /* C */
+};
+
+/* 'cr' must be initialized and empty. Return 0 if OK, -1 if error, -2
+   if not found */
+int unicode_general_category(CharRange *cr, const char *gc_name)
+{
+    int gc_idx;
+    uint32_t gc_mask;
+
+    gc_idx = unicode_find_name(unicode_gc_name_table, gc_name);
+    if (gc_idx < 0)
+        return -2;
+    if (gc_idx <= UNICODE_GC_Co) {
+        gc_mask = (uint64_t)1 << gc_idx;
+    } else {
+        gc_mask = unicode_gc_mask_table[gc_idx - UNICODE_GC_LC];
+    }
+    return unicode_general_category1(cr, gc_mask);
+}
+
+
+/* 'cr' must be initialized and empty. Return 0 if OK, -1 if error, -2
+   if not found */
+int unicode_prop(CharRange *cr, const char *prop_name)
+{
+    int prop_idx, ret;
+
+    prop_idx = unicode_find_name(unicode_prop_name_table, prop_name);
+    if (prop_idx < 0)
+        return -2;
+    prop_idx += UNICODE_PROP_ASCII_Hex_Digit;
+
+    ret = 0;
+    switch(prop_idx) {
+    case UNICODE_PROP_ASCII:
+        if (cr_add_interval(cr, 0x00, 0x7f + 1))
+            return -1;
+        break;
+    case UNICODE_PROP_Any:
+        if (cr_add_interval(cr, 0x00000, 0x10ffff + 1))
+            return -1;
+        break;
+    case UNICODE_PROP_Assigned:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Cn),
+                               POP_INVERT,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Math:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Sm),
+                               POP_PROP, UNICODE_PROP_Other_Math,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Lowercase:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Ll),
+                               POP_PROP, UNICODE_PROP_Other_Lowercase,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Uppercase:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu),
+                               POP_PROP, UNICODE_PROP_Other_Uppercase,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Cased:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt),
+                               POP_PROP, UNICODE_PROP_Other_Uppercase,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_Lowercase,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Alphabetic:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl),
+                               POP_PROP, UNICODE_PROP_Other_Uppercase,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_Lowercase,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_Alphabetic,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Grapheme_Base:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Cc) | M(Cf) | M(Cs) | M(Co) | M(Cn) | M(Zl) | M(Zp) | M(Me) | M(Mn),
+                               POP_PROP, UNICODE_PROP_Other_Grapheme_Extend,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Grapheme_Extend:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Me) | M(Mn),
+                               POP_PROP, UNICODE_PROP_Other_Grapheme_Extend,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_XID_Start:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl),
+                               POP_PROP, UNICODE_PROP_Other_ID_Start,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Pattern_Syntax,
+                               POP_PROP, UNICODE_PROP_Pattern_White_Space,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_XID_Start1,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_INTER,
+                               POP_END);
+        break;
+    case UNICODE_PROP_XID_Continue:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl) |
+                               M(Mn) | M(Mc) | M(Nd) | M(Pc),
+                               POP_PROP, UNICODE_PROP_Other_ID_Start,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_ID_Continue,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Pattern_Syntax,
+                               POP_PROP, UNICODE_PROP_Pattern_White_Space,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_XID_Continue1,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_INTER,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Changes_When_Uppercased:
+        ret = unicode_case1(cr, CASE_U);
+        break;
+    case UNICODE_PROP_Changes_When_Lowercased:
+        ret = unicode_case1(cr, CASE_L);
+        break;
+    case UNICODE_PROP_Changes_When_Casemapped:
+        ret = unicode_case1(cr, CASE_U | CASE_L | CASE_F);
+        break;
+    case UNICODE_PROP_Changes_When_Titlecased:
+        ret = unicode_prop_ops(cr,
+                               POP_CASE, CASE_U,
+                               POP_PROP, UNICODE_PROP_Changes_When_Titlecased1,
+                               POP_XOR,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Changes_When_Casefolded:
+        ret = unicode_prop_ops(cr,
+                               POP_CASE, CASE_F,
+                               POP_PROP, UNICODE_PROP_Changes_When_Casefolded1,
+                               POP_XOR,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Changes_When_NFKC_Casefolded:
+        ret = unicode_prop_ops(cr,
+                               POP_CASE, CASE_F,
+                               POP_PROP, UNICODE_PROP_Changes_When_NFKC_Casefolded1,
+                               POP_XOR,
+                               POP_END);
+        break;
+#if 0
+    case UNICODE_PROP_ID_Start:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl),
+                               POP_PROP, UNICODE_PROP_Other_ID_Start,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Pattern_Syntax,
+                               POP_PROP, UNICODE_PROP_Pattern_White_Space,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_INTER,
+                               POP_END);
+        break;
+    case UNICODE_PROP_ID_Continue:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl) |
+                               M(Mn) | M(Mc) | M(Nd) | M(Pc),
+                               POP_PROP, UNICODE_PROP_Other_ID_Start,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_ID_Continue,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Pattern_Syntax,
+                               POP_PROP, UNICODE_PROP_Pattern_White_Space,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_INTER,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Case_Ignorable:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Mn) | M(Cf) | M(Lm) | M(Sk),
+                               POP_PROP, UNICODE_PROP_Case_Ignorable1,
+                               POP_XOR,
+                               POP_END);
+        break;
+#else
+        /* we use the existing tables */
+    case UNICODE_PROP_ID_Continue:
+        ret = unicode_prop_ops(cr,
+                               POP_PROP, UNICODE_PROP_ID_Start,
+                               POP_PROP, UNICODE_PROP_ID_Continue1,
+                               POP_XOR,
+                               POP_END);
+        break;
+#endif
+    default:
+        if (prop_idx >= countof(unicode_prop_table))
+            return -2;
+        ret = unicode_prop1(cr, prop_idx);
+        break;
+    }
+    return ret;
+}
+
+#endif /* CONFIG_ALL_UNICODE */
+
+/*---- lre codepoint categorizing functions ----*/
+
+#define S  UNICODE_C_SPACE
+#define D  UNICODE_C_DIGIT
+#define X  UNICODE_C_XDIGIT
+#define U  UNICODE_C_UPPER
+#define L  UNICODE_C_LOWER
+#define _  UNICODE_C_UNDER
+#define d  UNICODE_C_DOLLAR
+
+uint8_t const lre_ctype_bits[256] = {
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, S, S, S, S, S, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+
+    S, 0, 0, 0, d, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    X|D, X|D, X|D, X|D, X|D, X|D, X|D, X|D,
+    X|D, X|D, 0, 0, 0, 0, 0, 0,
+
+    0, X|U, X|U, X|U, X|U, X|U, X|U, U,
+    U, U, U, U, U, U, U, U,
+    U, U, U, U, U, U, U, U,
+    U, U, U, 0, 0, 0, 0, _,
+
+    0, X|L, X|L, X|L, X|L, X|L, X|L, L,
+    L, L, L, L, L, L, L, L,
+    L, L, L, L, L, L, L, L,
+    L, L, L, 0, 0, 0, 0, 0,
+
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+
+    S, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+#undef S
+#undef D
+#undef X
+#undef U
+#undef L
+#undef _
+#undef d
+
+/* code point ranges for Zs,Zl or Zp property */
+static const uint16_t char_range_s[] = {
+    10,
+    0x0009, 0x000D + 1,
+    0x0020, 0x0020 + 1,
+    0x00A0, 0x00A0 + 1,
+    0x1680, 0x1680 + 1,
+    0x2000, 0x200A + 1,
+    /* 2028;LINE SEPARATOR;Zl;0;WS;;;;;N;;;;; */
+    /* 2029;PARAGRAPH SEPARATOR;Zp;0;B;;;;;N;;;;; */
+    0x2028, 0x2029 + 1,
+    0x202F, 0x202F + 1,
+    0x205F, 0x205F + 1,
+    0x3000, 0x3000 + 1,
+    /* FEFF;ZERO WIDTH NO-BREAK SPACE;Cf;0;BN;;;;;N;BYTE ORDER MARK;;;; */
+    0xFEFF, 0xFEFF + 1,
+};
+
+BOOL lre_is_space_non_ascii(uint32_t c)
+{
+    size_t i, n;
+
+    n = countof(char_range_s);
+    for(i = 5; i < n; i += 2) {
+        uint32_t low = char_range_s[i];
+        uint32_t high = char_range_s[i + 1];
+        if (c < low)
+            return FALSE;
+        if (c < high)
+            return TRUE;
+    }
+    return FALSE;
+}
diff --git a/src/shared/quickjs/libunicode.h b/src/shared/quickjs/libunicode.h
new file mode 100644
index 000000000..cc2f244c7
--- /dev/null
+++ b/src/shared/quickjs/libunicode.h
@@ -0,0 +1,182 @@
+/*
+ * Unicode utilities
+ *
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef LIBUNICODE_H
+#define LIBUNICODE_H
+
+#include <stdint.h>
+
+/* define it to include all the unicode tables (40KB larger) */
+#define CONFIG_ALL_UNICODE
+
+#define LRE_CC_RES_LEN_MAX 3
+
+/* char ranges */
+
+typedef struct {
+    int len; /* in points, always even */
+    int size;
+    uint32_t *points; /* points sorted by increasing value */
+    void *mem_opaque;
+    void *(*realloc_func)(void *opaque, void *ptr, size_t size);
+} CharRange;
+
+typedef enum {
+    CR_OP_UNION,
+    CR_OP_INTER,
+    CR_OP_XOR,
+} CharRangeOpEnum;
+
+void cr_init(CharRange *cr, void *mem_opaque, void *(*realloc_func)(void *opaque, void *ptr, size_t size));
+void cr_free(CharRange *cr);
+int cr_realloc(CharRange *cr, int size);
+int cr_copy(CharRange *cr, const CharRange *cr1);
+
+static inline int cr_add_point(CharRange *cr, uint32_t v)
+{
+    if (cr->len >= cr->size) {
+        if (cr_realloc(cr, cr->len + 1))
+            return -1;
+    }
+    cr->points[cr->len++] = v;
+    return 0;
+}
+
+static inline int cr_add_interval(CharRange *cr, uint32_t c1, uint32_t c2)
+{
+    if ((cr->len + 2) > cr->size) {
+        if (cr_realloc(cr, cr->len + 2))
+            return -1;
+    }
+    cr->points[cr->len++] = c1;
+    cr->points[cr->len++] = c2;
+    return 0;
+}
+
+int cr_union1(CharRange *cr, const uint32_t *b_pt, int b_len);
+
+static inline int cr_union_interval(CharRange *cr, uint32_t c1, uint32_t c2)
+{
+    uint32_t b_pt[2];
+    b_pt[0] = c1;
+    b_pt[1] = c2 + 1;
+    return cr_union1(cr, b_pt, 2);
+}
+
+int cr_op(CharRange *cr, const uint32_t *a_pt, int a_len,
+          const uint32_t *b_pt, int b_len, int op);
+
+int cr_invert(CharRange *cr);
+
+int cr_regexp_canonicalize(CharRange *cr, int is_unicode);
+
+typedef enum {
+    UNICODE_NFC,
+    UNICODE_NFD,
+    UNICODE_NFKC,
+    UNICODE_NFKD,
+} UnicodeNormalizationEnum;
+
+int unicode_normalize(uint32_t **pdst, const uint32_t *src, int src_len,
+                      UnicodeNormalizationEnum n_type,
+                      void *opaque, void *(*realloc_func)(void *opaque, void *ptr, size_t size));
+
+/* Unicode character range functions */
+
+int unicode_script(CharRange *cr, const char *script_name, int is_ext);
+int unicode_general_category(CharRange *cr, const char *gc_name);
+int unicode_prop(CharRange *cr, const char *prop_name);
+
+int lre_case_conv(uint32_t *res, uint32_t c, int conv_type);
+int lre_canonicalize(uint32_t c, int is_unicode);
+
+/* Code point type categories */
+enum {
+    UNICODE_C_SPACE  = (1 << 0),
+    UNICODE_C_DIGIT  = (1 << 1),
+    UNICODE_C_UPPER  = (1 << 2),
+    UNICODE_C_LOWER  = (1 << 3),
+    UNICODE_C_UNDER  = (1 << 4),
+    UNICODE_C_DOLLAR = (1 << 5),
+    UNICODE_C_XDIGIT = (1 << 6),
+};
+extern uint8_t const lre_ctype_bits[256];
+
+/* zero or non-zero return value */
+int lre_is_cased(uint32_t c);
+int lre_is_case_ignorable(uint32_t c);
+int lre_is_id_start(uint32_t c);
+int lre_is_id_continue(uint32_t c);
+
+static inline int lre_is_space_byte(uint8_t c) {
+    return lre_ctype_bits[c] & UNICODE_C_SPACE;
+}
+
+static inline int lre_is_id_start_byte(uint8_t c) {
+    return lre_ctype_bits[c] & (UNICODE_C_UPPER | UNICODE_C_LOWER |
+                                UNICODE_C_UNDER | UNICODE_C_DOLLAR);
+}
+
+static inline int lre_is_id_continue_byte(uint8_t c) {
+    return lre_ctype_bits[c] & (UNICODE_C_UPPER | UNICODE_C_LOWER |
+                                UNICODE_C_UNDER | UNICODE_C_DOLLAR |
+                                UNICODE_C_DIGIT);
+}
+
+int lre_is_space_non_ascii(uint32_t c);
+
+static inline int lre_is_space(uint32_t c) {
+    if (c < 256)
+        return lre_is_space_byte(c);
+    else
+        return lre_is_space_non_ascii(c);
+}
+
+static inline int lre_js_is_ident_first(uint32_t c) {
+    if (c < 128) {
+        return lre_is_id_start_byte(c);
+    } else {
+#ifdef CONFIG_ALL_UNICODE
+        return lre_is_id_start(c);
+#else
+        return !lre_is_space_non_ascii(c);
+#endif
+    }
+}
+
+static inline int lre_js_is_ident_next(uint32_t c) {
+    if (c < 128) {
+        return lre_is_id_continue_byte(c);
+    } else {
+        /* ZWNJ and ZWJ are accepted in identifiers */
+        if (c >= 0x200C && c <= 0x200D)
+            return TRUE;
+#ifdef CONFIG_ALL_UNICODE
+        return lre_is_id_continue(c);
+#else
+        return !lre_is_space_non_ascii(c);
+#endif
+    }
+}
+
+#endif /* LIBUNICODE_H */
diff --git a/src/shared/quickjs/list.h b/src/shared/quickjs/list.h
new file mode 100644
index 000000000..809831115
--- /dev/null
+++ b/src/shared/quickjs/list.h
@@ -0,0 +1,99 @@
+/*
+ * Linux klist like system
+ *
+ * Copyright (c) 2016-2017 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef LIST_H
+#define LIST_H
+
+#ifndef NULL
+#include <stddef.h>
+#endif
+
+struct list_head {
+    struct list_head *prev;
+    struct list_head *next;
+};
+
+#define LIST_HEAD_INIT(el) { &(el), &(el) }
+
+/* return the pointer of type 'type *' containing 'el' as field 'member' */
+#define list_entry(el, type, member) container_of(el, type, member)
+
+static inline void init_list_head(struct list_head *head)
+{
+    head->prev = head;
+    head->next = head;
+}
+
+/* insert 'el' between 'prev' and 'next' */
+static inline void __list_add(struct list_head *el,
+                              struct list_head *prev, struct list_head *next)
+{
+    prev->next = el;
+    el->prev = prev;
+    el->next = next;
+    next->prev = el;
+}
+
+/* add 'el' at the head of the list 'head' (= after element head) */
+static inline void list_add(struct list_head *el, struct list_head *head)
+{
+    __list_add(el, head, head->next);
+}
+
+/* add 'el' at the end of the list 'head' (= before element head) */
+static inline void list_add_tail(struct list_head *el, struct list_head *head)
+{
+    __list_add(el, head->prev, head);
+}
+
+static inline void list_del(struct list_head *el)
+{
+    struct list_head *prev, *next;
+    prev = el->prev;
+    next = el->next;
+    prev->next = next;
+    next->prev = prev;
+    el->prev = NULL; /* fail safe */
+    el->next = NULL; /* fail safe */
+}
+
+static inline int list_empty(struct list_head *el)
+{
+    return el->next == el;
+}
+
+#define list_for_each(el, head) \
+  for(el = (head)->next; el != (head); el = el->next)
+
+#define list_for_each_safe(el, el1, head)                \
+    for(el = (head)->next, el1 = el->next; el != (head); \
+        el = el1, el1 = el->next)
+
+#define list_for_each_prev(el, head) \
+  for(el = (head)->prev; el != (head); el = el->prev)
+
+#define list_for_each_prev_safe(el, el1, head)           \
+    for(el = (head)->prev, el1 = el->prev; el != (head); \
+        el = el1, el1 = el->prev)
+
+#endif /* LIST_H */
diff --git a/src/shared/quickjs/quickjs-atom.h b/src/shared/quickjs/quickjs-atom.h
new file mode 100644
index 000000000..f4d5838d4
--- /dev/null
+++ b/src/shared/quickjs/quickjs-atom.h
@@ -0,0 +1,273 @@
+/*
+ * QuickJS atom definitions
+ *
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ * Copyright (c) 2017-2018 Charlie Gordon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifdef DEF
+
+/* Note: first atoms are considered as keywords in the parser */
+DEF(null, "null") /* must be first */
+DEF(false, "false")
+DEF(true, "true")
+DEF(if, "if")
+DEF(else, "else")
+DEF(return, "return")
+DEF(var, "var")
+DEF(this, "this")
+DEF(delete, "delete")
+DEF(void, "void")
+DEF(typeof, "typeof")
+DEF(new, "new")
+DEF(in, "in")
+DEF(instanceof, "instanceof")
+DEF(do, "do")
+DEF(while, "while")
+DEF(for, "for")
+DEF(break, "break")
+DEF(continue, "continue")
+DEF(switch, "switch")
+DEF(case, "case")
+DEF(default, "default")
+DEF(throw, "throw")
+DEF(try, "try")
+DEF(catch, "catch")
+DEF(finally, "finally")
+DEF(function, "function")
+DEF(debugger, "debugger")
+DEF(with, "with")
+/* FutureReservedWord */
+DEF(class, "class")
+DEF(const, "const")
+DEF(enum, "enum")
+DEF(export, "export")
+DEF(extends, "extends")
+DEF(import, "import")
+DEF(super, "super")
+/* FutureReservedWords when parsing strict mode code */
+DEF(implements, "implements")
+DEF(interface, "interface")
+DEF(let, "let")
+DEF(package, "package")
+DEF(private, "private")
+DEF(protected, "protected")
+DEF(public, "public")
+DEF(static, "static")
+DEF(yield, "yield")
+DEF(await, "await")
+
+/* empty string */
+DEF(empty_string, "")
+/* identifiers */
+DEF(length, "length")
+DEF(fileName, "fileName")
+DEF(lineNumber, "lineNumber")
+DEF(message, "message")
+DEF(cause, "cause")
+DEF(errors, "errors")
+DEF(stack, "stack")
+DEF(name, "name")
+DEF(toString, "toString")
+DEF(toLocaleString, "toLocaleString")
+DEF(valueOf, "valueOf")
+DEF(eval, "eval")
+DEF(prototype, "prototype")
+DEF(constructor, "constructor")
+DEF(configurable, "configurable")
+DEF(writable, "writable")
+DEF(enumerable, "enumerable")
+DEF(value, "value")
+DEF(get, "get")
+DEF(set, "set")
+DEF(of, "of")
+DEF(__proto__, "__proto__")
+DEF(undefined, "undefined")
+DEF(number, "number")
+DEF(boolean, "boolean")
+DEF(string, "string")
+DEF(object, "object")
+DEF(symbol, "symbol")
+DEF(integer, "integer")
+DEF(unknown, "unknown")
+DEF(arguments, "arguments")
+DEF(callee, "callee")
+DEF(caller, "caller")
+DEF(_eval_, "<eval>")
+DEF(_ret_, "<ret>")
+DEF(_var_, "<var>")
+DEF(_arg_var_, "<arg_var>")
+DEF(_with_, "<with>")
+DEF(lastIndex, "lastIndex")
+DEF(target, "target")
+DEF(index, "index")
+DEF(input, "input")
+DEF(defineProperties, "defineProperties")
+DEF(apply, "apply")
+DEF(join, "join")
+DEF(concat, "concat")
+DEF(split, "split")
+DEF(construct, "construct")
+DEF(getPrototypeOf, "getPrototypeOf")
+DEF(setPrototypeOf, "setPrototypeOf")
+DEF(isExtensible, "isExtensible")
+DEF(preventExtensions, "preventExtensions")
+DEF(has, "has")
+DEF(deleteProperty, "deleteProperty")
+DEF(defineProperty, "defineProperty")
+DEF(getOwnPropertyDescriptor, "getOwnPropertyDescriptor")
+DEF(ownKeys, "ownKeys")
+DEF(add, "add")
+DEF(done, "done")
+DEF(next, "next")
+DEF(values, "values")
+DEF(source, "source")
+DEF(flags, "flags")
+DEF(global, "global")
+DEF(unicode, "unicode")
+DEF(raw, "raw")
+DEF(new_target, "new.target")
+DEF(this_active_func, "this.active_func")
+DEF(home_object, "<home_object>")
+DEF(computed_field, "<computed_field>")
+DEF(static_computed_field, "<static_computed_field>") /* must come after computed_fields */
+DEF(class_fields_init, "<class_fields_init>")
+DEF(brand, "<brand>")
+DEF(hash_constructor, "#constructor")
+DEF(as, "as")
+DEF(from, "from")
+DEF(meta, "meta")
+DEF(_default_, "*default*")
+DEF(_star_, "*")
+DEF(Module, "Module")
+DEF(then, "then")
+DEF(resolve, "resolve")
+DEF(reject, "reject")
+DEF(promise, "promise")
+DEF(proxy, "proxy")
+DEF(revoke, "revoke")
+DEF(async, "async")
+DEF(exec, "exec")
+DEF(groups, "groups")
+DEF(indices, "indices")
+DEF(status, "status")
+DEF(reason, "reason")
+DEF(globalThis, "globalThis")
+DEF(bigint, "bigint")
+#ifdef CONFIG_BIGNUM
+DEF(bigfloat, "bigfloat")
+DEF(bigdecimal, "bigdecimal")
+DEF(roundingMode, "roundingMode")
+DEF(maximumSignificantDigits, "maximumSignificantDigits")
+DEF(maximumFractionDigits, "maximumFractionDigits")
+#endif
+/* the following 3 atoms are only used with CONFIG_ATOMICS */
+DEF(not_equal, "not-equal")
+DEF(timed_out, "timed-out")
+DEF(ok, "ok")
+/* */
+DEF(toJSON, "toJSON")
+/* class names */
+DEF(Object, "Object")
+DEF(Array, "Array")
+DEF(Error, "Error")
+DEF(Number, "Number")
+DEF(String, "String")
+DEF(Boolean, "Boolean")
+DEF(Symbol, "Symbol")
+DEF(Arguments, "Arguments")
+DEF(Math, "Math")
+DEF(JSON, "JSON")
+DEF(Date, "Date")
+DEF(Function, "Function")
+DEF(GeneratorFunction, "GeneratorFunction")
+DEF(ForInIterator, "ForInIterator")
+DEF(RegExp, "RegExp")
+DEF(ArrayBuffer, "ArrayBuffer")
+DEF(SharedArrayBuffer, "SharedArrayBuffer")
+/* must keep same order as class IDs for typed arrays */
+DEF(Uint8ClampedArray, "Uint8ClampedArray")
+DEF(Int8Array, "Int8Array")
+DEF(Uint8Array, "Uint8Array")
+DEF(Int16Array, "Int16Array")
+DEF(Uint16Array, "Uint16Array")
+DEF(Int32Array, "Int32Array")
+DEF(Uint32Array, "Uint32Array")
+DEF(BigInt64Array, "BigInt64Array")
+DEF(BigUint64Array, "BigUint64Array")
+DEF(Float32Array, "Float32Array")
+DEF(Float64Array, "Float64Array")
+DEF(DataView, "DataView")
+DEF(BigInt, "BigInt")
+#ifdef CONFIG_BIGNUM
+DEF(BigFloat, "BigFloat")
+DEF(BigFloatEnv, "BigFloatEnv")
+DEF(BigDecimal, "BigDecimal")
+DEF(OperatorSet, "OperatorSet")
+DEF(Operators, "Operators")
+#endif
+DEF(Map, "Map")
+DEF(Set, "Set") /* Map + 1 */
+DEF(WeakMap, "WeakMap") /* Map + 2 */
+DEF(WeakSet, "WeakSet") /* Map + 3 */
+DEF(Map_Iterator, "Map Iterator")
+DEF(Set_Iterator, "Set Iterator")
+DEF(Array_Iterator, "Array Iterator")
+DEF(String_Iterator, "String Iterator")
+DEF(RegExp_String_Iterator, "RegExp String Iterator")
+DEF(Generator, "Generator")
+DEF(Proxy, "Proxy")
+DEF(Promise, "Promise")
+DEF(PromiseResolveFunction, "PromiseResolveFunction")
+DEF(PromiseRejectFunction, "PromiseRejectFunction")
+DEF(AsyncFunction, "AsyncFunction")
+DEF(AsyncFunctionResolve, "AsyncFunctionResolve")
+DEF(AsyncFunctionReject, "AsyncFunctionReject")
+DEF(AsyncGeneratorFunction, "AsyncGeneratorFunction")
+DEF(AsyncGenerator, "AsyncGenerator")
+DEF(EvalError, "EvalError")
+DEF(RangeError, "RangeError")
+DEF(ReferenceError, "ReferenceError")
+DEF(SyntaxError, "SyntaxError")
+DEF(TypeError, "TypeError")
+DEF(URIError, "URIError")
+DEF(InternalError, "InternalError")
+/* private symbols */
+DEF(Private_brand, "<brand>")
+/* symbols */
+DEF(Symbol_toPrimitive, "Symbol.toPrimitive")
+DEF(Symbol_iterator, "Symbol.iterator")
+DEF(Symbol_match, "Symbol.match")
+DEF(Symbol_matchAll, "Symbol.matchAll")
+DEF(Symbol_replace, "Symbol.replace")
+DEF(Symbol_search, "Symbol.search")
+DEF(Symbol_split, "Symbol.split")
+DEF(Symbol_toStringTag, "Symbol.toStringTag")
+DEF(Symbol_isConcatSpreadable, "Symbol.isConcatSpreadable")
+DEF(Symbol_hasInstance, "Symbol.hasInstance")
+DEF(Symbol_species, "Symbol.species")
+DEF(Symbol_unscopables, "Symbol.unscopables")
+DEF(Symbol_asyncIterator, "Symbol.asyncIterator")
+#ifdef CONFIG_BIGNUM
+DEF(Symbol_operatorSet, "Symbol.operatorSet")
+#endif
+
+#endif /* DEF */
diff --git a/src/shared/quickjs/quickjs-opcode.h b/src/shared/quickjs/quickjs-opcode.h
new file mode 100644
index 000000000..1e1821259
--- /dev/null
+++ b/src/shared/quickjs/quickjs-opcode.h
@@ -0,0 +1,372 @@
+/*
+ * QuickJS opcode definitions
+ *
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ * Copyright (c) 2017-2018 Charlie Gordon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifdef FMT
+FMT(none)
+FMT(none_int)
+FMT(none_loc)
+FMT(none_arg)
+FMT(none_var_ref)
+FMT(u8)
+FMT(i8)
+FMT(loc8)
+FMT(const8)
+FMT(label8)
+FMT(u16)
+FMT(i16)
+FMT(label16)
+FMT(npop)
+FMT(npopx)
+FMT(npop_u16)
+FMT(loc)
+FMT(arg)
+FMT(var_ref)
+FMT(u32)
+FMT(i32)
+FMT(const)
+FMT(label)
+FMT(atom)
+FMT(atom_u8)
+FMT(atom_u16)
+FMT(atom_label_u8)
+FMT(atom_label_u16)
+FMT(label_u16)
+#undef FMT
+#endif /* FMT */
+
+#ifdef DEF
+
+#ifndef def
+#define def(id, size, n_pop, n_push, f) DEF(id, size, n_pop, n_push, f)
+#endif
+
+DEF(invalid, 1, 0, 0, none) /* never emitted */
+
+/* push values */
+DEF(       push_i32, 5, 0, 1, i32)
+DEF(     push_const, 5, 0, 1, const)
+DEF(       fclosure, 5, 0, 1, const) /* must follow push_const */
+DEF(push_atom_value, 5, 0, 1, atom)
+DEF( private_symbol, 5, 0, 1, atom)
+DEF(      undefined, 1, 0, 1, none)
+DEF(           null, 1, 0, 1, none)
+DEF(      push_this, 1, 0, 1, none) /* only used at the start of a function */
+DEF(     push_false, 1, 0, 1, none)
+DEF(      push_true, 1, 0, 1, none)
+DEF(         object, 1, 0, 1, none)
+DEF( special_object, 2, 0, 1, u8) /* only used at the start of a function */
+DEF(           rest, 3, 0, 1, u16) /* only used at the start of a function */
+
+DEF(           drop, 1, 1, 0, none) /* a -> */
+DEF(            nip, 1, 2, 1, none) /* a b -> b */
+DEF(           nip1, 1, 3, 2, none) /* a b c -> b c */
+DEF(            dup, 1, 1, 2, none) /* a -> a a */
+DEF(           dup1, 1, 2, 3, none) /* a b -> a a b */
+DEF(           dup2, 1, 2, 4, none) /* a b -> a b a b */
+DEF(           dup3, 1, 3, 6, none) /* a b c -> a b c a b c */
+DEF(        insert2, 1, 2, 3, none) /* obj a -> a obj a (dup_x1) */
+DEF(        insert3, 1, 3, 4, none) /* obj prop a -> a obj prop a (dup_x2) */
+DEF(        insert4, 1, 4, 5, none) /* this obj prop a -> a this obj prop a */
+DEF(          perm3, 1, 3, 3, none) /* obj a b -> a obj b */
+DEF(          perm4, 1, 4, 4, none) /* obj prop a b -> a obj prop b */
+DEF(          perm5, 1, 5, 5, none) /* this obj prop a b -> a this obj prop b */
+DEF(           swap, 1, 2, 2, none) /* a b -> b a */
+DEF(          swap2, 1, 4, 4, none) /* a b c d -> c d a b */
+DEF(          rot3l, 1, 3, 3, none) /* x a b -> a b x */
+DEF(          rot3r, 1, 3, 3, none) /* a b x -> x a b */
+DEF(          rot4l, 1, 4, 4, none) /* x a b c -> a b c x */
+DEF(          rot5l, 1, 5, 5, none) /* x a b c d -> a b c d x */
+
+DEF(call_constructor, 3, 2, 1, npop) /* func new.target args -> ret. arguments are not counted in n_pop */
+DEF(           call, 3, 1, 1, npop) /* arguments are not counted in n_pop */
+DEF(      tail_call, 3, 1, 0, npop) /* arguments are not counted in n_pop */
+DEF(    call_method, 3, 2, 1, npop) /* arguments are not counted in n_pop */
+DEF(tail_call_method, 3, 2, 0, npop) /* arguments are not counted in n_pop */
+DEF(     array_from, 3, 0, 1, npop) /* arguments are not counted in n_pop */
+DEF(          apply, 3, 3, 1, u16)
+DEF(         return, 1, 1, 0, none)
+DEF(   return_undef, 1, 0, 0, none)
+DEF(check_ctor_return, 1, 1, 2, none)
+DEF(     check_ctor, 1, 0, 0, none)
+DEF(    check_brand, 1, 2, 2, none) /* this_obj func -> this_obj func */
+DEF(      add_brand, 1, 2, 0, none) /* this_obj home_obj -> */
+DEF(   return_async, 1, 1, 0, none)
+DEF(          throw, 1, 1, 0, none)
+DEF(    throw_error, 6, 0, 0, atom_u8)
+DEF(           eval, 5, 1, 1, npop_u16) /* func args... -> ret_val */
+DEF(     apply_eval, 3, 2, 1, u16) /* func array -> ret_eval */
+DEF(         regexp, 1, 2, 1, none) /* create a RegExp object from the pattern and a
+                                       bytecode string */
+DEF(      get_super, 1, 1, 1, none)
+DEF(         import, 1, 1, 1, none) /* dynamic module import */
+
+DEF(      check_var, 5, 0, 1, atom) /* check if a variable exists */
+DEF(  get_var_undef, 5, 0, 1, atom) /* push undefined if the variable does not exist */
+DEF(        get_var, 5, 0, 1, atom) /* throw an exception if the variable does not exist */
+DEF(        put_var, 5, 1, 0, atom) /* must come after get_var */
+DEF(   put_var_init, 5, 1, 0, atom) /* must come after put_var. Used to initialize a global lexical variable */
+DEF( put_var_strict, 5, 2, 0, atom) /* for strict mode variable write */
+
+DEF(  get_ref_value, 1, 2, 3, none)
+DEF(  put_ref_value, 1, 3, 0, none)
+
+DEF(     define_var, 6, 0, 0, atom_u8)
+DEF(check_define_var, 6, 0, 0, atom_u8)
+DEF(    define_func, 6, 1, 0, atom_u8)
+DEF(      get_field, 5, 1, 1, atom)
+DEF(     get_field2, 5, 1, 2, atom)
+DEF(      put_field, 5, 2, 0, atom)
+DEF( get_private_field, 1, 2, 1, none) /* obj prop -> value */
+DEF( put_private_field, 1, 3, 0, none) /* obj value prop -> */
+DEF(define_private_field, 1, 3, 1, none) /* obj prop value -> obj */
+DEF(   get_array_el, 1, 2, 1, none)
+DEF(  get_array_el2, 1, 2, 2, none) /* obj prop -> obj value */
+DEF(   put_array_el, 1, 3, 0, none)
+DEF(get_super_value, 1, 3, 1, none) /* this obj prop -> value */
+DEF(put_super_value, 1, 4, 0, none) /* this obj prop value -> */
+DEF(   define_field, 5, 2, 1, atom)
+DEF(       set_name, 5, 1, 1, atom)
+DEF(set_name_computed, 1, 2, 2, none)
+DEF(      set_proto, 1, 2, 1, none)
+DEF(set_home_object, 1, 2, 2, none)
+DEF(define_array_el, 1, 3, 2, none)
+DEF(         append, 1, 3, 2, none) /* append enumerated object, update length */
+DEF(copy_data_properties, 2, 3, 3, u8)
+DEF(  define_method, 6, 2, 1, atom_u8)
+DEF(define_method_computed, 2, 3, 1, u8) /* must come after define_method */
+DEF(   define_class, 6, 2, 2, atom_u8) /* parent ctor -> ctor proto */
+DEF(   define_class_computed, 6, 3, 3, atom_u8) /* field_name parent ctor -> field_name ctor proto (class with computed name) */
+
+DEF(        get_loc, 3, 0, 1, loc)
+DEF(        put_loc, 3, 1, 0, loc) /* must come after get_loc */
+DEF(        set_loc, 3, 1, 1, loc) /* must come after put_loc */
+DEF(        get_arg, 3, 0, 1, arg)
+DEF(        put_arg, 3, 1, 0, arg) /* must come after get_arg */
+DEF(        set_arg, 3, 1, 1, arg) /* must come after put_arg */
+DEF(    get_var_ref, 3, 0, 1, var_ref)
+DEF(    put_var_ref, 3, 1, 0, var_ref) /* must come after get_var_ref */
+DEF(    set_var_ref, 3, 1, 1, var_ref) /* must come after put_var_ref */
+DEF(set_loc_uninitialized, 3, 0, 0, loc)
+DEF(  get_loc_check, 3, 0, 1, loc)
+DEF(  put_loc_check, 3, 1, 0, loc) /* must come after get_loc_check */
+DEF(  put_loc_check_init, 3, 1, 0, loc)
+DEF(get_loc_checkthis, 3, 0, 1, loc)
+DEF(get_var_ref_check, 3, 0, 1, var_ref)
+DEF(put_var_ref_check, 3, 1, 0, var_ref) /* must come after get_var_ref_check */
+DEF(put_var_ref_check_init, 3, 1, 0, var_ref)
+DEF(      close_loc, 3, 0, 0, loc)
+DEF(       if_false, 5, 1, 0, label)
+DEF(        if_true, 5, 1, 0, label) /* must come after if_false */
+DEF(           goto, 5, 0, 0, label) /* must come after if_true */
+DEF(          catch, 5, 0, 1, label)
+DEF(          gosub, 5, 0, 0, label) /* used to execute the finally block */
+DEF(            ret, 1, 1, 0, none) /* used to return from the finally block */
+DEF(      nip_catch, 1, 2, 1, none) /* catch ... a -> a */
+
+DEF(      to_object, 1, 1, 1, none)
+//DEF(      to_string, 1, 1, 1, none)
+DEF(     to_propkey, 1, 1, 1, none)
+DEF(    to_propkey2, 1, 2, 2, none)
+
+DEF(   with_get_var, 10, 1, 0, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(   with_put_var, 10, 2, 1, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(with_delete_var, 10, 1, 0, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(  with_make_ref, 10, 1, 0, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(   with_get_ref, 10, 1, 0, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(with_get_ref_undef, 10, 1, 0, atom_label_u8)
+
+DEF(   make_loc_ref, 7, 0, 2, atom_u16)
+DEF(   make_arg_ref, 7, 0, 2, atom_u16)
+DEF(make_var_ref_ref, 7, 0, 2, atom_u16)
+DEF(   make_var_ref, 5, 0, 2, atom)
+
+DEF(   for_in_start, 1, 1, 1, none)
+DEF(   for_of_start, 1, 1, 3, none)
+DEF(for_await_of_start, 1, 1, 3, none)
+DEF(    for_in_next, 1, 1, 3, none)
+DEF(    for_of_next, 2, 3, 5, u8)
+DEF(iterator_check_object, 1, 1, 1, none)
+DEF(iterator_get_value_done, 1, 1, 2, none)
+DEF( iterator_close, 1, 3, 0, none)
+DEF(  iterator_next, 1, 4, 4, none)
+DEF(  iterator_call, 2, 4, 5, u8)
+DEF(  initial_yield, 1, 0, 0, none)
+DEF(          yield, 1, 1, 2, none)
+DEF(     yield_star, 1, 1, 2, none)
+DEF(async_yield_star, 1, 1, 2, none)
+DEF(          await, 1, 1, 1, none)
+
+/* arithmetic/logic operations */
+DEF(            neg, 1, 1, 1, none)
+DEF(           plus, 1, 1, 1, none)
+DEF(            dec, 1, 1, 1, none)
+DEF(            inc, 1, 1, 1, none)
+DEF(       post_dec, 1, 1, 2, none)
+DEF(       post_inc, 1, 1, 2, none)
+DEF(        dec_loc, 2, 0, 0, loc8)
+DEF(        inc_loc, 2, 0, 0, loc8)
+DEF(        add_loc, 2, 1, 0, loc8)
+DEF(            not, 1, 1, 1, none)
+DEF(           lnot, 1, 1, 1, none)
+DEF(         typeof, 1, 1, 1, none)
+DEF(         delete, 1, 2, 1, none)
+DEF(     delete_var, 5, 0, 1, atom)
+
+DEF(            mul, 1, 2, 1, none)
+DEF(            div, 1, 2, 1, none)
+DEF(            mod, 1, 2, 1, none)
+DEF(            add, 1, 2, 1, none)
+DEF(            sub, 1, 2, 1, none)
+DEF(            pow, 1, 2, 1, none)
+DEF(            shl, 1, 2, 1, none)
+DEF(            sar, 1, 2, 1, none)
+DEF(            shr, 1, 2, 1, none)
+DEF(             lt, 1, 2, 1, none)
+DEF(            lte, 1, 2, 1, none)
+DEF(             gt, 1, 2, 1, none)
+DEF(            gte, 1, 2, 1, none)
+DEF(     instanceof, 1, 2, 1, none)
+DEF(             in, 1, 2, 1, none)
+DEF(             eq, 1, 2, 1, none)
+DEF(            neq, 1, 2, 1, none)
+DEF(      strict_eq, 1, 2, 1, none)
+DEF(     strict_neq, 1, 2, 1, none)
+DEF(            and, 1, 2, 1, none)
+DEF(            xor, 1, 2, 1, none)
+DEF(             or, 1, 2, 1, none)
+DEF(is_undefined_or_null, 1, 1, 1, none)
+DEF(     private_in, 1, 2, 1, none)
+#ifdef CONFIG_BIGNUM
+DEF(      mul_pow10, 1, 2, 1, none)
+DEF(       math_mod, 1, 2, 1, none)
+#endif
+/* must be the last non short and non temporary opcode */
+DEF(            nop, 1, 0, 0, none)
+
+/* temporary opcodes: never emitted in the final bytecode */
+
+def(    enter_scope, 3, 0, 0, u16)  /* emitted in phase 1, removed in phase 2 */
+def(    leave_scope, 3, 0, 0, u16)  /* emitted in phase 1, removed in phase 2 */
+
+def(          label, 5, 0, 0, label) /* emitted in phase 1, removed in phase 3 */
+
+/* the following opcodes must be in the same order as the 'with_x' and
+   get_var_undef, get_var and put_var opcodes */
+def(scope_get_var_undef, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(  scope_get_var, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(  scope_put_var, 7, 1, 0, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(scope_delete_var, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def( scope_make_ref, 11, 0, 2, atom_label_u16) /* emitted in phase 1, removed in phase 2 */
+def(  scope_get_ref, 7, 0, 2, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(scope_put_var_init, 7, 0, 2, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(scope_get_var_checkthis, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2, only used to return 'this' in derived class constructors */
+def(scope_get_private_field, 7, 1, 1, atom_u16) /* obj -> value, emitted in phase 1, removed in phase 2 */
+def(scope_get_private_field2, 7, 1, 2, atom_u16) /* obj -> obj value, emitted in phase 1, removed in phase 2 */
+def(scope_put_private_field, 7, 2, 0, atom_u16) /* obj value ->, emitted in phase 1, removed in phase 2 */
+def(scope_in_private_field, 7, 1, 1, atom_u16) /* obj -> res emitted in phase 1, removed in phase 2 */
+def(get_field_opt_chain, 5, 1, 1, atom) /* emitted in phase 1, removed in phase 2 */
+def(get_array_el_opt_chain, 1, 2, 1, none) /* emitted in phase 1, removed in phase 2 */
+def( set_class_name, 5, 1, 1, u32) /* emitted in phase 1, removed in phase 2 */
+
+def(       line_num, 5, 0, 0, u32) /* emitted in phase 1, removed in phase 3 */
+
+#if SHORT_OPCODES
+DEF(    push_minus1, 1, 0, 1, none_int)
+DEF(         push_0, 1, 0, 1, none_int)
+DEF(         push_1, 1, 0, 1, none_int)
+DEF(         push_2, 1, 0, 1, none_int)
+DEF(         push_3, 1, 0, 1, none_int)
+DEF(         push_4, 1, 0, 1, none_int)
+DEF(         push_5, 1, 0, 1, none_int)
+DEF(         push_6, 1, 0, 1, none_int)
+DEF(         push_7, 1, 0, 1, none_int)
+DEF(        push_i8, 2, 0, 1, i8)
+DEF(       push_i16, 3, 0, 1, i16)
+DEF(    push_const8, 2, 0, 1, const8)
+DEF(      fclosure8, 2, 0, 1, const8) /* must follow push_const8 */
+DEF(push_empty_string, 1, 0, 1, none)
+
+DEF(       get_loc8, 2, 0, 1, loc8)
+DEF(       put_loc8, 2, 1, 0, loc8)
+DEF(       set_loc8, 2, 1, 1, loc8)
+
+DEF(       get_loc0, 1, 0, 1, none_loc)
+DEF(       get_loc1, 1, 0, 1, none_loc)
+DEF(       get_loc2, 1, 0, 1, none_loc)
+DEF(       get_loc3, 1, 0, 1, none_loc)
+DEF(       put_loc0, 1, 1, 0, none_loc)
+DEF(       put_loc1, 1, 1, 0, none_loc)
+DEF(       put_loc2, 1, 1, 0, none_loc)
+DEF(       put_loc3, 1, 1, 0, none_loc)
+DEF(       set_loc0, 1, 1, 1, none_loc)
+DEF(       set_loc1, 1, 1, 1, none_loc)
+DEF(       set_loc2, 1, 1, 1, none_loc)
+DEF(       set_loc3, 1, 1, 1, none_loc)
+DEF(       get_arg0, 1, 0, 1, none_arg)
+DEF(       get_arg1, 1, 0, 1, none_arg)
+DEF(       get_arg2, 1, 0, 1, none_arg)
+DEF(       get_arg3, 1, 0, 1, none_arg)
+DEF(       put_arg0, 1, 1, 0, none_arg)
+DEF(       put_arg1, 1, 1, 0, none_arg)
+DEF(       put_arg2, 1, 1, 0, none_arg)
+DEF(       put_arg3, 1, 1, 0, none_arg)
+DEF(       set_arg0, 1, 1, 1, none_arg)
+DEF(       set_arg1, 1, 1, 1, none_arg)
+DEF(       set_arg2, 1, 1, 1, none_arg)
+DEF(       set_arg3, 1, 1, 1, none_arg)
+DEF(   get_var_ref0, 1, 0, 1, none_var_ref)
+DEF(   get_var_ref1, 1, 0, 1, none_var_ref)
+DEF(   get_var_ref2, 1, 0, 1, none_var_ref)
+DEF(   get_var_ref3, 1, 0, 1, none_var_ref)
+DEF(   put_var_ref0, 1, 1, 0, none_var_ref)
+DEF(   put_var_ref1, 1, 1, 0, none_var_ref)
+DEF(   put_var_ref2, 1, 1, 0, none_var_ref)
+DEF(   put_var_ref3, 1, 1, 0, none_var_ref)
+DEF(   set_var_ref0, 1, 1, 1, none_var_ref)
+DEF(   set_var_ref1, 1, 1, 1, none_var_ref)
+DEF(   set_var_ref2, 1, 1, 1, none_var_ref)
+DEF(   set_var_ref3, 1, 1, 1, none_var_ref)
+
+DEF(     get_length, 1, 1, 1, none)
+
+DEF(      if_false8, 2, 1, 0, label8)
+DEF(       if_true8, 2, 1, 0, label8) /* must come after if_false8 */
+DEF(          goto8, 2, 0, 0, label8) /* must come after if_true8 */
+DEF(         goto16, 3, 0, 0, label16)
+
+DEF(          call0, 1, 1, 1, npopx)
+DEF(          call1, 1, 1, 1, npopx)
+DEF(          call2, 1, 1, 1, npopx)
+DEF(          call3, 1, 1, 1, npopx)
+
+DEF(   is_undefined, 1, 1, 1, none)
+DEF(        is_null, 1, 1, 1, none)
+DEF(typeof_is_undefined, 1, 1, 1, none)
+DEF( typeof_is_function, 1, 1, 1, none)
+#endif
+
+#undef DEF
+#undef def
+#endif  /* DEF */
diff --git a/src/shared/quickjs/quickjs.c b/src/shared/quickjs/quickjs.c
new file mode 100644
index 000000000..3bafe6948
--- /dev/null
+++ b/src/shared/quickjs/quickjs.c
@@ -0,0 +1,56267 @@
+/*
+ * QuickJS Javascript Engine
+ *
+ * Copyright (c) 2017-2021 Fabrice Bellard
+ * Copyright (c) 2017-2021 Charlie Gordon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <inttypes.h>
+#include <string.h>
+#include <assert.h>
+#ifndef _MSC_VER
+#include <sys/time.h>
+#endif
+#include <time.h>
+#include <fenv.h>
+#include <math.h>
+#if defined(__APPLE__)
+#include <malloc/malloc.h>
+#elif defined(__linux__)
+#include <malloc.h>
+#elif defined(__FreeBSD__)
+#include <malloc_np.h>
+#endif
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#include <windows.h>
+#endif
+
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \
+    || defined(__APPLE__)
+#include <xlocale.h>
+#else
+#include <locale.h>
+#endif
+
+#include "cutils.h"
+#include "list.h"
+#include "quickjs.h"
+#include "libregexp.h"
+#include "libunicode.h"
+#include "libbf.h"
+
+#define OPTIMIZE         0
+#define SHORT_OPCODES    1
+#if defined(EMSCRIPTEN) || defined(_MSC_VER)
+#define DIRECT_DISPATCH  0
+#else
+#define DIRECT_DISPATCH  1
+#endif
+
+#if defined(__APPLE__)
+#define MALLOC_OVERHEAD  0
+#else
+#define MALLOC_OVERHEAD  8
+#endif
+
+#if !defined(_WIN32)
+/* define it if printf uses the RNDN rounding mode instead of RNDNA */
+#define CONFIG_PRINTF_RNDN
+#endif
+
+/* define to include Atomics.* operations which depend on the OS
+   threads */
+#if !defined(EMSCRIPTEN) && !defined(_MSC_VER)
+#define CONFIG_ATOMICS
+#endif
+
+#if !defined(EMSCRIPTEN)
+/* enable stack limitation */
+#define CONFIG_STACK_CHECK
+#endif
+
+/* dump object free */
+//#define DUMP_FREE
+//#define DUMP_CLOSURE
+/* dump the bytecode of the compiled functions: combination of bits
+   1: dump pass 3 final byte code
+   2: dump pass 2 code
+   4: dump pass 1 code
+   8: dump stdlib functions
+  16: dump bytecode in hex
+  32: dump line number table
+  64: dump compute_stack_size
+ */
+//#define DUMP_BYTECODE  (1)
+/* dump the occurence of the automatic GC */
+//#define DUMP_GC
+/* dump objects freed by the garbage collector */
+//#define DUMP_GC_FREE
+/* dump objects leaking when freeing the runtime */
+//#define DUMP_LEAKS  1
+/* dump memory usage before running the garbage collector */
+//#define DUMP_MEM
+//#define DUMP_OBJECTS    /* dump objects in JS_FreeContext */
+//#define DUMP_ATOMS      /* dump atoms in JS_FreeContext */
+//#define DUMP_SHAPES     /* dump shapes in JS_FreeContext */
+//#define DUMP_MODULE_RESOLVE
+//#define DUMP_PROMISE
+//#define DUMP_READ_OBJECT
+
+/* test the GC by forcing it before each object allocation */
+//#define FORCE_GC_AT_MALLOC
+
+#ifdef CONFIG_ATOMICS
+#include <pthread.h>
+#include <stdatomic.h>
+#include <errno.h>
+#endif
+
+static double safe_strtod(const char *restrict nptr, char **restrict endptr)
+{
+#if defined(_MSC_VER) || defined(__MINGW32__)
+    _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+    setlocale(LC_NUMERIC, "C");
+#else
+    const locale_t tempLoc = newlocale(LC_NUMERIC_MASK, "C", 0);
+    uselocale(tempLoc);
+#endif
+    double d = strtod(nptr, endptr);
+#if defined(_MSC_VER) || defined(__MINGW32__)
+    _configthreadlocale(_DISABLE_PER_THREAD_LOCALE);
+#else
+    uselocale(LC_GLOBAL_LOCALE);
+    freelocale(tempLoc);
+#endif
+    return d;
+}
+
+enum {
+    /* classid tag        */    /* union usage   | properties */
+    JS_CLASS_OBJECT = 1,        /* must be first */
+    JS_CLASS_ARRAY,             /* u.array       | length */
+    JS_CLASS_ERROR,
+    JS_CLASS_NUMBER,            /* u.object_data */
+    JS_CLASS_STRING,            /* u.object_data */
+    JS_CLASS_BOOLEAN,           /* u.object_data */
+    JS_CLASS_SYMBOL,            /* u.object_data */
+    JS_CLASS_ARGUMENTS,         /* u.array       | length */
+    JS_CLASS_MAPPED_ARGUMENTS,  /*               | length */
+    JS_CLASS_DATE,              /* u.object_data */
+    JS_CLASS_MODULE_NS,
+    JS_CLASS_C_FUNCTION,        /* u.cfunc */
+    JS_CLASS_BYTECODE_FUNCTION, /* u.func */
+    JS_CLASS_BOUND_FUNCTION,    /* u.bound_function */
+    JS_CLASS_C_FUNCTION_DATA,   /* u.c_function_data_record */
+    JS_CLASS_GENERATOR_FUNCTION, /* u.func */
+    JS_CLASS_FOR_IN_ITERATOR,   /* u.for_in_iterator */
+    JS_CLASS_REGEXP,            /* u.regexp */
+    JS_CLASS_ARRAY_BUFFER,      /* u.array_buffer */
+    JS_CLASS_SHARED_ARRAY_BUFFER, /* u.array_buffer */
+    JS_CLASS_UINT8C_ARRAY,      /* u.array (typed_array) */
+    JS_CLASS_INT8_ARRAY,        /* u.array (typed_array) */
+    JS_CLASS_UINT8_ARRAY,       /* u.array (typed_array) */
+    JS_CLASS_INT16_ARRAY,       /* u.array (typed_array) */
+    JS_CLASS_UINT16_ARRAY,      /* u.array (typed_array) */
+    JS_CLASS_INT32_ARRAY,       /* u.array (typed_array) */
+    JS_CLASS_UINT32_ARRAY,      /* u.array (typed_array) */
+    JS_CLASS_BIG_INT64_ARRAY,   /* u.array (typed_array) */
+    JS_CLASS_BIG_UINT64_ARRAY,  /* u.array (typed_array) */
+    JS_CLASS_FLOAT32_ARRAY,     /* u.array (typed_array) */
+    JS_CLASS_FLOAT64_ARRAY,     /* u.array (typed_array) */
+    JS_CLASS_DATAVIEW,          /* u.typed_array */
+    JS_CLASS_BIG_INT,           /* u.object_data */
+#ifdef CONFIG_BIGNUM
+    JS_CLASS_BIG_FLOAT,         /* u.object_data */
+    JS_CLASS_FLOAT_ENV,         /* u.float_env */
+    JS_CLASS_BIG_DECIMAL,       /* u.object_data */
+    JS_CLASS_OPERATOR_SET,      /* u.operator_set */
+#endif
+    JS_CLASS_MAP,               /* u.map_state */
+    JS_CLASS_SET,               /* u.map_state */
+    JS_CLASS_WEAKMAP,           /* u.map_state */
+    JS_CLASS_WEAKSET,           /* u.map_state */
+    JS_CLASS_MAP_ITERATOR,      /* u.map_iterator_data */
+    JS_CLASS_SET_ITERATOR,      /* u.map_iterator_data */
+    JS_CLASS_ARRAY_ITERATOR,    /* u.array_iterator_data */
+    JS_CLASS_STRING_ITERATOR,   /* u.array_iterator_data */
+    JS_CLASS_REGEXP_STRING_ITERATOR,   /* u.regexp_string_iterator_data */
+    JS_CLASS_GENERATOR,         /* u.generator_data */
+    JS_CLASS_PROXY,             /* u.proxy_data */
+    JS_CLASS_PROMISE,           /* u.promise_data */
+    JS_CLASS_PROMISE_RESOLVE_FUNCTION,  /* u.promise_function_data */
+    JS_CLASS_PROMISE_REJECT_FUNCTION,   /* u.promise_function_data */
+    JS_CLASS_ASYNC_FUNCTION,            /* u.func */
+    JS_CLASS_ASYNC_FUNCTION_RESOLVE,    /* u.async_function_data */
+    JS_CLASS_ASYNC_FUNCTION_REJECT,     /* u.async_function_data */
+    JS_CLASS_ASYNC_FROM_SYNC_ITERATOR,  /* u.async_from_sync_iterator_data */
+    JS_CLASS_ASYNC_GENERATOR_FUNCTION,  /* u.func */
+    JS_CLASS_ASYNC_GENERATOR,   /* u.async_generator_data */
+
+    JS_CLASS_INIT_COUNT, /* last entry for predefined classes */
+};
+
+/* number of typed array types */
+#define JS_TYPED_ARRAY_COUNT  (JS_CLASS_FLOAT64_ARRAY - JS_CLASS_UINT8C_ARRAY + 1)
+static uint8_t const typed_array_size_log2[JS_TYPED_ARRAY_COUNT];
+#define typed_array_size_log2(classid)  (typed_array_size_log2[(classid)- JS_CLASS_UINT8C_ARRAY])
+
+typedef enum JSErrorEnum {
+    JS_EVAL_ERROR,
+    JS_RANGE_ERROR,
+    JS_REFERENCE_ERROR,
+    JS_SYNTAX_ERROR,
+    JS_TYPE_ERROR,
+    JS_URI_ERROR,
+    JS_INTERNAL_ERROR,
+    JS_AGGREGATE_ERROR,
+
+    JS_NATIVE_ERROR_COUNT, /* number of different NativeError objects */
+} JSErrorEnum;
+
+#define JS_MAX_LOCAL_VARS 65535
+#define JS_STACK_SIZE_MAX 65534
+#define JS_STRING_LEN_MAX ((1 << 30) - 1)
+
+#ifdef __GNUC__
+#define __exception __attribute__((warn_unused_result))
+#else
+#define __exception
+#endif
+
+typedef struct JSShape JSShape;
+typedef struct JSString JSString;
+typedef struct JSString JSAtomStruct;
+
+typedef enum {
+    JS_GC_PHASE_NONE,
+    JS_GC_PHASE_DECREF,
+    JS_GC_PHASE_REMOVE_CYCLES,
+} JSGCPhaseEnum;
+
+typedef enum OPCodeEnum OPCodeEnum;
+
+/* function pointers are used for numeric operations so that it is
+   possible to remove some numeric types */
+typedef struct {
+    JSValue (*to_string)(JSContext *ctx, JSValueConst val);
+    JSValue (*from_string)(JSContext *ctx, const char *buf,
+                           int radix, int flags, slimb_t *pexponent);
+    int (*unary_arith)(JSContext *ctx,
+                       JSValue *pres, OPCodeEnum op, JSValue op1);
+    int (*binary_arith)(JSContext *ctx, OPCodeEnum op,
+                        JSValue *pres, JSValue op1, JSValue op2);
+    int (*compare)(JSContext *ctx, OPCodeEnum op,
+                   JSValue op1, JSValue op2);
+    /* only for bigfloat: */
+    JSValue (*mul_pow10_to_float64)(JSContext *ctx, const bf_t *a,
+                                    int64_t exponent);
+    int (*mul_pow10)(JSContext *ctx, JSValue *sp);
+} JSNumericOperations;
+
+struct JSRuntime {
+    JSMallocFunctions mf;
+    JSMallocState malloc_state;
+    const char *rt_info;
+
+    int atom_hash_size; /* power of two */
+    int atom_count;
+    int atom_size;
+    int atom_count_resize; /* resize hash table at this count */
+    uint32_t *atom_hash;
+    JSAtomStruct **atom_array;
+    int atom_free_index; /* 0 = none */
+
+    int class_count;    /* size of class_array */
+    JSClass *class_array;
+
+    struct list_head context_list; /* list of JSContext.link */
+    /* list of JSGCObjectHeader.link. List of allocated GC objects (used
+       by the garbage collector) */
+    struct list_head gc_obj_list;
+    /* list of JSGCObjectHeader.link. Used during JS_FreeValueRT() */
+    struct list_head gc_zero_ref_count_list;
+    struct list_head tmp_obj_list; /* used during GC */
+    JSGCPhaseEnum gc_phase : 8;
+    size_t malloc_gc_threshold;
+#ifdef DUMP_LEAKS
+    struct list_head string_list; /* list of JSString.link */
+#endif
+    /* stack limitation */
+    uintptr_t stack_size; /* in bytes, 0 if no limit */
+    uintptr_t stack_top;
+    uintptr_t stack_limit; /* lower stack limit */
+
+    JSValue current_exception;
+    /* true if inside an out of memory error, to avoid recursing */
+    BOOL in_out_of_memory : 8;
+
+    struct JSStackFrame *current_stack_frame;
+
+    JSInterruptHandler *interrupt_handler;
+    void *interrupt_opaque;
+
+    JSHostPromiseRejectionTracker *host_promise_rejection_tracker;
+    void *host_promise_rejection_tracker_opaque;
+
+    struct list_head job_list; /* list of JSJobEntry.link */
+
+    JSModuleNormalizeFunc *module_normalize_func;
+    JSModuleLoaderFunc *module_loader_func;
+    void *module_loader_opaque;
+    /* timestamp for internal use in module evaluation */
+    int64_t module_async_evaluation_next_timestamp;
+
+    BOOL can_block : 8; /* TRUE if Atomics.wait can block */
+    /* used to allocate, free and clone SharedArrayBuffers */
+    JSSharedArrayBufferFunctions sab_funcs;
+
+    /* Shape hash table */
+    int shape_hash_bits;
+    int shape_hash_size;
+    int shape_hash_count; /* number of hashed shapes */
+    JSShape **shape_hash;
+    bf_context_t bf_ctx;
+    JSNumericOperations bigint_ops;
+#ifdef CONFIG_BIGNUM
+    JSNumericOperations bigfloat_ops;
+    JSNumericOperations bigdecimal_ops;
+    uint32_t operator_count;
+#endif
+    void *user_opaque;
+};
+
+struct JSClass {
+    uint32_t class_id; /* 0 means free entry */
+    JSAtom class_name;
+    JSClassFinalizer *finalizer;
+    JSClassGCMark *gc_mark;
+    JSClassCall *call;
+    /* pointers for exotic behavior, can be NULL if none are present */
+    const JSClassExoticMethods *exotic;
+};
+
+#define JS_MODE_STRICT (1 << 0)
+#define JS_MODE_STRIP  (1 << 1)
+#define JS_MODE_MATH   (1 << 2)
+#define JS_MODE_ASYNC  (1 << 3) /* async function */
+
+typedef struct JSStackFrame {
+    struct JSStackFrame *prev_frame; /* NULL if first stack frame */
+    JSValue cur_func; /* current function, JS_UNDEFINED if the frame is detached */
+    JSValue *arg_buf; /* arguments */
+    JSValue *var_buf; /* variables */
+    struct list_head var_ref_list; /* list of JSVarRef.var_ref_link */
+    const uint8_t *cur_pc; /* only used in bytecode functions : PC of the
+                        instruction after the call */
+    int arg_count;
+    int js_mode; /* for C functions, only JS_MODE_MATH may be set */
+    /* only used in generators. Current stack pointer value. NULL if
+       the function is running. */
+    JSValue *cur_sp;
+} JSStackFrame;
+
+typedef enum {
+    JS_GC_OBJ_TYPE_JS_OBJECT,
+    JS_GC_OBJ_TYPE_FUNCTION_BYTECODE,
+    JS_GC_OBJ_TYPE_SHAPE,
+    JS_GC_OBJ_TYPE_VAR_REF,
+    JS_GC_OBJ_TYPE_ASYNC_FUNCTION,
+    JS_GC_OBJ_TYPE_JS_CONTEXT,
+} JSGCObjectTypeEnum;
+
+/* header for GC objects. GC objects are C data structures with a
+   reference count that can reference other GC objects. JS Objects are
+   a particular type of GC object. */
+struct JSGCObjectHeader {
+    int ref_count; /* must come first, 32-bit */
+    JSGCObjectTypeEnum gc_obj_type : 4;
+    uint8_t mark : 4; /* used by the GC */
+    uint8_t dummy1; /* not used by the GC */
+    uint16_t dummy2; /* not used by the GC */
+    struct list_head link;
+};
+
+typedef struct JSVarRef {
+    union {
+        JSGCObjectHeader header; /* must come first */
+        struct {
+            int __gc_ref_count; /* corresponds to header.ref_count */
+            uint8_t __gc_mark; /* corresponds to header.mark/gc_obj_type */
+            uint8_t is_detached : 1;
+            uint8_t is_arg : 1;
+            uint16_t var_idx; /* index of the corresponding function variable on
+                                 the stack */
+        };
+    };
+    JSValue *pvalue; /* pointer to the value, either on the stack or
+                        to 'value' */
+    union {
+        JSValue value; /* used when is_detached = TRUE */
+        struct {
+            struct list_head var_ref_link; /* JSStackFrame.var_ref_list list */
+            struct JSAsyncFunctionState *async_func; /* != NULL if async stack frame */
+        }; /* used when is_detached = FALSE */
+    };
+} JSVarRef;
+
+/* the same structure is used for big integers and big floats. Big
+   integers are never infinite or NaNs */
+typedef struct JSBigFloat {
+    JSRefCountHeader header; /* must come first, 32-bit */
+    bf_t num;
+} JSBigFloat;
+
+#ifdef CONFIG_BIGNUM
+typedef struct JSFloatEnv {
+    limb_t prec;
+    bf_flags_t flags;
+    unsigned int status;
+} JSFloatEnv;
+
+typedef struct JSBigDecimal {
+    JSRefCountHeader header; /* must come first, 32-bit */
+    bfdec_t num;
+} JSBigDecimal;
+#endif
+
+typedef enum {
+    JS_AUTOINIT_ID_PROTOTYPE,
+    JS_AUTOINIT_ID_MODULE_NS,
+    JS_AUTOINIT_ID_PROP,
+} JSAutoInitIDEnum;
+
+/* must be large enough to have a negligible runtime cost and small
+   enough to call the interrupt callback often. */
+#define JS_INTERRUPT_COUNTER_INIT 10000
+
+struct JSContext {
+    JSGCObjectHeader header; /* must come first */
+    JSRuntime *rt;
+    struct list_head link;
+
+    uint16_t binary_object_count;
+    int binary_object_size;
+
+    JSShape *array_shape;   /* initial shape for Array objects */
+
+    JSValue *class_proto;
+    JSValue function_proto;
+    JSValue function_ctor;
+    JSValue array_ctor;
+    JSValue regexp_ctor;
+    JSValue promise_ctor;
+    JSValue native_error_proto[JS_NATIVE_ERROR_COUNT];
+    JSValue iterator_proto;
+    JSValue async_iterator_proto;
+    JSValue array_proto_values;
+    JSValue throw_type_error;
+    JSValue eval_obj;
+
+    JSValue global_obj; /* global object */
+    JSValue global_var_obj; /* contains the global let/const definitions */
+
+    uint64_t random_state;
+    bf_context_t *bf_ctx;   /* points to rt->bf_ctx, shared by all contexts */
+#ifdef CONFIG_BIGNUM
+    JSFloatEnv fp_env; /* global FP environment */
+    BOOL bignum_ext : 8; /* enable math mode */
+    BOOL allow_operator_overloading : 8;
+#endif
+    /* when the counter reaches zero, JSRutime.interrupt_handler is called */
+    int interrupt_counter;
+
+    struct list_head loaded_modules; /* list of JSModuleDef.link */
+
+    /* if NULL, RegExp compilation is not supported */
+    JSValue (*compile_regexp)(JSContext *ctx, JSValueConst pattern,
+                              JSValueConst flags);
+    /* if NULL, eval is not supported */
+    JSValue (*eval_internal)(JSContext *ctx, JSValueConst this_obj,
+                             const char *input, size_t input_len,
+                             const char *filename, int line, int flags, int scope_idx);
+    void *user_opaque;
+    ScopeLookup *scopeLookup;
+    FoundUndefinedHandler *handleUndefined;
+    FunctionEnteredHandler *handleFunctionEntered;
+    FunctionExitedHandler *handleFunctionExited;
+};
+
+typedef union JSFloat64Union {
+    double d;
+    uint64_t u64;
+    uint32_t u32[2];
+} JSFloat64Union;
+
+enum {
+    JS_ATOM_TYPE_STRING = 1,
+    JS_ATOM_TYPE_GLOBAL_SYMBOL,
+    JS_ATOM_TYPE_SYMBOL,
+    JS_ATOM_TYPE_PRIVATE,
+};
+
+enum {
+    JS_ATOM_HASH_SYMBOL,
+    JS_ATOM_HASH_PRIVATE,
+};
+
+typedef enum {
+    JS_ATOM_KIND_STRING,
+    JS_ATOM_KIND_SYMBOL,
+    JS_ATOM_KIND_PRIVATE,
+} JSAtomKindEnum;
+
+#define JS_ATOM_HASH_MASK  ((1 << 30) - 1)
+
+struct JSString {
+    JSRefCountHeader header; /* must come first, 32-bit */
+    uint32_t len : 31;
+    uint8_t is_wide_char : 1; /* 0 = 8 bits, 1 = 16 bits characters */
+    /* for JS_ATOM_TYPE_SYMBOL: hash = 0, atom_type = 3,
+       for JS_ATOM_TYPE_PRIVATE: hash = 1, atom_type = 3
+       XXX: could change encoding to have one more bit in hash */
+    uint32_t hash : 30;
+    uint8_t atom_type : 2; /* != 0 if atom, JS_ATOM_TYPE_x */
+    uint32_t hash_next; /* atom_index for JS_ATOM_TYPE_SYMBOL */
+#ifdef DUMP_LEAKS
+    struct list_head link; /* string list */
+#endif
+    union {
+        uint8_t str8[0]; /* 8 bit strings will get an extra null terminator */
+        uint16_t str16[0];
+    } u;
+};
+
+typedef struct JSClosureVar {
+    uint8_t is_local : 1;
+    uint8_t is_arg : 1;
+    uint8_t is_const : 1;
+    uint8_t is_lexical : 1;
+    uint8_t var_kind : 4; /* see JSVarKindEnum */
+    /* 8 bits available */
+    uint16_t var_idx; /* is_local = TRUE: index to a normal variable of the
+                    parent function. otherwise: index to a closure
+                    variable of the parent function */
+    JSAtom var_name;
+} JSClosureVar;
+
+#define ARG_SCOPE_INDEX 1
+#define ARG_SCOPE_END (-2)
+
+typedef struct JSVarScope {
+    int parent;  /* index into fd->scopes of the enclosing scope */
+    int first;   /* index into fd->vars of the last variable in this scope */
+} JSVarScope;
+
+typedef enum {
+    /* XXX: add more variable kinds here instead of using bit fields */
+    JS_VAR_NORMAL,
+    JS_VAR_FUNCTION_DECL, /* lexical var with function declaration */
+    JS_VAR_NEW_FUNCTION_DECL, /* lexical var with async/generator
+                                 function declaration */
+    JS_VAR_CATCH,
+    JS_VAR_FUNCTION_NAME, /* function expression name */
+    JS_VAR_PRIVATE_FIELD,
+    JS_VAR_PRIVATE_METHOD,
+    JS_VAR_PRIVATE_GETTER,
+    JS_VAR_PRIVATE_SETTER, /* must come after JS_VAR_PRIVATE_GETTER */
+    JS_VAR_PRIVATE_GETTER_SETTER, /* must come after JS_VAR_PRIVATE_SETTER */
+} JSVarKindEnum;
+
+/* XXX: could use a different structure in bytecode functions to save
+   memory */
+typedef struct JSVarDef {
+    JSAtom var_name;
+    /* index into fd->scopes of this variable lexical scope */
+    int scope_level;
+    /* during compilation:
+        - if scope_level = 0: scope in which the variable is defined
+        - if scope_level != 0: index into fd->vars of the next
+          variable in the same or enclosing lexical scope
+       in a bytecode function:
+       index into fd->vars of the next
+       variable in the same or enclosing lexical scope
+    */
+    int scope_next;
+    uint8_t is_const : 1;
+    uint8_t is_lexical : 1;
+    uint8_t is_captured : 1;
+    uint8_t is_static_private : 1; /* only used during private class field parsing */
+    uint8_t var_kind : 4; /* see JSVarKindEnum */
+    /* only used during compilation: function pool index for lexical
+       variables with var_kind =
+       JS_VAR_FUNCTION_DECL/JS_VAR_NEW_FUNCTION_DECL or scope level of
+       the definition of the 'var' variables (they have scope_level =
+       0) */
+    int func_pool_idx : 24; /* only used during compilation : index in
+                               the constant pool for hoisted function
+                               definition */
+} JSVarDef;
+
+/* for the encoding of the pc2line table */
+#define PC2LINE_BASE     (-1)
+#define PC2LINE_RANGE    5
+#define PC2LINE_OP_FIRST 1
+#define PC2LINE_DIFF_PC_MAX ((255 - PC2LINE_OP_FIRST) / PC2LINE_RANGE)
+
+typedef enum JSFunctionKindEnum {
+    JS_FUNC_NORMAL = 0,
+    JS_FUNC_GENERATOR = (1 << 0),
+    JS_FUNC_ASYNC = (1 << 1),
+    JS_FUNC_ASYNC_GENERATOR = (JS_FUNC_GENERATOR | JS_FUNC_ASYNC),
+} JSFunctionKindEnum;
+
+typedef struct JSFunctionBytecode {
+    JSGCObjectHeader header; /* must come first */
+    uint8_t js_mode;
+    uint8_t has_prototype : 1; /* true if a prototype field is necessary */
+    uint8_t has_simple_parameter_list : 1;
+    uint8_t is_derived_class_constructor : 1;
+    /* true if home_object needs to be initialized */
+    uint8_t need_home_object : 1;
+    uint8_t func_kind : 2;
+    uint8_t new_target_allowed : 1;
+    uint8_t super_call_allowed : 1;
+    uint8_t super_allowed : 1;
+    uint8_t arguments_allowed : 1;
+    uint8_t has_debug : 1;
+    uint8_t backtrace_barrier : 1; /* stop backtrace on this function */
+    uint8_t read_only_bytecode : 1;
+    uint8_t is_direct_or_indirect_eval : 1; /* used by JS_GetScriptOrModuleName() */
+    /* XXX: 10 bits available */
+    uint8_t *byte_code_buf; /* (self pointer) */
+    int byte_code_len;
+    JSAtom func_name;
+    JSVarDef *vardefs; /* arguments + local variables (arg_count + var_count) (self pointer) */
+    JSClosureVar *closure_var; /* list of variables in the closure (self pointer) */
+    uint16_t arg_count;
+    uint16_t var_count;
+    uint16_t defined_arg_count; /* for length function property */
+    uint16_t stack_size; /* maximum stack size */
+    JSContext *realm; /* function realm */
+    JSValue *cpool; /* constant pool (self pointer) */
+    int cpool_count;
+    int closure_var_count;
+    struct {
+        /* debug info, move to separate structure to save memory? */
+        JSAtom filename;
+        int line_num;
+        int source_len;
+        int pc2line_len;
+        uint8_t *pc2line_buf;
+        char *source;
+    } debug;
+} JSFunctionBytecode;
+
+typedef struct JSBoundFunction {
+    JSValue func_obj;
+    JSValue this_val;
+    int argc;
+    JSValue argv[0];
+} JSBoundFunction;
+
+typedef enum JSIteratorKindEnum {
+    JS_ITERATOR_KIND_KEY,
+    JS_ITERATOR_KIND_VALUE,
+    JS_ITERATOR_KIND_KEY_AND_VALUE,
+} JSIteratorKindEnum;
+
+typedef struct JSForInIterator {
+    JSValue obj;
+    uint32_t idx;
+    uint32_t atom_count;
+    uint8_t in_prototype_chain;
+    uint8_t is_array;
+    JSPropertyEnum *tab_atom; /* is_array = FALSE */
+} JSForInIterator;
+
+typedef struct JSRegExp {
+    JSString *pattern;
+    JSString *bytecode; /* also contains the flags */
+} JSRegExp;
+
+typedef struct JSProxyData {
+    JSValue target;
+    JSValue handler;
+    uint8_t is_func;
+    uint8_t is_revoked;
+} JSProxyData;
+
+typedef struct JSArrayBuffer {
+    int byte_length; /* 0 if detached */
+    uint8_t detached;
+    uint8_t shared; /* if shared, the array buffer cannot be detached */
+    uint8_t *data; /* NULL if detached */
+    struct list_head array_list;
+    void *opaque;
+    JSFreeArrayBufferDataFunc *free_func;
+} JSArrayBuffer;
+
+typedef struct JSTypedArray {
+    struct list_head link; /* link to arraybuffer */
+    JSObject *obj; /* back pointer to the TypedArray/DataView object */
+    JSObject *buffer; /* based array buffer */
+    uint32_t offset; /* offset in the array buffer */
+    uint32_t length; /* length in the array buffer */
+} JSTypedArray;
+
+typedef struct JSAsyncFunctionState {
+    JSGCObjectHeader header;
+    JSValue this_val; /* 'this' argument */
+    int argc; /* number of function arguments */
+    BOOL throw_flag; /* used to throw an exception in JS_CallInternal() */
+    BOOL is_completed; /* TRUE if the function has returned. The stack
+                          frame is no longer valid */
+    JSValue resolving_funcs[2]; /* only used in JS async functions */
+    JSStackFrame frame;
+} JSAsyncFunctionState;
+
+typedef enum {
+   /* binary operators */
+   JS_OVOP_ADD,
+   JS_OVOP_SUB,
+   JS_OVOP_MUL,
+   JS_OVOP_DIV,
+   JS_OVOP_MOD,
+   JS_OVOP_POW,
+   JS_OVOP_OR,
+   JS_OVOP_AND,
+   JS_OVOP_XOR,
+   JS_OVOP_SHL,
+   JS_OVOP_SAR,
+   JS_OVOP_SHR,
+   JS_OVOP_EQ,
+   JS_OVOP_LESS,
+
+   JS_OVOP_BINARY_COUNT,
+   /* unary operators */
+   JS_OVOP_POS = JS_OVOP_BINARY_COUNT,
+   JS_OVOP_NEG,
+   JS_OVOP_INC,
+   JS_OVOP_DEC,
+   JS_OVOP_NOT,
+
+   JS_OVOP_COUNT,
+} JSOverloadableOperatorEnum;
+
+typedef struct {
+    uint32_t operator_index;
+    JSObject *ops[JS_OVOP_BINARY_COUNT]; /* self operators */
+} JSBinaryOperatorDefEntry;
+
+typedef struct {
+    int count;
+    JSBinaryOperatorDefEntry *tab;
+} JSBinaryOperatorDef;
+
+typedef struct {
+    uint32_t operator_counter;
+    BOOL is_primitive; /* OperatorSet for a primitive type */
+    /* NULL if no operator is defined */
+    JSObject *self_ops[JS_OVOP_COUNT]; /* self operators */
+    JSBinaryOperatorDef left;
+    JSBinaryOperatorDef right;
+} JSOperatorSetData;
+
+typedef struct JSReqModuleEntry {
+    JSAtom module_name;
+    JSModuleDef *module; /* used using resolution */
+} JSReqModuleEntry;
+
+typedef enum JSExportTypeEnum {
+    JS_EXPORT_TYPE_LOCAL,
+    JS_EXPORT_TYPE_INDIRECT,
+} JSExportTypeEnum;
+
+typedef struct JSExportEntry {
+    union {
+        struct {
+            int var_idx; /* closure variable index */
+            JSVarRef *var_ref; /* if != NULL, reference to the variable */
+        } local; /* for local export */
+        int req_module_idx; /* module for indirect export */
+    } u;
+    JSExportTypeEnum export_type;
+    JSAtom local_name; /* '*' if export ns from. not used for local
+                          export after compilation */
+    JSAtom export_name; /* exported variable name */
+} JSExportEntry;
+
+typedef struct JSStarExportEntry {
+    int req_module_idx; /* in req_module_entries */
+} JSStarExportEntry;
+
+typedef struct JSImportEntry {
+    int var_idx; /* closure variable index */
+    JSAtom import_name;
+    int req_module_idx; /* in req_module_entries */
+} JSImportEntry;
+
+typedef enum {
+    JS_MODULE_STATUS_UNLINKED,
+    JS_MODULE_STATUS_LINKING,
+    JS_MODULE_STATUS_LINKED,
+    JS_MODULE_STATUS_EVALUATING,
+    JS_MODULE_STATUS_EVALUATING_ASYNC,
+    JS_MODULE_STATUS_EVALUATED,
+} JSModuleStatus;
+
+struct JSModuleDef {
+    JSRefCountHeader header; /* must come first, 32-bit */
+    JSAtom module_name;
+    struct list_head link;
+
+    JSReqModuleEntry *req_module_entries;
+    int req_module_entries_count;
+    int req_module_entries_size;
+
+    JSExportEntry *export_entries;
+    int export_entries_count;
+    int export_entries_size;
+
+    JSStarExportEntry *star_export_entries;
+    int star_export_entries_count;
+    int star_export_entries_size;
+
+    JSImportEntry *import_entries;
+    int import_entries_count;
+    int import_entries_size;
+
+    JSValue module_ns;
+    JSValue func_obj; /* only used for JS modules */
+    JSModuleInitFunc *init_func; /* only used for C modules */
+    BOOL has_tla : 8; /* true if func_obj contains await */
+    BOOL resolved : 8;
+    BOOL func_created : 8;
+    JSModuleStatus status : 8;
+    /* temp use during js_module_link() & js_module_evaluate() */
+    int dfs_index, dfs_ancestor_index;
+    JSModuleDef *stack_prev;
+    /* temp use during js_module_evaluate() */
+    JSModuleDef **async_parent_modules;
+    int async_parent_modules_count;
+    int async_parent_modules_size;
+    int pending_async_dependencies;
+    BOOL async_evaluation;
+    int64_t async_evaluation_timestamp;
+    JSModuleDef *cycle_root;
+    JSValue promise; /* corresponds to spec field: capability */
+    JSValue resolving_funcs[2]; /* corresponds to spec field: capability */
+
+    /* true if evaluation yielded an exception. It is saved in
+       eval_exception */
+    BOOL eval_has_exception : 8;
+    JSValue eval_exception;
+    JSValue meta_obj; /* for import.meta */
+};
+
+typedef struct JSJobEntry {
+    struct list_head link;
+    JSContext *ctx;
+    JSJobFunc *job_func;
+    int argc;
+    JSValue argv[0];
+} JSJobEntry;
+
+typedef struct JSProperty {
+    union {
+        JSValue value;      /* JS_PROP_NORMAL */
+        struct {            /* JS_PROP_GETSET */
+            JSObject *getter; /* NULL if undefined */
+            JSObject *setter; /* NULL if undefined */
+        } getset;
+        JSVarRef *var_ref;  /* JS_PROP_VARREF */
+        struct {            /* JS_PROP_AUTOINIT */
+            /* in order to use only 2 pointers, we compress the realm
+               and the init function pointer */
+            uintptr_t realm_and_id; /* realm and init_id (JS_AUTOINIT_ID_x)
+                                       in the 2 low bits */
+            void *opaque;
+        } init;
+    } u;
+} JSProperty;
+
+#define JS_PROP_INITIAL_SIZE 2
+#define JS_PROP_INITIAL_HASH_SIZE 4 /* must be a power of two */
+#define JS_ARRAY_INITIAL_SIZE 2
+
+typedef struct JSShapeProperty {
+    uint32_t hash_next : 26; /* 0 if last in list */
+    uint32_t flags : 6;   /* JS_PROP_XXX */
+    JSAtom atom; /* JS_ATOM_NULL = free property entry */
+} JSShapeProperty;
+
+struct JSShape {
+    /* hash table of size hash_mask + 1 before the start of the
+       structure (see prop_hash_end()). */
+    JSGCObjectHeader header;
+    /* true if the shape is inserted in the shape hash table. If not,
+       JSShape.hash is not valid */
+    uint8_t is_hashed;
+    /* If true, the shape may have small array index properties 'n' with 0
+       <= n <= 2^31-1. If false, the shape is guaranteed not to have
+       small array index properties */
+    uint8_t has_small_array_index;
+    uint32_t hash; /* current hash value */
+    uint32_t prop_hash_mask;
+    int prop_size; /* allocated properties */
+    int prop_count; /* include deleted properties */
+    int deleted_prop_count;
+    JSShape *shape_hash_next; /* in JSRuntime.shape_hash[h] list */
+    JSObject *proto;
+    JSShapeProperty prop[0]; /* prop_size elements */
+};
+
+struct JSObject {
+    union {
+        JSGCObjectHeader header;
+        struct {
+            int __gc_ref_count; /* corresponds to header.ref_count */
+            uint8_t __gc_mark; /* corresponds to header.mark/gc_obj_type */
+
+            uint8_t extensible : 1;
+            uint8_t free_mark : 1; /* only used when freeing objects with cycles */
+            uint8_t is_exotic : 1; /* TRUE if object has exotic property handlers */
+            uint8_t fast_array : 1; /* TRUE if u.array is used for get/put (for JS_CLASS_ARRAY, JS_CLASS_ARGUMENTS and typed arrays) */
+            uint8_t is_constructor : 1; /* TRUE if object is a constructor function */
+            uint8_t is_uncatchable_error : 1; /* if TRUE, error is not catchable */
+            uint8_t tmp_mark : 1; /* used in JS_WriteObjectRec() */
+            uint8_t is_HTMLDDA : 1; /* specific annex B IsHtmlDDA behavior */
+            uint16_t class_id; /* see JS_CLASS_x */
+        };
+    };
+    /* byte offsets: 16/24 */
+    JSShape *shape; /* prototype and property names + flag */
+    JSProperty *prop; /* array of properties */
+    /* byte offsets: 24/40 */
+    struct JSMapRecord *first_weak_ref; /* XXX: use a bit and an external hash table? */
+    /* byte offsets: 28/48 */
+    union {
+        void *opaque;
+        struct JSBoundFunction *bound_function; /* JS_CLASS_BOUND_FUNCTION */
+        struct JSCFunctionDataRecord *c_function_data_record; /* JS_CLASS_C_FUNCTION_DATA */
+        struct JSForInIterator *for_in_iterator; /* JS_CLASS_FOR_IN_ITERATOR */
+        struct JSArrayBuffer *array_buffer; /* JS_CLASS_ARRAY_BUFFER, JS_CLASS_SHARED_ARRAY_BUFFER */
+        struct JSTypedArray *typed_array; /* JS_CLASS_UINT8C_ARRAY..JS_CLASS_DATAVIEW */
+#ifdef CONFIG_BIGNUM
+        struct JSFloatEnv *float_env; /* JS_CLASS_FLOAT_ENV */
+        struct JSOperatorSetData *operator_set; /* JS_CLASS_OPERATOR_SET */
+#endif
+        struct JSMapState *map_state;   /* JS_CLASS_MAP..JS_CLASS_WEAKSET */
+        struct JSMapIteratorData *map_iterator_data; /* JS_CLASS_MAP_ITERATOR, JS_CLASS_SET_ITERATOR */
+        struct JSArrayIteratorData *array_iterator_data; /* JS_CLASS_ARRAY_ITERATOR, JS_CLASS_STRING_ITERATOR */
+        struct JSRegExpStringIteratorData *regexp_string_iterator_data; /* JS_CLASS_REGEXP_STRING_ITERATOR */
+        struct JSGeneratorData *generator_data; /* JS_CLASS_GENERATOR */
+        struct JSProxyData *proxy_data; /* JS_CLASS_PROXY */
+        struct JSPromiseData *promise_data; /* JS_CLASS_PROMISE */
+        struct JSPromiseFunctionData *promise_function_data; /* JS_CLASS_PROMISE_RESOLVE_FUNCTION, JS_CLASS_PROMISE_REJECT_FUNCTION */
+        struct JSAsyncFunctionState *async_function_data; /* JS_CLASS_ASYNC_FUNCTION_RESOLVE, JS_CLASS_ASYNC_FUNCTION_REJECT */
+        struct JSAsyncFromSyncIteratorData *async_from_sync_iterator_data; /* JS_CLASS_ASYNC_FROM_SYNC_ITERATOR */
+        struct JSAsyncGeneratorData *async_generator_data; /* JS_CLASS_ASYNC_GENERATOR */
+        struct { /* JS_CLASS_BYTECODE_FUNCTION: 12/24 bytes */
+            /* also used by JS_CLASS_GENERATOR_FUNCTION, JS_CLASS_ASYNC_FUNCTION and JS_CLASS_ASYNC_GENERATOR_FUNCTION */
+            struct JSFunctionBytecode *function_bytecode;
+            JSVarRef **var_refs;
+            JSObject *home_object; /* for 'super' access */
+        } func;
+        struct { /* JS_CLASS_C_FUNCTION: 12/20 bytes */
+            JSContext *realm;
+            JSCFunctionType c_function;
+            uint8_t length;
+            uint8_t cproto;
+            int16_t magic;
+        } cfunc;
+        /* array part for fast arrays and typed arrays */
+        struct { /* JS_CLASS_ARRAY, JS_CLASS_ARGUMENTS, JS_CLASS_UINT8C_ARRAY..JS_CLASS_FLOAT64_ARRAY */
+            union {
+                uint32_t size;          /* JS_CLASS_ARRAY, JS_CLASS_ARGUMENTS */
+                struct JSTypedArray *typed_array; /* JS_CLASS_UINT8C_ARRAY..JS_CLASS_FLOAT64_ARRAY */
+            } u1;
+            union {
+                JSValue *values;        /* JS_CLASS_ARRAY, JS_CLASS_ARGUMENTS */
+                void *ptr;              /* JS_CLASS_UINT8C_ARRAY..JS_CLASS_FLOAT64_ARRAY */
+                int8_t *int8_ptr;       /* JS_CLASS_INT8_ARRAY */
+                uint8_t *uint8_ptr;     /* JS_CLASS_UINT8_ARRAY, JS_CLASS_UINT8C_ARRAY */
+                int16_t *int16_ptr;     /* JS_CLASS_INT16_ARRAY */
+                uint16_t *uint16_ptr;   /* JS_CLASS_UINT16_ARRAY */
+                int32_t *int32_ptr;     /* JS_CLASS_INT32_ARRAY */
+                uint32_t *uint32_ptr;   /* JS_CLASS_UINT32_ARRAY */
+                int64_t *int64_ptr;     /* JS_CLASS_INT64_ARRAY */
+                uint64_t *uint64_ptr;   /* JS_CLASS_UINT64_ARRAY */
+                float *float_ptr;       /* JS_CLASS_FLOAT32_ARRAY */
+                double *double_ptr;     /* JS_CLASS_FLOAT64_ARRAY */
+            } u;
+            uint32_t count; /* <= 2^31-1. 0 for a detached typed array */
+        } array;    /* 12/20 bytes */
+        JSRegExp regexp;    /* JS_CLASS_REGEXP: 8/16 bytes */
+        JSValue object_data;    /* for JS_SetObjectData(): 8/16/16 bytes */
+    } u;
+    /* byte sizes: 40/48/72 */
+};
+
+enum {
+    __JS_ATOM_NULL = JS_ATOM_NULL,
+#define DEF(name, str) JS_ATOM_ ## name,
+#include "quickjs-atom.h"
+#undef DEF
+    JS_ATOM_END,
+};
+#define JS_ATOM_LAST_KEYWORD JS_ATOM_super
+#define JS_ATOM_LAST_STRICT_KEYWORD JS_ATOM_yield
+
+static const char js_atom_init[] =
+#define DEF(name, str) str "\0"
+#include "quickjs-atom.h"
+#undef DEF
+;
+
+typedef enum OPCodeFormat {
+#define FMT(f) OP_FMT_ ## f,
+#define DEF(id, size, n_pop, n_push, f)
+#include "quickjs-opcode.h"
+#undef DEF
+#undef FMT
+} OPCodeFormat;
+
+enum OPCodeEnum {
+#define FMT(f)
+#define DEF(id, size, n_pop, n_push, f) OP_ ## id,
+#define def(id, size, n_pop, n_push, f)
+#include "quickjs-opcode.h"
+#undef def
+#undef DEF
+#undef FMT
+    OP_COUNT, /* excluding temporary opcodes */
+    /* temporary opcodes : overlap with the short opcodes */
+    OP_TEMP_START = OP_nop + 1,
+    OP___dummy = OP_TEMP_START - 1,
+#define FMT(f)
+#define DEF(id, size, n_pop, n_push, f)
+#define def(id, size, n_pop, n_push, f) OP_ ## id,
+#include "quickjs-opcode.h"
+#undef def
+#undef DEF
+#undef FMT
+    OP_TEMP_END,
+};
+
+static int JS_InitAtoms(JSRuntime *rt);
+static JSAtom __JS_NewAtomInit(JSRuntime *rt, const char *str, int len,
+                               int atom_type);
+static void JS_FreeAtomStruct(JSRuntime *rt, JSAtomStruct *p);
+static void free_function_bytecode(JSRuntime *rt, JSFunctionBytecode *b);
+static JSValue js_call_c_function(JSContext *ctx, JSValueConst func_obj,
+                                  JSValueConst this_obj,
+                                  int argc, JSValueConst *argv, int flags);
+static JSValue js_call_bound_function(JSContext *ctx, JSValueConst func_obj,
+                                      JSValueConst this_obj,
+                                      int argc, JSValueConst *argv, int flags);
+static JSValue JS_CallInternal(JSContext *ctx, JSValueConst func_obj,
+                               JSValueConst this_obj, JSValueConst new_target,
+                               int argc, JSValue *argv, int flags);
+static JSValue JS_CallConstructorInternal(JSContext *ctx,
+                                          JSValueConst func_obj,
+                                          JSValueConst new_target,
+                                          int argc, JSValue *argv, int flags);
+static JSValue JS_CallFree(JSContext *ctx, JSValue func_obj, JSValueConst this_obj,
+                           int argc, JSValueConst *argv);
+static JSValue JS_InvokeFree(JSContext *ctx, JSValue this_val, JSAtom atom,
+                             int argc, JSValueConst *argv);
+static __exception int JS_ToArrayLengthFree(JSContext *ctx, uint32_t *plen,
+                                            JSValue val, BOOL is_array_ctor);
+static JSValue JS_EvalObject(JSContext *ctx, JSValueConst this_obj,
+                             JSValueConst val, int flags, int scope_idx);
+static __maybe_unused void JS_DumpAtoms(JSRuntime *rt);
+static __maybe_unused void JS_DumpString(JSRuntime *rt, const JSString *p);
+static __maybe_unused void JS_DumpObjectHeader(JSRuntime *rt);
+static __maybe_unused void JS_DumpObject(JSRuntime *rt, JSObject *p);
+static __maybe_unused void JS_DumpGCObject(JSRuntime *rt, JSGCObjectHeader *p);
+static __maybe_unused void JS_DumpValueShort(JSRuntime *rt, JSValueConst val);
+static __maybe_unused void JS_DumpValue(JSContext *ctx, JSValueConst val);
+static __maybe_unused void JS_PrintValue(JSContext *ctx,
+                                                  const char *str,
+                                                  JSValueConst val);
+static __maybe_unused void JS_DumpShapes(JSRuntime *rt);
+static JSValue js_function_apply(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int magic);
+static void js_array_finalizer(JSRuntime *rt, JSValue val);
+static void js_array_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func);
+static void js_object_data_finalizer(JSRuntime *rt, JSValue val);
+static void js_object_data_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func);
+static void js_c_function_finalizer(JSRuntime *rt, JSValue val);
+static void js_c_function_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func);
+static void js_bytecode_function_finalizer(JSRuntime *rt, JSValue val);
+static void js_bytecode_function_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_bound_function_finalizer(JSRuntime *rt, JSValue val);
+static void js_bound_function_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_for_in_iterator_finalizer(JSRuntime *rt, JSValue val);
+static void js_for_in_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_regexp_finalizer(JSRuntime *rt, JSValue val);
+static void js_array_buffer_finalizer(JSRuntime *rt, JSValue val);
+static void js_typed_array_finalizer(JSRuntime *rt, JSValue val);
+static void js_typed_array_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_proxy_finalizer(JSRuntime *rt, JSValue val);
+static void js_proxy_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_map_finalizer(JSRuntime *rt, JSValue val);
+static void js_map_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_map_iterator_finalizer(JSRuntime *rt, JSValue val);
+static void js_map_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_array_iterator_finalizer(JSRuntime *rt, JSValue val);
+static void js_array_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_regexp_string_iterator_finalizer(JSRuntime *rt, JSValue val);
+static void js_regexp_string_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_generator_finalizer(JSRuntime *rt, JSValue obj);
+static void js_generator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_promise_finalizer(JSRuntime *rt, JSValue val);
+static void js_promise_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_promise_resolve_function_finalizer(JSRuntime *rt, JSValue val);
+static void js_promise_resolve_function_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+#ifdef CONFIG_BIGNUM
+static void js_operator_set_finalizer(JSRuntime *rt, JSValue val);
+static void js_operator_set_mark(JSRuntime *rt, JSValueConst val,
+                                 JS_MarkFunc *mark_func);
+#endif
+
+#define HINT_STRING  0
+#define HINT_NUMBER  1
+#define HINT_NONE    2
+#define HINT_FORCE_ORDINARY (1 << 4) // don't try Symbol.toPrimitive
+static JSValue JS_ToPrimitiveFree(JSContext *ctx, JSValue val, int hint);
+static JSValue JS_ToStringFree(JSContext *ctx, JSValue val);
+static int JS_ToBoolFree(JSContext *ctx, JSValue val);
+static int JS_ToInt32Free(JSContext *ctx, int32_t *pres, JSValue val);
+static int JS_ToFloat64Free(JSContext *ctx, double *pres, JSValue val);
+static int JS_ToUint8ClampFree(JSContext *ctx, int32_t *pres, JSValue val);
+static JSValue js_compile_regexp(JSContext *ctx, JSValueConst pattern,
+                                 JSValueConst flags);
+static JSValue js_regexp_constructor_internal(JSContext *ctx, JSValueConst ctor,
+                                              JSValue pattern, JSValue bc);
+static void gc_decref(JSRuntime *rt);
+static int JS_NewClass1(JSRuntime *rt, JSClassID class_id,
+                        const JSClassDef *class_def, JSAtom name);
+
+typedef enum JSStrictEqModeEnum {
+    JS_EQ_STRICT,
+    JS_EQ_SAME_VALUE,
+    JS_EQ_SAME_VALUE_ZERO,
+} JSStrictEqModeEnum;
+
+static BOOL js_strict_eq2(JSContext *ctx, JSValue op1, JSValue op2,
+                          JSStrictEqModeEnum eq_mode);
+static BOOL js_strict_eq(JSContext *ctx, JSValueConst op1, JSValueConst op2);
+static BOOL js_same_value(JSContext *ctx, JSValueConst op1, JSValueConst op2);
+static BOOL js_same_value_zero(JSContext *ctx, JSValueConst op1, JSValueConst op2);
+static JSValue JS_ToObject(JSContext *ctx, JSValueConst val);
+static JSValue JS_ToObjectFree(JSContext *ctx, JSValue val);
+static JSProperty *add_property(JSContext *ctx,
+                                JSObject *p, JSAtom prop, int prop_flags);
+static JSValue JS_NewBigInt(JSContext *ctx);
+static inline bf_t *JS_GetBigInt(JSValueConst val)
+{
+    JSBigFloat *p = JS_VALUE_GET_PTR(val);
+    return &p->num;
+}
+static JSValue JS_CompactBigInt1(JSContext *ctx, JSValue val,
+                                 BOOL convert_to_safe_integer);
+static JSValue JS_CompactBigInt(JSContext *ctx, JSValue val);
+static int JS_ToBigInt64Free(JSContext *ctx, int64_t *pres, JSValue val);
+static bf_t *JS_ToBigInt(JSContext *ctx, bf_t *buf, JSValueConst val);
+static void JS_FreeBigInt(JSContext *ctx, bf_t *a, bf_t *buf);
+#ifdef CONFIG_BIGNUM
+static void js_float_env_finalizer(JSRuntime *rt, JSValue val);
+static JSValue JS_NewBigFloat(JSContext *ctx);
+static inline bf_t *JS_GetBigFloat(JSValueConst val)
+{
+    JSBigFloat *p = JS_VALUE_GET_PTR(val);
+    return &p->num;
+}
+static JSValue JS_NewBigDecimal(JSContext *ctx);
+static inline bfdec_t *JS_GetBigDecimal(JSValueConst val)
+{
+    JSBigDecimal *p = JS_VALUE_GET_PTR(val);
+    return &p->num;
+}
+static bf_t *JS_ToBigFloat(JSContext *ctx, bf_t *buf, JSValueConst val);
+static JSValue JS_ToBigDecimalFree(JSContext *ctx, JSValue val,
+                                   BOOL allow_null_or_undefined);
+static bfdec_t *JS_ToBigDecimal(JSContext *ctx, JSValueConst val);
+#endif
+static JSValue JS_ThrowTypeErrorRevokedProxy(JSContext *ctx);
+static JSValue js_proxy_getPrototypeOf(JSContext *ctx, JSValueConst obj);
+static int js_proxy_setPrototypeOf(JSContext *ctx, JSValueConst obj,
+                                   JSValueConst proto_val, BOOL throw_flag);
+
+static int js_resolve_proxy(JSContext *ctx, JSValueConst *pval, int throw_exception);
+static int js_proxy_isExtensible(JSContext *ctx, JSValueConst obj);
+static int js_proxy_preventExtensions(JSContext *ctx, JSValueConst obj);
+static int JS_CreateProperty(JSContext *ctx, JSObject *p,
+                             JSAtom prop, JSValueConst val,
+                             JSValueConst getter, JSValueConst setter,
+                             int flags);
+static int js_string_memcmp(const JSString *p1, const JSString *p2, int len);
+static void reset_weak_ref(JSRuntime *rt, JSObject *p);
+static JSValue js_array_buffer_constructor3(JSContext *ctx,
+                                            JSValueConst new_target,
+                                            uint64_t len, JSClassID class_id,
+                                            uint8_t *buf,
+                                            JSFreeArrayBufferDataFunc *free_func,
+                                            void *opaque, BOOL alloc_flag);
+static JSArrayBuffer *js_get_array_buffer(JSContext *ctx, JSValueConst obj);
+static JSValue js_typed_array_constructor(JSContext *ctx,
+                                          JSValueConst this_val,
+                                          int argc, JSValueConst *argv,
+                                          int classid);
+static JSValue js_typed_array_constructor_ta(JSContext *ctx,
+                                             JSValueConst new_target,
+                                             JSValueConst src_obj,
+                                             int classid);
+static BOOL typed_array_is_detached(JSContext *ctx, JSObject *p);
+static uint32_t typed_array_get_length(JSContext *ctx, JSObject *p);
+static JSValue JS_ThrowTypeErrorDetachedArrayBuffer(JSContext *ctx);
+static JSVarRef *get_var_ref(JSContext *ctx, JSStackFrame *sf, int var_idx,
+                             BOOL is_arg);
+static void __async_func_free(JSRuntime *rt, JSAsyncFunctionState *s);
+static void async_func_free(JSRuntime *rt, JSAsyncFunctionState *s);
+static JSValue js_generator_function_call(JSContext *ctx, JSValueConst func_obj,
+                                          JSValueConst this_obj,
+                                          int argc, JSValueConst *argv,
+                                          int flags);
+static void js_async_function_resolve_finalizer(JSRuntime *rt, JSValue val);
+static void js_async_function_resolve_mark(JSRuntime *rt, JSValueConst val,
+                                           JS_MarkFunc *mark_func);
+static JSValue JS_EvalInternal(JSContext *ctx, JSValueConst this_obj,
+                               const char *input, size_t input_len,
+                               const char *filename, int line, int flags, int scope_idx);
+static void js_free_module_def(JSContext *ctx, JSModuleDef *m);
+static void js_mark_module_def(JSRuntime *rt, JSModuleDef *m,
+                               JS_MarkFunc *mark_func);
+static JSValue js_import_meta(JSContext *ctx);
+static JSValue js_dynamic_import(JSContext *ctx, JSValueConst specifier);
+static void free_var_ref(JSRuntime *rt, JSVarRef *var_ref);
+static JSValue js_new_promise_capability(JSContext *ctx,
+                                         JSValue *resolving_funcs,
+                                         JSValueConst ctor);
+static __exception int perform_promise_then(JSContext *ctx,
+                                            JSValueConst promise,
+                                            JSValueConst *resolve_reject,
+                                            JSValueConst *cap_resolving_funcs);
+static JSValue js_promise_resolve(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int magic);
+static JSValue js_promise_then(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv);
+static int js_string_compare(JSContext *ctx,
+                             const JSString *p1, const JSString *p2);
+static JSValue JS_ToNumber(JSContext *ctx, JSValueConst val);
+static int JS_SetPropertyValue(JSContext *ctx, JSValueConst this_obj,
+                               JSValue prop, JSValue val, int flags);
+static int JS_NumberIsInteger(JSContext *ctx, JSValueConst val);
+static BOOL JS_NumberIsNegativeOrMinusZero(JSContext *ctx, JSValueConst val);
+static JSValue JS_ToNumberFree(JSContext *ctx, JSValue val);
+static int JS_GetOwnPropertyInternal(JSContext *ctx, JSPropertyDescriptor *desc,
+                                     JSObject *p, JSAtom prop);
+static void js_free_desc(JSContext *ctx, JSPropertyDescriptor *desc);
+static void JS_AddIntrinsicBasicObjects(JSContext *ctx);
+static void js_free_shape(JSRuntime *rt, JSShape *sh);
+static void js_free_shape_null(JSRuntime *rt, JSShape *sh);
+static int js_shape_prepare_update(JSContext *ctx, JSObject *p,
+                                   JSShapeProperty **pprs);
+static int init_shape_hash(JSRuntime *rt);
+static __exception int js_get_length32(JSContext *ctx, uint32_t *pres,
+                                       JSValueConst obj);
+static __exception int js_get_length64(JSContext *ctx, int64_t *pres,
+                                       JSValueConst obj);
+static void free_arg_list(JSContext *ctx, JSValue *tab, uint32_t len);
+static JSValue *build_arg_list(JSContext *ctx, uint32_t *plen,
+                               JSValueConst array_arg);
+static BOOL js_get_fast_array(JSContext *ctx, JSValueConst obj,
+                              JSValue **arrpp, uint32_t *countp);
+static JSValue JS_CreateAsyncFromSyncIterator(JSContext *ctx,
+                                              JSValueConst sync_iter);
+static void js_c_function_data_finalizer(JSRuntime *rt, JSValue val);
+static void js_c_function_data_mark(JSRuntime *rt, JSValueConst val,
+                                    JS_MarkFunc *mark_func);
+static JSValue js_c_function_data_call(JSContext *ctx, JSValueConst func_obj,
+                                       JSValueConst this_val,
+                                       int argc, JSValueConst *argv, int flags);
+static JSAtom js_symbol_to_atom(JSContext *ctx, JSValue val);
+static void add_gc_object(JSRuntime *rt, JSGCObjectHeader *h,
+                          JSGCObjectTypeEnum type);
+static void remove_gc_object(JSGCObjectHeader *h);
+static JSValue js_instantiate_prototype(JSContext *ctx, JSObject *p, JSAtom atom, void *opaque);
+static JSValue js_module_ns_autoinit(JSContext *ctx, JSObject *p, JSAtom atom,
+                                 void *opaque);
+static JSValue JS_InstantiateFunctionListItem2(JSContext *ctx, JSObject *p,
+                                               JSAtom atom, void *opaque);
+static JSValue js_object_groupBy(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int is_map);
+
+static const JSClassExoticMethods js_arguments_exotic_methods;
+static const JSClassExoticMethods js_string_exotic_methods;
+static const JSClassExoticMethods js_proxy_exotic_methods;
+static const JSClassExoticMethods js_module_ns_exotic_methods;
+static JSClassID js_class_id_alloc = JS_CLASS_INIT_COUNT;
+
+static void js_trigger_gc(JSRuntime *rt, size_t size)
+{
+    BOOL force_gc;
+#ifdef FORCE_GC_AT_MALLOC
+    force_gc = TRUE;
+#else
+    force_gc = ((rt->malloc_state.malloc_size + size) >
+                rt->malloc_gc_threshold);
+#endif
+    if (force_gc) {
+#ifdef DUMP_GC
+        printf("GC: size=%" PRIu64 "\n",
+               (uint64_t)rt->malloc_state.malloc_size);
+#endif
+        JS_RunGC(rt);
+        rt->malloc_gc_threshold = rt->malloc_state.malloc_size +
+            (rt->malloc_state.malloc_size >> 1);
+    }
+}
+
+static size_t js_malloc_usable_size_unknown(const void *ptr)
+{
+    return 0;
+}
+
+void *js_malloc_rt(JSRuntime *rt, size_t size)
+{
+    return rt->mf.js_malloc(&rt->malloc_state, size);
+}
+
+void js_free_rt(JSRuntime *rt, void *ptr)
+{
+    rt->mf.js_free(&rt->malloc_state, ptr);
+}
+
+void *js_realloc_rt(JSRuntime *rt, void *ptr, size_t size)
+{
+    return rt->mf.js_realloc(&rt->malloc_state, ptr, size);
+}
+
+size_t js_malloc_usable_size_rt(JSRuntime *rt, const void *ptr)
+{
+    return rt->mf.js_malloc_usable_size(ptr);
+}
+
+void *js_mallocz_rt(JSRuntime *rt, size_t size)
+{
+    void *ptr;
+    ptr = js_malloc_rt(rt, size);
+    if (!ptr)
+        return NULL;
+    return memset(ptr, 0, size);
+}
+
+/* called by libbf */
+static void *js_bf_realloc(void *opaque, void *ptr, size_t size)
+{
+    JSRuntime *rt = opaque;
+    return js_realloc_rt(rt, ptr, size);
+}
+
+/* Throw out of memory in case of error */
+void *js_malloc(JSContext *ctx, size_t size)
+{
+    void *ptr;
+    ptr = js_malloc_rt(ctx->rt, size);
+    if (unlikely(!ptr)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    return ptr;
+}
+
+/* Throw out of memory in case of error */
+void *js_mallocz(JSContext *ctx, size_t size)
+{
+    void *ptr;
+    ptr = js_mallocz_rt(ctx->rt, size);
+    if (unlikely(!ptr)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    return ptr;
+}
+
+void js_free(JSContext *ctx, void *ptr)
+{
+    js_free_rt(ctx->rt, ptr);
+}
+
+/* Throw out of memory in case of error */
+void *js_realloc(JSContext *ctx, void *ptr, size_t size)
+{
+    void *ret;
+    ret = js_realloc_rt(ctx->rt, ptr, size);
+    if (unlikely(!ret && size != 0)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    return ret;
+}
+
+/* store extra allocated size in *pslack if successful */
+void *js_realloc2(JSContext *ctx, void *ptr, size_t size, size_t *pslack)
+{
+    void *ret;
+    ret = js_realloc_rt(ctx->rt, ptr, size);
+    if (unlikely(!ret && size != 0)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    if (pslack) {
+        size_t new_size = js_malloc_usable_size_rt(ctx->rt, ret);
+        *pslack = (new_size > size) ? new_size - size : 0;
+    }
+    return ret;
+}
+
+size_t js_malloc_usable_size(JSContext *ctx, const void *ptr)
+{
+    return js_malloc_usable_size_rt(ctx->rt, ptr);
+}
+
+/* Throw out of memory exception in case of error */
+char *js_strndup(JSContext *ctx, const char *s, size_t n)
+{
+    char *ptr;
+    ptr = js_malloc(ctx, n + 1);
+    if (ptr) {
+        memcpy(ptr, s, n);
+        ptr[n] = '\0';
+    }
+    return ptr;
+}
+
+char *js_strdup(JSContext *ctx, const char *str)
+{
+    return js_strndup(ctx, str, strlen(str));
+}
+
+static no_inline int js_realloc_array(JSContext *ctx, void **parray,
+                                      int elem_size, int *psize, int req_size)
+{
+    int new_size;
+    size_t slack;
+    void *new_array;
+    /* XXX: potential arithmetic overflow */
+    new_size = max_int(req_size, *psize * 3 / 2);
+    new_array = js_realloc2(ctx, *parray, new_size * elem_size, &slack);
+    if (!new_array)
+        return -1;
+    new_size += slack / elem_size;
+    *psize = new_size;
+    *parray = new_array;
+    return 0;
+}
+
+/* resize the array and update its size if req_size > *psize */
+static inline int js_resize_array(JSContext *ctx, void **parray, int elem_size,
+                                  int *psize, int req_size)
+{
+    if (unlikely(req_size > *psize))
+        return js_realloc_array(ctx, parray, elem_size, psize, req_size);
+    else
+        return 0;
+}
+
+static inline void js_dbuf_init(JSContext *ctx, DynBuf *s)
+{
+    dbuf_init2(s, ctx->rt, (DynBufReallocFunc *)js_realloc_rt);
+}
+
+static inline int is_digit(int c) {
+    return c >= '0' && c <= '9';
+}
+
+static inline int string_get(const JSString *p, int idx) {
+    return p->is_wide_char ? p->u.str16[idx] : p->u.str8[idx];
+}
+
+typedef struct JSClassShortDef {
+    JSAtom class_name;
+    JSClassFinalizer *finalizer;
+    JSClassGCMark *gc_mark;
+} JSClassShortDef;
+
+static JSClassShortDef const js_std_class_def[] = {
+    { JS_ATOM_Object, NULL, NULL },                             /* JS_CLASS_OBJECT */
+    { JS_ATOM_Array, js_array_finalizer, js_array_mark },       /* JS_CLASS_ARRAY */
+    { JS_ATOM_Error, NULL, NULL }, /* JS_CLASS_ERROR */
+    { JS_ATOM_Number, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_NUMBER */
+    { JS_ATOM_String, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_STRING */
+    { JS_ATOM_Boolean, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_BOOLEAN */
+    { JS_ATOM_Symbol, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_SYMBOL */
+    { JS_ATOM_Arguments, js_array_finalizer, js_array_mark },   /* JS_CLASS_ARGUMENTS */
+    { JS_ATOM_Arguments, NULL, NULL },                          /* JS_CLASS_MAPPED_ARGUMENTS */
+    { JS_ATOM_Date, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_DATE */
+    { JS_ATOM_Object, NULL, NULL },                             /* JS_CLASS_MODULE_NS */
+    { JS_ATOM_Function, js_c_function_finalizer, js_c_function_mark }, /* JS_CLASS_C_FUNCTION */
+    { JS_ATOM_Function, js_bytecode_function_finalizer, js_bytecode_function_mark }, /* JS_CLASS_BYTECODE_FUNCTION */
+    { JS_ATOM_Function, js_bound_function_finalizer, js_bound_function_mark }, /* JS_CLASS_BOUND_FUNCTION */
+    { JS_ATOM_Function, js_c_function_data_finalizer, js_c_function_data_mark }, /* JS_CLASS_C_FUNCTION_DATA */
+    { JS_ATOM_GeneratorFunction, js_bytecode_function_finalizer, js_bytecode_function_mark },  /* JS_CLASS_GENERATOR_FUNCTION */
+    { JS_ATOM_ForInIterator, js_for_in_iterator_finalizer, js_for_in_iterator_mark },      /* JS_CLASS_FOR_IN_ITERATOR */
+    { JS_ATOM_RegExp, js_regexp_finalizer, NULL },                              /* JS_CLASS_REGEXP */
+    { JS_ATOM_ArrayBuffer, js_array_buffer_finalizer, NULL },                   /* JS_CLASS_ARRAY_BUFFER */
+    { JS_ATOM_SharedArrayBuffer, js_array_buffer_finalizer, NULL },             /* JS_CLASS_SHARED_ARRAY_BUFFER */
+    { JS_ATOM_Uint8ClampedArray, js_typed_array_finalizer, js_typed_array_mark }, /* JS_CLASS_UINT8C_ARRAY */
+    { JS_ATOM_Int8Array, js_typed_array_finalizer, js_typed_array_mark },       /* JS_CLASS_INT8_ARRAY */
+    { JS_ATOM_Uint8Array, js_typed_array_finalizer, js_typed_array_mark },      /* JS_CLASS_UINT8_ARRAY */
+    { JS_ATOM_Int16Array, js_typed_array_finalizer, js_typed_array_mark },      /* JS_CLASS_INT16_ARRAY */
+    { JS_ATOM_Uint16Array, js_typed_array_finalizer, js_typed_array_mark },     /* JS_CLASS_UINT16_ARRAY */
+    { JS_ATOM_Int32Array, js_typed_array_finalizer, js_typed_array_mark },      /* JS_CLASS_INT32_ARRAY */
+    { JS_ATOM_Uint32Array, js_typed_array_finalizer, js_typed_array_mark },     /* JS_CLASS_UINT32_ARRAY */
+    { JS_ATOM_BigInt64Array, js_typed_array_finalizer, js_typed_array_mark },   /* JS_CLASS_BIG_INT64_ARRAY */
+    { JS_ATOM_BigUint64Array, js_typed_array_finalizer, js_typed_array_mark },  /* JS_CLASS_BIG_UINT64_ARRAY */
+    { JS_ATOM_Float32Array, js_typed_array_finalizer, js_typed_array_mark },    /* JS_CLASS_FLOAT32_ARRAY */
+    { JS_ATOM_Float64Array, js_typed_array_finalizer, js_typed_array_mark },    /* JS_CLASS_FLOAT64_ARRAY */
+    { JS_ATOM_DataView, js_typed_array_finalizer, js_typed_array_mark },        /* JS_CLASS_DATAVIEW */
+    { JS_ATOM_BigInt, js_object_data_finalizer, js_object_data_mark },      /* JS_CLASS_BIG_INT */
+#ifdef CONFIG_BIGNUM
+    { JS_ATOM_BigFloat, js_object_data_finalizer, js_object_data_mark },    /* JS_CLASS_BIG_FLOAT */
+    { JS_ATOM_BigFloatEnv, js_float_env_finalizer, NULL },      /* JS_CLASS_FLOAT_ENV */
+    { JS_ATOM_BigDecimal, js_object_data_finalizer, js_object_data_mark },    /* JS_CLASS_BIG_DECIMAL */
+    { JS_ATOM_OperatorSet, js_operator_set_finalizer, js_operator_set_mark },    /* JS_CLASS_OPERATOR_SET */
+#endif
+    { JS_ATOM_Map, js_map_finalizer, js_map_mark },             /* JS_CLASS_MAP */
+    { JS_ATOM_Set, js_map_finalizer, js_map_mark },             /* JS_CLASS_SET */
+    { JS_ATOM_WeakMap, js_map_finalizer, js_map_mark },         /* JS_CLASS_WEAKMAP */
+    { JS_ATOM_WeakSet, js_map_finalizer, js_map_mark },         /* JS_CLASS_WEAKSET */
+    { JS_ATOM_Map_Iterator, js_map_iterator_finalizer, js_map_iterator_mark }, /* JS_CLASS_MAP_ITERATOR */
+    { JS_ATOM_Set_Iterator, js_map_iterator_finalizer, js_map_iterator_mark }, /* JS_CLASS_SET_ITERATOR */
+    { JS_ATOM_Array_Iterator, js_array_iterator_finalizer, js_array_iterator_mark }, /* JS_CLASS_ARRAY_ITERATOR */
+    { JS_ATOM_String_Iterator, js_array_iterator_finalizer, js_array_iterator_mark }, /* JS_CLASS_STRING_ITERATOR */
+    { JS_ATOM_RegExp_String_Iterator, js_regexp_string_iterator_finalizer, js_regexp_string_iterator_mark }, /* JS_CLASS_REGEXP_STRING_ITERATOR */
+    { JS_ATOM_Generator, js_generator_finalizer, js_generator_mark }, /* JS_CLASS_GENERATOR */
+};
+
+static int init_class_range(JSRuntime *rt, JSClassShortDef const *tab,
+                            int start, int count)
+{
+    JSClassDef cm_s, *cm = &cm_s;
+    int i, class_id;
+
+    for(i = 0; i < count; i++) {
+        class_id = i + start;
+        memset(cm, 0, sizeof(*cm));
+        cm->finalizer = tab[i].finalizer;
+        cm->gc_mark = tab[i].gc_mark;
+        if (JS_NewClass1(rt, class_id, cm, tab[i].class_name) < 0)
+            return -1;
+    }
+    return 0;
+}
+
+static JSValue JS_ThrowUnsupportedOperation(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "unsupported operation");
+}
+
+static JSValue invalid_to_string(JSContext *ctx, JSValueConst val)
+{
+    return JS_ThrowUnsupportedOperation(ctx);
+}
+
+static JSValue invalid_from_string(JSContext *ctx, const char *buf,
+                                   int radix, int flags, slimb_t *pexponent)
+{
+    return JS_NAN;
+}
+
+static int invalid_unary_arith(JSContext *ctx,
+                               JSValue *pres, OPCodeEnum op, JSValue op1)
+{
+    JS_FreeValue(ctx, op1);
+    JS_ThrowUnsupportedOperation(ctx);
+    return -1;
+}
+
+static int invalid_binary_arith(JSContext *ctx, OPCodeEnum op,
+                                JSValue *pres, JSValue op1, JSValue op2)
+{
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    JS_ThrowUnsupportedOperation(ctx);
+    return -1;
+}
+
+static JSValue invalid_mul_pow10_to_float64(JSContext *ctx, const bf_t *a,
+                                            int64_t exponent)
+{
+    return JS_ThrowUnsupportedOperation(ctx);
+}
+
+static int invalid_mul_pow10(JSContext *ctx, JSValue *sp)
+{
+    JS_ThrowUnsupportedOperation(ctx);
+    return -1;
+}
+
+static void set_dummy_numeric_ops(JSNumericOperations *ops)
+{
+    ops->to_string = invalid_to_string;
+    ops->from_string = invalid_from_string;
+    ops->unary_arith = invalid_unary_arith;
+    ops->binary_arith = invalid_binary_arith;
+    ops->mul_pow10_to_float64 = invalid_mul_pow10_to_float64;
+    ops->mul_pow10 = invalid_mul_pow10;
+}
+
+#if !defined(CONFIG_STACK_CHECK)
+/* no stack limitation */
+static inline uintptr_t js_get_stack_pointer(void)
+{
+    return 0;
+}
+
+static inline BOOL js_check_stack_overflow(JSRuntime *rt, size_t alloca_size)
+{
+    return FALSE;
+}
+#else
+// Uses code from LLVM project.
+static inline uintptr_t js_get_stack_pointer(void)
+{
+#ifdef _MSC_VER
+    return (uintptr_t) _AddressOfReturnAddress();
+#elif defined __has_builtin
+#if __has_builtin(__builtin_frame_address)
+    return (uintptr_t) __builtin_frame_address(0);
+#endif
+#elif defined __GNUC__
+    return (uintptr_t) __builtin_frame_address(0);
+#else
+    char CharOnStack = 0;
+    // The volatile store here is intended to escape the local variable, to
+    // prevent the compiler from optimizing CharOnStack into anything other
+    // than a char on the stack.
+    //
+    // Tested on: MSVC 2015 - 2019, GCC 4.9 - 9, Clang 3.2 - 9, ICC 13 - 19.
+    char *volatile Ptr = &CharOnStack;
+    return (uintptr_t) Ptr;
+#endif
+}
+
+static inline BOOL js_check_stack_overflow(JSRuntime *rt, size_t alloca_size)
+{
+    uintptr_t sp;
+    sp = js_get_stack_pointer() - alloca_size;
+    return unlikely(sp < rt->stack_limit);
+}
+#endif
+
+JSRuntime *JS_NewRuntime2(const JSMallocFunctions *mf, void *opaque)
+{
+    JSRuntime *rt;
+    JSMallocState ms;
+
+    memset(&ms, 0, sizeof(ms));
+    ms.opaque = opaque;
+    ms.malloc_limit = -1;
+
+    rt = mf->js_malloc(&ms, sizeof(JSRuntime));
+    if (!rt)
+        return NULL;
+    memset(rt, 0, sizeof(*rt));
+    rt->mf = *mf;
+    if (!rt->mf.js_malloc_usable_size) {
+        /* use dummy function if none provided */
+        rt->mf.js_malloc_usable_size = js_malloc_usable_size_unknown;
+    }
+    rt->malloc_state = ms;
+    rt->malloc_gc_threshold = 256 * 1024;
+
+    bf_context_init(&rt->bf_ctx, js_bf_realloc, rt);
+    set_dummy_numeric_ops(&rt->bigint_ops);
+#ifdef CONFIG_BIGNUM
+    set_dummy_numeric_ops(&rt->bigfloat_ops);
+    set_dummy_numeric_ops(&rt->bigdecimal_ops);
+#endif
+
+    init_list_head(&rt->context_list);
+    init_list_head(&rt->gc_obj_list);
+    init_list_head(&rt->gc_zero_ref_count_list);
+    rt->gc_phase = JS_GC_PHASE_NONE;
+
+#ifdef DUMP_LEAKS
+    init_list_head(&rt->string_list);
+#endif
+    init_list_head(&rt->job_list);
+
+    if (JS_InitAtoms(rt))
+        goto fail;
+
+    /* create the object, array and function classes */
+    if (init_class_range(rt, js_std_class_def, JS_CLASS_OBJECT,
+                         countof(js_std_class_def)) < 0)
+        goto fail;
+    rt->class_array[JS_CLASS_ARGUMENTS].exotic = &js_arguments_exotic_methods;
+    rt->class_array[JS_CLASS_STRING].exotic = &js_string_exotic_methods;
+    rt->class_array[JS_CLASS_MODULE_NS].exotic = &js_module_ns_exotic_methods;
+
+    rt->class_array[JS_CLASS_C_FUNCTION].call = js_call_c_function;
+    rt->class_array[JS_CLASS_C_FUNCTION_DATA].call = js_c_function_data_call;
+    rt->class_array[JS_CLASS_BOUND_FUNCTION].call = js_call_bound_function;
+    rt->class_array[JS_CLASS_GENERATOR_FUNCTION].call = js_generator_function_call;
+    if (init_shape_hash(rt))
+        goto fail;
+
+    rt->stack_size = JS_DEFAULT_STACK_SIZE;
+    JS_UpdateStackTop(rt);
+
+    rt->current_exception = JS_NULL;
+
+    return rt;
+ fail:
+    JS_FreeRuntime(rt);
+    return NULL;
+}
+
+void *JS_GetRuntimeOpaque(JSRuntime *rt)
+{
+    return rt->user_opaque;
+}
+
+void JS_SetRuntimeOpaque(JSRuntime *rt, void *opaque)
+{
+    rt->user_opaque = opaque;
+}
+
+/* default memory allocation functions with memory limitation */
+static size_t js_def_malloc_usable_size(const void *ptr)
+{
+#if defined(__APPLE__)
+    return malloc_size(ptr);
+#elif defined(_WIN32)
+    return _msize((void *)ptr);
+#elif defined(EMSCRIPTEN)
+    return 0;
+#elif defined(__linux__)
+    return malloc_usable_size((void *)ptr);
+#else
+    /* change this to `return 0;` if compilation fails */
+    return malloc_usable_size((void *)ptr);
+#endif
+}
+
+static void *js_def_malloc(JSMallocState *s, size_t size)
+{
+    void *ptr;
+
+    /* Do not allocate zero bytes: behavior is platform dependent */
+    assert(size != 0);
+
+    if (unlikely(s->malloc_size + size > s->malloc_limit))
+        return NULL;
+
+    ptr = malloc(size);
+    if (!ptr)
+        return NULL;
+
+    s->malloc_count++;
+    s->malloc_size += js_def_malloc_usable_size(ptr) + MALLOC_OVERHEAD;
+    return ptr;
+}
+
+static void js_def_free(JSMallocState *s, void *ptr)
+{
+    if (!ptr)
+        return;
+
+    s->malloc_count--;
+    s->malloc_size -= js_def_malloc_usable_size(ptr) + MALLOC_OVERHEAD;
+    free(ptr);
+}
+
+static void *js_def_realloc(JSMallocState *s, void *ptr, size_t size)
+{
+    size_t old_size;
+
+    if (!ptr) {
+        if (size == 0)
+            return NULL;
+        return js_def_malloc(s, size);
+    }
+    old_size = js_def_malloc_usable_size(ptr);
+    if (size == 0) {
+        s->malloc_count--;
+        s->malloc_size -= old_size + MALLOC_OVERHEAD;
+        free(ptr);
+        return NULL;
+    }
+    if (s->malloc_size + size - old_size > s->malloc_limit)
+        return NULL;
+
+    ptr = realloc(ptr, size);
+    if (!ptr)
+        return NULL;
+
+    s->malloc_size += js_def_malloc_usable_size(ptr) - old_size;
+    return ptr;
+}
+
+static const JSMallocFunctions def_malloc_funcs = {
+    js_def_malloc,
+    js_def_free,
+    js_def_realloc,
+    js_def_malloc_usable_size,
+};
+
+JSRuntime *JS_NewRuntime(void)
+{
+    return JS_NewRuntime2(&def_malloc_funcs, NULL);
+}
+
+void JS_SetMemoryLimit(JSRuntime *rt, size_t limit)
+{
+    rt->malloc_state.malloc_limit = limit;
+}
+
+/* use -1 to disable automatic GC */
+void JS_SetGCThreshold(JSRuntime *rt, size_t gc_threshold)
+{
+    rt->malloc_gc_threshold = gc_threshold;
+}
+
+#define malloc(s) malloc_is_forbidden(s)
+#define free(p) free_is_forbidden(p)
+#define realloc(p,s) realloc_is_forbidden(p,s)
+
+void JS_SetInterruptHandler(JSRuntime *rt, JSInterruptHandler *cb, void *opaque)
+{
+    rt->interrupt_handler = cb;
+    rt->interrupt_opaque = opaque;
+}
+
+void JS_SetCanBlock(JSRuntime *rt, BOOL can_block)
+{
+    rt->can_block = can_block;
+}
+
+void JS_SetSharedArrayBufferFunctions(JSRuntime *rt,
+                                      const JSSharedArrayBufferFunctions *sf)
+{
+    rt->sab_funcs = *sf;
+}
+
+/* return 0 if OK, < 0 if exception */
+int JS_EnqueueJob(JSContext *ctx, JSJobFunc *job_func,
+                  int argc, JSValueConst *argv)
+{
+    JSRuntime *rt = ctx->rt;
+    JSJobEntry *e;
+    int i;
+
+    e = js_malloc(ctx, sizeof(*e) + argc * sizeof(JSValue));
+    if (!e)
+        return -1;
+    e->ctx = ctx;
+    e->job_func = job_func;
+    e->argc = argc;
+    for(i = 0; i < argc; i++) {
+        e->argv[i] = JS_DupValue(ctx, argv[i]);
+    }
+    list_add_tail(&e->link, &rt->job_list);
+    return 0;
+}
+
+BOOL JS_IsJobPending(JSRuntime *rt)
+{
+    return !list_empty(&rt->job_list);
+}
+
+/* return < 0 if exception, 0 if no job pending, 1 if a job was
+   executed successfully. the context of the job is stored in '*pctx' */
+int JS_ExecutePendingJob(JSRuntime *rt, JSContext **pctx)
+{
+    JSContext *ctx;
+    JSJobEntry *e;
+    JSValue res;
+    int i, ret;
+
+    if (list_empty(&rt->job_list)) {
+        *pctx = NULL;
+        return 0;
+    }
+
+    /* get the first pending job and execute it */
+    e = list_entry(rt->job_list.next, JSJobEntry, link);
+    list_del(&e->link);
+    ctx = e->ctx;
+    res = e->job_func(e->ctx, e->argc, (JSValueConst *)e->argv);
+    for(i = 0; i < e->argc; i++)
+        JS_FreeValue(ctx, e->argv[i]);
+    if (JS_IsException(res))
+        ret = -1;
+    else
+        ret = 1;
+    JS_FreeValue(ctx, res);
+    js_free(ctx, e);
+    *pctx = ctx;
+    return ret;
+}
+
+static inline uint32_t atom_get_free(const JSAtomStruct *p)
+{
+    return (uintptr_t)p >> 1;
+}
+
+static inline BOOL atom_is_free(const JSAtomStruct *p)
+{
+    return (uintptr_t)p & 1;
+}
+
+static inline JSAtomStruct *atom_set_free(uint32_t v)
+{
+    return (JSAtomStruct *)(((uintptr_t)v << 1) | 1);
+}
+
+/* Note: the string contents are uninitialized */
+static JSString *js_alloc_string_rt(JSRuntime *rt, int max_len, int is_wide_char)
+{
+    JSString *str;
+    str = js_malloc_rt(rt, sizeof(JSString) + (max_len << is_wide_char) + 1 - is_wide_char);
+    if (unlikely(!str))
+        return NULL;
+    str->header.ref_count = 1;
+    str->is_wide_char = is_wide_char;
+    str->len = max_len;
+    str->atom_type = 0;
+    str->hash = 0;          /* optional but costless */
+    str->hash_next = 0;     /* optional */
+#ifdef DUMP_LEAKS
+    list_add_tail(&str->link, &rt->string_list);
+#endif
+    return str;
+}
+
+static JSString *js_alloc_string(JSContext *ctx, int max_len, int is_wide_char)
+{
+    JSString *p;
+    p = js_alloc_string_rt(ctx->rt, max_len, is_wide_char);
+    if (unlikely(!p)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    return p;
+}
+
+/* same as JS_FreeValueRT() but faster */
+static inline void js_free_string(JSRuntime *rt, JSString *str)
+{
+    if (--str->header.ref_count <= 0) {
+        if (str->atom_type) {
+            JS_FreeAtomStruct(rt, str);
+        } else {
+#ifdef DUMP_LEAKS
+            list_del(&str->link);
+#endif
+            js_free_rt(rt, str);
+        }
+    }
+}
+
+void JS_SetRuntimeInfo(JSRuntime *rt, const char *s)
+{
+    if (rt)
+        rt->rt_info = s;
+}
+
+void JS_FreeRuntime(JSRuntime *rt)
+{
+    struct list_head *el, *el1;
+    int i;
+
+    JS_FreeValueRT(rt, rt->current_exception);
+
+    list_for_each_safe(el, el1, &rt->job_list) {
+        JSJobEntry *e = list_entry(el, JSJobEntry, link);
+        for(i = 0; i < e->argc; i++)
+            JS_FreeValueRT(rt, e->argv[i]);
+        js_free_rt(rt, e);
+    }
+    init_list_head(&rt->job_list);
+
+    JS_RunGC(rt);
+
+#ifdef DUMP_LEAKS
+    /* leaking objects */
+    {
+        BOOL header_done;
+        JSGCObjectHeader *p;
+        int count;
+
+        /* remove the internal refcounts to display only the object
+           referenced externally */
+        list_for_each(el, &rt->gc_obj_list) {
+            p = list_entry(el, JSGCObjectHeader, link);
+            p->mark = 0;
+        }
+        gc_decref(rt);
+
+        header_done = FALSE;
+        list_for_each(el, &rt->gc_obj_list) {
+            p = list_entry(el, JSGCObjectHeader, link);
+            if (p->ref_count != 0) {
+                if (!header_done) {
+                    printf("Object leaks:\n");
+                    JS_DumpObjectHeader(rt);
+                    header_done = TRUE;
+                }
+                JS_DumpGCObject(rt, p);
+            }
+        }
+
+        count = 0;
+        list_for_each(el, &rt->gc_obj_list) {
+            p = list_entry(el, JSGCObjectHeader, link);
+            if (p->ref_count == 0) {
+                count++;
+            }
+        }
+        if (count != 0)
+            printf("Secondary object leaks: %d\n", count);
+    }
+#endif
+    fflush(stdout);
+    assert(list_empty(&rt->gc_obj_list));
+
+    /* free the classes */
+    for(i = 0; i < rt->class_count; i++) {
+        JSClass *cl = &rt->class_array[i];
+        if (cl->class_id != 0) {
+            JS_FreeAtomRT(rt, cl->class_name);
+        }
+    }
+    js_free_rt(rt, rt->class_array);
+
+    bf_context_end(&rt->bf_ctx);
+
+#ifdef DUMP_LEAKS
+    /* only the atoms defined in JS_InitAtoms() should be left */
+    {
+        BOOL header_done = FALSE;
+
+        for(i = 0; i < rt->atom_size; i++) {
+            JSAtomStruct *p = rt->atom_array[i];
+            if (!atom_is_free(p) /* && p->str*/) {
+                if (i >= JS_ATOM_END || p->header.ref_count != 1) {
+                    if (!header_done) {
+                        header_done = TRUE;
+                        if (rt->rt_info) {
+                            printf("%s:1: atom leakage:", rt->rt_info);
+                        } else {
+                            printf("Atom leaks:\n"
+                                   "    %6s %6s %s\n",
+                                   "ID", "REFCNT", "NAME");
+                        }
+                    }
+                    if (rt->rt_info) {
+                        printf(" ");
+                    } else {
+                        printf("    %6u %6u ", i, p->header.ref_count);
+                    }
+                    switch (p->atom_type) {
+                    case JS_ATOM_TYPE_STRING:
+                        JS_DumpString(rt, p);
+                        break;
+                    case JS_ATOM_TYPE_GLOBAL_SYMBOL:
+                        printf("Symbol.for(");
+                        JS_DumpString(rt, p);
+                        printf(")");
+                        break;
+                    case JS_ATOM_TYPE_SYMBOL:
+                        if (p->hash == JS_ATOM_HASH_SYMBOL) {
+                            printf("Symbol(");
+                            JS_DumpString(rt, p);
+                            printf(")");
+                        } else {
+                            printf("Private(");
+                            JS_DumpString(rt, p);
+                            printf(")");
+                        }
+                        break;
+                    }
+                    if (rt->rt_info) {
+                        printf(":%u", p->header.ref_count);
+                    } else {
+                        printf("\n");
+                    }
+                }
+            }
+        }
+        if (rt->rt_info && header_done)
+            printf("\n");
+    }
+#endif
+
+    /* free the atoms */
+    for(i = 0; i < rt->atom_size; i++) {
+        JSAtomStruct *p = rt->atom_array[i];
+        if (!atom_is_free(p)) {
+#ifdef DUMP_LEAKS
+            list_del(&p->link);
+#endif
+            js_free_rt(rt, p);
+        }
+    }
+    js_free_rt(rt, rt->atom_array);
+    js_free_rt(rt, rt->atom_hash);
+    js_free_rt(rt, rt->shape_hash);
+#ifdef DUMP_LEAKS
+    if (!list_empty(&rt->string_list)) {
+        if (rt->rt_info) {
+            printf("%s:1: string leakage:", rt->rt_info);
+        } else {
+            printf("String leaks:\n"
+                   "    %6s %s\n",
+                   "REFCNT", "VALUE");
+        }
+        list_for_each_safe(el, el1, &rt->string_list) {
+            JSString *str = list_entry(el, JSString, link);
+            if (rt->rt_info) {
+                printf(" ");
+            } else {
+                printf("    %6u ", str->header.ref_count);
+            }
+            JS_DumpString(rt, str);
+            if (rt->rt_info) {
+                printf(":%u", str->header.ref_count);
+            } else {
+                printf("\n");
+            }
+            list_del(&str->link);
+            js_free_rt(rt, str);
+        }
+        if (rt->rt_info)
+            printf("\n");
+    }
+    {
+        JSMallocState *s = &rt->malloc_state;
+        if (s->malloc_count > 1) {
+            if (rt->rt_info)
+                printf("%s:1: ", rt->rt_info);
+            printf("Memory leak: %"PRIu64" bytes lost in %"PRIu64" block%s\n",
+                   (uint64_t)(s->malloc_size - sizeof(JSRuntime)),
+                   (uint64_t)(s->malloc_count - 1), &"s"[s->malloc_count == 2]);
+        }
+    }
+#endif
+
+    {
+        JSMallocState ms = rt->malloc_state;
+        rt->mf.js_free(&ms, rt);
+    }
+}
+
+JSContext *JS_NewContextRaw(JSRuntime *rt)
+{
+    JSContext *ctx;
+    int i;
+
+    ctx = js_mallocz_rt(rt, sizeof(JSContext));
+    if (!ctx)
+        return NULL;
+    ctx->header.ref_count = 1;
+    add_gc_object(rt, &ctx->header, JS_GC_OBJ_TYPE_JS_CONTEXT);
+
+    ctx->class_proto = js_malloc_rt(rt, sizeof(ctx->class_proto[0]) *
+                                    rt->class_count);
+    if (!ctx->class_proto) {
+        js_free_rt(rt, ctx);
+        return NULL;
+    }
+    ctx->rt = rt;
+    list_add_tail(&ctx->link, &rt->context_list);
+    ctx->bf_ctx = &rt->bf_ctx;
+#ifdef CONFIG_BIGNUM
+    ctx->fp_env.prec = 113;
+    ctx->fp_env.flags = bf_set_exp_bits(15) | BF_RNDN | BF_FLAG_SUBNORMAL;
+#endif
+    for(i = 0; i < rt->class_count; i++)
+        ctx->class_proto[i] = JS_NULL;
+    ctx->array_ctor = JS_NULL;
+    ctx->regexp_ctor = JS_NULL;
+    ctx->promise_ctor = JS_NULL;
+    init_list_head(&ctx->loaded_modules);
+
+    JS_AddIntrinsicBasicObjects(ctx);
+    return ctx;
+}
+
+JSContext *JS_NewContext(JSRuntime *rt)
+{
+    JSContext *ctx;
+
+    ctx = JS_NewContextRaw(rt);
+    if (!ctx)
+        return NULL;
+
+    JS_AddIntrinsicBaseObjects(ctx);
+    JS_AddIntrinsicDate(ctx);
+    JS_AddIntrinsicEval(ctx);
+    JS_AddIntrinsicStringNormalize(ctx);
+    JS_AddIntrinsicRegExp(ctx);
+    JS_AddIntrinsicJSON(ctx);
+    JS_AddIntrinsicProxy(ctx);
+    JS_AddIntrinsicMapSet(ctx);
+    JS_AddIntrinsicTypedArrays(ctx);
+    JS_AddIntrinsicPromise(ctx);
+    JS_AddIntrinsicBigInt(ctx);
+    return ctx;
+}
+
+void *JS_GetContextOpaque(JSContext *ctx)
+{
+    return ctx->user_opaque;
+}
+
+void JS_SetContextOpaque(JSContext *ctx, void *opaque)
+{
+    ctx->user_opaque = opaque;
+}
+
+/* set the new value and free the old value after (freeing the value
+   can reallocate the object data) */
+static inline void set_value(JSContext *ctx, JSValue *pval, JSValue new_val)
+{
+    JSValue old_val;
+    old_val = *pval;
+    *pval = new_val;
+    JS_FreeValue(ctx, old_val);
+}
+
+void JS_SetClassProto(JSContext *ctx, JSClassID class_id, JSValue obj)
+{
+    JSRuntime *rt = ctx->rt;
+    assert(class_id < rt->class_count);
+    set_value(ctx, &ctx->class_proto[class_id], obj);
+}
+
+JSValue JS_GetClassProto(JSContext *ctx, JSClassID class_id)
+{
+    JSRuntime *rt = ctx->rt;
+    assert(class_id < rt->class_count);
+    return JS_DupValue(ctx, ctx->class_proto[class_id]);
+}
+
+typedef enum JSFreeModuleEnum {
+    JS_FREE_MODULE_ALL,
+    JS_FREE_MODULE_NOT_RESOLVED,
+} JSFreeModuleEnum;
+
+/* XXX: would be more efficient with separate module lists */
+static void js_free_modules(JSContext *ctx, JSFreeModuleEnum flag)
+{
+    struct list_head *el, *el1;
+    list_for_each_safe(el, el1, &ctx->loaded_modules) {
+        JSModuleDef *m = list_entry(el, JSModuleDef, link);
+        if (flag == JS_FREE_MODULE_ALL ||
+            (flag == JS_FREE_MODULE_NOT_RESOLVED && !m->resolved)) {
+            js_free_module_def(ctx, m);
+        }
+    }
+}
+
+JSContext *JS_DupContext(JSContext *ctx)
+{
+    ctx->header.ref_count++;
+    return ctx;
+}
+
+/* used by the GC */
+static void JS_MarkContext(JSRuntime *rt, JSContext *ctx,
+                           JS_MarkFunc *mark_func)
+{
+    int i;
+    struct list_head *el;
+
+    /* modules are not seen by the GC, so we directly mark the objects
+       referenced by each module */
+    list_for_each(el, &ctx->loaded_modules) {
+        JSModuleDef *m = list_entry(el, JSModuleDef, link);
+        js_mark_module_def(rt, m, mark_func);
+    }
+
+    JS_MarkValue(rt, ctx->global_obj, mark_func);
+    JS_MarkValue(rt, ctx->global_var_obj, mark_func);
+
+    JS_MarkValue(rt, ctx->throw_type_error, mark_func);
+    JS_MarkValue(rt, ctx->eval_obj, mark_func);
+
+    JS_MarkValue(rt, ctx->array_proto_values, mark_func);
+    for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
+        JS_MarkValue(rt, ctx->native_error_proto[i], mark_func);
+    }
+    for(i = 0; i < rt->class_count; i++) {
+        JS_MarkValue(rt, ctx->class_proto[i], mark_func);
+    }
+    JS_MarkValue(rt, ctx->iterator_proto, mark_func);
+    JS_MarkValue(rt, ctx->async_iterator_proto, mark_func);
+    JS_MarkValue(rt, ctx->promise_ctor, mark_func);
+    JS_MarkValue(rt, ctx->array_ctor, mark_func);
+    JS_MarkValue(rt, ctx->regexp_ctor, mark_func);
+    JS_MarkValue(rt, ctx->function_ctor, mark_func);
+    JS_MarkValue(rt, ctx->function_proto, mark_func);
+
+    if (ctx->array_shape)
+        mark_func(rt, &ctx->array_shape->header);
+}
+
+void JS_FreeContext(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    int i;
+
+    if (--ctx->header.ref_count > 0)
+        return;
+    assert(ctx->header.ref_count == 0);
+
+#ifdef DUMP_ATOMS
+    JS_DumpAtoms(ctx->rt);
+#endif
+#ifdef DUMP_SHAPES
+    JS_DumpShapes(ctx->rt);
+#endif
+#ifdef DUMP_OBJECTS
+    {
+        struct list_head *el;
+        JSGCObjectHeader *p;
+        printf("JSObjects: {\n");
+        JS_DumpObjectHeader(ctx->rt);
+        list_for_each(el, &rt->gc_obj_list) {
+            p = list_entry(el, JSGCObjectHeader, link);
+            JS_DumpGCObject(rt, p);
+        }
+        printf("}\n");
+    }
+#endif
+#ifdef DUMP_MEM
+    {
+        JSMemoryUsage stats;
+        JS_ComputeMemoryUsage(rt, &stats);
+        JS_DumpMemoryUsage(stdout, &stats, rt);
+    }
+#endif
+
+    js_free_modules(ctx, JS_FREE_MODULE_ALL);
+
+    JS_FreeValue(ctx, ctx->global_obj);
+    JS_FreeValue(ctx, ctx->global_var_obj);
+
+    JS_FreeValue(ctx, ctx->throw_type_error);
+    JS_FreeValue(ctx, ctx->eval_obj);
+
+    JS_FreeValue(ctx, ctx->array_proto_values);
+    for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
+        JS_FreeValue(ctx, ctx->native_error_proto[i]);
+    }
+    for(i = 0; i < rt->class_count; i++) {
+        JS_FreeValue(ctx, ctx->class_proto[i]);
+    }
+    js_free_rt(rt, ctx->class_proto);
+    JS_FreeValue(ctx, ctx->iterator_proto);
+    JS_FreeValue(ctx, ctx->async_iterator_proto);
+    JS_FreeValue(ctx, ctx->promise_ctor);
+    JS_FreeValue(ctx, ctx->array_ctor);
+    JS_FreeValue(ctx, ctx->regexp_ctor);
+    JS_FreeValue(ctx, ctx->function_ctor);
+    JS_FreeValue(ctx, ctx->function_proto);
+
+    js_free_shape_null(ctx->rt, ctx->array_shape);
+
+    list_del(&ctx->link);
+    remove_gc_object(&ctx->header);
+    js_free_rt(ctx->rt, ctx);
+}
+
+JSRuntime *JS_GetRuntime(JSContext *ctx)
+{
+    return ctx->rt;
+}
+
+static void update_stack_limit(JSRuntime *rt)
+{
+    if (rt->stack_size == 0) {
+        rt->stack_limit = 0; /* no limit */
+    } else {
+        rt->stack_limit = rt->stack_top - rt->stack_size;
+    }
+}
+
+void JS_SetMaxStackSize(JSRuntime *rt, size_t stack_size)
+{
+    rt->stack_size = stack_size;
+    update_stack_limit(rt);
+}
+
+void JS_UpdateStackTop(JSRuntime *rt)
+{
+    rt->stack_top = js_get_stack_pointer();
+    update_stack_limit(rt);
+}
+
+static inline BOOL is_strict_mode(JSContext *ctx)
+{
+    JSStackFrame *sf = ctx->rt->current_stack_frame;
+    return (sf && (sf->js_mode & JS_MODE_STRICT));
+}
+
+#ifdef CONFIG_BIGNUM
+static inline BOOL is_math_mode(JSContext *ctx)
+{
+    JSStackFrame *sf = ctx->rt->current_stack_frame;
+    return (sf && (sf->js_mode & JS_MODE_MATH));
+}
+#else
+static inline BOOL is_math_mode(JSContext *ctx)
+{
+    return FALSE;
+}
+#endif
+
+/* JSAtom support */
+
+#define JS_ATOM_TAG_INT (1U << 31)
+#define JS_ATOM_MAX_INT (JS_ATOM_TAG_INT - 1)
+#define JS_ATOM_MAX     ((1U << 30) - 1)
+
+/* return the max count from the hash size */
+#define JS_ATOM_COUNT_RESIZE(n) ((n) * 2)
+
+static inline BOOL __JS_AtomIsConst(JSAtom v)
+{
+#if defined(DUMP_LEAKS) && DUMP_LEAKS > 1
+        return (int32_t)v <= 0;
+#else
+        return (int32_t)v < JS_ATOM_END;
+#endif
+}
+
+static inline BOOL __JS_AtomIsTaggedInt(JSAtom v)
+{
+    return (v & JS_ATOM_TAG_INT) != 0;
+}
+
+static inline JSAtom __JS_AtomFromUInt32(uint32_t v)
+{
+    return v | JS_ATOM_TAG_INT;
+}
+
+static inline uint32_t __JS_AtomToUInt32(JSAtom atom)
+{
+    return atom & ~JS_ATOM_TAG_INT;
+}
+
+static inline int is_num(int c)
+{
+    return c >= '0' && c <= '9';
+}
+
+/* return TRUE if the string is a number n with 0 <= n <= 2^32-1 */
+static inline BOOL is_num_string(uint32_t *pval, const JSString *p)
+{
+    uint32_t n;
+    uint64_t n64;
+    int c, i, len;
+
+    len = p->len;
+    if (len == 0 || len > 10)
+        return FALSE;
+    c = string_get(p, 0);
+    if (is_num(c)) {
+        if (c == '0') {
+            if (len != 1)
+                return FALSE;
+            n = 0;
+        } else {
+            n = c - '0';
+            for(i = 1; i < len; i++) {
+                c = string_get(p, i);
+                if (!is_num(c))
+                    return FALSE;
+                n64 = (uint64_t)n * 10 + (c - '0');
+                if ((n64 >> 32) != 0)
+                    return FALSE;
+                n = n64;
+            }
+        }
+        *pval = n;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+/* XXX: could use faster version ? */
+static inline uint32_t hash_string8(const uint8_t *str, size_t len, uint32_t h)
+{
+    size_t i;
+
+    for(i = 0; i < len; i++)
+        h = h * 263 + str[i];
+    return h;
+}
+
+static inline uint32_t hash_string16(const uint16_t *str,
+                                     size_t len, uint32_t h)
+{
+    size_t i;
+
+    for(i = 0; i < len; i++)
+        h = h * 263 + str[i];
+    return h;
+}
+
+static uint32_t hash_string(const JSString *str, uint32_t h)
+{
+    if (str->is_wide_char)
+        h = hash_string16(str->u.str16, str->len, h);
+    else
+        h = hash_string8(str->u.str8, str->len, h);
+    return h;
+}
+
+static __maybe_unused void JS_DumpChar(JSRuntime *rt, int c, int sep)
+{
+    if (c == sep || c == '\\') {
+        putchar('\\');
+        putchar(c);
+    } else if (c >= ' ' && c <= 126) {
+        putchar(c);
+    } else if (c == '\n') {
+        putchar('\\');
+        putchar('n');
+    } else {
+        printf("\\u%04x", c);
+    }
+}
+
+static __maybe_unused void JS_DumpString(JSRuntime *rt, const JSString *p)
+{
+    int i, sep;
+
+    if (p == NULL) {
+        printf("<null>");
+        return;
+    }
+    printf("%d", p->header.ref_count);
+    sep = (p->header.ref_count == 1) ? '\"' : '\'';
+    putchar(sep);
+    for(i = 0; i < p->len; i++) {
+        JS_DumpChar(rt, string_get(p, i), sep);
+    }
+    putchar(sep);
+}
+
+static __maybe_unused void JS_DumpAtoms(JSRuntime *rt)
+{
+    JSAtomStruct *p;
+    int h, i;
+    /* This only dumps hashed atoms, not JS_ATOM_TYPE_SYMBOL atoms */
+    printf("JSAtom count=%d size=%d hash_size=%d:\n",
+           rt->atom_count, rt->atom_size, rt->atom_hash_size);
+    printf("JSAtom hash table: {\n");
+    for(i = 0; i < rt->atom_hash_size; i++) {
+        h = rt->atom_hash[i];
+        if (h) {
+            printf("  %d:", i);
+            while (h) {
+                p = rt->atom_array[h];
+                printf(" ");
+                JS_DumpString(rt, p);
+                h = p->hash_next;
+            }
+            printf("\n");
+        }
+    }
+    printf("}\n");
+    printf("JSAtom table: {\n");
+    for(i = 0; i < rt->atom_size; i++) {
+        p = rt->atom_array[i];
+        if (!atom_is_free(p)) {
+            printf("  %d: { %d %08x ", i, p->atom_type, p->hash);
+            if (!(p->len == 0 && p->is_wide_char != 0))
+                JS_DumpString(rt, p);
+            printf(" %d }\n", p->hash_next);
+        }
+    }
+    printf("}\n");
+}
+
+static int JS_ResizeAtomHash(JSRuntime *rt, int new_hash_size)
+{
+    JSAtomStruct *p;
+    uint32_t new_hash_mask, h, i, hash_next1, j, *new_hash;
+
+    assert((new_hash_size & (new_hash_size - 1)) == 0); /* power of two */
+    new_hash_mask = new_hash_size - 1;
+    new_hash = js_mallocz_rt(rt, sizeof(rt->atom_hash[0]) * new_hash_size);
+    if (!new_hash)
+        return -1;
+    for(i = 0; i < rt->atom_hash_size; i++) {
+        h = rt->atom_hash[i];
+        while (h != 0) {
+            p = rt->atom_array[h];
+            hash_next1 = p->hash_next;
+            /* add in new hash table */
+            j = p->hash & new_hash_mask;
+            p->hash_next = new_hash[j];
+            new_hash[j] = h;
+            h = hash_next1;
+        }
+    }
+    js_free_rt(rt, rt->atom_hash);
+    rt->atom_hash = new_hash;
+    rt->atom_hash_size = new_hash_size;
+    rt->atom_count_resize = JS_ATOM_COUNT_RESIZE(new_hash_size);
+    //    JS_DumpAtoms(rt);
+    return 0;
+}
+
+static int JS_InitAtoms(JSRuntime *rt)
+{
+    int i, len, atom_type;
+    const char *p;
+
+    rt->atom_hash_size = 0;
+    rt->atom_hash = NULL;
+    rt->atom_count = 0;
+    rt->atom_size = 0;
+    rt->atom_free_index = 0;
+    if (JS_ResizeAtomHash(rt, 256))     /* there are at least 195 predefined atoms */
+        return -1;
+
+    p = js_atom_init;
+    for(i = 1; i < JS_ATOM_END; i++) {
+        if (i == JS_ATOM_Private_brand)
+            atom_type = JS_ATOM_TYPE_PRIVATE;
+        else if (i >= JS_ATOM_Symbol_toPrimitive)
+            atom_type = JS_ATOM_TYPE_SYMBOL;
+        else
+            atom_type = JS_ATOM_TYPE_STRING;
+        len = strlen(p);
+        if (__JS_NewAtomInit(rt, p, len, atom_type) == JS_ATOM_NULL)
+            return -1;
+        p = p + len + 1;
+    }
+    return 0;
+}
+
+static JSAtom JS_DupAtomRT(JSRuntime *rt, JSAtom v)
+{
+    JSAtomStruct *p;
+
+    if (!__JS_AtomIsConst(v)) {
+        p = rt->atom_array[v];
+        p->header.ref_count++;
+    }
+    return v;
+}
+
+JSAtom JS_DupAtom(JSContext *ctx, JSAtom v)
+{
+    JSRuntime *rt;
+    JSAtomStruct *p;
+
+    if (!__JS_AtomIsConst(v)) {
+        rt = ctx->rt;
+        p = rt->atom_array[v];
+        p->header.ref_count++;
+    }
+    return v;
+}
+
+static JSAtomKindEnum JS_AtomGetKind(JSContext *ctx, JSAtom v)
+{
+    JSRuntime *rt;
+    JSAtomStruct *p;
+
+    rt = ctx->rt;
+    if (__JS_AtomIsTaggedInt(v))
+        return JS_ATOM_KIND_STRING;
+    p = rt->atom_array[v];
+    switch(p->atom_type) {
+    case JS_ATOM_TYPE_STRING:
+        return JS_ATOM_KIND_STRING;
+    case JS_ATOM_TYPE_GLOBAL_SYMBOL:
+        return JS_ATOM_KIND_SYMBOL;
+    case JS_ATOM_TYPE_SYMBOL:
+        switch(p->hash) {
+        case JS_ATOM_HASH_SYMBOL:
+            return JS_ATOM_KIND_SYMBOL;
+        case JS_ATOM_HASH_PRIVATE:
+            return JS_ATOM_KIND_PRIVATE;
+        default:
+            abort();
+        }
+    default:
+        abort();
+    }
+}
+
+static BOOL JS_AtomIsString(JSContext *ctx, JSAtom v)
+{
+    return JS_AtomGetKind(ctx, v) == JS_ATOM_KIND_STRING;
+}
+
+static JSAtom js_get_atom_index(JSRuntime *rt, JSAtomStruct *p)
+{
+    uint32_t i = p->hash_next;  /* atom_index */
+    if (p->atom_type != JS_ATOM_TYPE_SYMBOL) {
+        JSAtomStruct *p1;
+
+        i = rt->atom_hash[p->hash & (rt->atom_hash_size - 1)];
+        p1 = rt->atom_array[i];
+        while (p1 != p) {
+            assert(i != 0);
+            i = p1->hash_next;
+            p1 = rt->atom_array[i];
+        }
+    }
+    return i;
+}
+
+/* string case (internal). Return JS_ATOM_NULL if error. 'str' is
+   freed. */
+static JSAtom __JS_NewAtom(JSRuntime *rt, JSString *str, int atom_type)
+{
+    uint32_t h, h1, i;
+    JSAtomStruct *p;
+    int len;
+
+#if 0
+    printf("__JS_NewAtom: ");  JS_DumpString(rt, str); printf("\n");
+#endif
+    if (atom_type < JS_ATOM_TYPE_SYMBOL) {
+        /* str is not NULL */
+        if (str->atom_type == atom_type) {
+            /* str is the atom, return its index */
+            i = js_get_atom_index(rt, str);
+            /* reduce string refcount and increase atom's unless constant */
+            if (__JS_AtomIsConst(i))
+                str->header.ref_count--;
+            return i;
+        }
+        /* try and locate an already registered atom */
+        len = str->len;
+        h = hash_string(str, atom_type);
+        h &= JS_ATOM_HASH_MASK;
+        h1 = h & (rt->atom_hash_size - 1);
+        i = rt->atom_hash[h1];
+        while (i != 0) {
+            p = rt->atom_array[i];
+            if (p->hash == h &&
+                p->atom_type == atom_type &&
+                p->len == len &&
+                js_string_memcmp(p, str, len) == 0) {
+                if (!__JS_AtomIsConst(i))
+                    p->header.ref_count++;
+                goto done;
+            }
+            i = p->hash_next;
+        }
+    } else {
+        h1 = 0; /* avoid warning */
+        if (atom_type == JS_ATOM_TYPE_SYMBOL) {
+            h = JS_ATOM_HASH_SYMBOL;
+        } else {
+            h = JS_ATOM_HASH_PRIVATE;
+            atom_type = JS_ATOM_TYPE_SYMBOL;
+        }
+    }
+
+    if (rt->atom_free_index == 0) {
+        /* allow new atom entries */
+        uint32_t new_size, start;
+        JSAtomStruct **new_array;
+
+        /* alloc new with size progression 3/2:
+           4 6 9 13 19 28 42 63 94 141 211 316 474 711 1066 1599 2398 3597 5395 8092
+           preallocating space for predefined atoms (at least 195).
+         */
+        new_size = max_int(211, rt->atom_size * 3 / 2);
+        if (new_size > JS_ATOM_MAX)
+            goto fail;
+        /* XXX: should use realloc2 to use slack space */
+        new_array = js_realloc_rt(rt, rt->atom_array, sizeof(*new_array) * new_size);
+        if (!new_array)
+            goto fail;
+        /* Note: the atom 0 is not used */
+        start = rt->atom_size;
+        if (start == 0) {
+            /* JS_ATOM_NULL entry */
+            p = js_mallocz_rt(rt, sizeof(JSAtomStruct));
+            if (!p) {
+                js_free_rt(rt, new_array);
+                goto fail;
+            }
+            p->header.ref_count = 1;  /* not refcounted */
+            p->atom_type = JS_ATOM_TYPE_SYMBOL;
+#ifdef DUMP_LEAKS
+            list_add_tail(&p->link, &rt->string_list);
+#endif
+            new_array[0] = p;
+            rt->atom_count++;
+            start = 1;
+        }
+        rt->atom_size = new_size;
+        rt->atom_array = new_array;
+        rt->atom_free_index = start;
+        for(i = start; i < new_size; i++) {
+            uint32_t next;
+            if (i == (new_size - 1))
+                next = 0;
+            else
+                next = i + 1;
+            rt->atom_array[i] = atom_set_free(next);
+        }
+    }
+
+    if (str) {
+        if (str->atom_type == 0) {
+            p = str;
+            p->atom_type = atom_type;
+        } else {
+            p = js_malloc_rt(rt, sizeof(JSString) +
+                             (str->len << str->is_wide_char) +
+                             1 - str->is_wide_char);
+            if (unlikely(!p))
+                goto fail;
+            p->header.ref_count = 1;
+            p->is_wide_char = str->is_wide_char;
+            p->len = str->len;
+#ifdef DUMP_LEAKS
+            list_add_tail(&p->link, &rt->string_list);
+#endif
+            memcpy(p->u.str8, str->u.str8, (str->len << str->is_wide_char) +
+                   1 - str->is_wide_char);
+            js_free_string(rt, str);
+        }
+    } else {
+        p = js_malloc_rt(rt, sizeof(JSAtomStruct)); /* empty wide string */
+        if (!p)
+            return JS_ATOM_NULL;
+        p->header.ref_count = 1;
+        p->is_wide_char = 1;    /* Hack to represent NULL as a JSString */
+        p->len = 0;
+#ifdef DUMP_LEAKS
+        list_add_tail(&p->link, &rt->string_list);
+#endif
+    }
+
+    /* use an already free entry */
+    i = rt->atom_free_index;
+    rt->atom_free_index = atom_get_free(rt->atom_array[i]);
+    rt->atom_array[i] = p;
+
+    p->hash = h;
+    p->hash_next = i;   /* atom_index */
+    p->atom_type = atom_type;
+
+    rt->atom_count++;
+
+    if (atom_type != JS_ATOM_TYPE_SYMBOL) {
+        p->hash_next = rt->atom_hash[h1];
+        rt->atom_hash[h1] = i;
+        if (unlikely(rt->atom_count >= rt->atom_count_resize))
+            JS_ResizeAtomHash(rt, rt->atom_hash_size * 2);
+    }
+
+    //    JS_DumpAtoms(rt);
+    return i;
+
+ fail:
+    i = JS_ATOM_NULL;
+ done:
+    if (str)
+        js_free_string(rt, str);
+    return i;
+}
+
+/* only works with zero terminated 8 bit strings */
+static JSAtom __JS_NewAtomInit(JSRuntime *rt, const char *str, int len,
+                               int atom_type)
+{
+    JSString *p;
+    p = js_alloc_string_rt(rt, len, 0);
+    if (!p)
+        return JS_ATOM_NULL;
+    memcpy(p->u.str8, str, len);
+    p->u.str8[len] = '\0';
+    return __JS_NewAtom(rt, p, atom_type);
+}
+
+/* Warning: str must be ASCII only */
+static JSAtom __JS_FindAtom(JSRuntime *rt, const char *str, size_t len,
+                            int atom_type)
+{
+    uint32_t h, h1, i;
+    JSAtomStruct *p;
+
+    h = hash_string8((const uint8_t *)str, len, JS_ATOM_TYPE_STRING);
+    h &= JS_ATOM_HASH_MASK;
+    h1 = h & (rt->atom_hash_size - 1);
+    i = rt->atom_hash[h1];
+    while (i != 0) {
+        p = rt->atom_array[i];
+        if (p->hash == h &&
+            p->atom_type == JS_ATOM_TYPE_STRING &&
+            p->len == len &&
+            p->is_wide_char == 0 &&
+            memcmp(p->u.str8, str, len) == 0) {
+            if (!__JS_AtomIsConst(i))
+                p->header.ref_count++;
+            return i;
+        }
+        i = p->hash_next;
+    }
+    return JS_ATOM_NULL;
+}
+
+static void JS_FreeAtomStruct(JSRuntime *rt, JSAtomStruct *p)
+{
+#if 0   /* JS_ATOM_NULL is not refcounted: __JS_AtomIsConst() includes 0 */
+    if (unlikely(i == JS_ATOM_NULL)) {
+        p->header.ref_count = INT32_MAX / 2;
+        return;
+    }
+#endif
+    uint32_t i = p->hash_next;  /* atom_index */
+    if (p->atom_type != JS_ATOM_TYPE_SYMBOL) {
+        JSAtomStruct *p0, *p1;
+        uint32_t h0;
+
+        h0 = p->hash & (rt->atom_hash_size - 1);
+        i = rt->atom_hash[h0];
+        p1 = rt->atom_array[i];
+        if (p1 == p) {
+            rt->atom_hash[h0] = p1->hash_next;
+        } else {
+            for(;;) {
+                assert(i != 0);
+                p0 = p1;
+                i = p1->hash_next;
+                p1 = rt->atom_array[i];
+                if (p1 == p) {
+                    p0->hash_next = p1->hash_next;
+                    break;
+                }
+            }
+        }
+    }
+    /* insert in free atom list */
+    rt->atom_array[i] = atom_set_free(rt->atom_free_index);
+    rt->atom_free_index = i;
+    /* free the string structure */
+#ifdef DUMP_LEAKS
+    list_del(&p->link);
+#endif
+    js_free_rt(rt, p);
+    rt->atom_count--;
+    assert(rt->atom_count >= 0);
+}
+
+static void __JS_FreeAtom(JSRuntime *rt, uint32_t i)
+{
+    JSAtomStruct *p;
+
+    p = rt->atom_array[i];
+    if (--p->header.ref_count > 0)
+        return;
+    JS_FreeAtomStruct(rt, p);
+}
+
+/* Warning: 'p' is freed */
+static JSAtom JS_NewAtomStr(JSContext *ctx, JSString *p)
+{
+    JSRuntime *rt = ctx->rt;
+    uint32_t n;
+    if (is_num_string(&n, p)) {
+        if (n <= JS_ATOM_MAX_INT) {
+            js_free_string(rt, p);
+            return __JS_AtomFromUInt32(n);
+        }
+    }
+    /* XXX: should generate an exception */
+    return __JS_NewAtom(rt, p, JS_ATOM_TYPE_STRING);
+}
+
+/* str is UTF-8 encoded */
+JSAtom JS_NewAtomLen(JSContext *ctx, const char *str, size_t len)
+{
+    JSValue val;
+
+    if (len == 0 || !is_digit(*str)) {
+        // XXX: this will not work if UTF-8 encoded str contains non ASCII bytes
+        JSAtom atom = __JS_FindAtom(ctx->rt, str, len, JS_ATOM_TYPE_STRING);
+        if (atom)
+            return atom;
+    }
+    val = JS_NewStringLen(ctx, str, len);
+    if (JS_IsException(val))
+        return JS_ATOM_NULL;
+    return JS_NewAtomStr(ctx, JS_VALUE_GET_STRING(val));
+}
+
+JSAtom JS_NewAtom(JSContext *ctx, const char *str)
+{
+    return JS_NewAtomLen(ctx, str, strlen(str));
+}
+
+JSAtom JS_NewAtomUInt32(JSContext *ctx, uint32_t n)
+{
+    if (n <= JS_ATOM_MAX_INT) {
+        return __JS_AtomFromUInt32(n);
+    } else {
+        char buf[11];
+        JSValue val;
+        snprintf(buf, sizeof(buf), "%u", n);
+        val = JS_NewString(ctx, buf);
+        if (JS_IsException(val))
+            return JS_ATOM_NULL;
+        return __JS_NewAtom(ctx->rt, JS_VALUE_GET_STRING(val),
+                            JS_ATOM_TYPE_STRING);
+    }
+}
+
+static JSAtom JS_NewAtomInt64(JSContext *ctx, int64_t n)
+{
+    if ((uint64_t)n <= JS_ATOM_MAX_INT) {
+        return __JS_AtomFromUInt32((uint32_t)n);
+    } else {
+        char buf[24];
+        JSValue val;
+        snprintf(buf, sizeof(buf), "%" PRId64 , n);
+        val = JS_NewString(ctx, buf);
+        if (JS_IsException(val))
+            return JS_ATOM_NULL;
+        return __JS_NewAtom(ctx->rt, JS_VALUE_GET_STRING(val),
+                            JS_ATOM_TYPE_STRING);
+    }
+}
+
+/* 'p' is freed */
+static JSValue JS_NewSymbol(JSContext *ctx, JSString *p, int atom_type)
+{
+    JSRuntime *rt = ctx->rt;
+    JSAtom atom;
+    atom = __JS_NewAtom(rt, p, atom_type);
+    if (atom == JS_ATOM_NULL)
+        return JS_ThrowOutOfMemory(ctx);
+    return JS_MKPTR(JS_TAG_SYMBOL, rt->atom_array[atom]);
+}
+
+/* descr must be a non-numeric string atom */
+static JSValue JS_NewSymbolFromAtom(JSContext *ctx, JSAtom descr,
+                                    int atom_type)
+{
+    JSRuntime *rt = ctx->rt;
+    JSString *p;
+
+    assert(!__JS_AtomIsTaggedInt(descr));
+    assert(descr < rt->atom_size);
+    p = rt->atom_array[descr];
+    JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+    return JS_NewSymbol(ctx, p, atom_type);
+}
+
+#define ATOM_GET_STR_BUF_SIZE 64
+
+/* Should only be used for debug. */
+static const char *JS_AtomGetStrRT(JSRuntime *rt, char *buf, int buf_size,
+                                   JSAtom atom)
+{
+    if (__JS_AtomIsTaggedInt(atom)) {
+        snprintf(buf, buf_size, "%u", __JS_AtomToUInt32(atom));
+    } else {
+        JSAtomStruct *p;
+        assert(atom < rt->atom_size);
+        if (atom == JS_ATOM_NULL) {
+            snprintf(buf, buf_size, "<null>");
+        } else {
+            int i, c;
+            char *q;
+            JSString *str;
+
+            q = buf;
+            p = rt->atom_array[atom];
+            assert(!atom_is_free(p));
+            str = p;
+            if (str) {
+                if (!str->is_wide_char) {
+                    /* special case ASCII strings */
+                    c = 0;
+                    for(i = 0; i < str->len; i++) {
+                        c |= str->u.str8[i];
+                    }
+                    if (c < 0x80)
+                        return (const char *)str->u.str8;
+                }
+                for(i = 0; i < str->len; i++) {
+                    c = string_get(str, i);
+                    if ((q - buf) >= buf_size - UTF8_CHAR_LEN_MAX)
+                        break;
+                    if (c < 128) {
+                        *q++ = c;
+                    } else {
+                        q += unicode_to_utf8((uint8_t *)q, c);
+                    }
+                }
+            }
+            *q = '\0';
+        }
+    }
+    return buf;
+}
+
+static const char *JS_AtomGetStr(JSContext *ctx, char *buf, int buf_size, JSAtom atom)
+{
+    return JS_AtomGetStrRT(ctx->rt, buf, buf_size, atom);
+}
+
+static JSValue __JS_AtomToValue(JSContext *ctx, JSAtom atom, BOOL force_string)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+
+    if (__JS_AtomIsTaggedInt(atom)) {
+        snprintf(buf, sizeof(buf), "%u", __JS_AtomToUInt32(atom));
+        return JS_NewString(ctx, buf);
+    } else {
+        JSRuntime *rt = ctx->rt;
+        JSAtomStruct *p;
+        assert(atom < rt->atom_size);
+        p = rt->atom_array[atom];
+        if (p->atom_type == JS_ATOM_TYPE_STRING) {
+            goto ret_string;
+        } else if (force_string) {
+            if (p->len == 0 && p->is_wide_char != 0) {
+                /* no description string */
+                p = rt->atom_array[JS_ATOM_empty_string];
+            }
+        ret_string:
+            return JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+        } else {
+            return JS_DupValue(ctx, JS_MKPTR(JS_TAG_SYMBOL, p));
+        }
+    }
+}
+
+JSValue JS_AtomToValue(JSContext *ctx, JSAtom atom)
+{
+    return __JS_AtomToValue(ctx, atom, FALSE);
+}
+
+JSValue JS_AtomToString(JSContext *ctx, JSAtom atom)
+{
+    return __JS_AtomToValue(ctx, atom, TRUE);
+}
+
+/* return TRUE if the atom is an array index (i.e. 0 <= index <=
+   2^32-2 and return its value */
+static BOOL JS_AtomIsArrayIndex(JSContext *ctx, uint32_t *pval, JSAtom atom)
+{
+    if (__JS_AtomIsTaggedInt(atom)) {
+        *pval = __JS_AtomToUInt32(atom);
+        return TRUE;
+    } else {
+        JSRuntime *rt = ctx->rt;
+        JSAtomStruct *p;
+        uint32_t val;
+
+        assert(atom < rt->atom_size);
+        p = rt->atom_array[atom];
+        if (p->atom_type == JS_ATOM_TYPE_STRING &&
+            is_num_string(&val, p) && val != -1) {
+            *pval = val;
+            return TRUE;
+        } else {
+            *pval = 0;
+            return FALSE;
+        }
+    }
+}
+
+/* This test must be fast if atom is not a numeric index (e.g. a
+   method name). Return JS_UNDEFINED if not a numeric
+   index. JS_EXCEPTION can also be returned. */
+static JSValue JS_AtomIsNumericIndex1(JSContext *ctx, JSAtom atom)
+{
+    JSRuntime *rt = ctx->rt;
+    JSAtomStruct *p1;
+    JSString *p;
+    int c, len, ret;
+    JSValue num, str;
+
+    if (__JS_AtomIsTaggedInt(atom))
+        return JS_NewInt32(ctx, __JS_AtomToUInt32(atom));
+    assert(atom < rt->atom_size);
+    p1 = rt->atom_array[atom];
+    if (p1->atom_type != JS_ATOM_TYPE_STRING)
+        return JS_UNDEFINED;
+    p = p1;
+    len = p->len;
+    if (p->is_wide_char) {
+        const uint16_t *r = p->u.str16, *r_end = p->u.str16 + len;
+        if (r >= r_end)
+            return JS_UNDEFINED;
+        c = *r;
+        if (c == '-') {
+            if (r >= r_end)
+                return JS_UNDEFINED;
+            r++;
+            c = *r;
+            /* -0 case is specific */
+            if (c == '0' && len == 2)
+                goto minus_zero;
+        }
+        /* XXX: should test NaN, but the tests do not check it */
+        if (!is_num(c)) {
+            /* XXX: String should be normalized, therefore 8-bit only */
+            const uint16_t nfinity16[7] = { 'n', 'f', 'i', 'n', 'i', 't', 'y' };
+            if (!(c =='I' && (r_end - r) == 8 &&
+                  !memcmp(r + 1, nfinity16, sizeof(nfinity16))))
+                return JS_UNDEFINED;
+        }
+    } else {
+        const uint8_t *r = p->u.str8, *r_end = p->u.str8 + len;
+        if (r >= r_end)
+            return JS_UNDEFINED;
+        c = *r;
+        if (c == '-') {
+            if (r >= r_end)
+                return JS_UNDEFINED;
+            r++;
+            c = *r;
+            /* -0 case is specific */
+            if (c == '0' && len == 2) {
+            minus_zero:
+                return __JS_NewFloat64(ctx, -0.0);
+            }
+        }
+        if (!is_num(c)) {
+            if (!(c =='I' && (r_end - r) == 8 &&
+                  !memcmp(r + 1, "nfinity", 7)))
+                return JS_UNDEFINED;
+        }
+    }
+    /* XXX: bignum: would be better to only accept integer to avoid
+       relying on current floating point precision */
+    /* this is ECMA CanonicalNumericIndexString primitive */
+    num = JS_ToNumber(ctx, JS_MKPTR(JS_TAG_STRING, p));
+    if (JS_IsException(num))
+        return num;
+    str = JS_ToString(ctx, num);
+    if (JS_IsException(str)) {
+        JS_FreeValue(ctx, num);
+        return str;
+    }
+    ret = js_string_compare(ctx, p, JS_VALUE_GET_STRING(str));
+    JS_FreeValue(ctx, str);
+    if (ret == 0) {
+        return num;
+    } else {
+        JS_FreeValue(ctx, num);
+        return JS_UNDEFINED;
+    }
+}
+
+/* return -1 if exception or TRUE/FALSE */
+static int JS_AtomIsNumericIndex(JSContext *ctx, JSAtom atom)
+{
+    JSValue num;
+    num = JS_AtomIsNumericIndex1(ctx, atom);
+    if (likely(JS_IsUndefined(num)))
+        return FALSE;
+    if (JS_IsException(num))
+        return -1;
+    JS_FreeValue(ctx, num);
+    return TRUE;
+}
+
+void JS_FreeAtom(JSContext *ctx, JSAtom v)
+{
+    if (!__JS_AtomIsConst(v))
+        __JS_FreeAtom(ctx->rt, v);
+}
+
+void JS_FreeAtomRT(JSRuntime *rt, JSAtom v)
+{
+    if (!__JS_AtomIsConst(v))
+        __JS_FreeAtom(rt, v);
+}
+
+/* return TRUE if 'v' is a symbol with a string description */
+static BOOL JS_AtomSymbolHasDescription(JSContext *ctx, JSAtom v)
+{
+    JSRuntime *rt;
+    JSAtomStruct *p;
+
+    rt = ctx->rt;
+    if (__JS_AtomIsTaggedInt(v))
+        return FALSE;
+    p = rt->atom_array[v];
+    return (((p->atom_type == JS_ATOM_TYPE_SYMBOL &&
+              p->hash == JS_ATOM_HASH_SYMBOL) ||
+             p->atom_type == JS_ATOM_TYPE_GLOBAL_SYMBOL) &&
+            !(p->len == 0 && p->is_wide_char != 0));
+}
+
+static __maybe_unused void print_atom(JSContext *ctx, JSAtom atom)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+    const char *p;
+    int i;
+
+    /* XXX: should handle embedded null characters */
+    /* XXX: should move encoding code to JS_AtomGetStr */
+    p = JS_AtomGetStr(ctx, buf, sizeof(buf), atom);
+    for (i = 0; p[i]; i++) {
+        int c = (unsigned char)p[i];
+        if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
+              (c == '_' || c == '$') || (c >= '0' && c <= '9' && i > 0)))
+            break;
+    }
+    if (i > 0 && p[i] == '\0') {
+        printf("%s", p);
+    } else {
+        putchar('"');
+        printf("%.*s", i, p);
+        for (; p[i]; i++) {
+            int c = (unsigned char)p[i];
+            if (c == '\"' || c == '\\') {
+                putchar('\\');
+                putchar(c);
+            } else if (c >= ' ' && c <= 126) {
+                putchar(c);
+            } else if (c == '\n') {
+                putchar('\\');
+                putchar('n');
+            } else {
+                printf("\\u%04x", c);
+            }
+        }
+        putchar('\"');
+    }
+}
+
+/* free with JS_FreeCString() */
+const char *JS_AtomToCString(JSContext *ctx, JSAtom atom)
+{
+    JSValue str;
+    const char *cstr;
+
+    str = JS_AtomToString(ctx, atom);
+    if (JS_IsException(str))
+        return NULL;
+    cstr = JS_ToCString(ctx, str);
+    JS_FreeValue(ctx, str);
+    return cstr;
+}
+
+/* return a string atom containing name concatenated with str1 */
+static JSAtom js_atom_concat_str(JSContext *ctx, JSAtom name, const char *str1)
+{
+    JSValue str;
+    JSAtom atom;
+    const char *cstr;
+    char *cstr2;
+    size_t len, len1;
+
+    str = JS_AtomToString(ctx, name);
+    if (JS_IsException(str))
+        return JS_ATOM_NULL;
+    cstr = JS_ToCStringLen(ctx, &len, str);
+    if (!cstr)
+        goto fail;
+    len1 = strlen(str1);
+    cstr2 = js_malloc(ctx, len + len1 + 1);
+    if (!cstr2)
+        goto fail;
+    memcpy(cstr2, cstr, len);
+    memcpy(cstr2 + len, str1, len1);
+    cstr2[len + len1] = '\0';
+    atom = JS_NewAtomLen(ctx, cstr2, len + len1);
+    js_free(ctx, cstr2);
+    JS_FreeCString(ctx, cstr);
+    JS_FreeValue(ctx, str);
+    return atom;
+ fail:
+    JS_FreeCString(ctx, cstr);
+    JS_FreeValue(ctx, str);
+    return JS_ATOM_NULL;
+}
+
+static JSAtom js_atom_concat_num(JSContext *ctx, JSAtom name, uint32_t n)
+{
+    char buf[16];
+    snprintf(buf, sizeof(buf), "%u", n);
+    return js_atom_concat_str(ctx, name, buf);
+}
+
+static inline BOOL JS_IsEmptyString(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_STRING && JS_VALUE_GET_STRING(v)->len == 0;
+}
+
+/* JSClass support */
+
+#ifdef CONFIG_ATOMICS
+static pthread_mutex_t js_class_id_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
+/* a new class ID is allocated if *pclass_id != 0 */
+JSClassID JS_NewClassID(JSClassID *pclass_id)
+{
+    JSClassID class_id;
+#ifdef CONFIG_ATOMICS
+    pthread_mutex_lock(&js_class_id_mutex);
+#endif
+    class_id = *pclass_id;
+    if (class_id == 0) {
+        class_id = js_class_id_alloc++;
+        *pclass_id = class_id;
+    }
+#ifdef CONFIG_ATOMICS
+    pthread_mutex_unlock(&js_class_id_mutex);
+#endif
+    return class_id;
+}
+
+JSClassID JS_GetClassID(JSValue v)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(v) != JS_TAG_OBJECT)
+        return JS_INVALID_CLASS_ID;
+    p = JS_VALUE_GET_OBJ(v);
+    return p->class_id;
+}
+
+BOOL JS_IsRegisteredClass(JSRuntime *rt, JSClassID class_id)
+{
+    return (class_id < rt->class_count &&
+            rt->class_array[class_id].class_id != 0);
+}
+
+/* create a new object internal class. Return -1 if error, 0 if
+   OK. The finalizer can be NULL if none is needed. */
+static int JS_NewClass1(JSRuntime *rt, JSClassID class_id,
+                        const JSClassDef *class_def, JSAtom name)
+{
+    int new_size, i;
+    JSClass *cl, *new_class_array;
+    struct list_head *el;
+
+    if (class_id >= (1 << 16))
+        return -1;
+    if (class_id < rt->class_count &&
+        rt->class_array[class_id].class_id != 0)
+        return -1;
+
+    if (class_id >= rt->class_count) {
+        new_size = max_int(JS_CLASS_INIT_COUNT,
+                           max_int(class_id + 1, rt->class_count * 3 / 2));
+
+        /* reallocate the context class prototype array, if any */
+        list_for_each(el, &rt->context_list) {
+            JSContext *ctx = list_entry(el, JSContext, link);
+            JSValue *new_tab;
+            new_tab = js_realloc_rt(rt, ctx->class_proto,
+                                    sizeof(ctx->class_proto[0]) * new_size);
+            if (!new_tab)
+                return -1;
+            for(i = rt->class_count; i < new_size; i++)
+                new_tab[i] = JS_NULL;
+            ctx->class_proto = new_tab;
+        }
+        /* reallocate the class array */
+        new_class_array = js_realloc_rt(rt, rt->class_array,
+                                        sizeof(JSClass) * new_size);
+        if (!new_class_array)
+            return -1;
+        memset(new_class_array + rt->class_count, 0,
+               (new_size - rt->class_count) * sizeof(JSClass));
+        rt->class_array = new_class_array;
+        rt->class_count = new_size;
+    }
+    cl = &rt->class_array[class_id];
+    cl->class_id = class_id;
+    cl->class_name = JS_DupAtomRT(rt, name);
+    cl->finalizer = class_def->finalizer;
+    cl->gc_mark = class_def->gc_mark;
+    cl->call = class_def->call;
+    cl->exotic = class_def->exotic;
+    return 0;
+}
+
+int JS_NewClass(JSRuntime *rt, JSClassID class_id, const JSClassDef *class_def)
+{
+    int ret, len;
+    JSAtom name;
+
+    len = strlen(class_def->class_name);
+    name = __JS_FindAtom(rt, class_def->class_name, len, JS_ATOM_TYPE_STRING);
+    if (name == JS_ATOM_NULL) {
+        name = __JS_NewAtomInit(rt, class_def->class_name, len, JS_ATOM_TYPE_STRING);
+        if (name == JS_ATOM_NULL)
+            return -1;
+    }
+    ret = JS_NewClass1(rt, class_id, class_def, name);
+    JS_FreeAtomRT(rt, name);
+    return ret;
+}
+
+static JSValue js_new_string8(JSContext *ctx, const uint8_t *buf, int len)
+{
+    JSString *str;
+
+    if (len <= 0) {
+        return JS_AtomToString(ctx, JS_ATOM_empty_string);
+    }
+    str = js_alloc_string(ctx, len, 0);
+    if (!str)
+        return JS_EXCEPTION;
+    memcpy(str->u.str8, buf, len);
+    str->u.str8[len] = '\0';
+    return JS_MKPTR(JS_TAG_STRING, str);
+}
+
+static JSValue js_new_string16(JSContext *ctx, const uint16_t *buf, int len)
+{
+    JSString *str;
+    str = js_alloc_string(ctx, len, 1);
+    if (!str)
+        return JS_EXCEPTION;
+    memcpy(str->u.str16, buf, len * 2);
+    return JS_MKPTR(JS_TAG_STRING, str);
+}
+
+static JSValue js_new_string_char(JSContext *ctx, uint16_t c)
+{
+    if (c < 0x100) {
+        uint8_t ch8 = c;
+        return js_new_string8(ctx, &ch8, 1);
+    } else {
+        uint16_t ch16 = c;
+        return js_new_string16(ctx, &ch16, 1);
+    }
+}
+
+static JSValue js_sub_string(JSContext *ctx, JSString *p, int start, int end)
+{
+    int len = end - start;
+    if (start == 0 && end == p->len) {
+        return JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+    }
+    if (p->is_wide_char && len > 0) {
+        JSString *str;
+        int i;
+        uint16_t c = 0;
+        for (i = start; i < end; i++) {
+            c |= p->u.str16[i];
+        }
+        if (c > 0xFF)
+            return js_new_string16(ctx, p->u.str16 + start, len);
+
+        str = js_alloc_string(ctx, len, 0);
+        if (!str)
+            return JS_EXCEPTION;
+        for (i = 0; i < len; i++) {
+            str->u.str8[i] = p->u.str16[start + i];
+        }
+        str->u.str8[len] = '\0';
+        return JS_MKPTR(JS_TAG_STRING, str);
+    } else {
+        return js_new_string8(ctx, p->u.str8 + start, len);
+    }
+}
+
+typedef struct StringBuffer {
+    JSContext *ctx;
+    JSString *str;
+    int len;
+    int size;
+    int is_wide_char;
+    int error_status;
+} StringBuffer;
+
+/* It is valid to call string_buffer_end() and all string_buffer functions even
+   if string_buffer_init() or another string_buffer function returns an error.
+   If the error_status is set, string_buffer_end() returns JS_EXCEPTION.
+ */
+static int string_buffer_init2(JSContext *ctx, StringBuffer *s, int size,
+                               int is_wide)
+{
+    s->ctx = ctx;
+    s->size = size;
+    s->len = 0;
+    s->is_wide_char = is_wide;
+    s->error_status = 0;
+    s->str = js_alloc_string(ctx, size, is_wide);
+    if (unlikely(!s->str)) {
+        s->size = 0;
+        return s->error_status = -1;
+    }
+#ifdef DUMP_LEAKS
+    /* the StringBuffer may reallocate the JSString, only link it at the end */
+    list_del(&s->str->link);
+#endif
+    return 0;
+}
+
+static inline int string_buffer_init(JSContext *ctx, StringBuffer *s, int size)
+{
+    return string_buffer_init2(ctx, s, size, 0);
+}
+
+static void string_buffer_free(StringBuffer *s)
+{
+    js_free(s->ctx, s->str);
+    s->str = NULL;
+}
+
+static int string_buffer_set_error(StringBuffer *s)
+{
+    js_free(s->ctx, s->str);
+    s->str = NULL;
+    s->size = 0;
+    s->len = 0;
+    return s->error_status = -1;
+}
+
+static no_inline int string_buffer_widen(StringBuffer *s, int size)
+{
+    JSString *str;
+    size_t slack;
+    int i;
+
+    if (s->error_status)
+        return -1;
+
+    str = js_realloc2(s->ctx, s->str, sizeof(JSString) + (size << 1), &slack);
+    if (!str)
+        return string_buffer_set_error(s);
+    size += slack >> 1;
+    for(i = s->len; i-- > 0;) {
+        str->u.str16[i] = str->u.str8[i];
+    }
+    s->is_wide_char = 1;
+    s->size = size;
+    s->str = str;
+    return 0;
+}
+
+static no_inline int string_buffer_realloc(StringBuffer *s, int new_len, int c)
+{
+    JSString *new_str;
+    int new_size;
+    size_t new_size_bytes, slack;
+
+    if (s->error_status)
+        return -1;
+
+    if (new_len > JS_STRING_LEN_MAX) {
+        JS_ThrowInternalError(s->ctx, "string too long");
+        return string_buffer_set_error(s);
+    }
+    new_size = min_int(max_int(new_len, s->size * 3 / 2), JS_STRING_LEN_MAX);
+    if (!s->is_wide_char && c >= 0x100) {
+        return string_buffer_widen(s, new_size);
+    }
+    new_size_bytes = sizeof(JSString) + (new_size << s->is_wide_char) + 1 - s->is_wide_char;
+    new_str = js_realloc2(s->ctx, s->str, new_size_bytes, &slack);
+    if (!new_str)
+        return string_buffer_set_error(s);
+    new_size = min_int(new_size + (slack >> s->is_wide_char), JS_STRING_LEN_MAX);
+    s->size = new_size;
+    s->str = new_str;
+    return 0;
+}
+
+static no_inline int string_buffer_putc_slow(StringBuffer *s, uint32_t c)
+{
+    if (unlikely(s->len >= s->size)) {
+        if (string_buffer_realloc(s, s->len + 1, c))
+            return -1;
+    }
+    if (s->is_wide_char) {
+        s->str->u.str16[s->len++] = c;
+    } else if (c < 0x100) {
+        s->str->u.str8[s->len++] = c;
+    } else {
+        if (string_buffer_widen(s, s->size))
+            return -1;
+        s->str->u.str16[s->len++] = c;
+    }
+    return 0;
+}
+
+/* 0 <= c <= 0xff */
+static int string_buffer_putc8(StringBuffer *s, uint32_t c)
+{
+    if (unlikely(s->len >= s->size)) {
+        if (string_buffer_realloc(s, s->len + 1, c))
+            return -1;
+    }
+    if (s->is_wide_char) {
+        s->str->u.str16[s->len++] = c;
+    } else {
+        s->str->u.str8[s->len++] = c;
+    }
+    return 0;
+}
+
+/* 0 <= c <= 0xffff */
+static int string_buffer_putc16(StringBuffer *s, uint32_t c)
+{
+    if (likely(s->len < s->size)) {
+        if (s->is_wide_char) {
+            s->str->u.str16[s->len++] = c;
+            return 0;
+        } else if (c < 0x100) {
+            s->str->u.str8[s->len++] = c;
+            return 0;
+        }
+    }
+    return string_buffer_putc_slow(s, c);
+}
+
+/* 0 <= c <= 0x10ffff */
+static int string_buffer_putc(StringBuffer *s, uint32_t c)
+{
+    if (unlikely(c >= 0x10000)) {
+        /* surrogate pair */
+        if (string_buffer_putc16(s, get_hi_surrogate(c)))
+            return -1;
+        c = get_lo_surrogate(c);
+    }
+    return string_buffer_putc16(s, c);
+}
+
+static int string_getc(const JSString *p, int *pidx)
+{
+    int idx, c, c1;
+    idx = *pidx;
+    if (p->is_wide_char) {
+        c = p->u.str16[idx++];
+        if (is_hi_surrogate(c) && idx < p->len) {
+            c1 = p->u.str16[idx];
+            if (is_lo_surrogate(c1)) {
+                c = from_surrogate(c, c1);
+                idx++;
+            }
+        }
+    } else {
+        c = p->u.str8[idx++];
+    }
+    *pidx = idx;
+    return c;
+}
+
+static int string_buffer_write8(StringBuffer *s, const uint8_t *p, int len)
+{
+    int i;
+
+    if (s->len + len > s->size) {
+        if (string_buffer_realloc(s, s->len + len, 0))
+            return -1;
+    }
+    if (s->is_wide_char) {
+        for (i = 0; i < len; i++) {
+            s->str->u.str16[s->len + i] = p[i];
+        }
+        s->len += len;
+    } else {
+        memcpy(&s->str->u.str8[s->len], p, len);
+        s->len += len;
+    }
+    return 0;
+}
+
+static int string_buffer_write16(StringBuffer *s, const uint16_t *p, int len)
+{
+    int c = 0, i;
+
+    for (i = 0; i < len; i++) {
+        c |= p[i];
+    }
+    if (s->len + len > s->size) {
+        if (string_buffer_realloc(s, s->len + len, c))
+            return -1;
+    } else if (!s->is_wide_char && c >= 0x100) {
+        if (string_buffer_widen(s, s->size))
+            return -1;
+    }
+    if (s->is_wide_char) {
+        memcpy(&s->str->u.str16[s->len], p, len << 1);
+        s->len += len;
+    } else {
+        for (i = 0; i < len; i++) {
+            s->str->u.str8[s->len + i] = p[i];
+        }
+        s->len += len;
+    }
+    return 0;
+}
+
+/* appending an ASCII string */
+static int string_buffer_puts8(StringBuffer *s, const char *str)
+{
+    return string_buffer_write8(s, (const uint8_t *)str, strlen(str));
+}
+
+static int string_buffer_concat(StringBuffer *s, const JSString *p,
+                                uint32_t from, uint32_t to)
+{
+    if (to <= from)
+        return 0;
+    if (p->is_wide_char)
+        return string_buffer_write16(s, p->u.str16 + from, to - from);
+    else
+        return string_buffer_write8(s, p->u.str8 + from, to - from);
+}
+
+static int string_buffer_concat_value(StringBuffer *s, JSValueConst v)
+{
+    JSString *p;
+    JSValue v1;
+    int res;
+
+    if (s->error_status) {
+        /* prevent exception overload */
+        return -1;
+    }
+    if (unlikely(JS_VALUE_GET_TAG(v) != JS_TAG_STRING)) {
+        v1 = JS_ToString(s->ctx, v);
+        if (JS_IsException(v1))
+            return string_buffer_set_error(s);
+        p = JS_VALUE_GET_STRING(v1);
+        res = string_buffer_concat(s, p, 0, p->len);
+        JS_FreeValue(s->ctx, v1);
+        return res;
+    }
+    p = JS_VALUE_GET_STRING(v);
+    return string_buffer_concat(s, p, 0, p->len);
+}
+
+static int string_buffer_concat_value_free(StringBuffer *s, JSValue v)
+{
+    JSString *p;
+    int res;
+
+    if (s->error_status) {
+        /* prevent exception overload */
+        JS_FreeValue(s->ctx, v);
+        return -1;
+    }
+    if (unlikely(JS_VALUE_GET_TAG(v) != JS_TAG_STRING)) {
+        v = JS_ToStringFree(s->ctx, v);
+        if (JS_IsException(v))
+            return string_buffer_set_error(s);
+    }
+    p = JS_VALUE_GET_STRING(v);
+    res = string_buffer_concat(s, p, 0, p->len);
+    JS_FreeValue(s->ctx, v);
+    return res;
+}
+
+static int string_buffer_fill(StringBuffer *s, int c, int count)
+{
+    /* XXX: optimize */
+    if (s->len + count > s->size) {
+        if (string_buffer_realloc(s, s->len + count, c))
+            return -1;
+    }
+    while (count-- > 0) {
+        if (string_buffer_putc16(s, c))
+            return -1;
+    }
+    return 0;
+}
+
+static JSValue string_buffer_end(StringBuffer *s)
+{
+    JSString *str;
+    str = s->str;
+    if (s->error_status)
+        return JS_EXCEPTION;
+    if (s->len == 0) {
+        js_free(s->ctx, str);
+        s->str = NULL;
+        return JS_AtomToString(s->ctx, JS_ATOM_empty_string);
+    }
+    if (s->len < s->size) {
+        /* smaller size so js_realloc should not fail, but OK if it does */
+        /* XXX: should add some slack to avoid unnecessary calls */
+        /* XXX: might need to use malloc+free to ensure smaller size */
+        str = js_realloc_rt(s->ctx->rt, str, sizeof(JSString) +
+                            (s->len << s->is_wide_char) + 1 - s->is_wide_char);
+        if (str == NULL)
+            str = s->str;
+        s->str = str;
+    }
+    if (!s->is_wide_char)
+        str->u.str8[s->len] = 0;
+#ifdef DUMP_LEAKS
+    list_add_tail(&str->link, &s->ctx->rt->string_list);
+#endif
+    str->is_wide_char = s->is_wide_char;
+    str->len = s->len;
+    s->str = NULL;
+    return JS_MKPTR(JS_TAG_STRING, str);
+}
+
+/* create a string from a UTF-8 buffer */
+JSValue JS_NewStringLen(JSContext *ctx, const char *buf, size_t buf_len)
+{
+    const uint8_t *p, *p_end, *p_start, *p_next;
+    uint32_t c;
+    StringBuffer b_s, *b = &b_s;
+    size_t len1;
+
+    p_start = (const uint8_t *)buf;
+    p_end = p_start + buf_len;
+    p = p_start;
+    while (p < p_end && *p < 128)
+        p++;
+    len1 = p - p_start;
+    if (len1 > JS_STRING_LEN_MAX)
+        return JS_ThrowInternalError(ctx, "string too long");
+    if (p == p_end) {
+        /* ASCII string */
+        return js_new_string8(ctx, (const uint8_t *)buf, buf_len);
+    } else {
+        if (string_buffer_init(ctx, b, buf_len))
+            goto fail;
+        string_buffer_write8(b, p_start, len1);
+        while (p < p_end) {
+            if (*p < 128) {
+                string_buffer_putc8(b, *p++);
+            } else {
+                /* parse utf-8 sequence, return 0xFFFFFFFF for error */
+                c = unicode_from_utf8(p, p_end - p, &p_next);
+                if (c < 0x10000) {
+                    p = p_next;
+                } else if (c <= 0x10FFFF) {
+                    p = p_next;
+                    /* surrogate pair */
+                    string_buffer_putc16(b, get_hi_surrogate(c));
+                    c = get_lo_surrogate(c);
+                } else {
+                    /* invalid char */
+                    c = 0xfffd;
+                    /* skip the invalid chars */
+                    /* XXX: seems incorrect. Why not just use c = *p++; ? */
+                    while (p < p_end && (*p >= 0x80 && *p < 0xc0))
+                        p++;
+                    if (p < p_end) {
+                        p++;
+                        while (p < p_end && (*p >= 0x80 && *p < 0xc0))
+                            p++;
+                    }
+                }
+                string_buffer_putc16(b, c);
+            }
+        }
+    }
+    return string_buffer_end(b);
+
+ fail:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ConcatString3(JSContext *ctx, const char *str1,
+                                JSValue str2, const char *str3)
+{
+    StringBuffer b_s, *b = &b_s;
+    int len1, len3;
+    JSString *p;
+
+    if (unlikely(JS_VALUE_GET_TAG(str2) != JS_TAG_STRING)) {
+        str2 = JS_ToStringFree(ctx, str2);
+        if (JS_IsException(str2))
+            goto fail;
+    }
+    p = JS_VALUE_GET_STRING(str2);
+    len1 = strlen(str1);
+    len3 = strlen(str3);
+
+    if (string_buffer_init2(ctx, b, len1 + p->len + len3, p->is_wide_char))
+        goto fail;
+
+    string_buffer_write8(b, (const uint8_t *)str1, len1);
+    string_buffer_concat(b, p, 0, p->len);
+    string_buffer_write8(b, (const uint8_t *)str3, len3);
+
+    JS_FreeValue(ctx, str2);
+    return string_buffer_end(b);
+
+ fail:
+    JS_FreeValue(ctx, str2);
+    return JS_EXCEPTION;
+}
+
+JSValue JS_NewString(JSContext *ctx, const char *str)
+{
+    return JS_NewStringLen(ctx, str, strlen(str));
+}
+
+JSValue JS_NewAtomString(JSContext *ctx, const char *str)
+{
+    JSAtom atom = JS_NewAtom(ctx, str);
+    if (atom == JS_ATOM_NULL)
+        return JS_EXCEPTION;
+    JSValue val = JS_AtomToString(ctx, atom);
+    JS_FreeAtom(ctx, atom);
+    return val;
+}
+
+/* return (NULL, 0) if exception. */
+/* return pointer into a JSString with a live ref_count */
+/* cesu8 determines if non-BMP1 codepoints are encoded as 1 or 2 utf-8 sequences */
+const char *JS_ToCStringLen2(JSContext *ctx, size_t *plen, JSValueConst val1, BOOL cesu8)
+{
+    JSValue val;
+    JSString *str, *str_new;
+    int pos, len, c, c1;
+    uint8_t *q;
+
+    if (JS_VALUE_GET_TAG(val1) != JS_TAG_STRING) {
+        val = JS_ToString(ctx, val1);
+        if (JS_IsException(val))
+            goto fail;
+    } else {
+        val = JS_DupValue(ctx, val1);
+    }
+
+    str = JS_VALUE_GET_STRING(val);
+    len = str->len;
+    if (!str->is_wide_char) {
+        const uint8_t *src = str->u.str8;
+        int count;
+
+        /* count the number of non-ASCII characters */
+        /* Scanning the whole string is required for ASCII strings,
+           and computing the number of non-ASCII bytes is less expensive
+           than testing each byte, hence this method is faster for ASCII
+           strings, which is the most common case.
+         */
+        count = 0;
+        for (pos = 0; pos < len; pos++) {
+            count += src[pos] >> 7;
+        }
+        if (count == 0) {
+            if (plen)
+                *plen = len;
+            return (const char *)src;
+        }
+        str_new = js_alloc_string(ctx, len + count, 0);
+        if (!str_new)
+            goto fail;
+        q = str_new->u.str8;
+        for (pos = 0; pos < len; pos++) {
+            c = src[pos];
+            if (c < 0x80) {
+                *q++ = c;
+            } else {
+                *q++ = (c >> 6) | 0xc0;
+                *q++ = (c & 0x3f) | 0x80;
+            }
+        }
+    } else {
+        const uint16_t *src = str->u.str16;
+        /* Allocate 3 bytes per 16 bit code point. Surrogate pairs may
+           produce 4 bytes but use 2 code points.
+         */
+        str_new = js_alloc_string(ctx, len * 3, 0);
+        if (!str_new)
+            goto fail;
+        q = str_new->u.str8;
+        pos = 0;
+        while (pos < len) {
+            c = src[pos++];
+            if (c < 0x80) {
+                *q++ = c;
+            } else {
+                if (is_hi_surrogate(c)) {
+                    if (pos < len && !cesu8) {
+                        c1 = src[pos];
+                        if (is_lo_surrogate(c1)) {
+                            pos++;
+                            c = from_surrogate(c, c1);
+                        } else {
+                            /* Keep unmatched surrogate code points */
+                            /* c = 0xfffd; */ /* error */
+                        }
+                    } else {
+                        /* Keep unmatched surrogate code points */
+                        /* c = 0xfffd; */ /* error */
+                    }
+                }
+                q += unicode_to_utf8(q, c);
+            }
+        }
+    }
+
+    *q = '\0';
+    str_new->len = q - str_new->u.str8;
+    JS_FreeValue(ctx, val);
+    if (plen)
+        *plen = str_new->len;
+    return (const char *)str_new->u.str8;
+ fail:
+    if (plen)
+        *plen = 0;
+    return NULL;
+}
+
+void JS_FreeCString(JSContext *ctx, const char *ptr)
+{
+    JSString *p;
+    if (!ptr)
+        return;
+    /* purposely removing constness */
+    p = container_of(ptr, JSString, u);
+    JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+}
+
+static int memcmp16_8(const uint16_t *src1, const uint8_t *src2, int len)
+{
+    int c, i;
+    for(i = 0; i < len; i++) {
+        c = src1[i] - src2[i];
+        if (c != 0)
+            return c;
+    }
+    return 0;
+}
+
+static int memcmp16(const uint16_t *src1, const uint16_t *src2, int len)
+{
+    int c, i;
+    for(i = 0; i < len; i++) {
+        c = src1[i] - src2[i];
+        if (c != 0)
+            return c;
+    }
+    return 0;
+}
+
+static int js_string_memcmp(const JSString *p1, const JSString *p2, int len)
+{
+    int res;
+
+    if (likely(!p1->is_wide_char)) {
+        if (likely(!p2->is_wide_char))
+            res = memcmp(p1->u.str8, p2->u.str8, len);
+        else
+            res = -memcmp16_8(p2->u.str16, p1->u.str8, len);
+    } else {
+        if (!p2->is_wide_char)
+            res = memcmp16_8(p1->u.str16, p2->u.str8, len);
+        else
+            res = memcmp16(p1->u.str16, p2->u.str16, len);
+    }
+    return res;
+}
+
+/* return < 0, 0 or > 0 */
+static int js_string_compare(JSContext *ctx,
+                             const JSString *p1, const JSString *p2)
+{
+    int res, len;
+    len = min_int(p1->len, p2->len);
+    res = js_string_memcmp(p1, p2, len);
+    if (res == 0) {
+        if (p1->len == p2->len)
+            res = 0;
+        else if (p1->len < p2->len)
+            res = -1;
+        else
+            res = 1;
+    }
+    return res;
+}
+
+static void copy_str16(uint16_t *dst, const JSString *p, int offset, int len)
+{
+    if (p->is_wide_char) {
+        memcpy(dst, p->u.str16 + offset, len * 2);
+    } else {
+        const uint8_t *src1 = p->u.str8 + offset;
+        int i;
+
+        for(i = 0; i < len; i++)
+            dst[i] = src1[i];
+    }
+}
+
+static JSValue JS_ConcatString1(JSContext *ctx,
+                                const JSString *p1, const JSString *p2)
+{
+    JSString *p;
+    uint32_t len;
+    int is_wide_char;
+
+    len = p1->len + p2->len;
+    if (len > JS_STRING_LEN_MAX)
+        return JS_ThrowInternalError(ctx, "string too long");
+    is_wide_char = p1->is_wide_char | p2->is_wide_char;
+    p = js_alloc_string(ctx, len, is_wide_char);
+    if (!p)
+        return JS_EXCEPTION;
+    if (!is_wide_char) {
+        memcpy(p->u.str8, p1->u.str8, p1->len);
+        memcpy(p->u.str8 + p1->len, p2->u.str8, p2->len);
+        p->u.str8[len] = '\0';
+    } else {
+        copy_str16(p->u.str16, p1, 0, p1->len);
+        copy_str16(p->u.str16 + p1->len, p2, 0, p2->len);
+    }
+    return JS_MKPTR(JS_TAG_STRING, p);
+}
+
+static BOOL JS_ConcatStringInPlace(JSContext *ctx, JSString *p1, JSValueConst op2) {
+    if (JS_VALUE_GET_TAG(op2) == JS_TAG_STRING) {
+        JSString *p2 = JS_VALUE_GET_STRING(op2);
+        size_t size1;
+
+        if (p2->len == 0)
+            return TRUE;
+        if (p1->header.ref_count != 1)
+            return FALSE;
+        size1 = js_malloc_usable_size(ctx, p1);
+        if (p1->is_wide_char) {
+            if (size1 >= sizeof(*p1) + ((p1->len + p2->len) << 1)) {
+                if (p2->is_wide_char) {
+                    memcpy(p1->u.str16 + p1->len, p2->u.str16, p2->len << 1);
+                    p1->len += p2->len;
+                    return TRUE;
+                } else {
+                    size_t i;
+                    for (i = 0; i < p2->len; i++) {
+                        p1->u.str16[p1->len++] = p2->u.str8[i];
+                    }
+                    return TRUE;
+                }
+            }
+        } else if (!p2->is_wide_char) {
+            if (size1 >= sizeof(*p1) + p1->len + p2->len + 1) {
+                memcpy(p1->u.str8 + p1->len, p2->u.str8, p2->len);
+                p1->len += p2->len;
+                p1->u.str8[p1->len] = '\0';
+                return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
+/* op1 and op2 are converted to strings. For convenience, op1 or op2 =
+   JS_EXCEPTION are accepted and return JS_EXCEPTION.  */
+static JSValue JS_ConcatString(JSContext *ctx, JSValue op1, JSValue op2)
+{
+    JSValue ret;
+    JSString *p1, *p2;
+
+    if (unlikely(JS_VALUE_GET_TAG(op1) != JS_TAG_STRING)) {
+        op1 = JS_ToStringFree(ctx, op1);
+        if (JS_IsException(op1)) {
+            JS_FreeValue(ctx, op2);
+            return JS_EXCEPTION;
+        }
+    }
+    if (unlikely(JS_VALUE_GET_TAG(op2) != JS_TAG_STRING)) {
+        op2 = JS_ToStringFree(ctx, op2);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            return JS_EXCEPTION;
+        }
+    }
+    p1 = JS_VALUE_GET_STRING(op1);
+    if (JS_ConcatStringInPlace(ctx, p1, op2)) {
+        JS_FreeValue(ctx, op2);
+        return op1;
+    }
+    p2 = JS_VALUE_GET_STRING(op2);
+    ret = JS_ConcatString1(ctx, p1, p2);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return ret;
+}
+
+/* Shape support */
+
+static inline size_t get_shape_size(size_t hash_size, size_t prop_size)
+{
+    return hash_size * sizeof(uint32_t) + sizeof(JSShape) +
+        prop_size * sizeof(JSShapeProperty);
+}
+
+static inline JSShape *get_shape_from_alloc(void *sh_alloc, size_t hash_size)
+{
+    return (JSShape *)(void *)((uint32_t *)sh_alloc + hash_size);
+}
+
+static inline uint32_t *prop_hash_end(JSShape *sh)
+{
+    return (uint32_t *)sh;
+}
+
+static inline void *get_alloc_from_shape(JSShape *sh)
+{
+    return prop_hash_end(sh) - ((intptr_t)sh->prop_hash_mask + 1);
+}
+
+static inline JSShapeProperty *get_shape_prop(JSShape *sh)
+{
+    return sh->prop;
+}
+
+static int init_shape_hash(JSRuntime *rt)
+{
+    rt->shape_hash_bits = 4;   /* 16 shapes */
+    rt->shape_hash_size = 1 << rt->shape_hash_bits;
+    rt->shape_hash_count = 0;
+    rt->shape_hash = js_mallocz_rt(rt, sizeof(rt->shape_hash[0]) *
+                                   rt->shape_hash_size);
+    if (!rt->shape_hash)
+        return -1;
+    return 0;
+}
+
+/* same magic hash multiplier as the Linux kernel */
+static uint32_t shape_hash(uint32_t h, uint32_t val)
+{
+    return (h + val) * 0x9e370001;
+}
+
+/* truncate the shape hash to 'hash_bits' bits */
+static uint32_t get_shape_hash(uint32_t h, int hash_bits)
+{
+    return h >> (32 - hash_bits);
+}
+
+static uint32_t shape_initial_hash(JSObject *proto)
+{
+    uint32_t h;
+    h = shape_hash(1, (uintptr_t)proto);
+    if (sizeof(proto) > 4)
+        h = shape_hash(h, (uint64_t)(uintptr_t)proto >> 32);
+    return h;
+}
+
+static int resize_shape_hash(JSRuntime *rt, int new_shape_hash_bits)
+{
+    int new_shape_hash_size, i;
+    uint32_t h;
+    JSShape **new_shape_hash, *sh, *sh_next;
+
+    new_shape_hash_size = 1 << new_shape_hash_bits;
+    new_shape_hash = js_mallocz_rt(rt, sizeof(rt->shape_hash[0]) *
+                                   new_shape_hash_size);
+    if (!new_shape_hash)
+        return -1;
+    for(i = 0; i < rt->shape_hash_size; i++) {
+        for(sh = rt->shape_hash[i]; sh != NULL; sh = sh_next) {
+            sh_next = sh->shape_hash_next;
+            h = get_shape_hash(sh->hash, new_shape_hash_bits);
+            sh->shape_hash_next = new_shape_hash[h];
+            new_shape_hash[h] = sh;
+        }
+    }
+    js_free_rt(rt, rt->shape_hash);
+    rt->shape_hash_bits = new_shape_hash_bits;
+    rt->shape_hash_size = new_shape_hash_size;
+    rt->shape_hash = new_shape_hash;
+    return 0;
+}
+
+static void js_shape_hash_link(JSRuntime *rt, JSShape *sh)
+{
+    uint32_t h;
+    h = get_shape_hash(sh->hash, rt->shape_hash_bits);
+    sh->shape_hash_next = rt->shape_hash[h];
+    rt->shape_hash[h] = sh;
+    rt->shape_hash_count++;
+}
+
+static void js_shape_hash_unlink(JSRuntime *rt, JSShape *sh)
+{
+    uint32_t h;
+    JSShape **psh;
+
+    h = get_shape_hash(sh->hash, rt->shape_hash_bits);
+    psh = &rt->shape_hash[h];
+    while (*psh != sh)
+        psh = &(*psh)->shape_hash_next;
+    *psh = sh->shape_hash_next;
+    rt->shape_hash_count--;
+}
+
+/* create a new empty shape with prototype 'proto' */
+static no_inline JSShape *js_new_shape2(JSContext *ctx, JSObject *proto,
+                                        int hash_size, int prop_size)
+{
+    JSRuntime *rt = ctx->rt;
+    void *sh_alloc;
+    JSShape *sh;
+
+    /* resize the shape hash table if necessary */
+    if (2 * (rt->shape_hash_count + 1) > rt->shape_hash_size) {
+        resize_shape_hash(rt, rt->shape_hash_bits + 1);
+    }
+
+    sh_alloc = js_malloc(ctx, get_shape_size(hash_size, prop_size));
+    if (!sh_alloc)
+        return NULL;
+    sh = get_shape_from_alloc(sh_alloc, hash_size);
+    sh->header.ref_count = 1;
+    add_gc_object(rt, &sh->header, JS_GC_OBJ_TYPE_SHAPE);
+    if (proto)
+        JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, proto));
+    sh->proto = proto;
+    memset(prop_hash_end(sh) - hash_size, 0, sizeof(prop_hash_end(sh)[0]) *
+           hash_size);
+    sh->prop_hash_mask = hash_size - 1;
+    sh->prop_size = prop_size;
+    sh->prop_count = 0;
+    sh->deleted_prop_count = 0;
+
+    /* insert in the hash table */
+    sh->hash = shape_initial_hash(proto);
+    sh->is_hashed = TRUE;
+    sh->has_small_array_index = FALSE;
+    js_shape_hash_link(ctx->rt, sh);
+    return sh;
+}
+
+static JSShape *js_new_shape(JSContext *ctx, JSObject *proto)
+{
+    return js_new_shape2(ctx, proto, JS_PROP_INITIAL_HASH_SIZE,
+                         JS_PROP_INITIAL_SIZE);
+}
+
+/* The shape is cloned. The new shape is not inserted in the shape
+   hash table */
+static JSShape *js_clone_shape(JSContext *ctx, JSShape *sh1)
+{
+    JSShape *sh;
+    void *sh_alloc, *sh_alloc1;
+    size_t size;
+    JSShapeProperty *pr;
+    uint32_t i, hash_size;
+
+    hash_size = sh1->prop_hash_mask + 1;
+    size = get_shape_size(hash_size, sh1->prop_size);
+    sh_alloc = js_malloc(ctx, size);
+    if (!sh_alloc)
+        return NULL;
+    sh_alloc1 = get_alloc_from_shape(sh1);
+    memcpy(sh_alloc, sh_alloc1, size);
+    sh = get_shape_from_alloc(sh_alloc, hash_size);
+    sh->header.ref_count = 1;
+    add_gc_object(ctx->rt, &sh->header, JS_GC_OBJ_TYPE_SHAPE);
+    sh->is_hashed = FALSE;
+    if (sh->proto) {
+        JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, sh->proto));
+    }
+    for(i = 0, pr = get_shape_prop(sh); i < sh->prop_count; i++, pr++) {
+        JS_DupAtom(ctx, pr->atom);
+    }
+    return sh;
+}
+
+static JSShape *js_dup_shape(JSShape *sh)
+{
+    sh->header.ref_count++;
+    return sh;
+}
+
+static void js_free_shape0(JSRuntime *rt, JSShape *sh)
+{
+    uint32_t i;
+    JSShapeProperty *pr;
+
+    assert(sh->header.ref_count == 0);
+    if (sh->is_hashed)
+        js_shape_hash_unlink(rt, sh);
+    if (sh->proto != NULL) {
+        JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, sh->proto));
+    }
+    pr = get_shape_prop(sh);
+    for(i = 0; i < sh->prop_count; i++) {
+        JS_FreeAtomRT(rt, pr->atom);
+        pr++;
+    }
+    remove_gc_object(&sh->header);
+    js_free_rt(rt, get_alloc_from_shape(sh));
+}
+
+static void js_free_shape(JSRuntime *rt, JSShape *sh)
+{
+    if (unlikely(--sh->header.ref_count <= 0)) {
+        js_free_shape0(rt, sh);
+    }
+}
+
+static void js_free_shape_null(JSRuntime *rt, JSShape *sh)
+{
+    if (sh)
+        js_free_shape(rt, sh);
+}
+
+/* make space to hold at least 'count' properties */
+static no_inline int resize_properties(JSContext *ctx, JSShape **psh,
+                                       JSObject *p, uint32_t count)
+{
+    JSShape *sh;
+    uint32_t new_size, new_hash_size, new_hash_mask, i;
+    JSShapeProperty *pr;
+    void *sh_alloc;
+    intptr_t h;
+    JSShape *old_sh;
+
+    sh = *psh;
+    new_size = max_int(count, sh->prop_size * 3 / 2);
+    /* Reallocate prop array first to avoid crash or size inconsistency
+       in case of memory allocation failure */
+    if (p) {
+        JSProperty *new_prop;
+        new_prop = js_realloc(ctx, p->prop, sizeof(new_prop[0]) * new_size);
+        if (unlikely(!new_prop))
+            return -1;
+        p->prop = new_prop;
+    }
+    new_hash_size = sh->prop_hash_mask + 1;
+    while (new_hash_size < new_size)
+        new_hash_size = 2 * new_hash_size;
+    /* resize the property shapes. Using js_realloc() is not possible in
+       case the GC runs during the allocation */
+    old_sh = sh;
+    sh_alloc = js_malloc(ctx, get_shape_size(new_hash_size, new_size));
+    if (!sh_alloc)
+        return -1;
+    sh = get_shape_from_alloc(sh_alloc, new_hash_size);
+    list_del(&old_sh->header.link);
+    /* copy all the shape properties */
+    memcpy(sh, old_sh,
+           sizeof(JSShape) + sizeof(sh->prop[0]) * old_sh->prop_count);
+    list_add_tail(&sh->header.link, &ctx->rt->gc_obj_list);
+
+    if (new_hash_size != (sh->prop_hash_mask + 1)) {
+        /* resize the hash table and the properties */
+        new_hash_mask = new_hash_size - 1;
+        sh->prop_hash_mask = new_hash_mask;
+        memset(prop_hash_end(sh) - new_hash_size, 0,
+               sizeof(prop_hash_end(sh)[0]) * new_hash_size);
+        for(i = 0, pr = sh->prop; i < sh->prop_count; i++, pr++) {
+            if (pr->atom != JS_ATOM_NULL) {
+                h = ((uintptr_t)pr->atom & new_hash_mask);
+                pr->hash_next = prop_hash_end(sh)[-h - 1];
+                prop_hash_end(sh)[-h - 1] = i + 1;
+            }
+        }
+    } else {
+        /* just copy the previous hash table */
+        memcpy(prop_hash_end(sh) - new_hash_size, prop_hash_end(old_sh) - new_hash_size,
+               sizeof(prop_hash_end(sh)[0]) * new_hash_size);
+    }
+    js_free(ctx, get_alloc_from_shape(old_sh));
+    *psh = sh;
+    sh->prop_size = new_size;
+    return 0;
+}
+
+/* remove the deleted properties. */
+static int compact_properties(JSContext *ctx, JSObject *p)
+{
+    JSShape *sh, *old_sh;
+    void *sh_alloc;
+    intptr_t h;
+    uint32_t new_hash_size, i, j, new_hash_mask, new_size;
+    JSShapeProperty *old_pr, *pr;
+    JSProperty *prop, *new_prop;
+
+    sh = p->shape;
+    assert(!sh->is_hashed);
+
+    new_size = max_int(JS_PROP_INITIAL_SIZE,
+                       sh->prop_count - sh->deleted_prop_count);
+    assert(new_size <= sh->prop_size);
+
+    new_hash_size = sh->prop_hash_mask + 1;
+    while ((new_hash_size / 2) >= new_size)
+        new_hash_size = new_hash_size / 2;
+    new_hash_mask = new_hash_size - 1;
+
+    /* resize the hash table and the properties */
+    old_sh = sh;
+    sh_alloc = js_malloc(ctx, get_shape_size(new_hash_size, new_size));
+    if (!sh_alloc)
+        return -1;
+    sh = get_shape_from_alloc(sh_alloc, new_hash_size);
+    list_del(&old_sh->header.link);
+    memcpy(sh, old_sh, sizeof(JSShape));
+    list_add_tail(&sh->header.link, &ctx->rt->gc_obj_list);
+
+    memset(prop_hash_end(sh) - new_hash_size, 0,
+           sizeof(prop_hash_end(sh)[0]) * new_hash_size);
+
+    j = 0;
+    old_pr = old_sh->prop;
+    pr = sh->prop;
+    prop = p->prop;
+    for(i = 0; i < sh->prop_count; i++) {
+        if (old_pr->atom != JS_ATOM_NULL) {
+            pr->atom = old_pr->atom;
+            pr->flags = old_pr->flags;
+            h = ((uintptr_t)old_pr->atom & new_hash_mask);
+            pr->hash_next = prop_hash_end(sh)[-h - 1];
+            prop_hash_end(sh)[-h - 1] = j + 1;
+            prop[j] = prop[i];
+            j++;
+            pr++;
+        }
+        old_pr++;
+    }
+    assert(j == (sh->prop_count - sh->deleted_prop_count));
+    sh->prop_hash_mask = new_hash_mask;
+    sh->prop_size = new_size;
+    sh->deleted_prop_count = 0;
+    sh->prop_count = j;
+
+    p->shape = sh;
+    js_free(ctx, get_alloc_from_shape(old_sh));
+
+    /* reduce the size of the object properties */
+    new_prop = js_realloc(ctx, p->prop, sizeof(new_prop[0]) * new_size);
+    if (new_prop)
+        p->prop = new_prop;
+    return 0;
+}
+
+static int add_shape_property(JSContext *ctx, JSShape **psh,
+                              JSObject *p, JSAtom atom, int prop_flags)
+{
+    JSRuntime *rt = ctx->rt;
+    JSShape *sh = *psh;
+    JSShapeProperty *pr, *prop;
+    uint32_t hash_mask, new_shape_hash = 0;
+    intptr_t h;
+
+    /* update the shape hash */
+    if (sh->is_hashed) {
+        js_shape_hash_unlink(rt, sh);
+        new_shape_hash = shape_hash(shape_hash(sh->hash, atom), prop_flags);
+    }
+
+    if (unlikely(sh->prop_count >= sh->prop_size)) {
+        if (resize_properties(ctx, psh, p, sh->prop_count + 1)) {
+            /* in case of error, reinsert in the hash table.
+               sh is still valid if resize_properties() failed */
+            if (sh->is_hashed)
+                js_shape_hash_link(rt, sh);
+            return -1;
+        }
+        sh = *psh;
+    }
+    if (sh->is_hashed) {
+        sh->hash = new_shape_hash;
+        js_shape_hash_link(rt, sh);
+    }
+    /* Initialize the new shape property.
+       The object property at p->prop[sh->prop_count] is uninitialized */
+    prop = get_shape_prop(sh);
+    pr = &prop[sh->prop_count++];
+    pr->atom = JS_DupAtom(ctx, atom);
+    pr->flags = prop_flags;
+    sh->has_small_array_index |= __JS_AtomIsTaggedInt(atom);
+    /* add in hash table */
+    hash_mask = sh->prop_hash_mask;
+    h = atom & hash_mask;
+    pr->hash_next = prop_hash_end(sh)[-h - 1];
+    prop_hash_end(sh)[-h - 1] = sh->prop_count;
+    return 0;
+}
+
+/* find a hashed empty shape matching the prototype. Return NULL if
+   not found */
+static JSShape *find_hashed_shape_proto(JSRuntime *rt, JSObject *proto)
+{
+    JSShape *sh1;
+    uint32_t h, h1;
+
+    h = shape_initial_hash(proto);
+    h1 = get_shape_hash(h, rt->shape_hash_bits);
+    for(sh1 = rt->shape_hash[h1]; sh1 != NULL; sh1 = sh1->shape_hash_next) {
+        if (sh1->hash == h &&
+            sh1->proto == proto &&
+            sh1->prop_count == 0) {
+            return sh1;
+        }
+    }
+    return NULL;
+}
+
+/* find a hashed shape matching sh + (prop, prop_flags). Return NULL if
+   not found */
+static JSShape *find_hashed_shape_prop(JSRuntime *rt, JSShape *sh,
+                                       JSAtom atom, int prop_flags)
+{
+    JSShape *sh1;
+    uint32_t h, h1, i, n;
+
+    h = sh->hash;
+    h = shape_hash(h, atom);
+    h = shape_hash(h, prop_flags);
+    h1 = get_shape_hash(h, rt->shape_hash_bits);
+    for(sh1 = rt->shape_hash[h1]; sh1 != NULL; sh1 = sh1->shape_hash_next) {
+        /* we test the hash first so that the rest is done only if the
+           shapes really match */
+        if (sh1->hash == h &&
+            sh1->proto == sh->proto &&
+            sh1->prop_count == ((n = sh->prop_count) + 1)) {
+            for(i = 0; i < n; i++) {
+                if (unlikely(sh1->prop[i].atom != sh->prop[i].atom) ||
+                    unlikely(sh1->prop[i].flags != sh->prop[i].flags))
+                    goto next;
+            }
+            if (unlikely(sh1->prop[n].atom != atom) ||
+                unlikely(sh1->prop[n].flags != prop_flags))
+                goto next;
+            return sh1;
+        }
+    next: ;
+    }
+    return NULL;
+}
+
+static __maybe_unused void JS_DumpShape(JSRuntime *rt, int i, JSShape *sh)
+{
+    char atom_buf[ATOM_GET_STR_BUF_SIZE];
+    int j;
+
+    /* XXX: should output readable class prototype */
+    printf("%5d %3d%c %14p %5d %5d", i,
+           sh->header.ref_count, " *"[sh->is_hashed],
+           (void *)sh->proto, sh->prop_size, sh->prop_count);
+    for(j = 0; j < sh->prop_count; j++) {
+        printf(" %s", JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf),
+                                      sh->prop[j].atom));
+    }
+    printf("\n");
+}
+
+static __maybe_unused void JS_DumpShapes(JSRuntime *rt)
+{
+    int i;
+    JSShape *sh;
+    struct list_head *el;
+    JSObject *p;
+    JSGCObjectHeader *gp;
+
+    printf("JSShapes: {\n");
+    printf("%5s %4s %14s %5s %5s %s\n", "SLOT", "REFS", "PROTO", "SIZE", "COUNT", "PROPS");
+    for(i = 0; i < rt->shape_hash_size; i++) {
+        for(sh = rt->shape_hash[i]; sh != NULL; sh = sh->shape_hash_next) {
+            JS_DumpShape(rt, i, sh);
+            assert(sh->is_hashed);
+        }
+    }
+    /* dump non-hashed shapes */
+    list_for_each(el, &rt->gc_obj_list) {
+        gp = list_entry(el, JSGCObjectHeader, link);
+        if (gp->gc_obj_type == JS_GC_OBJ_TYPE_JS_OBJECT) {
+            p = (JSObject *)gp;
+            if (!p->shape->is_hashed) {
+                JS_DumpShape(rt, -1, p->shape);
+            }
+        }
+    }
+    printf("}\n");
+}
+
+static JSValue JS_NewObjectFromShape(JSContext *ctx, JSShape *sh, JSClassID class_id)
+{
+    JSObject *p;
+
+    js_trigger_gc(ctx->rt, sizeof(JSObject));
+    p = js_malloc(ctx, sizeof(JSObject));
+    if (unlikely(!p))
+        goto fail;
+    p->class_id = class_id;
+    p->extensible = TRUE;
+    p->free_mark = 0;
+    p->is_exotic = 0;
+    p->fast_array = 0;
+    p->is_constructor = 0;
+    p->is_uncatchable_error = 0;
+    p->tmp_mark = 0;
+    p->is_HTMLDDA = 0;
+    p->first_weak_ref = NULL;
+    p->u.opaque = NULL;
+    p->shape = sh;
+    p->prop = js_malloc(ctx, sizeof(JSProperty) * sh->prop_size);
+    if (unlikely(!p->prop)) {
+        js_free(ctx, p);
+    fail:
+        js_free_shape(ctx->rt, sh);
+        return JS_EXCEPTION;
+    }
+
+    switch(class_id) {
+    case JS_CLASS_OBJECT:
+        break;
+    case JS_CLASS_ARRAY:
+        {
+            JSProperty *pr;
+            p->is_exotic = 1;
+            p->fast_array = 1;
+            p->u.array.u.values = NULL;
+            p->u.array.count = 0;
+            p->u.array.u1.size = 0;
+            /* the length property is always the first one */
+            if (likely(sh == ctx->array_shape)) {
+                pr = &p->prop[0];
+            } else {
+                /* only used for the first array */
+                /* cannot fail */
+                pr = add_property(ctx, p, JS_ATOM_length,
+                                  JS_PROP_WRITABLE | JS_PROP_LENGTH);
+            }
+            pr->u.value = JS_NewInt32(ctx, 0);
+        }
+        break;
+    case JS_CLASS_C_FUNCTION:
+        p->prop[0].u.value = JS_UNDEFINED;
+        break;
+    case JS_CLASS_ARGUMENTS:
+    case JS_CLASS_UINT8C_ARRAY:
+    case JS_CLASS_INT8_ARRAY:
+    case JS_CLASS_UINT8_ARRAY:
+    case JS_CLASS_INT16_ARRAY:
+    case JS_CLASS_UINT16_ARRAY:
+    case JS_CLASS_INT32_ARRAY:
+    case JS_CLASS_UINT32_ARRAY:
+    case JS_CLASS_BIG_INT64_ARRAY:
+    case JS_CLASS_BIG_UINT64_ARRAY:
+    case JS_CLASS_FLOAT32_ARRAY:
+    case JS_CLASS_FLOAT64_ARRAY:
+        p->is_exotic = 1;
+        p->fast_array = 1;
+        p->u.array.u.ptr = NULL;
+        p->u.array.count = 0;
+        break;
+    case JS_CLASS_DATAVIEW:
+        p->u.array.u.ptr = NULL;
+        p->u.array.count = 0;
+        break;
+    case JS_CLASS_NUMBER:
+    case JS_CLASS_STRING:
+    case JS_CLASS_BOOLEAN:
+    case JS_CLASS_SYMBOL:
+    case JS_CLASS_DATE:
+    case JS_CLASS_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_CLASS_BIG_FLOAT:
+    case JS_CLASS_BIG_DECIMAL:
+#endif
+        p->u.object_data = JS_UNDEFINED;
+        goto set_exotic;
+    case JS_CLASS_REGEXP:
+        p->u.regexp.pattern = NULL;
+        p->u.regexp.bytecode = NULL;
+        goto set_exotic;
+    default:
+    set_exotic:
+        if (ctx->rt->class_array[class_id].exotic) {
+            p->is_exotic = 1;
+        }
+        break;
+    }
+    p->header.ref_count = 1;
+    add_gc_object(ctx->rt, &p->header, JS_GC_OBJ_TYPE_JS_OBJECT);
+    return JS_MKPTR(JS_TAG_OBJECT, p);
+}
+
+static JSObject *get_proto_obj(JSValueConst proto_val)
+{
+    if (JS_VALUE_GET_TAG(proto_val) != JS_TAG_OBJECT)
+        return NULL;
+    else
+        return JS_VALUE_GET_OBJ(proto_val);
+}
+
+/* WARNING: proto must be an object or JS_NULL */
+JSValue JS_NewObjectProtoClass(JSContext *ctx, JSValueConst proto_val,
+                               JSClassID class_id)
+{
+    JSShape *sh;
+    JSObject *proto;
+
+    proto = get_proto_obj(proto_val);
+    sh = find_hashed_shape_proto(ctx->rt, proto);
+    if (likely(sh)) {
+        sh = js_dup_shape(sh);
+    } else {
+        sh = js_new_shape(ctx, proto);
+        if (!sh)
+            return JS_EXCEPTION;
+    }
+    return JS_NewObjectFromShape(ctx, sh, class_id);
+}
+
+#if 0
+static JSValue JS_GetObjectData(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(obj);
+        switch(p->class_id) {
+        case JS_CLASS_NUMBER:
+        case JS_CLASS_STRING:
+        case JS_CLASS_BOOLEAN:
+        case JS_CLASS_SYMBOL:
+        case JS_CLASS_DATE:
+        case JS_CLASS_BIG_INT:
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_FLOAT:
+        case JS_CLASS_BIG_DECIMAL:
+#endif
+            return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_UNDEFINED;
+}
+#endif
+
+static int JS_SetObjectData(JSContext *ctx, JSValueConst obj, JSValue val)
+{
+    JSObject *p;
+
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(obj);
+        switch(p->class_id) {
+        case JS_CLASS_NUMBER:
+        case JS_CLASS_STRING:
+        case JS_CLASS_BOOLEAN:
+        case JS_CLASS_SYMBOL:
+        case JS_CLASS_DATE:
+        case JS_CLASS_BIG_INT:
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_FLOAT:
+        case JS_CLASS_BIG_DECIMAL:
+#endif
+            JS_FreeValue(ctx, p->u.object_data);
+            p->u.object_data = val;
+            return 0;
+        }
+    }
+    JS_FreeValue(ctx, val);
+    if (!JS_IsException(obj))
+        JS_ThrowTypeError(ctx, "invalid object type");
+    return -1;
+}
+
+JSValue JS_NewObjectClass(JSContext *ctx, int class_id)
+{
+    return JS_NewObjectProtoClass(ctx, ctx->class_proto[class_id], class_id);
+}
+
+JSValue JS_NewObjectProto(JSContext *ctx, JSValueConst proto)
+{
+    return JS_NewObjectProtoClass(ctx, proto, JS_CLASS_OBJECT);
+}
+
+JSValue JS_NewArray(JSContext *ctx)
+{
+    return JS_NewObjectFromShape(ctx, js_dup_shape(ctx->array_shape),
+                                 JS_CLASS_ARRAY);
+}
+
+JSValue JS_NewObject(JSContext *ctx)
+{
+    /* inline JS_NewObjectClass(ctx, JS_CLASS_OBJECT); */
+    return JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT], JS_CLASS_OBJECT);
+}
+
+static void js_function_set_properties(JSContext *ctx, JSValueConst func_obj,
+                                       JSAtom name, int len)
+{
+    /* ES6 feature non compatible with ES5.1: length is configurable */
+    JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_length, JS_NewInt32(ctx, len),
+                           JS_PROP_CONFIGURABLE);
+    JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_name,
+                           JS_AtomToString(ctx, name), JS_PROP_CONFIGURABLE);
+}
+
+static BOOL js_class_has_bytecode(JSClassID class_id)
+{
+    return (class_id == JS_CLASS_BYTECODE_FUNCTION ||
+            class_id == JS_CLASS_GENERATOR_FUNCTION ||
+            class_id == JS_CLASS_ASYNC_FUNCTION ||
+            class_id == JS_CLASS_ASYNC_GENERATOR_FUNCTION);
+}
+
+/* return NULL without exception if not a function or no bytecode */
+static JSFunctionBytecode *JS_GetFunctionBytecode(JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return NULL;
+    p = JS_VALUE_GET_OBJ(val);
+    if (!js_class_has_bytecode(p->class_id))
+        return NULL;
+    return p->u.func.function_bytecode;
+}
+
+static void js_method_set_home_object(JSContext *ctx, JSValueConst func_obj,
+                                      JSValueConst home_obj)
+{
+    JSObject *p, *p1;
+    JSFunctionBytecode *b;
+
+    if (JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)
+        return;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    if (!js_class_has_bytecode(p->class_id))
+        return;
+    b = p->u.func.function_bytecode;
+    if (b->need_home_object) {
+        p1 = p->u.func.home_object;
+        if (p1) {
+            JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p1));
+        }
+        if (JS_VALUE_GET_TAG(home_obj) == JS_TAG_OBJECT)
+            p1 = JS_VALUE_GET_OBJ(JS_DupValue(ctx, home_obj));
+        else
+            p1 = NULL;
+        p->u.func.home_object = p1;
+    }
+}
+
+static JSValue js_get_function_name(JSContext *ctx, JSAtom name)
+{
+    JSValue name_str;
+
+    name_str = JS_AtomToString(ctx, name);
+    if (JS_AtomSymbolHasDescription(ctx, name)) {
+        name_str = JS_ConcatString3(ctx, "[", name_str, "]");
+    }
+    return name_str;
+}
+
+/* Modify the name of a method according to the atom and
+   'flags'. 'flags' is a bitmask of JS_PROP_HAS_GET and
+   JS_PROP_HAS_SET. Also set the home object of the method.
+   Return < 0 if exception. */
+static int js_method_set_properties(JSContext *ctx, JSValueConst func_obj,
+                                    JSAtom name, int flags, JSValueConst home_obj)
+{
+    JSValue name_str;
+
+    name_str = js_get_function_name(ctx, name);
+    if (flags & JS_PROP_HAS_GET) {
+        name_str = JS_ConcatString3(ctx, "get ", name_str, "");
+    } else if (flags & JS_PROP_HAS_SET) {
+        name_str = JS_ConcatString3(ctx, "set ", name_str, "");
+    }
+    if (JS_IsException(name_str))
+        return -1;
+    if (JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_name, name_str,
+                               JS_PROP_CONFIGURABLE) < 0)
+        return -1;
+    js_method_set_home_object(ctx, func_obj, home_obj);
+    return 0;
+}
+
+/* Note: at least 'length' arguments will be readable in 'argv' */
+static JSValue JS_NewCFunction3(JSContext *ctx, JSCFunction *func,
+                                const char *name,
+                                int length, JSCFunctionEnum cproto, int magic,
+                                JSValueConst proto_val)
+{
+    JSValue func_obj;
+    JSObject *p;
+    JSAtom name_atom;
+
+    func_obj = JS_NewObjectProtoClass(ctx, proto_val, JS_CLASS_C_FUNCTION);
+    if (JS_IsException(func_obj))
+        return func_obj;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    p->u.cfunc.realm = JS_DupContext(ctx);
+    p->u.cfunc.c_function.generic = func;
+    p->u.cfunc.length = length;
+    p->u.cfunc.cproto = cproto;
+    p->u.cfunc.magic = magic;
+    p->is_constructor = (cproto == JS_CFUNC_constructor ||
+                         cproto == JS_CFUNC_constructor_magic ||
+                         cproto == JS_CFUNC_constructor_or_func ||
+                         cproto == JS_CFUNC_constructor_or_func_magic);
+    if (!name)
+        name = "";
+    name_atom = JS_NewAtom(ctx, name);
+    js_function_set_properties(ctx, func_obj, name_atom, length);
+    JS_FreeAtom(ctx, name_atom);
+    return func_obj;
+}
+
+/* Note: at least 'length' arguments will be readable in 'argv' */
+JSValue JS_NewCFunction2(JSContext *ctx, JSCFunction *func,
+                         const char *name,
+                         int length, JSCFunctionEnum cproto, int magic)
+{
+    return JS_NewCFunction3(ctx, func, name, length, cproto, magic,
+                            ctx->function_proto);
+}
+
+typedef struct JSCFunctionDataRecord {
+    JSCFunctionData *func;
+    uint8_t length;
+    uint8_t data_len;
+    uint16_t magic;
+    JSValue data[0];
+} JSCFunctionDataRecord;
+
+static void js_c_function_data_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSCFunctionDataRecord *s = JS_GetOpaque(val, JS_CLASS_C_FUNCTION_DATA);
+    int i;
+
+    if (s) {
+        for(i = 0; i < s->data_len; i++) {
+            JS_FreeValueRT(rt, s->data[i]);
+        }
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_c_function_data_mark(JSRuntime *rt, JSValueConst val,
+                                    JS_MarkFunc *mark_func)
+{
+    JSCFunctionDataRecord *s = JS_GetOpaque(val, JS_CLASS_C_FUNCTION_DATA);
+    int i;
+
+    if (s) {
+        for(i = 0; i < s->data_len; i++) {
+            JS_MarkValue(rt, s->data[i], mark_func);
+        }
+    }
+}
+
+static JSValue js_c_function_data_call(JSContext *ctx, JSValueConst func_obj,
+                                       JSValueConst this_val,
+                                       int argc, JSValueConst *argv, int flags)
+{
+    JSCFunctionDataRecord *s = JS_GetOpaque(func_obj, JS_CLASS_C_FUNCTION_DATA);
+    JSValueConst *arg_buf;
+    int i;
+
+    /* XXX: could add the function on the stack for debug */
+    if (unlikely(argc < s->length)) {
+        arg_buf = alloca(sizeof(arg_buf[0]) * s->length);
+        for(i = 0; i < argc; i++)
+            arg_buf[i] = argv[i];
+        for(i = argc; i < s->length; i++)
+            arg_buf[i] = JS_UNDEFINED;
+    } else {
+        arg_buf = argv;
+    }
+
+    return s->func(ctx, this_val, argc, arg_buf, s->magic, s->data);
+}
+
+JSValue JS_NewCFunctionData(JSContext *ctx, JSCFunctionData *func,
+                            int length, int magic, int data_len,
+                            JSValueConst *data)
+{
+    JSCFunctionDataRecord *s;
+    JSValue func_obj;
+    int i;
+
+    func_obj = JS_NewObjectProtoClass(ctx, ctx->function_proto,
+                                      JS_CLASS_C_FUNCTION_DATA);
+    if (JS_IsException(func_obj))
+        return func_obj;
+    s = js_malloc(ctx, sizeof(*s) + data_len * sizeof(JSValue));
+    if (!s) {
+        JS_FreeValue(ctx, func_obj);
+        return JS_EXCEPTION;
+    }
+    s->func = func;
+    s->length = length;
+    s->data_len = data_len;
+    s->magic = magic;
+    for(i = 0; i < data_len; i++)
+        s->data[i] = JS_DupValue(ctx, data[i]);
+    JS_SetOpaque(func_obj, s);
+    js_function_set_properties(ctx, func_obj,
+                               JS_ATOM_empty_string, length);
+    return func_obj;
+}
+
+static JSContext *js_autoinit_get_realm(JSProperty *pr)
+{
+    return (JSContext *)(pr->u.init.realm_and_id & ~3);
+}
+
+static JSAutoInitIDEnum js_autoinit_get_id(JSProperty *pr)
+{
+    return pr->u.init.realm_and_id & 3;
+}
+
+static void js_autoinit_free(JSRuntime *rt, JSProperty *pr)
+{
+    JS_FreeContext(js_autoinit_get_realm(pr));
+}
+
+static void js_autoinit_mark(JSRuntime *rt, JSProperty *pr,
+                             JS_MarkFunc *mark_func)
+{
+    mark_func(rt, &js_autoinit_get_realm(pr)->header);
+}
+
+static void free_property(JSRuntime *rt, JSProperty *pr, int prop_flags)
+{
+    if (unlikely(prop_flags & JS_PROP_TMASK)) {
+        if ((prop_flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+            if (pr->u.getset.getter)
+                JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter));
+            if (pr->u.getset.setter)
+                JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.setter));
+        } else if ((prop_flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+            free_var_ref(rt, pr->u.var_ref);
+        } else if ((prop_flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+            js_autoinit_free(rt, pr);
+        }
+    } else {
+        JS_FreeValueRT(rt, pr->u.value);
+    }
+}
+
+static force_inline JSShapeProperty *find_own_property1(JSObject *p,
+                                                        JSAtom atom)
+{
+    JSShape *sh;
+    JSShapeProperty *pr, *prop;
+    intptr_t h;
+    sh = p->shape;
+    h = (uintptr_t)atom & sh->prop_hash_mask;
+    h = prop_hash_end(sh)[-h - 1];
+    prop = get_shape_prop(sh);
+    while (h) {
+        pr = &prop[h - 1];
+        if (likely(pr->atom == atom)) {
+            return pr;
+        }
+        h = pr->hash_next;
+    }
+    return NULL;
+}
+
+static force_inline JSShapeProperty *find_own_property(JSProperty **ppr,
+                                                       JSObject *p,
+                                                       JSAtom atom)
+{
+    JSShape *sh;
+    JSShapeProperty *pr, *prop;
+    intptr_t h;
+    sh = p->shape;
+    h = (uintptr_t)atom & sh->prop_hash_mask;
+    h = prop_hash_end(sh)[-h - 1];
+    prop = get_shape_prop(sh);
+    while (h) {
+        pr = &prop[h - 1];
+        if (likely(pr->atom == atom)) {
+            *ppr = &p->prop[h - 1];
+            /* the compiler should be able to assume that pr != NULL here */
+            return pr;
+        }
+        h = pr->hash_next;
+    }
+    *ppr = NULL;
+    return NULL;
+}
+
+/* indicate that the object may be part of a function prototype cycle */
+static void set_cycle_flag(JSContext *ctx, JSValueConst obj)
+{
+}
+
+static void free_var_ref(JSRuntime *rt, JSVarRef *var_ref)
+{
+    if (var_ref) {
+        assert(var_ref->header.ref_count > 0);
+        if (--var_ref->header.ref_count == 0) {
+            if (var_ref->is_detached) {
+                JS_FreeValueRT(rt, var_ref->value);
+            } else {
+                list_del(&var_ref->var_ref_link); /* still on the stack */
+                if (var_ref->async_func)
+                    async_func_free(rt, var_ref->async_func);
+            }
+            remove_gc_object(&var_ref->header);
+            js_free_rt(rt, var_ref);
+        }
+    }
+}
+
+static void js_array_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    int i;
+
+    for(i = 0; i < p->u.array.count; i++) {
+        JS_FreeValueRT(rt, p->u.array.u.values[i]);
+    }
+    js_free_rt(rt, p->u.array.u.values);
+}
+
+static void js_array_mark(JSRuntime *rt, JSValueConst val,
+                          JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    int i;
+
+    for(i = 0; i < p->u.array.count; i++) {
+        JS_MarkValue(rt, p->u.array.u.values[i], mark_func);
+    }
+}
+
+static void js_object_data_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JS_FreeValueRT(rt, p->u.object_data);
+    p->u.object_data = JS_UNDEFINED;
+}
+
+static void js_object_data_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JS_MarkValue(rt, p->u.object_data, mark_func);
+}
+
+static void js_c_function_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+
+    if (p->u.cfunc.realm)
+        JS_FreeContext(p->u.cfunc.realm);
+}
+
+static void js_c_function_mark(JSRuntime *rt, JSValueConst val,
+                               JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+
+    if (p->u.cfunc.realm)
+        mark_func(rt, &p->u.cfunc.realm->header);
+}
+
+static void js_bytecode_function_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p1, *p = JS_VALUE_GET_OBJ(val);
+    JSFunctionBytecode *b;
+    JSVarRef **var_refs;
+    int i;
+
+    p1 = p->u.func.home_object;
+    if (p1) {
+        JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, p1));
+    }
+    b = p->u.func.function_bytecode;
+    if (b) {
+        var_refs = p->u.func.var_refs;
+        if (var_refs) {
+            for(i = 0; i < b->closure_var_count; i++)
+                free_var_ref(rt, var_refs[i]);
+            js_free_rt(rt, var_refs);
+        }
+        JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_FUNCTION_BYTECODE, b));
+    }
+}
+
+static void js_bytecode_function_mark(JSRuntime *rt, JSValueConst val,
+                                      JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSVarRef **var_refs = p->u.func.var_refs;
+    JSFunctionBytecode *b = p->u.func.function_bytecode;
+    int i;
+
+    if (p->u.func.home_object) {
+        JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, p->u.func.home_object),
+                     mark_func);
+    }
+    if (b) {
+        if (var_refs) {
+            for(i = 0; i < b->closure_var_count; i++) {
+                JSVarRef *var_ref = var_refs[i];
+                if (var_ref) {
+                    mark_func(rt, &var_ref->header);
+                }
+            }
+        }
+        /* must mark the function bytecode because template objects may be
+           part of a cycle */
+        JS_MarkValue(rt, JS_MKPTR(JS_TAG_FUNCTION_BYTECODE, b), mark_func);
+    }
+}
+
+static void js_bound_function_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSBoundFunction *bf = p->u.bound_function;
+    int i;
+
+    JS_FreeValueRT(rt, bf->func_obj);
+    JS_FreeValueRT(rt, bf->this_val);
+    for(i = 0; i < bf->argc; i++) {
+        JS_FreeValueRT(rt, bf->argv[i]);
+    }
+    js_free_rt(rt, bf);
+}
+
+static void js_bound_function_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSBoundFunction *bf = p->u.bound_function;
+    int i;
+
+    JS_MarkValue(rt, bf->func_obj, mark_func);
+    JS_MarkValue(rt, bf->this_val, mark_func);
+    for(i = 0; i < bf->argc; i++)
+        JS_MarkValue(rt, bf->argv[i], mark_func);
+}
+
+static void js_for_in_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSForInIterator *it = p->u.for_in_iterator;
+    int i;
+
+    JS_FreeValueRT(rt, it->obj);
+    if (!it->is_array) {
+        for(i = 0; i < it->atom_count; i++) {
+            JS_FreeAtomRT(rt, it->tab_atom[i].atom);
+        }
+        js_free_rt(rt, it->tab_atom);
+    }
+    js_free_rt(rt, it);
+}
+
+static void js_for_in_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSForInIterator *it = p->u.for_in_iterator;
+    JS_MarkValue(rt, it->obj, mark_func);
+}
+
+static void free_object(JSRuntime *rt, JSObject *p)
+{
+    int i;
+    JSClassFinalizer *finalizer;
+    JSShape *sh;
+    JSShapeProperty *pr;
+
+    p->free_mark = 1; /* used to tell the object is invalid when
+                         freeing cycles */
+    /* free all the fields */
+    sh = p->shape;
+    pr = get_shape_prop(sh);
+    for(i = 0; i < sh->prop_count; i++) {
+        free_property(rt, &p->prop[i], pr->flags);
+        pr++;
+    }
+    js_free_rt(rt, p->prop);
+    /* as an optimization we destroy the shape immediately without
+       putting it in gc_zero_ref_count_list */
+    js_free_shape(rt, sh);
+
+    /* fail safe */
+    p->shape = NULL;
+    p->prop = NULL;
+
+    if (unlikely(p->first_weak_ref)) {
+        reset_weak_ref(rt, p);
+    }
+
+    finalizer = rt->class_array[p->class_id].finalizer;
+    if (finalizer)
+        (*finalizer)(rt, JS_MKPTR(JS_TAG_OBJECT, p));
+
+    /* fail safe */
+    p->class_id = 0;
+    p->u.opaque = NULL;
+    p->u.func.var_refs = NULL;
+    p->u.func.home_object = NULL;
+
+    remove_gc_object(&p->header);
+    if (rt->gc_phase == JS_GC_PHASE_REMOVE_CYCLES && p->header.ref_count != 0) {
+        list_add_tail(&p->header.link, &rt->gc_zero_ref_count_list);
+    } else {
+        js_free_rt(rt, p);
+    }
+}
+
+static void free_gc_object(JSRuntime *rt, JSGCObjectHeader *gp)
+{
+    switch(gp->gc_obj_type) {
+    case JS_GC_OBJ_TYPE_JS_OBJECT:
+        free_object(rt, (JSObject *)gp);
+        break;
+    case JS_GC_OBJ_TYPE_FUNCTION_BYTECODE:
+        free_function_bytecode(rt, (JSFunctionBytecode *)gp);
+        break;
+    case JS_GC_OBJ_TYPE_ASYNC_FUNCTION:
+        __async_func_free(rt, (JSAsyncFunctionState *)gp);
+        break;
+    default:
+        abort();
+    }
+}
+
+static void free_zero_refcount(JSRuntime *rt)
+{
+    struct list_head *el;
+    JSGCObjectHeader *p;
+
+    rt->gc_phase = JS_GC_PHASE_DECREF;
+    for(;;) {
+        el = rt->gc_zero_ref_count_list.next;
+        if (el == &rt->gc_zero_ref_count_list)
+            break;
+        p = list_entry(el, JSGCObjectHeader, link);
+        assert(p->ref_count == 0);
+        free_gc_object(rt, p);
+    }
+    rt->gc_phase = JS_GC_PHASE_NONE;
+}
+
+/* called with the ref_count of 'v' reaches zero. */
+static void __JS_FreeValueRT(JSRuntime *rt, JSValue v)
+{
+    uint32_t tag = JS_VALUE_GET_TAG(v);
+
+#ifdef DUMP_FREE
+    {
+        printf("Freeing ");
+        if (tag == JS_TAG_OBJECT) {
+            JS_DumpObject(rt, JS_VALUE_GET_OBJ(v));
+        } else {
+            JS_DumpValueShort(rt, v);
+            printf("\n");
+        }
+    }
+#endif
+
+    switch(tag) {
+    case JS_TAG_STRING:
+        {
+            JSString *p = JS_VALUE_GET_STRING(v);
+            if (p->atom_type) {
+                JS_FreeAtomStruct(rt, p);
+            } else {
+#ifdef DUMP_LEAKS
+                list_del(&p->link);
+#endif
+                js_free_rt(rt, p);
+            }
+        }
+        break;
+    case JS_TAG_OBJECT:
+    case JS_TAG_FUNCTION_BYTECODE:
+        {
+            JSGCObjectHeader *p = JS_VALUE_GET_PTR(v);
+            if (rt->gc_phase != JS_GC_PHASE_REMOVE_CYCLES) {
+                list_del(&p->link);
+                list_add(&p->link, &rt->gc_zero_ref_count_list);
+                if (rt->gc_phase == JS_GC_PHASE_NONE) {
+                    free_zero_refcount(rt);
+                }
+            }
+        }
+        break;
+    case JS_TAG_MODULE:
+        abort(); /* never freed here */
+        break;
+    case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+#endif
+        {
+            JSBigFloat *bf = JS_VALUE_GET_PTR(v);
+            bf_delete(&bf->num);
+            js_free_rt(rt, bf);
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *bf = JS_VALUE_GET_PTR(v);
+            bfdec_delete(&bf->num);
+            js_free_rt(rt, bf);
+        }
+        break;
+#endif
+    case JS_TAG_SYMBOL:
+        {
+            JSAtomStruct *p = JS_VALUE_GET_PTR(v);
+            JS_FreeAtomStruct(rt, p);
+        }
+        break;
+    default:
+        printf("__JS_FreeValue: unknown tag=%d\n", tag);
+        abort();
+    }
+}
+
+static void __JS_FreeValue(JSContext *ctx, JSValue v)
+{
+    __JS_FreeValueRT(ctx->rt, v);
+}
+
+/* garbage collection */
+
+static void add_gc_object(JSRuntime *rt, JSGCObjectHeader *h,
+                          JSGCObjectTypeEnum type)
+{
+    h->mark = 0;
+    h->gc_obj_type = type;
+    list_add_tail(&h->link, &rt->gc_obj_list);
+}
+
+static void remove_gc_object(JSGCObjectHeader *h)
+{
+    list_del(&h->link);
+}
+
+void JS_MarkValue(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+    if (JS_VALUE_HAS_REF_COUNT(val)) {
+        switch(JS_VALUE_GET_TAG(val)) {
+        case JS_TAG_OBJECT:
+        case JS_TAG_FUNCTION_BYTECODE:
+            mark_func(rt, JS_VALUE_GET_PTR(val));
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+static void mark_children(JSRuntime *rt, JSGCObjectHeader *gp,
+                          JS_MarkFunc *mark_func)
+{
+    switch(gp->gc_obj_type) {
+    case JS_GC_OBJ_TYPE_JS_OBJECT:
+        {
+            JSObject *p = (JSObject *)gp;
+            JSShapeProperty *prs;
+            JSShape *sh;
+            int i;
+            sh = p->shape;
+            mark_func(rt, &sh->header);
+            /* mark all the fields */
+            prs = get_shape_prop(sh);
+            for(i = 0; i < sh->prop_count; i++) {
+                JSProperty *pr = &p->prop[i];
+                if (prs->atom != JS_ATOM_NULL) {
+                    if (prs->flags & JS_PROP_TMASK) {
+                        if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                            if (pr->u.getset.getter)
+                                mark_func(rt, &pr->u.getset.getter->header);
+                            if (pr->u.getset.setter)
+                                mark_func(rt, &pr->u.getset.setter->header);
+                        } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                            /* Note: the tag does not matter
+                               provided it is a GC object */
+                            mark_func(rt, &pr->u.var_ref->header);
+                        } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+                            js_autoinit_mark(rt, pr, mark_func);
+                        }
+                    } else {
+                        JS_MarkValue(rt, pr->u.value, mark_func);
+                    }
+                }
+                prs++;
+            }
+
+            if (p->class_id != JS_CLASS_OBJECT) {
+                JSClassGCMark *gc_mark;
+                gc_mark = rt->class_array[p->class_id].gc_mark;
+                if (gc_mark)
+                    gc_mark(rt, JS_MKPTR(JS_TAG_OBJECT, p), mark_func);
+            }
+        }
+        break;
+    case JS_GC_OBJ_TYPE_FUNCTION_BYTECODE:
+        /* the template objects can be part of a cycle */
+        {
+            JSFunctionBytecode *b = (JSFunctionBytecode *)gp;
+            int i;
+            for(i = 0; i < b->cpool_count; i++) {
+                JS_MarkValue(rt, b->cpool[i], mark_func);
+            }
+            if (b->realm)
+                mark_func(rt, &b->realm->header);
+        }
+        break;
+    case JS_GC_OBJ_TYPE_VAR_REF:
+        {
+            JSVarRef *var_ref = (JSVarRef *)gp;
+            if (var_ref->is_detached) {
+                JS_MarkValue(rt, *var_ref->pvalue, mark_func);
+            } else if (var_ref->async_func) {
+                mark_func(rt, &var_ref->async_func->header);
+            }
+        }
+        break;
+    case JS_GC_OBJ_TYPE_ASYNC_FUNCTION:
+        {
+            JSAsyncFunctionState *s = (JSAsyncFunctionState *)gp;
+            JSStackFrame *sf = &s->frame;
+            JSValue *sp;
+
+            if (!s->is_completed) {
+                JS_MarkValue(rt, sf->cur_func, mark_func);
+                JS_MarkValue(rt, s->this_val, mark_func);
+                /* sf->cur_sp = NULL if the function is running */
+                if (sf->cur_sp) {
+                    /* if the function is running, cur_sp is not known so we
+                       cannot mark the stack. Marking the variables is not needed
+                       because a running function cannot be part of a removable
+                       cycle */
+                    for(sp = sf->arg_buf; sp < sf->cur_sp; sp++)
+                        JS_MarkValue(rt, *sp, mark_func);
+                }
+            }
+            JS_MarkValue(rt, s->resolving_funcs[0], mark_func);
+            JS_MarkValue(rt, s->resolving_funcs[1], mark_func);
+        }
+        break;
+    case JS_GC_OBJ_TYPE_SHAPE:
+        {
+            JSShape *sh = (JSShape *)gp;
+            if (sh->proto != NULL) {
+                mark_func(rt, &sh->proto->header);
+            }
+        }
+        break;
+    case JS_GC_OBJ_TYPE_JS_CONTEXT:
+        {
+            JSContext *ctx = (JSContext *)gp;
+            JS_MarkContext(rt, ctx, mark_func);
+        }
+        break;
+    default:
+        abort();
+    }
+}
+
+static void gc_decref_child(JSRuntime *rt, JSGCObjectHeader *p)
+{
+    assert(p->ref_count > 0);
+    p->ref_count--;
+    if (p->ref_count == 0 && p->mark == 1) {
+        list_del(&p->link);
+        list_add_tail(&p->link, &rt->tmp_obj_list);
+    }
+}
+
+static void gc_decref(JSRuntime *rt)
+{
+    struct list_head *el, *el1;
+    JSGCObjectHeader *p;
+
+    init_list_head(&rt->tmp_obj_list);
+
+    /* decrement the refcount of all the children of all the GC
+       objects and move the GC objects with zero refcount to
+       tmp_obj_list */
+    list_for_each_safe(el, el1, &rt->gc_obj_list) {
+        p = list_entry(el, JSGCObjectHeader, link);
+        assert(p->mark == 0);
+        mark_children(rt, p, gc_decref_child);
+        p->mark = 1;
+        if (p->ref_count == 0) {
+            list_del(&p->link);
+            list_add_tail(&p->link, &rt->tmp_obj_list);
+        }
+    }
+}
+
+static void gc_scan_incref_child(JSRuntime *rt, JSGCObjectHeader *p)
+{
+    p->ref_count++;
+    if (p->ref_count == 1) {
+        /* ref_count was 0: remove from tmp_obj_list and add at the
+           end of gc_obj_list */
+        list_del(&p->link);
+        list_add_tail(&p->link, &rt->gc_obj_list);
+        p->mark = 0; /* reset the mark for the next GC call */
+    }
+}
+
+static void gc_scan_incref_child2(JSRuntime *rt, JSGCObjectHeader *p)
+{
+    p->ref_count++;
+}
+
+static void gc_scan(JSRuntime *rt)
+{
+    struct list_head *el;
+    JSGCObjectHeader *p;
+
+    /* keep the objects with a refcount > 0 and their children. */
+    list_for_each(el, &rt->gc_obj_list) {
+        p = list_entry(el, JSGCObjectHeader, link);
+        assert(p->ref_count > 0);
+        p->mark = 0; /* reset the mark for the next GC call */
+        mark_children(rt, p, gc_scan_incref_child);
+    }
+
+    /* restore the refcount of the objects to be deleted. */
+    list_for_each(el, &rt->tmp_obj_list) {
+        p = list_entry(el, JSGCObjectHeader, link);
+        mark_children(rt, p, gc_scan_incref_child2);
+    }
+}
+
+static void gc_free_cycles(JSRuntime *rt)
+{
+    struct list_head *el, *el1;
+    JSGCObjectHeader *p;
+#ifdef DUMP_GC_FREE
+    BOOL header_done = FALSE;
+#endif
+
+    rt->gc_phase = JS_GC_PHASE_REMOVE_CYCLES;
+
+    for(;;) {
+        el = rt->tmp_obj_list.next;
+        if (el == &rt->tmp_obj_list)
+            break;
+        p = list_entry(el, JSGCObjectHeader, link);
+        /* Only need to free the GC object associated with JS values
+           or async functions. The rest will be automatically removed
+           because they must be referenced by them. */
+        switch(p->gc_obj_type) {
+        case JS_GC_OBJ_TYPE_JS_OBJECT:
+        case JS_GC_OBJ_TYPE_FUNCTION_BYTECODE:
+        case JS_GC_OBJ_TYPE_ASYNC_FUNCTION:
+#ifdef DUMP_GC_FREE
+            if (!header_done) {
+                printf("Freeing cycles:\n");
+                JS_DumpObjectHeader(rt);
+                header_done = TRUE;
+            }
+            JS_DumpGCObject(rt, p);
+#endif
+            free_gc_object(rt, p);
+            break;
+        default:
+            list_del(&p->link);
+            list_add_tail(&p->link, &rt->gc_zero_ref_count_list);
+            break;
+        }
+    }
+    rt->gc_phase = JS_GC_PHASE_NONE;
+
+    list_for_each_safe(el, el1, &rt->gc_zero_ref_count_list) {
+        p = list_entry(el, JSGCObjectHeader, link);
+        assert(p->gc_obj_type == JS_GC_OBJ_TYPE_JS_OBJECT ||
+               p->gc_obj_type == JS_GC_OBJ_TYPE_FUNCTION_BYTECODE ||
+               p->gc_obj_type == JS_GC_OBJ_TYPE_ASYNC_FUNCTION);
+        js_free_rt(rt, p);
+    }
+
+    init_list_head(&rt->gc_zero_ref_count_list);
+}
+
+void JS_RunGC(JSRuntime *rt)
+{
+    /* decrement the reference of the children of each object. mark =
+       1 after this pass. */
+    gc_decref(rt);
+
+    /* keep the GC objects with a non zero refcount and their childs */
+    gc_scan(rt);
+
+    /* free the GC objects in a cycle */
+    gc_free_cycles(rt);
+}
+
+/* Return false if not an object or if the object has already been
+   freed (zombie objects are visible in finalizers when freeing
+   cycles). */
+BOOL JS_IsLiveObject(JSRuntime *rt, JSValueConst obj)
+{
+    JSObject *p;
+    if (!JS_IsObject(obj))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    return !p->free_mark;
+}
+
+/* Compute memory used by various object types */
+/* XXX: poor man's approach to handling multiply referenced objects */
+typedef struct JSMemoryUsage_helper {
+    double memory_used_count;
+    double str_count;
+    double str_size;
+    int64_t js_func_count;
+    double js_func_size;
+    int64_t js_func_code_size;
+    int64_t js_func_pc2line_count;
+    int64_t js_func_pc2line_size;
+} JSMemoryUsage_helper;
+
+static void compute_value_size(JSValueConst val, JSMemoryUsage_helper *hp);
+
+static void compute_jsstring_size(JSString *str, JSMemoryUsage_helper *hp)
+{
+    if (!str->atom_type) {  /* atoms are handled separately */
+        double s_ref_count = str->header.ref_count;
+        hp->str_count += 1 / s_ref_count;
+        hp->str_size += ((sizeof(*str) + (str->len << str->is_wide_char) +
+                          1 - str->is_wide_char) / s_ref_count);
+    }
+}
+
+static void compute_bytecode_size(JSFunctionBytecode *b, JSMemoryUsage_helper *hp)
+{
+    int memory_used_count, js_func_size, i;
+
+    memory_used_count = 0;
+    js_func_size = offsetof(JSFunctionBytecode, debug);
+    if (b->vardefs) {
+        js_func_size += (b->arg_count + b->var_count) * sizeof(*b->vardefs);
+    }
+    if (b->cpool) {
+        js_func_size += b->cpool_count * sizeof(*b->cpool);
+        for (i = 0; i < b->cpool_count; i++) {
+            JSValueConst val = b->cpool[i];
+            compute_value_size(val, hp);
+        }
+    }
+    if (b->closure_var) {
+        js_func_size += b->closure_var_count * sizeof(*b->closure_var);
+    }
+    if (!b->read_only_bytecode && b->byte_code_buf) {
+        hp->js_func_code_size += b->byte_code_len;
+    }
+    if (b->has_debug) {
+        js_func_size += sizeof(*b) - offsetof(JSFunctionBytecode, debug);
+        if (b->debug.source) {
+            memory_used_count++;
+            js_func_size += b->debug.source_len + 1;
+        }
+        if (b->debug.pc2line_len) {
+            memory_used_count++;
+            hp->js_func_pc2line_count += 1;
+            hp->js_func_pc2line_size += b->debug.pc2line_len;
+        }
+    }
+    hp->js_func_size += js_func_size;
+    hp->js_func_count += 1;
+    hp->memory_used_count += memory_used_count;
+}
+
+static void compute_value_size(JSValueConst val, JSMemoryUsage_helper *hp)
+{
+    switch(JS_VALUE_GET_TAG(val)) {
+    case JS_TAG_STRING:
+        compute_jsstring_size(JS_VALUE_GET_STRING(val), hp);
+        break;
+    case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+    case JS_TAG_BIG_DECIMAL:
+#endif
+        /* should track JSBigFloat usage */
+        break;
+    }
+}
+
+void JS_ComputeMemoryUsage(JSRuntime *rt, JSMemoryUsage *s)
+{
+    struct list_head *el, *el1;
+    int i;
+    JSMemoryUsage_helper mem = { 0 }, *hp = &mem;
+
+    memset(s, 0, sizeof(*s));
+    s->malloc_count = rt->malloc_state.malloc_count;
+    s->malloc_size = rt->malloc_state.malloc_size;
+    s->malloc_limit = rt->malloc_state.malloc_limit;
+
+    s->memory_used_count = 2; /* rt + rt->class_array */
+    s->memory_used_size = sizeof(JSRuntime) + sizeof(JSValue) * rt->class_count;
+
+    list_for_each(el, &rt->context_list) {
+        JSContext *ctx = list_entry(el, JSContext, link);
+        JSShape *sh = ctx->array_shape;
+        s->memory_used_count += 2; /* ctx + ctx->class_proto */
+        s->memory_used_size += sizeof(JSContext) +
+            sizeof(JSValue) * rt->class_count;
+        s->binary_object_count += ctx->binary_object_count;
+        s->binary_object_size += ctx->binary_object_size;
+
+        /* the hashed shapes are counted separately */
+        if (sh && !sh->is_hashed) {
+            int hash_size = sh->prop_hash_mask + 1;
+            s->shape_count++;
+            s->shape_size += get_shape_size(hash_size, sh->prop_size);
+        }
+        list_for_each(el1, &ctx->loaded_modules) {
+            JSModuleDef *m = list_entry(el1, JSModuleDef, link);
+            s->memory_used_count += 1;
+            s->memory_used_size += sizeof(*m);
+            if (m->req_module_entries) {
+                s->memory_used_count += 1;
+                s->memory_used_size += m->req_module_entries_count * sizeof(*m->req_module_entries);
+            }
+            if (m->export_entries) {
+                s->memory_used_count += 1;
+                s->memory_used_size += m->export_entries_count * sizeof(*m->export_entries);
+                for (i = 0; i < m->export_entries_count; i++) {
+                    JSExportEntry *me = &m->export_entries[i];
+                    if (me->export_type == JS_EXPORT_TYPE_LOCAL && me->u.local.var_ref) {
+                        /* potential multiple count */
+                        s->memory_used_count += 1;
+                        compute_value_size(me->u.local.var_ref->value, hp);
+                    }
+                }
+            }
+            if (m->star_export_entries) {
+                s->memory_used_count += 1;
+                s->memory_used_size += m->star_export_entries_count * sizeof(*m->star_export_entries);
+            }
+            if (m->import_entries) {
+                s->memory_used_count += 1;
+                s->memory_used_size += m->import_entries_count * sizeof(*m->import_entries);
+            }
+            compute_value_size(m->module_ns, hp);
+            compute_value_size(m->func_obj, hp);
+        }
+    }
+
+    list_for_each(el, &rt->gc_obj_list) {
+        JSGCObjectHeader *gp = list_entry(el, JSGCObjectHeader, link);
+        JSObject *p;
+        JSShape *sh;
+        JSShapeProperty *prs;
+
+        /* XXX: could count the other GC object types too */
+        if (gp->gc_obj_type == JS_GC_OBJ_TYPE_FUNCTION_BYTECODE) {
+            compute_bytecode_size((JSFunctionBytecode *)gp, hp);
+            continue;
+        } else if (gp->gc_obj_type != JS_GC_OBJ_TYPE_JS_OBJECT) {
+            continue;
+        }
+        p = (JSObject *)gp;
+        sh = p->shape;
+        s->obj_count++;
+        if (p->prop) {
+            s->memory_used_count++;
+            s->prop_size += sh->prop_size * sizeof(*p->prop);
+            s->prop_count += sh->prop_count;
+            prs = get_shape_prop(sh);
+            for(i = 0; i < sh->prop_count; i++) {
+                JSProperty *pr = &p->prop[i];
+                if (prs->atom != JS_ATOM_NULL && !(prs->flags & JS_PROP_TMASK)) {
+                    compute_value_size(pr->u.value, hp);
+                }
+                prs++;
+            }
+        }
+        /* the hashed shapes are counted separately */
+        if (!sh->is_hashed) {
+            int hash_size = sh->prop_hash_mask + 1;
+            s->shape_count++;
+            s->shape_size += get_shape_size(hash_size, sh->prop_size);
+        }
+
+        switch(p->class_id) {
+        case JS_CLASS_ARRAY:             /* u.array | length */
+        case JS_CLASS_ARGUMENTS:         /* u.array | length */
+            s->array_count++;
+            if (p->fast_array) {
+                s->fast_array_count++;
+                if (p->u.array.u.values) {
+                    s->memory_used_count++;
+                    s->memory_used_size += p->u.array.count *
+                        sizeof(*p->u.array.u.values);
+                    s->fast_array_elements += p->u.array.count;
+                    for (i = 0; i < p->u.array.count; i++) {
+                        compute_value_size(p->u.array.u.values[i], hp);
+                    }
+                }
+            }
+            break;
+        case JS_CLASS_NUMBER:            /* u.object_data */
+        case JS_CLASS_STRING:            /* u.object_data */
+        case JS_CLASS_BOOLEAN:           /* u.object_data */
+        case JS_CLASS_SYMBOL:            /* u.object_data */
+        case JS_CLASS_DATE:              /* u.object_data */
+        case JS_CLASS_BIG_INT:           /* u.object_data */
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_FLOAT:         /* u.object_data */
+        case JS_CLASS_BIG_DECIMAL:         /* u.object_data */
+#endif
+            compute_value_size(p->u.object_data, hp);
+            break;
+        case JS_CLASS_C_FUNCTION:        /* u.cfunc */
+            s->c_func_count++;
+            break;
+        case JS_CLASS_BYTECODE_FUNCTION: /* u.func */
+            {
+                JSFunctionBytecode *b = p->u.func.function_bytecode;
+                JSVarRef **var_refs = p->u.func.var_refs;
+                /* home_object: object will be accounted for in list scan */
+                if (var_refs) {
+                    s->memory_used_count++;
+                    s->js_func_size += b->closure_var_count * sizeof(*var_refs);
+                    for (i = 0; i < b->closure_var_count; i++) {
+                        if (var_refs[i]) {
+                            double ref_count = var_refs[i]->header.ref_count;
+                            s->memory_used_count += 1 / ref_count;
+                            s->js_func_size += sizeof(*var_refs[i]) / ref_count;
+                            /* handle non object closed values */
+                            if (var_refs[i]->pvalue == &var_refs[i]->value) {
+                                /* potential multiple count */
+                                compute_value_size(var_refs[i]->value, hp);
+                            }
+                        }
+                    }
+                }
+            }
+            break;
+        case JS_CLASS_BOUND_FUNCTION:    /* u.bound_function */
+            {
+                JSBoundFunction *bf = p->u.bound_function;
+                /* func_obj and this_val are objects */
+                for (i = 0; i < bf->argc; i++) {
+                    compute_value_size(bf->argv[i], hp);
+                }
+                s->memory_used_count += 1;
+                s->memory_used_size += sizeof(*bf) + bf->argc * sizeof(*bf->argv);
+            }
+            break;
+        case JS_CLASS_C_FUNCTION_DATA:   /* u.c_function_data_record */
+            {
+                JSCFunctionDataRecord *fd = p->u.c_function_data_record;
+                if (fd) {
+                    for (i = 0; i < fd->data_len; i++) {
+                        compute_value_size(fd->data[i], hp);
+                    }
+                    s->memory_used_count += 1;
+                    s->memory_used_size += sizeof(*fd) + fd->data_len * sizeof(*fd->data);
+                }
+            }
+            break;
+        case JS_CLASS_REGEXP:            /* u.regexp */
+            compute_jsstring_size(p->u.regexp.pattern, hp);
+            compute_jsstring_size(p->u.regexp.bytecode, hp);
+            break;
+
+        case JS_CLASS_FOR_IN_ITERATOR:   /* u.for_in_iterator */
+            {
+                JSForInIterator *it = p->u.for_in_iterator;
+                if (it) {
+                    compute_value_size(it->obj, hp);
+                    s->memory_used_count += 1;
+                    s->memory_used_size += sizeof(*it);
+                }
+            }
+            break;
+        case JS_CLASS_ARRAY_BUFFER:      /* u.array_buffer */
+        case JS_CLASS_SHARED_ARRAY_BUFFER: /* u.array_buffer */
+            {
+                JSArrayBuffer *abuf = p->u.array_buffer;
+                if (abuf) {
+                    s->memory_used_count += 1;
+                    s->memory_used_size += sizeof(*abuf);
+                    if (abuf->data) {
+                        s->memory_used_count += 1;
+                        s->memory_used_size += abuf->byte_length;
+                    }
+                }
+            }
+            break;
+        case JS_CLASS_GENERATOR:         /* u.generator_data */
+        case JS_CLASS_UINT8C_ARRAY:      /* u.typed_array / u.array */
+        case JS_CLASS_INT8_ARRAY:        /* u.typed_array / u.array */
+        case JS_CLASS_UINT8_ARRAY:       /* u.typed_array / u.array */
+        case JS_CLASS_INT16_ARRAY:       /* u.typed_array / u.array */
+        case JS_CLASS_UINT16_ARRAY:      /* u.typed_array / u.array */
+        case JS_CLASS_INT32_ARRAY:       /* u.typed_array / u.array */
+        case JS_CLASS_UINT32_ARRAY:      /* u.typed_array / u.array */
+        case JS_CLASS_BIG_INT64_ARRAY:   /* u.typed_array / u.array */
+        case JS_CLASS_BIG_UINT64_ARRAY:  /* u.typed_array / u.array */
+        case JS_CLASS_FLOAT32_ARRAY:     /* u.typed_array / u.array */
+        case JS_CLASS_FLOAT64_ARRAY:     /* u.typed_array / u.array */
+        case JS_CLASS_DATAVIEW:          /* u.typed_array */
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_FLOAT_ENV:         /* u.float_env */
+#endif
+        case JS_CLASS_MAP:               /* u.map_state */
+        case JS_CLASS_SET:               /* u.map_state */
+        case JS_CLASS_WEAKMAP:           /* u.map_state */
+        case JS_CLASS_WEAKSET:           /* u.map_state */
+        case JS_CLASS_MAP_ITERATOR:      /* u.map_iterator_data */
+        case JS_CLASS_SET_ITERATOR:      /* u.map_iterator_data */
+        case JS_CLASS_ARRAY_ITERATOR:    /* u.array_iterator_data */
+        case JS_CLASS_STRING_ITERATOR:   /* u.array_iterator_data */
+        case JS_CLASS_PROXY:             /* u.proxy_data */
+        case JS_CLASS_PROMISE:           /* u.promise_data */
+        case JS_CLASS_PROMISE_RESOLVE_FUNCTION:  /* u.promise_function_data */
+        case JS_CLASS_PROMISE_REJECT_FUNCTION:   /* u.promise_function_data */
+        case JS_CLASS_ASYNC_FUNCTION_RESOLVE:    /* u.async_function_data */
+        case JS_CLASS_ASYNC_FUNCTION_REJECT:     /* u.async_function_data */
+        case JS_CLASS_ASYNC_FROM_SYNC_ITERATOR:  /* u.async_from_sync_iterator_data */
+        case JS_CLASS_ASYNC_GENERATOR:   /* u.async_generator_data */
+            /* TODO */
+        default:
+            /* XXX: class definition should have an opaque block size */
+            if (p->u.opaque) {
+                s->memory_used_count += 1;
+            }
+            break;
+        }
+    }
+    s->obj_size += s->obj_count * sizeof(JSObject);
+
+    /* hashed shapes */
+    s->memory_used_count++; /* rt->shape_hash */
+    s->memory_used_size += sizeof(rt->shape_hash[0]) * rt->shape_hash_size;
+    for(i = 0; i < rt->shape_hash_size; i++) {
+        JSShape *sh;
+        for(sh = rt->shape_hash[i]; sh != NULL; sh = sh->shape_hash_next) {
+            int hash_size = sh->prop_hash_mask + 1;
+            s->shape_count++;
+            s->shape_size += get_shape_size(hash_size, sh->prop_size);
+        }
+    }
+
+    /* atoms */
+    s->memory_used_count += 2; /* rt->atom_array, rt->atom_hash */
+    s->atom_count = rt->atom_count;
+    s->atom_size = sizeof(rt->atom_array[0]) * rt->atom_size +
+        sizeof(rt->atom_hash[0]) * rt->atom_hash_size;
+    for(i = 0; i < rt->atom_size; i++) {
+        JSAtomStruct *p = rt->atom_array[i];
+        if (!atom_is_free(p)) {
+            s->atom_size += (sizeof(*p) + (p->len << p->is_wide_char) +
+                             1 - p->is_wide_char);
+        }
+    }
+    s->str_count = round(mem.str_count);
+    s->str_size = round(mem.str_size);
+    s->js_func_count = mem.js_func_count;
+    s->js_func_size = round(mem.js_func_size);
+    s->js_func_code_size = mem.js_func_code_size;
+    s->js_func_pc2line_count = mem.js_func_pc2line_count;
+    s->js_func_pc2line_size = mem.js_func_pc2line_size;
+    s->memory_used_count += round(mem.memory_used_count) +
+        s->atom_count + s->str_count +
+        s->obj_count + s->shape_count +
+        s->js_func_count + s->js_func_pc2line_count;
+    s->memory_used_size += s->atom_size + s->str_size +
+        s->obj_size + s->prop_size + s->shape_size +
+        s->js_func_size + s->js_func_code_size + s->js_func_pc2line_size;
+}
+
+void JS_DumpMemoryUsage(FILE *fp, const JSMemoryUsage *s, JSRuntime *rt)
+{
+    fprintf(fp, "QuickJS memory usage -- "
+#ifdef CONFIG_BIGNUM
+            "BigNum "
+#endif
+            CONFIG_VERSION " version, %d-bit, malloc limit: %"PRId64"\n\n",
+            (int)sizeof(void *) * 8, s->malloc_limit);
+#if 1
+    if (rt) {
+        static const struct {
+            const char *name;
+            size_t size;
+        } object_types[] = {
+            { "JSRuntime", sizeof(JSRuntime) },
+            { "JSContext", sizeof(JSContext) },
+            { "JSObject", sizeof(JSObject) },
+            { "JSString", sizeof(JSString) },
+            { "JSFunctionBytecode", sizeof(JSFunctionBytecode) },
+        };
+        int i, usage_size_ok = 0;
+        for(i = 0; i < countof(object_types); i++) {
+            unsigned int size = object_types[i].size;
+            void *p = js_malloc_rt(rt, size);
+            if (p) {
+                unsigned int size1 = js_malloc_usable_size_rt(rt, p);
+                if (size1 >= size) {
+                    usage_size_ok = 1;
+                    fprintf(fp, "  %3u + %-2u  %s\n",
+                            size, size1 - size, object_types[i].name);
+                }
+                js_free_rt(rt, p);
+            }
+        }
+        if (!usage_size_ok) {
+            fprintf(fp, "  malloc_usable_size unavailable\n");
+        }
+        {
+            int obj_classes[JS_CLASS_INIT_COUNT + 1] = { 0 };
+            int class_id;
+            struct list_head *el;
+            list_for_each(el, &rt->gc_obj_list) {
+                JSGCObjectHeader *gp = list_entry(el, JSGCObjectHeader, link);
+                JSObject *p;
+                if (gp->gc_obj_type == JS_GC_OBJ_TYPE_JS_OBJECT) {
+                    p = (JSObject *)gp;
+                    obj_classes[min_uint32(p->class_id, JS_CLASS_INIT_COUNT)]++;
+                }
+            }
+            fprintf(fp, "\n" "JSObject classes\n");
+            if (obj_classes[0])
+                fprintf(fp, "  %5d  %2.0d %s\n", obj_classes[0], 0, "none");
+            for (class_id = 1; class_id < JS_CLASS_INIT_COUNT; class_id++) {
+                if (obj_classes[class_id] && class_id < rt->class_count) {
+                    char buf[ATOM_GET_STR_BUF_SIZE];
+                    fprintf(fp, "  %5d  %2.0d %s\n", obj_classes[class_id], class_id,
+                            JS_AtomGetStrRT(rt, buf, sizeof(buf), rt->class_array[class_id].class_name));
+                }
+            }
+            if (obj_classes[JS_CLASS_INIT_COUNT])
+                fprintf(fp, "  %5d  %2.0d %s\n", obj_classes[JS_CLASS_INIT_COUNT], 0, "other");
+        }
+        fprintf(fp, "\n");
+    }
+#endif
+    fprintf(fp, "%-20s %8s %8s\n", "NAME", "COUNT", "SIZE");
+
+    if (s->malloc_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per block)\n",
+                "memory allocated", s->malloc_count, s->malloc_size,
+                (double)s->malloc_size / s->malloc_count);
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%d overhead, %0.1f average slack)\n",
+                "memory used", s->memory_used_count, s->memory_used_size,
+                MALLOC_OVERHEAD, ((double)(s->malloc_size - s->memory_used_size) /
+                                  s->memory_used_count));
+    }
+    if (s->atom_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per atom)\n",
+                "atoms", s->atom_count, s->atom_size,
+                (double)s->atom_size / s->atom_count);
+    }
+    if (s->str_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per string)\n",
+                "strings", s->str_count, s->str_size,
+                (double)s->str_size / s->str_count);
+    }
+    if (s->obj_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per object)\n",
+                "objects", s->obj_count, s->obj_size,
+                (double)s->obj_size / s->obj_count);
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per object)\n",
+                "  properties", s->prop_count, s->prop_size,
+                (double)s->prop_count / s->obj_count);
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per shape)\n",
+                "  shapes", s->shape_count, s->shape_size,
+                (double)s->shape_size / s->shape_count);
+    }
+    if (s->js_func_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"\n",
+                "bytecode functions", s->js_func_count, s->js_func_size);
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per function)\n",
+                "  bytecode", s->js_func_count, s->js_func_code_size,
+                (double)s->js_func_code_size / s->js_func_count);
+        if (s->js_func_pc2line_count) {
+            fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per function)\n",
+                    "  pc2line", s->js_func_pc2line_count,
+                    s->js_func_pc2line_size,
+                    (double)s->js_func_pc2line_size / s->js_func_pc2line_count);
+        }
+    }
+    if (s->c_func_count) {
+        fprintf(fp, "%-20s %8"PRId64"\n", "C functions", s->c_func_count);
+    }
+    if (s->array_count) {
+        fprintf(fp, "%-20s %8"PRId64"\n", "arrays", s->array_count);
+        if (s->fast_array_count) {
+            fprintf(fp, "%-20s %8"PRId64"\n", "  fast arrays", s->fast_array_count);
+            fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per fast array)\n",
+                    "  elements", s->fast_array_elements,
+                    s->fast_array_elements * (int)sizeof(JSValue),
+                    (double)s->fast_array_elements / s->fast_array_count);
+        }
+    }
+    if (s->binary_object_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"\n",
+                "binary objects", s->binary_object_count, s->binary_object_size);
+    }
+}
+
+JSValue JS_GetGlobalObject(JSContext *ctx)
+{
+    return JS_DupValue(ctx, ctx->global_obj);
+}
+
+/* WARNING: obj is freed */
+JSValue JS_Throw(JSContext *ctx, JSValue obj)
+{
+    JSRuntime *rt = ctx->rt;
+    JS_FreeValue(ctx, rt->current_exception);
+    rt->current_exception = obj;
+    return JS_EXCEPTION;
+}
+
+/* return the pending exception (cannot be called twice). */
+JSValue JS_GetException(JSContext *ctx)
+{
+    JSValue val;
+    JSRuntime *rt = ctx->rt;
+    val = rt->current_exception;
+    rt->current_exception = JS_NULL;
+    return val;
+}
+
+JS_BOOL JS_HasException(JSContext *ctx)
+{
+    return !JS_IsNull(ctx->rt->current_exception);
+}
+
+static void dbuf_put_leb128(DynBuf *s, uint32_t v)
+{
+    uint32_t a;
+    for(;;) {
+        a = v & 0x7f;
+        v >>= 7;
+        if (v != 0) {
+            dbuf_putc(s, a | 0x80);
+        } else {
+            dbuf_putc(s, a);
+            break;
+        }
+    }
+}
+
+static void dbuf_put_sleb128(DynBuf *s, int32_t v1)
+{
+    uint32_t v = v1;
+    dbuf_put_leb128(s, (2 * v) ^ -(v >> 31));
+}
+
+static int get_leb128(uint32_t *pval, const uint8_t *buf,
+                      const uint8_t *buf_end)
+{
+    const uint8_t *ptr = buf;
+    uint32_t v, a, i;
+    v = 0;
+    for(i = 0; i < 5; i++) {
+        if (unlikely(ptr >= buf_end))
+            break;
+        a = *ptr++;
+        v |= (a & 0x7f) << (i * 7);
+        if (!(a & 0x80)) {
+            *pval = v;
+            return ptr - buf;
+        }
+    }
+    *pval = 0;
+    return -1;
+}
+
+static int get_sleb128(int32_t *pval, const uint8_t *buf,
+                       const uint8_t *buf_end)
+{
+    int ret;
+    uint32_t val;
+    ret = get_leb128(&val, buf, buf_end);
+    if (ret < 0) {
+        *pval = 0;
+        return -1;
+    }
+    *pval = (val >> 1) ^ -(val & 1);
+    return ret;
+}
+
+static int find_line_num(JSContext *ctx, JSFunctionBytecode *b,
+                         uint32_t pc_value)
+{
+    const uint8_t *p_end, *p;
+    int new_line_num, line_num, pc, v, ret;
+    unsigned int op;
+
+    if (!b->has_debug || !b->debug.pc2line_buf) {
+        /* function was stripped */
+        return -1;
+    }
+
+    p = b->debug.pc2line_buf;
+    p_end = p + b->debug.pc2line_len;
+    pc = 0;
+    line_num = b->debug.line_num;
+    while (p < p_end) {
+        op = *p++;
+        if (op == 0) {
+            uint32_t val;
+            ret = get_leb128(&val, p, p_end);
+            if (ret < 0)
+                goto fail;
+            pc += val;
+            p += ret;
+            ret = get_sleb128(&v, p, p_end);
+            if (ret < 0) {
+            fail:
+                /* should never happen */
+                return b->debug.line_num;
+            }
+            p += ret;
+            new_line_num = line_num + v;
+        } else {
+            op -= PC2LINE_OP_FIRST;
+            pc += (op / PC2LINE_RANGE);
+            new_line_num = line_num + (op % PC2LINE_RANGE) + PC2LINE_BASE;
+        }
+        if (pc_value < pc)
+            return line_num;
+        line_num = new_line_num;
+    }
+    return line_num;
+}
+
+/* in order to avoid executing arbitrary code during the stack trace
+   generation, we only look at simple 'name' properties containing a
+   string. */
+static const char *get_func_name(JSContext *ctx, JSValueConst func)
+{
+    JSProperty *pr;
+    JSShapeProperty *prs;
+    JSValueConst val;
+
+    if (JS_VALUE_GET_TAG(func) != JS_TAG_OBJECT)
+        return NULL;
+    prs = find_own_property(&pr, JS_VALUE_GET_OBJ(func), JS_ATOM_name);
+    if (!prs)
+        return NULL;
+    if ((prs->flags & JS_PROP_TMASK) != JS_PROP_NORMAL)
+        return NULL;
+    val = pr->u.value;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_STRING)
+        return NULL;
+    return JS_ToCString(ctx, val);
+}
+
+#define JS_BACKTRACE_FLAG_SKIP_FIRST_LEVEL (1 << 0)
+/* only taken into account if filename is provided */
+#define JS_BACKTRACE_FLAG_SINGLE_LEVEL     (1 << 1)
+
+/* if filename != NULL, an additional level is added with the filename
+   and line number information (used for parse error). */
+void build_backtrace(JSContext *ctx, JSValueConst error_obj,
+                            const char *filename, int line_num,
+                            int backtrace_flags)
+{
+    JSStackFrame *sf;
+    JSValue str;
+    DynBuf dbuf;
+    const char *func_name_str;
+    const char *str1;
+    JSObject *p;
+    BOOL backtrace_barrier;
+
+    js_dbuf_init(ctx, &dbuf);
+    if (filename) {
+        dbuf_printf(&dbuf, "    at %s", filename);
+        if (line_num != -1)
+            dbuf_printf(&dbuf, ":%d", line_num);
+        dbuf_putc(&dbuf, '\n');
+        str = JS_NewString(ctx, filename);
+        JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_fileName, str,
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+        JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_lineNumber, JS_NewInt32(ctx, line_num),
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+        if (backtrace_flags & JS_BACKTRACE_FLAG_SINGLE_LEVEL)
+            goto done;
+    }
+    for(sf = ctx->rt->current_stack_frame; sf != NULL; sf = sf->prev_frame) {
+        if (backtrace_flags & JS_BACKTRACE_FLAG_SKIP_FIRST_LEVEL) {
+            backtrace_flags &= ~JS_BACKTRACE_FLAG_SKIP_FIRST_LEVEL;
+            continue;
+        }
+        func_name_str = get_func_name(ctx, sf->cur_func);
+        if (!func_name_str || func_name_str[0] == '\0')
+            str1 = "<anonymous>";
+        else
+            str1 = func_name_str;
+        dbuf_printf(&dbuf, "    at %s", str1);
+        JS_FreeCString(ctx, func_name_str);
+
+        p = JS_VALUE_GET_OBJ(sf->cur_func);
+        backtrace_barrier = FALSE;
+        if (js_class_has_bytecode(p->class_id)) {
+            JSFunctionBytecode *b;
+            const char *atom_str;
+            int line_num1;
+
+            b = p->u.func.function_bytecode;
+            backtrace_barrier = b->backtrace_barrier;
+            if (b->has_debug) {
+                line_num1 = find_line_num(ctx, b,
+                                          sf->cur_pc - b->byte_code_buf - 1);
+                atom_str = JS_AtomToCString(ctx, b->debug.filename);
+                dbuf_printf(&dbuf, " (%s",
+                            atom_str ? atom_str : "<null>");
+                JS_FreeCString(ctx, atom_str);
+                if (line_num1 != -1)
+                    dbuf_printf(&dbuf, ":%d", line_num1);
+                dbuf_putc(&dbuf, ')');
+            }
+        } else {
+            dbuf_printf(&dbuf, " (native)");
+        }
+        dbuf_putc(&dbuf, '\n');
+        /* stop backtrace if JS_EVAL_FLAG_BACKTRACE_BARRIER was used */
+        if (backtrace_barrier)
+            break;
+    }
+ done:
+    dbuf_putc(&dbuf, '\0');
+    if (dbuf_error(&dbuf))
+        str = JS_NULL;
+    else
+        str = JS_NewString(ctx, (char *)dbuf.buf);
+    dbuf_free(&dbuf);
+    JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_stack, str,
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+}
+
+/* Note: it is important that no exception is returned by this function */
+static BOOL is_backtrace_needed(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (p->class_id != JS_CLASS_ERROR)
+        return FALSE;
+    if (find_own_property1(p, JS_ATOM_stack))
+        return FALSE;
+    return TRUE;
+}
+
+JSValue JS_NewError(JSContext *ctx)
+{
+    return JS_NewObjectClass(ctx, JS_CLASS_ERROR);
+}
+
+static JSValue JS_ThrowError2(JSContext *ctx, JSErrorEnum error_num,
+                              const char *fmt, va_list ap, BOOL add_backtrace)
+{
+    char buf[8192];
+    JSValue obj, ret;
+
+    vsnprintf(buf, sizeof(buf), fmt, ap);
+    obj = JS_NewObjectProtoClass(ctx, ctx->native_error_proto[error_num],
+                                 JS_CLASS_ERROR);
+    if (unlikely(JS_IsException(obj))) {
+        /* out of memory: throw JS_NULL to avoid recursing */
+        obj = JS_NULL;
+    } else {
+        JS_DefinePropertyValue(ctx, obj, JS_ATOM_message,
+                               JS_NewString(ctx, buf),
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    }
+    if (add_backtrace) {
+        build_backtrace(ctx, obj, NULL, 0, 0);
+    }
+    ret = JS_Throw(ctx, obj);
+    return ret;
+}
+
+static JSValue JS_ThrowError(JSContext *ctx, JSErrorEnum error_num,
+                             const char *fmt, va_list ap)
+{
+    JSRuntime *rt = ctx->rt;
+    JSStackFrame *sf;
+    BOOL add_backtrace;
+
+    /* the backtrace is added later if called from a bytecode function */
+    sf = rt->current_stack_frame;
+    add_backtrace = !rt->in_out_of_memory &&
+        (!sf || (JS_GetFunctionBytecode(sf->cur_func) == NULL));
+    return JS_ThrowError2(ctx, error_num, fmt, ap, add_backtrace);
+}
+
+JSValue FORMAT_ATTR(2, 3) JS_ThrowSyntaxError(JSContext *ctx, const char *fmt, ...)
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_SYNTAX_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+JSValue FORMAT_ATTR(2, 3) JS_ThrowTypeError(JSContext *ctx, const char *fmt, ...)
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_TYPE_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+static int FORMAT_ATTR(3, 4) JS_ThrowTypeErrorOrFalse(JSContext *ctx, int flags, const char *fmt, ...)
+{
+    va_list ap;
+
+    if ((flags & JS_PROP_THROW) ||
+        ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
+        va_start(ap, fmt);
+        JS_ThrowError(ctx, JS_TYPE_ERROR, fmt, ap);
+        va_end(ap);
+        return -1;
+    } else {
+        return FALSE;
+    }
+}
+
+/* never use it directly */
+static JSValue FORMAT_ATTR(3, 4) __JS_ThrowTypeErrorAtom(JSContext *ctx, JSAtom atom, const char *fmt, ...)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+    return JS_ThrowTypeError(ctx, fmt,
+                             JS_AtomGetStr(ctx, buf, sizeof(buf), atom));
+}
+
+/* never use it directly */
+static JSValue FORMAT_ATTR(3, 4) __JS_ThrowSyntaxErrorAtom(JSContext *ctx, JSAtom atom, const char *fmt, ...)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+    return JS_ThrowSyntaxError(ctx, fmt,
+                             JS_AtomGetStr(ctx, buf, sizeof(buf), atom));
+}
+
+/* %s is replaced by 'atom'. The macro is used so that gcc can check
+    the format string. */
+#define JS_ThrowTypeErrorAtom(ctx, fmt, atom) __JS_ThrowTypeErrorAtom(ctx, atom, fmt, "")
+#define JS_ThrowSyntaxErrorAtom(ctx, fmt, atom) __JS_ThrowSyntaxErrorAtom(ctx, atom, fmt, "")
+
+static int JS_ThrowTypeErrorReadOnly(JSContext *ctx, int flags, JSAtom atom)
+{
+    if ((flags & JS_PROP_THROW) ||
+        ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
+        JS_ThrowTypeErrorAtom(ctx, "'%s' is read-only", atom);
+        return -1;
+    } else {
+        return FALSE;
+    }
+}
+
+JSValue FORMAT_ATTR(2, 3) JS_ThrowReferenceError(JSContext *ctx, const char *fmt, ...)
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_REFERENCE_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+JSValue FORMAT_ATTR(2, 3) JS_ThrowRangeError(JSContext *ctx, const char *fmt, ...)
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_RANGE_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+JSValue FORMAT_ATTR(2, 3) JS_ThrowInternalError(JSContext *ctx, const char *fmt, ...)
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_INTERNAL_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+JSValue JS_ThrowOutOfMemory(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    if (!rt->in_out_of_memory) {
+        rt->in_out_of_memory = TRUE;
+        JS_ThrowInternalError(ctx, "out of memory");
+        rt->in_out_of_memory = FALSE;
+    }
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ThrowStackOverflow(JSContext *ctx)
+{
+    return JS_ThrowInternalError(ctx, "stack overflow");
+}
+
+static JSValue JS_ThrowTypeErrorNotAnObject(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "not an object");
+}
+
+static JSValue JS_ThrowTypeErrorNotASymbol(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "not a symbol");
+}
+
+static JSValue JS_ThrowReferenceErrorNotDefined(JSContext *ctx, JSAtom name)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+    return JS_ThrowReferenceError(ctx, "'%s' is not defined",
+                                  JS_AtomGetStr(ctx, buf, sizeof(buf), name));
+}
+
+static JSValue JS_ThrowReferenceErrorUninitialized(JSContext *ctx, JSAtom name)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+    return JS_ThrowReferenceError(ctx, "%s is not initialized",
+                                  name == JS_ATOM_NULL ? "lexical variable" :
+                                  JS_AtomGetStr(ctx, buf, sizeof(buf), name));
+}
+
+static JSValue JS_ThrowReferenceErrorUninitialized2(JSContext *ctx,
+                                                    JSFunctionBytecode *b,
+                                                    int idx, BOOL is_ref)
+{
+    JSAtom atom = JS_ATOM_NULL;
+    if (is_ref) {
+        atom = b->closure_var[idx].var_name;
+    } else {
+        /* not present if the function is stripped and contains no eval() */
+        if (b->vardefs)
+            atom = b->vardefs[b->arg_count + idx].var_name;
+    }
+    return JS_ThrowReferenceErrorUninitialized(ctx, atom);
+}
+
+static JSValue JS_ThrowTypeErrorInvalidClass(JSContext *ctx, int class_id)
+{
+    JSRuntime *rt = ctx->rt;
+    JSAtom name;
+    name = rt->class_array[class_id].class_name;
+    return JS_ThrowTypeErrorAtom(ctx, "%s object expected", name);
+}
+
+static no_inline __exception int __js_poll_interrupts(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    ctx->interrupt_counter = JS_INTERRUPT_COUNTER_INIT;
+    if (rt->interrupt_handler) {
+        if (rt->interrupt_handler(rt, rt->interrupt_opaque)) {
+            /* XXX: should set a specific flag to avoid catching */
+            JS_ThrowInternalError(ctx, "interrupted");
+            JS_SetUncatchableError(ctx, ctx->rt->current_exception, TRUE);
+            return -1;
+        }
+    }
+    return 0;
+}
+
+static inline __exception int js_poll_interrupts(JSContext *ctx)
+{
+    if (unlikely(--ctx->interrupt_counter <= 0)) {
+        return __js_poll_interrupts(ctx);
+    } else {
+        return 0;
+    }
+}
+
+/* return -1 (exception) or TRUE/FALSE */
+static int JS_SetPrototypeInternal(JSContext *ctx, JSValueConst obj,
+                                   JSValueConst proto_val,
+                                   BOOL throw_flag)
+{
+    JSObject *proto, *p, *p1;
+    JSShape *sh;
+
+    if (throw_flag) {
+        if (JS_VALUE_GET_TAG(obj) == JS_TAG_NULL ||
+            JS_VALUE_GET_TAG(obj) == JS_TAG_UNDEFINED)
+            goto not_obj;
+    } else {
+        if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+            goto not_obj;
+    }
+    p = JS_VALUE_GET_OBJ(obj);
+    if (JS_VALUE_GET_TAG(proto_val) != JS_TAG_OBJECT) {
+        if (JS_VALUE_GET_TAG(proto_val) != JS_TAG_NULL) {
+        not_obj:
+            JS_ThrowTypeErrorNotAnObject(ctx);
+            return -1;
+        }
+        proto = NULL;
+    } else {
+        proto = JS_VALUE_GET_OBJ(proto_val);
+    }
+
+    if (throw_flag && JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return TRUE;
+
+    if (unlikely(p->class_id == JS_CLASS_PROXY))
+        return js_proxy_setPrototypeOf(ctx, obj, proto_val, throw_flag);
+    sh = p->shape;
+    if (sh->proto == proto)
+        return TRUE;
+    if (!p->extensible) {
+        if (throw_flag) {
+            JS_ThrowTypeError(ctx, "object is not extensible");
+            return -1;
+        } else {
+            return FALSE;
+        }
+    }
+    if (proto) {
+        /* check if there is a cycle */
+        p1 = proto;
+        do {
+            if (p1 == p) {
+                if (throw_flag) {
+                    JS_ThrowTypeError(ctx, "circular prototype chain");
+                    return -1;
+                } else {
+                    return FALSE;
+                }
+            }
+            /* Note: for Proxy objects, proto is NULL */
+            p1 = p1->shape->proto;
+        } while (p1 != NULL);
+        JS_DupValue(ctx, proto_val);
+    }
+
+    if (js_shape_prepare_update(ctx, p, NULL))
+        return -1;
+    sh = p->shape;
+    if (sh->proto)
+        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, sh->proto));
+    sh->proto = proto;
+    return TRUE;
+}
+
+/* return -1 (exception) or TRUE/FALSE */
+int JS_SetPrototype(JSContext *ctx, JSValueConst obj, JSValueConst proto_val)
+{
+    return JS_SetPrototypeInternal(ctx, obj, proto_val, TRUE);
+}
+
+/* Only works for primitive types, otherwise return JS_NULL. */
+static JSValueConst JS_GetPrototypePrimitive(JSContext *ctx, JSValueConst val)
+{
+    switch(JS_VALUE_GET_NORM_TAG(val)) {
+    case JS_TAG_BIG_INT:
+        val = ctx->class_proto[JS_CLASS_BIG_INT];
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        val = ctx->class_proto[JS_CLASS_BIG_FLOAT];
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        val = ctx->class_proto[JS_CLASS_BIG_DECIMAL];
+        break;
+#endif
+    case JS_TAG_INT:
+    case JS_TAG_FLOAT64:
+        val = ctx->class_proto[JS_CLASS_NUMBER];
+        break;
+    case JS_TAG_BOOL:
+        val = ctx->class_proto[JS_CLASS_BOOLEAN];
+        break;
+    case JS_TAG_STRING:
+        val = ctx->class_proto[JS_CLASS_STRING];
+        break;
+    case JS_TAG_SYMBOL:
+        val = ctx->class_proto[JS_CLASS_SYMBOL];
+        break;
+    case JS_TAG_OBJECT:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+    default:
+        val = JS_NULL;
+        break;
+    }
+    return val;
+}
+
+/* Return an Object, JS_NULL or JS_EXCEPTION in case of Proxy object. */
+JSValue JS_GetPrototype(JSContext *ctx, JSValueConst obj)
+{
+    JSValue val;
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        JSObject *p;
+        p = JS_VALUE_GET_OBJ(obj);
+        if (unlikely(p->class_id == JS_CLASS_PROXY)) {
+            val = js_proxy_getPrototypeOf(ctx, obj);
+        } else {
+            p = p->shape->proto;
+            if (!p)
+                val = JS_NULL;
+            else
+                val = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+        }
+    } else {
+        val = JS_DupValue(ctx, JS_GetPrototypePrimitive(ctx, obj));
+    }
+    return val;
+}
+
+static JSValue JS_GetPrototypeFree(JSContext *ctx, JSValue obj)
+{
+    JSValue obj1;
+    obj1 = JS_GetPrototype(ctx, obj);
+    JS_FreeValue(ctx, obj);
+    return obj1;
+}
+
+/* return TRUE, FALSE or (-1) in case of exception */
+static int JS_OrdinaryIsInstanceOf(JSContext *ctx, JSValueConst val,
+                                   JSValueConst obj)
+{
+    JSValue obj_proto;
+    JSObject *proto;
+    const JSObject *p, *proto1;
+    BOOL ret;
+
+    if (!JS_IsFunction(ctx, obj))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (p->class_id == JS_CLASS_BOUND_FUNCTION) {
+        JSBoundFunction *s = p->u.bound_function;
+        return JS_IsInstanceOf(ctx, val, s->func_obj);
+    }
+
+    /* Only explicitly boxed values are instances of constructors */
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    obj_proto = JS_GetProperty(ctx, obj, JS_ATOM_prototype);
+    if (JS_VALUE_GET_TAG(obj_proto) != JS_TAG_OBJECT) {
+        if (!JS_IsException(obj_proto))
+            JS_ThrowTypeError(ctx, "operand 'prototype' property is not an object");
+        ret = -1;
+        goto done;
+    }
+    proto = JS_VALUE_GET_OBJ(obj_proto);
+    p = JS_VALUE_GET_OBJ(val);
+    for(;;) {
+        proto1 = p->shape->proto;
+        if (!proto1) {
+            /* slow case if proxy in the prototype chain */
+            if (unlikely(p->class_id == JS_CLASS_PROXY)) {
+                JSValue obj1;
+                obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, (JSObject *)p));
+                for(;;) {
+                    obj1 = JS_GetPrototypeFree(ctx, obj1);
+                    if (JS_IsException(obj1)) {
+                        ret = -1;
+                        break;
+                    }
+                    if (JS_IsNull(obj1)) {
+                        ret = FALSE;
+                        break;
+                    }
+                    if (proto == JS_VALUE_GET_OBJ(obj1)) {
+                        JS_FreeValue(ctx, obj1);
+                        ret = TRUE;
+                        break;
+                    }
+                    /* must check for timeout to avoid infinite loop */
+                    if (js_poll_interrupts(ctx)) {
+                        JS_FreeValue(ctx, obj1);
+                        ret = -1;
+                        break;
+                    }
+                }
+            } else {
+                ret = FALSE;
+            }
+            break;
+        }
+        p = proto1;
+        if (proto == p) {
+            ret = TRUE;
+            break;
+        }
+    }
+done:
+    JS_FreeValue(ctx, obj_proto);
+    return ret;
+}
+
+/* return TRUE, FALSE or (-1) in case of exception */
+int JS_IsInstanceOf(JSContext *ctx, JSValueConst val, JSValueConst obj)
+{
+    JSValue method;
+
+    if (!JS_IsObject(obj))
+        goto fail;
+    method = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_hasInstance);
+    if (JS_IsException(method))
+        return -1;
+    if (!JS_IsNull(method) && !JS_IsUndefined(method)) {
+        JSValue ret;
+        ret = JS_CallFree(ctx, method, obj, 1, &val);
+        return JS_ToBoolFree(ctx, ret);
+    }
+
+    /* legacy case */
+    if (!JS_IsFunction(ctx, obj)) {
+    fail:
+        JS_ThrowTypeError(ctx, "invalid 'instanceof' right operand");
+        return -1;
+    }
+    return JS_OrdinaryIsInstanceOf(ctx, val, obj);
+}
+
+/* return the value associated to the autoinit property or an exception */
+typedef JSValue JSAutoInitFunc(JSContext *ctx, JSObject *p, JSAtom atom, void *opaque);
+
+static JSAutoInitFunc *js_autoinit_func_table[] = {
+    js_instantiate_prototype, /* JS_AUTOINIT_ID_PROTOTYPE */
+    js_module_ns_autoinit, /* JS_AUTOINIT_ID_MODULE_NS */
+    JS_InstantiateFunctionListItem2, /* JS_AUTOINIT_ID_PROP */
+};
+
+/* warning: 'prs' is reallocated after it */
+static int JS_AutoInitProperty(JSContext *ctx, JSObject *p, JSAtom prop,
+                               JSProperty *pr, JSShapeProperty *prs)
+{
+    JSValue val;
+    JSContext *realm;
+    JSAutoInitFunc *func;
+
+    if (js_shape_prepare_update(ctx, p, &prs))
+        return -1;
+
+    realm = js_autoinit_get_realm(pr);
+    func = js_autoinit_func_table[js_autoinit_get_id(pr)];
+    /* 'func' shall not modify the object properties 'pr' */
+    val = func(realm, p, prop, pr->u.init.opaque);
+    js_autoinit_free(ctx->rt, pr);
+    prs->flags &= ~JS_PROP_TMASK;
+    pr->u.value = JS_UNDEFINED;
+    if (JS_IsException(val))
+        return -1;
+    pr->u.value = val;
+    return 0;
+}
+
+JSValue JS_GetPropertyInternal(JSContext *ctx, JSValueConst obj,
+                               JSAtom prop, JSValueConst this_obj,
+                               BOOL throw_ref_error)
+{
+    JSObject *p;
+    JSProperty *pr;
+    JSShapeProperty *prs;
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_TAG(obj);
+    if (unlikely(tag != JS_TAG_OBJECT)) {
+        switch(tag) {
+        case JS_TAG_NULL:
+            return JS_ThrowTypeErrorAtom(ctx, "cannot read property '%s' of null", prop);
+        case JS_TAG_UNDEFINED:
+            return JS_ThrowTypeErrorAtom(ctx, "cannot read property '%s' of undefined", prop);
+        case JS_TAG_EXCEPTION:
+            return JS_EXCEPTION;
+        case JS_TAG_STRING:
+            {
+                JSString *p1 = JS_VALUE_GET_STRING(obj);
+                if (__JS_AtomIsTaggedInt(prop)) {
+                    uint32_t idx, ch;
+                    idx = __JS_AtomToUInt32(prop);
+                    if (idx < p1->len) {
+                        if (p1->is_wide_char)
+                            ch = p1->u.str16[idx];
+                        else
+                            ch = p1->u.str8[idx];
+                        return js_new_string_char(ctx, ch);
+                    }
+                } else if (prop == JS_ATOM_length) {
+                    return JS_NewInt32(ctx, p1->len);
+                }
+            }
+            break;
+        default:
+            break;
+        }
+        /* cannot raise an exception */
+        p = JS_VALUE_GET_OBJ(JS_GetPrototypePrimitive(ctx, obj));
+        if (!p)
+            return JS_UNDEFINED;
+    } else {
+        p = JS_VALUE_GET_OBJ(obj);
+    }
+
+    for(;;) {
+        prs = find_own_property(&pr, p, prop);
+        if (prs) {
+            /* found */
+            if (unlikely(prs->flags & JS_PROP_TMASK)) {
+                if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                    if (unlikely(!pr->u.getset.getter)) {
+                        return JS_UNDEFINED;
+                    } else {
+                        JSValue func = JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter);
+                        /* Note: the field could be removed in the getter */
+                        func = JS_DupValue(ctx, func);
+                        return JS_CallFree(ctx, func, this_obj, 0, NULL);
+                    }
+                } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                    JSValue val = *pr->u.var_ref->pvalue;
+                    if (unlikely(JS_IsUninitialized(val)))
+                        return JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                    return JS_DupValue(ctx, val);
+                } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+                    /* Instantiate property and retry */
+                    if (JS_AutoInitProperty(ctx, p, prop, pr, prs))
+                        return JS_EXCEPTION;
+                    continue;
+                }
+            } else {
+                if (JS_IsUndefined(pr->u.value) && ctx->handleUndefined)
+                    ctx->handleUndefined(ctx);
+                return JS_DupValue(ctx, pr->u.value);
+            }
+        }
+        if (unlikely(p->is_exotic)) {
+            /* exotic behaviors */
+            if (p->fast_array) {
+                if (__JS_AtomIsTaggedInt(prop)) {
+                    uint32_t idx = __JS_AtomToUInt32(prop);
+                    if (idx < p->u.array.count) {
+                        /* we avoid duplicating the code */
+                        return JS_GetPropertyUint32(ctx, JS_MKPTR(JS_TAG_OBJECT, p), idx);
+                    } else if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                               p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+                        return JS_UNDEFINED;
+                    }
+                } else if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                           p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+                    int ret;
+                    ret = JS_AtomIsNumericIndex(ctx, prop);
+                    if (ret != 0) {
+                        if (ret < 0)
+                            return JS_EXCEPTION;
+                        return JS_UNDEFINED;
+                    }
+                }
+            } else {
+                const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+                if (em) {
+                    if (em->get_property) {
+                        JSValue obj1, retval;
+                        /* XXX: should pass throw_ref_error */
+                        /* Note: if 'p' is a prototype, it can be
+                           freed in the called function */
+                        obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+                        retval = em->get_property(ctx, obj1, prop, this_obj);
+                        JS_FreeValue(ctx, obj1);
+                        return retval;
+                    }
+                    if (em->get_own_property) {
+                        JSPropertyDescriptor desc;
+                        int ret;
+                        JSValue obj1;
+
+                        /* Note: if 'p' is a prototype, it can be
+                           freed in the called function */
+                        obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+                        ret = em->get_own_property(ctx, &desc, obj1, prop);
+                        JS_FreeValue(ctx, obj1);
+                        if (ret < 0)
+                            return JS_EXCEPTION;
+                        if (ret) {
+                            if (desc.flags & JS_PROP_GETSET) {
+                                JS_FreeValue(ctx, desc.setter);
+                                return JS_CallFree(ctx, desc.getter, this_obj, 0, NULL);
+                            } else {
+                                return desc.value;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        p = p->shape->proto;
+        if (!p)
+            break;
+    }
+    if (unlikely(throw_ref_error)) {
+        return JS_ThrowReferenceErrorNotDefined(ctx, prop);
+    } else {
+        return JS_UNDEFINED;
+    }
+}
+
+static JSValue JS_ThrowTypeErrorPrivateNotFound(JSContext *ctx, JSAtom atom)
+{
+    return JS_ThrowTypeErrorAtom(ctx, "private class field '%s' does not exist",
+                                 atom);
+}
+
+/* Private fields can be added even on non extensible objects or
+   Proxies */
+static int JS_DefinePrivateField(JSContext *ctx, JSValueConst obj,
+                                 JSValueConst name, JSValue val)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSAtom prop;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        goto fail;
+    }
+    /* safety check */
+    if (unlikely(JS_VALUE_GET_TAG(name) != JS_TAG_SYMBOL)) {
+        JS_ThrowTypeErrorNotASymbol(ctx);
+        goto fail;
+    }
+    prop = js_symbol_to_atom(ctx, name);
+    p = JS_VALUE_GET_OBJ(obj);
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        JS_ThrowTypeErrorAtom(ctx, "private class field '%s' already exists",
+                              prop);
+        goto fail;
+    }
+    pr = add_property(ctx, p, prop, JS_PROP_C_W_E);
+    if (unlikely(!pr)) {
+    fail:
+        JS_FreeValue(ctx, val);
+        return -1;
+    }
+    pr->u.value = val;
+    return 0;
+}
+
+static JSValue JS_GetPrivateField(JSContext *ctx, JSValueConst obj,
+                                  JSValueConst name)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSAtom prop;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    /* safety check */
+    if (unlikely(JS_VALUE_GET_TAG(name) != JS_TAG_SYMBOL))
+        return JS_ThrowTypeErrorNotASymbol(ctx);
+    prop = js_symbol_to_atom(ctx, name);
+    p = JS_VALUE_GET_OBJ(obj);
+    prs = find_own_property(&pr, p, prop);
+    if (!prs) {
+        JS_ThrowTypeErrorPrivateNotFound(ctx, prop);
+        return JS_EXCEPTION;
+    }
+    return JS_DupValue(ctx, pr->u.value);
+}
+
+static int JS_SetPrivateField(JSContext *ctx, JSValueConst obj,
+                              JSValueConst name, JSValue val)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSAtom prop;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        goto fail;
+    }
+    /* safety check */
+    if (unlikely(JS_VALUE_GET_TAG(name) != JS_TAG_SYMBOL)) {
+        JS_ThrowTypeErrorNotASymbol(ctx);
+        goto fail;
+    }
+    prop = js_symbol_to_atom(ctx, name);
+    p = JS_VALUE_GET_OBJ(obj);
+    prs = find_own_property(&pr, p, prop);
+    if (!prs) {
+        JS_ThrowTypeErrorPrivateNotFound(ctx, prop);
+    fail:
+        JS_FreeValue(ctx, val);
+        return -1;
+    }
+    set_value(ctx, &pr->u.value, val);
+    return 0;
+}
+
+/* add a private brand field to 'home_obj' if not already present and
+   if obj is != null add a private brand to it */
+static int JS_AddBrand(JSContext *ctx, JSValueConst obj, JSValueConst home_obj)
+{
+    JSObject *p, *p1;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSValue brand;
+    JSAtom brand_atom;
+
+    if (unlikely(JS_VALUE_GET_TAG(home_obj) != JS_TAG_OBJECT)) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    p = JS_VALUE_GET_OBJ(home_obj);
+    prs = find_own_property(&pr, p, JS_ATOM_Private_brand);
+    if (!prs) {
+        /* if the brand is not present, add it */
+        brand = JS_NewSymbolFromAtom(ctx, JS_ATOM_brand, JS_ATOM_TYPE_PRIVATE);
+        if (JS_IsException(brand))
+            return -1;
+        pr = add_property(ctx, p, JS_ATOM_Private_brand, JS_PROP_C_W_E);
+        if (!pr) {
+            JS_FreeValue(ctx, brand);
+            return -1;
+        }
+        pr->u.value = JS_DupValue(ctx, brand);
+    } else {
+        brand = JS_DupValue(ctx, pr->u.value);
+    }
+    brand_atom = js_symbol_to_atom(ctx, brand);
+
+    if (JS_IsObject(obj)) {
+        p1 = JS_VALUE_GET_OBJ(obj);
+        prs = find_own_property(&pr, p1, brand_atom);
+        if (unlikely(prs)) {
+            JS_FreeAtom(ctx, brand_atom);
+            JS_ThrowTypeError(ctx, "private method is already present");
+            return -1;
+        }
+        pr = add_property(ctx, p1, brand_atom, JS_PROP_C_W_E);
+        JS_FreeAtom(ctx, brand_atom);
+        if (!pr)
+            return -1;
+        pr->u.value = JS_UNDEFINED;
+    } else {
+        JS_FreeAtom(ctx, brand_atom);
+    }
+    return 0;
+}
+
+/* return a boolean telling if the brand of the home object of 'func'
+   is present on 'obj' or -1 in case of exception */
+static int JS_CheckBrand(JSContext *ctx, JSValueConst obj, JSValueConst func)
+{
+    JSObject *p, *p1, *home_obj;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSValueConst brand;
+
+    /* get the home object of 'func' */
+    if (unlikely(JS_VALUE_GET_TAG(func) != JS_TAG_OBJECT))
+        goto not_obj;
+    p1 = JS_VALUE_GET_OBJ(func);
+    if (!js_class_has_bytecode(p1->class_id))
+        goto not_obj;
+    home_obj = p1->u.func.home_object;
+    if (!home_obj)
+        goto not_obj;
+    prs = find_own_property(&pr, home_obj, JS_ATOM_Private_brand);
+    if (!prs) {
+        JS_ThrowTypeError(ctx, "expecting <brand> private field");
+        return -1;
+    }
+    brand = pr->u.value;
+    /* safety check */
+    if (unlikely(JS_VALUE_GET_TAG(brand) != JS_TAG_SYMBOL))
+        goto not_obj;
+
+    /* get the brand array of 'obj' */
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)) {
+    not_obj:
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    p = JS_VALUE_GET_OBJ(obj);
+    prs = find_own_property(&pr, p, js_symbol_to_atom(ctx, brand));
+    return (prs != NULL);
+}
+
+static uint32_t js_string_obj_get_length(JSContext *ctx,
+                                         JSValueConst obj)
+{
+    JSObject *p;
+    JSString *p1;
+    uint32_t len = 0;
+
+    /* This is a class exotic method: obj class_id is JS_CLASS_STRING */
+    p = JS_VALUE_GET_OBJ(obj);
+    if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_STRING) {
+        p1 = JS_VALUE_GET_STRING(p->u.object_data);
+        len = p1->len;
+    }
+    return len;
+}
+
+static int num_keys_cmp(const void *p1, const void *p2, void *opaque)
+{
+    JSContext *ctx = opaque;
+    JSAtom atom1 = ((const JSPropertyEnum *)p1)->atom;
+    JSAtom atom2 = ((const JSPropertyEnum *)p2)->atom;
+    uint32_t v1, v2;
+    BOOL atom1_is_integer, atom2_is_integer;
+
+    atom1_is_integer = JS_AtomIsArrayIndex(ctx, &v1, atom1);
+    atom2_is_integer = JS_AtomIsArrayIndex(ctx, &v2, atom2);
+    assert(atom1_is_integer && atom2_is_integer);
+    if (v1 < v2)
+        return -1;
+    else if (v1 == v2)
+        return 0;
+    else
+        return 1;
+}
+
+static void js_free_prop_enum(JSContext *ctx, JSPropertyEnum *tab, uint32_t len)
+{
+    uint32_t i;
+    if (tab) {
+        for(i = 0; i < len; i++)
+            JS_FreeAtom(ctx, tab[i].atom);
+        js_free(ctx, tab);
+    }
+}
+
+/* return < 0 in case if exception, 0 if OK. ptab and its atoms must
+   be freed by the user. */
+static int __exception JS_GetOwnPropertyNamesInternal(JSContext *ctx,
+                                                      JSPropertyEnum **ptab,
+                                                      uint32_t *plen,
+                                                      JSObject *p, int flags)
+{
+    int i, j;
+    JSShape *sh;
+    JSShapeProperty *prs;
+    JSPropertyEnum *tab_atom, *tab_exotic;
+    JSAtom atom;
+    uint32_t num_keys_count, str_keys_count, sym_keys_count, atom_count;
+    uint32_t num_index, str_index, sym_index, exotic_count, exotic_keys_count;
+    BOOL is_enumerable, num_sorted;
+    uint32_t num_key;
+    JSAtomKindEnum kind;
+
+    /* clear pointer for consistency in case of failure */
+    *ptab = NULL;
+    *plen = 0;
+
+    /* compute the number of returned properties */
+    num_keys_count = 0;
+    str_keys_count = 0;
+    sym_keys_count = 0;
+    exotic_keys_count = 0;
+    exotic_count = 0;
+    tab_exotic = NULL;
+    sh = p->shape;
+    for(i = 0, prs = get_shape_prop(sh); i < sh->prop_count; i++, prs++) {
+        atom = prs->atom;
+        if (atom != JS_ATOM_NULL) {
+            is_enumerable = ((prs->flags & JS_PROP_ENUMERABLE) != 0);
+            kind = JS_AtomGetKind(ctx, atom);
+            if ((!(flags & JS_GPN_ENUM_ONLY) || is_enumerable) &&
+                ((flags >> kind) & 1) != 0) {
+                /* need to raise an exception in case of the module
+                   name space (implicit GetOwnProperty) */
+                if (unlikely((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) &&
+                    (flags & (JS_GPN_SET_ENUM | JS_GPN_ENUM_ONLY))) {
+                    JSVarRef *var_ref = p->prop[i].u.var_ref;
+                    if (unlikely(JS_IsUninitialized(*var_ref->pvalue))) {
+                        JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                        return -1;
+                    }
+                }
+                if (JS_AtomIsArrayIndex(ctx, &num_key, atom)) {
+                    num_keys_count++;
+                } else if (kind == JS_ATOM_KIND_STRING) {
+                    str_keys_count++;
+                } else {
+                    sym_keys_count++;
+                }
+            }
+        }
+    }
+
+    if (p->is_exotic) {
+        if (p->fast_array) {
+            if (flags & JS_GPN_STRING_MASK) {
+                num_keys_count += p->u.array.count;
+            }
+        } else if (p->class_id == JS_CLASS_STRING) {
+            if (flags & JS_GPN_STRING_MASK) {
+                num_keys_count += js_string_obj_get_length(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+            }
+        } else {
+            const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+            if (em && em->get_own_property_names) {
+                if (em->get_own_property_names(ctx, &tab_exotic, &exotic_count,
+                                               JS_MKPTR(JS_TAG_OBJECT, p)))
+                    return -1;
+                for(i = 0; i < exotic_count; i++) {
+                    atom = tab_exotic[i].atom;
+                    kind = JS_AtomGetKind(ctx, atom);
+                    if (((flags >> kind) & 1) != 0) {
+                        is_enumerable = FALSE;
+                        if (flags & (JS_GPN_SET_ENUM | JS_GPN_ENUM_ONLY)) {
+                            JSPropertyDescriptor desc;
+                            int res;
+                            /* set the "is_enumerable" field if necessary */
+                            res = JS_GetOwnPropertyInternal(ctx, &desc, p, atom);
+                            if (res < 0) {
+                                js_free_prop_enum(ctx, tab_exotic, exotic_count);
+                                return -1;
+                            }
+                            if (res) {
+                                is_enumerable =
+                                    ((desc.flags & JS_PROP_ENUMERABLE) != 0);
+                                js_free_desc(ctx, &desc);
+                            }
+                            tab_exotic[i].is_enumerable = is_enumerable;
+                        }
+                        if (!(flags & JS_GPN_ENUM_ONLY) || is_enumerable) {
+                            exotic_keys_count++;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /* fill them */
+
+    atom_count = num_keys_count + str_keys_count + sym_keys_count + exotic_keys_count;
+    /* avoid allocating 0 bytes */
+    tab_atom = js_malloc(ctx, sizeof(tab_atom[0]) * max_int(atom_count, 1));
+    if (!tab_atom) {
+        js_free_prop_enum(ctx, tab_exotic, exotic_count);
+        return -1;
+    }
+
+    num_index = 0;
+    str_index = num_keys_count;
+    sym_index = str_index + str_keys_count;
+
+    num_sorted = TRUE;
+    sh = p->shape;
+    for(i = 0, prs = get_shape_prop(sh); i < sh->prop_count; i++, prs++) {
+        atom = prs->atom;
+        if (atom != JS_ATOM_NULL) {
+            is_enumerable = ((prs->flags & JS_PROP_ENUMERABLE) != 0);
+            kind = JS_AtomGetKind(ctx, atom);
+            if ((!(flags & JS_GPN_ENUM_ONLY) || is_enumerable) &&
+                ((flags >> kind) & 1) != 0) {
+                if (JS_AtomIsArrayIndex(ctx, &num_key, atom)) {
+                    j = num_index++;
+                    num_sorted = FALSE;
+                } else if (kind == JS_ATOM_KIND_STRING) {
+                    j = str_index++;
+                } else {
+                    j = sym_index++;
+                }
+                tab_atom[j].atom = JS_DupAtom(ctx, atom);
+                tab_atom[j].is_enumerable = is_enumerable;
+            }
+        }
+    }
+
+    if (p->is_exotic) {
+        int len;
+        if (p->fast_array) {
+            if (flags & JS_GPN_STRING_MASK) {
+                len = p->u.array.count;
+                goto add_array_keys;
+            }
+        } else if (p->class_id == JS_CLASS_STRING) {
+            if (flags & JS_GPN_STRING_MASK) {
+                len = js_string_obj_get_length(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+            add_array_keys:
+                for(i = 0; i < len; i++) {
+                    tab_atom[num_index].atom = __JS_AtomFromUInt32(i);
+                    if (tab_atom[num_index].atom == JS_ATOM_NULL) {
+                        js_free_prop_enum(ctx, tab_atom, num_index);
+                        return -1;
+                    }
+                    tab_atom[num_index].is_enumerable = TRUE;
+                    num_index++;
+                }
+            }
+        } else {
+            /* Note: exotic keys are not reordered and comes after the object own properties. */
+            for(i = 0; i < exotic_count; i++) {
+                atom = tab_exotic[i].atom;
+                is_enumerable = tab_exotic[i].is_enumerable;
+                kind = JS_AtomGetKind(ctx, atom);
+                if ((!(flags & JS_GPN_ENUM_ONLY) || is_enumerable) &&
+                    ((flags >> kind) & 1) != 0) {
+                    tab_atom[sym_index].atom = atom;
+                    tab_atom[sym_index].is_enumerable = is_enumerable;
+                    sym_index++;
+                } else {
+                    JS_FreeAtom(ctx, atom);
+                }
+            }
+            js_free(ctx, tab_exotic);
+        }
+    }
+
+    assert(num_index == num_keys_count);
+    assert(str_index == num_keys_count + str_keys_count);
+    assert(sym_index == atom_count);
+
+    if (num_keys_count != 0 && !num_sorted) {
+        rqsort(tab_atom, num_keys_count, sizeof(tab_atom[0]), num_keys_cmp,
+               ctx);
+    }
+    *ptab = tab_atom;
+    *plen = atom_count;
+    return 0;
+}
+
+int JS_GetOwnPropertyNames(JSContext *ctx, JSPropertyEnum **ptab,
+                           uint32_t *plen, JSValueConst obj, int flags)
+{
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    return JS_GetOwnPropertyNamesInternal(ctx, ptab, plen,
+                                          JS_VALUE_GET_OBJ(obj), flags);
+}
+
+/* Return -1 if exception,
+   FALSE if the property does not exist, TRUE if it exists. If TRUE is
+   returned, the property descriptor 'desc' is filled present. */
+static int JS_GetOwnPropertyInternal(JSContext *ctx, JSPropertyDescriptor *desc,
+                                     JSObject *p, JSAtom prop)
+{
+    JSShapeProperty *prs;
+    JSProperty *pr;
+
+retry:
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        if (desc) {
+            desc->flags = prs->flags & JS_PROP_C_W_E;
+            desc->getter = JS_UNDEFINED;
+            desc->setter = JS_UNDEFINED;
+            desc->value = JS_UNDEFINED;
+            if (unlikely(prs->flags & JS_PROP_TMASK)) {
+                if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                    desc->flags |= JS_PROP_GETSET;
+                    if (pr->u.getset.getter)
+                        desc->getter = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter));
+                    if (pr->u.getset.setter)
+                        desc->setter = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.setter));
+                } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                    JSValue val = *pr->u.var_ref->pvalue;
+                    if (unlikely(JS_IsUninitialized(val))) {
+                        JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                        return -1;
+                    }
+                    desc->value = JS_DupValue(ctx, val);
+                } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+                    /* Instantiate property and retry */
+                    if (JS_AutoInitProperty(ctx, p, prop, pr, prs))
+                        return -1;
+                    goto retry;
+                }
+            } else {
+                desc->value = JS_DupValue(ctx, pr->u.value);
+            }
+        } else {
+            /* for consistency, send the exception even if desc is NULL */
+            if (unlikely((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF)) {
+                if (unlikely(JS_IsUninitialized(*pr->u.var_ref->pvalue))) {
+                    JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                    return -1;
+                }
+            } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+                /* nothing to do: delay instantiation until actual value and/or attributes are read */
+            }
+        }
+        return TRUE;
+    }
+    if (p->is_exotic) {
+        if (p->fast_array) {
+            /* specific case for fast arrays */
+            if (__JS_AtomIsTaggedInt(prop)) {
+                uint32_t idx;
+                idx = __JS_AtomToUInt32(prop);
+                if (idx < p->u.array.count) {
+                    if (desc) {
+                        desc->flags = JS_PROP_WRITABLE | JS_PROP_ENUMERABLE |
+                            JS_PROP_CONFIGURABLE;
+                        desc->getter = JS_UNDEFINED;
+                        desc->setter = JS_UNDEFINED;
+                        desc->value = JS_GetPropertyUint32(ctx, JS_MKPTR(JS_TAG_OBJECT, p), idx);
+                    }
+                    return TRUE;
+                }
+            }
+        } else {
+            const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+            if (em && em->get_own_property) {
+                return em->get_own_property(ctx, desc,
+                                            JS_MKPTR(JS_TAG_OBJECT, p), prop);
+            }
+        }
+    }
+    return FALSE;
+}
+
+int JS_GetOwnProperty(JSContext *ctx, JSPropertyDescriptor *desc,
+                      JSValueConst obj, JSAtom prop)
+{
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    return JS_GetOwnPropertyInternal(ctx, desc, JS_VALUE_GET_OBJ(obj), prop);
+}
+
+/* return -1 if exception (Proxy object only) or TRUE/FALSE */
+int JS_IsExtensible(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (unlikely(p->class_id == JS_CLASS_PROXY))
+        return js_proxy_isExtensible(ctx, obj);
+    else
+        return p->extensible;
+}
+
+/* return -1 if exception (Proxy object only) or TRUE/FALSE */
+int JS_PreventExtensions(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (unlikely(p->class_id == JS_CLASS_PROXY))
+        return js_proxy_preventExtensions(ctx, obj);
+    p->extensible = FALSE;
+    return TRUE;
+}
+
+/* return -1 if exception otherwise TRUE or FALSE */
+int JS_HasProperty(JSContext *ctx, JSValueConst obj, JSAtom prop)
+{
+    JSObject *p;
+    int ret;
+    JSValue obj1;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    for(;;) {
+        if (p->is_exotic) {
+            const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+            if (em && em->has_property) {
+                /* has_property can free the prototype */
+                obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+                ret = em->has_property(ctx, obj1, prop);
+                JS_FreeValue(ctx, obj1);
+                return ret;
+            }
+        }
+        /* JS_GetOwnPropertyInternal can free the prototype */
+        JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+        ret = JS_GetOwnPropertyInternal(ctx, NULL, p, prop);
+        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+        if (ret != 0)
+            return ret;
+        if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+            p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+            ret = JS_AtomIsNumericIndex(ctx, prop);
+            if (ret != 0) {
+                if (ret < 0)
+                    return -1;
+                return FALSE;
+            }
+        }
+        p = p->shape->proto;
+        if (!p)
+            break;
+    }
+    return FALSE;
+}
+
+/* val must be a symbol */
+static JSAtom js_symbol_to_atom(JSContext *ctx, JSValue val)
+{
+    JSAtomStruct *p = JS_VALUE_GET_PTR(val);
+    return js_get_atom_index(ctx->rt, p);
+}
+
+/* return JS_ATOM_NULL in case of exception */
+JSAtom JS_ValueToAtom(JSContext *ctx, JSValueConst val)
+{
+    JSAtom atom;
+    uint32_t tag;
+    tag = JS_VALUE_GET_TAG(val);
+    if (tag == JS_TAG_INT &&
+        (uint32_t)JS_VALUE_GET_INT(val) <= JS_ATOM_MAX_INT) {
+        /* fast path for integer values */
+        atom = __JS_AtomFromUInt32(JS_VALUE_GET_INT(val));
+    } else if (tag == JS_TAG_SYMBOL) {
+        JSAtomStruct *p = JS_VALUE_GET_PTR(val);
+        atom = JS_DupAtom(ctx, js_get_atom_index(ctx->rt, p));
+    } else {
+        JSValue str;
+        str = JS_ToPropertyKey(ctx, val);
+        if (JS_IsException(str))
+            return JS_ATOM_NULL;
+        if (JS_VALUE_GET_TAG(str) == JS_TAG_SYMBOL) {
+            atom = js_symbol_to_atom(ctx, str);
+        } else {
+            atom = JS_NewAtomStr(ctx, JS_VALUE_GET_STRING(str));
+        }
+    }
+    return atom;
+}
+
+static JSValue JS_GetPropertyValue(JSContext *ctx, JSValueConst this_obj,
+                                   JSValue prop)
+{
+    JSAtom atom;
+    JSValue ret;
+
+    if (likely(JS_VALUE_GET_TAG(this_obj) == JS_TAG_OBJECT &&
+               JS_VALUE_GET_TAG(prop) == JS_TAG_INT)) {
+        JSObject *p;
+        uint32_t idx;
+        /* fast path for array access */
+        p = JS_VALUE_GET_OBJ(this_obj);
+        idx = JS_VALUE_GET_INT(prop);
+        switch(p->class_id) {
+        case JS_CLASS_ARRAY:
+        case JS_CLASS_ARGUMENTS:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return JS_DupValue(ctx, p->u.array.u.values[idx]);
+        case JS_CLASS_INT8_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return JS_NewInt32(ctx, p->u.array.u.int8_ptr[idx]);
+        case JS_CLASS_UINT8C_ARRAY:
+        case JS_CLASS_UINT8_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return JS_NewInt32(ctx, p->u.array.u.uint8_ptr[idx]);
+        case JS_CLASS_INT16_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return JS_NewInt32(ctx, p->u.array.u.int16_ptr[idx]);
+        case JS_CLASS_UINT16_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return JS_NewInt32(ctx, p->u.array.u.uint16_ptr[idx]);
+        case JS_CLASS_INT32_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return JS_NewInt32(ctx, p->u.array.u.int32_ptr[idx]);
+        case JS_CLASS_UINT32_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return JS_NewUint32(ctx, p->u.array.u.uint32_ptr[idx]);
+        case JS_CLASS_BIG_INT64_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return JS_NewBigInt64(ctx, p->u.array.u.int64_ptr[idx]);
+        case JS_CLASS_BIG_UINT64_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return JS_NewBigUint64(ctx, p->u.array.u.uint64_ptr[idx]);
+        case JS_CLASS_FLOAT32_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return __JS_NewFloat64(ctx, p->u.array.u.float_ptr[idx]);
+        case JS_CLASS_FLOAT64_ARRAY:
+            if (unlikely(idx >= p->u.array.count)) goto slow_path;
+            return __JS_NewFloat64(ctx, p->u.array.u.double_ptr[idx]);
+        default:
+            goto slow_path;
+        }
+    } else {
+    slow_path:
+        atom = JS_ValueToAtom(ctx, prop);
+        JS_FreeValue(ctx, prop);
+        if (unlikely(atom == JS_ATOM_NULL))
+            return JS_EXCEPTION;
+        ret = JS_GetProperty(ctx, this_obj, atom);
+        JS_FreeAtom(ctx, atom);
+        return ret;
+    }
+}
+
+JSValue JS_GetPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                             uint32_t idx)
+{
+    return JS_GetPropertyValue(ctx, this_obj, JS_NewUint32(ctx, idx));
+}
+
+/* Check if an object has a generalized numeric property. Return value:
+   -1 for exception,
+   TRUE if property exists, stored into *pval,
+   FALSE if proprty does not exist.
+ */
+static int JS_TryGetPropertyInt64(JSContext *ctx, JSValueConst obj, int64_t idx, JSValue *pval)
+{
+    JSValue val = JS_UNDEFINED;
+    JSAtom prop;
+    int present;
+
+    if (likely((uint64_t)idx <= JS_ATOM_MAX_INT)) {
+        /* fast path */
+        present = JS_HasProperty(ctx, obj, __JS_AtomFromUInt32(idx));
+        if (present > 0) {
+            val = JS_GetPropertyValue(ctx, obj, JS_NewInt32(ctx, idx));
+            if (unlikely(JS_IsException(val)))
+                present = -1;
+        }
+    } else {
+        prop = JS_NewAtomInt64(ctx, idx);
+        present = -1;
+        if (likely(prop != JS_ATOM_NULL)) {
+            present = JS_HasProperty(ctx, obj, prop);
+            if (present > 0) {
+                val = JS_GetProperty(ctx, obj, prop);
+                if (unlikely(JS_IsException(val)))
+                    present = -1;
+            }
+            JS_FreeAtom(ctx, prop);
+        }
+    }
+    *pval = val;
+    return present;
+}
+
+static JSValue JS_GetPropertyInt64(JSContext *ctx, JSValueConst obj, int64_t idx)
+{
+    JSAtom prop;
+    JSValue val;
+
+    if ((uint64_t)idx <= INT32_MAX) {
+        /* fast path for fast arrays */
+        return JS_GetPropertyValue(ctx, obj, JS_NewInt32(ctx, idx));
+    }
+    prop = JS_NewAtomInt64(ctx, idx);
+    if (prop == JS_ATOM_NULL)
+        return JS_EXCEPTION;
+
+    val = JS_GetProperty(ctx, obj, prop);
+    JS_FreeAtom(ctx, prop);
+    return val;
+}
+
+JSValue JS_GetPropertyStr(JSContext *ctx, JSValueConst this_obj,
+                          const char *prop)
+{
+    JSAtom atom;
+    JSValue ret;
+    atom = JS_NewAtom(ctx, prop);
+    ret = JS_GetProperty(ctx, this_obj, atom);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+/* Note: the property value is not initialized. Return NULL if memory
+   error. */
+static JSProperty *add_property(JSContext *ctx,
+                                JSObject *p, JSAtom prop, int prop_flags)
+{
+    JSShape *sh, *new_sh;
+
+    sh = p->shape;
+    if (sh->is_hashed) {
+        /* try to find an existing shape */
+        new_sh = find_hashed_shape_prop(ctx->rt, sh, prop, prop_flags);
+        if (new_sh) {
+            /* matching shape found: use it */
+            /*  the property array may need to be resized */
+            if (new_sh->prop_size != sh->prop_size) {
+                JSProperty *new_prop;
+                new_prop = js_realloc(ctx, p->prop, sizeof(p->prop[0]) *
+                                      new_sh->prop_size);
+                if (!new_prop)
+                    return NULL;
+                p->prop = new_prop;
+            }
+            p->shape = js_dup_shape(new_sh);
+            js_free_shape(ctx->rt, sh);
+            return &p->prop[new_sh->prop_count - 1];
+        } else if (sh->header.ref_count != 1) {
+            /* if the shape is shared, clone it */
+            new_sh = js_clone_shape(ctx, sh);
+            if (!new_sh)
+                return NULL;
+            /* hash the cloned shape */
+            new_sh->is_hashed = TRUE;
+            js_shape_hash_link(ctx->rt, new_sh);
+            js_free_shape(ctx->rt, p->shape);
+            p->shape = new_sh;
+        }
+    }
+    assert(p->shape->header.ref_count == 1);
+    if (add_shape_property(ctx, &p->shape, p, prop, prop_flags))
+        return NULL;
+    return &p->prop[p->shape->prop_count - 1];
+}
+
+/* can be called on Array or Arguments objects. return < 0 if
+   memory alloc error. */
+static no_inline __exception int convert_fast_array_to_array(JSContext *ctx,
+                                                             JSObject *p)
+{
+    JSProperty *pr;
+    JSShape *sh;
+    JSValue *tab;
+    uint32_t i, len, new_count;
+
+    if (js_shape_prepare_update(ctx, p, NULL))
+        return -1;
+    len = p->u.array.count;
+    /* resize the properties once to simplify the error handling */
+    sh = p->shape;
+    new_count = sh->prop_count + len;
+    if (new_count > sh->prop_size) {
+        if (resize_properties(ctx, &p->shape, p, new_count))
+            return -1;
+    }
+
+    tab = p->u.array.u.values;
+    for(i = 0; i < len; i++) {
+        /* add_property cannot fail here but
+           __JS_AtomFromUInt32(i) fails for i > INT32_MAX */
+        pr = add_property(ctx, p, __JS_AtomFromUInt32(i), JS_PROP_C_W_E);
+        pr->u.value = *tab++;
+    }
+    js_free(ctx, p->u.array.u.values);
+    p->u.array.count = 0;
+    p->u.array.u.values = NULL; /* fail safe */
+    p->u.array.u1.size = 0;
+    p->fast_array = 0;
+    return 0;
+}
+
+static int delete_property(JSContext *ctx, JSObject *p, JSAtom atom)
+{
+    JSShape *sh;
+    JSShapeProperty *pr, *lpr, *prop;
+    JSProperty *pr1;
+    uint32_t lpr_idx;
+    intptr_t h, h1;
+
+ redo:
+    sh = p->shape;
+    h1 = atom & sh->prop_hash_mask;
+    h = prop_hash_end(sh)[-h1 - 1];
+    prop = get_shape_prop(sh);
+    lpr = NULL;
+    lpr_idx = 0;   /* prevent warning */
+    while (h != 0) {
+        pr = &prop[h - 1];
+        if (likely(pr->atom == atom)) {
+            /* found ! */
+            if (!(pr->flags & JS_PROP_CONFIGURABLE))
+                return FALSE;
+            /* realloc the shape if needed */
+            if (lpr)
+                lpr_idx = lpr - get_shape_prop(sh);
+            if (js_shape_prepare_update(ctx, p, &pr))
+                return -1;
+            sh = p->shape;
+            /* remove property */
+            if (lpr) {
+                lpr = get_shape_prop(sh) + lpr_idx;
+                lpr->hash_next = pr->hash_next;
+            } else {
+                prop_hash_end(sh)[-h1 - 1] = pr->hash_next;
+            }
+            sh->deleted_prop_count++;
+            /* free the entry */
+            pr1 = &p->prop[h - 1];
+            free_property(ctx->rt, pr1, pr->flags);
+            JS_FreeAtom(ctx, pr->atom);
+            /* put default values */
+            pr->flags = 0;
+            pr->atom = JS_ATOM_NULL;
+            pr1->u.value = JS_UNDEFINED;
+
+            /* compact the properties if too many deleted properties */
+            if (sh->deleted_prop_count >= 8 &&
+                sh->deleted_prop_count >= ((unsigned)sh->prop_count / 2)) {
+                compact_properties(ctx, p);
+            }
+            return TRUE;
+        }
+        lpr = pr;
+        h = pr->hash_next;
+    }
+
+    if (p->is_exotic) {
+        if (p->fast_array) {
+            uint32_t idx;
+            if (JS_AtomIsArrayIndex(ctx, &idx, atom) &&
+                idx < p->u.array.count) {
+                if (p->class_id == JS_CLASS_ARRAY ||
+                    p->class_id == JS_CLASS_ARGUMENTS) {
+                    /* Special case deleting the last element of a fast Array */
+                    if (idx == p->u.array.count - 1) {
+                        JS_FreeValue(ctx, p->u.array.u.values[idx]);
+                        p->u.array.count = idx;
+                        return TRUE;
+                    }
+                    if (convert_fast_array_to_array(ctx, p))
+                        return -1;
+                    goto redo;
+                } else {
+                    return FALSE;
+                }
+            }
+        } else {
+            const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+            if (em && em->delete_property) {
+                return em->delete_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p), atom);
+            }
+        }
+    }
+    /* not found */
+    return TRUE;
+}
+
+static int call_setter(JSContext *ctx, JSObject *setter,
+                       JSValueConst this_obj, JSValue val, int flags)
+{
+    JSValue ret, func;
+    if (likely(setter)) {
+        func = JS_MKPTR(JS_TAG_OBJECT, setter);
+        /* Note: the field could be removed in the setter */
+        func = JS_DupValue(ctx, func);
+        ret = JS_CallFree(ctx, func, this_obj, 1, (JSValueConst *)&val);
+        JS_FreeValue(ctx, val);
+        if (JS_IsException(ret))
+            return -1;
+        JS_FreeValue(ctx, ret);
+        return TRUE;
+    } else {
+        JS_FreeValue(ctx, val);
+        if ((flags & JS_PROP_THROW) ||
+            ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
+            JS_ThrowTypeError(ctx, "no setter for property");
+            return -1;
+        }
+        return FALSE;
+    }
+}
+
+/* set the array length and remove the array elements if necessary. */
+static int set_array_length(JSContext *ctx, JSObject *p, JSValue val,
+                            int flags)
+{
+    uint32_t len, idx, cur_len;
+    int i, ret;
+
+    /* Note: this call can reallocate the properties of 'p' */
+    ret = JS_ToArrayLengthFree(ctx, &len, val, FALSE);
+    if (ret)
+        return -1;
+    /* JS_ToArrayLengthFree() must be done before the read-only test */
+    if (unlikely(!(p->shape->prop[0].flags & JS_PROP_WRITABLE)))
+        return JS_ThrowTypeErrorReadOnly(ctx, flags, JS_ATOM_length);
+
+    if (likely(p->fast_array)) {
+        uint32_t old_len = p->u.array.count;
+        if (len < old_len) {
+            for(i = len; i < old_len; i++) {
+                JS_FreeValue(ctx, p->u.array.u.values[i]);
+            }
+            p->u.array.count = len;
+        }
+        p->prop[0].u.value = JS_NewUint32(ctx, len);
+    } else {
+        /* Note: length is always a uint32 because the object is an
+           array */
+        JS_ToUint32(ctx, &cur_len, p->prop[0].u.value);
+        if (len < cur_len) {
+            uint32_t d;
+            JSShape *sh;
+            JSShapeProperty *pr;
+
+            d = cur_len - len;
+            sh = p->shape;
+            if (d <= sh->prop_count) {
+                JSAtom atom;
+
+                /* faster to iterate */
+                while (cur_len > len) {
+                    atom = JS_NewAtomUInt32(ctx, cur_len - 1);
+                    ret = delete_property(ctx, p, atom);
+                    JS_FreeAtom(ctx, atom);
+                    if (unlikely(!ret)) {
+                        /* unlikely case: property is not
+                           configurable */
+                        break;
+                    }
+                    cur_len--;
+                }
+            } else {
+                /* faster to iterate thru all the properties. Need two
+                   passes in case one of the property is not
+                   configurable */
+                cur_len = len;
+                for(i = 0, pr = get_shape_prop(sh); i < sh->prop_count;
+                    i++, pr++) {
+                    if (pr->atom != JS_ATOM_NULL &&
+                        JS_AtomIsArrayIndex(ctx, &idx, pr->atom)) {
+                        if (idx >= cur_len &&
+                            !(pr->flags & JS_PROP_CONFIGURABLE)) {
+                            cur_len = idx + 1;
+                        }
+                    }
+                }
+
+                for(i = 0, pr = get_shape_prop(sh); i < sh->prop_count;
+                    i++, pr++) {
+                    if (pr->atom != JS_ATOM_NULL &&
+                        JS_AtomIsArrayIndex(ctx, &idx, pr->atom)) {
+                        if (idx >= cur_len) {
+                            /* remove the property */
+                            delete_property(ctx, p, pr->atom);
+                            /* WARNING: the shape may have been modified */
+                            sh = p->shape;
+                            pr = get_shape_prop(sh) + i;
+                        }
+                    }
+                }
+            }
+        } else {
+            cur_len = len;
+        }
+        set_value(ctx, &p->prop[0].u.value, JS_NewUint32(ctx, cur_len));
+        if (unlikely(cur_len > len)) {
+            return JS_ThrowTypeErrorOrFalse(ctx, flags, "not configurable");
+        }
+    }
+    return TRUE;
+}
+
+/* return -1 if exception */
+static int expand_fast_array(JSContext *ctx, JSObject *p, uint32_t new_len)
+{
+    uint32_t new_size;
+    size_t slack;
+    JSValue *new_array_prop;
+    /* XXX: potential arithmetic overflow */
+    new_size = max_int(new_len, p->u.array.u1.size * 3 / 2);
+    new_array_prop = js_realloc2(ctx, p->u.array.u.values, sizeof(JSValue) * new_size, &slack);
+    if (!new_array_prop)
+        return -1;
+    new_size += slack / sizeof(*new_array_prop);
+    p->u.array.u.values = new_array_prop;
+    p->u.array.u1.size = new_size;
+    return 0;
+}
+
+/* Preconditions: 'p' must be of class JS_CLASS_ARRAY, p->fast_array =
+   TRUE and p->extensible = TRUE */
+static int add_fast_array_element(JSContext *ctx, JSObject *p,
+                                  JSValue val, int flags)
+{
+    uint32_t new_len, array_len;
+    /* extend the array by one */
+    /* XXX: convert to slow array if new_len > 2^31-1 elements */
+    new_len = p->u.array.count + 1;
+    /* update the length if necessary. We assume that if the length is
+       not an integer, then if it >= 2^31.  */
+    if (likely(JS_VALUE_GET_TAG(p->prop[0].u.value) == JS_TAG_INT)) {
+        array_len = JS_VALUE_GET_INT(p->prop[0].u.value);
+        if (new_len > array_len) {
+            if (unlikely(!(get_shape_prop(p->shape)->flags & JS_PROP_WRITABLE))) {
+                JS_FreeValue(ctx, val);
+                return JS_ThrowTypeErrorReadOnly(ctx, flags, JS_ATOM_length);
+            }
+            p->prop[0].u.value = JS_NewInt32(ctx, new_len);
+        }
+    }
+    if (unlikely(new_len > p->u.array.u1.size)) {
+        if (expand_fast_array(ctx, p, new_len)) {
+            JS_FreeValue(ctx, val);
+            return -1;
+        }
+    }
+    p->u.array.u.values[new_len - 1] = val;
+    p->u.array.count = new_len;
+    return TRUE;
+}
+
+/* Allocate a new fast array. Its 'length' property is set to zero. It
+   maximum size is 2^31-1 elements. For convenience, 'len' is a 64 bit
+   integer. WARNING: the content of the array is not initialized. */
+static JSValue js_allocate_fast_array(JSContext *ctx, int64_t len)
+{
+    JSValue arr;
+    JSObject *p;
+
+    if (len > INT32_MAX)
+        return JS_ThrowRangeError(ctx, "invalid array length");
+    arr = JS_NewArray(ctx);
+    if (JS_IsException(arr))
+        return arr;
+    if (len > 0) {
+        p = JS_VALUE_GET_OBJ(arr);
+        if (expand_fast_array(ctx, p, len) < 0) {
+            JS_FreeValue(ctx, arr);
+            return JS_EXCEPTION;
+        }
+        p->u.array.count = len;
+    }
+    return arr;
+}
+
+static void js_free_desc(JSContext *ctx, JSPropertyDescriptor *desc)
+{
+    JS_FreeValue(ctx, desc->getter);
+    JS_FreeValue(ctx, desc->setter);
+    JS_FreeValue(ctx, desc->value);
+}
+
+/* return -1 in case of exception or TRUE or FALSE. Warning: 'val' is
+   freed by the function. 'flags' is a bitmask of JS_PROP_NO_ADD,
+   JS_PROP_THROW or JS_PROP_THROW_STRICT. If JS_PROP_NO_ADD is set,
+   the new property is not added and an error is raised. 'this_obj' is
+   the receiver. If obj != this_obj, then obj must be an object
+   (Reflect.set case). */
+int JS_SetPropertyInternal(JSContext *ctx, JSValueConst obj,
+                           JSAtom prop, JSValue val, JSValueConst this_obj, int flags)
+{
+    JSObject *p, *p1;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    uint32_t tag;
+    JSPropertyDescriptor desc;
+    int ret;
+#if 0
+    printf("JS_SetPropertyInternal: "); print_atom(ctx, prop); printf("\n");
+#endif
+    tag = JS_VALUE_GET_TAG(this_obj);
+    if (unlikely(tag != JS_TAG_OBJECT)) {
+        if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+            p = NULL;
+            p1 = JS_VALUE_GET_OBJ(obj);
+            goto prototype_lookup;
+        } else {
+            switch(tag) {
+            case JS_TAG_NULL:
+                JS_FreeValue(ctx, val);
+                JS_ThrowTypeErrorAtom(ctx, "cannot set property '%s' of null", prop);
+                return -1;
+            case JS_TAG_UNDEFINED:
+                JS_FreeValue(ctx, val);
+                JS_ThrowTypeErrorAtom(ctx, "cannot set property '%s' of undefined", prop);
+                return -1;
+            default:
+                /* even on a primitive type we can have setters on the prototype */
+                p = NULL;
+                p1 = JS_VALUE_GET_OBJ(JS_GetPrototypePrimitive(ctx, obj));
+                goto prototype_lookup;
+            }
+        }
+    } else {
+        p = JS_VALUE_GET_OBJ(this_obj);
+        p1 = JS_VALUE_GET_OBJ(obj);
+        if (unlikely(p != p1))
+            goto retry2;
+    }
+
+    /* fast path if obj == this_obj */
+ retry:
+    prs = find_own_property(&pr, p1, prop);
+    if (prs) {
+        if (likely((prs->flags & (JS_PROP_TMASK | JS_PROP_WRITABLE |
+                                  JS_PROP_LENGTH)) == JS_PROP_WRITABLE)) {
+            /* fast case */
+            set_value(ctx, &pr->u.value, val);
+            return TRUE;
+        } else if (prs->flags & JS_PROP_LENGTH) {
+            assert(p->class_id == JS_CLASS_ARRAY);
+            assert(prop == JS_ATOM_length);
+            return set_array_length(ctx, p, val, flags);
+        } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+            return call_setter(ctx, pr->u.getset.setter, this_obj, val, flags);
+        } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+            /* JS_PROP_WRITABLE is always true for variable
+               references, but they are write protected in module name
+               spaces. */
+            if (p->class_id == JS_CLASS_MODULE_NS)
+                goto read_only_prop;
+            set_value(ctx, pr->u.var_ref->pvalue, val);
+            return TRUE;
+        } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+            /* Instantiate property and retry (potentially useless) */
+            if (JS_AutoInitProperty(ctx, p, prop, pr, prs)) {
+                JS_FreeValue(ctx, val);
+                return -1;
+            }
+            goto retry;
+        } else {
+            goto read_only_prop;
+        }
+    }
+
+    for(;;) {
+        if (p1->is_exotic) {
+            if (p1->fast_array) {
+                if (__JS_AtomIsTaggedInt(prop)) {
+                    uint32_t idx = __JS_AtomToUInt32(prop);
+                    if (idx < p1->u.array.count) {
+                        if (unlikely(p == p1))
+                            return JS_SetPropertyValue(ctx, this_obj, JS_NewInt32(ctx, idx), val, flags);
+                        else
+                            break;
+                    } else if (p1->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                               p1->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+                        goto typed_array_oob;
+                    }
+                } else if (p1->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                           p1->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+                    ret = JS_AtomIsNumericIndex(ctx, prop);
+                    if (ret != 0) {
+                        if (ret < 0) {
+                            JS_FreeValue(ctx, val);
+                            return -1;
+                        }
+                    typed_array_oob:
+                        /* must convert the argument even if out of bound access */
+                        if (p1->class_id == JS_CLASS_BIG_INT64_ARRAY ||
+                            p1->class_id == JS_CLASS_BIG_UINT64_ARRAY) {
+                            int64_t v;
+                            if (JS_ToBigInt64Free(ctx, &v, val))
+                                return -1;
+                        } else {
+                            val = JS_ToNumberFree(ctx, val);
+                            JS_FreeValue(ctx, val);
+                            if (JS_IsException(val))
+                                return -1;
+                        }
+                        return TRUE;
+                    }
+                }
+            } else {
+                const JSClassExoticMethods *em = ctx->rt->class_array[p1->class_id].exotic;
+                if (em) {
+                    JSValue obj1;
+                    if (em->set_property) {
+                        /* set_property can free the prototype */
+                        obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p1));
+                        ret = em->set_property(ctx, obj1, prop,
+                                               val, this_obj, flags);
+                        JS_FreeValue(ctx, obj1);
+                        JS_FreeValue(ctx, val);
+                        return ret;
+                    }
+                    if (em->get_own_property) {
+                        /* get_own_property can free the prototype */
+                        obj1 = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p1));
+                        ret = em->get_own_property(ctx, &desc,
+                                                   obj1, prop);
+                        JS_FreeValue(ctx, obj1);
+                        if (ret < 0) {
+                            JS_FreeValue(ctx, val);
+                            return ret;
+                        }
+                        if (ret) {
+                            if (desc.flags & JS_PROP_GETSET) {
+                                JSObject *setter;
+                                if (JS_IsUndefined(desc.setter))
+                                    setter = NULL;
+                                else
+                                    setter = JS_VALUE_GET_OBJ(desc.setter);
+                                ret = call_setter(ctx, setter, this_obj, val, flags);
+                                JS_FreeValue(ctx, desc.getter);
+                                JS_FreeValue(ctx, desc.setter);
+                                return ret;
+                            } else {
+                                JS_FreeValue(ctx, desc.value);
+                                if (!(desc.flags & JS_PROP_WRITABLE))
+                                    goto read_only_prop;
+                                if (likely(p == p1)) {
+                                    ret = JS_DefineProperty(ctx, this_obj, prop, val,
+                                                            JS_UNDEFINED, JS_UNDEFINED,
+                                                            JS_PROP_HAS_VALUE);
+                                    JS_FreeValue(ctx, val);
+                                    return ret;
+                                } else {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        p1 = p1->shape->proto;
+    prototype_lookup:
+        if (!p1)
+            break;
+
+    retry2:
+        prs = find_own_property(&pr, p1, prop);
+        if (prs) {
+            if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                return call_setter(ctx, pr->u.getset.setter, this_obj, val, flags);
+            } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+                /* Instantiate property and retry (potentially useless) */
+                if (JS_AutoInitProperty(ctx, p1, prop, pr, prs))
+                    return -1;
+                goto retry2;
+            } else if (!(prs->flags & JS_PROP_WRITABLE)) {
+                goto read_only_prop;
+            }
+        }
+    }
+
+    if (unlikely(flags & JS_PROP_NO_ADD)) {
+        JS_FreeValue(ctx, val);
+        JS_ThrowReferenceErrorNotDefined(ctx, prop);
+        return -1;
+    }
+
+    if (unlikely(!p)) {
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeErrorOrFalse(ctx, flags, "not an object");
+    }
+
+    if (unlikely(!p->extensible)) {
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeErrorOrFalse(ctx, flags, "object is not extensible");
+    }
+
+    if (likely(p == JS_VALUE_GET_OBJ(obj))) {
+        if (p->is_exotic) {
+            if (p->class_id == JS_CLASS_ARRAY && p->fast_array &&
+                __JS_AtomIsTaggedInt(prop)) {
+                uint32_t idx = __JS_AtomToUInt32(prop);
+                if (idx == p->u.array.count) {
+                    /* fast case */
+                    return add_fast_array_element(ctx, p, val, flags);
+                } else {
+                    goto generic_create_prop;
+                }
+            } else {
+                goto generic_create_prop;
+            }
+        } else {
+            pr = add_property(ctx, p, prop, JS_PROP_C_W_E);
+            if (unlikely(!pr)) {
+                JS_FreeValue(ctx, val);
+                return -1;
+            }
+            pr->u.value = val;
+            return TRUE;
+        }
+    } else {
+        /* generic case: modify the property in this_obj if it already exists */
+        ret = JS_GetOwnPropertyInternal(ctx, &desc, p, prop);
+        if (ret < 0) {
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+        if (ret) {
+            if (desc.flags & JS_PROP_GETSET) {
+                JS_FreeValue(ctx, desc.getter);
+                JS_FreeValue(ctx, desc.setter);
+                JS_FreeValue(ctx, val);
+                return JS_ThrowTypeErrorOrFalse(ctx, flags, "setter is forbidden");
+            } else {
+                JS_FreeValue(ctx, desc.value);
+                if (!(desc.flags & JS_PROP_WRITABLE) ||
+                    p->class_id == JS_CLASS_MODULE_NS) {
+                read_only_prop:
+                    JS_FreeValue(ctx, val);
+                    return JS_ThrowTypeErrorReadOnly(ctx, flags, prop);
+                }
+            }
+            ret = JS_DefineProperty(ctx, this_obj, prop, val,
+                                    JS_UNDEFINED, JS_UNDEFINED,
+                                    JS_PROP_HAS_VALUE);
+            JS_FreeValue(ctx, val);
+            return ret;
+        } else {
+        generic_create_prop:
+            ret = JS_CreateProperty(ctx, p, prop, val, JS_UNDEFINED, JS_UNDEFINED,
+                                    flags |
+                                    JS_PROP_HAS_VALUE |
+                                    JS_PROP_HAS_ENUMERABLE |
+                                    JS_PROP_HAS_WRITABLE |
+                                    JS_PROP_HAS_CONFIGURABLE |
+                                    JS_PROP_C_W_E);
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+    }
+}
+
+/* flags can be JS_PROP_THROW or JS_PROP_THROW_STRICT */
+static int JS_SetPropertyValue(JSContext *ctx, JSValueConst this_obj,
+                               JSValue prop, JSValue val, int flags)
+{
+    if (likely(JS_VALUE_GET_TAG(this_obj) == JS_TAG_OBJECT &&
+               JS_VALUE_GET_TAG(prop) == JS_TAG_INT)) {
+        JSObject *p;
+        uint32_t idx;
+        double d;
+        int32_t v;
+
+        /* fast path for array access */
+        p = JS_VALUE_GET_OBJ(this_obj);
+        idx = JS_VALUE_GET_INT(prop);
+        switch(p->class_id) {
+        case JS_CLASS_ARRAY:
+            if (unlikely(idx >= (uint32_t)p->u.array.count)) {
+                JSObject *p1;
+                JSShape *sh1;
+
+                /* fast path to add an element to the array */
+                if (idx != (uint32_t)p->u.array.count ||
+                    !p->fast_array || !p->extensible)
+                    goto slow_path;
+                /* check if prototype chain has a numeric property */
+                p1 = p->shape->proto;
+                while (p1 != NULL) {
+                    sh1 = p1->shape;
+                    if (p1->class_id == JS_CLASS_ARRAY) {
+                        if (unlikely(!p1->fast_array))
+                            goto slow_path;
+                    } else if (p1->class_id == JS_CLASS_OBJECT) {
+                        if (unlikely(sh1->has_small_array_index))
+                            goto slow_path;
+                    } else {
+                        goto slow_path;
+                    }
+                    p1 = sh1->proto;
+                }
+                /* add element */
+                return add_fast_array_element(ctx, p, val, flags);
+            }
+            set_value(ctx, &p->u.array.u.values[idx], val);
+            break;
+        case JS_CLASS_ARGUMENTS:
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto slow_path;
+            set_value(ctx, &p->u.array.u.values[idx], val);
+            break;
+        case JS_CLASS_UINT8C_ARRAY:
+            if (JS_ToUint8ClampFree(ctx, &v, val))
+                return -1;
+            /* Note: the conversion can detach the typed array, so the
+               array bound check must be done after */
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.uint8_ptr[idx] = v;
+            break;
+        case JS_CLASS_INT8_ARRAY:
+        case JS_CLASS_UINT8_ARRAY:
+            if (JS_ToInt32Free(ctx, &v, val))
+                return -1;
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.uint8_ptr[idx] = v;
+            break;
+        case JS_CLASS_INT16_ARRAY:
+        case JS_CLASS_UINT16_ARRAY:
+            if (JS_ToInt32Free(ctx, &v, val))
+                return -1;
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.uint16_ptr[idx] = v;
+            break;
+        case JS_CLASS_INT32_ARRAY:
+        case JS_CLASS_UINT32_ARRAY:
+            if (JS_ToInt32Free(ctx, &v, val))
+                return -1;
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.uint32_ptr[idx] = v;
+            break;
+        case JS_CLASS_BIG_INT64_ARRAY:
+        case JS_CLASS_BIG_UINT64_ARRAY:
+            /* XXX: need specific conversion function */
+            {
+                int64_t v;
+                if (JS_ToBigInt64Free(ctx, &v, val))
+                    return -1;
+                if (unlikely(idx >= (uint32_t)p->u.array.count))
+                    goto ta_out_of_bound;
+                p->u.array.u.uint64_ptr[idx] = v;
+            }
+            break;
+        case JS_CLASS_FLOAT32_ARRAY:
+            if (JS_ToFloat64Free(ctx, &d, val))
+                return -1;
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.float_ptr[idx] = d;
+            break;
+        case JS_CLASS_FLOAT64_ARRAY:
+            if (JS_ToFloat64Free(ctx, &d, val))
+                return -1;
+            if (unlikely(idx >= (uint32_t)p->u.array.count)) {
+            ta_out_of_bound:
+                return TRUE;
+            }
+            p->u.array.u.double_ptr[idx] = d;
+            break;
+        default:
+            goto slow_path;
+        }
+        return TRUE;
+    } else {
+        JSAtom atom;
+        int ret;
+    slow_path:
+        atom = JS_ValueToAtom(ctx, prop);
+        JS_FreeValue(ctx, prop);
+        if (unlikely(atom == JS_ATOM_NULL)) {
+            JS_FreeValue(ctx, val);
+            return -1;
+        }
+        ret = JS_SetPropertyInternal(ctx, this_obj, atom, val, this_obj, flags);
+        JS_FreeAtom(ctx, atom);
+        return ret;
+    }
+}
+
+int JS_SetPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                         uint32_t idx, JSValue val)
+{
+    return JS_SetPropertyValue(ctx, this_obj, JS_NewUint32(ctx, idx), val,
+                               JS_PROP_THROW);
+}
+
+int JS_SetPropertyInt64(JSContext *ctx, JSValueConst this_obj,
+                        int64_t idx, JSValue val)
+{
+    JSAtom prop;
+    int res;
+
+    if ((uint64_t)idx <= INT32_MAX) {
+        /* fast path for fast arrays */
+        return JS_SetPropertyValue(ctx, this_obj, JS_NewInt32(ctx, idx), val,
+                                   JS_PROP_THROW);
+    }
+    prop = JS_NewAtomInt64(ctx, idx);
+    if (prop == JS_ATOM_NULL) {
+        JS_FreeValue(ctx, val);
+        return -1;
+    }
+    res = JS_SetProperty(ctx, this_obj, prop, val);
+    JS_FreeAtom(ctx, prop);
+    return res;
+}
+
+int JS_SetPropertyStr(JSContext *ctx, JSValueConst this_obj,
+                      const char *prop, JSValue val)
+{
+    JSAtom atom;
+    int ret;
+    atom = JS_NewAtom(ctx, prop);
+    ret = JS_SetPropertyInternal(ctx, this_obj, atom, val, this_obj, JS_PROP_THROW);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+/* compute the property flags. For each flag: (JS_PROP_HAS_x forces
+   it, otherwise def_flags is used)
+   Note: makes assumption about the bit pattern of the flags
+*/
+static int get_prop_flags(int flags, int def_flags)
+{
+    int mask;
+    mask = (flags >> JS_PROP_HAS_SHIFT) & JS_PROP_C_W_E;
+    return (flags & mask) | (def_flags & ~mask);
+}
+
+static int JS_CreateProperty(JSContext *ctx, JSObject *p,
+                             JSAtom prop, JSValueConst val,
+                             JSValueConst getter, JSValueConst setter,
+                             int flags)
+{
+    JSProperty *pr;
+    int ret, prop_flags;
+
+    /* add a new property or modify an existing exotic one */
+    if (p->is_exotic) {
+        if (p->class_id == JS_CLASS_ARRAY) {
+            uint32_t idx, len;
+
+            if (p->fast_array) {
+                if (__JS_AtomIsTaggedInt(prop)) {
+                    idx = __JS_AtomToUInt32(prop);
+                    if (idx == p->u.array.count) {
+                        if (!p->extensible)
+                            goto not_extensible;
+                        if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET))
+                            goto convert_to_array;
+                        prop_flags = get_prop_flags(flags, 0);
+                        if (prop_flags != JS_PROP_C_W_E)
+                            goto convert_to_array;
+                        return add_fast_array_element(ctx, p,
+                                                      JS_DupValue(ctx, val), flags);
+                    } else {
+                        goto convert_to_array;
+                    }
+                } else if (JS_AtomIsArrayIndex(ctx, &idx, prop)) {
+                    /* convert the fast array to normal array */
+                convert_to_array:
+                    if (convert_fast_array_to_array(ctx, p))
+                        return -1;
+                    goto generic_array;
+                }
+            } else if (JS_AtomIsArrayIndex(ctx, &idx, prop)) {
+                JSProperty *plen;
+                JSShapeProperty *pslen;
+            generic_array:
+                /* update the length field */
+                plen = &p->prop[0];
+                JS_ToUint32(ctx, &len, plen->u.value);
+                if ((idx + 1) > len) {
+                    pslen = get_shape_prop(p->shape);
+                    if (unlikely(!(pslen->flags & JS_PROP_WRITABLE)))
+                        return JS_ThrowTypeErrorReadOnly(ctx, flags, JS_ATOM_length);
+                    /* XXX: should update the length after defining
+                       the property */
+                    len = idx + 1;
+                    set_value(ctx, &plen->u.value, JS_NewUint32(ctx, len));
+                }
+            }
+        } else if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                   p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+            ret = JS_AtomIsNumericIndex(ctx, prop);
+            if (ret != 0) {
+                if (ret < 0)
+                    return -1;
+                return JS_ThrowTypeErrorOrFalse(ctx, flags, "cannot create numeric index in typed array");
+            }
+        } else if (!(flags & JS_PROP_NO_EXOTIC)) {
+            const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+            if (em) {
+                if (em->define_own_property) {
+                    return em->define_own_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p),
+                                                   prop, val, getter, setter, flags);
+                }
+                ret = JS_IsExtensible(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+                if (ret < 0)
+                    return -1;
+                if (!ret)
+                    goto not_extensible;
+            }
+        }
+    }
+
+    if (!p->extensible) {
+    not_extensible:
+        return JS_ThrowTypeErrorOrFalse(ctx, flags, "object is not extensible");
+    }
+
+    if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+        prop_flags = (flags & (JS_PROP_CONFIGURABLE | JS_PROP_ENUMERABLE)) |
+            JS_PROP_GETSET;
+    } else {
+        prop_flags = flags & JS_PROP_C_W_E;
+    }
+    pr = add_property(ctx, p, prop, prop_flags);
+    if (unlikely(!pr))
+        return -1;
+    if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+        pr->u.getset.getter = NULL;
+        if ((flags & JS_PROP_HAS_GET) && JS_IsFunction(ctx, getter)) {
+            pr->u.getset.getter =
+                JS_VALUE_GET_OBJ(JS_DupValue(ctx, getter));
+        }
+        pr->u.getset.setter = NULL;
+        if ((flags & JS_PROP_HAS_SET) && JS_IsFunction(ctx, setter)) {
+            pr->u.getset.setter =
+                JS_VALUE_GET_OBJ(JS_DupValue(ctx, setter));
+        }
+    } else {
+        if (flags & JS_PROP_HAS_VALUE) {
+            pr->u.value = JS_DupValue(ctx, val);
+        } else {
+            pr->u.value = JS_UNDEFINED;
+        }
+    }
+    return TRUE;
+}
+
+/* return FALSE if not OK */
+static BOOL check_define_prop_flags(int prop_flags, int flags)
+{
+    BOOL has_accessor, is_getset;
+
+    if (!(prop_flags & JS_PROP_CONFIGURABLE)) {
+        if ((flags & (JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE)) ==
+            (JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE)) {
+            return FALSE;
+        }
+        if ((flags & JS_PROP_HAS_ENUMERABLE) &&
+            (flags & JS_PROP_ENUMERABLE) != (prop_flags & JS_PROP_ENUMERABLE))
+            return FALSE;
+    }
+    if (flags & (JS_PROP_HAS_VALUE | JS_PROP_HAS_WRITABLE |
+                 JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+        if (!(prop_flags & JS_PROP_CONFIGURABLE)) {
+            has_accessor = ((flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) != 0);
+            is_getset = ((prop_flags & JS_PROP_TMASK) == JS_PROP_GETSET);
+            if (has_accessor != is_getset)
+                return FALSE;
+            if (!has_accessor && !is_getset && !(prop_flags & JS_PROP_WRITABLE)) {
+                /* not writable: cannot set the writable bit */
+                if ((flags & (JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE)) ==
+                    (JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE))
+                    return FALSE;
+            }
+        }
+    }
+    return TRUE;
+}
+
+/* ensure that the shape can be safely modified */
+static int js_shape_prepare_update(JSContext *ctx, JSObject *p,
+                                   JSShapeProperty **pprs)
+{
+    JSShape *sh;
+    uint32_t idx = 0;    /* prevent warning */
+
+    sh = p->shape;
+    if (sh->is_hashed) {
+        if (sh->header.ref_count != 1) {
+            if (pprs)
+                idx = *pprs - get_shape_prop(sh);
+            /* clone the shape (the resulting one is no longer hashed) */
+            sh = js_clone_shape(ctx, sh);
+            if (!sh)
+                return -1;
+            js_free_shape(ctx->rt, p->shape);
+            p->shape = sh;
+            if (pprs)
+                *pprs = get_shape_prop(sh) + idx;
+        } else {
+            js_shape_hash_unlink(ctx->rt, sh);
+            sh->is_hashed = FALSE;
+        }
+    }
+    return 0;
+}
+
+static int js_update_property_flags(JSContext *ctx, JSObject *p,
+                                    JSShapeProperty **pprs, int flags)
+{
+    if (flags != (*pprs)->flags) {
+        if (js_shape_prepare_update(ctx, p, pprs))
+            return -1;
+        (*pprs)->flags = flags;
+    }
+    return 0;
+}
+
+/* allowed flags:
+   JS_PROP_CONFIGURABLE, JS_PROP_WRITABLE, JS_PROP_ENUMERABLE
+   JS_PROP_HAS_GET, JS_PROP_HAS_SET, JS_PROP_HAS_VALUE,
+   JS_PROP_HAS_CONFIGURABLE, JS_PROP_HAS_WRITABLE, JS_PROP_HAS_ENUMERABLE,
+   JS_PROP_THROW, JS_PROP_NO_EXOTIC.
+   If JS_PROP_THROW is set, return an exception instead of FALSE.
+   if JS_PROP_NO_EXOTIC is set, do not call the exotic
+   define_own_property callback.
+   return -1 (exception), FALSE or TRUE.
+*/
+int JS_DefineProperty(JSContext *ctx, JSValueConst this_obj,
+                      JSAtom prop, JSValueConst val,
+                      JSValueConst getter, JSValueConst setter, int flags)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    int mask, res;
+
+    if (JS_VALUE_GET_TAG(this_obj) != JS_TAG_OBJECT) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    p = JS_VALUE_GET_OBJ(this_obj);
+
+ redo_prop_update:
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        /* the range of the Array length property is always tested before */
+        if ((prs->flags & JS_PROP_LENGTH) && (flags & JS_PROP_HAS_VALUE)) {
+            uint32_t array_length;
+            if (JS_ToArrayLengthFree(ctx, &array_length,
+                                     JS_DupValue(ctx, val), FALSE)) {
+                return -1;
+            }
+            /* this code relies on the fact that Uint32 are never allocated */
+            val = JS_NewUint32(ctx, array_length);
+            /* prs may have been modified */
+            prs = find_own_property(&pr, p, prop);
+            assert(prs != NULL);
+        }
+        /* property already exists */
+        if (!check_define_prop_flags(prs->flags, flags)) {
+        not_configurable:
+            return JS_ThrowTypeErrorOrFalse(ctx, flags, "property is not configurable");
+        }
+
+        if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+            /* Instantiate property and retry */
+            if (JS_AutoInitProperty(ctx, p, prop, pr, prs))
+                return -1;
+            goto redo_prop_update;
+        }
+
+        if (flags & (JS_PROP_HAS_VALUE | JS_PROP_HAS_WRITABLE |
+                     JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+            if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+                JSObject *new_getter, *new_setter;
+
+                if (JS_IsFunction(ctx, getter)) {
+                    new_getter = JS_VALUE_GET_OBJ(getter);
+                } else {
+                    new_getter = NULL;
+                }
+                if (JS_IsFunction(ctx, setter)) {
+                    new_setter = JS_VALUE_GET_OBJ(setter);
+                } else {
+                    new_setter = NULL;
+                }
+
+                if ((prs->flags & JS_PROP_TMASK) != JS_PROP_GETSET) {
+                    if (js_shape_prepare_update(ctx, p, &prs))
+                        return -1;
+                    /* convert to getset */
+                    if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                        free_var_ref(ctx->rt, pr->u.var_ref);
+                    } else {
+                        JS_FreeValue(ctx, pr->u.value);
+                    }
+                    prs->flags = (prs->flags &
+                                  (JS_PROP_CONFIGURABLE | JS_PROP_ENUMERABLE)) |
+                        JS_PROP_GETSET;
+                    pr->u.getset.getter = NULL;
+                    pr->u.getset.setter = NULL;
+                } else {
+                    if (!(prs->flags & JS_PROP_CONFIGURABLE)) {
+                        if ((flags & JS_PROP_HAS_GET) &&
+                            new_getter != pr->u.getset.getter) {
+                            goto not_configurable;
+                        }
+                        if ((flags & JS_PROP_HAS_SET) &&
+                            new_setter != pr->u.getset.setter) {
+                            goto not_configurable;
+                        }
+                    }
+                }
+                if (flags & JS_PROP_HAS_GET) {
+                    if (pr->u.getset.getter)
+                        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter));
+                    if (new_getter)
+                        JS_DupValue(ctx, getter);
+                    pr->u.getset.getter = new_getter;
+                }
+                if (flags & JS_PROP_HAS_SET) {
+                    if (pr->u.getset.setter)
+                        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.setter));
+                    if (new_setter)
+                        JS_DupValue(ctx, setter);
+                    pr->u.getset.setter = new_setter;
+                }
+            } else {
+                if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                    /* convert to data descriptor */
+                    if (js_shape_prepare_update(ctx, p, &prs))
+                        return -1;
+                    if (pr->u.getset.getter)
+                        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter));
+                    if (pr->u.getset.setter)
+                        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.setter));
+                    prs->flags &= ~(JS_PROP_TMASK | JS_PROP_WRITABLE);
+                    pr->u.value = JS_UNDEFINED;
+                } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                    /* Note: JS_PROP_VARREF is always writable */
+                } else {
+                    if ((prs->flags & (JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) == 0 &&
+                        (flags & JS_PROP_HAS_VALUE)) {
+                        if (!js_same_value(ctx, val, pr->u.value)) {
+                            goto not_configurable;
+                        } else {
+                            return TRUE;
+                        }
+                    }
+                }
+                if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                    if (flags & JS_PROP_HAS_VALUE) {
+                        if (p->class_id == JS_CLASS_MODULE_NS) {
+                            /* JS_PROP_WRITABLE is always true for variable
+                               references, but they are write protected in module name
+                               spaces. */
+                            if (!js_same_value(ctx, val, *pr->u.var_ref->pvalue))
+                                goto not_configurable;
+                        } else {
+                            /* update the reference */
+                            set_value(ctx, pr->u.var_ref->pvalue,
+                                      JS_DupValue(ctx, val));
+                        }
+                    }
+                    /* if writable is set to false, no longer a
+                       reference (for mapped arguments) */
+                    if ((flags & (JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE)) == JS_PROP_HAS_WRITABLE) {
+                        JSValue val1;
+                        if (p->class_id == JS_CLASS_MODULE_NS) {
+                            return JS_ThrowTypeErrorOrFalse(ctx, flags, "module namespace properties have writable = false");
+                        }
+                        if (js_shape_prepare_update(ctx, p, &prs))
+                            return -1;
+                        val1 = JS_DupValue(ctx, *pr->u.var_ref->pvalue);
+                        free_var_ref(ctx->rt, pr->u.var_ref);
+                        pr->u.value = val1;
+                        prs->flags &= ~(JS_PROP_TMASK | JS_PROP_WRITABLE);
+                    }
+                } else if (prs->flags & JS_PROP_LENGTH) {
+                    if (flags & JS_PROP_HAS_VALUE) {
+                        /* Note: no JS code is executable because
+                           'val' is guaranted to be a Uint32 */
+                        res = set_array_length(ctx, p, JS_DupValue(ctx, val),
+                                               flags);
+                    } else {
+                        res = TRUE;
+                    }
+                    /* still need to reset the writable flag if
+                       needed.  The JS_PROP_LENGTH is kept because the
+                       Uint32 test is still done if the length
+                       property is read-only. */
+                    if ((flags & (JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE)) ==
+                        JS_PROP_HAS_WRITABLE) {
+                        prs = get_shape_prop(p->shape);
+                        if (js_update_property_flags(ctx, p, &prs,
+                                                     prs->flags & ~JS_PROP_WRITABLE))
+                            return -1;
+                    }
+                    return res;
+                } else {
+                    if (flags & JS_PROP_HAS_VALUE) {
+                        JS_FreeValue(ctx, pr->u.value);
+                        pr->u.value = JS_DupValue(ctx, val);
+                    }
+                    if (flags & JS_PROP_HAS_WRITABLE) {
+                        if (js_update_property_flags(ctx, p, &prs,
+                                                     (prs->flags & ~JS_PROP_WRITABLE) |
+                                                     (flags & JS_PROP_WRITABLE)))
+                            return -1;
+                    }
+                }
+            }
+        }
+        mask = 0;
+        if (flags & JS_PROP_HAS_CONFIGURABLE)
+            mask |= JS_PROP_CONFIGURABLE;
+        if (flags & JS_PROP_HAS_ENUMERABLE)
+            mask |= JS_PROP_ENUMERABLE;
+        if (js_update_property_flags(ctx, p, &prs,
+                                     (prs->flags & ~mask) | (flags & mask)))
+            return -1;
+        return TRUE;
+    }
+
+    /* handle modification of fast array elements */
+    if (p->fast_array) {
+        uint32_t idx;
+        uint32_t prop_flags;
+        if (p->class_id == JS_CLASS_ARRAY) {
+            if (__JS_AtomIsTaggedInt(prop)) {
+                idx = __JS_AtomToUInt32(prop);
+                if (idx < p->u.array.count) {
+                    prop_flags = get_prop_flags(flags, JS_PROP_C_W_E);
+                    if (prop_flags != JS_PROP_C_W_E)
+                        goto convert_to_slow_array;
+                    if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+                    convert_to_slow_array:
+                        if (convert_fast_array_to_array(ctx, p))
+                            return -1;
+                        else
+                            goto redo_prop_update;
+                    }
+                    if (flags & JS_PROP_HAS_VALUE) {
+                        set_value(ctx, &p->u.array.u.values[idx], JS_DupValue(ctx, val));
+                    }
+                    return TRUE;
+                }
+            }
+        } else if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                   p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+            JSValue num;
+            int ret;
+
+            if (!__JS_AtomIsTaggedInt(prop)) {
+                /* slow path with to handle all numeric indexes */
+                num = JS_AtomIsNumericIndex1(ctx, prop);
+                if (JS_IsUndefined(num))
+                    goto typed_array_done;
+                if (JS_IsException(num))
+                    return -1;
+                ret = JS_NumberIsInteger(ctx, num);
+                if (ret < 0) {
+                    JS_FreeValue(ctx, num);
+                    return -1;
+                }
+                if (!ret) {
+                    JS_FreeValue(ctx, num);
+                    return JS_ThrowTypeErrorOrFalse(ctx, flags, "non integer index in typed array");
+                }
+                ret = JS_NumberIsNegativeOrMinusZero(ctx, num);
+                JS_FreeValue(ctx, num);
+                if (ret) {
+                    return JS_ThrowTypeErrorOrFalse(ctx, flags, "negative index in typed array");
+                }
+                if (!__JS_AtomIsTaggedInt(prop))
+                    goto typed_array_oob;
+            }
+            idx = __JS_AtomToUInt32(prop);
+            /* if the typed array is detached, p->u.array.count = 0 */
+            if (idx >= p->u.array.count) {
+            typed_array_oob:
+                return JS_ThrowTypeErrorOrFalse(ctx, flags, "out-of-bound index in typed array");
+            }
+            prop_flags = get_prop_flags(flags, JS_PROP_ENUMERABLE | JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+            if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET) ||
+                prop_flags != (JS_PROP_ENUMERABLE | JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE)) {
+                return JS_ThrowTypeErrorOrFalse(ctx, flags, "invalid descriptor flags");
+            }
+            if (flags & JS_PROP_HAS_VALUE) {
+                return JS_SetPropertyValue(ctx, this_obj, JS_NewInt32(ctx, idx), JS_DupValue(ctx, val), flags);
+            }
+            return TRUE;
+        typed_array_done: ;
+        }
+    }
+
+    return JS_CreateProperty(ctx, p, prop, val, getter, setter, flags);
+}
+
+static int JS_DefineAutoInitProperty(JSContext *ctx, JSValueConst this_obj,
+                                     JSAtom prop, JSAutoInitIDEnum id,
+                                     void *opaque, int flags)
+{
+    JSObject *p;
+    JSProperty *pr;
+
+    if (JS_VALUE_GET_TAG(this_obj) != JS_TAG_OBJECT)
+        return FALSE;
+
+    p = JS_VALUE_GET_OBJ(this_obj);
+
+    if (find_own_property(&pr, p, prop)) {
+        /* property already exists */
+        abort();
+        return FALSE;
+    }
+
+    /* Specialized CreateProperty */
+    pr = add_property(ctx, p, prop, (flags & JS_PROP_C_W_E) | JS_PROP_AUTOINIT);
+    if (unlikely(!pr))
+        return -1;
+    pr->u.init.realm_and_id = (uintptr_t)JS_DupContext(ctx);
+    assert((pr->u.init.realm_and_id & 3) == 0);
+    assert(id <= 3);
+    pr->u.init.realm_and_id |= id;
+    pr->u.init.opaque = opaque;
+    return TRUE;
+}
+
+/* shortcut to add or redefine a new property value */
+int JS_DefinePropertyValue(JSContext *ctx, JSValueConst this_obj,
+                           JSAtom prop, JSValue val, int flags)
+{
+    int ret;
+    ret = JS_DefineProperty(ctx, this_obj, prop, val, JS_UNDEFINED, JS_UNDEFINED,
+                            flags | JS_PROP_HAS_VALUE | JS_PROP_HAS_CONFIGURABLE | JS_PROP_HAS_WRITABLE | JS_PROP_HAS_ENUMERABLE);
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+int JS_DefinePropertyValueValue(JSContext *ctx, JSValueConst this_obj,
+                                JSValue prop, JSValue val, int flags)
+{
+    JSAtom atom;
+    int ret;
+    atom = JS_ValueToAtom(ctx, prop);
+    JS_FreeValue(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL)) {
+        JS_FreeValue(ctx, val);
+        return -1;
+    }
+    ret = JS_DefinePropertyValue(ctx, this_obj, atom, val, flags);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+int JS_DefinePropertyValueUint32(JSContext *ctx, JSValueConst this_obj,
+                                 uint32_t idx, JSValue val, int flags)
+{
+    return JS_DefinePropertyValueValue(ctx, this_obj, JS_NewUint32(ctx, idx),
+                                       val, flags);
+}
+
+int JS_DefinePropertyValueInt64(JSContext *ctx, JSValueConst this_obj,
+                                int64_t idx, JSValue val, int flags)
+{
+    return JS_DefinePropertyValueValue(ctx, this_obj, JS_NewInt64(ctx, idx),
+                                       val, flags);
+}
+
+int JS_DefinePropertyValueStr(JSContext *ctx, JSValueConst this_obj,
+                              const char *prop, JSValue val, int flags)
+{
+    JSAtom atom;
+    int ret;
+    atom = JS_NewAtom(ctx, prop);
+    ret = JS_DefinePropertyValue(ctx, this_obj, atom, val, flags);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+/* shortcut to add getter & setter */
+int JS_DefinePropertyGetSet(JSContext *ctx, JSValueConst this_obj,
+                            JSAtom prop, JSValue getter, JSValue setter,
+                            int flags)
+{
+    int ret;
+    ret = JS_DefineProperty(ctx, this_obj, prop, JS_UNDEFINED, getter, setter,
+                            flags | JS_PROP_HAS_GET | JS_PROP_HAS_SET |
+                            JS_PROP_HAS_CONFIGURABLE | JS_PROP_HAS_ENUMERABLE);
+    JS_FreeValue(ctx, getter);
+    JS_FreeValue(ctx, setter);
+    return ret;
+}
+
+static int JS_CreateDataPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                                       int64_t idx, JSValue val, int flags)
+{
+    return JS_DefinePropertyValueValue(ctx, this_obj, JS_NewInt64(ctx, idx),
+                                       val, flags | JS_PROP_CONFIGURABLE |
+                                       JS_PROP_ENUMERABLE | JS_PROP_WRITABLE);
+}
+
+
+/* return TRUE if 'obj' has a non empty 'name' string */
+static BOOL js_object_has_name(JSContext *ctx, JSValueConst obj)
+{
+    JSProperty *pr;
+    JSShapeProperty *prs;
+    JSValueConst val;
+    JSString *p;
+
+    prs = find_own_property(&pr, JS_VALUE_GET_OBJ(obj), JS_ATOM_name);
+    if (!prs)
+        return FALSE;
+    if ((prs->flags & JS_PROP_TMASK) != JS_PROP_NORMAL)
+        return TRUE;
+    val = pr->u.value;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_STRING)
+        return TRUE;
+    p = JS_VALUE_GET_STRING(val);
+    return (p->len != 0);
+}
+
+static int JS_DefineObjectName(JSContext *ctx, JSValueConst obj,
+                               JSAtom name, int flags)
+{
+    if (name != JS_ATOM_NULL
+    &&  JS_IsObject(obj)
+    &&  !js_object_has_name(ctx, obj)
+    &&  JS_DefinePropertyValue(ctx, obj, JS_ATOM_name, JS_AtomToString(ctx, name), flags) < 0) {
+        return -1;
+    }
+    return 0;
+}
+
+static int JS_DefineObjectNameComputed(JSContext *ctx, JSValueConst obj,
+                                       JSValueConst str, int flags)
+{
+    if (JS_IsObject(obj) &&
+        !js_object_has_name(ctx, obj)) {
+        JSAtom prop;
+        JSValue name_str;
+        prop = JS_ValueToAtom(ctx, str);
+        if (prop == JS_ATOM_NULL)
+            return -1;
+        name_str = js_get_function_name(ctx, prop);
+        JS_FreeAtom(ctx, prop);
+        if (JS_IsException(name_str))
+            return -1;
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_name, name_str, flags) < 0)
+            return -1;
+    }
+    return 0;
+}
+
+#define DEFINE_GLOBAL_LEX_VAR (1 << 7)
+#define DEFINE_GLOBAL_FUNC_VAR (1 << 6)
+
+static JSValue JS_ThrowSyntaxErrorVarRedeclaration(JSContext *ctx, JSAtom prop)
+{
+    return JS_ThrowSyntaxErrorAtom(ctx, "redeclaration of '%s'", prop);
+}
+
+/* flags is 0, DEFINE_GLOBAL_LEX_VAR or DEFINE_GLOBAL_FUNC_VAR */
+/* XXX: could support exotic global object. */
+static int JS_CheckDefineGlobalVar(JSContext *ctx, JSAtom prop, int flags)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+
+    p = JS_VALUE_GET_OBJ(ctx->global_obj);
+    prs = find_own_property1(p, prop);
+    /* XXX: should handle JS_PROP_AUTOINIT */
+    if (flags & DEFINE_GLOBAL_LEX_VAR) {
+        if (prs && !(prs->flags & JS_PROP_CONFIGURABLE))
+            goto fail_redeclaration;
+    } else {
+        if (!prs && !p->extensible)
+            goto define_error;
+        if (flags & DEFINE_GLOBAL_FUNC_VAR) {
+            if (prs) {
+                if (!(prs->flags & JS_PROP_CONFIGURABLE) &&
+                    ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET ||
+                     ((prs->flags & (JS_PROP_WRITABLE | JS_PROP_ENUMERABLE)) !=
+                      (JS_PROP_WRITABLE | JS_PROP_ENUMERABLE)))) {
+                define_error:
+                    JS_ThrowTypeErrorAtom(ctx, "cannot define variable '%s'",
+                                          prop);
+                    return -1;
+                }
+            }
+        }
+    }
+    /* check if there already is a lexical declaration */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property1(p, prop);
+    if (prs) {
+    fail_redeclaration:
+        JS_ThrowSyntaxErrorVarRedeclaration(ctx, prop);
+        return -1;
+    }
+    return 0;
+}
+
+/* def_flags is (0, DEFINE_GLOBAL_LEX_VAR) |
+   JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE */
+/* XXX: could support exotic global object. */
+static int JS_DefineGlobalVar(JSContext *ctx, JSAtom prop, int def_flags)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSValue val;
+    int flags;
+
+    if (def_flags & DEFINE_GLOBAL_LEX_VAR) {
+        p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+        flags = JS_PROP_ENUMERABLE | (def_flags & JS_PROP_WRITABLE) |
+            JS_PROP_CONFIGURABLE;
+        val = JS_UNINITIALIZED;
+    } else {
+        p = JS_VALUE_GET_OBJ(ctx->global_obj);
+        flags = JS_PROP_ENUMERABLE | JS_PROP_WRITABLE |
+            (def_flags & JS_PROP_CONFIGURABLE);
+        val = JS_UNDEFINED;
+    }
+    prs = find_own_property1(p, prop);
+    if (prs)
+        return 0;
+    if (!p->extensible)
+        return 0;
+    pr = add_property(ctx, p, prop, flags);
+    if (unlikely(!pr))
+        return -1;
+    pr->u.value = val;
+    return 0;
+}
+
+/* 'def_flags' is 0 or JS_PROP_CONFIGURABLE. */
+/* XXX: could support exotic global object. */
+static int JS_DefineGlobalFunction(JSContext *ctx, JSAtom prop,
+                                   JSValueConst func, int def_flags)
+{
+
+    JSObject *p;
+    JSShapeProperty *prs;
+    int flags;
+
+    p = JS_VALUE_GET_OBJ(ctx->global_obj);
+    prs = find_own_property1(p, prop);
+    flags = JS_PROP_HAS_VALUE | JS_PROP_THROW;
+    if (!prs || (prs->flags & JS_PROP_CONFIGURABLE)) {
+        flags |= JS_PROP_ENUMERABLE | JS_PROP_WRITABLE | def_flags |
+            JS_PROP_HAS_CONFIGURABLE | JS_PROP_HAS_WRITABLE | JS_PROP_HAS_ENUMERABLE;
+    }
+    if (JS_DefineProperty(ctx, ctx->global_obj, prop, func,
+                          JS_UNDEFINED, JS_UNDEFINED, flags) < 0)
+        return -1;
+    return 0;
+}
+
+static JSValue JS_GetGlobalVar(JSContext *ctx, JSAtom prop,
+                               BOOL throw_ref_error)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+
+    /* no exotic behavior is possible in global_var_obj */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        /* XXX: should handle JS_PROP_TMASK properties */
+        if (unlikely(JS_IsUninitialized(pr->u.value)))
+            return JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+        return JS_DupValue(ctx, pr->u.value);
+    }
+    if (ctx->scopeLookup) {
+        struct LookupResult result = ctx->scopeLookup(ctx, prop);
+        if (result.useResult)
+            return result.value;
+    }
+    return JS_GetPropertyInternal(ctx, ctx->global_obj, prop,
+                                 ctx->global_obj, throw_ref_error);
+}
+
+/* construct a reference to a global variable */
+static int JS_GetGlobalVarRef(JSContext *ctx, JSAtom prop, JSValue *sp)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+
+    /* no exotic behavior is possible in global_var_obj */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        /* XXX: should handle JS_PROP_AUTOINIT properties? */
+        /* XXX: conformance: do these tests in
+           OP_put_var_ref/OP_get_var_ref ? */
+        if (unlikely(JS_IsUninitialized(pr->u.value))) {
+            JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+            return -1;
+        }
+        if (unlikely(!(prs->flags & JS_PROP_WRITABLE))) {
+            return JS_ThrowTypeErrorReadOnly(ctx, JS_PROP_THROW, prop);
+        }
+        sp[0] = JS_DupValue(ctx, ctx->global_var_obj);
+    } else {
+        int ret;
+        ret = JS_HasProperty(ctx, ctx->global_obj, prop);
+        if (ret < 0)
+            return -1;
+        if (ret) {
+            sp[0] = JS_DupValue(ctx, ctx->global_obj);
+        } else {
+            sp[0] = JS_UNDEFINED;
+        }
+    }
+    sp[1] = JS_AtomToValue(ctx, prop);
+    return 0;
+}
+
+/* use for strict variable access: test if the variable exists */
+static int JS_CheckGlobalVar(JSContext *ctx, JSAtom prop)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    int ret;
+
+    /* no exotic behavior is possible in global_var_obj */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property1(p, prop);
+    if (prs) {
+        ret = TRUE;
+    } else {
+        ret = JS_HasProperty(ctx, ctx->global_obj, prop);
+        if (ret < 0)
+            return -1;
+    }
+    return ret;
+}
+
+/* flag = 0: normal variable write
+   flag = 1: initialize lexical variable
+   flag = 2: normal variable write, strict check was done before
+*/
+static int JS_SetGlobalVar(JSContext *ctx, JSAtom prop, JSValue val,
+                           int flag)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    int flags;
+
+    /* no exotic behavior is possible in global_var_obj */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        /* XXX: should handle JS_PROP_AUTOINIT properties? */
+        if (flag != 1) {
+            if (unlikely(JS_IsUninitialized(pr->u.value))) {
+                JS_FreeValue(ctx, val);
+                JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                return -1;
+            }
+            if (unlikely(!(prs->flags & JS_PROP_WRITABLE))) {
+                JS_FreeValue(ctx, val);
+                return JS_ThrowTypeErrorReadOnly(ctx, JS_PROP_THROW, prop);
+            }
+        }
+        set_value(ctx, &pr->u.value, val);
+        return 0;
+    }
+    flags = JS_PROP_THROW_STRICT;
+    if (is_strict_mode(ctx))
+        flags |= JS_PROP_NO_ADD;
+
+    if (ctx->scopeLookup) {
+        struct LookupResult result = ctx->scopeLookup(ctx, prop);
+        if (result.useResult) {
+            JS_FreeValue(ctx, result.value);
+            return JS_SetPropertyInternal(ctx, ctx->global_obj, prop, val, result.scope, flags);
+        }
+    }
+
+    return JS_SetPropertyInternal(ctx, ctx->global_obj, prop, val, ctx->global_obj, flags);
+}
+
+/* return -1, FALSE or TRUE. return FALSE if not configurable or
+   invalid object. return -1 in case of exception.
+   flags can be 0, JS_PROP_THROW or JS_PROP_THROW_STRICT */
+int JS_DeleteProperty(JSContext *ctx, JSValueConst obj, JSAtom prop, int flags)
+{
+    JSValue obj1;
+    JSObject *p;
+    int res;
+
+    obj1 = JS_ToObject(ctx, obj);
+    if (JS_IsException(obj1))
+        return -1;
+    p = JS_VALUE_GET_OBJ(obj1);
+    res = delete_property(ctx, p, prop);
+    JS_FreeValue(ctx, obj1);
+    if (res != FALSE)
+        return res;
+    if ((flags & JS_PROP_THROW) ||
+        ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
+        JS_ThrowTypeError(ctx, "could not delete property");
+        return -1;
+    }
+    return FALSE;
+}
+
+int JS_DeletePropertyInt64(JSContext *ctx, JSValueConst obj, int64_t idx, int flags)
+{
+    JSAtom prop;
+    int res;
+
+    if ((uint64_t)idx <= JS_ATOM_MAX_INT) {
+        /* fast path for fast arrays */
+        return JS_DeleteProperty(ctx, obj, __JS_AtomFromUInt32(idx), flags);
+    }
+    prop = JS_NewAtomInt64(ctx, idx);
+    if (prop == JS_ATOM_NULL)
+        return -1;
+    res = JS_DeleteProperty(ctx, obj, prop, flags);
+    JS_FreeAtom(ctx, prop);
+    return res;
+}
+
+BOOL JS_IsFunction(JSContext *ctx, JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    switch(p->class_id) {
+    case JS_CLASS_BYTECODE_FUNCTION:
+        return TRUE;
+    case JS_CLASS_PROXY:
+        return p->u.proxy_data->is_func;
+    default:
+        return (ctx->rt->class_array[p->class_id].call != NULL);
+    }
+}
+
+BOOL JS_IsCFunction(JSContext *ctx, JSValueConst val, JSCFunction *func, int magic)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    if (p->class_id == JS_CLASS_C_FUNCTION)
+        return (p->u.cfunc.c_function.generic == func && p->u.cfunc.magic == magic);
+    else
+        return FALSE;
+}
+
+BOOL JS_IsConstructor(JSContext *ctx, JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    return p->is_constructor;
+}
+
+BOOL JS_SetConstructorBit(JSContext *ctx, JSValueConst func_obj, BOOL val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    p->is_constructor = val;
+    return TRUE;
+}
+
+JS_BOOL JS_IsArrayBuffer(JSValueConst v)
+{
+    if (!JS_IsObject(v))
+        return FALSE;
+    JSObject *p = JS_VALUE_GET_OBJ(v);
+    return p->class_id == JS_CLASS_ARRAY_BUFFER || p->class_id == JS_CLASS_SHARED_ARRAY_BUFFER;
+}
+
+BOOL JS_IsError(JSContext *ctx, JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    return (p->class_id == JS_CLASS_ERROR);
+}
+
+/* used to avoid catching interrupt exceptions */
+BOOL JS_IsUncatchableError(JSContext *ctx, JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    return p->class_id == JS_CLASS_ERROR && p->is_uncatchable_error;
+}
+
+void JS_SetUncatchableError(JSContext *ctx, JSValueConst val, BOOL flag)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return;
+    p = JS_VALUE_GET_OBJ(val);
+    if (p->class_id == JS_CLASS_ERROR)
+        p->is_uncatchable_error = flag;
+}
+
+void JS_ResetUncatchableError(JSContext *ctx)
+{
+    JS_SetUncatchableError(ctx, ctx->rt->current_exception, FALSE);
+}
+
+void JS_SetOpaque(JSValue obj, void *opaque)
+{
+   JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(obj);
+        p->u.opaque = opaque;
+    }
+}
+
+/* return NULL if not an object of class class_id */
+void *JS_GetOpaque(JSValueConst obj, JSClassID class_id)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return NULL;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (p->class_id != class_id)
+        return NULL;
+    return p->u.opaque;
+}
+
+void *JS_GetOpaque2(JSContext *ctx, JSValueConst obj, JSClassID class_id)
+{
+    void *p = JS_GetOpaque(obj, class_id);
+    if (unlikely(!p)) {
+        JS_ThrowTypeErrorInvalidClass(ctx, class_id);
+    }
+    return p;
+}
+
+static JSValue JS_ToPrimitiveFree(JSContext *ctx, JSValue val, int hint)
+{
+    int i;
+    BOOL force_ordinary;
+
+    JSAtom method_name;
+    JSValue method, ret;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return val;
+    force_ordinary = hint & HINT_FORCE_ORDINARY;
+    hint &= ~HINT_FORCE_ORDINARY;
+    if (!force_ordinary) {
+        method = JS_GetProperty(ctx, val, JS_ATOM_Symbol_toPrimitive);
+        if (JS_IsException(method))
+            goto exception;
+        /* ECMA says *If exoticToPrim is not undefined* but tests in
+           test262 use null as a non callable converter */
+        if (!JS_IsUndefined(method) && !JS_IsNull(method)) {
+            JSAtom atom;
+            JSValue arg;
+            switch(hint) {
+            case HINT_STRING:
+                atom = JS_ATOM_string;
+                break;
+            case HINT_NUMBER:
+                atom = JS_ATOM_number;
+                break;
+            default:
+            case HINT_NONE:
+                atom = JS_ATOM_default;
+                break;
+            }
+            arg = JS_AtomToString(ctx, atom);
+            ret = JS_CallFree(ctx, method, val, 1, (JSValueConst *)&arg);
+            JS_FreeValue(ctx, arg);
+            if (JS_IsException(ret))
+                goto exception;
+            JS_FreeValue(ctx, val);
+            if (JS_VALUE_GET_TAG(ret) != JS_TAG_OBJECT)
+                return ret;
+            JS_FreeValue(ctx, ret);
+            return JS_ThrowTypeError(ctx, "toPrimitive");
+        }
+    }
+    if (hint != HINT_STRING)
+        hint = HINT_NUMBER;
+    for(i = 0; i < 2; i++) {
+        if ((i ^ hint) == 0) {
+            method_name = JS_ATOM_toString;
+        } else {
+            method_name = JS_ATOM_valueOf;
+        }
+        method = JS_GetProperty(ctx, val, method_name);
+        if (JS_IsException(method))
+            goto exception;
+        if (JS_IsFunction(ctx, method)) {
+            ret = JS_CallFree(ctx, method, val, 0, NULL);
+            if (JS_IsException(ret))
+                goto exception;
+            if (JS_VALUE_GET_TAG(ret) != JS_TAG_OBJECT) {
+                JS_FreeValue(ctx, val);
+                return ret;
+            }
+            JS_FreeValue(ctx, ret);
+        } else {
+            JS_FreeValue(ctx, method);
+        }
+    }
+    JS_ThrowTypeError(ctx, "toPrimitive");
+exception:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ToPrimitive(JSContext *ctx, JSValueConst val, int hint)
+{
+    return JS_ToPrimitiveFree(ctx, JS_DupValue(ctx, val), hint);
+}
+
+void JS_SetIsHTMLDDA(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return;
+    p = JS_VALUE_GET_OBJ(obj);
+    p->is_HTMLDDA = TRUE;
+}
+
+static inline BOOL JS_IsHTMLDDA(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    return p->is_HTMLDDA;
+}
+
+static int JS_ToBoolFree(JSContext *ctx, JSValue val)
+{
+    uint32_t tag = JS_VALUE_GET_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+        return JS_VALUE_GET_INT(val) != 0;
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        return JS_VALUE_GET_INT(val);
+    case JS_TAG_EXCEPTION:
+        return -1;
+    case JS_TAG_STRING:
+        {
+            BOOL ret = JS_VALUE_GET_STRING(val)->len != 0;
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+    case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+#endif
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            BOOL ret;
+            ret = p->num.expn != BF_EXP_ZERO && p->num.expn != BF_EXP_NAN;
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *p = JS_VALUE_GET_PTR(val);
+            BOOL ret;
+            ret = p->num.expn != BF_EXP_ZERO && p->num.expn != BF_EXP_NAN;
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+#endif
+    case JS_TAG_OBJECT:
+        {
+            JSObject *p = JS_VALUE_GET_OBJ(val);
+            BOOL ret;
+            ret = !p->is_HTMLDDA;
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+        break;
+    default:
+        if (JS_TAG_IS_FLOAT64(tag)) {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            return !isnan(d) && d != 0;
+        } else {
+            JS_FreeValue(ctx, val);
+            return TRUE;
+        }
+    }
+}
+
+int JS_ToBool(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToBoolFree(ctx, JS_DupValue(ctx, val));
+}
+
+static int skip_spaces(const char *pc)
+{
+    const uint8_t *p, *p_next, *p_start;
+    uint32_t c;
+
+    p = p_start = (const uint8_t *)pc;
+    for (;;) {
+        c = *p;
+        if (c < 128) {
+            if (!((c >= 0x09 && c <= 0x0d) || (c == 0x20)))
+                break;
+            p++;
+        } else {
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p_next);
+            if (!lre_is_space(c))
+                break;
+            p = p_next;
+        }
+    }
+    return p - p_start;
+}
+
+static inline int to_digit(int c)
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    else if (c >= 'A' && c <= 'Z')
+        return c - 'A' + 10;
+    else if (c >= 'a' && c <= 'z')
+        return c - 'a' + 10;
+    else
+        return 36;
+}
+
+/* XXX: remove */
+static double js_strtod(const char *str, int radix, BOOL is_float)
+{
+    double d;
+    int c;
+
+    if (!is_float || radix != 10) {
+        const char *p = str;
+        uint64_t n_max, n;
+        int int_exp, is_neg;
+
+        is_neg = 0;
+        if (*p == '-') {
+            is_neg = 1;
+            p++;
+        }
+
+        /* skip leading zeros */
+        while (*p == '0')
+            p++;
+        n = 0;
+        if (radix == 10)
+            n_max = ((uint64_t)-1 - 9) / 10; /* most common case */
+        else
+            n_max = ((uint64_t)-1 - (radix - 1)) / radix;
+        /* XXX: could be more precise */
+        int_exp = 0;
+        while (*p != '\0') {
+            c = to_digit((uint8_t)*p);
+            if (c >= radix)
+                break;
+            if (n <= n_max) {
+                n = n * radix + c;
+            } else {
+                if (radix == 10)
+                    goto strtod_case;
+                int_exp++;
+            }
+            p++;
+        }
+        d = n;
+        if (int_exp != 0) {
+            d *= pow(radix, int_exp);
+        }
+        if (is_neg)
+            d = -d;
+    } else {
+    strtod_case:
+        d = safe_strtod(str, NULL);
+    }
+    return d;
+}
+
+#define ATOD_INT_ONLY        (1 << 0)
+/* accept Oo and Ob prefixes in addition to 0x prefix if radix = 0 */
+#define ATOD_ACCEPT_BIN_OCT  (1 << 2)
+/* accept O prefix as octal if radix == 0 and properly formed (Annex B) */
+#define ATOD_ACCEPT_LEGACY_OCTAL  (1 << 4)
+/* accept _ between digits as a digit separator */
+#define ATOD_ACCEPT_UNDERSCORES  (1 << 5)
+/* allow a suffix to override the type */
+#define ATOD_ACCEPT_SUFFIX    (1 << 6)
+/* default type */
+#define ATOD_TYPE_MASK        (3 << 7)
+#define ATOD_TYPE_FLOAT64     (0 << 7)
+#define ATOD_TYPE_BIG_INT     (1 << 7)
+#ifdef CONFIG_BIGNUM
+#define ATOD_TYPE_BIG_FLOAT   (2 << 7)
+#define ATOD_TYPE_BIG_DECIMAL (3 << 7)
+/* assume bigint mode: floats are parsed as integers if no decimal
+   point nor exponent */
+#define ATOD_MODE_BIGINT      (1 << 9)
+#endif
+/* accept -0x1 */
+#define ATOD_ACCEPT_PREFIX_AFTER_SIGN (1 << 10)
+
+static JSValue js_string_to_bigint(JSContext *ctx, const char *buf,
+                                   int radix, int flags, slimb_t *pexponent)
+{
+    bf_t a_s, *a = &a_s;
+    int ret;
+    JSValue val;
+    val = JS_NewBigInt(ctx);
+    if (JS_IsException(val))
+        return val;
+    a = JS_GetBigInt(val);
+    ret = bf_atof(a, buf, NULL, radix, BF_PREC_INF, BF_RNDZ);
+    if (ret & BF_ST_MEM_ERROR) {
+        JS_FreeValue(ctx, val);
+        return JS_ThrowOutOfMemory(ctx);
+    }
+#ifdef CONFIG_BIGNUM
+    val = JS_CompactBigInt1(ctx, val, (flags & ATOD_MODE_BIGINT) != 0);
+#else
+    val = JS_CompactBigInt1(ctx, val, FALSE);
+#endif
+    return val;
+}
+
+#ifdef CONFIG_BIGNUM
+static JSValue js_string_to_bigfloat(JSContext *ctx, const char *buf,
+                                     int radix, int flags, slimb_t *pexponent)
+{
+    bf_t *a;
+    int ret;
+    JSValue val;
+
+    val = JS_NewBigFloat(ctx);
+    if (JS_IsException(val))
+        return val;
+    a = JS_GetBigFloat(val);
+    if (flags & ATOD_ACCEPT_SUFFIX) {
+        /* return the exponent to get infinite precision */
+        ret = bf_atof2(a, pexponent, buf, NULL, radix, BF_PREC_INF,
+                       BF_RNDZ | BF_ATOF_EXPONENT);
+    } else {
+        ret = bf_atof(a, buf, NULL, radix, ctx->fp_env.prec,
+                      ctx->fp_env.flags);
+    }
+    if (ret & BF_ST_MEM_ERROR) {
+        JS_FreeValue(ctx, val);
+        return JS_ThrowOutOfMemory(ctx);
+    }
+    return val;
+}
+
+static JSValue js_string_to_bigdecimal(JSContext *ctx, const char *buf,
+                                       int radix, int flags, slimb_t *pexponent)
+{
+    bfdec_t *a;
+    int ret;
+    JSValue val;
+
+    val = JS_NewBigDecimal(ctx);
+    if (JS_IsException(val))
+        return val;
+    a = JS_GetBigDecimal(val);
+    ret = bfdec_atof(a, buf, NULL, BF_PREC_INF,
+                     BF_RNDZ | BF_ATOF_NO_NAN_INF);
+    if (ret & BF_ST_MEM_ERROR) {
+        JS_FreeValue(ctx, val);
+        return JS_ThrowOutOfMemory(ctx);
+    }
+    return val;
+}
+#endif
+
+/* return an exception in case of memory error. Return JS_NAN if
+   invalid syntax */
+#ifdef CONFIG_BIGNUM
+static JSValue js_atof2(JSContext *ctx, const char *str, const char **pp,
+                        int radix, int flags, slimb_t *pexponent)
+#else
+static JSValue js_atof(JSContext *ctx, const char *str, const char **pp,
+                       int radix, int flags)
+#endif
+{
+    const char *p, *p_start;
+    int sep, is_neg;
+    BOOL is_float, has_legacy_octal;
+    int atod_type = flags & ATOD_TYPE_MASK;
+    char buf1[64], *buf;
+    int i, j, len;
+    BOOL buf_allocated = FALSE;
+    JSValue val;
+
+    /* optional separator between digits */
+    sep = (flags & ATOD_ACCEPT_UNDERSCORES) ? '_' : 256;
+    has_legacy_octal = FALSE;
+
+    p = str;
+    p_start = p;
+    is_neg = 0;
+    if (p[0] == '+') {
+        p++;
+        p_start++;
+        if (!(flags & ATOD_ACCEPT_PREFIX_AFTER_SIGN))
+            goto no_radix_prefix;
+    } else if (p[0] == '-') {
+        p++;
+        p_start++;
+        is_neg = 1;
+        if (!(flags & ATOD_ACCEPT_PREFIX_AFTER_SIGN))
+            goto no_radix_prefix;
+    }
+    if (p[0] == '0') {
+        if ((p[1] == 'x' || p[1] == 'X') &&
+            (radix == 0 || radix == 16)) {
+            p += 2;
+            radix = 16;
+        } else if ((p[1] == 'o' || p[1] == 'O') &&
+                   radix == 0 && (flags & ATOD_ACCEPT_BIN_OCT)) {
+            p += 2;
+            radix = 8;
+        } else if ((p[1] == 'b' || p[1] == 'B') &&
+                   radix == 0 && (flags & ATOD_ACCEPT_BIN_OCT)) {
+            p += 2;
+            radix = 2;
+        } else if ((p[1] >= '0' && p[1] <= '9') &&
+                   radix == 0 && (flags & ATOD_ACCEPT_LEGACY_OCTAL)) {
+            int i;
+            has_legacy_octal = TRUE;
+            sep = 256;
+            for (i = 1; (p[i] >= '0' && p[i] <= '7'); i++)
+                continue;
+            if (p[i] == '8' || p[i] == '9')
+                goto no_prefix;
+            p += 1;
+            radix = 8;
+        } else {
+            goto no_prefix;
+        }
+        /* there must be a digit after the prefix */
+        if (to_digit((uint8_t)*p) >= radix)
+            goto fail;
+    no_prefix: ;
+    } else {
+ no_radix_prefix:
+        if (!(flags & ATOD_INT_ONLY) &&
+            (atod_type == ATOD_TYPE_FLOAT64
+#ifdef CONFIG_BIGNUM
+             || atod_type == ATOD_TYPE_BIG_FLOAT
+#endif
+             ) &&
+            strstart(p, "Infinity", &p)) {
+#ifdef CONFIG_BIGNUM
+            if (atod_type == ATOD_TYPE_BIG_FLOAT) {
+                bf_t *a;
+                val = JS_NewBigFloat(ctx);
+                if (JS_IsException(val))
+                    goto done;
+                a = JS_GetBigFloat(val);
+                bf_set_inf(a, is_neg);
+            } else
+#endif
+            {
+                double d = INFINITY;
+                if (is_neg)
+                    d = -d;
+                val = JS_NewFloat64(ctx, d);
+            }
+            goto done;
+        }
+    }
+    if (radix == 0)
+        radix = 10;
+    is_float = FALSE;
+    p_start = p;
+    while (to_digit((uint8_t)*p) < radix
+           ||  (*p == sep && (radix != 10 ||
+                              p != p_start + 1 || p[-1] != '0') &&
+                to_digit((uint8_t)p[1]) < radix)) {
+        p++;
+    }
+    if (!(flags & ATOD_INT_ONLY)) {
+        if (*p == '.' && (p > p_start || to_digit((uint8_t)p[1]) < radix)) {
+            is_float = TRUE;
+            p++;
+            if (*p == sep)
+                goto fail;
+            while (to_digit((uint8_t)*p) < radix ||
+                   (*p == sep && to_digit((uint8_t)p[1]) < radix))
+                p++;
+        }
+        if (p > p_start &&
+            (((*p == 'e' || *p == 'E') && radix == 10) ||
+             ((*p == 'p' || *p == 'P') && (radix == 2 || radix == 8 || radix == 16)))) {
+            const char *p1 = p + 1;
+            is_float = TRUE;
+            if (*p1 == '+') {
+                p1++;
+            } else if (*p1 == '-') {
+                p1++;
+            }
+            if (is_digit((uint8_t)*p1)) {
+                p = p1 + 1;
+                while (is_digit((uint8_t)*p) || (*p == sep && is_digit((uint8_t)p[1])))
+                    p++;
+            }
+        }
+    }
+    if (p == p_start)
+        goto fail;
+
+    buf = buf1;
+    buf_allocated = FALSE;
+    len = p - p_start;
+    if (unlikely((len + 2) > sizeof(buf1))) {
+        buf = js_malloc_rt(ctx->rt, len + 2); /* no exception raised */
+        if (!buf)
+            goto mem_error;
+        buf_allocated = TRUE;
+    }
+    /* remove the separators and the radix prefixes */
+    j = 0;
+    if (is_neg)
+        buf[j++] = '-';
+    for (i = 0; i < len; i++) {
+        if (p_start[i] != '_')
+            buf[j++] = p_start[i];
+    }
+    buf[j] = '\0';
+
+    if (flags & ATOD_ACCEPT_SUFFIX) {
+        if (*p == 'n') {
+            p++;
+            atod_type = ATOD_TYPE_BIG_INT;
+        } else
+#ifdef CONFIG_BIGNUM
+        if (*p == 'l') {
+            p++;
+            atod_type = ATOD_TYPE_BIG_FLOAT;
+        } else if (*p == 'm') {
+            p++;
+            atod_type = ATOD_TYPE_BIG_DECIMAL;
+        } else if (flags & ATOD_MODE_BIGINT) {
+            if (!is_float)
+                atod_type = ATOD_TYPE_BIG_INT;
+            if (has_legacy_octal)
+                goto fail;
+        } else
+#endif
+        {
+            if (is_float && radix != 10)
+                goto fail;
+        }
+    } else {
+        if (atod_type == ATOD_TYPE_FLOAT64) {
+#ifdef CONFIG_BIGNUM
+            if (flags & ATOD_MODE_BIGINT) {
+                if (!is_float)
+                    atod_type = ATOD_TYPE_BIG_INT;
+                if (has_legacy_octal)
+                    goto fail;
+            } else
+#endif
+            {
+                if (is_float && radix != 10)
+                    goto fail;
+            }
+        }
+    }
+
+    switch(atod_type) {
+    case ATOD_TYPE_FLOAT64:
+        {
+            double d;
+            d = js_strtod(buf, radix, is_float);
+            /* return int or float64 */
+            val = JS_NewFloat64(ctx, d);
+        }
+        break;
+    case ATOD_TYPE_BIG_INT:
+        if (has_legacy_octal || is_float)
+            goto fail;
+        val = ctx->rt->bigint_ops.from_string(ctx, buf, radix, flags, NULL);
+        break;
+#ifdef CONFIG_BIGNUM
+    case ATOD_TYPE_BIG_FLOAT:
+        if (has_legacy_octal)
+            goto fail;
+        val = ctx->rt->bigfloat_ops.from_string(ctx, buf, radix, flags,
+                                                pexponent);
+        break;
+    case ATOD_TYPE_BIG_DECIMAL:
+        if (radix != 10)
+            goto fail;
+        val = ctx->rt->bigdecimal_ops.from_string(ctx, buf, radix, flags, NULL);
+        break;
+#endif
+    default:
+        abort();
+    }
+
+done:
+    if (buf_allocated)
+        js_free_rt(ctx->rt, buf);
+    if (pp)
+        *pp = p;
+    return val;
+ fail:
+    val = JS_NAN;
+    goto done;
+ mem_error:
+    val = JS_ThrowOutOfMemory(ctx);
+    goto done;
+}
+
+#ifdef CONFIG_BIGNUM
+static JSValue js_atof(JSContext *ctx, const char *str, const char **pp,
+                       int radix, int flags)
+{
+    return js_atof2(ctx, str, pp, radix, flags, NULL);
+}
+#endif
+
+typedef enum JSToNumberHintEnum {
+    TON_FLAG_NUMBER,
+    TON_FLAG_NUMERIC,
+} JSToNumberHintEnum;
+
+static JSValue JS_ToNumberHintFree(JSContext *ctx, JSValue val,
+                                   JSToNumberHintEnum flag)
+{
+    uint32_t tag;
+    JSValue ret;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_BIG_INT:
+        if (flag != TON_FLAG_NUMERIC) {
+            JS_FreeValue(ctx, val);
+            return JS_ThrowTypeError(ctx, "cannot convert bigint to number");
+        }
+        ret = val;
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_DECIMAL:
+        if (flag != TON_FLAG_NUMERIC) {
+            JS_FreeValue(ctx, val);
+            return JS_ThrowTypeError(ctx, "cannot convert bigdecimal to number");
+        }
+        ret = val;
+        break;
+    case JS_TAG_BIG_FLOAT:
+        if (flag != TON_FLAG_NUMERIC) {
+            JS_FreeValue(ctx, val);
+            return JS_ThrowTypeError(ctx, "cannot convert bigfloat to number");
+        }
+        ret = val;
+        break;
+#endif
+    case JS_TAG_FLOAT64:
+    case JS_TAG_INT:
+    case JS_TAG_EXCEPTION:
+        ret = val;
+        break;
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+        ret = JS_NewInt32(ctx, JS_VALUE_GET_INT(val));
+        break;
+    case JS_TAG_UNDEFINED:
+        ret = JS_NAN;
+        break;
+    case JS_TAG_OBJECT:
+        val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
+        if (JS_IsException(val))
+            return JS_EXCEPTION;
+        goto redo;
+    case JS_TAG_STRING:
+        {
+            const char *str;
+            const char *p;
+            size_t len;
+
+            str = JS_ToCStringLen(ctx, &len, val);
+            JS_FreeValue(ctx, val);
+            if (!str)
+                return JS_EXCEPTION;
+            p = str;
+            p += skip_spaces(p);
+            if ((p - str) == len) {
+                ret = JS_NewInt32(ctx, 0);
+            } else {
+                int flags = ATOD_ACCEPT_BIN_OCT;
+                ret = js_atof(ctx, p, &p, 0, flags);
+                if (!JS_IsException(ret)) {
+                    p += skip_spaces(p);
+                    if ((p - str) != len) {
+                        JS_FreeValue(ctx, ret);
+                        ret = JS_NAN;
+                    }
+                }
+            }
+            JS_FreeCString(ctx, str);
+        }
+        break;
+    case JS_TAG_SYMBOL:
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeError(ctx, "cannot convert symbol to number");
+    default:
+        JS_FreeValue(ctx, val);
+        ret = JS_NAN;
+        break;
+    }
+    return ret;
+}
+
+static JSValue JS_ToNumberFree(JSContext *ctx, JSValue val)
+{
+    return JS_ToNumberHintFree(ctx, val, TON_FLAG_NUMBER);
+}
+
+static JSValue JS_ToNumericFree(JSContext *ctx, JSValue val)
+{
+    return JS_ToNumberHintFree(ctx, val, TON_FLAG_NUMERIC);
+}
+
+static JSValue JS_ToNumeric(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToNumericFree(ctx, JS_DupValue(ctx, val));
+}
+
+static __exception int __JS_ToFloat64Free(JSContext *ctx, double *pres,
+                                          JSValue val)
+{
+    double d;
+    uint32_t tag;
+
+    val = JS_ToNumberFree(ctx, val);
+    if (JS_IsException(val)) {
+        *pres = JS_FLOAT64_NAN;
+        return -1;
+    }
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+        d = JS_VALUE_GET_INT(val);
+        break;
+    case JS_TAG_FLOAT64:
+        d = JS_VALUE_GET_FLOAT64(val);
+        break;
+    case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+#endif
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            /* XXX: there can be a double rounding issue with some
+               primitives (such as JS_ToUint8ClampFree()), but it is
+               not critical to fix it. */
+            bf_get_float64(&p->num, &d, BF_RNDN);
+            JS_FreeValue(ctx, val);
+        }
+        break;
+    default:
+        abort();
+    }
+    *pres = d;
+    return 0;
+}
+
+static inline int JS_ToFloat64Free(JSContext *ctx, double *pres, JSValue val)
+{
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_TAG(val);
+    if (tag <= JS_TAG_NULL) {
+        *pres = JS_VALUE_GET_INT(val);
+        return 0;
+    } else if (JS_TAG_IS_FLOAT64(tag)) {
+        *pres = JS_VALUE_GET_FLOAT64(val);
+        return 0;
+    } else {
+        return __JS_ToFloat64Free(ctx, pres, val);
+    }
+}
+
+int JS_ToFloat64(JSContext *ctx, double *pres, JSValueConst val)
+{
+    return JS_ToFloat64Free(ctx, pres, JS_DupValue(ctx, val));
+}
+
+static JSValue JS_ToNumber(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToNumberFree(ctx, JS_DupValue(ctx, val));
+}
+
+/* same as JS_ToNumber() but return 0 in case of NaN/Undefined */
+static __maybe_unused JSValue JS_ToIntegerFree(JSContext *ctx, JSValue val)
+{
+    uint32_t tag;
+    JSValue ret;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        ret = JS_NewInt32(ctx, JS_VALUE_GET_INT(val));
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (isnan(d)) {
+                ret = JS_NewInt32(ctx, 0);
+            } else {
+                /* convert -0 to +0 */
+                d = trunc(d) + 0.0;
+                ret = JS_NewFloat64(ctx, d);
+            }
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        {
+            bf_t a_s, *a, r_s, *r = &r_s;
+            BOOL is_nan;
+
+            a = JS_ToBigFloat(ctx, &a_s, val);
+            if (!a) {
+                JS_FreeValue(ctx, val);
+                return JS_EXCEPTION;
+            }
+            if (!bf_is_finite(a)) {
+                is_nan = bf_is_nan(a);
+                if (is_nan)
+                    ret = JS_NewInt32(ctx, 0);
+                else
+                    ret = JS_DupValue(ctx, val);
+            } else {
+                ret = JS_NewBigInt(ctx);
+                if (!JS_IsException(ret)) {
+                    r = JS_GetBigInt(ret);
+                    bf_set(r, a);
+                    bf_rint(r, BF_RNDZ);
+                    ret = JS_CompactBigInt(ctx, ret);
+                }
+            }
+            if (a == &a_s)
+                bf_delete(a);
+            JS_FreeValue(ctx, val);
+        }
+        break;
+#endif
+    default:
+        val = JS_ToNumberFree(ctx, val);
+        if (JS_IsException(val))
+            return val;
+        goto redo;
+    }
+    return ret;
+}
+
+/* Note: the integer value is satured to 32 bits */
+static int JS_ToInt32SatFree(JSContext *ctx, int *pres, JSValue val)
+{
+    uint32_t tag;
+    int ret;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        ret = JS_VALUE_GET_INT(val);
+        break;
+    case JS_TAG_EXCEPTION:
+        *pres = 0;
+        return -1;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (isnan(d)) {
+                ret = 0;
+            } else {
+                if (d < INT32_MIN)
+                    ret = INT32_MIN;
+                else if (d > INT32_MAX)
+                    ret = INT32_MAX;
+                else
+                    ret = (int)d;
+            }
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            bf_get_int32(&ret, &p->num, 0);
+            JS_FreeValue(ctx, val);
+        }
+        break;
+#endif
+    default:
+        val = JS_ToNumberFree(ctx, val);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+    *pres = ret;
+    return 0;
+}
+
+int JS_ToInt32Sat(JSContext *ctx, int *pres, JSValueConst val)
+{
+    return JS_ToInt32SatFree(ctx, pres, JS_DupValue(ctx, val));
+}
+
+int JS_ToInt32Clamp(JSContext *ctx, int *pres, JSValueConst val,
+                    int min, int max, int min_offset)
+{
+    int res = JS_ToInt32SatFree(ctx, pres, JS_DupValue(ctx, val));
+    if (res == 0) {
+        if (*pres < min) {
+            *pres += min_offset;
+            if (*pres < min)
+                *pres = min;
+        } else {
+            if (*pres > max)
+                *pres = max;
+        }
+    }
+    return res;
+}
+
+static int JS_ToInt64SatFree(JSContext *ctx, int64_t *pres, JSValue val)
+{
+    uint32_t tag;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        *pres = JS_VALUE_GET_INT(val);
+        return 0;
+    case JS_TAG_EXCEPTION:
+        *pres = 0;
+        return -1;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (isnan(d)) {
+                *pres = 0;
+            } else {
+                if (d < INT64_MIN)
+                    *pres = INT64_MIN;
+                else if (d >= 0x1p63) /* must use INT64_MAX + 1 because INT64_MAX cannot be exactly represented as a double */
+                    *pres = INT64_MAX;
+                else
+                    *pres = (int64_t)d;
+            }
+        }
+        return 0;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            bf_get_int64(pres, &p->num, 0);
+            JS_FreeValue(ctx, val);
+        }
+        return 0;
+#endif
+    default:
+        val = JS_ToNumberFree(ctx, val);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+}
+
+int JS_ToInt64Sat(JSContext *ctx, int64_t *pres, JSValueConst val)
+{
+    return JS_ToInt64SatFree(ctx, pres, JS_DupValue(ctx, val));
+}
+
+int JS_ToInt64Clamp(JSContext *ctx, int64_t *pres, JSValueConst val,
+                    int64_t min, int64_t max, int64_t neg_offset)
+{
+    int res = JS_ToInt64SatFree(ctx, pres, JS_DupValue(ctx, val));
+    if (res == 0) {
+        if (*pres < 0)
+            *pres += neg_offset;
+        if (*pres < min)
+            *pres = min;
+        else if (*pres > max)
+            *pres = max;
+    }
+    return res;
+}
+
+/* Same as JS_ToInt32Free() but with a 64 bit result. Return (<0, 0)
+   in case of exception */
+static int JS_ToInt64Free(JSContext *ctx, int64_t *pres, JSValue val)
+{
+    uint32_t tag;
+    int64_t ret;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        ret = JS_VALUE_GET_INT(val);
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            JSFloat64Union u;
+            double d;
+            int e;
+            d = JS_VALUE_GET_FLOAT64(val);
+            u.d = d;
+            /* we avoid doing fmod(x, 2^64) */
+            e = (u.u64 >> 52) & 0x7ff;
+            if (likely(e <= (1023 + 62))) {
+                /* fast case */
+                ret = (int64_t)d;
+            } else if (e <= (1023 + 62 + 53)) {
+                uint64_t v;
+                /* remainder modulo 2^64 */
+                v = (u.u64 & (((uint64_t)1 << 52) - 1)) | ((uint64_t)1 << 52);
+                ret = v << ((e - 1023) - 52);
+                /* take the sign into account */
+                if (u.u64 >> 63)
+                    ret = -ret;
+            } else {
+                ret = 0; /* also handles NaN and +inf */
+            }
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            bf_get_int64(&ret, &p->num, BF_GET_INT_MOD);
+            JS_FreeValue(ctx, val);
+        }
+        break;
+#endif
+    default:
+        val = JS_ToNumberFree(ctx, val);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+    *pres = ret;
+    return 0;
+}
+
+int JS_ToInt64(JSContext *ctx, int64_t *pres, JSValueConst val)
+{
+    return JS_ToInt64Free(ctx, pres, JS_DupValue(ctx, val));
+}
+
+int JS_ToInt64Ext(JSContext *ctx, int64_t *pres, JSValueConst val)
+{
+    if (JS_IsBigInt(ctx, val))
+        return JS_ToBigInt64(ctx, pres, val);
+    else
+        return JS_ToInt64(ctx, pres, val);
+}
+
+/* return (<0, 0) in case of exception */
+static int JS_ToInt32Free(JSContext *ctx, int32_t *pres, JSValue val)
+{
+    uint32_t tag;
+    int32_t ret;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        ret = JS_VALUE_GET_INT(val);
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            JSFloat64Union u;
+            double d;
+            int e;
+            d = JS_VALUE_GET_FLOAT64(val);
+            u.d = d;
+            /* we avoid doing fmod(x, 2^32) */
+            e = (u.u64 >> 52) & 0x7ff;
+            if (likely(e <= (1023 + 30))) {
+                /* fast case */
+                ret = (int32_t)d;
+            } else if (e <= (1023 + 30 + 53)) {
+                uint64_t v;
+                /* remainder modulo 2^32 */
+                v = (u.u64 & (((uint64_t)1 << 52) - 1)) | ((uint64_t)1 << 52);
+                v = v << ((e - 1023) - 52 + 32);
+                ret = v >> 32;
+                /* take the sign into account */
+                if (u.u64 >> 63)
+                    ret = -ret;
+            } else {
+                ret = 0; /* also handles NaN and +inf */
+            }
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            bf_get_int32(&ret, &p->num, BF_GET_INT_MOD);
+            JS_FreeValue(ctx, val);
+        }
+        break;
+#endif
+    default:
+        val = JS_ToNumberFree(ctx, val);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+    *pres = ret;
+    return 0;
+}
+
+int JS_ToInt32(JSContext *ctx, int32_t *pres, JSValueConst val)
+{
+    return JS_ToInt32Free(ctx, pres, JS_DupValue(ctx, val));
+}
+
+static inline int JS_ToUint32Free(JSContext *ctx, uint32_t *pres, JSValue val)
+{
+    return JS_ToInt32Free(ctx, (int32_t *)pres, val);
+}
+
+static int JS_ToUint8ClampFree(JSContext *ctx, int32_t *pres, JSValue val)
+{
+    uint32_t tag;
+    int res;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        res = JS_VALUE_GET_INT(val);
+#ifdef CONFIG_BIGNUM
+    int_clamp:
+#endif
+        res = max_int(0, min_int(255, res));
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (isnan(d)) {
+                res = 0;
+            } else {
+                if (d < 0)
+                    res = 0;
+                else if (d > 255)
+                    res = 255;
+                else
+                    res = lrint(d);
+            }
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            bf_t r_s, *r = &r_s;
+            bf_init(ctx->bf_ctx, r);
+            bf_set(r, &p->num);
+            bf_rint(r, BF_RNDN);
+            bf_get_int32(&res, r, 0);
+            bf_delete(r);
+            JS_FreeValue(ctx, val);
+        }
+        goto int_clamp;
+#endif
+    default:
+        val = JS_ToNumberFree(ctx, val);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+    *pres = res;
+    return 0;
+}
+
+static __exception int JS_ToArrayLengthFree(JSContext *ctx, uint32_t *plen,
+                                            JSValue val, BOOL is_array_ctor)
+{
+    uint32_t tag, len;
+
+    tag = JS_VALUE_GET_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+        {
+            int v;
+            v = JS_VALUE_GET_INT(val);
+            if (v < 0)
+                goto fail;
+            len = v;
+        }
+        break;
+    case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+#endif
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            bf_t a;
+            BOOL res;
+            bf_get_int32((int32_t *)&len, &p->num, BF_GET_INT_MOD);
+            bf_init(ctx->bf_ctx, &a);
+            bf_set_ui(&a, len);
+            res = bf_cmp_eq(&a, &p->num);
+            bf_delete(&a);
+            JS_FreeValue(ctx, val);
+            if (!res)
+                goto fail;
+        }
+        break;
+    default:
+        if (JS_TAG_IS_FLOAT64(tag)) {
+            double d;
+            d = JS_VALUE_GET_FLOAT64(val);
+            if (!(d >= 0 && d <= UINT32_MAX))
+                goto fail;
+            len = (uint32_t)d;
+            if (len != d)
+                goto fail;
+        } else {
+            uint32_t len1;
+
+            if (is_array_ctor) {
+                val = JS_ToNumberFree(ctx, val);
+                if (JS_IsException(val))
+                    return -1;
+                /* cannot recurse because val is a number */
+                if (JS_ToArrayLengthFree(ctx, &len, val, TRUE))
+                    return -1;
+            } else {
+                /* legacy behavior: must do the conversion twice and compare */
+                if (JS_ToUint32(ctx, &len, val)) {
+                    JS_FreeValue(ctx, val);
+                    return -1;
+                }
+                val = JS_ToNumberFree(ctx, val);
+                if (JS_IsException(val))
+                    return -1;
+                /* cannot recurse because val is a number */
+                if (JS_ToArrayLengthFree(ctx, &len1, val, FALSE))
+                    return -1;
+                if (len1 != len) {
+                fail:
+                    JS_ThrowRangeError(ctx, "invalid array length");
+                    return -1;
+                }
+            }
+        }
+        break;
+    }
+    *plen = len;
+    return 0;
+}
+
+#define MAX_SAFE_INTEGER (((int64_t)1 << 53) - 1)
+
+static BOOL is_safe_integer(double d)
+{
+    return isfinite(d) && floor(d) == d &&
+        fabs(d) <= (double)MAX_SAFE_INTEGER;
+}
+
+int JS_ToIndex(JSContext *ctx, uint64_t *plen, JSValueConst val)
+{
+    int64_t v;
+    if (JS_ToInt64Sat(ctx, &v, val))
+        return -1;
+    if (v < 0 || v > MAX_SAFE_INTEGER) {
+        JS_ThrowRangeError(ctx, "invalid array index");
+        *plen = 0;
+        return -1;
+    }
+    *plen = v;
+    return 0;
+}
+
+/* convert a value to a length between 0 and MAX_SAFE_INTEGER.
+   return -1 for exception */
+static __exception int JS_ToLengthFree(JSContext *ctx, int64_t *plen,
+                                       JSValue val)
+{
+    int res = JS_ToInt64Clamp(ctx, plen, val, 0, MAX_SAFE_INTEGER, 0);
+    JS_FreeValue(ctx, val);
+    return res;
+}
+
+/* Note: can return an exception */
+static int JS_NumberIsInteger(JSContext *ctx, JSValueConst val)
+{
+    double d;
+    if (!JS_IsNumber(val))
+        return FALSE;
+    if (unlikely(JS_ToFloat64(ctx, &d, val)))
+        return -1;
+    return isfinite(d) && floor(d) == d;
+}
+
+static BOOL JS_NumberIsNegativeOrMinusZero(JSContext *ctx, JSValueConst val)
+{
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+        {
+            int v;
+            v = JS_VALUE_GET_INT(val);
+            return (v < 0);
+        }
+    case JS_TAG_FLOAT64:
+        {
+            JSFloat64Union u;
+            u.d = JS_VALUE_GET_FLOAT64(val);
+            return (u.u64 >> 63);
+        }
+    case JS_TAG_BIG_INT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            /* Note: integer zeros are not necessarily positive */
+            return p->num.sign && !bf_is_zero(&p->num);
+        }
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            return p->num.sign;
+        }
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *p = JS_VALUE_GET_PTR(val);
+            return p->num.sign;
+        }
+        break;
+#endif
+    default:
+        return FALSE;
+    }
+}
+
+static JSValue js_bigint_to_string1(JSContext *ctx, JSValueConst val, int radix)
+{
+    JSValue ret;
+    bf_t a_s, *a;
+    char *str;
+    int saved_sign;
+
+    a = JS_ToBigInt(ctx, &a_s, val);
+    if (!a)
+        return JS_EXCEPTION;
+    saved_sign = a->sign;
+    if (a->expn == BF_EXP_ZERO)
+        a->sign = 0;
+    str = bf_ftoa(NULL, a, radix, 0, BF_RNDZ | BF_FTOA_FORMAT_FRAC |
+                  BF_FTOA_JS_QUIRKS);
+    a->sign = saved_sign;
+    JS_FreeBigInt(ctx, a, &a_s);
+    if (!str)
+        return JS_ThrowOutOfMemory(ctx);
+    ret = JS_NewString(ctx, str);
+    bf_free(ctx->bf_ctx, str);
+    return ret;
+}
+
+static JSValue js_bigint_to_string(JSContext *ctx, JSValueConst val)
+{
+    return js_bigint_to_string1(ctx, val, 10);
+}
+
+#ifdef CONFIG_BIGNUM
+
+static JSValue js_ftoa(JSContext *ctx, JSValueConst val1, int radix,
+                       limb_t prec, bf_flags_t flags)
+{
+    JSValue val, ret;
+    bf_t a_s, *a;
+    char *str;
+    int saved_sign;
+
+    val = JS_ToNumeric(ctx, val1);
+    if (JS_IsException(val))
+        return val;
+    a = JS_ToBigFloat(ctx, &a_s, val);
+    if (!a) {
+        JS_FreeValue(ctx, val);
+        return JS_EXCEPTION;
+    }
+    saved_sign = a->sign;
+    if (a->expn == BF_EXP_ZERO)
+        a->sign = 0;
+    flags |= BF_FTOA_JS_QUIRKS;
+    if ((flags & BF_FTOA_FORMAT_MASK) == BF_FTOA_FORMAT_FREE_MIN) {
+        /* Note: for floating point numbers with a radix which is not
+           a power of two, the current precision is used to compute
+           the number of digits. */
+        if ((radix & (radix - 1)) != 0) {
+            bf_t r_s, *r = &r_s;
+            int prec, flags1;
+            /* must round first */
+            if (JS_VALUE_GET_TAG(val) == JS_TAG_BIG_FLOAT) {
+                prec = ctx->fp_env.prec;
+                flags1 = ctx->fp_env.flags &
+                    (BF_FLAG_SUBNORMAL | (BF_EXP_BITS_MASK << BF_EXP_BITS_SHIFT));
+            } else {
+                prec = 53;
+                flags1 = bf_set_exp_bits(11) | BF_FLAG_SUBNORMAL;
+            }
+            bf_init(ctx->bf_ctx, r);
+            bf_set(r, a);
+            bf_round(r, prec, flags1 | BF_RNDN);
+            str = bf_ftoa(NULL, r, radix, prec, flags1 | flags);
+            bf_delete(r);
+        } else {
+            str = bf_ftoa(NULL, a, radix, BF_PREC_INF, flags);
+        }
+    } else {
+        str = bf_ftoa(NULL, a, radix, prec, flags);
+    }
+    a->sign = saved_sign;
+    if (a == &a_s)
+        bf_delete(a);
+    JS_FreeValue(ctx, val);
+    if (!str)
+        return JS_ThrowOutOfMemory(ctx);
+    ret = JS_NewString(ctx, str);
+    bf_free(ctx->bf_ctx, str);
+    return ret;
+}
+
+static JSValue js_bigfloat_to_string(JSContext *ctx, JSValueConst val)
+{
+    return js_ftoa(ctx, val, 10, 0, BF_RNDN | BF_FTOA_FORMAT_FREE_MIN);
+}
+
+static JSValue js_bigdecimal_to_string1(JSContext *ctx, JSValueConst val,
+                                        limb_t prec, int flags)
+{
+    JSValue ret;
+    bfdec_t *a;
+    char *str;
+    int saved_sign;
+
+    a = JS_ToBigDecimal(ctx, val);
+    if (!a)
+        return JS_EXCEPTION;
+    saved_sign = a->sign;
+    if (a->expn == BF_EXP_ZERO)
+        a->sign = 0;
+    str = bfdec_ftoa(NULL, a, prec, flags | BF_FTOA_JS_QUIRKS);
+    a->sign = saved_sign;
+    if (!str)
+        return JS_ThrowOutOfMemory(ctx);
+    ret = JS_NewString(ctx, str);
+    bf_free(ctx->bf_ctx, str);
+    return ret;
+}
+
+static JSValue js_bigdecimal_to_string(JSContext *ctx, JSValueConst val)
+{
+    return js_bigdecimal_to_string1(ctx, val, 0,
+                                    BF_RNDZ | BF_FTOA_FORMAT_FREE);
+}
+
+#endif /* CONFIG_BIGNUM */
+
+/* 2 <= base <= 36 */
+static char const digits[36] = "0123456789abcdefghijklmnopqrstuvwxyz";
+
+static char *i64toa(char *buf_end, int64_t n, unsigned int base)
+{
+    char *q = buf_end;
+    int digit, is_neg;
+
+    is_neg = 0;
+    if (n < 0) {
+        is_neg = 1;
+        n = -n;
+    }
+    *--q = '\0';
+    if (base == 10) {
+        /* division by known base uses multiplication */
+        do {
+            digit = (uint64_t)n % 10;
+            n = (uint64_t)n / 10;
+            *--q = '0' + digit;
+        } while (n != 0);
+    } else {
+        do {
+            digit = (uint64_t)n % base;
+            n = (uint64_t)n / base;
+            *--q = digits[digit];
+        } while (n != 0);
+    }
+    if (is_neg)
+        *--q = '-';
+    return q;
+}
+
+/* buf1 contains the printf result */
+static void js_ecvt1(double d, int n_digits, int *decpt, int *sign, char *buf,
+                     int rounding_mode, char *buf1, int buf1_size)
+{
+    if (rounding_mode != FE_TONEAREST)
+        fesetround(rounding_mode);
+    snprintf(buf1, buf1_size, "%+.*e", n_digits - 1, d);
+    if (rounding_mode != FE_TONEAREST)
+        fesetround(FE_TONEAREST);
+    *sign = (buf1[0] == '-');
+    /* mantissa */
+    buf[0] = buf1[1];
+    if (n_digits > 1)
+        memcpy(buf + 1, buf1 + 3, n_digits - 1);
+    buf[n_digits] = '\0';
+    /* exponent */
+    *decpt = atoi(buf1 + n_digits + 2 + (n_digits > 1)) + 1;
+}
+
+/* maximum buffer size for js_dtoa */
+#define JS_DTOA_BUF_SIZE 128
+
+/* needed because ecvt usually limits the number of digits to
+   17. Return the number of digits. */
+static int js_ecvt(double d, int n_digits, int *decpt, int *sign, char *buf,
+                   BOOL is_fixed)
+{
+    int rounding_mode;
+    char buf_tmp[JS_DTOA_BUF_SIZE];
+
+    if (!is_fixed) {
+        unsigned int n_digits_min, n_digits_max;
+        /* find the minimum amount of digits (XXX: inefficient but simple) */
+        n_digits_min = 1;
+        n_digits_max = 17;
+        while (n_digits_min < n_digits_max) {
+            n_digits = (n_digits_min + n_digits_max) / 2;
+            js_ecvt1(d, n_digits, decpt, sign, buf, FE_TONEAREST,
+                     buf_tmp, sizeof(buf_tmp));
+            if (safe_strtod(buf_tmp, NULL) == d) {
+                /* no need to keep the trailing zeros */
+                while (n_digits >= 2 && buf[n_digits - 1] == '0')
+                    n_digits--;
+                n_digits_max = n_digits;
+            } else {
+                n_digits_min = n_digits + 1;
+            }
+        }
+        n_digits = n_digits_max;
+        rounding_mode = FE_TONEAREST;
+    } else {
+        rounding_mode = FE_TONEAREST;
+#ifdef CONFIG_PRINTF_RNDN
+        {
+            char buf1[JS_DTOA_BUF_SIZE], buf2[JS_DTOA_BUF_SIZE];
+            int decpt1, sign1, decpt2, sign2;
+            /* The JS rounding is specified as round to nearest ties away
+               from zero (RNDNA), but in printf the "ties" case is not
+               specified (for example it is RNDN for glibc, RNDNA for
+               Windows), so we must round manually. */
+            js_ecvt1(d, n_digits + 1, &decpt1, &sign1, buf1, FE_TONEAREST,
+                     buf_tmp, sizeof(buf_tmp));
+            /* XXX: could use 2 digits to reduce the average running time */
+            if (buf1[n_digits] == '5') {
+                js_ecvt1(d, n_digits + 1, &decpt1, &sign1, buf1, FE_DOWNWARD,
+                         buf_tmp, sizeof(buf_tmp));
+                js_ecvt1(d, n_digits + 1, &decpt2, &sign2, buf2, FE_UPWARD,
+                         buf_tmp, sizeof(buf_tmp));
+                if (memcmp(buf1, buf2, n_digits + 1) == 0 && decpt1 == decpt2) {
+                    /* exact result: round away from zero */
+                    if (sign1)
+                        rounding_mode = FE_DOWNWARD;
+                    else
+                        rounding_mode = FE_UPWARD;
+                }
+            }
+        }
+#endif /* CONFIG_PRINTF_RNDN */
+    }
+    js_ecvt1(d, n_digits, decpt, sign, buf, rounding_mode,
+             buf_tmp, sizeof(buf_tmp));
+    return n_digits;
+}
+
+static int js_fcvt1(char (*buf)[JS_DTOA_BUF_SIZE], double d, int n_digits,
+                    int rounding_mode)
+{
+    int n;
+    if (rounding_mode != FE_TONEAREST)
+        fesetround(rounding_mode);
+    n = snprintf(*buf, sizeof(*buf), "%.*f", n_digits, d);
+    if (rounding_mode != FE_TONEAREST)
+        fesetround(FE_TONEAREST);
+    assert(n < sizeof(*buf));
+    return n;
+}
+
+static void js_fcvt(char (*buf)[JS_DTOA_BUF_SIZE], double d, int n_digits)
+{
+    int rounding_mode;
+    rounding_mode = FE_TONEAREST;
+#ifdef CONFIG_PRINTF_RNDN
+    {
+        int n1, n2;
+        char buf1[JS_DTOA_BUF_SIZE];
+        char buf2[JS_DTOA_BUF_SIZE];
+
+        /* The JS rounding is specified as round to nearest ties away from
+           zero (RNDNA), but in printf the "ties" case is not specified
+           (for example it is RNDN for glibc, RNDNA for Windows), so we
+           must round manually. */
+        n1 = js_fcvt1(&buf1, d, n_digits + 1, FE_TONEAREST);
+        rounding_mode = FE_TONEAREST;
+        /* XXX: could use 2 digits to reduce the average running time */
+        if (buf1[n1 - 1] == '5') {
+            n1 = js_fcvt1(&buf1, d, n_digits + 1, FE_DOWNWARD);
+            n2 = js_fcvt1(&buf2, d, n_digits + 1, FE_UPWARD);
+            if (n1 == n2 && memcmp(buf1, buf2, n1) == 0) {
+                /* exact result: round away from zero */
+                if (buf1[0] == '-')
+                    rounding_mode = FE_DOWNWARD;
+                else
+                    rounding_mode = FE_UPWARD;
+            }
+        }
+    }
+#endif /* CONFIG_PRINTF_RNDN */
+    js_fcvt1(buf, d, n_digits, rounding_mode);
+}
+
+/* radix != 10 is only supported with flags = JS_DTOA_VAR_FORMAT */
+/* use as many digits as necessary */
+#define JS_DTOA_VAR_FORMAT   (0 << 0)
+/* use n_digits significant digits (1 <= n_digits <= 101) */
+#define JS_DTOA_FIXED_FORMAT (1 << 0)
+/* force fractional format: [-]dd.dd with n_digits fractional digits */
+#define JS_DTOA_FRAC_FORMAT  (2 << 0)
+/* force exponential notation either in fixed or variable format */
+#define JS_DTOA_FORCE_EXP    (1 << 2)
+
+/* XXX: slow and maybe not fully correct. Use libbf when it is fast enough.
+   XXX: radix != 10 is only supported for small integers
+*/
+static void js_dtoa1(char (*buf)[JS_DTOA_BUF_SIZE], double d,
+                     int radix, int n_digits, int flags)
+{
+    char *q;
+
+    if (!isfinite(d)) {
+        if (isnan(d)) {
+            pstrcpy(*buf, sizeof(*buf), "NaN");
+        } else if (d < 0) {
+            pstrcpy(*buf, sizeof(*buf), "-Infinity");
+        } else {
+            pstrcpy(*buf, sizeof(*buf), "Infinity");
+        }
+    } else if (flags == JS_DTOA_VAR_FORMAT) {
+        int64_t i64;
+        char buf1[70], *ptr;
+        if (d > (double)MAX_SAFE_INTEGER || d < (double)-MAX_SAFE_INTEGER)
+            goto generic_conv;
+        i64 = (int64_t)d;
+        if (d != i64)
+            goto generic_conv;
+        /* fast path for integers */
+        ptr = i64toa(buf1 + sizeof(buf1), i64, radix);
+        pstrcpy(*buf, sizeof(*buf), ptr);
+    } else {
+        if (d == 0.0)
+            d = 0.0; /* convert -0 to 0 */
+        if (flags == JS_DTOA_FRAC_FORMAT) {
+            js_fcvt(buf, d, n_digits);
+        } else {
+            char buf1[JS_DTOA_BUF_SIZE];
+            int sign, decpt, k, n, i, p, n_max;
+            BOOL is_fixed;
+        generic_conv:
+            is_fixed = ((flags & 3) == JS_DTOA_FIXED_FORMAT);
+            if (is_fixed) {
+                n_max = n_digits;
+            } else {
+                n_max = 21;
+            }
+            /* the number has k digits (k >= 1) */
+            k = js_ecvt(d, n_digits, &decpt, &sign, buf1, is_fixed);
+            n = decpt; /* d=10^(n-k)*(buf1) i.e. d= < x.yyyy 10^(n-1) */
+            q = *buf;
+            if (sign)
+                *q++ = '-';
+            if (flags & JS_DTOA_FORCE_EXP)
+                goto force_exp;
+            if (n >= 1 && n <= n_max) {
+                if (k <= n) {
+                    memcpy(q, buf1, k);
+                    q += k;
+                    for(i = 0; i < (n - k); i++)
+                        *q++ = '0';
+                    *q = '\0';
+                } else {
+                    /* k > n */
+                    memcpy(q, buf1, n);
+                    q += n;
+                    *q++ = '.';
+                    for(i = 0; i < (k - n); i++)
+                        *q++ = buf1[n + i];
+                    *q = '\0';
+                }
+            } else if (n >= -5 && n <= 0) {
+                *q++ = '0';
+                *q++ = '.';
+                for(i = 0; i < -n; i++)
+                    *q++ = '0';
+                memcpy(q, buf1, k);
+                q += k;
+                *q = '\0';
+            } else {
+            force_exp:
+                /* exponential notation */
+                *q++ = buf1[0];
+                if (k > 1) {
+                    *q++ = '.';
+                    for(i = 1; i < k; i++)
+                        *q++ = buf1[i];
+                }
+                *q++ = 'e';
+                p = n - 1;
+                if (p >= 0)
+                    *q++ = '+';
+                snprintf(q, *buf + sizeof(*buf) - q, "%d", p);
+            }
+        }
+    }
+}
+
+static JSValue js_dtoa(JSContext *ctx,
+                       double d, int radix, int n_digits, int flags)
+{
+    char buf[JS_DTOA_BUF_SIZE];
+    js_dtoa1(&buf, d, radix, n_digits, flags);
+    return JS_NewString(ctx, buf);
+}
+
+static JSValue js_dtoa_radix(JSContext *ctx, double d, int radix)
+{
+    char buf[2200], *ptr, *ptr2;
+    /* d is finite */
+    int sign = d < 0;
+    int digit;
+    double frac, d0;
+    int64_t n0 = 0;
+    d = fabs(d);
+    d0 = trunc(d);
+    frac = d - d0;
+    ptr = buf + 1100;
+    *ptr = '\0';
+    if (d0 <= MAX_SAFE_INTEGER) {
+        int64_t n = n0 = (int64_t)d0;
+        while (n >= radix) {
+            digit = n % radix;
+            n = n / radix;
+            *--ptr = digits[digit];
+        }
+        *--ptr = digits[(int)n];
+    } else {
+        /* no decimals */
+        while (d0 >= radix) {
+            digit = fmod(d0, radix);
+            d0 = trunc(d0 / radix);
+            if (d0 >= MAX_SAFE_INTEGER)
+                digit = 0;
+            *--ptr = digits[digit];
+        }
+        *--ptr = digits[(int)d0];
+        goto done;
+    }
+    if (frac != 0) {
+        double log2_radix = log2(radix);
+        double prec = 1023 + 51;  // handle subnormals
+        ptr2 = buf + 1100;
+        *ptr2++ = '.';
+        while (frac != 0 && n0 <= MAX_SAFE_INTEGER/2 && prec > 0) {
+            frac *= radix;
+            digit = trunc(frac);
+            frac -= digit;
+            *ptr2++ = digits[digit];
+            n0 = n0 * radix + digit;
+            prec -= log2_radix;
+        }
+        *ptr2 = '\0';
+        if (frac * radix >= radix / 2) {
+            char nine = digits[radix - 1];
+            // round to closest
+            while (ptr2[-1] == nine)
+                *--ptr2 = '\0';
+            if (ptr2[-1] == '.') {
+                *--ptr2 = '\0';
+                while (ptr2[-1] == nine)
+                    *--ptr2 = '0';
+            }
+            if (ptr2 - 1 == ptr)
+                *--ptr = '1';
+            else
+                ptr2[-1] += 1;
+        } else {
+            while (ptr2[-1] == '0')
+                *--ptr2 = '\0';
+            if (ptr2[-1] == '.')
+                *--ptr2 = '\0';
+        }
+    }
+done:
+    ptr[-1] = '-';
+    ptr -= sign;
+    return JS_NewString(ctx, ptr);
+}
+
+JSValue JS_ToStringInternal(JSContext *ctx, JSValueConst val, BOOL is_ToPropertyKey)
+{
+    uint32_t tag;
+    const char *str;
+    char buf[32];
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_STRING:
+        return JS_DupValue(ctx, val);
+    case JS_TAG_INT:
+        snprintf(buf, sizeof(buf), "%d", JS_VALUE_GET_INT(val));
+        str = buf;
+        goto new_string;
+    case JS_TAG_BOOL:
+        return JS_AtomToString(ctx, JS_VALUE_GET_BOOL(val) ?
+                          JS_ATOM_true : JS_ATOM_false);
+    case JS_TAG_NULL:
+        return JS_AtomToString(ctx, JS_ATOM_null);
+    case JS_TAG_UNDEFINED:
+        return JS_AtomToString(ctx, JS_ATOM_undefined);
+    case JS_TAG_EXCEPTION:
+        return JS_EXCEPTION;
+    case JS_TAG_OBJECT:
+        {
+            JSValue val1, ret;
+            val1 = JS_ToPrimitive(ctx, val, HINT_STRING);
+            if (JS_IsException(val1))
+                return val1;
+            ret = JS_ToStringInternal(ctx, val1, is_ToPropertyKey);
+            JS_FreeValue(ctx, val1);
+            return ret;
+        }
+        break;
+    case JS_TAG_FUNCTION_BYTECODE:
+        str = "[function bytecode]";
+        goto new_string;
+    case JS_TAG_SYMBOL:
+        if (is_ToPropertyKey) {
+            return JS_DupValue(ctx, val);
+        } else {
+            return JS_ThrowTypeError(ctx, "cannot convert symbol to string");
+        }
+    case JS_TAG_FLOAT64:
+        return js_dtoa(ctx, JS_VALUE_GET_FLOAT64(val), 10, 0,
+                       JS_DTOA_VAR_FORMAT);
+    case JS_TAG_BIG_INT:
+        return ctx->rt->bigint_ops.to_string(ctx, val);
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        return ctx->rt->bigfloat_ops.to_string(ctx, val);
+    case JS_TAG_BIG_DECIMAL:
+        return ctx->rt->bigdecimal_ops.to_string(ctx, val);
+#endif
+    default:
+        str = "[unsupported type]";
+    new_string:
+        return JS_NewString(ctx, str);
+    }
+}
+
+JSValue JS_ToString(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToStringInternal(ctx, val, FALSE);
+}
+
+static JSValue JS_ToStringFree(JSContext *ctx, JSValue val)
+{
+    JSValue ret;
+    ret = JS_ToString(ctx, val);
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue JS_ToLocaleStringFree(JSContext *ctx, JSValue val)
+{
+    if (JS_IsUndefined(val) || JS_IsNull(val))
+        return JS_ToStringFree(ctx, val);
+    return JS_InvokeFree(ctx, val, JS_ATOM_toLocaleString, 0, NULL);
+}
+
+JSValue JS_ToPropertyKey(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToStringInternal(ctx, val, TRUE);
+}
+
+static JSValue JS_ToStringCheckObject(JSContext *ctx, JSValueConst val)
+{
+    uint32_t tag = JS_VALUE_GET_TAG(val);
+    if (tag == JS_TAG_NULL || tag == JS_TAG_UNDEFINED)
+        return JS_ThrowTypeError(ctx, "null or undefined are forbidden");
+    return JS_ToString(ctx, val);
+}
+
+static JSValue JS_ToQuotedString(JSContext *ctx, JSValueConst val1)
+{
+    JSValue val;
+    JSString *p;
+    int i;
+    uint32_t c;
+    StringBuffer b_s, *b = &b_s;
+    char buf[16];
+
+    val = JS_ToStringCheckObject(ctx, val1);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+
+    if (string_buffer_init(ctx, b, p->len + 2))
+        goto fail;
+
+    if (string_buffer_putc8(b, '\"'))
+        goto fail;
+    for(i = 0; i < p->len; ) {
+        c = string_getc(p, &i);
+        switch(c) {
+        case '\t':
+            c = 't';
+            goto quote;
+        case '\r':
+            c = 'r';
+            goto quote;
+        case '\n':
+            c = 'n';
+            goto quote;
+        case '\b':
+            c = 'b';
+            goto quote;
+        case '\f':
+            c = 'f';
+            goto quote;
+        case '\"':
+        case '\\':
+        quote:
+            if (string_buffer_putc8(b, '\\'))
+                goto fail;
+            if (string_buffer_putc8(b, c))
+                goto fail;
+            break;
+        default:
+            if (c < 32 || is_surrogate(c)) {
+                snprintf(buf, sizeof(buf), "\\u%04x", c);
+                if (string_buffer_puts8(b, buf))
+                    goto fail;
+            } else {
+                if (string_buffer_putc(b, c))
+                    goto fail;
+            }
+            break;
+        }
+    }
+    if (string_buffer_putc8(b, '\"'))
+        goto fail;
+    JS_FreeValue(ctx, val);
+    return string_buffer_end(b);
+ fail:
+    JS_FreeValue(ctx, val);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static __maybe_unused void JS_DumpObjectHeader(JSRuntime *rt)
+{
+    printf("%14s %4s %4s %14s %10s %s\n",
+           "ADDRESS", "REFS", "SHRF", "PROTO", "CLASS", "PROPS");
+}
+
+/* for debug only: dump an object without side effect */
+static __maybe_unused void JS_DumpObject(JSRuntime *rt, JSObject *p)
+{
+    uint32_t i;
+    char atom_buf[ATOM_GET_STR_BUF_SIZE];
+    JSShape *sh;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    BOOL is_first = TRUE;
+
+    /* XXX: should encode atoms with special characters */
+    sh = p->shape; /* the shape can be NULL while freeing an object */
+    printf("%14p %4d ",
+           (void *)p,
+           p->header.ref_count);
+    if (sh) {
+        printf("%3d%c %14p ",
+               sh->header.ref_count,
+               " *"[sh->is_hashed],
+               (void *)sh->proto);
+    } else {
+        printf("%3s  %14s ", "-", "-");
+    }
+    printf("%10s ",
+           JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf), rt->class_array[p->class_id].class_name));
+    if (p->is_exotic && p->fast_array) {
+        printf("[ ");
+        for(i = 0; i < p->u.array.count; i++) {
+            if (i != 0)
+                printf(", ");
+            switch (p->class_id) {
+            case JS_CLASS_ARRAY:
+            case JS_CLASS_ARGUMENTS:
+                JS_DumpValueShort(rt, p->u.array.u.values[i]);
+                break;
+            case JS_CLASS_UINT8C_ARRAY:
+            case JS_CLASS_INT8_ARRAY:
+            case JS_CLASS_UINT8_ARRAY:
+            case JS_CLASS_INT16_ARRAY:
+            case JS_CLASS_UINT16_ARRAY:
+            case JS_CLASS_INT32_ARRAY:
+            case JS_CLASS_UINT32_ARRAY:
+            case JS_CLASS_BIG_INT64_ARRAY:
+            case JS_CLASS_BIG_UINT64_ARRAY:
+            case JS_CLASS_FLOAT32_ARRAY:
+            case JS_CLASS_FLOAT64_ARRAY:
+                {
+                    int size = 1 << typed_array_size_log2(p->class_id);
+                    const uint8_t *b = p->u.array.u.uint8_ptr + i * size;
+                    while (size-- > 0)
+                        printf("%02X", *b++);
+                }
+                break;
+            }
+        }
+        printf(" ] ");
+    }
+
+    if (sh) {
+        printf("{ ");
+        for(i = 0, prs = get_shape_prop(sh); i < sh->prop_count; i++, prs++) {
+            if (prs->atom != JS_ATOM_NULL) {
+                pr = &p->prop[i];
+                if (!is_first)
+                    printf(", ");
+                printf("%s: ",
+                       JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf), prs->atom));
+                if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                    printf("[getset %p %p]", (void *)pr->u.getset.getter,
+                           (void *)pr->u.getset.setter);
+                } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                    printf("[varref %p]", (void *)pr->u.var_ref);
+                } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+                    printf("[autoinit %p %d %p]",
+                           (void *)js_autoinit_get_realm(pr),
+                           js_autoinit_get_id(pr),
+                           (void *)pr->u.init.opaque);
+                } else {
+                    JS_DumpValueShort(rt, pr->u.value);
+                }
+                is_first = FALSE;
+            }
+        }
+        printf(" }");
+    }
+
+    if (js_class_has_bytecode(p->class_id)) {
+        JSFunctionBytecode *b = p->u.func.function_bytecode;
+        JSVarRef **var_refs;
+        if (b->closure_var_count) {
+            var_refs = p->u.func.var_refs;
+            printf(" Closure:");
+            for(i = 0; i < b->closure_var_count; i++) {
+                printf(" ");
+                JS_DumpValueShort(rt, var_refs[i]->value);
+            }
+            if (p->u.func.home_object) {
+                printf(" HomeObject: ");
+                JS_DumpValueShort(rt, JS_MKPTR(JS_TAG_OBJECT, p->u.func.home_object));
+            }
+        }
+    }
+    printf("\n");
+}
+
+static __maybe_unused void JS_DumpGCObject(JSRuntime *rt, JSGCObjectHeader *p)
+{
+    if (p->gc_obj_type == JS_GC_OBJ_TYPE_JS_OBJECT) {
+        JS_DumpObject(rt, (JSObject *)p);
+    } else {
+        printf("%14p %4d ",
+               (void *)p,
+               p->ref_count);
+        switch(p->gc_obj_type) {
+        case JS_GC_OBJ_TYPE_FUNCTION_BYTECODE:
+            printf("[function bytecode]");
+            break;
+        case JS_GC_OBJ_TYPE_SHAPE:
+            printf("[shape]");
+            break;
+        case JS_GC_OBJ_TYPE_VAR_REF:
+            printf("[var_ref]");
+            break;
+        case JS_GC_OBJ_TYPE_ASYNC_FUNCTION:
+            printf("[async_function]");
+            break;
+        case JS_GC_OBJ_TYPE_JS_CONTEXT:
+            printf("[js_context]");
+            break;
+        default:
+            printf("[unknown %d]", p->gc_obj_type);
+            break;
+        }
+        printf("\n");
+    }
+}
+
+static __maybe_unused void JS_DumpValueShort(JSRuntime *rt,
+                                                      JSValueConst val)
+{
+    uint32_t tag = JS_VALUE_GET_NORM_TAG(val);
+    const char *str;
+
+    switch(tag) {
+    case JS_TAG_INT:
+        printf("%d", JS_VALUE_GET_INT(val));
+        break;
+    case JS_TAG_BOOL:
+        if (JS_VALUE_GET_BOOL(val))
+            str = "true";
+        else
+            str = "false";
+        goto print_str;
+    case JS_TAG_NULL:
+        str = "null";
+        goto print_str;
+    case JS_TAG_EXCEPTION:
+        str = "exception";
+        goto print_str;
+    case JS_TAG_UNINITIALIZED:
+        str = "uninitialized";
+        goto print_str;
+    case JS_TAG_UNDEFINED:
+        str = "undefined";
+    print_str:
+        printf("%s", str);
+        break;
+    case JS_TAG_FLOAT64:
+        printf("%.14g", JS_VALUE_GET_FLOAT64(val));
+        break;
+    case JS_TAG_BIG_INT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            char *str;
+            str = bf_ftoa(NULL, &p->num, 10, 0,
+                          BF_RNDZ | BF_FTOA_FORMAT_FRAC);
+            printf("%sn", str);
+            bf_realloc(&rt->bf_ctx, str, 0);
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            char *str;
+            str = bf_ftoa(NULL, &p->num, 16, BF_PREC_INF,
+                          BF_RNDZ | BF_FTOA_FORMAT_FREE | BF_FTOA_ADD_PREFIX);
+            printf("%sl", str);
+            bf_free(&rt->bf_ctx, str);
+        }
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *p = JS_VALUE_GET_PTR(val);
+            char *str;
+            str = bfdec_ftoa(NULL, &p->num, BF_PREC_INF,
+                             BF_RNDZ | BF_FTOA_FORMAT_FREE);
+            printf("%sm", str);
+            bf_free(&rt->bf_ctx, str);
+        }
+        break;
+#endif
+    case JS_TAG_STRING:
+        {
+            JSString *p;
+            p = JS_VALUE_GET_STRING(val);
+            JS_DumpString(rt, p);
+        }
+        break;
+    case JS_TAG_FUNCTION_BYTECODE:
+        {
+            JSFunctionBytecode *b = JS_VALUE_GET_PTR(val);
+            char buf[ATOM_GET_STR_BUF_SIZE];
+            printf("[bytecode %s]", JS_AtomGetStrRT(rt, buf, sizeof(buf), b->func_name));
+        }
+        break;
+    case JS_TAG_OBJECT:
+        {
+            JSObject *p = JS_VALUE_GET_OBJ(val);
+            JSAtom atom = rt->class_array[p->class_id].class_name;
+            char atom_buf[ATOM_GET_STR_BUF_SIZE];
+            printf("[%s %p]",
+                   JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf), atom), (void *)p);
+        }
+        break;
+    case JS_TAG_SYMBOL:
+        {
+            JSAtomStruct *p = JS_VALUE_GET_PTR(val);
+            char atom_buf[ATOM_GET_STR_BUF_SIZE];
+            printf("Symbol(%s)",
+                   JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf), js_get_atom_index(rt, p)));
+        }
+        break;
+    case JS_TAG_MODULE:
+        printf("[module]");
+        break;
+    default:
+        printf("[unknown tag %d]", tag);
+        break;
+    }
+}
+
+static __maybe_unused void JS_DumpValue(JSContext *ctx,
+                                                 JSValueConst val)
+{
+    JS_DumpValueShort(ctx->rt, val);
+}
+
+static __maybe_unused void JS_PrintValue(JSContext *ctx,
+                                                  const char *str,
+                                                  JSValueConst val)
+{
+    printf("%s=", str);
+    JS_DumpValueShort(ctx->rt, val);
+    printf("\n");
+}
+
+/* return -1 if exception (proxy case) or TRUE/FALSE */
+// TODO: should take flags to make proxy resolution and exceptions optional
+int JS_IsArray(JSContext *ctx, JSValueConst val)
+{
+    if (js_resolve_proxy(ctx, &val, TRUE))
+        return -1;
+    if (JS_VALUE_GET_TAG(val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(val);
+        return p->class_id == JS_CLASS_ARRAY;
+    } else {
+        return FALSE;
+    }
+}
+
+static double js_pow(double a, double b)
+{
+    if (unlikely(!isfinite(b)) && fabs(a) == 1) {
+        /* not compatible with IEEE 754 */
+        return JS_FLOAT64_NAN;
+    } else {
+        return pow(a, b);
+    }
+}
+
+JSValue JS_NewBigInt64_1(JSContext *ctx, int64_t v)
+{
+    JSValue val;
+    bf_t *a;
+    val = JS_NewBigInt(ctx);
+    if (JS_IsException(val))
+        return val;
+    a = JS_GetBigInt(val);
+    if (bf_set_si(a, v)) {
+        JS_FreeValue(ctx, val);
+        return JS_ThrowOutOfMemory(ctx);
+    }
+    return val;
+}
+
+JSValue JS_NewBigInt64(JSContext *ctx, int64_t v)
+{
+    if (is_math_mode(ctx) &&
+        v >= -MAX_SAFE_INTEGER && v <= MAX_SAFE_INTEGER) {
+        return JS_NewInt64(ctx, v);
+    } else {
+        return JS_NewBigInt64_1(ctx, v);
+    }
+}
+
+JSValue JS_NewBigUint64(JSContext *ctx, uint64_t v)
+{
+    JSValue val;
+    if (is_math_mode(ctx) && v <= MAX_SAFE_INTEGER) {
+        val = JS_NewInt64(ctx, v);
+    } else {
+        bf_t *a;
+        val = JS_NewBigInt(ctx);
+        if (JS_IsException(val))
+            return val;
+        a = JS_GetBigInt(val);
+        if (bf_set_ui(a, v)) {
+            JS_FreeValue(ctx, val);
+            return JS_ThrowOutOfMemory(ctx);
+        }
+    }
+    return val;
+}
+
+/* return NaN if bad bigint literal */
+static JSValue JS_StringToBigInt(JSContext *ctx, JSValue val)
+{
+    const char *str, *p;
+    size_t len;
+    int flags;
+
+    str = JS_ToCStringLen(ctx, &len, val);
+    JS_FreeValue(ctx, val);
+    if (!str)
+        return JS_EXCEPTION;
+    p = str;
+    p += skip_spaces(p);
+    if ((p - str) == len) {
+        val = JS_NewBigInt64(ctx, 0);
+    } else {
+        flags = ATOD_INT_ONLY | ATOD_ACCEPT_BIN_OCT | ATOD_TYPE_BIG_INT;
+#ifdef CONFIG_BIGNUM
+        if (is_math_mode(ctx))
+            flags |= ATOD_MODE_BIGINT;
+#endif
+        val = js_atof(ctx, p, &p, 0, flags);
+        p += skip_spaces(p);
+        if (!JS_IsException(val)) {
+            if ((p - str) != len) {
+                JS_FreeValue(ctx, val);
+                val = JS_NAN;
+            }
+        }
+    }
+    JS_FreeCString(ctx, str);
+    return val;
+}
+
+static JSValue JS_StringToBigIntErr(JSContext *ctx, JSValue val)
+{
+    val = JS_StringToBigInt(ctx, val);
+    if (JS_VALUE_IS_NAN(val))
+        return JS_ThrowSyntaxError(ctx, "invalid bigint literal");
+    return val;
+}
+
+/* if the returned bigfloat is allocated it is equal to
+   'buf'. Otherwise it is a pointer to the bigfloat in 'val'. */
+static bf_t *JS_ToBigIntFree(JSContext *ctx, bf_t *buf, JSValue val)
+{
+    uint32_t tag;
+    bf_t *r;
+    JSBigFloat *p;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        if (!is_math_mode(ctx))
+            goto fail;
+        /* fall tru */
+    case JS_TAG_BOOL:
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        bf_set_si(r, JS_VALUE_GET_INT(val));
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (!is_math_mode(ctx))
+                goto fail;
+            if (!isfinite(d))
+                goto fail;
+            r = buf;
+            bf_init(ctx->bf_ctx, r);
+            d = trunc(d);
+            bf_set_float64(r, d);
+        }
+        break;
+    case JS_TAG_BIG_INT:
+        p = JS_VALUE_GET_PTR(val);
+        r = &p->num;
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        if (!is_math_mode(ctx))
+            goto fail;
+        p = JS_VALUE_GET_PTR(val);
+        if (!bf_is_finite(&p->num))
+            goto fail;
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        bf_set(r, &p->num);
+        bf_rint(r, BF_RNDZ);
+        JS_FreeValue(ctx, val);
+        break;
+#endif
+    case JS_TAG_STRING:
+        val = JS_StringToBigIntErr(ctx, val);
+        if (JS_IsException(val))
+            return NULL;
+        goto redo;
+    case JS_TAG_OBJECT:
+        val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
+        if (JS_IsException(val))
+            return NULL;
+        goto redo;
+    default:
+    fail:
+        JS_FreeValue(ctx, val);
+        JS_ThrowTypeError(ctx, "cannot convert to bigint");
+        return NULL;
+    }
+    return r;
+}
+
+static bf_t *JS_ToBigInt(JSContext *ctx, bf_t *buf, JSValueConst val)
+{
+    return JS_ToBigIntFree(ctx, buf, JS_DupValue(ctx, val));
+}
+
+static __maybe_unused JSValue JS_ToBigIntValueFree(JSContext *ctx, JSValue val)
+{
+    if (JS_VALUE_GET_TAG(val) == JS_TAG_BIG_INT) {
+        return val;
+    } else {
+        bf_t a_s, *a, *r;
+        int ret;
+        JSValue res;
+
+        res = JS_NewBigInt(ctx);
+        if (JS_IsException(res))
+            return JS_EXCEPTION;
+        a = JS_ToBigIntFree(ctx, &a_s, val);
+        if (!a) {
+            JS_FreeValue(ctx, res);
+            return JS_EXCEPTION;
+        }
+        r = JS_GetBigInt(res);
+        ret = bf_set(r, a);
+        JS_FreeBigInt(ctx, a, &a_s);
+        if (ret) {
+            JS_FreeValue(ctx, res);
+            return JS_ThrowOutOfMemory(ctx);
+        }
+        return JS_CompactBigInt(ctx, res);
+    }
+}
+
+/* free the bf_t allocated by JS_ToBigInt */
+static void JS_FreeBigInt(JSContext *ctx, bf_t *a, bf_t *buf)
+{
+    if (a == buf) {
+        bf_delete(a);
+    } else {
+        JSBigFloat *p = (JSBigFloat *)((uint8_t *)a -
+                                       offsetof(JSBigFloat, num));
+        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_BIG_INT, p));
+    }
+}
+
+/* XXX: merge with JS_ToInt64Free with a specific flag */
+static int JS_ToBigInt64Free(JSContext *ctx, int64_t *pres, JSValue val)
+{
+    bf_t a_s, *a;
+
+    a = JS_ToBigIntFree(ctx, &a_s, val);
+    if (!a) {
+        *pres = 0;
+        return -1;
+    }
+    bf_get_int64(pres, a, BF_GET_INT_MOD);
+    JS_FreeBigInt(ctx, a, &a_s);
+    return 0;
+}
+
+int JS_ToBigInt64(JSContext *ctx, int64_t *pres, JSValueConst val)
+{
+    return JS_ToBigInt64Free(ctx, pres, JS_DupValue(ctx, val));
+}
+
+static JSBigFloat *js_new_bf(JSContext *ctx)
+{
+    JSBigFloat *p;
+    p = js_malloc(ctx, sizeof(*p));
+    if (!p)
+        return NULL;
+    p->header.ref_count = 1;
+    bf_init(ctx->bf_ctx, &p->num);
+    return p;
+}
+
+static JSValue JS_NewBigInt(JSContext *ctx)
+{
+    JSBigFloat *p;
+    p = js_malloc(ctx, sizeof(*p));
+    if (!p)
+        return JS_EXCEPTION;
+    p->header.ref_count = 1;
+    bf_init(ctx->bf_ctx, &p->num);
+    return JS_MKPTR(JS_TAG_BIG_INT, p);
+}
+
+static JSValue JS_CompactBigInt1(JSContext *ctx, JSValue val,
+                                 BOOL convert_to_safe_integer)
+{
+    int64_t v;
+    bf_t *a;
+
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_BIG_INT)
+        return val; /* fail safe */
+    a = JS_GetBigInt(val);
+    if (convert_to_safe_integer && bf_get_int64(&v, a, 0) == 0 &&
+        v >= -MAX_SAFE_INTEGER && v <= MAX_SAFE_INTEGER) {
+        JS_FreeValue(ctx, val);
+        return JS_NewInt64(ctx, v);
+    } else if (a->expn == BF_EXP_ZERO && a->sign) {
+        JSBigFloat *p = JS_VALUE_GET_PTR(val);
+        assert(p->header.ref_count == 1);
+        a->sign = 0;
+    }
+    return val;
+}
+
+/* Convert the big int to a safe integer if in math mode. normalize
+   the zero representation. Could also be used to convert the bigint
+   to a short bigint value. The reference count of the value must be
+   1. Cannot fail */
+static JSValue JS_CompactBigInt(JSContext *ctx, JSValue val)
+{
+    return JS_CompactBigInt1(ctx, val, is_math_mode(ctx));
+}
+
+static JSValue throw_bf_exception(JSContext *ctx, int status)
+{
+    const char *str;
+    if (status & BF_ST_MEM_ERROR)
+        return JS_ThrowOutOfMemory(ctx);
+    if (status & BF_ST_DIVIDE_ZERO) {
+        str = "division by zero";
+    } else if (status & BF_ST_INVALID_OP) {
+        str = "invalid operation";
+    } else {
+        str = "integer overflow";
+    }
+    return JS_ThrowRangeError(ctx, "%s", str);
+}
+
+/* if the returned bigfloat is allocated it is equal to
+   'buf'. Otherwise it is a pointer to the bigfloat in 'val'. Return
+   NULL in case of error. */
+static bf_t *JS_ToBigFloat(JSContext *ctx, bf_t *buf, JSValueConst val)
+{
+    uint32_t tag;
+    bf_t *r;
+    JSBigFloat *p;
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        if (bf_set_si(r, JS_VALUE_GET_INT(val)))
+            goto fail;
+        break;
+    case JS_TAG_FLOAT64:
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        if (bf_set_float64(r, JS_VALUE_GET_FLOAT64(val))) {
+        fail:
+            bf_delete(r);
+            return NULL;
+        }
+        break;
+    case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+#endif
+        p = JS_VALUE_GET_PTR(val);
+        r = &p->num;
+        break;
+    case JS_TAG_UNDEFINED:
+    default:
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        bf_set_nan(r);
+        break;
+    }
+    return r;
+}
+
+#ifdef CONFIG_BIGNUM
+/* return NULL if invalid type */
+static bfdec_t *JS_ToBigDecimal(JSContext *ctx, JSValueConst val)
+{
+    uint32_t tag;
+    JSBigDecimal *p;
+    bfdec_t *r;
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_BIG_DECIMAL:
+        p = JS_VALUE_GET_PTR(val);
+        r = &p->num;
+        break;
+    default:
+        JS_ThrowTypeError(ctx, "bigdecimal expected");
+        r = NULL;
+        break;
+    }
+    return r;
+}
+
+static JSValue JS_NewBigFloat(JSContext *ctx)
+{
+    JSBigFloat *p;
+    p = js_malloc(ctx, sizeof(*p));
+    if (!p)
+        return JS_EXCEPTION;
+    p->header.ref_count = 1;
+    bf_init(ctx->bf_ctx, &p->num);
+    return JS_MKPTR(JS_TAG_BIG_FLOAT, p);
+}
+
+static JSValue JS_NewBigDecimal(JSContext *ctx)
+{
+    JSBigDecimal *p;
+    p = js_malloc(ctx, sizeof(*p));
+    if (!p)
+        return JS_EXCEPTION;
+    p->header.ref_count = 1;
+    bfdec_init(ctx->bf_ctx, &p->num);
+    return JS_MKPTR(JS_TAG_BIG_DECIMAL, p);
+}
+
+/* must be kept in sync with JSOverloadableOperatorEnum */
+/* XXX: use atoms ? */
+static const char js_overloadable_operator_names[JS_OVOP_COUNT][4] = {
+    "+",
+    "-",
+    "*",
+    "/",
+    "%",
+    "**",
+    "|",
+    "&",
+    "^",
+    "<<",
+    ">>",
+    ">>>",
+    "==",
+    "<",
+    "pos",
+    "neg",
+    "++",
+    "--",
+    "~",
+};
+
+static int get_ovop_from_opcode(OPCodeEnum op)
+{
+    switch(op) {
+    case OP_add:
+        return JS_OVOP_ADD;
+    case OP_sub:
+        return JS_OVOP_SUB;
+    case OP_mul:
+        return JS_OVOP_MUL;
+    case OP_div:
+        return JS_OVOP_DIV;
+    case OP_mod:
+    case OP_math_mod:
+        return JS_OVOP_MOD;
+    case OP_pow:
+        return JS_OVOP_POW;
+    case OP_or:
+        return JS_OVOP_OR;
+    case OP_and:
+        return JS_OVOP_AND;
+    case OP_xor:
+        return JS_OVOP_XOR;
+    case OP_shl:
+        return JS_OVOP_SHL;
+    case OP_sar:
+        return JS_OVOP_SAR;
+    case OP_shr:
+        return JS_OVOP_SHR;
+    case OP_eq:
+    case OP_neq:
+        return JS_OVOP_EQ;
+    case OP_lt:
+    case OP_lte:
+    case OP_gt:
+    case OP_gte:
+        return JS_OVOP_LESS;
+    case OP_plus:
+        return JS_OVOP_POS;
+    case OP_neg:
+        return JS_OVOP_NEG;
+    case OP_inc:
+        return JS_OVOP_INC;
+    case OP_dec:
+        return JS_OVOP_DEC;
+    default:
+        abort();
+    }
+}
+
+/* return NULL if not present */
+static JSObject *find_binary_op(JSBinaryOperatorDef *def,
+                                uint32_t operator_index,
+                                JSOverloadableOperatorEnum op)
+{
+    JSBinaryOperatorDefEntry *ent;
+    int i;
+    for(i = 0; i < def->count; i++) {
+        ent = &def->tab[i];
+        if (ent->operator_index == operator_index)
+            return ent->ops[op];
+    }
+    return NULL;
+}
+
+/* return -1 if exception, 0 if no operator overloading, 1 if
+   overloaded operator called */
+static __exception int js_call_binary_op_fallback(JSContext *ctx,
+                                                  JSValue *pret,
+                                                  JSValueConst op1,
+                                                  JSValueConst op2,
+                                                  OPCodeEnum op,
+                                                  BOOL is_numeric,
+                                                  int hint)
+{
+    JSValue opset1_obj, opset2_obj, method, ret, new_op1, new_op2;
+    JSOperatorSetData *opset1, *opset2;
+    JSOverloadableOperatorEnum ovop;
+    JSObject *p;
+    JSValueConst args[2];
+
+    if (!ctx->allow_operator_overloading)
+        return 0;
+
+    opset2_obj = JS_UNDEFINED;
+    opset1_obj = JS_GetProperty(ctx, op1, JS_ATOM_Symbol_operatorSet);
+    if (JS_IsException(opset1_obj))
+        goto exception;
+    if (JS_IsUndefined(opset1_obj))
+        return 0;
+    opset1 = JS_GetOpaque2(ctx, opset1_obj, JS_CLASS_OPERATOR_SET);
+    if (!opset1)
+        goto exception;
+
+    opset2_obj = JS_GetProperty(ctx, op2, JS_ATOM_Symbol_operatorSet);
+    if (JS_IsException(opset2_obj))
+        goto exception;
+    if (JS_IsUndefined(opset2_obj)) {
+        JS_FreeValue(ctx, opset1_obj);
+        return 0;
+    }
+    opset2 = JS_GetOpaque2(ctx, opset2_obj, JS_CLASS_OPERATOR_SET);
+    if (!opset2)
+        goto exception;
+
+    if (opset1->is_primitive && opset2->is_primitive) {
+        JS_FreeValue(ctx, opset1_obj);
+        JS_FreeValue(ctx, opset2_obj);
+        return 0;
+    }
+
+    ovop = get_ovop_from_opcode(op);
+
+    if (opset1->operator_counter == opset2->operator_counter) {
+        p = opset1->self_ops[ovop];
+    } else if (opset1->operator_counter > opset2->operator_counter) {
+        p = find_binary_op(&opset1->left, opset2->operator_counter, ovop);
+    } else {
+        p = find_binary_op(&opset2->right, opset1->operator_counter, ovop);
+    }
+    if (!p) {
+        JS_ThrowTypeError(ctx, "operator %s: no function defined",
+                          js_overloadable_operator_names[ovop]);
+        goto exception;
+    }
+
+    if (opset1->is_primitive) {
+        if (is_numeric) {
+            new_op1 = JS_ToNumeric(ctx, op1);
+        } else {
+            new_op1 = JS_ToPrimitive(ctx, op1, hint);
+        }
+        if (JS_IsException(new_op1))
+            goto exception;
+    } else {
+        new_op1 = JS_DupValue(ctx, op1);
+    }
+
+    if (opset2->is_primitive) {
+        if (is_numeric) {
+            new_op2 = JS_ToNumeric(ctx, op2);
+        } else {
+            new_op2 = JS_ToPrimitive(ctx, op2, hint);
+        }
+        if (JS_IsException(new_op2)) {
+            JS_FreeValue(ctx, new_op1);
+            goto exception;
+        }
+    } else {
+        new_op2 = JS_DupValue(ctx, op2);
+    }
+
+    /* XXX: could apply JS_ToPrimitive() if primitive type so that the
+       operator function does not get a value object */
+
+    method = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+    if (ovop == JS_OVOP_LESS && (op == OP_lte || op == OP_gt)) {
+        args[0] = new_op2;
+        args[1] = new_op1;
+    } else {
+        args[0] = new_op1;
+        args[1] = new_op2;
+    }
+    ret = JS_CallFree(ctx, method, JS_UNDEFINED, 2, args);
+    JS_FreeValue(ctx, new_op1);
+    JS_FreeValue(ctx, new_op2);
+    if (JS_IsException(ret))
+        goto exception;
+    if (ovop == JS_OVOP_EQ) {
+        BOOL res = JS_ToBoolFree(ctx, ret);
+        if (op == OP_neq)
+            res ^= 1;
+        ret = JS_NewBool(ctx, res);
+    } else if (ovop == JS_OVOP_LESS) {
+        if (JS_IsUndefined(ret)) {
+            ret = JS_FALSE;
+        } else {
+            BOOL res = JS_ToBoolFree(ctx, ret);
+            if (op == OP_lte || op == OP_gte)
+                res ^= 1;
+            ret = JS_NewBool(ctx, res);
+        }
+    }
+    JS_FreeValue(ctx, opset1_obj);
+    JS_FreeValue(ctx, opset2_obj);
+    *pret = ret;
+    return 1;
+ exception:
+    JS_FreeValue(ctx, opset1_obj);
+    JS_FreeValue(ctx, opset2_obj);
+    *pret = JS_UNDEFINED;
+    return -1;
+}
+
+/* try to call the operation on the operatorSet field of 'obj'. Only
+   used for "/" and "**" on the BigInt prototype in math mode */
+static __exception int js_call_binary_op_simple(JSContext *ctx,
+                                                JSValue *pret,
+                                                JSValueConst obj,
+                                                JSValueConst op1,
+                                                JSValueConst op2,
+                                                OPCodeEnum op)
+{
+    JSValue opset1_obj, method, ret, new_op1, new_op2;
+    JSOperatorSetData *opset1;
+    JSOverloadableOperatorEnum ovop;
+    JSObject *p;
+    JSValueConst args[2];
+
+    opset1_obj = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_operatorSet);
+    if (JS_IsException(opset1_obj))
+        goto exception;
+    if (JS_IsUndefined(opset1_obj))
+        return 0;
+    opset1 = JS_GetOpaque2(ctx, opset1_obj, JS_CLASS_OPERATOR_SET);
+    if (!opset1)
+        goto exception;
+    ovop = get_ovop_from_opcode(op);
+
+    p = opset1->self_ops[ovop];
+    if (!p) {
+        JS_FreeValue(ctx, opset1_obj);
+        return 0;
+    }
+
+    new_op1 = JS_ToNumeric(ctx, op1);
+    if (JS_IsException(new_op1))
+        goto exception;
+    new_op2 = JS_ToNumeric(ctx, op2);
+    if (JS_IsException(new_op2)) {
+        JS_FreeValue(ctx, new_op1);
+        goto exception;
+    }
+
+    method = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+    args[0] = new_op1;
+    args[1] = new_op2;
+    ret = JS_CallFree(ctx, method, JS_UNDEFINED, 2, args);
+    JS_FreeValue(ctx, new_op1);
+    JS_FreeValue(ctx, new_op2);
+    if (JS_IsException(ret))
+        goto exception;
+    JS_FreeValue(ctx, opset1_obj);
+    *pret = ret;
+    return 1;
+ exception:
+    JS_FreeValue(ctx, opset1_obj);
+    *pret = JS_UNDEFINED;
+    return -1;
+}
+
+/* return -1 if exception, 0 if no operator overloading, 1 if
+   overloaded operator called */
+static __exception int js_call_unary_op_fallback(JSContext *ctx,
+                                                 JSValue *pret,
+                                                 JSValueConst op1,
+                                                 OPCodeEnum op)
+{
+    JSValue opset1_obj, method, ret;
+    JSOperatorSetData *opset1;
+    JSOverloadableOperatorEnum ovop;
+    JSObject *p;
+
+    if (!ctx->allow_operator_overloading)
+        return 0;
+
+    opset1_obj = JS_GetProperty(ctx, op1, JS_ATOM_Symbol_operatorSet);
+    if (JS_IsException(opset1_obj))
+        goto exception;
+    if (JS_IsUndefined(opset1_obj))
+        return 0;
+    opset1 = JS_GetOpaque2(ctx, opset1_obj, JS_CLASS_OPERATOR_SET);
+    if (!opset1)
+        goto exception;
+    if (opset1->is_primitive) {
+        JS_FreeValue(ctx, opset1_obj);
+        return 0;
+    }
+
+    ovop = get_ovop_from_opcode(op);
+
+    p = opset1->self_ops[ovop];
+    if (!p) {
+        JS_ThrowTypeError(ctx, "no overloaded operator %s",
+                          js_overloadable_operator_names[ovop]);
+        goto exception;
+    }
+    method = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+    ret = JS_CallFree(ctx, method, JS_UNDEFINED, 1, &op1);
+    if (JS_IsException(ret))
+        goto exception;
+    JS_FreeValue(ctx, opset1_obj);
+    *pret = ret;
+    return 1;
+ exception:
+    JS_FreeValue(ctx, opset1_obj);
+    *pret = JS_UNDEFINED;
+    return -1;
+}
+
+static int js_unary_arith_bigfloat(JSContext *ctx,
+                                   JSValue *pres, OPCodeEnum op, JSValue op1)
+{
+    bf_t a_s, *r, *a;
+    int ret, v;
+    JSValue res;
+
+    if (op == OP_plus && !is_math_mode(ctx)) {
+        JS_ThrowTypeError(ctx, "bigfloat argument with unary +");
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+
+    res = JS_NewBigFloat(ctx);
+    if (JS_IsException(res)) {
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    r = JS_GetBigFloat(res);
+    a = JS_ToBigFloat(ctx, &a_s, op1);
+    if (!a) {
+        JS_FreeValue(ctx, res);
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    ret = 0;
+    switch(op) {
+    case OP_inc:
+    case OP_dec:
+        v = 2 * (op - OP_dec) - 1;
+        ret = bf_add_si(r, a, v, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case OP_plus:
+        ret = bf_set(r, a);
+        break;
+    case OP_neg:
+        ret = bf_set(r, a);
+        bf_neg(r);
+        break;
+    default:
+        abort();
+    }
+    if (a == &a_s)
+        bf_delete(a);
+    JS_FreeValue(ctx, op1);
+    if (unlikely(ret & BF_ST_MEM_ERROR)) {
+        JS_FreeValue(ctx, res);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = res;
+    return 0;
+}
+
+static int js_unary_arith_bigdecimal(JSContext *ctx,
+                                     JSValue *pres, OPCodeEnum op, JSValue op1)
+{
+    bfdec_t *r, *a;
+    int ret, v;
+    JSValue res;
+
+    if (op == OP_plus && !is_math_mode(ctx)) {
+        JS_ThrowTypeError(ctx, "bigdecimal argument with unary +");
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+
+    res = JS_NewBigDecimal(ctx);
+    if (JS_IsException(res)) {
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    r = JS_GetBigDecimal(res);
+    a = JS_ToBigDecimal(ctx, op1);
+    if (!a) {
+        JS_FreeValue(ctx, res);
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    ret = 0;
+    switch(op) {
+    case OP_inc:
+    case OP_dec:
+        v = 2 * (op - OP_dec) - 1;
+        ret = bfdec_add_si(r, a, v, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_plus:
+        ret = bfdec_set(r, a);
+        break;
+    case OP_neg:
+        ret = bfdec_set(r, a);
+        bfdec_neg(r);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeValue(ctx, op1);
+    if (unlikely(ret)) {
+        JS_FreeValue(ctx, res);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = res;
+    return 0;
+}
+
+#endif /* CONFIG_BIGNUM */
+
+static int js_unary_arith_bigint(JSContext *ctx,
+                                 JSValue *pres, OPCodeEnum op, JSValue op1)
+{
+    bf_t a_s, *r, *a;
+    int ret, v;
+    JSValue res;
+
+    if (op == OP_plus && !is_math_mode(ctx)) {
+        JS_ThrowTypeError(ctx, "bigint argument with unary +");
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    res = JS_NewBigInt(ctx);
+    if (JS_IsException(res)) {
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    r = JS_GetBigInt(res);
+    a = JS_ToBigInt(ctx, &a_s, op1);
+    if (!a) {
+        JS_FreeValue(ctx, res);
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    ret = 0;
+    switch(op) {
+    case OP_inc:
+    case OP_dec:
+        v = 2 * (op - OP_dec) - 1;
+        ret = bf_add_si(r, a, v, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_plus:
+        ret = bf_set(r, a);
+        break;
+    case OP_neg:
+        ret = bf_set(r, a);
+        bf_neg(r);
+        break;
+    case OP_not:
+        ret = bf_add_si(r, a, 1, BF_PREC_INF, BF_RNDZ);
+        bf_neg(r);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeBigInt(ctx, a, &a_s);
+    JS_FreeValue(ctx, op1);
+    if (unlikely(ret)) {
+        JS_FreeValue(ctx, res);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    res = JS_CompactBigInt(ctx, res);
+    *pres = res;
+    return 0;
+}
+
+static no_inline __exception int js_unary_arith_slow(JSContext *ctx,
+                                                     JSValue *sp,
+                                                     OPCodeEnum op)
+{
+    JSValue op1;
+    int v;
+    uint32_t tag;
+
+    op1 = sp[-1];
+    /* fast path for float64 */
+    if (JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(op1)))
+        goto handle_float64;
+#ifdef CONFIG_BIGNUM
+    if (JS_IsObject(op1)) {
+        JSValue val;
+        int ret = js_call_unary_op_fallback(ctx, &val, op1, op);
+        if (ret < 0)
+            return -1;
+        if (ret) {
+            JS_FreeValue(ctx, op1);
+            sp[-1] = val;
+            return 0;
+        }
+    }
+#endif
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1))
+        goto exception;
+    tag = JS_VALUE_GET_TAG(op1);
+    switch(tag) {
+    case JS_TAG_INT:
+        {
+            int64_t v64;
+            v64 = JS_VALUE_GET_INT(op1);
+            switch(op) {
+            case OP_inc:
+            case OP_dec:
+                v = 2 * (op - OP_dec) - 1;
+                v64 += v;
+                break;
+            case OP_plus:
+                break;
+            case OP_neg:
+                if (v64 == 0) {
+                    sp[-1] = JS_NewFloat64(ctx, -0.0);
+                    return 0;
+                } else {
+                    v64 = -v64;
+                }
+                break;
+            default:
+                abort();
+            }
+            sp[-1] = JS_NewInt64(ctx, v64);
+        }
+        break;
+    case JS_TAG_BIG_INT:
+    handle_bigint:
+        if (ctx->rt->bigint_ops.unary_arith(ctx, sp - 1, op, op1))
+            goto exception;
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        if (ctx->rt->bigfloat_ops.unary_arith(ctx, sp - 1, op, op1))
+            goto exception;
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        if (ctx->rt->bigdecimal_ops.unary_arith(ctx, sp - 1, op, op1))
+            goto exception;
+        break;
+#endif
+    default:
+    handle_float64:
+        {
+            double d;
+            if (is_math_mode(ctx))
+                goto handle_bigint;
+            d = JS_VALUE_GET_FLOAT64(op1);
+            switch(op) {
+            case OP_inc:
+            case OP_dec:
+                v = 2 * (op - OP_dec) - 1;
+                d += v;
+                break;
+            case OP_plus:
+                break;
+            case OP_neg:
+                d = -d;
+                break;
+            default:
+                abort();
+            }
+            sp[-1] = JS_NewFloat64(ctx, d);
+        }
+        break;
+    }
+    return 0;
+ exception:
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static __exception int js_post_inc_slow(JSContext *ctx,
+                                        JSValue *sp, OPCodeEnum op)
+{
+    JSValue op1;
+
+    /* XXX: allow custom operators */
+    op1 = sp[-1];
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1)) {
+        sp[-1] = JS_UNDEFINED;
+        return -1;
+    }
+    sp[-1] = op1;
+    sp[0] = JS_DupValue(ctx, op1);
+    return js_unary_arith_slow(ctx, sp + 1, op - OP_post_dec + OP_dec);
+}
+
+static no_inline int js_not_slow(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1;
+
+    op1 = sp[-1];
+#ifdef CONFIG_BIGNUM
+    if (JS_IsObject(op1)) {
+        JSValue val;
+        int ret = js_call_unary_op_fallback(ctx, &val, op1, OP_not);
+        if (ret < 0)
+            return -1;
+        if (ret) {
+            JS_FreeValue(ctx, op1);
+            sp[-1] = val;
+            return 0;
+        }
+    }
+#endif
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1))
+        goto exception;
+    if (is_math_mode(ctx) || JS_VALUE_GET_TAG(op1) == JS_TAG_BIG_INT) {
+        if (ctx->rt->bigint_ops.unary_arith(ctx, sp - 1, OP_not, op1))
+            goto exception;
+    } else {
+        int32_t v1;
+        if (unlikely(JS_ToInt32Free(ctx, &v1, op1)))
+            goto exception;
+        sp[-1] = JS_NewInt32(ctx, ~v1);
+    }
+    return 0;
+ exception:
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static int js_binary_arith_bigint(JSContext *ctx, OPCodeEnum op,
+                                  JSValue *pres, JSValue op1, JSValue op2)
+{
+    bf_t a_s, b_s, *r, *a, *b;
+    int ret;
+    JSValue res;
+
+    res = JS_NewBigInt(ctx);
+    if (JS_IsException(res))
+        goto fail;
+    a = JS_ToBigInt(ctx, &a_s, op1);
+    if (!a)
+        goto fail;
+    b = JS_ToBigInt(ctx, &b_s, op2);
+    if (!b) {
+        JS_FreeBigInt(ctx, a, &a_s);
+        goto fail;
+    }
+    r = JS_GetBigInt(res);
+    ret = 0;
+    switch(op) {
+    case OP_add:
+        ret = bf_add(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_sub:
+        ret = bf_sub(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_mul:
+        ret = bf_mul(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_div:
+        if (!is_math_mode(ctx)) {
+            bf_t rem_s, *rem = &rem_s;
+            bf_init(ctx->bf_ctx, rem);
+            ret = bf_divrem(r, rem, a, b, BF_PREC_INF, BF_RNDZ,
+                            BF_RNDZ);
+            bf_delete(rem);
+        } else {
+            goto math_mode_div_pow;
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case OP_math_mod:
+        /* Euclidian remainder */
+        ret = bf_rem(r, a, b, BF_PREC_INF, BF_RNDZ,
+                     BF_DIVREM_EUCLIDIAN) & BF_ST_INVALID_OP;
+        break;
+#endif
+    case OP_mod:
+        ret = bf_rem(r, a, b, BF_PREC_INF, BF_RNDZ,
+                     BF_RNDZ) & BF_ST_INVALID_OP;
+        break;
+    case OP_pow:
+        if (b->sign) {
+            if (!is_math_mode(ctx)) {
+                ret = BF_ST_INVALID_OP;
+            } else {
+            math_mode_div_pow:
+#ifdef CONFIG_BIGNUM
+                JS_FreeValue(ctx, res);
+                ret = js_call_binary_op_simple(ctx, &res, ctx->class_proto[JS_CLASS_BIG_INT], op1, op2, op);
+                if (ret != 0) {
+                    JS_FreeBigInt(ctx, a, &a_s);
+                    JS_FreeBigInt(ctx, b, &b_s);
+                    JS_FreeValue(ctx, op1);
+                    JS_FreeValue(ctx, op2);
+                    if (ret < 0) {
+                        return -1;
+                    } else {
+                        *pres = res;
+                        return 0;
+                    }
+                }
+                /* if no BigInt power operator defined, return a
+                   bigfloat */
+                res = JS_NewBigFloat(ctx);
+                if (JS_IsException(res)) {
+                    JS_FreeBigInt(ctx, a, &a_s);
+                    JS_FreeBigInt(ctx, b, &b_s);
+                    goto fail;
+                }
+                r = JS_GetBigFloat(res);
+                if (op == OP_div) {
+                    ret = bf_div(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags) & BF_ST_MEM_ERROR;
+                } else {
+                    ret = bf_pow(r, a, b, ctx->fp_env.prec,
+                                 ctx->fp_env.flags | BF_POW_JS_QUIRKS) & BF_ST_MEM_ERROR;
+                }
+                JS_FreeBigInt(ctx, a, &a_s);
+                JS_FreeBigInt(ctx, b, &b_s);
+                JS_FreeValue(ctx, op1);
+                JS_FreeValue(ctx, op2);
+                if (unlikely(ret)) {
+                    JS_FreeValue(ctx, res);
+                    throw_bf_exception(ctx, ret);
+                    return -1;
+                }
+                *pres = res;
+                return 0;
+#else
+                abort();
+#endif
+            }
+        } else {
+            ret = bf_pow(r, a, b, BF_PREC_INF, BF_RNDZ | BF_POW_JS_QUIRKS);
+        }
+        break;
+
+        /* logical operations */
+    case OP_shl:
+    case OP_sar:
+        {
+            slimb_t v2;
+#if LIMB_BITS == 32
+            bf_get_int32(&v2, b, 0);
+            if (v2 == INT32_MIN)
+                v2 = INT32_MIN + 1;
+#else
+            bf_get_int64(&v2, b, 0);
+            if (v2 == INT64_MIN)
+                v2 = INT64_MIN + 1;
+#endif
+            if (op == OP_sar)
+                v2 = -v2;
+            ret = bf_set(r, a);
+            ret |= bf_mul_2exp(r, v2, BF_PREC_INF, BF_RNDZ);
+            if (v2 < 0) {
+                ret |= bf_rint(r, BF_RNDD) & (BF_ST_OVERFLOW | BF_ST_MEM_ERROR);
+            }
+        }
+        break;
+    case OP_and:
+        ret = bf_logic_and(r, a, b);
+        break;
+    case OP_or:
+        ret = bf_logic_or(r, a, b);
+        break;
+    case OP_xor:
+        ret = bf_logic_xor(r, a, b);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeBigInt(ctx, a, &a_s);
+    JS_FreeBigInt(ctx, b, &b_s);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    if (unlikely(ret)) {
+        JS_FreeValue(ctx, res);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = JS_CompactBigInt(ctx, res);
+    return 0;
+ fail:
+    JS_FreeValue(ctx, res);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return -1;
+}
+
+#ifdef CONFIG_BIGNUM
+static int js_binary_arith_bigfloat(JSContext *ctx, OPCodeEnum op,
+                                    JSValue *pres, JSValue op1, JSValue op2)
+{
+    bf_t a_s, b_s, *r, *a, *b;
+    int ret;
+    JSValue res;
+
+    res = JS_NewBigFloat(ctx);
+    if (JS_IsException(res))
+        goto fail;
+    r = JS_GetBigFloat(res);
+    a = JS_ToBigFloat(ctx, &a_s, op1);
+    if (!a) {
+        JS_FreeValue(ctx, res);
+        goto fail;
+    }
+    b = JS_ToBigFloat(ctx, &b_s, op2);
+    if (!b) {
+        if (a == &a_s)
+            bf_delete(a);
+        JS_FreeValue(ctx, res);
+        goto fail;
+    }
+    bf_init(ctx->bf_ctx, r);
+    switch(op) {
+    case OP_add:
+        ret = bf_add(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case OP_sub:
+        ret = bf_sub(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case OP_mul:
+        ret = bf_mul(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case OP_div:
+        ret = bf_div(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case OP_math_mod:
+        /* Euclidian remainder */
+        ret = bf_rem(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags,
+                     BF_DIVREM_EUCLIDIAN);
+        break;
+    case OP_mod:
+        ret = bf_rem(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags,
+                     BF_RNDZ);
+        break;
+    case OP_pow:
+        ret = bf_pow(r, a, b, ctx->fp_env.prec,
+                     ctx->fp_env.flags | BF_POW_JS_QUIRKS);
+        break;
+    default:
+        abort();
+    }
+    if (a == &a_s)
+        bf_delete(a);
+    if (b == &b_s)
+        bf_delete(b);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    if (unlikely(ret & BF_ST_MEM_ERROR)) {
+        JS_FreeValue(ctx, res);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = res;
+    return 0;
+ fail:
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return -1;
+}
+
+/* b must be a positive integer */
+static int js_bfdec_pow(bfdec_t *r, const bfdec_t *a, const bfdec_t *b)
+{
+    bfdec_t b1;
+    int32_t b2;
+    int ret;
+
+    bfdec_init(b->ctx, &b1);
+    ret = bfdec_set(&b1, b);
+    if (ret) {
+        bfdec_delete(&b1);
+        return ret;
+    }
+    ret = bfdec_rint(&b1, BF_RNDZ);
+    if (ret) {
+        bfdec_delete(&b1);
+        return BF_ST_INVALID_OP; /* must be an integer */
+    }
+    ret = bfdec_get_int32(&b2, &b1);
+    bfdec_delete(&b1);
+    if (ret)
+        return ret; /* overflow */
+    if (b2 < 0)
+        return BF_ST_INVALID_OP; /* must be positive */
+    return bfdec_pow_ui(r, a, b2);
+}
+
+static int js_binary_arith_bigdecimal(JSContext *ctx, OPCodeEnum op,
+                                      JSValue *pres, JSValue op1, JSValue op2)
+{
+    bfdec_t *r, *a, *b;
+    int ret;
+    JSValue res;
+
+    res = JS_NewBigDecimal(ctx);
+    if (JS_IsException(res))
+        goto fail;
+    r = JS_GetBigDecimal(res);
+
+    a = JS_ToBigDecimal(ctx, op1);
+    if (!a)
+        goto fail;
+    b = JS_ToBigDecimal(ctx, op2);
+    if (!b)
+        goto fail;
+    switch(op) {
+    case OP_add:
+        ret = bfdec_add(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_sub:
+        ret = bfdec_sub(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_mul:
+        ret = bfdec_mul(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_div:
+        ret = bfdec_div(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_math_mod:
+        /* Euclidian remainder */
+        ret = bfdec_rem(r, a, b, BF_PREC_INF, BF_RNDZ, BF_DIVREM_EUCLIDIAN);
+        break;
+    case OP_mod:
+        ret = bfdec_rem(r, a, b, BF_PREC_INF, BF_RNDZ, BF_RNDZ);
+        break;
+    case OP_pow:
+        ret = js_bfdec_pow(r, a, b);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    if (unlikely(ret)) {
+        JS_FreeValue(ctx, res);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = res;
+    return 0;
+ fail:
+    JS_FreeValue(ctx, res);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return -1;
+}
+#endif /* CONFIG_BIGNUM */
+
+static no_inline __exception int js_binary_arith_slow(JSContext *ctx, JSValue *sp,
+                                                      OPCodeEnum op)
+{
+    JSValue op1, op2;
+    uint32_t tag1, tag2;
+    double d1, d2;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    /* fast path for float operations */
+    if (tag1 == JS_TAG_FLOAT64 && tag2 == JS_TAG_FLOAT64) {
+        d1 = JS_VALUE_GET_FLOAT64(op1);
+        d2 = JS_VALUE_GET_FLOAT64(op2);
+        goto handle_float64;
+    }
+
+#ifdef CONFIG_BIGNUM
+    /* try to call an overloaded operator */
+    if ((tag1 == JS_TAG_OBJECT &&
+         (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
+        (tag2 == JS_TAG_OBJECT &&
+         (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) {
+        JSValue res;
+        int ret = js_call_binary_op_fallback(ctx, &res, op1, op2, op, TRUE, 0);
+        if (ret != 0) {
+            JS_FreeValue(ctx, op1);
+            JS_FreeValue(ctx, op2);
+            if (ret < 0) {
+                goto exception;
+            } else {
+                sp[-2] = res;
+                return 0;
+            }
+        }
+    }
+#endif
+
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToNumericFree(ctx, op2);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+
+    if (tag1 == JS_TAG_INT && tag2 == JS_TAG_INT) {
+        int32_t v1, v2;
+        int64_t v;
+        v1 = JS_VALUE_GET_INT(op1);
+        v2 = JS_VALUE_GET_INT(op2);
+        switch(op) {
+        case OP_sub:
+            v = (int64_t)v1 - (int64_t)v2;
+            break;
+        case OP_mul:
+            v = (int64_t)v1 * (int64_t)v2;
+            if (is_math_mode(ctx) &&
+                (v < -MAX_SAFE_INTEGER || v > MAX_SAFE_INTEGER))
+                goto handle_bigint;
+            if (v == 0 && (v1 | v2) < 0) {
+                sp[-2] = JS_NewFloat64(ctx, -0.0);
+                return 0;
+            }
+            break;
+        case OP_div:
+            if (is_math_mode(ctx))
+                goto handle_bigint;
+            sp[-2] = JS_NewFloat64(ctx, (double)v1 / (double)v2);
+            return 0;
+#ifdef CONFIG_BIGNUM
+        case OP_math_mod:
+            if (unlikely(v2 == 0)) {
+                throw_bf_exception(ctx, BF_ST_DIVIDE_ZERO);
+                goto exception;
+            }
+            v = (int64_t)v1 % (int64_t)v2;
+            if (v < 0) {
+                if (v2 < 0)
+                    v -= v2;
+                else
+                    v += v2;
+            }
+            break;
+#endif
+        case OP_mod:
+            if (v1 < 0 || v2 <= 0) {
+                sp[-2] = JS_NewFloat64(ctx, fmod(v1, v2));
+                return 0;
+            } else {
+                v = (int64_t)v1 % (int64_t)v2;
+            }
+            break;
+        case OP_pow:
+            if (!is_math_mode(ctx)) {
+                sp[-2] = JS_NewFloat64(ctx, js_pow(v1, v2));
+                return 0;
+            } else {
+                goto handle_bigint;
+            }
+            break;
+        default:
+            abort();
+        }
+        sp[-2] = JS_NewInt64(ctx, v);
+    } else
+#ifdef CONFIG_BIGNUM
+    if (tag1 == JS_TAG_BIG_DECIMAL || tag2 == JS_TAG_BIG_DECIMAL) {
+        if (ctx->rt->bigdecimal_ops.binary_arith(ctx, op, sp - 2, op1, op2))
+            goto exception;
+    } else if (tag1 == JS_TAG_BIG_FLOAT || tag2 == JS_TAG_BIG_FLOAT) {
+        if (ctx->rt->bigfloat_ops.binary_arith(ctx, op, sp - 2, op1, op2))
+            goto exception;
+    } else
+#endif
+    if (tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) {
+    handle_bigint:
+        if (ctx->rt->bigint_ops.binary_arith(ctx, op, sp - 2, op1, op2))
+            goto exception;
+    } else {
+        double dr;
+        /* float64 result */
+        if (JS_ToFloat64Free(ctx, &d1, op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        if (JS_ToFloat64Free(ctx, &d2, op2))
+            goto exception;
+    handle_float64:
+        if (is_math_mode(ctx) && is_safe_integer(d1) && is_safe_integer(d2))
+            goto handle_bigint;
+        switch(op) {
+        case OP_sub:
+            dr = d1 - d2;
+            break;
+        case OP_mul:
+            dr = d1 * d2;
+            break;
+        case OP_div:
+            dr = d1 / d2;
+            break;
+        case OP_mod:
+            dr = fmod(d1, d2);
+            break;
+#ifdef CONFIG_BIGNUM
+        case OP_math_mod:
+            d2 = fabs(d2);
+            dr = fmod(d1, d2);
+            /* XXX: loss of accuracy if dr < 0 */
+            if (dr < 0)
+                dr += d2;
+            break;
+#endif
+        case OP_pow:
+            dr = js_pow(d1, d2);
+            break;
+        default:
+            abort();
+        }
+        sp[-2] = JS_NewFloat64(ctx, dr);
+    }
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline __exception int js_add_slow(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    uint32_t tag1, tag2;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    /* fast path for float64 */
+    if (tag1 == JS_TAG_FLOAT64 && tag2 == JS_TAG_FLOAT64) {
+        double d1, d2;
+        d1 = JS_VALUE_GET_FLOAT64(op1);
+        d2 = JS_VALUE_GET_FLOAT64(op2);
+        sp[-2] = JS_NewFloat64(ctx, d1 + d2);
+        return 0;
+    }
+
+    if (tag1 == JS_TAG_OBJECT || tag2 == JS_TAG_OBJECT) {
+#ifdef CONFIG_BIGNUM
+        /* try to call an overloaded operator */
+        if ((tag1 == JS_TAG_OBJECT &&
+             (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED &&
+              tag2 != JS_TAG_STRING)) ||
+            (tag2 == JS_TAG_OBJECT &&
+             (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED &&
+              tag1 != JS_TAG_STRING))) {
+            JSValue res;
+            int ret = js_call_binary_op_fallback(ctx, &res, op1, op2, OP_add,
+                                                 FALSE, HINT_NONE);
+            if (ret != 0) {
+                JS_FreeValue(ctx, op1);
+                JS_FreeValue(ctx, op2);
+                if (ret < 0) {
+                    goto exception;
+                } else {
+                    sp[-2] = res;
+                    return 0;
+                }
+            }
+        }
+#endif
+        op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NONE);
+        if (JS_IsException(op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+
+        op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NONE);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            goto exception;
+        }
+        tag1 = JS_VALUE_GET_NORM_TAG(op1);
+        tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    }
+
+    if (tag1 == JS_TAG_STRING || tag2 == JS_TAG_STRING) {
+        sp[-2] = JS_ConcatString(ctx, op1, op2);
+        if (JS_IsException(sp[-2]))
+            goto exception;
+        return 0;
+    }
+
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToNumericFree(ctx, op2);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+
+    if (tag1 == JS_TAG_INT && tag2 == JS_TAG_INT) {
+        int32_t v1, v2;
+        int64_t v;
+        v1 = JS_VALUE_GET_INT(op1);
+        v2 = JS_VALUE_GET_INT(op2);
+        v = (int64_t)v1 + (int64_t)v2;
+        sp[-2] = JS_NewInt64(ctx, v);
+    } else
+#ifdef CONFIG_BIGNUM
+    if (tag1 == JS_TAG_BIG_DECIMAL || tag2 == JS_TAG_BIG_DECIMAL) {
+        if (ctx->rt->bigdecimal_ops.binary_arith(ctx, OP_add, sp - 2, op1, op2))
+            goto exception;
+    } else if (tag1 == JS_TAG_BIG_FLOAT || tag2 == JS_TAG_BIG_FLOAT) {
+        if (ctx->rt->bigfloat_ops.binary_arith(ctx, OP_add, sp - 2, op1, op2))
+            goto exception;
+    } else
+#endif
+    if (tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) {
+    handle_bigint:
+        if (ctx->rt->bigint_ops.binary_arith(ctx, OP_add, sp - 2, op1, op2))
+            goto exception;
+    } else {
+        double d1, d2;
+        /* float64 result */
+        if (JS_ToFloat64Free(ctx, &d1, op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        if (JS_ToFloat64Free(ctx, &d2, op2))
+            goto exception;
+        if (is_math_mode(ctx) && is_safe_integer(d1) && is_safe_integer(d2))
+            goto handle_bigint;
+        sp[-2] = JS_NewFloat64(ctx, d1 + d2);
+    }
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline __exception int js_binary_logic_slow(JSContext *ctx,
+                                                      JSValue *sp,
+                                                      OPCodeEnum op)
+{
+    JSValue op1, op2;
+    uint32_t tag1, tag2;
+    uint32_t v1, v2, r;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+
+#ifdef CONFIG_BIGNUM
+    /* try to call an overloaded operator */
+    if ((tag1 == JS_TAG_OBJECT &&
+         (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
+        (tag2 == JS_TAG_OBJECT &&
+         (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) {
+        JSValue res;
+        int ret = js_call_binary_op_fallback(ctx, &res, op1, op2, op, TRUE, 0);
+        if (ret != 0) {
+            JS_FreeValue(ctx, op1);
+            JS_FreeValue(ctx, op2);
+            if (ret < 0) {
+                goto exception;
+            } else {
+                sp[-2] = res;
+                return 0;
+            }
+        }
+    }
+#endif
+
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToNumericFree(ctx, op2);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+
+    if (is_math_mode(ctx))
+        goto bigint_op;
+
+    tag1 = JS_VALUE_GET_TAG(op1);
+    tag2 = JS_VALUE_GET_TAG(op2);
+    if (tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) {
+        if (tag1 != tag2) {
+            JS_FreeValue(ctx, op1);
+            JS_FreeValue(ctx, op2);
+            JS_ThrowTypeError(ctx, "both operands must be bigint");
+            goto exception;
+        } else {
+        bigint_op:
+            if (ctx->rt->bigint_ops.binary_arith(ctx, op, sp - 2, op1, op2))
+                goto exception;
+        }
+    } else {
+        if (unlikely(JS_ToInt32Free(ctx, (int32_t *)&v1, op1))) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        if (unlikely(JS_ToInt32Free(ctx, (int32_t *)&v2, op2)))
+            goto exception;
+        switch(op) {
+        case OP_shl:
+            r = v1 << (v2 & 0x1f);
+            break;
+        case OP_sar:
+            r = (int)v1 >> (v2 & 0x1f);
+            break;
+        case OP_and:
+            r = v1 & v2;
+            break;
+        case OP_or:
+            r = v1 | v2;
+            break;
+        case OP_xor:
+            r = v1 ^ v2;
+            break;
+        default:
+            abort();
+        }
+        sp[-2] = JS_NewInt32(ctx, r);
+    }
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+/* Note: also used for bigint */
+static int js_compare_bigfloat(JSContext *ctx, OPCodeEnum op,
+                               JSValue op1, JSValue op2)
+{
+    bf_t a_s, b_s, *a, *b;
+    int res;
+
+    a = JS_ToBigFloat(ctx, &a_s, op1);
+    if (!a) {
+        JS_FreeValue(ctx, op2);
+        return -1;
+    }
+    b = JS_ToBigFloat(ctx, &b_s, op2);
+    if (!b) {
+        if (a == &a_s)
+            bf_delete(a);
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    switch(op) {
+    case OP_lt:
+        res = bf_cmp_lt(a, b); /* if NaN return false */
+        break;
+    case OP_lte:
+        res = bf_cmp_le(a, b); /* if NaN return false */
+        break;
+    case OP_gt:
+        res = bf_cmp_lt(b, a); /* if NaN return false */
+        break;
+    case OP_gte:
+        res = bf_cmp_le(b, a); /* if NaN return false */
+        break;
+    case OP_eq:
+        res = bf_cmp_eq(a, b); /* if NaN return false */
+        break;
+    default:
+        abort();
+    }
+    if (a == &a_s)
+        bf_delete(a);
+    if (b == &b_s)
+        bf_delete(b);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return res;
+}
+
+#ifdef CONFIG_BIGNUM
+static int js_compare_bigdecimal(JSContext *ctx, OPCodeEnum op,
+                                 JSValue op1, JSValue op2)
+{
+    bfdec_t *a, *b;
+    int res;
+
+    /* Note: binary floats are converted to bigdecimal with
+       toString(). It is not mathematically correct but is consistent
+       with the BigDecimal() constructor behavior */
+    op1 = JS_ToBigDecimalFree(ctx, op1, TRUE);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        return -1;
+    }
+    op2 = JS_ToBigDecimalFree(ctx, op2, TRUE);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    a = JS_ToBigDecimal(ctx, op1); /* cannot fail */
+    b = JS_ToBigDecimal(ctx, op2); /* cannot fail */
+
+    switch(op) {
+    case OP_lt:
+        res = bfdec_cmp_lt(a, b); /* if NaN return false */
+        break;
+    case OP_lte:
+        res = bfdec_cmp_le(a, b); /* if NaN return false */
+        break;
+    case OP_gt:
+        res = bfdec_cmp_lt(b, a); /* if NaN return false */
+        break;
+    case OP_gte:
+        res = bfdec_cmp_le(b, a); /* if NaN return false */
+        break;
+    case OP_eq:
+        res = bfdec_cmp_eq(a, b); /* if NaN return false */
+        break;
+    default:
+        abort();
+    }
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return res;
+}
+#endif /* !CONFIG_BIGNUM */
+
+static no_inline int js_relational_slow(JSContext *ctx, JSValue *sp,
+                                        OPCodeEnum op)
+{
+    JSValue op1, op2;
+    int res;
+    uint32_t tag1, tag2;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+#ifdef CONFIG_BIGNUM
+    /* try to call an overloaded operator */
+    if ((tag1 == JS_TAG_OBJECT &&
+         (tag2 != JS_TAG_NULL && tag2 != JS_TAG_UNDEFINED)) ||
+        (tag2 == JS_TAG_OBJECT &&
+         (tag1 != JS_TAG_NULL && tag1 != JS_TAG_UNDEFINED))) {
+        JSValue ret;
+        res = js_call_binary_op_fallback(ctx, &ret, op1, op2, op,
+                                         FALSE, HINT_NUMBER);
+        if (res != 0) {
+            JS_FreeValue(ctx, op1);
+            JS_FreeValue(ctx, op2);
+            if (res < 0) {
+                goto exception;
+            } else {
+                sp[-2] = ret;
+                return 0;
+            }
+        }
+    }
+#endif
+    op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NUMBER);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NUMBER);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+
+    if (tag1 == JS_TAG_STRING && tag2 == JS_TAG_STRING) {
+        JSString *p1, *p2;
+        p1 = JS_VALUE_GET_STRING(op1);
+        p2 = JS_VALUE_GET_STRING(op2);
+        res = js_string_compare(ctx, p1, p2);
+        switch(op) {
+        case OP_lt:
+            res = (res < 0);
+            break;
+        case OP_lte:
+            res = (res <= 0);
+            break;
+        case OP_gt:
+            res = (res > 0);
+            break;
+        default:
+        case OP_gte:
+            res = (res >= 0);
+            break;
+        }
+        JS_FreeValue(ctx, op1);
+        JS_FreeValue(ctx, op2);
+    } else if ((tag1 <= JS_TAG_NULL || tag1 == JS_TAG_FLOAT64) &&
+               (tag2 <= JS_TAG_NULL || tag2 == JS_TAG_FLOAT64)) {
+        /* fast path for float64/int */
+        goto float64_compare;
+    } else {
+        if (((tag1 == JS_TAG_BIG_INT && tag2 == JS_TAG_STRING) ||
+             (tag2 == JS_TAG_BIG_INT && tag1 == JS_TAG_STRING)) &&
+            !is_math_mode(ctx)) {
+            if (tag1 == JS_TAG_STRING) {
+                op1 = JS_StringToBigInt(ctx, op1);
+                if (JS_VALUE_GET_TAG(op1) != JS_TAG_BIG_INT)
+                    goto invalid_bigint_string;
+            }
+            if (tag2 == JS_TAG_STRING) {
+                op2 = JS_StringToBigInt(ctx, op2);
+                if (JS_VALUE_GET_TAG(op2) != JS_TAG_BIG_INT) {
+                invalid_bigint_string:
+                    JS_FreeValue(ctx, op1);
+                    JS_FreeValue(ctx, op2);
+                    res = FALSE;
+                    goto done;
+                }
+            }
+        } else {
+            op1 = JS_ToNumericFree(ctx, op1);
+            if (JS_IsException(op1)) {
+                JS_FreeValue(ctx, op2);
+                goto exception;
+            }
+            op2 = JS_ToNumericFree(ctx, op2);
+            if (JS_IsException(op2)) {
+                JS_FreeValue(ctx, op1);
+                goto exception;
+            }
+        }
+
+        tag1 = JS_VALUE_GET_NORM_TAG(op1);
+        tag2 = JS_VALUE_GET_NORM_TAG(op2);
+
+#ifdef CONFIG_BIGNUM
+        if (tag1 == JS_TAG_BIG_DECIMAL || tag2 == JS_TAG_BIG_DECIMAL) {
+            res = ctx->rt->bigdecimal_ops.compare(ctx, op, op1, op2);
+            if (res < 0)
+                goto exception;
+        } else if (tag1 == JS_TAG_BIG_FLOAT || tag2 == JS_TAG_BIG_FLOAT) {
+            res = ctx->rt->bigfloat_ops.compare(ctx, op, op1, op2);
+            if (res < 0)
+                goto exception;
+        } else
+#endif
+        if (tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) {
+            res = ctx->rt->bigint_ops.compare(ctx, op, op1, op2);
+            if (res < 0)
+                goto exception;
+        } else {
+            double d1, d2;
+
+        float64_compare:
+            /* can use floating point comparison */
+            if (tag1 == JS_TAG_FLOAT64) {
+                d1 = JS_VALUE_GET_FLOAT64(op1);
+            } else {
+                d1 = JS_VALUE_GET_INT(op1);
+            }
+            if (tag2 == JS_TAG_FLOAT64) {
+                d2 = JS_VALUE_GET_FLOAT64(op2);
+            } else {
+                d2 = JS_VALUE_GET_INT(op2);
+            }
+            switch(op) {
+            case OP_lt:
+                res = (d1 < d2); /* if NaN return false */
+                break;
+            case OP_lte:
+                res = (d1 <= d2); /* if NaN return false */
+                break;
+            case OP_gt:
+                res = (d1 > d2); /* if NaN return false */
+                break;
+            default:
+            case OP_gte:
+                res = (d1 >= d2); /* if NaN return false */
+                break;
+            }
+        }
+    }
+ done:
+    sp[-2] = JS_NewBool(ctx, res);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static BOOL tag_is_number(uint32_t tag)
+{
+    return (tag == JS_TAG_INT || tag == JS_TAG_BIG_INT ||
+            tag == JS_TAG_FLOAT64
+#ifdef CONFIG_BIGNUM
+            || tag == JS_TAG_BIG_FLOAT || tag == JS_TAG_BIG_DECIMAL
+#endif
+            );
+}
+
+static no_inline __exception int js_eq_slow(JSContext *ctx, JSValue *sp,
+                                            BOOL is_neq)
+{
+    JSValue op1, op2;
+#ifdef CONFIG_BIGNUM
+    JSValue ret;
+#endif
+    int res;
+    uint32_t tag1, tag2;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+ redo:
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    if (tag_is_number(tag1) && tag_is_number(tag2)) {
+        if (tag1 == JS_TAG_INT && tag2 == JS_TAG_INT) {
+            res = JS_VALUE_GET_INT(op1) == JS_VALUE_GET_INT(op2);
+        } else if ((tag1 == JS_TAG_FLOAT64 &&
+                    (tag2 == JS_TAG_INT || tag2 == JS_TAG_FLOAT64)) ||
+                   (tag2 == JS_TAG_FLOAT64 &&
+                    (tag1 == JS_TAG_INT || tag1 == JS_TAG_FLOAT64))) {
+            double d1, d2;
+            if (tag1 == JS_TAG_FLOAT64) {
+                d1 = JS_VALUE_GET_FLOAT64(op1);
+            } else {
+                d1 = JS_VALUE_GET_INT(op1);
+            }
+            if (tag2 == JS_TAG_FLOAT64) {
+                d2 = JS_VALUE_GET_FLOAT64(op2);
+            } else {
+                d2 = JS_VALUE_GET_INT(op2);
+            }
+            res = (d1 == d2);
+        } else
+#ifdef CONFIG_BIGNUM
+        if (tag1 == JS_TAG_BIG_DECIMAL || tag2 == JS_TAG_BIG_DECIMAL) {
+            res = ctx->rt->bigdecimal_ops.compare(ctx, OP_eq, op1, op2);
+            if (res < 0)
+                goto exception;
+        } else if (tag1 == JS_TAG_BIG_FLOAT || tag2 == JS_TAG_BIG_FLOAT) {
+            res = ctx->rt->bigfloat_ops.compare(ctx, OP_eq, op1, op2);
+            if (res < 0)
+                goto exception;
+        } else
+#endif
+        {
+            res = ctx->rt->bigint_ops.compare(ctx, OP_eq, op1, op2);
+            if (res < 0)
+                goto exception;
+        }
+    } else if (tag1 == tag2) {
+#ifdef CONFIG_BIGNUM
+        if (tag1 == JS_TAG_OBJECT) {
+            /* try the fallback operator */
+            res = js_call_binary_op_fallback(ctx, &ret, op1, op2,
+                                             is_neq ? OP_neq : OP_eq,
+                                             FALSE, HINT_NONE);
+            if (res != 0) {
+                JS_FreeValue(ctx, op1);
+                JS_FreeValue(ctx, op2);
+                if (res < 0) {
+                    goto exception;
+                } else {
+                    sp[-2] = ret;
+                    return 0;
+                }
+            }
+        }
+#endif
+        res = js_strict_eq2(ctx, op1, op2, JS_EQ_STRICT);
+    } else if ((tag1 == JS_TAG_NULL && tag2 == JS_TAG_UNDEFINED) ||
+               (tag2 == JS_TAG_NULL && tag1 == JS_TAG_UNDEFINED)) {
+        res = TRUE;
+    } else if ((tag1 == JS_TAG_STRING && tag_is_number(tag2)) ||
+               (tag2 == JS_TAG_STRING && tag_is_number(tag1))) {
+
+        if ((tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) &&
+            !is_math_mode(ctx)) {
+            if (tag1 == JS_TAG_STRING) {
+                op1 = JS_StringToBigInt(ctx, op1);
+                if (JS_VALUE_GET_TAG(op1) != JS_TAG_BIG_INT)
+                    goto invalid_bigint_string;
+            }
+            if (tag2 == JS_TAG_STRING) {
+                op2 = JS_StringToBigInt(ctx, op2);
+                if (JS_VALUE_GET_TAG(op2) != JS_TAG_BIG_INT) {
+                invalid_bigint_string:
+                    JS_FreeValue(ctx, op1);
+                    JS_FreeValue(ctx, op2);
+                    res = FALSE;
+                    goto done;
+                }
+            }
+        } else {
+            op1 = JS_ToNumericFree(ctx, op1);
+            if (JS_IsException(op1)) {
+                JS_FreeValue(ctx, op2);
+                goto exception;
+            }
+            op2 = JS_ToNumericFree(ctx, op2);
+            if (JS_IsException(op2)) {
+                JS_FreeValue(ctx, op1);
+                goto exception;
+            }
+        }
+        res = js_strict_eq2(ctx, op1, op2, JS_EQ_STRICT);
+    } else if (tag1 == JS_TAG_BOOL) {
+        op1 = JS_NewInt32(ctx, JS_VALUE_GET_INT(op1));
+        goto redo;
+    } else if (tag2 == JS_TAG_BOOL) {
+        op2 = JS_NewInt32(ctx, JS_VALUE_GET_INT(op2));
+        goto redo;
+    } else if ((tag1 == JS_TAG_OBJECT &&
+                (tag_is_number(tag2) || tag2 == JS_TAG_STRING || tag2 == JS_TAG_SYMBOL)) ||
+               (tag2 == JS_TAG_OBJECT &&
+                (tag_is_number(tag1) || tag1 == JS_TAG_STRING || tag1 == JS_TAG_SYMBOL))) {
+#ifdef CONFIG_BIGNUM
+        /* try the fallback operator */
+        res = js_call_binary_op_fallback(ctx, &ret, op1, op2,
+                                         is_neq ? OP_neq : OP_eq,
+                                         FALSE, HINT_NONE);
+        if (res != 0) {
+            JS_FreeValue(ctx, op1);
+            JS_FreeValue(ctx, op2);
+            if (res < 0) {
+                goto exception;
+            } else {
+                sp[-2] = ret;
+                return 0;
+            }
+        }
+#endif
+        op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NONE);
+        if (JS_IsException(op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NONE);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            goto exception;
+        }
+        goto redo;
+    } else {
+        /* IsHTMLDDA object is equivalent to undefined for '==' and '!=' */
+        if ((JS_IsHTMLDDA(ctx, op1) &&
+             (tag2 == JS_TAG_NULL || tag2 == JS_TAG_UNDEFINED)) ||
+            (JS_IsHTMLDDA(ctx, op2) &&
+             (tag1 == JS_TAG_NULL || tag1 == JS_TAG_UNDEFINED))) {
+            res = TRUE;
+        } else {
+            res = FALSE;
+        }
+        JS_FreeValue(ctx, op1);
+        JS_FreeValue(ctx, op2);
+    }
+ done:
+    sp[-2] = JS_NewBool(ctx, res ^ is_neq);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline int js_shr_slow(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    uint32_t v1, v2, r;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToNumericFree(ctx, op2);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+    /* XXX: could forbid >>> in bignum mode */
+    if (!is_math_mode(ctx) &&
+        (JS_VALUE_GET_TAG(op1) == JS_TAG_BIG_INT ||
+         JS_VALUE_GET_TAG(op2) == JS_TAG_BIG_INT)) {
+        JS_ThrowTypeError(ctx, "bigint operands are forbidden for >>>");
+        JS_FreeValue(ctx, op1);
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    /* cannot give an exception */
+    JS_ToUint32Free(ctx, &v1, op1);
+    JS_ToUint32Free(ctx, &v2, op2);
+    r = v1 >> (v2 & 0x1f);
+    sp[-2] = JS_NewUint32(ctx, r);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+#ifdef CONFIG_BIGNUM
+static JSValue js_mul_pow10_to_float64(JSContext *ctx, const bf_t *a,
+                                       int64_t exponent)
+{
+    bf_t r_s, *r = &r_s;
+    double d;
+    int ret;
+
+    /* always convert to Float64 */
+    bf_init(ctx->bf_ctx, r);
+    ret = bf_mul_pow_radix(r, a, 10, exponent,
+                           53, bf_set_exp_bits(11) | BF_RNDN |
+                           BF_FLAG_SUBNORMAL);
+    bf_get_float64(r, &d, BF_RNDN);
+    bf_delete(r);
+    if (ret & BF_ST_MEM_ERROR)
+        return JS_ThrowOutOfMemory(ctx);
+    else
+        return JS_NewFloat64(ctx, d);
+}
+
+static no_inline int js_mul_pow10(JSContext *ctx, JSValue *sp)
+{
+    bf_t a_s, *a, *r;
+    JSValue op1, op2, res;
+    int64_t e;
+    int ret;
+
+    res = JS_NewBigFloat(ctx);
+    if (JS_IsException(res))
+        return -1;
+    r = JS_GetBigFloat(res);
+    op1 = sp[-2];
+    op2 = sp[-1];
+    a = JS_ToBigFloat(ctx, &a_s, op1);
+    if (!a) {
+        JS_FreeValue(ctx, res);
+        return -1;
+    }
+    if (JS_IsBigInt(ctx, op2)) {
+        ret = JS_ToBigInt64(ctx, &e, op2);
+    } else {
+        ret = JS_ToInt64(ctx, &e, op2);
+    }
+    if (ret) {
+        if (a == &a_s)
+            bf_delete(a);
+        JS_FreeValue(ctx, res);
+        return -1;
+    }
+
+    bf_mul_pow_radix(r, a, 10, e, ctx->fp_env.prec, ctx->fp_env.flags);
+    if (a == &a_s)
+        bf_delete(a);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    sp[-2] = res;
+    return 0;
+}
+#endif
+
+/* XXX: Should take JSValueConst arguments */
+static BOOL js_strict_eq2(JSContext *ctx, JSValue op1, JSValue op2,
+                          JSStrictEqModeEnum eq_mode)
+{
+    BOOL res;
+    int tag1, tag2;
+    double d1, d2;
+
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    switch(tag1) {
+    case JS_TAG_BOOL:
+        if (tag1 != tag2) {
+            res = FALSE;
+        } else {
+            res = JS_VALUE_GET_INT(op1) == JS_VALUE_GET_INT(op2);
+            goto done_no_free;
+        }
+        break;
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        res = (tag1 == tag2);
+        break;
+    case JS_TAG_STRING:
+        {
+            JSString *p1, *p2;
+            if (tag1 != tag2) {
+                res = FALSE;
+            } else {
+                p1 = JS_VALUE_GET_STRING(op1);
+                p2 = JS_VALUE_GET_STRING(op2);
+                res = (js_string_compare(ctx, p1, p2) == 0);
+            }
+        }
+        break;
+    case JS_TAG_SYMBOL:
+        {
+            JSAtomStruct *p1, *p2;
+            if (tag1 != tag2) {
+                res = FALSE;
+            } else {
+                p1 = JS_VALUE_GET_PTR(op1);
+                p2 = JS_VALUE_GET_PTR(op2);
+                res = (p1 == p2);
+            }
+        }
+        break;
+    case JS_TAG_OBJECT:
+        if (tag1 != tag2)
+            res = FALSE;
+        else
+            res = JS_VALUE_GET_OBJ(op1) == JS_VALUE_GET_OBJ(op2);
+        break;
+    case JS_TAG_INT:
+        d1 = JS_VALUE_GET_INT(op1);
+        if (tag2 == JS_TAG_INT) {
+            d2 = JS_VALUE_GET_INT(op2);
+            goto number_test;
+        } else if (tag2 == JS_TAG_FLOAT64) {
+            d2 = JS_VALUE_GET_FLOAT64(op2);
+            goto number_test;
+        } else {
+            res = FALSE;
+        }
+        break;
+    case JS_TAG_FLOAT64:
+        d1 = JS_VALUE_GET_FLOAT64(op1);
+        if (tag2 == JS_TAG_FLOAT64) {
+            d2 = JS_VALUE_GET_FLOAT64(op2);
+        } else if (tag2 == JS_TAG_INT) {
+            d2 = JS_VALUE_GET_INT(op2);
+        } else {
+            res = FALSE;
+            break;
+        }
+    number_test:
+        if (unlikely(eq_mode >= JS_EQ_SAME_VALUE)) {
+            JSFloat64Union u1, u2;
+            /* NaN is not always normalized, so this test is necessary */
+            if (isnan(d1) || isnan(d2)) {
+                res = isnan(d1) == isnan(d2);
+            } else if (eq_mode == JS_EQ_SAME_VALUE_ZERO) {
+                res = (d1 == d2); /* +0 == -0 */
+            } else {
+                u1.d = d1;
+                u2.d = d2;
+                res = (u1.u64 == u2.u64); /* +0 != -0 */
+            }
+        } else {
+            res = (d1 == d2); /* if NaN return false and +0 == -0 */
+        }
+        goto done_no_free;
+    case JS_TAG_BIG_INT:
+        {
+            bf_t a_s, *a, b_s, *b;
+            if (tag1 != tag2) {
+                res = FALSE;
+                break;
+            }
+            a = JS_ToBigFloat(ctx, &a_s, op1); /* cannot fail */
+            b = JS_ToBigFloat(ctx, &b_s, op2); /* cannot fail */
+            res = bf_cmp_eq(a, b);
+            if (a == &a_s)
+                bf_delete(a);
+            if (b == &b_s)
+                bf_delete(b);
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p1, *p2;
+            const bf_t *a, *b;
+            if (tag1 != tag2) {
+                res = FALSE;
+                break;
+            }
+            p1 = JS_VALUE_GET_PTR(op1);
+            p2 = JS_VALUE_GET_PTR(op2);
+            a = &p1->num;
+            b = &p2->num;
+            if (unlikely(eq_mode >= JS_EQ_SAME_VALUE)) {
+                if (eq_mode == JS_EQ_SAME_VALUE_ZERO &&
+                           a->expn == BF_EXP_ZERO && b->expn == BF_EXP_ZERO) {
+                    res = TRUE;
+                } else {
+                    res = (bf_cmp_full(a, b) == 0);
+                }
+            } else {
+                res = bf_cmp_eq(a, b);
+            }
+        }
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *p1, *p2;
+            const bfdec_t *a, *b;
+            if (tag1 != tag2) {
+                res = FALSE;
+                break;
+            }
+            p1 = JS_VALUE_GET_PTR(op1);
+            p2 = JS_VALUE_GET_PTR(op2);
+            a = &p1->num;
+            b = &p2->num;
+            res = bfdec_cmp_eq(a, b);
+        }
+        break;
+#endif
+    default:
+        res = FALSE;
+        break;
+    }
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+ done_no_free:
+    return res;
+}
+
+static BOOL js_strict_eq(JSContext *ctx, JSValueConst op1, JSValueConst op2)
+{
+    return js_strict_eq2(ctx,
+                         JS_DupValue(ctx, op1), JS_DupValue(ctx, op2),
+                         JS_EQ_STRICT);
+}
+
+BOOL JS_StrictEq(JSContext *ctx, JSValueConst op1, JSValueConst op2)
+{
+    return js_strict_eq(ctx, op1, op2);
+}
+
+static BOOL js_same_value(JSContext *ctx, JSValueConst op1, JSValueConst op2)
+{
+    return js_strict_eq2(ctx,
+                         JS_DupValue(ctx, op1), JS_DupValue(ctx, op2),
+                         JS_EQ_SAME_VALUE);
+}
+
+BOOL JS_SameValue(JSContext *ctx, JSValueConst op1, JSValueConst op2)
+{
+    return js_same_value(ctx, op1, op2);
+}
+
+static BOOL js_same_value_zero(JSContext *ctx, JSValueConst op1, JSValueConst op2)
+{
+    return js_strict_eq2(ctx,
+                         JS_DupValue(ctx, op1), JS_DupValue(ctx, op2),
+                         JS_EQ_SAME_VALUE_ZERO);
+}
+
+BOOL JS_SameValueZero(JSContext *ctx, JSValueConst op1, JSValueConst op2)
+{
+    return js_same_value_zero(ctx, op1, op2);
+}
+
+static no_inline int js_strict_eq_slow(JSContext *ctx, JSValue *sp,
+                                       BOOL is_neq)
+{
+    BOOL res;
+    res = js_strict_eq2(ctx, sp[-2], sp[-1], JS_EQ_STRICT);
+    sp[-2] = JS_NewBool(ctx, res ^ is_neq);
+    return 0;
+}
+
+static __exception int js_operator_in(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    JSAtom atom;
+    int ret;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+
+    if (JS_VALUE_GET_TAG(op2) != JS_TAG_OBJECT) {
+        JS_ThrowTypeError(ctx, "invalid 'in' operand");
+        return -1;
+    }
+    atom = JS_ValueToAtom(ctx, op1);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return -1;
+    ret = JS_HasProperty(ctx, op2, atom);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0)
+        return -1;
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    sp[-2] = JS_NewBool(ctx, ret);
+    return 0;
+}
+
+static __exception int js_operator_private_in(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    int ret;
+
+    op1 = sp[-2]; /* object */
+    op2 = sp[-1]; /* field name or method function */
+
+    if (JS_VALUE_GET_TAG(op1) != JS_TAG_OBJECT) {
+        JS_ThrowTypeError(ctx, "invalid 'in' operand");
+        return -1;
+    }
+    if (JS_IsObject(op2)) {
+        /* method: use the brand */
+        ret = JS_CheckBrand(ctx, op1, op2);
+        if (ret < 0)
+            return -1;
+    } else {
+        JSAtom atom;
+        JSObject *p;
+        JSShapeProperty *prs;
+        JSProperty *pr;
+        /* field */
+        atom = JS_ValueToAtom(ctx, op2);
+        if (unlikely(atom == JS_ATOM_NULL))
+            return -1;
+        p = JS_VALUE_GET_OBJ(op1);
+        prs = find_own_property(&pr, p, atom);
+        JS_FreeAtom(ctx, atom);
+        ret = (prs != NULL);
+    }
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    sp[-2] = JS_NewBool(ctx, ret);
+    return 0;
+}
+
+static __exception int js_has_unscopable(JSContext *ctx, JSValueConst obj,
+                                         JSAtom atom)
+{
+    JSValue arr, val;
+    int ret;
+
+    arr = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_unscopables);
+    if (JS_IsException(arr))
+        return -1;
+    ret = 0;
+    if (JS_IsObject(arr)) {
+        val = JS_GetProperty(ctx, arr, atom);
+        ret = JS_ToBoolFree(ctx, val);
+    }
+    JS_FreeValue(ctx, arr);
+    return ret;
+}
+
+static __exception int js_operator_instanceof(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    BOOL ret;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    ret = JS_IsInstanceOf(ctx, op1, op2);
+    if (ret < 0)
+        return ret;
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    sp[-2] = JS_NewBool(ctx, ret);
+    return 0;
+}
+
+static __exception int js_operator_typeof(JSContext *ctx, JSValueConst op1)
+{
+    JSAtom atom;
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_NORM_TAG(op1);
+    switch(tag) {
+    case JS_TAG_BIG_INT:
+        atom = JS_ATOM_bigint;
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        atom = JS_ATOM_bigfloat;
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        atom = JS_ATOM_bigdecimal;
+        break;
+#endif
+    case JS_TAG_INT:
+    case JS_TAG_FLOAT64:
+        atom = JS_ATOM_number;
+        break;
+    case JS_TAG_UNDEFINED:
+        atom = JS_ATOM_undefined;
+        break;
+    case JS_TAG_BOOL:
+        atom = JS_ATOM_boolean;
+        break;
+    case JS_TAG_STRING:
+        atom = JS_ATOM_string;
+        break;
+    case JS_TAG_OBJECT:
+        {
+            JSObject *p;
+            p = JS_VALUE_GET_OBJ(op1);
+            if (unlikely(p->is_HTMLDDA))
+                atom = JS_ATOM_undefined;
+            else if (JS_IsFunction(ctx, op1))
+                atom = JS_ATOM_function;
+            else
+                goto obj_type;
+        }
+        break;
+    case JS_TAG_NULL:
+    obj_type:
+        atom = JS_ATOM_object;
+        break;
+    case JS_TAG_SYMBOL:
+        atom = JS_ATOM_symbol;
+        break;
+    default:
+        atom = JS_ATOM_unknown;
+        break;
+    }
+    return atom;
+}
+
+static __exception int js_operator_delete(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    JSAtom atom;
+    int ret;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    atom = JS_ValueToAtom(ctx, op2);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return -1;
+    ret = JS_DeleteProperty(ctx, op1, atom, JS_PROP_THROW_STRICT);
+    JS_FreeAtom(ctx, atom);
+    if (unlikely(ret < 0))
+        return -1;
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    sp[-2] = JS_NewBool(ctx, ret);
+    return 0;
+}
+
+static JSValue js_throw_type_error(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    return JS_ThrowTypeError(ctx, "invalid property access");
+}
+
+/* XXX: not 100% compatible, but mozilla seems to use a similar
+   implementation to ensure that caller in non strict mode does not
+   throw (ES5 compatibility) */
+static JSValue js_function_proto_caller(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    JSFunctionBytecode *b = JS_GetFunctionBytecode(this_val);
+    if (!b || (b->js_mode & JS_MODE_STRICT) || !b->has_prototype) {
+        return js_throw_type_error(ctx, this_val, 0, NULL);
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_function_proto_fileName(JSContext *ctx,
+                                          JSValueConst this_val)
+{
+    JSFunctionBytecode *b = JS_GetFunctionBytecode(this_val);
+    if (b && b->has_debug) {
+        return JS_AtomToString(ctx, b->debug.filename);
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_function_proto_lineNumber(JSContext *ctx,
+                                            JSValueConst this_val)
+{
+    JSFunctionBytecode *b = JS_GetFunctionBytecode(this_val);
+    if (b && b->has_debug) {
+        return JS_NewInt32(ctx, b->debug.line_num);
+    }
+    return JS_UNDEFINED;
+}
+
+static int js_arguments_define_own_property(JSContext *ctx,
+                                            JSValueConst this_obj,
+                                            JSAtom prop, JSValueConst val,
+                                            JSValueConst getter, JSValueConst setter, int flags)
+{
+    JSObject *p;
+    uint32_t idx;
+    p = JS_VALUE_GET_OBJ(this_obj);
+    /* convert to normal array when redefining an existing numeric field */
+    if (p->fast_array && JS_AtomIsArrayIndex(ctx, &idx, prop) &&
+        idx < p->u.array.count) {
+        if (convert_fast_array_to_array(ctx, p))
+            return -1;
+    }
+    /* run the default define own property */
+    return JS_DefineProperty(ctx, this_obj, prop, val, getter, setter,
+                             flags | JS_PROP_NO_EXOTIC);
+}
+
+static const JSClassExoticMethods js_arguments_exotic_methods = {
+    .define_own_property = js_arguments_define_own_property,
+};
+
+static JSValue js_build_arguments(JSContext *ctx, int argc, JSValueConst *argv)
+{
+    JSValue val, *tab;
+    JSProperty *pr;
+    JSObject *p;
+    int i;
+
+    val = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                 JS_CLASS_ARGUMENTS);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_OBJ(val);
+
+    /* add the length field (cannot fail) */
+    pr = add_property(ctx, p, JS_ATOM_length,
+                      JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    pr->u.value = JS_NewInt32(ctx, argc);
+
+    /* initialize the fast array part */
+    tab = NULL;
+    if (argc > 0) {
+        tab = js_malloc(ctx, sizeof(tab[0]) * argc);
+        if (!tab) {
+            JS_FreeValue(ctx, val);
+            return JS_EXCEPTION;
+        }
+        for(i = 0; i < argc; i++) {
+            tab[i] = JS_DupValue(ctx, argv[i]);
+        }
+    }
+    p->u.array.u.values = tab;
+    p->u.array.count = argc;
+
+    JS_DefinePropertyValue(ctx, val, JS_ATOM_Symbol_iterator,
+                           JS_DupValue(ctx, ctx->array_proto_values),
+                           JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE);
+    /* add callee property to throw a TypeError in strict mode */
+    JS_DefineProperty(ctx, val, JS_ATOM_callee, JS_UNDEFINED,
+                      ctx->throw_type_error, ctx->throw_type_error,
+                      JS_PROP_HAS_GET | JS_PROP_HAS_SET);
+    return val;
+}
+
+#define GLOBAL_VAR_OFFSET 0x40000000
+#define ARGUMENT_VAR_OFFSET 0x20000000
+
+/* legacy arguments object: add references to the function arguments */
+static JSValue js_build_mapped_arguments(JSContext *ctx, int argc,
+                                         JSValueConst *argv,
+                                         JSStackFrame *sf, int arg_count)
+{
+    JSValue val;
+    JSProperty *pr;
+    JSObject *p;
+    int i;
+
+    val = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                 JS_CLASS_MAPPED_ARGUMENTS);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_OBJ(val);
+
+    /* add the length field (cannot fail) */
+    pr = add_property(ctx, p, JS_ATOM_length,
+                      JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    pr->u.value = JS_NewInt32(ctx, argc);
+
+    for(i = 0; i < arg_count; i++) {
+        JSVarRef *var_ref;
+        var_ref = get_var_ref(ctx, sf, i, TRUE);
+        if (!var_ref)
+            goto fail;
+        pr = add_property(ctx, p, __JS_AtomFromUInt32(i), JS_PROP_C_W_E | JS_PROP_VARREF);
+        if (!pr) {
+            free_var_ref(ctx->rt, var_ref);
+            goto fail;
+        }
+        pr->u.var_ref = var_ref;
+    }
+
+    /* the arguments not mapped to the arguments of the function can
+       be normal properties */
+    for(i = arg_count; i < argc; i++) {
+        if (JS_DefinePropertyValueUint32(ctx, val, i,
+                                         JS_DupValue(ctx, argv[i]),
+                                         JS_PROP_C_W_E) < 0)
+            goto fail;
+    }
+
+    JS_DefinePropertyValue(ctx, val, JS_ATOM_Symbol_iterator,
+                           JS_DupValue(ctx, ctx->array_proto_values),
+                           JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE);
+    /* callee returns this function in non strict mode */
+    JS_DefinePropertyValue(ctx, val, JS_ATOM_callee,
+                           JS_DupValue(ctx, ctx->rt->current_stack_frame->cur_func),
+                           JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE);
+    return val;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_build_rest(JSContext *ctx, int first, int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int i, ret;
+
+    val = JS_NewArray(ctx);
+    if (JS_IsException(val))
+        return val;
+    for (i = first; i < argc; i++) {
+        ret = JS_DefinePropertyValueUint32(ctx, val, i - first,
+                                           JS_DupValue(ctx, argv[i]),
+                                           JS_PROP_C_W_E);
+        if (ret < 0) {
+            JS_FreeValue(ctx, val);
+            return JS_EXCEPTION;
+        }
+    }
+    return val;
+}
+
+static JSValue build_for_in_iterator(JSContext *ctx, JSValue obj)
+{
+    JSObject *p, *p1;
+    JSPropertyEnum *tab_atom;
+    int i;
+    JSValue enum_obj;
+    JSForInIterator *it;
+    uint32_t tag, tab_atom_count;
+
+    tag = JS_VALUE_GET_TAG(obj);
+    if (tag != JS_TAG_OBJECT && tag != JS_TAG_NULL && tag != JS_TAG_UNDEFINED) {
+        obj = JS_ToObjectFree(ctx, obj);
+    }
+
+    it = js_malloc(ctx, sizeof(*it));
+    if (!it) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    enum_obj = JS_NewObjectProtoClass(ctx, JS_NULL, JS_CLASS_FOR_IN_ITERATOR);
+    if (JS_IsException(enum_obj)) {
+        js_free(ctx, it);
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    it->is_array = FALSE;
+    it->obj = obj;
+    it->idx = 0;
+    it->tab_atom = NULL;
+    it->atom_count = 0;
+    it->in_prototype_chain = FALSE;
+    p1 = JS_VALUE_GET_OBJ(enum_obj);
+    p1->u.for_in_iterator = it;
+
+    if (tag == JS_TAG_NULL || tag == JS_TAG_UNDEFINED)
+        return enum_obj;
+
+    p = JS_VALUE_GET_OBJ(obj);
+    if (p->fast_array) {
+        JSShape *sh;
+        JSShapeProperty *prs;
+        /* check that there are no enumerable normal fields */
+        sh = p->shape;
+        for(i = 0, prs = get_shape_prop(sh); i < sh->prop_count; i++, prs++) {
+            if (prs->flags & JS_PROP_ENUMERABLE)
+                goto normal_case;
+        }
+        /* for fast arrays, we only store the number of elements */
+        it->is_array = TRUE;
+        it->atom_count = p->u.array.count;
+    } else {
+    normal_case:
+        if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count, p,
+                                           JS_GPN_STRING_MASK | JS_GPN_SET_ENUM)) {
+            JS_FreeValue(ctx, enum_obj);
+            return JS_EXCEPTION;
+        }
+        it->tab_atom = tab_atom;
+        it->atom_count = tab_atom_count;
+    }
+    return enum_obj;
+}
+
+/* obj -> enum_obj */
+static __exception int js_for_in_start(JSContext *ctx, JSValue *sp)
+{
+    sp[-1] = build_for_in_iterator(ctx, sp[-1]);
+    if (JS_IsException(sp[-1]))
+        return -1;
+    return 0;
+}
+
+/* return -1 if exception, 0 if slow case, 1 if the enumeration is finished */
+static __exception int js_for_in_prepare_prototype_chain_enum(JSContext *ctx,
+                                                              JSValueConst enum_obj)
+{
+    JSObject *p;
+    JSForInIterator *it;
+    JSPropertyEnum *tab_atom;
+    uint32_t tab_atom_count, i;
+    JSValue obj1;
+
+    p = JS_VALUE_GET_OBJ(enum_obj);
+    it = p->u.for_in_iterator;
+
+    /* check if there are enumerable properties in the prototype chain (fast path) */
+    obj1 = JS_DupValue(ctx, it->obj);
+    for(;;) {
+        obj1 = JS_GetPrototypeFree(ctx, obj1);
+        if (JS_IsNull(obj1))
+            break;
+        if (JS_IsException(obj1))
+            goto fail;
+        if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count,
+                                           JS_VALUE_GET_OBJ(obj1),
+                                           JS_GPN_STRING_MASK | JS_GPN_ENUM_ONLY)) {
+            JS_FreeValue(ctx, obj1);
+            goto fail;
+        }
+        js_free_prop_enum(ctx, tab_atom, tab_atom_count);
+        if (tab_atom_count != 0) {
+            JS_FreeValue(ctx, obj1);
+            goto slow_path;
+        }
+        /* must check for timeout to avoid infinite loop */
+        if (js_poll_interrupts(ctx)) {
+            JS_FreeValue(ctx, obj1);
+            goto fail;
+        }
+    }
+    JS_FreeValue(ctx, obj1);
+    return 1;
+
+ slow_path:
+    /* add the visited properties, even if they are not enumerable */
+    if (it->is_array) {
+        if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count,
+                                           JS_VALUE_GET_OBJ(it->obj),
+                                           JS_GPN_STRING_MASK | JS_GPN_SET_ENUM)) {
+            goto fail;
+        }
+        it->is_array = FALSE;
+        it->tab_atom = tab_atom;
+        it->atom_count = tab_atom_count;
+    }
+
+    for(i = 0; i < it->atom_count; i++) {
+        if (JS_DefinePropertyValue(ctx, enum_obj, it->tab_atom[i].atom, JS_NULL, JS_PROP_ENUMERABLE) < 0)
+            goto fail;
+    }
+    return 0;
+ fail:
+    return -1;
+}
+
+/* enum_obj -> enum_obj value done */
+static __exception int js_for_in_next(JSContext *ctx, JSValue *sp)
+{
+    JSValueConst enum_obj;
+    JSObject *p;
+    JSAtom prop;
+    JSForInIterator *it;
+    JSPropertyEnum *tab_atom;
+    uint32_t tab_atom_count;
+    int ret;
+
+    enum_obj = sp[-1];
+    /* fail safe */
+    if (JS_VALUE_GET_TAG(enum_obj) != JS_TAG_OBJECT)
+        goto done;
+    p = JS_VALUE_GET_OBJ(enum_obj);
+    if (p->class_id != JS_CLASS_FOR_IN_ITERATOR)
+        goto done;
+    it = p->u.for_in_iterator;
+
+    for(;;) {
+        if (it->idx >= it->atom_count) {
+            if (JS_IsNull(it->obj) || JS_IsUndefined(it->obj))
+                goto done; /* not an object */
+            /* no more property in the current object: look in the prototype */
+            if (!it->in_prototype_chain) {
+                ret = js_for_in_prepare_prototype_chain_enum(ctx, enum_obj);
+                if (ret < 0)
+                    return -1;
+                if (ret)
+                    goto done;
+                it->in_prototype_chain = TRUE;
+            }
+            it->obj = JS_GetPrototypeFree(ctx, it->obj);
+            if (JS_IsException(it->obj))
+                return -1;
+            if (JS_IsNull(it->obj))
+                goto done; /* no more prototype */
+
+            /* must check for timeout to avoid infinite loop */
+            if (js_poll_interrupts(ctx))
+                return -1;
+
+            if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count,
+                                               JS_VALUE_GET_OBJ(it->obj),
+                                               JS_GPN_STRING_MASK | JS_GPN_SET_ENUM)) {
+                return -1;
+            }
+            js_free_prop_enum(ctx, it->tab_atom, it->atom_count);
+            it->tab_atom = tab_atom;
+            it->atom_count = tab_atom_count;
+            it->idx = 0;
+        } else {
+            if (it->is_array) {
+                prop = __JS_AtomFromUInt32(it->idx);
+                it->idx++;
+            } else {
+                BOOL is_enumerable;
+                prop = it->tab_atom[it->idx].atom;
+                is_enumerable = it->tab_atom[it->idx].is_enumerable;
+                it->idx++;
+                if (it->in_prototype_chain) {
+                    /* slow case: we are in the prototype chain */
+                    ret = JS_GetOwnPropertyInternal(ctx, NULL, JS_VALUE_GET_OBJ(enum_obj), prop);
+                    if (ret < 0)
+                        return ret;
+                    if (ret)
+                        continue; /* already visited */
+                    /* add to the visited property list */
+                    if (JS_DefinePropertyValue(ctx, enum_obj, prop, JS_NULL,
+                                               JS_PROP_ENUMERABLE) < 0)
+                        return -1;
+                }
+                if (!is_enumerable)
+                    continue;
+            }
+            /* check if the property was deleted */
+            ret = JS_GetOwnPropertyInternal(ctx, NULL, JS_VALUE_GET_OBJ(it->obj), prop);
+            if (ret < 0)
+                return ret;
+            if (ret)
+                break;
+        }
+    }
+    /* return the property */
+    sp[0] = JS_AtomToValue(ctx, prop);
+    sp[1] = JS_FALSE;
+    return 0;
+ done:
+    /* return the end */
+    sp[0] = JS_UNDEFINED;
+    sp[1] = JS_TRUE;
+    return 0;
+}
+
+static JSValue JS_GetIterator2(JSContext *ctx, JSValueConst obj,
+                               JSValueConst method)
+{
+    JSValue enum_obj;
+
+    enum_obj = JS_Call(ctx, method, obj, 0, NULL);
+    if (JS_IsException(enum_obj))
+        return enum_obj;
+    if (!JS_IsObject(enum_obj)) {
+        JS_FreeValue(ctx, enum_obj);
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    }
+    return enum_obj;
+}
+
+static JSValue JS_GetIterator(JSContext *ctx, JSValueConst obj, BOOL is_async)
+{
+    JSValue method, ret, sync_iter;
+
+    if (is_async) {
+        method = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_asyncIterator);
+        if (JS_IsException(method))
+            return method;
+        if (JS_IsUndefined(method) || JS_IsNull(method)) {
+            method = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_iterator);
+            if (JS_IsException(method))
+                return method;
+            sync_iter = JS_GetIterator2(ctx, obj, method);
+            JS_FreeValue(ctx, method);
+            if (JS_IsException(sync_iter))
+                return sync_iter;
+            ret = JS_CreateAsyncFromSyncIterator(ctx, sync_iter);
+            JS_FreeValue(ctx, sync_iter);
+            return ret;
+        }
+    } else {
+        method = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_iterator);
+        if (JS_IsException(method))
+            return method;
+    }
+    if (!JS_IsFunction(ctx, method)) {
+        JS_FreeValue(ctx, method);
+        return JS_ThrowTypeError(ctx, "value is not iterable");
+    }
+    ret = JS_GetIterator2(ctx, obj, method);
+    JS_FreeValue(ctx, method);
+    return ret;
+}
+
+/* return *pdone = 2 if the iterator object is not parsed */
+static JSValue JS_IteratorNext2(JSContext *ctx, JSValueConst enum_obj,
+                                JSValueConst method,
+                                int argc, JSValueConst *argv, int *pdone)
+{
+    JSValue obj;
+
+    /* fast path for the built-in iterators (avoid creating the
+       intermediate result object) */
+    if (JS_IsObject(method)) {
+        JSObject *p = JS_VALUE_GET_OBJ(method);
+        if (p->class_id == JS_CLASS_C_FUNCTION &&
+            p->u.cfunc.cproto == JS_CFUNC_iterator_next) {
+            JSCFunctionType func;
+            JSValueConst args[1];
+
+            /* in case the function expects one argument */
+            if (argc == 0) {
+                args[0] = JS_UNDEFINED;
+                argv = args;
+            }
+            func = p->u.cfunc.c_function;
+            return func.iterator_next(ctx, enum_obj, argc, argv,
+                                      pdone, p->u.cfunc.magic);
+        }
+    }
+    obj = JS_Call(ctx, method, enum_obj, argc, argv);
+    if (JS_IsException(obj))
+        goto fail;
+    if (!JS_IsObject(obj)) {
+        JS_FreeValue(ctx, obj);
+        JS_ThrowTypeError(ctx, "iterator must return an object");
+        goto fail;
+    }
+    *pdone = 2;
+    return obj;
+ fail:
+    *pdone = FALSE;
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_IteratorNext(JSContext *ctx, JSValueConst enum_obj,
+                               JSValueConst method,
+                               int argc, JSValueConst *argv, BOOL *pdone)
+{
+    JSValue obj, value, done_val;
+    int done;
+
+    obj = JS_IteratorNext2(ctx, enum_obj, method, argc, argv, &done);
+    if (JS_IsException(obj))
+        goto fail;
+    if (done != 2) {
+        *pdone = done;
+        return obj;
+    } else {
+        done_val = JS_GetProperty(ctx, obj, JS_ATOM_done);
+        if (JS_IsException(done_val))
+            goto fail;
+        *pdone = JS_ToBoolFree(ctx, done_val);
+        value = JS_UNDEFINED;
+        if (!*pdone) {
+            value = JS_GetProperty(ctx, obj, JS_ATOM_value);
+        }
+        JS_FreeValue(ctx, obj);
+        return value;
+    }
+ fail:
+    JS_FreeValue(ctx, obj);
+    *pdone = FALSE;
+    return JS_EXCEPTION;
+}
+
+/* return < 0 in case of exception */
+static int JS_IteratorClose(JSContext *ctx, JSValueConst enum_obj,
+                            BOOL is_exception_pending)
+{
+    JSValue method, ret, ex_obj;
+    int res;
+
+    if (is_exception_pending) {
+        ex_obj = ctx->rt->current_exception;
+        ctx->rt->current_exception = JS_NULL;
+        res = -1;
+    } else {
+        ex_obj = JS_UNDEFINED;
+        res = 0;
+    }
+    method = JS_GetProperty(ctx, enum_obj, JS_ATOM_return);
+    if (JS_IsException(method)) {
+        res = -1;
+        goto done;
+    }
+    if (JS_IsUndefined(method) || JS_IsNull(method)) {
+        goto done;
+    }
+    ret = JS_CallFree(ctx, method, enum_obj, 0, NULL);
+    if (!is_exception_pending) {
+        if (JS_IsException(ret)) {
+            res = -1;
+        } else if (!JS_IsObject(ret)) {
+            JS_ThrowTypeErrorNotAnObject(ctx);
+            res = -1;
+        }
+    }
+    JS_FreeValue(ctx, ret);
+ done:
+    if (is_exception_pending) {
+        JS_Throw(ctx, ex_obj);
+    }
+    return res;
+}
+
+/* obj -> enum_rec (3 slots) */
+static __exception int js_for_of_start(JSContext *ctx, JSValue *sp,
+                                       BOOL is_async)
+{
+    JSValue op1, obj, method;
+    op1 = sp[-1];
+    obj = JS_GetIterator(ctx, op1, is_async);
+    if (JS_IsException(obj))
+        return -1;
+    JS_FreeValue(ctx, op1);
+    sp[-1] = obj;
+    method = JS_GetProperty(ctx, obj, JS_ATOM_next);
+    if (JS_IsException(method))
+        return -1;
+    sp[0] = method;
+    return 0;
+}
+
+/* enum_rec [objs] -> enum_rec [objs] value done. There are 'offset'
+   objs. If 'done' is true or in case of exception, 'enum_rec' is set
+   to undefined. If 'done' is true, 'value' is always set to
+   undefined. */
+static __exception int js_for_of_next(JSContext *ctx, JSValue *sp, int offset)
+{
+    JSValue value = JS_UNDEFINED;
+    int done = 1;
+
+    if (likely(!JS_IsUndefined(sp[offset]))) {
+        value = JS_IteratorNext(ctx, sp[offset], sp[offset + 1], 0, NULL, &done);
+        if (JS_IsException(value))
+            done = -1;
+        if (done) {
+            /* value is JS_UNDEFINED or JS_EXCEPTION */
+            /* replace the iteration object with undefined */
+            JS_FreeValue(ctx, sp[offset]);
+            sp[offset] = JS_UNDEFINED;
+            if (done < 0) {
+                return -1;
+            } else {
+                JS_FreeValue(ctx, value);
+                value = JS_UNDEFINED;
+            }
+        }
+    }
+    sp[0] = value;
+    sp[1] = JS_NewBool(ctx, done);
+    return 0;
+}
+
+static JSValue JS_IteratorGetCompleteValue(JSContext *ctx, JSValueConst obj,
+                                           BOOL *pdone)
+{
+    JSValue done_val, value;
+    BOOL done;
+    done_val = JS_GetProperty(ctx, obj, JS_ATOM_done);
+    if (JS_IsException(done_val))
+        goto fail;
+    done = JS_ToBoolFree(ctx, done_val);
+    value = JS_GetProperty(ctx, obj, JS_ATOM_value);
+    if (JS_IsException(value))
+        goto fail;
+    *pdone = done;
+    return value;
+ fail:
+    *pdone = FALSE;
+    return JS_EXCEPTION;
+}
+
+static __exception int js_iterator_get_value_done(JSContext *ctx, JSValue *sp)
+{
+    JSValue obj, value;
+    BOOL done;
+    obj = sp[-1];
+    if (!JS_IsObject(obj)) {
+        JS_ThrowTypeError(ctx, "iterator must return an object");
+        return -1;
+    }
+    value = JS_IteratorGetCompleteValue(ctx, obj, &done);
+    if (JS_IsException(value))
+        return -1;
+    JS_FreeValue(ctx, obj);
+    sp[-1] = value;
+    sp[0] = JS_NewBool(ctx, done);
+    return 0;
+}
+
+static JSValue js_create_iterator_result(JSContext *ctx,
+                                         JSValue val,
+                                         BOOL done)
+{
+    JSValue obj;
+    obj = JS_NewObject(ctx);
+    if (JS_IsException(obj)) {
+        JS_FreeValue(ctx, val);
+        return obj;
+    }
+    if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_value,
+                               val, JS_PROP_C_W_E) < 0) {
+        goto fail;
+    }
+    if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_done,
+                               JS_NewBool(ctx, done), JS_PROP_C_W_E) < 0) {
+    fail:
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    return obj;
+}
+
+static JSValue js_array_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv,
+                                      BOOL *pdone, int magic);
+
+static JSValue js_create_array_iterator(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv, int magic);
+
+static BOOL js_is_fast_array(JSContext *ctx, JSValueConst obj)
+{
+    /* Try and handle fast arrays explicitly */
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(obj);
+        if (p->class_id == JS_CLASS_ARRAY && p->fast_array) {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+/* Access an Array's internal JSValue array if available */
+static BOOL js_get_fast_array(JSContext *ctx, JSValueConst obj,
+                              JSValue **arrpp, uint32_t *countp)
+{
+    /* Try and handle fast arrays explicitly */
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(obj);
+        if (p->class_id == JS_CLASS_ARRAY && p->fast_array) {
+            *countp = p->u.array.count;
+            *arrpp = p->u.array.u.values;
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static __exception int js_append_enumerate(JSContext *ctx, JSValue *sp)
+{
+    JSValue iterator, enumobj, method, value;
+    int is_array_iterator;
+    JSValue *arrp;
+    uint32_t i, count32, pos;
+
+    if (JS_VALUE_GET_TAG(sp[-2]) != JS_TAG_INT) {
+        JS_ThrowInternalError(ctx, "invalid index for append");
+        return -1;
+    }
+
+    pos = JS_VALUE_GET_INT(sp[-2]);
+
+    /* XXX: further optimisations:
+       - use ctx->array_proto_values?
+       - check if array_iterator_prototype next method is built-in and
+         avoid constructing actual iterator object?
+       - build this into js_for_of_start and use in all `for (x of o)` loops
+     */
+    iterator = JS_GetProperty(ctx, sp[-1], JS_ATOM_Symbol_iterator);
+    if (JS_IsException(iterator))
+        return -1;
+    is_array_iterator = JS_IsCFunction(ctx, iterator,
+                                       (JSCFunction *)js_create_array_iterator,
+                                       JS_ITERATOR_KIND_VALUE);
+    JS_FreeValue(ctx, iterator);
+
+    enumobj = JS_GetIterator(ctx, sp[-1], FALSE);
+    if (JS_IsException(enumobj))
+        return -1;
+    method = JS_GetProperty(ctx, enumobj, JS_ATOM_next);
+    if (JS_IsException(method)) {
+        JS_FreeValue(ctx, enumobj);
+        return -1;
+    }
+    if (is_array_iterator
+    &&  JS_IsCFunction(ctx, method, (JSCFunction *)js_array_iterator_next, 0)
+    &&  js_get_fast_array(ctx, sp[-1], &arrp, &count32)) {
+        uint32_t len;
+        if (js_get_length32(ctx, &len, sp[-1]))
+            goto exception;
+        /* if len > count32, the elements >= count32 might be read in
+           the prototypes and might have side effects */
+        if (len != count32)
+            goto general_case;
+        /* Handle fast arrays explicitly */
+        for (i = 0; i < count32; i++) {
+            if (JS_DefinePropertyValueUint32(ctx, sp[-3], pos++,
+                                             JS_DupValue(ctx, arrp[i]), JS_PROP_C_W_E) < 0)
+                goto exception;
+        }
+    } else {
+    general_case:
+        for (;;) {
+            BOOL done;
+            value = JS_IteratorNext(ctx, enumobj, method, 0, NULL, &done);
+            if (JS_IsException(value))
+                goto exception;
+            if (done) {
+                /* value is JS_UNDEFINED */
+                break;
+            }
+            if (JS_DefinePropertyValueUint32(ctx, sp[-3], pos++, value, JS_PROP_C_W_E) < 0)
+                goto exception;
+        }
+    }
+    /* Note: could raise an error if too many elements */
+    sp[-2] = JS_NewInt32(ctx, pos);
+    JS_FreeValue(ctx, enumobj);
+    JS_FreeValue(ctx, method);
+    return 0;
+
+exception:
+    JS_IteratorClose(ctx, enumobj, TRUE);
+    JS_FreeValue(ctx, enumobj);
+    JS_FreeValue(ctx, method);
+    return -1;
+}
+
+static __exception int JS_CopyDataProperties(JSContext *ctx,
+                                             JSValueConst target,
+                                             JSValueConst source,
+                                             JSValueConst excluded,
+                                             BOOL setprop)
+{
+    JSPropertyEnum *tab_atom;
+    JSValue val;
+    uint32_t i, tab_atom_count;
+    JSObject *p;
+    JSObject *pexcl = NULL;
+    int ret, gpn_flags;
+    JSPropertyDescriptor desc;
+    BOOL is_enumerable;
+
+    if (JS_VALUE_GET_TAG(source) != JS_TAG_OBJECT)
+        return 0;
+
+    if (JS_VALUE_GET_TAG(excluded) == JS_TAG_OBJECT)
+        pexcl = JS_VALUE_GET_OBJ(excluded);
+
+    p = JS_VALUE_GET_OBJ(source);
+
+    gpn_flags = JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK | JS_GPN_ENUM_ONLY;
+    if (p->is_exotic) {
+        const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+        /* cannot use JS_GPN_ENUM_ONLY with e.g. proxies because it
+           introduces a visible change */
+        if (em && em->get_own_property_names) {
+            gpn_flags &= ~JS_GPN_ENUM_ONLY;
+        }
+    }
+    if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count, p,
+                                       gpn_flags))
+        return -1;
+
+    for (i = 0; i < tab_atom_count; i++) {
+        if (pexcl) {
+            ret = JS_GetOwnPropertyInternal(ctx, NULL, pexcl, tab_atom[i].atom);
+            if (ret) {
+                if (ret < 0)
+                    goto exception;
+                continue;
+            }
+        }
+        if (!(gpn_flags & JS_GPN_ENUM_ONLY)) {
+            /* test if the property is enumerable */
+            ret = JS_GetOwnPropertyInternal(ctx, &desc, p, tab_atom[i].atom);
+            if (ret < 0)
+                goto exception;
+            if (!ret)
+                continue;
+            is_enumerable = (desc.flags & JS_PROP_ENUMERABLE) != 0;
+            js_free_desc(ctx, &desc);
+            if (!is_enumerable)
+                continue;
+        }
+        val = JS_GetProperty(ctx, source, tab_atom[i].atom);
+        if (JS_IsException(val))
+            goto exception;
+        if (setprop)
+            ret = JS_SetProperty(ctx, target, tab_atom[i].atom, val);
+        else
+            ret = JS_DefinePropertyValue(ctx, target, tab_atom[i].atom, val,
+                                         JS_PROP_C_W_E);
+        if (ret < 0)
+            goto exception;
+    }
+    js_free_prop_enum(ctx, tab_atom, tab_atom_count);
+    return 0;
+ exception:
+    js_free_prop_enum(ctx, tab_atom, tab_atom_count);
+    return -1;
+}
+
+/* only valid inside C functions */
+static JSValueConst JS_GetActiveFunction(JSContext *ctx)
+{
+    return ctx->rt->current_stack_frame->cur_func;
+}
+
+static JSVarRef *get_var_ref(JSContext *ctx, JSStackFrame *sf,
+                             int var_idx, BOOL is_arg)
+{
+    JSVarRef *var_ref;
+    struct list_head *el;
+
+    list_for_each(el, &sf->var_ref_list) {
+        var_ref = list_entry(el, JSVarRef, var_ref_link);
+        if (var_ref->var_idx == var_idx && var_ref->is_arg == is_arg) {
+            var_ref->header.ref_count++;
+            return var_ref;
+        }
+    }
+    /* create a new one */
+    var_ref = js_malloc(ctx, sizeof(JSVarRef));
+    if (!var_ref)
+        return NULL;
+    var_ref->header.ref_count = 1;
+    add_gc_object(ctx->rt, &var_ref->header, JS_GC_OBJ_TYPE_VAR_REF);
+    var_ref->is_detached = FALSE;
+    var_ref->is_arg = is_arg;
+    var_ref->var_idx = var_idx;
+    list_add_tail(&var_ref->var_ref_link, &sf->var_ref_list);
+    if (sf->js_mode & JS_MODE_ASYNC) {
+        /* The stack frame is detached and may be destroyed at any
+           time so its reference count must be increased. Calling
+           close_var_refs() when destroying the stack frame is not
+           possible because it would change the graph between the GC
+           objects. Another solution could be to temporarily detach
+           the JSVarRef of async functions during the GC. It would
+           have the advantage of allowing the release of unused stack
+           frames in a cycle. */
+        var_ref->async_func = container_of(sf, JSAsyncFunctionState, frame);
+        var_ref->async_func->header.ref_count++;
+    } else {
+        var_ref->async_func = NULL;
+    }
+    if (is_arg)
+        var_ref->pvalue = &sf->arg_buf[var_idx];
+    else
+        var_ref->pvalue = &sf->var_buf[var_idx];
+    return var_ref;
+}
+
+static JSValue js_closure2(JSContext *ctx, JSValue func_obj,
+                           JSFunctionBytecode *b,
+                           JSVarRef **cur_var_refs,
+                           JSStackFrame *sf)
+{
+    JSObject *p;
+    JSVarRef **var_refs;
+    int i;
+
+    p = JS_VALUE_GET_OBJ(func_obj);
+    p->u.func.function_bytecode = b;
+    p->u.func.home_object = NULL;
+    p->u.func.var_refs = NULL;
+    if (b->closure_var_count) {
+        var_refs = js_mallocz(ctx, sizeof(var_refs[0]) * b->closure_var_count);
+        if (!var_refs)
+            goto fail;
+        p->u.func.var_refs = var_refs;
+        for(i = 0; i < b->closure_var_count; i++) {
+            JSClosureVar *cv = &b->closure_var[i];
+            JSVarRef *var_ref;
+            if (cv->is_local) {
+                /* reuse the existing variable reference if it already exists */
+                var_ref = get_var_ref(ctx, sf, cv->var_idx, cv->is_arg);
+                if (!var_ref)
+                    goto fail;
+            } else {
+                var_ref = cur_var_refs[cv->var_idx];
+                var_ref->header.ref_count++;
+            }
+            var_refs[i] = var_ref;
+        }
+    }
+    return func_obj;
+ fail:
+    /* bfunc is freed when func_obj is freed */
+    JS_FreeValue(ctx, func_obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_instantiate_prototype(JSContext *ctx, JSObject *p, JSAtom atom, void *opaque)
+{
+    JSValue obj, this_val;
+    int ret;
+
+    this_val = JS_MKPTR(JS_TAG_OBJECT, p);
+    obj = JS_NewObject(ctx);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    set_cycle_flag(ctx, obj);
+    set_cycle_flag(ctx, this_val);
+    ret = JS_DefinePropertyValue(ctx, obj, JS_ATOM_constructor,
+                                 JS_DupValue(ctx, this_val),
+                                 JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    if (ret < 0) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    return obj;
+}
+
+static const uint16_t func_kind_to_class_id[] = {
+    [JS_FUNC_NORMAL] = JS_CLASS_BYTECODE_FUNCTION,
+    [JS_FUNC_GENERATOR] = JS_CLASS_GENERATOR_FUNCTION,
+    [JS_FUNC_ASYNC] = JS_CLASS_ASYNC_FUNCTION,
+    [JS_FUNC_ASYNC_GENERATOR] = JS_CLASS_ASYNC_GENERATOR_FUNCTION,
+};
+
+static JSValue js_closure(JSContext *ctx, JSValue bfunc,
+                          JSVarRef **cur_var_refs,
+                          JSStackFrame *sf)
+{
+    JSFunctionBytecode *b;
+    JSValue func_obj;
+    JSAtom name_atom;
+
+    b = JS_VALUE_GET_PTR(bfunc);
+    func_obj = JS_NewObjectClass(ctx, func_kind_to_class_id[b->func_kind]);
+    if (JS_IsException(func_obj)) {
+        JS_FreeValue(ctx, bfunc);
+        return JS_EXCEPTION;
+    }
+    func_obj = js_closure2(ctx, func_obj, b, cur_var_refs, sf);
+    if (JS_IsException(func_obj)) {
+        /* bfunc has been freed */
+        goto fail;
+    }
+    name_atom = b->func_name;
+    if (name_atom == JS_ATOM_NULL)
+        name_atom = JS_ATOM_empty_string;
+    js_function_set_properties(ctx, func_obj, name_atom,
+                               b->defined_arg_count);
+
+    if (b->func_kind & JS_FUNC_GENERATOR) {
+        JSValue proto;
+        int proto_class_id;
+        /* generators have a prototype field which is used as
+           prototype for the generator object */
+        if (b->func_kind == JS_FUNC_ASYNC_GENERATOR)
+            proto_class_id = JS_CLASS_ASYNC_GENERATOR;
+        else
+            proto_class_id = JS_CLASS_GENERATOR;
+        proto = JS_NewObjectProto(ctx, ctx->class_proto[proto_class_id]);
+        if (JS_IsException(proto))
+            goto fail;
+        JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_prototype, proto,
+                               JS_PROP_WRITABLE);
+    } else if (b->has_prototype) {
+        /* add the 'prototype' property: delay instantiation to avoid
+           creating cycles for every javascript function. The prototype
+           object is created on the fly when first accessed */
+        JS_SetConstructorBit(ctx, func_obj, TRUE);
+        JS_DefineAutoInitProperty(ctx, func_obj, JS_ATOM_prototype,
+                                  JS_AUTOINIT_ID_PROTOTYPE, NULL,
+                                  JS_PROP_WRITABLE);
+    }
+    return func_obj;
+ fail:
+    /* bfunc is freed when func_obj is freed */
+    JS_FreeValue(ctx, func_obj);
+    return JS_EXCEPTION;
+}
+
+#define JS_DEFINE_CLASS_HAS_HERITAGE     (1 << 0)
+
+static int js_op_define_class(JSContext *ctx, JSValue *sp,
+                              JSAtom class_name, int class_flags,
+                              JSVarRef **cur_var_refs,
+                              JSStackFrame *sf, BOOL is_computed_name)
+{
+    JSValue bfunc, parent_class, proto = JS_UNDEFINED;
+    JSValue ctor = JS_UNDEFINED, parent_proto = JS_UNDEFINED;
+    JSFunctionBytecode *b;
+
+    parent_class = sp[-2];
+    bfunc = sp[-1];
+
+    if (class_flags & JS_DEFINE_CLASS_HAS_HERITAGE) {
+        if (JS_IsNull(parent_class)) {
+            parent_proto = JS_NULL;
+            parent_class = JS_DupValue(ctx, ctx->function_proto);
+        } else {
+            if (!JS_IsConstructor(ctx, parent_class)) {
+                JS_ThrowTypeError(ctx, "parent class must be constructor");
+                goto fail;
+            }
+            parent_proto = JS_GetProperty(ctx, parent_class, JS_ATOM_prototype);
+            if (JS_IsException(parent_proto))
+                goto fail;
+            if (!JS_IsNull(parent_proto) && !JS_IsObject(parent_proto)) {
+                JS_ThrowTypeError(ctx, "parent prototype must be an object or null");
+                goto fail;
+            }
+        }
+    } else {
+        /* parent_class is JS_UNDEFINED in this case */
+        parent_proto = JS_DupValue(ctx, ctx->class_proto[JS_CLASS_OBJECT]);
+        parent_class = JS_DupValue(ctx, ctx->function_proto);
+    }
+    proto = JS_NewObjectProto(ctx, parent_proto);
+    if (JS_IsException(proto))
+        goto fail;
+
+    b = JS_VALUE_GET_PTR(bfunc);
+    assert(b->func_kind == JS_FUNC_NORMAL);
+    ctor = JS_NewObjectProtoClass(ctx, parent_class,
+                                  JS_CLASS_BYTECODE_FUNCTION);
+    if (JS_IsException(ctor))
+        goto fail;
+    ctor = js_closure2(ctx, ctor, b, cur_var_refs, sf);
+    bfunc = JS_UNDEFINED;
+    if (JS_IsException(ctor))
+        goto fail;
+    js_method_set_home_object(ctx, ctor, proto);
+    JS_SetConstructorBit(ctx, ctor, TRUE);
+
+    JS_DefinePropertyValue(ctx, ctor, JS_ATOM_length,
+                           JS_NewInt32(ctx, b->defined_arg_count),
+                           JS_PROP_CONFIGURABLE);
+
+    if (is_computed_name) {
+        if (JS_DefineObjectNameComputed(ctx, ctor, sp[-3],
+                                        JS_PROP_CONFIGURABLE) < 0)
+            goto fail;
+    } else {
+        if (JS_DefineObjectName(ctx, ctor, class_name, JS_PROP_CONFIGURABLE) < 0)
+            goto fail;
+    }
+
+    /* the constructor property must be first. It can be overriden by
+       computed property names */
+    if (JS_DefinePropertyValue(ctx, proto, JS_ATOM_constructor,
+                               JS_DupValue(ctx, ctor),
+                               JS_PROP_CONFIGURABLE |
+                               JS_PROP_WRITABLE | JS_PROP_THROW) < 0)
+        goto fail;
+    /* set the prototype property */
+    if (JS_DefinePropertyValue(ctx, ctor, JS_ATOM_prototype,
+                               JS_DupValue(ctx, proto), JS_PROP_THROW) < 0)
+        goto fail;
+    set_cycle_flag(ctx, ctor);
+    set_cycle_flag(ctx, proto);
+
+    JS_FreeValue(ctx, parent_proto);
+    JS_FreeValue(ctx, parent_class);
+
+    sp[-2] = ctor;
+    sp[-1] = proto;
+    return 0;
+ fail:
+    JS_FreeValue(ctx, parent_class);
+    JS_FreeValue(ctx, parent_proto);
+    JS_FreeValue(ctx, bfunc);
+    JS_FreeValue(ctx, proto);
+    JS_FreeValue(ctx, ctor);
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static void close_var_refs(JSRuntime *rt, JSStackFrame *sf)
+{
+    struct list_head *el, *el1;
+    JSVarRef *var_ref;
+    int var_idx;
+
+    list_for_each_safe(el, el1, &sf->var_ref_list) {
+        var_ref = list_entry(el, JSVarRef, var_ref_link);
+        /* no need to unlink var_ref->var_ref_link as the list is never used afterwards */
+        if (var_ref->async_func)
+            async_func_free(rt, var_ref->async_func);
+        var_idx = var_ref->var_idx;
+        if (var_ref->is_arg)
+            var_ref->value = JS_DupValueRT(rt, sf->arg_buf[var_idx]);
+        else
+            var_ref->value = JS_DupValueRT(rt, sf->var_buf[var_idx]);
+        var_ref->pvalue = &var_ref->value;
+        /* the reference is no longer to a local variable */
+        var_ref->is_detached = TRUE;
+    }
+}
+
+static void close_lexical_var(JSContext *ctx, JSStackFrame *sf, int idx, int is_arg)
+{
+    struct list_head *el, *el1;
+    JSVarRef *var_ref;
+    int var_idx = idx;
+
+    list_for_each_safe(el, el1, &sf->var_ref_list) {
+        var_ref = list_entry(el, JSVarRef, var_ref_link);
+        if (var_idx == var_ref->var_idx && var_ref->is_arg == is_arg) {
+            list_del(&var_ref->var_ref_link);
+            if (var_ref->async_func)
+                async_func_free(ctx->rt, var_ref->async_func);
+            var_ref->value = JS_DupValue(ctx, sf->var_buf[var_idx]);
+            var_ref->pvalue = &var_ref->value;
+            /* the reference is no longer to a local variable */
+            var_ref->is_detached = TRUE;
+        }
+    }
+}
+
+#define JS_CALL_FLAG_COPY_ARGV   (1 << 1)
+#define JS_CALL_FLAG_GENERATOR   (1 << 2)
+
+static JSValue js_call_c_function(JSContext *ctx, JSValueConst func_obj,
+                                  JSValueConst this_obj,
+                                  int argc, JSValueConst *argv, int flags)
+{
+    JSRuntime *rt = ctx->rt;
+    JSCFunctionType func;
+    JSObject *p;
+    JSStackFrame sf_s, *sf = &sf_s, *prev_sf;
+    JSValue ret_val;
+    JSValueConst *arg_buf;
+    int arg_count, i;
+    JSCFunctionEnum cproto;
+
+    p = JS_VALUE_GET_OBJ(func_obj);
+    cproto = p->u.cfunc.cproto;
+    arg_count = p->u.cfunc.length;
+
+    /* better to always check stack overflow */
+    if (js_check_stack_overflow(rt, sizeof(arg_buf[0]) * arg_count))
+        return JS_ThrowStackOverflow(ctx);
+
+    prev_sf = rt->current_stack_frame;
+    sf->prev_frame = prev_sf;
+    rt->current_stack_frame = sf;
+    ctx = p->u.cfunc.realm; /* change the current realm */
+
+#ifdef CONFIG_BIGNUM
+    /* we only propagate the bignum mode as some runtime functions
+       test it */
+    if (prev_sf)
+        sf->js_mode = prev_sf->js_mode & JS_MODE_MATH;
+    else
+        sf->js_mode = 0;
+#else
+    sf->js_mode = 0;
+#endif
+    sf->cur_func = func_obj;
+    sf->arg_count = argc;
+    arg_buf = argv;
+
+    if (unlikely(argc < arg_count)) {
+        /* ensure that at least argc_count arguments are readable */
+        arg_buf = alloca(sizeof(arg_buf[0]) * arg_count);
+        for(i = 0; i < argc; i++)
+            arg_buf[i] = argv[i];
+        for(i = argc; i < arg_count; i++)
+            arg_buf[i] = JS_UNDEFINED;
+        sf->arg_count = arg_count;
+    }
+    sf->arg_buf = (JSValue*)arg_buf;
+
+    func = p->u.cfunc.c_function;
+    switch(cproto) {
+    case JS_CFUNC_constructor:
+    case JS_CFUNC_constructor_or_func:
+        if (!(flags & JS_CALL_FLAG_CONSTRUCTOR)) {
+            if (cproto == JS_CFUNC_constructor) {
+            not_a_constructor:
+                ret_val = JS_ThrowTypeError(ctx, "must be called with new");
+                break;
+            } else {
+                this_obj = JS_UNDEFINED;
+            }
+        }
+        /* here this_obj is new_target */
+        /* fall thru */
+    case JS_CFUNC_generic:
+        ret_val = func.generic(ctx, this_obj, argc, arg_buf);
+        break;
+    case JS_CFUNC_constructor_magic:
+    case JS_CFUNC_constructor_or_func_magic:
+        if (!(flags & JS_CALL_FLAG_CONSTRUCTOR)) {
+            if (cproto == JS_CFUNC_constructor_magic) {
+                goto not_a_constructor;
+            } else {
+                this_obj = JS_UNDEFINED;
+            }
+        }
+        /* fall thru */
+    case JS_CFUNC_generic_magic:
+        ret_val = func.generic_magic(ctx, this_obj, argc, arg_buf,
+                                     p->u.cfunc.magic);
+        break;
+    case JS_CFUNC_getter:
+        ret_val = func.getter(ctx, this_obj);
+        break;
+    case JS_CFUNC_setter:
+        ret_val = func.setter(ctx, this_obj, arg_buf[0]);
+        break;
+    case JS_CFUNC_getter_magic:
+        ret_val = func.getter_magic(ctx, this_obj, p->u.cfunc.magic);
+        break;
+    case JS_CFUNC_setter_magic:
+        ret_val = func.setter_magic(ctx, this_obj, arg_buf[0], p->u.cfunc.magic);
+        break;
+    case JS_CFUNC_f_f:
+        {
+            double d1;
+
+            if (unlikely(JS_ToFloat64(ctx, &d1, arg_buf[0]))) {
+                ret_val = JS_EXCEPTION;
+                break;
+            }
+            ret_val = JS_NewFloat64(ctx, func.f_f(d1));
+        }
+        break;
+    case JS_CFUNC_f_f_f:
+        {
+            double d1, d2;
+
+            if (unlikely(JS_ToFloat64(ctx, &d1, arg_buf[0]))) {
+                ret_val = JS_EXCEPTION;
+                break;
+            }
+            if (unlikely(JS_ToFloat64(ctx, &d2, arg_buf[1]))) {
+                ret_val = JS_EXCEPTION;
+                break;
+            }
+            ret_val = JS_NewFloat64(ctx, func.f_f_f(d1, d2));
+        }
+        break;
+    case JS_CFUNC_iterator_next:
+        {
+            int done;
+            ret_val = func.iterator_next(ctx, this_obj, argc, arg_buf,
+                                         &done, p->u.cfunc.magic);
+            if (!JS_IsException(ret_val) && done != 2) {
+                ret_val = js_create_iterator_result(ctx, ret_val, done);
+            }
+        }
+        break;
+    default:
+        abort();
+    }
+
+    rt->current_stack_frame = sf->prev_frame;
+    return ret_val;
+}
+
+static JSValue js_call_bound_function(JSContext *ctx, JSValueConst func_obj,
+                                      JSValueConst this_obj,
+                                      int argc, JSValueConst *argv, int flags)
+{
+    JSObject *p;
+    JSBoundFunction *bf;
+    JSValueConst *arg_buf, new_target;
+    int arg_count, i;
+
+    p = JS_VALUE_GET_OBJ(func_obj);
+    bf = p->u.bound_function;
+    arg_count = bf->argc + argc;
+    if (js_check_stack_overflow(ctx->rt, sizeof(JSValue) * arg_count))
+        return JS_ThrowStackOverflow(ctx);
+    arg_buf = alloca(sizeof(JSValue) * arg_count);
+    for(i = 0; i < bf->argc; i++) {
+        arg_buf[i] = bf->argv[i];
+    }
+    for(i = 0; i < argc; i++) {
+        arg_buf[bf->argc + i] = argv[i];
+    }
+    if (flags & JS_CALL_FLAG_CONSTRUCTOR) {
+        new_target = this_obj;
+        if (js_same_value(ctx, func_obj, new_target))
+            new_target = bf->func_obj;
+        return JS_CallConstructor2(ctx, bf->func_obj, new_target,
+                                   arg_count, arg_buf);
+    } else {
+        return JS_Call(ctx, bf->func_obj, bf->this_val,
+                       arg_count, arg_buf);
+    }
+}
+
+/* argument of OP_special_object */
+typedef enum {
+    OP_SPECIAL_OBJECT_ARGUMENTS,
+    OP_SPECIAL_OBJECT_MAPPED_ARGUMENTS,
+    OP_SPECIAL_OBJECT_THIS_FUNC,
+    OP_SPECIAL_OBJECT_NEW_TARGET,
+    OP_SPECIAL_OBJECT_HOME_OBJECT,
+    OP_SPECIAL_OBJECT_VAR_OBJECT,
+    OP_SPECIAL_OBJECT_IMPORT_META,
+} OPSpecialObjectEnum;
+
+#define FUNC_RET_AWAIT         0
+#define FUNC_RET_YIELD         1
+#define FUNC_RET_YIELD_STAR    2
+#define FUNC_RET_INITIAL_YIELD 3
+
+/* argv[] is modified if (flags & JS_CALL_FLAG_COPY_ARGV) = 0. */
+static JSValue JS_CallInternal(JSContext *caller_ctx, JSValueConst func_obj,
+                               JSValueConst this_obj, JSValueConst new_target,
+                               int argc, JSValue *argv, int flags)
+{
+    JSRuntime *rt = caller_ctx->rt;
+    JSContext *ctx;
+    JSObject *p;
+    JSFunctionBytecode *b;
+    JSStackFrame sf_s, *sf = &sf_s;
+    const uint8_t *pc;
+    int opcode, arg_allocated_size, i;
+    JSValue *local_buf, *stack_buf, *var_buf, *arg_buf, *sp, ret_val, *pval;
+    JSVarRef **var_refs;
+    size_t alloca_size;
+
+#if !DIRECT_DISPATCH
+#define SWITCH(pc)      switch (opcode = *pc++)
+#define CASE(op)        case op
+#define DEFAULT         default
+#define BREAK           break
+#else
+    static const void * const dispatch_table[256] = {
+#define DEF(id, size, n_pop, n_push, f) && case_OP_ ## id,
+#if SHORT_OPCODES
+#define def(id, size, n_pop, n_push, f)
+#else
+#define def(id, size, n_pop, n_push, f) && case_default,
+#endif
+#include "quickjs-opcode.h"
+        [ OP_COUNT ... 255 ] = &&case_default
+    };
+#define SWITCH(pc)      goto *dispatch_table[opcode = *pc++];
+#define CASE(op)        case_ ## op
+#define DEFAULT         case_default
+#define BREAK           SWITCH(pc)
+#endif
+
+    if (js_poll_interrupts(caller_ctx))
+        return JS_EXCEPTION;
+    if (unlikely(JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)) {
+        if (flags & JS_CALL_FLAG_GENERATOR) {
+            JSAsyncFunctionState *s = JS_VALUE_GET_PTR(func_obj);
+            /* func_obj get contains a pointer to JSFuncAsyncState */
+            /* the stack frame is already allocated */
+            sf = &s->frame;
+            p = JS_VALUE_GET_OBJ(sf->cur_func);
+            b = p->u.func.function_bytecode;
+            ctx = b->realm;
+            var_refs = p->u.func.var_refs;
+            local_buf = arg_buf = sf->arg_buf;
+            var_buf = sf->var_buf;
+            stack_buf = sf->var_buf + b->var_count;
+            sp = sf->cur_sp;
+            sf->cur_sp = NULL; /* cur_sp is NULL if the function is running */
+            pc = sf->cur_pc;
+            sf->prev_frame = rt->current_stack_frame;
+            rt->current_stack_frame = sf;
+            if (s->throw_flag)
+                goto exception;
+            else
+                goto restart;
+        } else {
+            goto not_a_function;
+        }
+    }
+    p = JS_VALUE_GET_OBJ(func_obj);
+    if (unlikely(p->class_id != JS_CLASS_BYTECODE_FUNCTION)) {
+        JSClassCall *call_func;
+        call_func = rt->class_array[p->class_id].call;
+        if (!call_func) {
+        not_a_function:
+            return JS_ThrowTypeError(caller_ctx, "not a function");
+        }
+        return call_func(caller_ctx, func_obj, this_obj, argc,
+                         (JSValueConst *)argv, flags);
+    }
+    b = p->u.func.function_bytecode;
+
+    if (unlikely(argc < b->arg_count || (flags & JS_CALL_FLAG_COPY_ARGV))) {
+        arg_allocated_size = b->arg_count;
+    } else {
+        arg_allocated_size = 0;
+    }
+
+    alloca_size = sizeof(JSValue) * (arg_allocated_size + b->var_count +
+                                     b->stack_size);
+    if (js_check_stack_overflow(rt, alloca_size))
+        return JS_ThrowStackOverflow(caller_ctx);
+
+    sf->js_mode = b->js_mode;
+    arg_buf = argv;
+    sf->arg_count = argc;
+    sf->cur_func = func_obj;
+    init_list_head(&sf->var_ref_list);
+    var_refs = p->u.func.var_refs;
+
+    local_buf = alloca(alloca_size);
+    if (unlikely(arg_allocated_size)) {
+        int n = min_int(argc, b->arg_count);
+        arg_buf = local_buf;
+        for(i = 0; i < n; i++)
+            arg_buf[i] = JS_DupValue(caller_ctx, argv[i]);
+        for(; i < b->arg_count; i++)
+            arg_buf[i] = JS_UNDEFINED;
+        sf->arg_count = b->arg_count;
+    }
+    var_buf = local_buf + arg_allocated_size;
+    sf->var_buf = var_buf;
+    sf->arg_buf = arg_buf;
+
+    for(i = 0; i < b->var_count; i++)
+        var_buf[i] = JS_UNDEFINED;
+
+    stack_buf = var_buf + b->var_count;
+    sp = stack_buf;
+    pc = b->byte_code_buf;
+    sf->prev_frame = rt->current_stack_frame;
+    rt->current_stack_frame = sf;
+    ctx = b->realm; /* set the current realm */
+
+    if (ctx->handleFunctionEntered)
+        ctx->handleFunctionEntered(ctx, this_obj);
+
+ restart:
+    for(;;) {
+        int call_argc;
+        JSValue *call_argv;
+
+        SWITCH(pc) {
+        CASE(OP_push_i32):
+            *sp++ = JS_NewInt32(ctx, get_u32(pc));
+            pc += 4;
+            BREAK;
+        CASE(OP_push_const):
+            *sp++ = JS_DupValue(ctx, b->cpool[get_u32(pc)]);
+            pc += 4;
+            BREAK;
+#if SHORT_OPCODES
+        CASE(OP_push_minus1):
+        CASE(OP_push_0):
+        CASE(OP_push_1):
+        CASE(OP_push_2):
+        CASE(OP_push_3):
+        CASE(OP_push_4):
+        CASE(OP_push_5):
+        CASE(OP_push_6):
+        CASE(OP_push_7):
+            *sp++ = JS_NewInt32(ctx, opcode - OP_push_0);
+            BREAK;
+        CASE(OP_push_i8):
+            *sp++ = JS_NewInt32(ctx, get_i8(pc));
+            pc += 1;
+            BREAK;
+        CASE(OP_push_i16):
+            *sp++ = JS_NewInt32(ctx, get_i16(pc));
+            pc += 2;
+            BREAK;
+        CASE(OP_push_const8):
+            *sp++ = JS_DupValue(ctx, b->cpool[*pc++]);
+            BREAK;
+        CASE(OP_fclosure8):
+            *sp++ = js_closure(ctx, JS_DupValue(ctx, b->cpool[*pc++]), var_refs, sf);
+            if (unlikely(JS_IsException(sp[-1])))
+                goto exception;
+            BREAK;
+        CASE(OP_push_empty_string):
+            *sp++ = JS_AtomToString(ctx, JS_ATOM_empty_string);
+            BREAK;
+        CASE(OP_get_length):
+            {
+                JSValue val;
+
+                val = JS_GetProperty(ctx, sp[-1], JS_ATOM_length);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = val;
+            }
+            BREAK;
+#endif
+        CASE(OP_push_atom_value):
+            *sp++ = JS_AtomToValue(ctx, get_u32(pc));
+            pc += 4;
+            BREAK;
+        CASE(OP_undefined):
+            *sp++ = JS_UNDEFINED;
+            BREAK;
+        CASE(OP_null):
+            *sp++ = JS_NULL;
+            BREAK;
+        CASE(OP_push_this):
+            /* OP_push_this is only called at the start of a function */
+            {
+                JSValue val;
+                if (!(b->js_mode & JS_MODE_STRICT)) {
+                    uint32_t tag = JS_VALUE_GET_TAG(this_obj);
+                    if (likely(tag == JS_TAG_OBJECT))
+                        goto normal_this;
+                    if (tag == JS_TAG_NULL || tag == JS_TAG_UNDEFINED) {
+                        val = JS_DupValue(ctx, ctx->global_obj);
+                    } else {
+                        val = JS_ToObject(ctx, this_obj);
+                        if (JS_IsException(val))
+                            goto exception;
+                    }
+                } else {
+                normal_this:
+                    val = JS_DupValue(ctx, this_obj);
+                }
+                *sp++ = val;
+            }
+            BREAK;
+        CASE(OP_push_false):
+            *sp++ = JS_FALSE;
+            BREAK;
+        CASE(OP_push_true):
+            *sp++ = JS_TRUE;
+            BREAK;
+        CASE(OP_object):
+            *sp++ = JS_NewObject(ctx);
+            if (unlikely(JS_IsException(sp[-1])))
+                goto exception;
+            BREAK;
+        CASE(OP_special_object):
+            {
+                int arg = *pc++;
+                switch(arg) {
+                case OP_SPECIAL_OBJECT_ARGUMENTS:
+                    *sp++ = js_build_arguments(ctx, argc, (JSValueConst *)argv);
+                    if (unlikely(JS_IsException(sp[-1])))
+                        goto exception;
+                    break;
+                case OP_SPECIAL_OBJECT_MAPPED_ARGUMENTS:
+                    *sp++ = js_build_mapped_arguments(ctx, argc, (JSValueConst *)argv,
+                                                      sf, min_int(argc, b->arg_count));
+                    if (unlikely(JS_IsException(sp[-1])))
+                        goto exception;
+                    break;
+                case OP_SPECIAL_OBJECT_THIS_FUNC:
+                    *sp++ = JS_DupValue(ctx, sf->cur_func);
+                    break;
+                case OP_SPECIAL_OBJECT_NEW_TARGET:
+                    *sp++ = JS_DupValue(ctx, new_target);
+                    break;
+                case OP_SPECIAL_OBJECT_HOME_OBJECT:
+                    {
+                        JSObject *p1;
+                        p1 = p->u.func.home_object;
+                        if (unlikely(!p1))
+                            *sp++ = JS_UNDEFINED;
+                        else
+                            *sp++ = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p1));
+                    }
+                    break;
+                case OP_SPECIAL_OBJECT_VAR_OBJECT:
+                    *sp++ = JS_NewObjectProto(ctx, JS_NULL);
+                    if (unlikely(JS_IsException(sp[-1])))
+                        goto exception;
+                    break;
+                case OP_SPECIAL_OBJECT_IMPORT_META:
+                    *sp++ = js_import_meta(ctx);
+                    if (unlikely(JS_IsException(sp[-1])))
+                        goto exception;
+                    break;
+                default:
+                    abort();
+                }
+            }
+            BREAK;
+        CASE(OP_rest):
+            {
+                int first = get_u16(pc);
+                pc += 2;
+                *sp++ = js_build_rest(ctx, first, argc, (JSValueConst *)argv);
+                if (unlikely(JS_IsException(sp[-1])))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_drop):
+            JS_FreeValue(ctx, sp[-1]);
+            sp--;
+            BREAK;
+        CASE(OP_nip):
+            JS_FreeValue(ctx, sp[-2]);
+            sp[-2] = sp[-1];
+            sp--;
+            BREAK;
+        CASE(OP_nip1): /* a b c -> b c */
+            JS_FreeValue(ctx, sp[-3]);
+            sp[-3] = sp[-2];
+            sp[-2] = sp[-1];
+            sp--;
+            BREAK;
+        CASE(OP_dup):
+            sp[0] = JS_DupValue(ctx, sp[-1]);
+            sp++;
+            BREAK;
+        CASE(OP_dup2): /* a b -> a b a b */
+            sp[0] = JS_DupValue(ctx, sp[-2]);
+            sp[1] = JS_DupValue(ctx, sp[-1]);
+            sp += 2;
+            BREAK;
+        CASE(OP_dup3): /* a b c -> a b c a b c */
+            sp[0] = JS_DupValue(ctx, sp[-3]);
+            sp[1] = JS_DupValue(ctx, sp[-2]);
+            sp[2] = JS_DupValue(ctx, sp[-1]);
+            sp += 3;
+            BREAK;
+        CASE(OP_dup1): /* a b -> a a b */
+            sp[0] = sp[-1];
+            sp[-1] = JS_DupValue(ctx, sp[-2]);
+            sp++;
+            BREAK;
+        CASE(OP_insert2): /* obj a -> a obj a (dup_x1) */
+            sp[0] = sp[-1];
+            sp[-1] = sp[-2];
+            sp[-2] = JS_DupValue(ctx, sp[0]);
+            sp++;
+            BREAK;
+        CASE(OP_insert3): /* obj prop a -> a obj prop a (dup_x2) */
+            sp[0] = sp[-1];
+            sp[-1] = sp[-2];
+            sp[-2] = sp[-3];
+            sp[-3] = JS_DupValue(ctx, sp[0]);
+            sp++;
+            BREAK;
+        CASE(OP_insert4): /* this obj prop a -> a this obj prop a */
+            sp[0] = sp[-1];
+            sp[-1] = sp[-2];
+            sp[-2] = sp[-3];
+            sp[-3] = sp[-4];
+            sp[-4] = JS_DupValue(ctx, sp[0]);
+            sp++;
+            BREAK;
+        CASE(OP_perm3): /* obj a b -> a obj b (213) */
+            {
+                JSValue tmp;
+                tmp = sp[-2];
+                sp[-2] = sp[-3];
+                sp[-3] = tmp;
+            }
+            BREAK;
+        CASE(OP_rot3l): /* x a b -> a b x (231) */
+            {
+                JSValue tmp;
+                tmp = sp[-3];
+                sp[-3] = sp[-2];
+                sp[-2] = sp[-1];
+                sp[-1] = tmp;
+            }
+            BREAK;
+        CASE(OP_rot4l): /* x a b c -> a b c x */
+            {
+                JSValue tmp;
+                tmp = sp[-4];
+                sp[-4] = sp[-3];
+                sp[-3] = sp[-2];
+                sp[-2] = sp[-1];
+                sp[-1] = tmp;
+            }
+            BREAK;
+        CASE(OP_rot5l): /* x a b c d -> a b c d x */
+            {
+                JSValue tmp;
+                tmp = sp[-5];
+                sp[-5] = sp[-4];
+                sp[-4] = sp[-3];
+                sp[-3] = sp[-2];
+                sp[-2] = sp[-1];
+                sp[-1] = tmp;
+            }
+            BREAK;
+        CASE(OP_rot3r): /* a b x -> x a b (312) */
+            {
+                JSValue tmp;
+                tmp = sp[-1];
+                sp[-1] = sp[-2];
+                sp[-2] = sp[-3];
+                sp[-3] = tmp;
+            }
+            BREAK;
+        CASE(OP_perm4): /* obj prop a b -> a obj prop b */
+            {
+                JSValue tmp;
+                tmp = sp[-2];
+                sp[-2] = sp[-3];
+                sp[-3] = sp[-4];
+                sp[-4] = tmp;
+            }
+            BREAK;
+        CASE(OP_perm5): /* this obj prop a b -> a this obj prop b */
+            {
+                JSValue tmp;
+                tmp = sp[-2];
+                sp[-2] = sp[-3];
+                sp[-3] = sp[-4];
+                sp[-4] = sp[-5];
+                sp[-5] = tmp;
+            }
+            BREAK;
+        CASE(OP_swap): /* a b -> b a */
+            {
+                JSValue tmp;
+                tmp = sp[-2];
+                sp[-2] = sp[-1];
+                sp[-1] = tmp;
+            }
+            BREAK;
+        CASE(OP_swap2): /* a b c d -> c d a b */
+            {
+                JSValue tmp1, tmp2;
+                tmp1 = sp[-4];
+                tmp2 = sp[-3];
+                sp[-4] = sp[-2];
+                sp[-3] = sp[-1];
+                sp[-2] = tmp1;
+                sp[-1] = tmp2;
+            }
+            BREAK;
+
+        CASE(OP_fclosure):
+            {
+                JSValue bfunc = JS_DupValue(ctx, b->cpool[get_u32(pc)]);
+                pc += 4;
+                *sp++ = js_closure(ctx, bfunc, var_refs, sf);
+                if (unlikely(JS_IsException(sp[-1])))
+                    goto exception;
+            }
+            BREAK;
+#if SHORT_OPCODES
+        CASE(OP_call0):
+        CASE(OP_call1):
+        CASE(OP_call2):
+        CASE(OP_call3):
+            call_argc = opcode - OP_call0;
+            goto has_call_argc;
+#endif
+        CASE(OP_call):
+        CASE(OP_tail_call):
+            {
+                call_argc = get_u16(pc);
+                pc += 2;
+                goto has_call_argc;
+            has_call_argc:
+                call_argv = sp - call_argc;
+                sf->cur_pc = pc;
+                ret_val = JS_CallInternal(ctx, call_argv[-1], JS_UNDEFINED,
+                                          JS_UNDEFINED, call_argc, call_argv, 0);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                if (opcode == OP_tail_call)
+                    goto done;
+                for(i = -1; i < call_argc; i++)
+                    JS_FreeValue(ctx, call_argv[i]);
+                sp -= call_argc + 1;
+                *sp++ = ret_val;
+            }
+            BREAK;
+        CASE(OP_call_constructor):
+            {
+                call_argc = get_u16(pc);
+                pc += 2;
+                call_argv = sp - call_argc;
+                sf->cur_pc = pc;
+                ret_val = JS_CallConstructorInternal(ctx, call_argv[-2],
+                                                     call_argv[-1],
+                                                     call_argc, call_argv, 0);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                for(i = -2; i < call_argc; i++)
+                    JS_FreeValue(ctx, call_argv[i]);
+                sp -= call_argc + 2;
+                *sp++ = ret_val;
+            }
+            BREAK;
+        CASE(OP_call_method):
+        CASE(OP_tail_call_method):
+            {
+                call_argc = get_u16(pc);
+                pc += 2;
+                call_argv = sp - call_argc;
+                sf->cur_pc = pc;
+                ret_val = JS_CallInternal(ctx, call_argv[-1], call_argv[-2],
+                                          JS_UNDEFINED, call_argc, call_argv, 0);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                if (opcode == OP_tail_call_method)
+                    goto done;
+                for(i = -2; i < call_argc; i++)
+                    JS_FreeValue(ctx, call_argv[i]);
+                sp -= call_argc + 2;
+                *sp++ = ret_val;
+            }
+            BREAK;
+        CASE(OP_array_from):
+            {
+                int i, ret;
+
+                call_argc = get_u16(pc);
+                pc += 2;
+                ret_val = JS_NewArray(ctx);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                call_argv = sp - call_argc;
+                for(i = 0; i < call_argc; i++) {
+                    ret = JS_DefinePropertyValue(ctx, ret_val, __JS_AtomFromUInt32(i), call_argv[i],
+                                                 JS_PROP_C_W_E | JS_PROP_THROW);
+                    call_argv[i] = JS_UNDEFINED;
+                    if (ret < 0) {
+                        JS_FreeValue(ctx, ret_val);
+                        goto exception;
+                    }
+                }
+                sp -= call_argc;
+                *sp++ = ret_val;
+            }
+            BREAK;
+
+        CASE(OP_apply):
+            {
+                int magic;
+                magic = get_u16(pc);
+                pc += 2;
+
+                ret_val = js_function_apply(ctx, sp[-3], 2, (JSValueConst *)&sp[-2], magic);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-3]);
+                JS_FreeValue(ctx, sp[-2]);
+                JS_FreeValue(ctx, sp[-1]);
+                sp -= 3;
+                *sp++ = ret_val;
+            }
+            BREAK;
+        CASE(OP_return):
+            ret_val = *--sp;
+            goto done;
+        CASE(OP_return_undef):
+            ret_val = JS_UNDEFINED;
+            goto done;
+
+        CASE(OP_check_ctor_return):
+            /* return TRUE if 'this' should be returned */
+            if (!JS_IsObject(sp[-1])) {
+                if (!JS_IsUndefined(sp[-1])) {
+                    JS_ThrowTypeError(caller_ctx, "derived class constructor must return an object or undefined");
+                    goto exception;
+                }
+                sp[0] = JS_TRUE;
+            } else {
+                sp[0] = JS_FALSE;
+            }
+            sp++;
+            BREAK;
+        CASE(OP_check_ctor):
+            if (JS_IsUndefined(new_target)) {
+                JS_ThrowTypeError(ctx, "class constructors must be invoked with 'new'");
+                goto exception;
+            }
+            BREAK;
+        CASE(OP_check_brand):
+            {
+                int ret = JS_CheckBrand(ctx, sp[-2], sp[-1]);
+                if (ret < 0)
+                    goto exception;
+                if (!ret) {
+                    JS_ThrowTypeError(ctx, "invalid brand on object");
+                    goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_add_brand):
+            if (JS_AddBrand(ctx, sp[-2], sp[-1]) < 0)
+                goto exception;
+            JS_FreeValue(ctx, sp[-2]);
+            JS_FreeValue(ctx, sp[-1]);
+            sp -= 2;
+            BREAK;
+
+        CASE(OP_throw):
+            JS_Throw(ctx, *--sp);
+            goto exception;
+
+        CASE(OP_throw_error):
+#define JS_THROW_VAR_RO             0
+#define JS_THROW_VAR_REDECL         1
+#define JS_THROW_VAR_UNINITIALIZED  2
+#define JS_THROW_ERROR_DELETE_SUPER   3
+#define JS_THROW_ERROR_ITERATOR_THROW 4
+            {
+                JSAtom atom;
+                int type;
+                atom = get_u32(pc);
+                type = pc[4];
+                pc += 5;
+                if (type == JS_THROW_VAR_RO)
+                    JS_ThrowTypeErrorReadOnly(ctx, JS_PROP_THROW, atom);
+                else
+                if (type == JS_THROW_VAR_REDECL)
+                    JS_ThrowSyntaxErrorVarRedeclaration(ctx, atom);
+                else
+                if (type == JS_THROW_VAR_UNINITIALIZED)
+                    JS_ThrowReferenceErrorUninitialized(ctx, atom);
+                else
+                if (type == JS_THROW_ERROR_DELETE_SUPER)
+                    JS_ThrowReferenceError(ctx, "unsupported reference to 'super'");
+                else
+                if (type == JS_THROW_ERROR_ITERATOR_THROW)
+                    JS_ThrowTypeError(ctx, "iterator does not have a throw method");
+                else
+                    JS_ThrowInternalError(ctx, "invalid throw var type %d", type);
+            }
+            goto exception;
+
+        CASE(OP_eval):
+            {
+                JSValueConst obj;
+                int scope_idx;
+                call_argc = get_u16(pc);
+                scope_idx = get_u16(pc + 2) - 1;
+                pc += 4;
+                call_argv = sp - call_argc;
+                sf->cur_pc = pc;
+                if (js_same_value(ctx, call_argv[-1], ctx->eval_obj)) {
+                    if (call_argc >= 1)
+                        obj = call_argv[0];
+                    else
+                        obj = JS_UNDEFINED;
+                    ret_val = JS_EvalObject(ctx, JS_UNDEFINED, obj,
+                                            JS_EVAL_TYPE_DIRECT, scope_idx);
+                } else {
+                    ret_val = JS_CallInternal(ctx, call_argv[-1], JS_UNDEFINED,
+                                              JS_UNDEFINED, call_argc, call_argv, 0);
+                }
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                for(i = -1; i < call_argc; i++)
+                    JS_FreeValue(ctx, call_argv[i]);
+                sp -= call_argc + 1;
+                *sp++ = ret_val;
+            }
+            BREAK;
+            /* could merge with OP_apply */
+        CASE(OP_apply_eval):
+            {
+                int scope_idx;
+                uint32_t len;
+                JSValue *tab;
+                JSValueConst obj;
+
+                scope_idx = get_u16(pc) - 1;
+                pc += 2;
+                tab = build_arg_list(ctx, &len, sp[-1]);
+                if (!tab)
+                    goto exception;
+                if (js_same_value(ctx, sp[-2], ctx->eval_obj)) {
+                    if (len >= 1)
+                        obj = tab[0];
+                    else
+                        obj = JS_UNDEFINED;
+                    ret_val = JS_EvalObject(ctx, JS_UNDEFINED, obj,
+                                            JS_EVAL_TYPE_DIRECT, scope_idx);
+                } else {
+                    ret_val = JS_Call(ctx, sp[-2], JS_UNDEFINED, len,
+                                      (JSValueConst *)tab);
+                }
+                free_arg_list(ctx, tab, len);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-2]);
+                JS_FreeValue(ctx, sp[-1]);
+                sp -= 2;
+                *sp++ = ret_val;
+            }
+            BREAK;
+
+        CASE(OP_regexp):
+            {
+                sp[-2] = js_regexp_constructor_internal(ctx, JS_UNDEFINED,
+                                                        sp[-2], sp[-1]);
+                sp--;
+            }
+            BREAK;
+
+        CASE(OP_get_super):
+            {
+                JSValue proto;
+                proto = JS_GetPrototype(ctx, sp[-1]);
+                if (JS_IsException(proto))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = proto;
+            }
+            BREAK;
+
+        CASE(OP_import):
+            {
+                JSValue val;
+                val = js_dynamic_import(ctx, sp[-1]);
+                if (JS_IsException(val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = val;
+            }
+            BREAK;
+
+        CASE(OP_check_var):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_CheckGlobalVar(ctx, atom);
+                if (ret < 0)
+                    goto exception;
+                *sp++ = JS_NewBool(ctx, ret);
+            }
+            BREAK;
+
+        CASE(OP_get_var_undef):
+        CASE(OP_get_var):
+            {
+                JSValue val;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                val = JS_GetGlobalVar(ctx, atom, opcode - OP_get_var_undef);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                *sp++ = val;
+            }
+            BREAK;
+
+        CASE(OP_put_var):
+        CASE(OP_put_var_init):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_SetGlobalVar(ctx, atom, sp[-1], opcode - OP_put_var);
+                sp--;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_put_var_strict):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                /* sp[-2] is JS_TRUE or JS_FALSE */
+                if (unlikely(!JS_VALUE_GET_INT(sp[-2]))) {
+                    JS_ThrowReferenceErrorNotDefined(ctx, atom);
+                    goto exception;
+                }
+                ret = JS_SetGlobalVar(ctx, atom, sp[-1], 2);
+                sp -= 2;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_check_define_var):
+            {
+                JSAtom atom;
+                int flags;
+                atom = get_u32(pc);
+                flags = pc[4];
+                pc += 5;
+                if (JS_CheckDefineGlobalVar(ctx, atom, flags))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_define_var):
+            {
+                JSAtom atom;
+                int flags;
+                atom = get_u32(pc);
+                flags = pc[4];
+                pc += 5;
+                if (JS_DefineGlobalVar(ctx, atom, flags))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_define_func):
+            {
+                JSAtom atom;
+                int flags;
+                atom = get_u32(pc);
+                flags = pc[4];
+                pc += 5;
+                if (JS_DefineGlobalFunction(ctx, atom, sp[-1], flags))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp--;
+            }
+            BREAK;
+
+        CASE(OP_get_loc):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                sp[0] = JS_DupValue(ctx, var_buf[idx]);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_loc):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &var_buf[idx], sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_loc):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &var_buf[idx], JS_DupValue(ctx, sp[-1]));
+            }
+            BREAK;
+        CASE(OP_get_arg):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                sp[0] = JS_DupValue(ctx, arg_buf[idx]);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_arg):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &arg_buf[idx], sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_arg):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &arg_buf[idx], JS_DupValue(ctx, sp[-1]));
+            }
+            BREAK;
+
+#if SHORT_OPCODES
+        CASE(OP_get_loc8): *sp++ = JS_DupValue(ctx, var_buf[*pc++]); BREAK;
+        CASE(OP_put_loc8): set_value(ctx, &var_buf[*pc++], *--sp); BREAK;
+        CASE(OP_set_loc8): set_value(ctx, &var_buf[*pc++], JS_DupValue(ctx, sp[-1])); BREAK;
+
+        CASE(OP_get_loc0): *sp++ = JS_DupValue(ctx, var_buf[0]); BREAK;
+        CASE(OP_get_loc1): *sp++ = JS_DupValue(ctx, var_buf[1]); BREAK;
+        CASE(OP_get_loc2): *sp++ = JS_DupValue(ctx, var_buf[2]); BREAK;
+        CASE(OP_get_loc3): *sp++ = JS_DupValue(ctx, var_buf[3]); BREAK;
+        CASE(OP_put_loc0): set_value(ctx, &var_buf[0], *--sp); BREAK;
+        CASE(OP_put_loc1): set_value(ctx, &var_buf[1], *--sp); BREAK;
+        CASE(OP_put_loc2): set_value(ctx, &var_buf[2], *--sp); BREAK;
+        CASE(OP_put_loc3): set_value(ctx, &var_buf[3], *--sp); BREAK;
+        CASE(OP_set_loc0): set_value(ctx, &var_buf[0], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_loc1): set_value(ctx, &var_buf[1], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_loc2): set_value(ctx, &var_buf[2], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_loc3): set_value(ctx, &var_buf[3], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_get_arg0): *sp++ = JS_DupValue(ctx, arg_buf[0]); BREAK;
+        CASE(OP_get_arg1): *sp++ = JS_DupValue(ctx, arg_buf[1]); BREAK;
+        CASE(OP_get_arg2): *sp++ = JS_DupValue(ctx, arg_buf[2]); BREAK;
+        CASE(OP_get_arg3): *sp++ = JS_DupValue(ctx, arg_buf[3]); BREAK;
+        CASE(OP_put_arg0): set_value(ctx, &arg_buf[0], *--sp); BREAK;
+        CASE(OP_put_arg1): set_value(ctx, &arg_buf[1], *--sp); BREAK;
+        CASE(OP_put_arg2): set_value(ctx, &arg_buf[2], *--sp); BREAK;
+        CASE(OP_put_arg3): set_value(ctx, &arg_buf[3], *--sp); BREAK;
+        CASE(OP_set_arg0): set_value(ctx, &arg_buf[0], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_arg1): set_value(ctx, &arg_buf[1], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_arg2): set_value(ctx, &arg_buf[2], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_arg3): set_value(ctx, &arg_buf[3], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_get_var_ref0): *sp++ = JS_DupValue(ctx, *var_refs[0]->pvalue); BREAK;
+        CASE(OP_get_var_ref1): *sp++ = JS_DupValue(ctx, *var_refs[1]->pvalue); BREAK;
+        CASE(OP_get_var_ref2): *sp++ = JS_DupValue(ctx, *var_refs[2]->pvalue); BREAK;
+        CASE(OP_get_var_ref3): *sp++ = JS_DupValue(ctx, *var_refs[3]->pvalue); BREAK;
+        CASE(OP_put_var_ref0): set_value(ctx, var_refs[0]->pvalue, *--sp); BREAK;
+        CASE(OP_put_var_ref1): set_value(ctx, var_refs[1]->pvalue, *--sp); BREAK;
+        CASE(OP_put_var_ref2): set_value(ctx, var_refs[2]->pvalue, *--sp); BREAK;
+        CASE(OP_put_var_ref3): set_value(ctx, var_refs[3]->pvalue, *--sp); BREAK;
+        CASE(OP_set_var_ref0): set_value(ctx, var_refs[0]->pvalue, JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_var_ref1): set_value(ctx, var_refs[1]->pvalue, JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_var_ref2): set_value(ctx, var_refs[2]->pvalue, JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_var_ref3): set_value(ctx, var_refs[3]->pvalue, JS_DupValue(ctx, sp[-1])); BREAK;
+#endif
+
+        CASE(OP_get_var_ref):
+            {
+                int idx;
+                JSValue val;
+                idx = get_u16(pc);
+                pc += 2;
+                val = *var_refs[idx]->pvalue;
+                sp[0] = JS_DupValue(ctx, val);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_var_ref):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, var_refs[idx]->pvalue, sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_var_ref):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, var_refs[idx]->pvalue, JS_DupValue(ctx, sp[-1]));
+            }
+            BREAK;
+        CASE(OP_get_var_ref_check):
+            {
+                int idx;
+                JSValue val;
+                idx = get_u16(pc);
+                pc += 2;
+                val = *var_refs[idx]->pvalue;
+                if (unlikely(JS_IsUninitialized(val))) {
+                    JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, TRUE);
+                    goto exception;
+                }
+                sp[0] = JS_DupValue(ctx, val);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_var_ref_check):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(JS_IsUninitialized(*var_refs[idx]->pvalue))) {
+                    JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, TRUE);
+                    goto exception;
+                }
+                set_value(ctx, var_refs[idx]->pvalue, sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_put_var_ref_check_init):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(!JS_IsUninitialized(*var_refs[idx]->pvalue))) {
+                    JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, TRUE);
+                    goto exception;
+                }
+                set_value(ctx, var_refs[idx]->pvalue, sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_loc_uninitialized):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &var_buf[idx], JS_UNINITIALIZED);
+            }
+            BREAK;
+        CASE(OP_get_loc_check):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(JS_IsUninitialized(var_buf[idx]))) {
+                    JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, FALSE);
+                    goto exception;
+                }
+                sp[0] = JS_DupValue(ctx, var_buf[idx]);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_get_loc_checkthis):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(JS_IsUninitialized(var_buf[idx]))) {
+                    JS_ThrowReferenceErrorUninitialized2(caller_ctx, b, idx, FALSE);
+                    goto exception;
+                }
+                sp[0] = JS_DupValue(ctx, var_buf[idx]);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_loc_check):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(JS_IsUninitialized(var_buf[idx]))) {
+                    JS_ThrowReferenceErrorUninitialized2(ctx, b, idx, FALSE);
+                    goto exception;
+                }
+                set_value(ctx, &var_buf[idx], sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_put_loc_check_init):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(!JS_IsUninitialized(var_buf[idx]))) {
+                    JS_ThrowReferenceError(ctx, "'this' can be initialized only once");
+                    goto exception;
+                }
+                set_value(ctx, &var_buf[idx], sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_close_loc):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                close_lexical_var(ctx, sf, idx, FALSE);
+            }
+            BREAK;
+
+        CASE(OP_make_loc_ref):
+        CASE(OP_make_arg_ref):
+        CASE(OP_make_var_ref_ref):
+            {
+                JSVarRef *var_ref;
+                JSProperty *pr;
+                JSAtom atom;
+                int idx;
+                atom = get_u32(pc);
+                idx = get_u16(pc + 4);
+                pc += 6;
+                *sp++ = JS_NewObjectProto(ctx, JS_NULL);
+                if (unlikely(JS_IsException(sp[-1])))
+                    goto exception;
+                if (opcode == OP_make_var_ref_ref) {
+                    var_ref = var_refs[idx];
+                    var_ref->header.ref_count++;
+                } else {
+                    var_ref = get_var_ref(ctx, sf, idx, opcode == OP_make_arg_ref);
+                    if (!var_ref)
+                        goto exception;
+                }
+                pr = add_property(ctx, JS_VALUE_GET_OBJ(sp[-1]), atom,
+                                  JS_PROP_WRITABLE | JS_PROP_VARREF);
+                if (!pr) {
+                    free_var_ref(rt, var_ref);
+                    goto exception;
+                }
+                pr->u.var_ref = var_ref;
+                *sp++ = JS_AtomToValue(ctx, atom);
+            }
+            BREAK;
+        CASE(OP_make_var_ref):
+            {
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                if (JS_GetGlobalVarRef(ctx, atom, sp))
+                    goto exception;
+                sp += 2;
+            }
+            BREAK;
+
+        CASE(OP_goto):
+            pc += (int32_t)get_u32(pc);
+            if (unlikely(js_poll_interrupts(ctx)))
+                goto exception;
+            BREAK;
+#if SHORT_OPCODES
+        CASE(OP_goto16):
+            pc += (int16_t)get_u16(pc);
+            if (unlikely(js_poll_interrupts(ctx)))
+                goto exception;
+            BREAK;
+        CASE(OP_goto8):
+            pc += (int8_t)pc[0];
+            if (unlikely(js_poll_interrupts(ctx)))
+                goto exception;
+            BREAK;
+#endif
+        CASE(OP_if_true):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                pc += 4;
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1);
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp--;
+                if (res) {
+                    pc += (int32_t)get_u32(pc - 4) - 4;
+                }
+                if (unlikely(js_poll_interrupts(ctx)))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_if_false):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                pc += 4;
+                /* quick and dirty test for JS_TAG_INT, JS_TAG_BOOL, JS_TAG_NULL and JS_TAG_UNDEFINED */
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1);
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp--;
+                if (!res) {
+                    pc += (int32_t)get_u32(pc - 4) - 4;
+                }
+                if (unlikely(js_poll_interrupts(ctx)))
+                    goto exception;
+            }
+            BREAK;
+#if SHORT_OPCODES
+        CASE(OP_if_true8):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                pc += 1;
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1);
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp--;
+                if (res) {
+                    pc += (int8_t)pc[-1] - 1;
+                }
+                if (unlikely(js_poll_interrupts(ctx)))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_if_false8):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                pc += 1;
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1);
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp--;
+                if (!res) {
+                    pc += (int8_t)pc[-1] - 1;
+                }
+                if (unlikely(js_poll_interrupts(ctx)))
+                    goto exception;
+            }
+            BREAK;
+#endif
+        CASE(OP_catch):
+            {
+                int32_t diff;
+                diff = get_u32(pc);
+                sp[0] = JS_NewCatchOffset(ctx, pc + diff - b->byte_code_buf);
+                sp++;
+                pc += 4;
+            }
+            BREAK;
+        CASE(OP_gosub):
+            {
+                int32_t diff;
+                diff = get_u32(pc);
+                /* XXX: should have a different tag to avoid security flaw */
+                sp[0] = JS_NewInt32(ctx, pc + 4 - b->byte_code_buf);
+                sp++;
+                pc += diff;
+            }
+            BREAK;
+        CASE(OP_ret):
+            {
+                JSValue op1;
+                uint32_t pos;
+                op1 = sp[-1];
+                if (unlikely(JS_VALUE_GET_TAG(op1) != JS_TAG_INT))
+                    goto ret_fail;
+                pos = JS_VALUE_GET_INT(op1);
+                if (unlikely(pos >= b->byte_code_len)) {
+                ret_fail:
+                    JS_ThrowInternalError(ctx, "invalid ret value");
+                    goto exception;
+                }
+                sp--;
+                pc = b->byte_code_buf + pos;
+            }
+            BREAK;
+
+        CASE(OP_for_in_start):
+            if (js_for_in_start(ctx, sp))
+                goto exception;
+            BREAK;
+        CASE(OP_for_in_next):
+            if (js_for_in_next(ctx, sp))
+                goto exception;
+            sp += 2;
+            BREAK;
+        CASE(OP_for_of_start):
+            if (js_for_of_start(ctx, sp, FALSE))
+                goto exception;
+            sp += 1;
+            *sp++ = JS_NewCatchOffset(ctx, 0);
+            BREAK;
+        CASE(OP_for_of_next):
+            {
+                int offset = -3 - pc[0];
+                pc += 1;
+                if (js_for_of_next(ctx, sp, offset))
+                    goto exception;
+                sp += 2;
+            }
+            BREAK;
+        CASE(OP_for_await_of_start):
+            if (js_for_of_start(ctx, sp, TRUE))
+                goto exception;
+            sp += 1;
+            *sp++ = JS_NewCatchOffset(ctx, 0);
+            BREAK;
+        CASE(OP_iterator_get_value_done):
+            if (js_iterator_get_value_done(ctx, sp))
+                goto exception;
+            sp += 1;
+            BREAK;
+        CASE(OP_iterator_check_object):
+            if (unlikely(!JS_IsObject(sp[-1]))) {
+                JS_ThrowTypeError(ctx, "iterator must return an object");
+                goto exception;
+            }
+            BREAK;
+
+        CASE(OP_iterator_close):
+            /* iter_obj next catch_offset -> */
+            sp--; /* drop the catch offset to avoid getting caught by exception */
+            JS_FreeValue(ctx, sp[-1]); /* drop the next method */
+            sp--;
+            if (!JS_IsUndefined(sp[-1])) {
+                if (JS_IteratorClose(ctx, sp[-1], FALSE))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+            }
+            sp--;
+            BREAK;
+        CASE(OP_nip_catch):
+            {
+                JSValue ret_val;
+                /* catch_offset ... ret_val -> ret_eval */
+                ret_val = *--sp;
+                while (sp > stack_buf &&
+                       JS_VALUE_GET_TAG(sp[-1]) != JS_TAG_CATCH_OFFSET) {
+                    JS_FreeValue(ctx, *--sp);
+                }
+                if (unlikely(sp == stack_buf)) {
+                    JS_ThrowInternalError(ctx, "nip_catch");
+                    JS_FreeValue(ctx, ret_val);
+                    goto exception;
+                }
+                sp[-1] = ret_val;
+            }
+            BREAK;
+
+        CASE(OP_iterator_next):
+            /* stack: iter_obj next catch_offset val */
+            {
+                JSValue ret;
+                ret = JS_Call(ctx, sp[-3], sp[-4],
+                              1, (JSValueConst *)(sp - 1));
+                if (JS_IsException(ret))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret;
+            }
+            BREAK;
+
+        CASE(OP_iterator_call):
+            /* stack: iter_obj next catch_offset val */
+            {
+                JSValue method, ret;
+                BOOL ret_flag;
+                int flags;
+                flags = *pc++;
+                method = JS_GetProperty(ctx, sp[-4], (flags & 1) ?
+                                        JS_ATOM_throw : JS_ATOM_return);
+                if (JS_IsException(method))
+                    goto exception;
+                if (JS_IsUndefined(method) || JS_IsNull(method)) {
+                    ret_flag = TRUE;
+                } else {
+                    if (flags & 2) {
+                        /* no argument */
+                        ret = JS_CallFree(ctx, method, sp[-4],
+                                          0, NULL);
+                    } else {
+                        ret = JS_CallFree(ctx, method, sp[-4],
+                                          1, (JSValueConst *)(sp - 1));
+                    }
+                    if (JS_IsException(ret))
+                        goto exception;
+                    JS_FreeValue(ctx, sp[-1]);
+                    sp[-1] = ret;
+                    ret_flag = FALSE;
+                }
+                sp[0] = JS_NewBool(ctx, ret_flag);
+                sp += 1;
+            }
+            BREAK;
+
+        CASE(OP_lnot):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1) != 0;
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp[-1] = JS_NewBool(ctx, !res);
+            }
+            BREAK;
+
+        CASE(OP_get_field):
+            {
+                JSValue val;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                val = JS_GetProperty(ctx, sp[-1], atom);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = val;
+            }
+            BREAK;
+
+        CASE(OP_get_field2):
+            {
+                JSValue val;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                val = JS_GetProperty(ctx, sp[-1], atom);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                *sp++ = val;
+            }
+            BREAK;
+
+        CASE(OP_put_field):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_SetPropertyInternal(ctx, sp[-2], atom, sp[-1], sp[-2],
+                                             JS_PROP_THROW_STRICT);
+                JS_FreeValue(ctx, sp[-2]);
+                sp -= 2;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_private_symbol):
+            {
+                JSAtom atom;
+                JSValue val;
+
+                atom = get_u32(pc);
+                pc += 4;
+                val = JS_NewSymbolFromAtom(ctx, atom, JS_ATOM_TYPE_PRIVATE);
+                if (JS_IsException(val))
+                    goto exception;
+                *sp++ = val;
+            }
+            BREAK;
+
+        CASE(OP_get_private_field):
+            {
+                JSValue val;
+
+                val = JS_GetPrivateField(ctx, sp[-2], sp[-1]);
+                JS_FreeValue(ctx, sp[-1]);
+                JS_FreeValue(ctx, sp[-2]);
+                sp[-2] = val;
+                sp--;
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_put_private_field):
+            {
+                int ret;
+                ret = JS_SetPrivateField(ctx, sp[-3], sp[-1], sp[-2]);
+                JS_FreeValue(ctx, sp[-3]);
+                JS_FreeValue(ctx, sp[-1]);
+                sp -= 3;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_define_private_field):
+            {
+                int ret;
+                ret = JS_DefinePrivateField(ctx, sp[-3], sp[-2], sp[-1]);
+                JS_FreeValue(ctx, sp[-2]);
+                sp -= 2;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_define_field):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_DefinePropertyValue(ctx, sp[-2], atom, sp[-1],
+                                             JS_PROP_C_W_E | JS_PROP_THROW);
+                sp--;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_set_name):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_DefineObjectName(ctx, sp[-1], atom, JS_PROP_CONFIGURABLE);
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_set_name_computed):
+            {
+                int ret;
+                ret = JS_DefineObjectNameComputed(ctx, sp[-1], sp[-2], JS_PROP_CONFIGURABLE);
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_set_proto):
+            {
+                JSValue proto;
+                proto = sp[-1];
+                if (JS_IsObject(proto) || JS_IsNull(proto)) {
+                    if (JS_SetPrototypeInternal(ctx, sp[-2], proto, TRUE) < 0)
+                        goto exception;
+                }
+                JS_FreeValue(ctx, proto);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_home_object):
+            js_method_set_home_object(ctx, sp[-1], sp[-2]);
+            BREAK;
+        CASE(OP_define_method):
+        CASE(OP_define_method_computed):
+            {
+                JSValue getter, setter, value;
+                JSValueConst obj;
+                JSAtom atom;
+                int flags, ret, op_flags;
+                BOOL is_computed;
+#define OP_DEFINE_METHOD_METHOD 0
+#define OP_DEFINE_METHOD_GETTER 1
+#define OP_DEFINE_METHOD_SETTER 2
+#define OP_DEFINE_METHOD_ENUMERABLE 4
+
+                is_computed = (opcode == OP_define_method_computed);
+                if (is_computed) {
+                    atom = JS_ValueToAtom(ctx, sp[-2]);
+                    if (unlikely(atom == JS_ATOM_NULL))
+                        goto exception;
+                    opcode += OP_define_method - OP_define_method_computed;
+                } else {
+                    atom = get_u32(pc);
+                    pc += 4;
+                }
+                op_flags = *pc++;
+
+                obj = sp[-2 - is_computed];
+                flags = JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE |
+                    JS_PROP_HAS_ENUMERABLE | JS_PROP_THROW;
+                if (op_flags & OP_DEFINE_METHOD_ENUMERABLE)
+                    flags |= JS_PROP_ENUMERABLE;
+                op_flags &= 3;
+                value = JS_UNDEFINED;
+                getter = JS_UNDEFINED;
+                setter = JS_UNDEFINED;
+                if (op_flags == OP_DEFINE_METHOD_METHOD) {
+                    value = sp[-1];
+                    flags |= JS_PROP_HAS_VALUE | JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE;
+                } else if (op_flags == OP_DEFINE_METHOD_GETTER) {
+                    getter = sp[-1];
+                    flags |= JS_PROP_HAS_GET;
+                } else {
+                    setter = sp[-1];
+                    flags |= JS_PROP_HAS_SET;
+                }
+                ret = js_method_set_properties(ctx, sp[-1], atom, flags, obj);
+                if (ret >= 0) {
+                    ret = JS_DefineProperty(ctx, obj, atom, value,
+                                            getter, setter, flags);
+                }
+                JS_FreeValue(ctx, sp[-1]);
+                if (is_computed) {
+                    JS_FreeAtom(ctx, atom);
+                    JS_FreeValue(ctx, sp[-2]);
+                }
+                sp -= 1 + is_computed;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_define_class):
+        CASE(OP_define_class_computed):
+            {
+                int class_flags;
+                JSAtom atom;
+
+                atom = get_u32(pc);
+                class_flags = pc[4];
+                pc += 5;
+                if (js_op_define_class(ctx, sp, atom, class_flags,
+                                       var_refs, sf,
+                                       (opcode == OP_define_class_computed)) < 0)
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_get_array_el):
+            {
+                JSValue val;
+
+                val = JS_GetPropertyValue(ctx, sp[-2], sp[-1]);
+                JS_FreeValue(ctx, sp[-2]);
+                sp[-2] = val;
+                sp--;
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_get_array_el2):
+            {
+                JSValue val;
+
+                val = JS_GetPropertyValue(ctx, sp[-2], sp[-1]);
+                sp[-1] = val;
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_get_ref_value):
+            {
+                JSValue val;
+                if (unlikely(JS_IsUndefined(sp[-2]))) {
+                    JSAtom atom = JS_ValueToAtom(ctx, sp[-1]);
+                    if (atom != JS_ATOM_NULL) {
+                        JS_ThrowReferenceErrorNotDefined(ctx, atom);
+                        JS_FreeAtom(ctx, atom);
+                    }
+                    goto exception;
+                }
+                val = JS_GetPropertyValue(ctx, sp[-2],
+                                          JS_DupValue(ctx, sp[-1]));
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                sp[0] = val;
+                sp++;
+            }
+            BREAK;
+
+        CASE(OP_get_super_value):
+            {
+                JSValue val;
+                JSAtom atom;
+                atom = JS_ValueToAtom(ctx, sp[-1]);
+                if (unlikely(atom == JS_ATOM_NULL))
+                    goto exception;
+                val = JS_GetPropertyInternal(ctx, sp[-2], atom, sp[-3], FALSE);
+                JS_FreeAtom(ctx, atom);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                JS_FreeValue(ctx, sp[-2]);
+                JS_FreeValue(ctx, sp[-3]);
+                sp[-3] = val;
+                sp -= 2;
+            }
+            BREAK;
+
+        CASE(OP_put_array_el):
+            {
+                int ret;
+
+                ret = JS_SetPropertyValue(ctx, sp[-3], sp[-2], sp[-1], JS_PROP_THROW_STRICT);
+                JS_FreeValue(ctx, sp[-3]);
+                sp -= 3;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_put_ref_value):
+            {
+                int ret, flags;
+                flags = JS_PROP_THROW_STRICT;
+                if (unlikely(JS_IsUndefined(sp[-3]))) {
+                    if (is_strict_mode(ctx)) {
+                        JSAtom atom = JS_ValueToAtom(ctx, sp[-2]);
+                        if (atom != JS_ATOM_NULL) {
+                            JS_ThrowReferenceErrorNotDefined(ctx, atom);
+                            JS_FreeAtom(ctx, atom);
+                        }
+                        goto exception;
+                    } else {
+                        sp[-3] = JS_DupValue(ctx, ctx->global_obj);
+                    }
+                } else {
+                    if (is_strict_mode(ctx))
+                        flags |= JS_PROP_NO_ADD;
+                }
+                ret = JS_SetPropertyValue(ctx, sp[-3], sp[-2], sp[-1], flags);
+                JS_FreeValue(ctx, sp[-3]);
+                sp -= 3;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_put_super_value):
+            {
+                int ret;
+                JSAtom atom;
+                if (JS_VALUE_GET_TAG(sp[-3]) != JS_TAG_OBJECT) {
+                    JS_ThrowTypeErrorNotAnObject(ctx);
+                    goto exception;
+                }
+                atom = JS_ValueToAtom(ctx, sp[-2]);
+                if (unlikely(atom == JS_ATOM_NULL))
+                    goto exception;
+                ret = JS_SetPropertyInternal(ctx, sp[-3], atom, sp[-1], sp[-4],
+                                             JS_PROP_THROW_STRICT);
+                JS_FreeAtom(ctx, atom);
+                JS_FreeValue(ctx, sp[-4]);
+                JS_FreeValue(ctx, sp[-3]);
+                JS_FreeValue(ctx, sp[-2]);
+                sp -= 4;
+                if (ret < 0)
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_define_array_el):
+            {
+                int ret;
+                ret = JS_DefinePropertyValueValue(ctx, sp[-3], JS_DupValue(ctx, sp[-2]), sp[-1],
+                                                  JS_PROP_C_W_E | JS_PROP_THROW);
+                sp -= 1;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_append):    /* array pos enumobj -- array pos */
+            {
+                if (js_append_enumerate(ctx, sp))
+                    goto exception;
+                JS_FreeValue(ctx, *--sp);
+            }
+            BREAK;
+
+        CASE(OP_copy_data_properties):    /* target source excludeList */
+            {
+                /* stack offsets (-1 based):
+                   2 bits for target,
+                   3 bits for source,
+                   2 bits for exclusionList */
+                int mask;
+
+                mask = *pc++;
+                if (JS_CopyDataProperties(ctx, sp[-1 - (mask & 3)],
+                                          sp[-1 - ((mask >> 2) & 7)],
+                                          sp[-1 - ((mask >> 5) & 7)], 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_add):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int64_t r;
+                    r = (int64_t)JS_VALUE_GET_INT(op1) + JS_VALUE_GET_INT(op2);
+                    if (unlikely((int)r != r))
+                        goto add_slow;
+                    sp[-2] = JS_NewInt32(ctx, r);
+                    sp--;
+                } else if (JS_VALUE_IS_BOTH_FLOAT(op1, op2)) {
+                    sp[-2] = __JS_NewFloat64(ctx, JS_VALUE_GET_FLOAT64(op1) +
+                                             JS_VALUE_GET_FLOAT64(op2));
+                    sp--;
+                } else if (JS_IsString(op1) && JS_IsString(op2)) {
+                    sp[-2] = JS_ConcatString(ctx, op1, op2);
+                    sp--;
+                    if (JS_IsException(sp[-1]))
+                        goto exception;
+                } else {
+                add_slow:
+                    if (js_add_slow(ctx, sp))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_add_loc):
+            {
+                JSValue op2;
+                JSValue *pv;
+                int idx;
+                idx = *pc;
+                pc += 1;
+
+                op2 = sp[-1];
+                pv = &var_buf[idx];
+                if (likely(JS_VALUE_IS_BOTH_INT(*pv, op2))) {
+                    int64_t r;
+                    r = (int64_t)JS_VALUE_GET_INT(*pv) + JS_VALUE_GET_INT(op2);
+                    if (unlikely((int)r != r))
+                        goto add_loc_slow;
+                    *pv = JS_NewInt32(ctx, r);
+                    sp--;
+                } else if (JS_VALUE_IS_BOTH_FLOAT(*pv, op2)) {
+                    *pv = __JS_NewFloat64(ctx, JS_VALUE_GET_FLOAT64(*pv) +
+                                               JS_VALUE_GET_FLOAT64(op2));
+                    sp--;
+                } else if (JS_VALUE_GET_TAG(*pv) == JS_TAG_STRING) {
+                    sp--;
+                    op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NONE);
+                    if (JS_IsException(op2))
+                        goto exception;
+                    if (JS_ConcatStringInPlace(ctx, JS_VALUE_GET_STRING(*pv), op2)) {
+                        JS_FreeValue(ctx, op2);
+                    } else {
+                        op2 = JS_ConcatString(ctx, JS_DupValue(ctx, *pv), op2);
+                        if (JS_IsException(op2))
+                            goto exception;
+                        set_value(ctx, pv, op2);
+                    }
+                } else {
+                    JSValue ops[2];
+                add_loc_slow:
+                    /* In case of exception, js_add_slow frees ops[0]
+                       and ops[1], so we must duplicate *pv */
+                    ops[0] = JS_DupValue(ctx, *pv);
+                    ops[1] = op2;
+                    sp--;
+                    if (js_add_slow(ctx, ops + 2))
+                        goto exception;
+                    set_value(ctx, pv, ops[0]);
+                }
+            }
+            BREAK;
+        CASE(OP_sub):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int64_t r;
+                    r = (int64_t)JS_VALUE_GET_INT(op1) - JS_VALUE_GET_INT(op2);
+                    if (unlikely((int)r != r))
+                        goto binary_arith_slow;
+                    sp[-2] = JS_NewInt32(ctx, r);
+                    sp--;
+                } else if (JS_VALUE_IS_BOTH_FLOAT(op1, op2)) {
+                    sp[-2] = __JS_NewFloat64(ctx, JS_VALUE_GET_FLOAT64(op1) -
+                                             JS_VALUE_GET_FLOAT64(op2));
+                    sp--;
+                } else {
+                    goto binary_arith_slow;
+                }
+            }
+            BREAK;
+        CASE(OP_mul):
+            {
+                JSValue op1, op2;
+                double d;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int32_t v1, v2;
+                    int64_t r;
+                    v1 = JS_VALUE_GET_INT(op1);
+                    v2 = JS_VALUE_GET_INT(op2);
+                    r = (int64_t)v1 * v2;
+                    if (unlikely((int)r != r)) {
+#ifdef CONFIG_BIGNUM
+                        if (unlikely(sf->js_mode & JS_MODE_MATH) &&
+                            (r < -MAX_SAFE_INTEGER || r > MAX_SAFE_INTEGER))
+                            goto binary_arith_slow;
+#endif
+                        d = (double)r;
+                        goto mul_fp_res;
+                    }
+                    /* need to test zero case for -0 result */
+                    if (unlikely(r == 0 && (v1 | v2) < 0)) {
+                        d = -0.0;
+                        goto mul_fp_res;
+                    }
+                    sp[-2] = JS_NewInt32(ctx, r);
+                    sp--;
+                } else if (JS_VALUE_IS_BOTH_FLOAT(op1, op2)) {
+#ifdef CONFIG_BIGNUM
+                    if (unlikely(sf->js_mode & JS_MODE_MATH))
+                        goto binary_arith_slow;
+#endif
+                    d = JS_VALUE_GET_FLOAT64(op1) * JS_VALUE_GET_FLOAT64(op2);
+                mul_fp_res:
+                    sp[-2] = __JS_NewFloat64(ctx, d);
+                    sp--;
+                } else {
+                    goto binary_arith_slow;
+                }
+            }
+            BREAK;
+        CASE(OP_div):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int v1, v2;
+                    if (unlikely(sf->js_mode & JS_MODE_MATH))
+                        goto binary_arith_slow;
+                    v1 = JS_VALUE_GET_INT(op1);
+                    v2 = JS_VALUE_GET_INT(op2);
+                    sp[-2] = JS_NewFloat64(ctx, (double)v1 / (double)v2);
+                    sp--;
+                } else {
+                    goto binary_arith_slow;
+                }
+            }
+            BREAK;
+        CASE(OP_mod):
+#ifdef CONFIG_BIGNUM
+        CASE(OP_math_mod):
+#endif
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int v1, v2, r;
+                    v1 = JS_VALUE_GET_INT(op1);
+                    v2 = JS_VALUE_GET_INT(op2);
+                    /* We must avoid v2 = 0, v1 = INT32_MIN and v2 =
+                       -1 and the cases where the result is -0. */
+                    if (unlikely(v1 < 0 || v2 <= 0))
+                        goto binary_arith_slow;
+                    r = v1 % v2;
+                    sp[-2] = JS_NewInt32(ctx, r);
+                    sp--;
+                } else {
+                    goto binary_arith_slow;
+                }
+            }
+            BREAK;
+        CASE(OP_pow):
+        binary_arith_slow:
+            if (js_binary_arith_slow(ctx, sp, opcode))
+                goto exception;
+            sp--;
+            BREAK;
+
+        CASE(OP_plus):
+            {
+                JSValue op1;
+                uint32_t tag;
+                op1 = sp[-1];
+                tag = JS_VALUE_GET_TAG(op1);
+                if (tag == JS_TAG_INT || JS_TAG_IS_FLOAT64(tag)) {
+                } else {
+                    if (js_unary_arith_slow(ctx, sp, opcode))
+                        goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_neg):
+            {
+                JSValue op1;
+                uint32_t tag;
+                int val;
+                double d;
+                op1 = sp[-1];
+                tag = JS_VALUE_GET_TAG(op1);
+                if (tag == JS_TAG_INT) {
+                    val = JS_VALUE_GET_INT(op1);
+                    /* Note: -0 cannot be expressed as integer */
+                    if (unlikely(val == 0)) {
+                        d = -0.0;
+                        goto neg_fp_res;
+                    }
+                    if (unlikely(val == INT32_MIN)) {
+                        d = -(double)val;
+                        goto neg_fp_res;
+                    }
+                    sp[-1] = JS_NewInt32(ctx, -val);
+                } else if (JS_TAG_IS_FLOAT64(tag)) {
+                    d = -JS_VALUE_GET_FLOAT64(op1);
+                neg_fp_res:
+                    sp[-1] = __JS_NewFloat64(ctx, d);
+                } else {
+                    if (js_unary_arith_slow(ctx, sp, opcode))
+                        goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_inc):
+            {
+                JSValue op1;
+                int val;
+                op1 = sp[-1];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    val = JS_VALUE_GET_INT(op1);
+                    if (unlikely(val == INT32_MAX))
+                        goto inc_slow;
+                    sp[-1] = JS_NewInt32(ctx, val + 1);
+                } else {
+                inc_slow:
+                    if (js_unary_arith_slow(ctx, sp, opcode))
+                        goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_dec):
+            {
+                JSValue op1;
+                int val;
+                op1 = sp[-1];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    val = JS_VALUE_GET_INT(op1);
+                    if (unlikely(val == INT32_MIN))
+                        goto dec_slow;
+                    sp[-1] = JS_NewInt32(ctx, val - 1);
+                } else {
+                dec_slow:
+                    if (js_unary_arith_slow(ctx, sp, opcode))
+                        goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_post_inc):
+        CASE(OP_post_dec):
+            if (js_post_inc_slow(ctx, sp, opcode))
+                goto exception;
+            sp++;
+            BREAK;
+        CASE(OP_inc_loc):
+            {
+                JSValue op1;
+                int val;
+                int idx;
+                idx = *pc;
+                pc += 1;
+
+                op1 = var_buf[idx];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    val = JS_VALUE_GET_INT(op1);
+                    if (unlikely(val == INT32_MAX))
+                        goto inc_loc_slow;
+                    var_buf[idx] = JS_NewInt32(ctx, val + 1);
+                } else {
+                inc_loc_slow:
+                    /* must duplicate otherwise the variable value may
+                       be destroyed before JS code accesses it */
+                    op1 = JS_DupValue(ctx, op1);
+                    if (js_unary_arith_slow(ctx, &op1 + 1, OP_inc))
+                        goto exception;
+                    set_value(ctx, &var_buf[idx], op1);
+                }
+            }
+            BREAK;
+        CASE(OP_dec_loc):
+            {
+                JSValue op1;
+                int val;
+                int idx;
+                idx = *pc;
+                pc += 1;
+
+                op1 = var_buf[idx];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    val = JS_VALUE_GET_INT(op1);
+                    if (unlikely(val == INT32_MIN))
+                        goto dec_loc_slow;
+                    var_buf[idx] = JS_NewInt32(ctx, val - 1);
+                } else {
+                dec_loc_slow:
+                    /* must duplicate otherwise the variable value may
+                       be destroyed before JS code accesses it */
+                    op1 = JS_DupValue(ctx, op1);
+                    if (js_unary_arith_slow(ctx, &op1 + 1, OP_dec))
+                        goto exception;
+                    set_value(ctx, &var_buf[idx], op1);
+                }
+            }
+            BREAK;
+        CASE(OP_not):
+            {
+                JSValue op1;
+                op1 = sp[-1];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    sp[-1] = JS_NewInt32(ctx, ~JS_VALUE_GET_INT(op1));
+                } else {
+                    if (js_not_slow(ctx, sp))
+                        goto exception;
+                }
+            }
+            BREAK;
+
+        CASE(OP_shl):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    uint32_t v1, v2;
+                    v1 = JS_VALUE_GET_INT(op1);
+                    v2 = JS_VALUE_GET_INT(op2);
+#ifdef CONFIG_BIGNUM
+                    {
+                        int64_t r;
+                        if (unlikely(sf->js_mode & JS_MODE_MATH)) {
+                            if (v2 > 0x1f)
+                                goto shl_slow;
+                            r = (int64_t)v1 << v2;
+                            if ((int)r != r)
+                                goto shl_slow;
+                        } else {
+                            v2 &= 0x1f;
+                        }
+                    }
+#else
+                    v2 &= 0x1f;
+#endif
+                    sp[-2] = JS_NewInt32(ctx, v1 << v2);
+                    sp--;
+                } else {
+#ifdef CONFIG_BIGNUM
+                shl_slow:
+#endif
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_shr):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    uint32_t v2;
+                    v2 = JS_VALUE_GET_INT(op2);
+                    /* v1 >>> v2 retains its JS semantics if CONFIG_BIGNUM */
+                    v2 &= 0x1f;
+                    sp[-2] = JS_NewUint32(ctx,
+                                          (uint32_t)JS_VALUE_GET_INT(op1) >>
+                                          v2);
+                    sp--;
+                } else {
+                    if (js_shr_slow(ctx, sp))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_sar):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    uint32_t v2;
+                    v2 = JS_VALUE_GET_INT(op2);
+#ifdef CONFIG_BIGNUM
+                    if (unlikely(v2 > 0x1f)) {
+                        if (unlikely(sf->js_mode & JS_MODE_MATH))
+                            goto sar_slow;
+                        else
+                            v2 &= 0x1f;
+                    }
+#else
+                    v2 &= 0x1f;
+#endif
+                    sp[-2] = JS_NewInt32(ctx,
+                                          (int)JS_VALUE_GET_INT(op1) >> v2);
+                    sp--;
+                } else {
+#ifdef CONFIG_BIGNUM
+                sar_slow:
+#endif
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_and):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    sp[-2] = JS_NewInt32(ctx,
+                                         JS_VALUE_GET_INT(op1) &
+                                         JS_VALUE_GET_INT(op2));
+                    sp--;
+                } else {
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_or):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    sp[-2] = JS_NewInt32(ctx,
+                                         JS_VALUE_GET_INT(op1) |
+                                         JS_VALUE_GET_INT(op2));
+                    sp--;
+                } else {
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_xor):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    sp[-2] = JS_NewInt32(ctx,
+                                         JS_VALUE_GET_INT(op1) ^
+                                         JS_VALUE_GET_INT(op2));
+                    sp--;
+                } else {
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+
+
+#define OP_CMP(opcode, binary_op, slow_call)              \
+            CASE(opcode):                                 \
+                {                                         \
+                JSValue op1, op2;                         \
+                op1 = sp[-2];                             \
+                op2 = sp[-1];                                   \
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {           \
+                    sp[-2] = JS_NewBool(ctx, JS_VALUE_GET_INT(op1) binary_op JS_VALUE_GET_INT(op2)); \
+                    sp--;                                               \
+                } else {                                                \
+                    if (slow_call)                                      \
+                        goto exception;                                 \
+                    sp--;                                               \
+                }                                                       \
+                }                                                       \
+            BREAK
+
+            OP_CMP(OP_lt, <, js_relational_slow(ctx, sp, opcode));
+            OP_CMP(OP_lte, <=, js_relational_slow(ctx, sp, opcode));
+            OP_CMP(OP_gt, >, js_relational_slow(ctx, sp, opcode));
+            OP_CMP(OP_gte, >=, js_relational_slow(ctx, sp, opcode));
+            OP_CMP(OP_eq, ==, js_eq_slow(ctx, sp, 0));
+            OP_CMP(OP_neq, !=, js_eq_slow(ctx, sp, 1));
+            OP_CMP(OP_strict_eq, ==, js_strict_eq_slow(ctx, sp, 0));
+            OP_CMP(OP_strict_neq, !=, js_strict_eq_slow(ctx, sp, 1));
+
+#ifdef CONFIG_BIGNUM
+        CASE(OP_mul_pow10):
+            if (rt->bigfloat_ops.mul_pow10(ctx, sp))
+                goto exception;
+            sp--;
+            BREAK;
+#endif
+        CASE(OP_in):
+            if (js_operator_in(ctx, sp))
+                goto exception;
+            sp--;
+            BREAK;
+        CASE(OP_private_in):
+            if (js_operator_private_in(ctx, sp))
+                goto exception;
+            sp--;
+            BREAK;
+        CASE(OP_instanceof):
+            if (js_operator_instanceof(ctx, sp))
+                goto exception;
+            sp--;
+            BREAK;
+        CASE(OP_typeof):
+            {
+                JSValue op1;
+                JSAtom atom;
+
+                op1 = sp[-1];
+                atom = js_operator_typeof(ctx, op1);
+                JS_FreeValue(ctx, op1);
+                sp[-1] = JS_AtomToString(ctx, atom);
+            }
+            BREAK;
+        CASE(OP_delete):
+            if (js_operator_delete(ctx, sp))
+                goto exception;
+            sp--;
+            BREAK;
+        CASE(OP_delete_var):
+            {
+                JSAtom atom;
+                int ret;
+
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_DeleteProperty(ctx, ctx->global_obj, atom, 0);
+                if (unlikely(ret < 0))
+                    goto exception;
+                *sp++ = JS_NewBool(ctx, ret);
+            }
+            BREAK;
+
+        CASE(OP_to_object):
+            if (JS_VALUE_GET_TAG(sp[-1]) != JS_TAG_OBJECT) {
+                ret_val = JS_ToObject(ctx, sp[-1]);
+                if (JS_IsException(ret_val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret_val;
+            }
+            BREAK;
+
+        CASE(OP_to_propkey):
+            switch (JS_VALUE_GET_TAG(sp[-1])) {
+            case JS_TAG_INT:
+            case JS_TAG_STRING:
+            case JS_TAG_SYMBOL:
+                break;
+            default:
+                ret_val = JS_ToPropertyKey(ctx, sp[-1]);
+                if (JS_IsException(ret_val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret_val;
+                break;
+            }
+            BREAK;
+
+        CASE(OP_to_propkey2):
+            /* must be tested first */
+            if (unlikely(JS_IsUndefined(sp[-2]) || JS_IsNull(sp[-2]))) {
+                JS_ThrowTypeError(ctx, "value has no property");
+                goto exception;
+            }
+            switch (JS_VALUE_GET_TAG(sp[-1])) {
+            case JS_TAG_INT:
+            case JS_TAG_STRING:
+            case JS_TAG_SYMBOL:
+                break;
+            default:
+                ret_val = JS_ToPropertyKey(ctx, sp[-1]);
+                if (JS_IsException(ret_val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret_val;
+                break;
+            }
+            BREAK;
+#if 0
+        CASE(OP_to_string):
+            if (JS_VALUE_GET_TAG(sp[-1]) != JS_TAG_STRING) {
+                ret_val = JS_ToString(ctx, sp[-1]);
+                if (JS_IsException(ret_val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret_val;
+            }
+            BREAK;
+#endif
+        CASE(OP_with_get_var):
+        CASE(OP_with_put_var):
+        CASE(OP_with_delete_var):
+        CASE(OP_with_make_ref):
+        CASE(OP_with_get_ref):
+        CASE(OP_with_get_ref_undef):
+            {
+                JSAtom atom;
+                int32_t diff;
+                JSValue obj, val;
+                int ret, is_with;
+                atom = get_u32(pc);
+                diff = get_u32(pc + 4);
+                is_with = pc[8];
+                pc += 9;
+
+                obj = sp[-1];
+                ret = JS_HasProperty(ctx, obj, atom);
+                if (unlikely(ret < 0))
+                    goto exception;
+                if (ret) {
+                    if (is_with) {
+                        ret = js_has_unscopable(ctx, obj, atom);
+                        if (unlikely(ret < 0))
+                            goto exception;
+                        if (ret)
+                            goto no_with;
+                    }
+                    switch (opcode) {
+                    case OP_with_get_var:
+                        val = JS_GetProperty(ctx, obj, atom);
+                        if (unlikely(JS_IsException(val)))
+                            goto exception;
+                        set_value(ctx, &sp[-1], val);
+                        break;
+                    case OP_with_put_var:
+                        /* XXX: check if strict mode */
+                        ret = JS_SetPropertyInternal(ctx, obj, atom, sp[-2], obj,
+                                                     JS_PROP_THROW_STRICT);
+                        JS_FreeValue(ctx, sp[-1]);
+                        sp -= 2;
+                        if (unlikely(ret < 0))
+                            goto exception;
+                        break;
+                    case OP_with_delete_var:
+                        ret = JS_DeleteProperty(ctx, obj, atom, 0);
+                        if (unlikely(ret < 0))
+                            goto exception;
+                        JS_FreeValue(ctx, sp[-1]);
+                        sp[-1] = JS_NewBool(ctx, ret);
+                        break;
+                    case OP_with_make_ref:
+                        /* produce a pair object/propname on the stack */
+                        *sp++ = JS_AtomToValue(ctx, atom);
+                        break;
+                    case OP_with_get_ref:
+                        /* produce a pair object/method on the stack */
+                        val = JS_GetProperty(ctx, obj, atom);
+                        if (unlikely(JS_IsException(val)))
+                            goto exception;
+                        *sp++ = val;
+                        break;
+                    case OP_with_get_ref_undef:
+                        /* produce a pair undefined/function on the stack */
+                        val = JS_GetProperty(ctx, obj, atom);
+                        if (unlikely(JS_IsException(val)))
+                            goto exception;
+                        JS_FreeValue(ctx, sp[-1]);
+                        sp[-1] = JS_UNDEFINED;
+                        *sp++ = val;
+                        break;
+                    }
+                    pc += diff - 5;
+                } else {
+                no_with:
+                    /* if not jumping, drop the object argument */
+                    JS_FreeValue(ctx, sp[-1]);
+                    sp--;
+                }
+            }
+            BREAK;
+
+        CASE(OP_await):
+            ret_val = JS_NewInt32(ctx, FUNC_RET_AWAIT);
+            goto done_generator;
+        CASE(OP_yield):
+            ret_val = JS_NewInt32(ctx, FUNC_RET_YIELD);
+            goto done_generator;
+        CASE(OP_yield_star):
+        CASE(OP_async_yield_star):
+            ret_val = JS_NewInt32(ctx, FUNC_RET_YIELD_STAR);
+            goto done_generator;
+        CASE(OP_return_async):
+            ret_val = JS_UNDEFINED;
+            goto done_generator;
+        CASE(OP_initial_yield):
+            ret_val = JS_NewInt32(ctx, FUNC_RET_INITIAL_YIELD);
+            goto done_generator;
+
+        CASE(OP_nop):
+            BREAK;
+        CASE(OP_is_undefined_or_null):
+            if (JS_VALUE_GET_TAG(sp[-1]) == JS_TAG_UNDEFINED ||
+                JS_VALUE_GET_TAG(sp[-1]) == JS_TAG_NULL) {
+                goto set_true;
+            } else {
+                goto free_and_set_false;
+            }
+#if SHORT_OPCODES
+        CASE(OP_is_undefined):
+            if (JS_VALUE_GET_TAG(sp[-1]) == JS_TAG_UNDEFINED) {
+                goto set_true;
+            } else {
+                goto free_and_set_false;
+            }
+        CASE(OP_is_null):
+            if (JS_VALUE_GET_TAG(sp[-1]) == JS_TAG_NULL) {
+                goto set_true;
+            } else {
+                goto free_and_set_false;
+            }
+            /* XXX: could merge to a single opcode */
+        CASE(OP_typeof_is_undefined):
+            /* different from OP_is_undefined because of isHTMLDDA */
+            if (js_operator_typeof(ctx, sp[-1]) == JS_ATOM_undefined) {
+                goto free_and_set_true;
+            } else {
+                goto free_and_set_false;
+            }
+        CASE(OP_typeof_is_function):
+            if (js_operator_typeof(ctx, sp[-1]) == JS_ATOM_function) {
+                goto free_and_set_true;
+            } else {
+                goto free_and_set_false;
+            }
+        free_and_set_true:
+            JS_FreeValue(ctx, sp[-1]);
+#endif
+        set_true:
+            sp[-1] = JS_TRUE;
+            BREAK;
+        free_and_set_false:
+            JS_FreeValue(ctx, sp[-1]);
+            sp[-1] = JS_FALSE;
+            BREAK;
+        CASE(OP_invalid):
+        DEFAULT:
+            JS_ThrowInternalError(ctx, "invalid opcode: pc=%u opcode=0x%02x",
+                                  (int)(pc - b->byte_code_buf - 1), opcode);
+            goto exception;
+        }
+    }
+ exception:
+    if (JS_IsString(rt->current_exception)) {
+        JSValue error_obj = JS_NewError(ctx);
+        JSAtom msgProp = JS_NewAtom(ctx, "message");
+        JS_DefinePropertyValue(ctx, error_obj, msgProp, rt->current_exception, 0);
+        rt->current_exception = error_obj;
+        JS_FreeAtom(ctx, msgProp);
+    }
+    if (is_backtrace_needed(ctx, rt->current_exception)) {
+        /* add the backtrace information now (it is not done
+           before if the exception happens in a bytecode
+           operation */
+        sf->cur_pc = pc;
+        build_backtrace(ctx, rt->current_exception, NULL, 0, 0);
+    }
+    if (!JS_IsUncatchableError(ctx, rt->current_exception)) {
+        while (sp > stack_buf) {
+            JSValue val = *--sp;
+            JS_FreeValue(ctx, val);
+            if (JS_VALUE_GET_TAG(val) == JS_TAG_CATCH_OFFSET) {
+                int pos = JS_VALUE_GET_INT(val);
+                if (pos == 0) {
+                    /* enumerator: close it with a throw */
+                    JS_FreeValue(ctx, sp[-1]); /* drop the next method */
+                    sp--;
+                    JS_IteratorClose(ctx, sp[-1], TRUE);
+                } else {
+                    *sp++ = rt->current_exception;
+                    rt->current_exception = JS_NULL;
+                    pc = b->byte_code_buf + pos;
+                    goto restart;
+                }
+            }
+        }
+    }
+    ret_val = JS_EXCEPTION;
+    /* the local variables are freed by the caller in the generator
+       case. Hence the label 'done' should never be reached in a
+       generator function. */
+    if (b->func_kind != JS_FUNC_NORMAL) {
+    done_generator:
+        sf->cur_pc = pc;
+        sf->cur_sp = sp;
+    } else {
+    done:
+        if (unlikely(!list_empty(&sf->var_ref_list))) {
+            /* variable references reference the stack: must close them */
+            close_var_refs(rt, sf);
+        }
+        /* free the local variables and stack */
+        for(pval = local_buf; pval < sp; pval++) {
+            JS_FreeValue(ctx, *pval);
+        }
+    }
+    rt->current_stack_frame = sf->prev_frame;
+    if (ctx->handleFunctionExited)
+        ctx->handleFunctionExited(ctx);
+    return ret_val;
+}
+
+JSValue JS_Call(JSContext *ctx, JSValueConst func_obj, JSValueConst this_obj,
+                int argc, JSValueConst *argv)
+{
+    return JS_CallInternal(ctx, func_obj, this_obj, JS_UNDEFINED,
+                           argc, (JSValue *)argv, JS_CALL_FLAG_COPY_ARGV);
+}
+
+static JSValue JS_CallFree(JSContext *ctx, JSValue func_obj, JSValueConst this_obj,
+                           int argc, JSValueConst *argv)
+{
+    JSValue res = JS_CallInternal(ctx, func_obj, this_obj, JS_UNDEFINED,
+                                  argc, (JSValue *)argv, JS_CALL_FLAG_COPY_ARGV);
+    JS_FreeValue(ctx, func_obj);
+    return res;
+}
+
+/* warning: the refcount of the context is not incremented. Return
+   NULL in case of exception (case of revoked proxy only) */
+static JSContext *JS_GetFunctionRealm(JSContext *ctx, JSValueConst func_obj)
+{
+    JSObject *p;
+    JSContext *realm;
+
+    if (JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)
+        return ctx;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    switch(p->class_id) {
+    case JS_CLASS_C_FUNCTION:
+        realm = p->u.cfunc.realm;
+        break;
+    case JS_CLASS_BYTECODE_FUNCTION:
+    case JS_CLASS_GENERATOR_FUNCTION:
+    case JS_CLASS_ASYNC_FUNCTION:
+    case JS_CLASS_ASYNC_GENERATOR_FUNCTION:
+        {
+            JSFunctionBytecode *b;
+            b = p->u.func.function_bytecode;
+            realm = b->realm;
+        }
+        break;
+    case JS_CLASS_PROXY:
+        {
+            JSProxyData *s = p->u.opaque;
+            if (!s)
+                return ctx;
+            if (s->is_revoked) {
+                JS_ThrowTypeErrorRevokedProxy(ctx);
+                return NULL;
+            } else {
+                realm = JS_GetFunctionRealm(ctx, s->target);
+            }
+        }
+        break;
+    case JS_CLASS_BOUND_FUNCTION:
+        {
+            JSBoundFunction *bf = p->u.bound_function;
+            realm = JS_GetFunctionRealm(ctx, bf->func_obj);
+        }
+        break;
+    default:
+        realm = ctx;
+        break;
+    }
+    return realm;
+}
+
+static JSValue js_create_from_ctor(JSContext *ctx, JSValueConst ctor,
+                                   int class_id)
+{
+    JSValue proto, obj;
+    JSContext *realm;
+
+    if (JS_IsUndefined(ctor)) {
+        proto = JS_DupValue(ctx, ctx->class_proto[class_id]);
+    } else {
+        proto = JS_GetProperty(ctx, ctor, JS_ATOM_prototype);
+        if (JS_IsException(proto))
+            return proto;
+        if (!JS_IsObject(proto)) {
+            JS_FreeValue(ctx, proto);
+            realm = JS_GetFunctionRealm(ctx, ctor);
+            if (!realm)
+                return JS_EXCEPTION;
+            proto = JS_DupValue(ctx, realm->class_proto[class_id]);
+        }
+    }
+    obj = JS_NewObjectProtoClass(ctx, proto, class_id);
+    JS_FreeValue(ctx, proto);
+    return obj;
+}
+
+/* argv[] is modified if (flags & JS_CALL_FLAG_COPY_ARGV) = 0. */
+static JSValue JS_CallConstructorInternal(JSContext *ctx,
+                                          JSValueConst func_obj,
+                                          JSValueConst new_target,
+                                          int argc, JSValue *argv, int flags)
+{
+    JSObject *p;
+    JSFunctionBytecode *b;
+
+    if (js_poll_interrupts(ctx))
+        return JS_EXCEPTION;
+    flags |= JS_CALL_FLAG_CONSTRUCTOR;
+    if (unlikely(JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT))
+        goto not_a_function;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    if (unlikely(!p->is_constructor))
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    if (unlikely(p->class_id != JS_CLASS_BYTECODE_FUNCTION)) {
+        JSClassCall *call_func;
+        call_func = ctx->rt->class_array[p->class_id].call;
+        if (!call_func) {
+        not_a_function:
+            return JS_ThrowTypeError(ctx, "not a function");
+        }
+        return call_func(ctx, func_obj, new_target, argc,
+                         (JSValueConst *)argv, flags);
+    }
+
+    b = p->u.func.function_bytecode;
+    if (b->is_derived_class_constructor) {
+        return JS_CallInternal(ctx, func_obj, JS_UNDEFINED, new_target, argc, argv, flags);
+    } else {
+        JSValue obj, ret;
+        /* legacy constructor behavior */
+        obj = js_create_from_ctor(ctx, new_target, JS_CLASS_OBJECT);
+        if (JS_IsException(obj))
+            return JS_EXCEPTION;
+        ret = JS_CallInternal(ctx, func_obj, obj, new_target, argc, argv, flags);
+        if (JS_VALUE_GET_TAG(ret) == JS_TAG_OBJECT ||
+            JS_IsException(ret)) {
+            JS_FreeValue(ctx, obj);
+            return ret;
+        } else {
+            JS_FreeValue(ctx, ret);
+            return obj;
+        }
+    }
+}
+
+JSValue JS_CallConstructor2(JSContext *ctx, JSValueConst func_obj,
+                            JSValueConst new_target,
+                            int argc, JSValueConst *argv)
+{
+    return JS_CallConstructorInternal(ctx, func_obj, new_target,
+                                      argc, (JSValue *)argv,
+                                      JS_CALL_FLAG_COPY_ARGV);
+}
+
+JSValue JS_CallConstructor(JSContext *ctx, JSValueConst func_obj,
+                           int argc, JSValueConst *argv)
+{
+    return JS_CallConstructorInternal(ctx, func_obj, func_obj,
+                                      argc, (JSValue *)argv,
+                                      JS_CALL_FLAG_COPY_ARGV);
+}
+
+JSValue JS_Invoke(JSContext *ctx, JSValueConst this_val, JSAtom atom,
+                  int argc, JSValueConst *argv)
+{
+    JSValue func_obj;
+    func_obj = JS_GetProperty(ctx, this_val, atom);
+    if (JS_IsException(func_obj))
+        return func_obj;
+    return JS_CallFree(ctx, func_obj, this_val, argc, argv);
+}
+
+static JSValue JS_InvokeFree(JSContext *ctx, JSValue this_val, JSAtom atom,
+                             int argc, JSValueConst *argv)
+{
+    JSValue res = JS_Invoke(ctx, this_val, atom, argc, argv);
+    JS_FreeValue(ctx, this_val);
+    return res;
+}
+
+/* JSAsyncFunctionState (used by generator and async functions) */
+static JSAsyncFunctionState *async_func_init(JSContext *ctx,
+                                             JSValueConst func_obj, JSValueConst this_obj,
+                                             int argc, JSValueConst *argv)
+{
+    JSAsyncFunctionState *s;
+    JSObject *p;
+    JSFunctionBytecode *b;
+    JSStackFrame *sf;
+    int local_count, i, arg_buf_len, n;
+
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        return NULL;
+    s->header.ref_count = 1;
+    add_gc_object(ctx->rt, &s->header, JS_GC_OBJ_TYPE_ASYNC_FUNCTION);
+
+    sf = &s->frame;
+    init_list_head(&sf->var_ref_list);
+    p = JS_VALUE_GET_OBJ(func_obj);
+    b = p->u.func.function_bytecode;
+    sf->js_mode = b->js_mode | JS_MODE_ASYNC;
+    sf->cur_pc = b->byte_code_buf;
+    arg_buf_len = max_int(b->arg_count, argc);
+    local_count = arg_buf_len + b->var_count + b->stack_size;
+    sf->arg_buf = js_malloc(ctx, sizeof(JSValue) * max_int(local_count, 1));
+    if (!sf->arg_buf) {
+        js_free(ctx, s);
+        return NULL;
+    }
+    sf->cur_func = JS_DupValue(ctx, func_obj);
+    s->this_val = JS_DupValue(ctx, this_obj);
+    s->argc = argc;
+    sf->arg_count = arg_buf_len;
+    sf->var_buf = sf->arg_buf + arg_buf_len;
+    sf->cur_sp = sf->var_buf + b->var_count;
+    for(i = 0; i < argc; i++)
+        sf->arg_buf[i] = JS_DupValue(ctx, argv[i]);
+    n = arg_buf_len + b->var_count;
+    for(i = argc; i < n; i++)
+        sf->arg_buf[i] = JS_UNDEFINED;
+    s->resolving_funcs[0] = JS_UNDEFINED;
+    s->resolving_funcs[1] = JS_UNDEFINED;
+    s->is_completed = FALSE;
+    return s;
+}
+
+static void async_func_free_frame(JSRuntime *rt, JSAsyncFunctionState *s)
+{
+    JSStackFrame *sf = &s->frame;
+    JSValue *sp;
+
+    if (sf->arg_buf) {
+        /* cannot free the function if it is running */
+        assert(sf->cur_sp != NULL);
+        for(sp = sf->arg_buf; sp < sf->cur_sp; sp++) {
+            JS_FreeValueRT(rt, *sp);
+        }
+        js_free_rt(rt, sf->arg_buf);
+        sf->arg_buf = NULL;
+    }
+    JS_FreeValueRT(rt, sf->cur_func);
+    JS_FreeValueRT(rt, s->this_val);
+}
+
+static JSValue async_func_resume(JSContext *ctx, JSAsyncFunctionState *s)
+{
+    JSRuntime *rt = ctx->rt;
+    JSStackFrame *sf = &s->frame;
+    JSValue func_obj, ret;
+
+    assert(!s->is_completed);
+    if (js_check_stack_overflow(ctx->rt, 0)) {
+        ret = JS_ThrowStackOverflow(ctx);
+    } else {
+        /* the tag does not matter provided it is not an object */
+        func_obj = JS_MKPTR(JS_TAG_INT, s);
+        ret = JS_CallInternal(ctx, func_obj, s->this_val, JS_UNDEFINED,
+                              s->argc, sf->arg_buf, JS_CALL_FLAG_GENERATOR);
+    }
+    if (JS_IsException(ret) || JS_IsUndefined(ret)) {
+        if (JS_IsUndefined(ret)) {
+            ret = sf->cur_sp[-1];
+            sf->cur_sp[-1] = JS_UNDEFINED;
+        }
+        /* end of execution */
+        s->is_completed = TRUE;
+
+        /* close the closure variables. */
+        close_var_refs(rt, sf);
+
+        async_func_free_frame(rt, s);
+    }
+    return ret;
+}
+
+static void __async_func_free(JSRuntime *rt, JSAsyncFunctionState *s)
+{
+    /* cannot close the closure variables here because it would
+       potentially modify the object graph */
+    if (!s->is_completed) {
+        async_func_free_frame(rt, s);
+    }
+
+    JS_FreeValueRT(rt, s->resolving_funcs[0]);
+    JS_FreeValueRT(rt, s->resolving_funcs[1]);
+
+    remove_gc_object(&s->header);
+    if (rt->gc_phase == JS_GC_PHASE_REMOVE_CYCLES && s->header.ref_count != 0) {
+        list_add_tail(&s->header.link, &rt->gc_zero_ref_count_list);
+    } else {
+        js_free_rt(rt, s);
+    }
+}
+
+static void async_func_free(JSRuntime *rt, JSAsyncFunctionState *s)
+{
+    if (--s->header.ref_count == 0) {
+        if (rt->gc_phase != JS_GC_PHASE_REMOVE_CYCLES) {
+            list_del(&s->header.link);
+            list_add(&s->header.link, &rt->gc_zero_ref_count_list);
+            if (rt->gc_phase == JS_GC_PHASE_NONE) {
+                free_zero_refcount(rt);
+            }
+        }
+    }
+}
+
+/* Generators */
+
+typedef enum JSGeneratorStateEnum {
+    JS_GENERATOR_STATE_SUSPENDED_START,
+    JS_GENERATOR_STATE_SUSPENDED_YIELD,
+    JS_GENERATOR_STATE_SUSPENDED_YIELD_STAR,
+    JS_GENERATOR_STATE_EXECUTING,
+    JS_GENERATOR_STATE_COMPLETED,
+} JSGeneratorStateEnum;
+
+typedef struct JSGeneratorData {
+    JSGeneratorStateEnum state;
+    JSAsyncFunctionState *func_state;
+} JSGeneratorData;
+
+static void free_generator_stack_rt(JSRuntime *rt, JSGeneratorData *s)
+{
+    if (s->state == JS_GENERATOR_STATE_COMPLETED)
+        return;
+    if (s->func_state) {
+        async_func_free(rt, s->func_state);
+        s->func_state = NULL;
+    }
+    s->state = JS_GENERATOR_STATE_COMPLETED;
+}
+
+static void js_generator_finalizer(JSRuntime *rt, JSValue obj)
+{
+    JSGeneratorData *s = JS_GetOpaque(obj, JS_CLASS_GENERATOR);
+
+    if (s) {
+        free_generator_stack_rt(rt, s);
+        js_free_rt(rt, s);
+    }
+}
+
+static void free_generator_stack(JSContext *ctx, JSGeneratorData *s)
+{
+    free_generator_stack_rt(ctx->rt, s);
+}
+
+static void js_generator_mark(JSRuntime *rt, JSValueConst val,
+                              JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSGeneratorData *s = p->u.generator_data;
+
+    if (!s || !s->func_state)
+        return;
+    mark_func(rt, &s->func_state->header);
+}
+
+/* XXX: use enum */
+#define GEN_MAGIC_NEXT   0
+#define GEN_MAGIC_RETURN 1
+#define GEN_MAGIC_THROW  2
+
+static JSValue js_generator_next(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv,
+                                 BOOL *pdone, int magic)
+{
+    JSGeneratorData *s = JS_GetOpaque(this_val, JS_CLASS_GENERATOR);
+    JSStackFrame *sf;
+    JSValue ret, func_ret;
+
+    *pdone = TRUE;
+    if (!s)
+        return JS_ThrowTypeError(ctx, "not a generator");
+    switch(s->state) {
+    default:
+    case JS_GENERATOR_STATE_SUSPENDED_START:
+        sf = &s->func_state->frame;
+        if (magic == GEN_MAGIC_NEXT) {
+            goto exec_no_arg;
+        } else {
+            free_generator_stack(ctx, s);
+            goto done;
+        }
+        break;
+    case JS_GENERATOR_STATE_SUSPENDED_YIELD_STAR:
+    case JS_GENERATOR_STATE_SUSPENDED_YIELD:
+        sf = &s->func_state->frame;
+        /* cur_sp[-1] was set to JS_UNDEFINED in the previous call */
+        ret = JS_DupValue(ctx, argv[0]);
+        if (magic == GEN_MAGIC_THROW &&
+            s->state == JS_GENERATOR_STATE_SUSPENDED_YIELD) {
+            JS_Throw(ctx, ret);
+            s->func_state->throw_flag = TRUE;
+        } else {
+            sf->cur_sp[-1] = ret;
+            sf->cur_sp[0] = JS_NewInt32(ctx, magic);
+            sf->cur_sp++;
+        exec_no_arg:
+            s->func_state->throw_flag = FALSE;
+        }
+        s->state = JS_GENERATOR_STATE_EXECUTING;
+        func_ret = async_func_resume(ctx, s->func_state);
+        s->state = JS_GENERATOR_STATE_SUSPENDED_YIELD;
+        if (s->func_state->is_completed) {
+            /* finalize the execution in case of exception or normal return */
+            free_generator_stack(ctx, s);
+            return func_ret;
+        } else {
+            assert(JS_VALUE_GET_TAG(func_ret) == JS_TAG_INT);
+            /* get the returned yield value at the top of the stack */
+            ret = sf->cur_sp[-1];
+            sf->cur_sp[-1] = JS_UNDEFINED;
+            if (JS_VALUE_GET_INT(func_ret) == FUNC_RET_YIELD_STAR) {
+                s->state = JS_GENERATOR_STATE_SUSPENDED_YIELD_STAR;
+                /* return (value, done) object */
+                *pdone = 2;
+            } else {
+                *pdone = FALSE;
+            }
+        }
+        break;
+    case JS_GENERATOR_STATE_COMPLETED:
+    done:
+        /* execution is finished */
+        switch(magic) {
+        default:
+        case GEN_MAGIC_NEXT:
+            ret = JS_UNDEFINED;
+            break;
+        case GEN_MAGIC_RETURN:
+            ret = JS_DupValue(ctx, argv[0]);
+            break;
+        case GEN_MAGIC_THROW:
+            ret = JS_Throw(ctx, JS_DupValue(ctx, argv[0]));
+            break;
+        }
+        break;
+    case JS_GENERATOR_STATE_EXECUTING:
+        ret = JS_ThrowTypeError(ctx, "cannot invoke a running generator");
+        break;
+    }
+    return ret;
+}
+
+static JSValue js_generator_function_call(JSContext *ctx, JSValueConst func_obj,
+                                          JSValueConst this_obj,
+                                          int argc, JSValueConst *argv,
+                                          int flags)
+{
+    JSValue obj, func_ret;
+    JSGeneratorData *s;
+
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        return JS_EXCEPTION;
+    s->state = JS_GENERATOR_STATE_SUSPENDED_START;
+    s->func_state = async_func_init(ctx, func_obj, this_obj, argc, argv);
+    if (!s->func_state) {
+        s->state = JS_GENERATOR_STATE_COMPLETED;
+        goto fail;
+    }
+
+    /* execute the function up to 'OP_initial_yield' */
+    func_ret = async_func_resume(ctx, s->func_state);
+    if (JS_IsException(func_ret))
+        goto fail;
+    JS_FreeValue(ctx, func_ret);
+
+    obj = js_create_from_ctor(ctx, func_obj, JS_CLASS_GENERATOR);
+    if (JS_IsException(obj))
+        goto fail;
+    JS_SetOpaque(obj, s);
+    return obj;
+ fail:
+    free_generator_stack_rt(ctx->rt, s);
+    js_free(ctx, s);
+    return JS_EXCEPTION;
+}
+
+/* AsyncFunction */
+
+static void js_async_function_resolve_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSAsyncFunctionState *s = p->u.async_function_data;
+    if (s) {
+        async_func_free(rt, s);
+    }
+}
+
+static void js_async_function_resolve_mark(JSRuntime *rt, JSValueConst val,
+                                           JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSAsyncFunctionState *s = p->u.async_function_data;
+    if (s) {
+        mark_func(rt, &s->header);
+    }
+}
+
+static int js_async_function_resolve_create(JSContext *ctx,
+                                            JSAsyncFunctionState *s,
+                                            JSValue *resolving_funcs)
+{
+    int i;
+    JSObject *p;
+
+    for(i = 0; i < 2; i++) {
+        resolving_funcs[i] =
+            JS_NewObjectProtoClass(ctx, ctx->function_proto,
+                                   JS_CLASS_ASYNC_FUNCTION_RESOLVE + i);
+        if (JS_IsException(resolving_funcs[i])) {
+            if (i == 1)
+                JS_FreeValue(ctx, resolving_funcs[0]);
+            return -1;
+        }
+        p = JS_VALUE_GET_OBJ(resolving_funcs[i]);
+        s->header.ref_count++;
+        p->u.async_function_data = s;
+    }
+    return 0;
+}
+
+static void js_async_function_resume(JSContext *ctx, JSAsyncFunctionState *s)
+{
+    JSValue func_ret, ret2;
+
+    func_ret = async_func_resume(ctx, s);
+    if (s->is_completed) {
+        if (JS_IsException(func_ret)) {
+            JSValue error;
+        fail:
+            error = JS_GetException(ctx);
+            ret2 = JS_Call(ctx, s->resolving_funcs[1], JS_UNDEFINED,
+                           1, (JSValueConst *)&error);
+            JS_FreeValue(ctx, error);
+            JS_FreeValue(ctx, ret2); /* XXX: what to do if exception ? */
+        } else {
+            /* normal return */
+            ret2 = JS_Call(ctx, s->resolving_funcs[0], JS_UNDEFINED,
+                           1, (JSValueConst *)&func_ret);
+            JS_FreeValue(ctx, func_ret);
+            JS_FreeValue(ctx, ret2); /* XXX: what to do if exception ? */
+        }
+    } else {
+        JSValue value, promise, resolving_funcs[2], resolving_funcs1[2];
+        int i, res;
+
+        value = s->frame.cur_sp[-1];
+        s->frame.cur_sp[-1] = JS_UNDEFINED;
+
+        /* await */
+        JS_FreeValue(ctx, func_ret); /* not used */
+        promise = js_promise_resolve(ctx, ctx->promise_ctor,
+                                     1, (JSValueConst *)&value, 0);
+        JS_FreeValue(ctx, value);
+        if (JS_IsException(promise))
+            goto fail;
+        if (js_async_function_resolve_create(ctx, s, resolving_funcs)) {
+            JS_FreeValue(ctx, promise);
+            goto fail;
+        }
+
+        /* Note: no need to create 'thrownawayCapability' as in
+           the spec */
+        for(i = 0; i < 2; i++)
+            resolving_funcs1[i] = JS_UNDEFINED;
+        res = perform_promise_then(ctx, promise,
+                                   (JSValueConst *)resolving_funcs,
+                                   (JSValueConst *)resolving_funcs1);
+        JS_FreeValue(ctx, promise);
+        for(i = 0; i < 2; i++)
+            JS_FreeValue(ctx, resolving_funcs[i]);
+        if (res)
+            goto fail;
+    }
+}
+
+static JSValue js_async_function_resolve_call(JSContext *ctx,
+                                              JSValueConst func_obj,
+                                              JSValueConst this_obj,
+                                              int argc, JSValueConst *argv,
+                                              int flags)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(func_obj);
+    JSAsyncFunctionState *s = p->u.async_function_data;
+    BOOL is_reject = p->class_id - JS_CLASS_ASYNC_FUNCTION_RESOLVE;
+    JSValueConst arg;
+
+    if (argc > 0)
+        arg = argv[0];
+    else
+        arg = JS_UNDEFINED;
+    s->throw_flag = is_reject;
+    if (is_reject) {
+        JS_Throw(ctx, JS_DupValue(ctx, arg));
+    } else {
+        /* return value of await */
+        s->frame.cur_sp[-1] = JS_DupValue(ctx, arg);
+    }
+    js_async_function_resume(ctx, s);
+    return JS_UNDEFINED;
+}
+
+static JSValue js_async_function_call(JSContext *ctx, JSValueConst func_obj,
+                                      JSValueConst this_obj,
+                                      int argc, JSValueConst *argv, int flags)
+{
+    JSValue promise;
+    JSAsyncFunctionState *s;
+
+    s = async_func_init(ctx, func_obj, this_obj, argc, argv);
+    if (!s)
+        return JS_EXCEPTION;
+
+    promise = JS_NewPromiseCapability(ctx, s->resolving_funcs);
+    if (JS_IsException(promise)) {
+        async_func_free(ctx->rt, s);
+        return JS_EXCEPTION;
+    }
+
+    js_async_function_resume(ctx, s);
+
+    async_func_free(ctx->rt, s);
+
+    return promise;
+}
+
+/* AsyncGenerator */
+
+typedef enum JSAsyncGeneratorStateEnum {
+    JS_ASYNC_GENERATOR_STATE_SUSPENDED_START,
+    JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD,
+    JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD_STAR,
+    JS_ASYNC_GENERATOR_STATE_EXECUTING,
+    JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN,
+    JS_ASYNC_GENERATOR_STATE_COMPLETED,
+} JSAsyncGeneratorStateEnum;
+
+typedef struct JSAsyncGeneratorRequest {
+    struct list_head link;
+    /* completion */
+    int completion_type; /* GEN_MAGIC_x */
+    JSValue result;
+    /* promise capability */
+    JSValue promise;
+    JSValue resolving_funcs[2];
+} JSAsyncGeneratorRequest;
+
+typedef struct JSAsyncGeneratorData {
+    JSObject *generator; /* back pointer to the object (const) */
+    JSAsyncGeneratorStateEnum state;
+    /* func_state is NULL is state AWAITING_RETURN and COMPLETED */
+    JSAsyncFunctionState *func_state;
+    struct list_head queue; /* list of JSAsyncGeneratorRequest.link */
+} JSAsyncGeneratorData;
+
+static void js_async_generator_free(JSRuntime *rt,
+                                    JSAsyncGeneratorData *s)
+{
+    struct list_head *el, *el1;
+    JSAsyncGeneratorRequest *req;
+
+    list_for_each_safe(el, el1, &s->queue) {
+        req = list_entry(el, JSAsyncGeneratorRequest, link);
+        JS_FreeValueRT(rt, req->result);
+        JS_FreeValueRT(rt, req->promise);
+        JS_FreeValueRT(rt, req->resolving_funcs[0]);
+        JS_FreeValueRT(rt, req->resolving_funcs[1]);
+        js_free_rt(rt, req);
+    }
+    if (s->func_state)
+        async_func_free(rt, s->func_state);
+    js_free_rt(rt, s);
+}
+
+static void js_async_generator_finalizer(JSRuntime *rt, JSValue obj)
+{
+    JSAsyncGeneratorData *s = JS_GetOpaque(obj, JS_CLASS_ASYNC_GENERATOR);
+
+    if (s) {
+        js_async_generator_free(rt, s);
+    }
+}
+
+static void js_async_generator_mark(JSRuntime *rt, JSValueConst val,
+                                    JS_MarkFunc *mark_func)
+{
+    JSAsyncGeneratorData *s = JS_GetOpaque(val, JS_CLASS_ASYNC_GENERATOR);
+    struct list_head *el;
+    JSAsyncGeneratorRequest *req;
+    if (s) {
+        list_for_each(el, &s->queue) {
+            req = list_entry(el, JSAsyncGeneratorRequest, link);
+            JS_MarkValue(rt, req->result, mark_func);
+            JS_MarkValue(rt, req->promise, mark_func);
+            JS_MarkValue(rt, req->resolving_funcs[0], mark_func);
+            JS_MarkValue(rt, req->resolving_funcs[1], mark_func);
+        }
+        if (s->func_state) {
+            mark_func(rt, &s->func_state->header);
+        }
+    }
+}
+
+static JSValue js_async_generator_resolve_function(JSContext *ctx,
+                                          JSValueConst this_obj,
+                                          int argc, JSValueConst *argv,
+                                          int magic, JSValue *func_data);
+
+static int js_async_generator_resolve_function_create(JSContext *ctx,
+                                                      JSValueConst generator,
+                                                      JSValue *resolving_funcs,
+                                                      BOOL is_resume_next)
+{
+    int i;
+    JSValue func;
+
+    for(i = 0; i < 2; i++) {
+        func = JS_NewCFunctionData(ctx, js_async_generator_resolve_function, 1,
+                                   i + is_resume_next * 2, 1, &generator);
+        if (JS_IsException(func)) {
+            if (i == 1)
+                JS_FreeValue(ctx, resolving_funcs[0]);
+            return -1;
+        }
+        resolving_funcs[i] = func;
+    }
+    return 0;
+}
+
+static int js_async_generator_await(JSContext *ctx,
+                                    JSAsyncGeneratorData *s,
+                                    JSValueConst value)
+{
+    JSValue promise, resolving_funcs[2], resolving_funcs1[2];
+    int i, res;
+
+    promise = js_promise_resolve(ctx, ctx->promise_ctor,
+                                 1, &value, 0);
+    if (JS_IsException(promise))
+        goto fail;
+
+    if (js_async_generator_resolve_function_create(ctx, JS_MKPTR(JS_TAG_OBJECT, s->generator),
+                                                   resolving_funcs, FALSE)) {
+        JS_FreeValue(ctx, promise);
+        goto fail;
+    }
+
+    /* Note: no need to create 'thrownawayCapability' as in
+       the spec */
+    for(i = 0; i < 2; i++)
+        resolving_funcs1[i] = JS_UNDEFINED;
+    res = perform_promise_then(ctx, promise,
+                               (JSValueConst *)resolving_funcs,
+                               (JSValueConst *)resolving_funcs1);
+    JS_FreeValue(ctx, promise);
+    for(i = 0; i < 2; i++)
+        JS_FreeValue(ctx, resolving_funcs[i]);
+    if (res)
+        goto fail;
+    return 0;
+ fail:
+    return -1;
+}
+
+static void js_async_generator_resolve_or_reject(JSContext *ctx,
+                                                 JSAsyncGeneratorData *s,
+                                                 JSValueConst result,
+                                                 int is_reject)
+{
+    JSAsyncGeneratorRequest *next;
+    JSValue ret;
+
+    next = list_entry(s->queue.next, JSAsyncGeneratorRequest, link);
+    list_del(&next->link);
+    ret = JS_Call(ctx, next->resolving_funcs[is_reject], JS_UNDEFINED, 1,
+                  &result);
+    JS_FreeValue(ctx, ret);
+    JS_FreeValue(ctx, next->result);
+    JS_FreeValue(ctx, next->promise);
+    JS_FreeValue(ctx, next->resolving_funcs[0]);
+    JS_FreeValue(ctx, next->resolving_funcs[1]);
+    js_free(ctx, next);
+}
+
+static void js_async_generator_resolve(JSContext *ctx,
+                                       JSAsyncGeneratorData *s,
+                                       JSValueConst value,
+                                       BOOL done)
+{
+    JSValue result;
+    result = js_create_iterator_result(ctx, JS_DupValue(ctx, value), done);
+    /* XXX: better exception handling ? */
+    js_async_generator_resolve_or_reject(ctx, s, result, 0);
+    JS_FreeValue(ctx, result);
+ }
+
+static void js_async_generator_reject(JSContext *ctx,
+                                       JSAsyncGeneratorData *s,
+                                       JSValueConst exception)
+{
+    js_async_generator_resolve_or_reject(ctx, s, exception, 1);
+}
+
+static void js_async_generator_complete(JSContext *ctx,
+                                        JSAsyncGeneratorData *s)
+{
+    if (s->state != JS_ASYNC_GENERATOR_STATE_COMPLETED) {
+        s->state = JS_ASYNC_GENERATOR_STATE_COMPLETED;
+        async_func_free(ctx->rt, s->func_state);
+        s->func_state = NULL;
+    }
+}
+
+static int js_async_generator_completed_return(JSContext *ctx,
+                                               JSAsyncGeneratorData *s,
+                                               JSValueConst value)
+{
+    JSValue promise, resolving_funcs[2], resolving_funcs1[2];
+    int res;
+
+    // Can fail looking up JS_ATOM_constructor when is_reject==0.
+    promise = js_promise_resolve(ctx, ctx->promise_ctor, 1, &value,
+                                 /*is_reject*/0);
+    // A poisoned .constructor property is observable and the resulting
+    // exception should be delivered to the catch handler.
+    if (JS_IsException(promise)) {
+        JSValue err = JS_GetException(ctx);
+        promise = js_promise_resolve(ctx, ctx->promise_ctor, 1, (JSValueConst *)&err,
+                                     /*is_reject*/1);
+        JS_FreeValue(ctx, err);
+        if (JS_IsException(promise))
+            return -1;
+    }
+    if (js_async_generator_resolve_function_create(ctx,
+                                                   JS_MKPTR(JS_TAG_OBJECT, s->generator),
+                                                   resolving_funcs1,
+                                                   TRUE)) {
+        JS_FreeValue(ctx, promise);
+        return -1;
+    }
+    resolving_funcs[0] = JS_UNDEFINED;
+    resolving_funcs[1] = JS_UNDEFINED;
+    res = perform_promise_then(ctx, promise,
+                               (JSValueConst *)resolving_funcs1,
+                               (JSValueConst *)resolving_funcs);
+    JS_FreeValue(ctx, resolving_funcs1[0]);
+    JS_FreeValue(ctx, resolving_funcs1[1]);
+    JS_FreeValue(ctx, promise);
+    return res;
+}
+
+static void js_async_generator_resume_next(JSContext *ctx,
+                                           JSAsyncGeneratorData *s)
+{
+    JSAsyncGeneratorRequest *next;
+    JSValue func_ret, value;
+
+    for(;;) {
+        if (list_empty(&s->queue))
+            break;
+        next = list_entry(s->queue.next, JSAsyncGeneratorRequest, link);
+        switch(s->state) {
+        case JS_ASYNC_GENERATOR_STATE_EXECUTING:
+            /* only happens when restarting execution after await() */
+            goto resume_exec;
+        case JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN:
+            goto done;
+        case JS_ASYNC_GENERATOR_STATE_SUSPENDED_START:
+            if (next->completion_type == GEN_MAGIC_NEXT) {
+                goto exec_no_arg;
+            } else {
+                js_async_generator_complete(ctx, s);
+            }
+            break;
+        case JS_ASYNC_GENERATOR_STATE_COMPLETED:
+            if (next->completion_type == GEN_MAGIC_NEXT) {
+                js_async_generator_resolve(ctx, s, JS_UNDEFINED, TRUE);
+            } else if (next->completion_type == GEN_MAGIC_RETURN) {
+                s->state = JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN;
+                js_async_generator_completed_return(ctx, s, next->result);
+            } else {
+                js_async_generator_reject(ctx, s, next->result);
+            }
+            goto done;
+        case JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD:
+        case JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD_STAR:
+            value = JS_DupValue(ctx, next->result);
+            if (next->completion_type == GEN_MAGIC_THROW &&
+                s->state == JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD) {
+                JS_Throw(ctx, value);
+                s->func_state->throw_flag = TRUE;
+            } else {
+                /* 'yield' returns a value. 'yield *' also returns a value
+                   in case the 'throw' method is called */
+                s->func_state->frame.cur_sp[-1] = value;
+                s->func_state->frame.cur_sp[0] =
+                    JS_NewInt32(ctx, next->completion_type);
+                s->func_state->frame.cur_sp++;
+            exec_no_arg:
+                s->func_state->throw_flag = FALSE;
+            }
+            s->state = JS_ASYNC_GENERATOR_STATE_EXECUTING;
+        resume_exec:
+            func_ret = async_func_resume(ctx, s->func_state);
+            if (s->func_state->is_completed) {
+                if (JS_IsException(func_ret)) {
+                    value = JS_GetException(ctx);
+                    js_async_generator_complete(ctx, s);
+                    js_async_generator_reject(ctx, s, value);
+                    JS_FreeValue(ctx, value);
+                } else {
+                    /* end of function */
+                    js_async_generator_complete(ctx, s);
+                    js_async_generator_resolve(ctx, s, func_ret, TRUE);
+                    JS_FreeValue(ctx, func_ret);
+                }
+            } else {
+                int func_ret_code, ret;
+                assert(JS_VALUE_GET_TAG(func_ret) == JS_TAG_INT);
+                func_ret_code = JS_VALUE_GET_INT(func_ret);
+                value = s->func_state->frame.cur_sp[-1];
+                s->func_state->frame.cur_sp[-1] = JS_UNDEFINED;
+                switch(func_ret_code) {
+                case FUNC_RET_YIELD:
+                case FUNC_RET_YIELD_STAR:
+                    if (func_ret_code == FUNC_RET_YIELD_STAR)
+                        s->state = JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD_STAR;
+                    else
+                        s->state = JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD;
+                    js_async_generator_resolve(ctx, s, value, FALSE);
+                    JS_FreeValue(ctx, value);
+                    break;
+                case FUNC_RET_AWAIT:
+                    ret = js_async_generator_await(ctx, s, value);
+                    JS_FreeValue(ctx, value);
+                    if (ret < 0) {
+                        /* exception: throw it */
+                        s->func_state->throw_flag = TRUE;
+                        goto resume_exec;
+                    }
+                    goto done;
+                default:
+                    abort();
+                }
+            }
+            break;
+        default:
+            abort();
+        }
+    }
+ done: ;
+}
+
+static JSValue js_async_generator_resolve_function(JSContext *ctx,
+                                                   JSValueConst this_obj,
+                                                   int argc, JSValueConst *argv,
+                                                   int magic, JSValue *func_data)
+{
+    BOOL is_reject = magic & 1;
+    JSAsyncGeneratorData *s = JS_GetOpaque(func_data[0], JS_CLASS_ASYNC_GENERATOR);
+    JSValueConst arg = argv[0];
+
+    /* XXX: what if s == NULL */
+
+    if (magic >= 2) {
+        /* resume next case in AWAITING_RETURN state */
+        assert(s->state == JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN ||
+               s->state == JS_ASYNC_GENERATOR_STATE_COMPLETED);
+        s->state = JS_ASYNC_GENERATOR_STATE_COMPLETED;
+        if (is_reject) {
+            js_async_generator_reject(ctx, s, arg);
+        } else {
+            js_async_generator_resolve(ctx, s, arg, TRUE);
+        }
+    } else {
+        /* restart function execution after await() */
+        assert(s->state == JS_ASYNC_GENERATOR_STATE_EXECUTING);
+        s->func_state->throw_flag = is_reject;
+        if (is_reject) {
+            JS_Throw(ctx, JS_DupValue(ctx, arg));
+        } else {
+            /* return value of await */
+            s->func_state->frame.cur_sp[-1] = JS_DupValue(ctx, arg);
+        }
+        js_async_generator_resume_next(ctx, s);
+    }
+    return JS_UNDEFINED;
+}
+
+/* magic = GEN_MAGIC_x */
+static JSValue js_async_generator_next(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv,
+                                       int magic)
+{
+    JSAsyncGeneratorData *s = JS_GetOpaque(this_val, JS_CLASS_ASYNC_GENERATOR);
+    JSValue promise, resolving_funcs[2];
+    JSAsyncGeneratorRequest *req;
+
+    promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+    if (JS_IsException(promise))
+        return JS_EXCEPTION;
+    if (!s) {
+        JSValue err, res2;
+        JS_ThrowTypeError(ctx, "not an AsyncGenerator object");
+        err = JS_GetException(ctx);
+        res2 = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED,
+                       1, (JSValueConst *)&err);
+        JS_FreeValue(ctx, err);
+        JS_FreeValue(ctx, res2);
+        JS_FreeValue(ctx, resolving_funcs[0]);
+        JS_FreeValue(ctx, resolving_funcs[1]);
+        return promise;
+    }
+    req = js_mallocz(ctx, sizeof(*req));
+    if (!req)
+        goto fail;
+    req->completion_type = magic;
+    req->result = JS_DupValue(ctx, argv[0]);
+    req->promise = JS_DupValue(ctx, promise);
+    req->resolving_funcs[0] = resolving_funcs[0];
+    req->resolving_funcs[1] = resolving_funcs[1];
+    list_add_tail(&req->link, &s->queue);
+    if (s->state != JS_ASYNC_GENERATOR_STATE_EXECUTING) {
+        js_async_generator_resume_next(ctx, s);
+    }
+    return promise;
+ fail:
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    JS_FreeValue(ctx, promise);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_async_generator_function_call(JSContext *ctx, JSValueConst func_obj,
+                                                JSValueConst this_obj,
+                                                int argc, JSValueConst *argv,
+                                                int flags)
+{
+    JSValue obj, func_ret;
+    JSAsyncGeneratorData *s;
+
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        return JS_EXCEPTION;
+    s->state = JS_ASYNC_GENERATOR_STATE_SUSPENDED_START;
+    init_list_head(&s->queue);
+    s->func_state = async_func_init(ctx, func_obj, this_obj, argc, argv);
+    if (!s->func_state)
+        goto fail;
+    /* execute the function up to 'OP_initial_yield' (no yield nor
+       await are possible) */
+    func_ret = async_func_resume(ctx, s->func_state);
+    if (JS_IsException(func_ret))
+        goto fail;
+    JS_FreeValue(ctx, func_ret);
+
+    obj = js_create_from_ctor(ctx, func_obj, JS_CLASS_ASYNC_GENERATOR);
+    if (JS_IsException(obj))
+        goto fail;
+    s->generator = JS_VALUE_GET_OBJ(obj);
+    JS_SetOpaque(obj, s);
+    return obj;
+ fail:
+    js_async_generator_free(ctx->rt, s);
+    return JS_EXCEPTION;
+}
+
+/* JS parser */
+
+enum {
+    TOK_NUMBER = -128,
+    TOK_STRING,
+    TOK_TEMPLATE,
+    TOK_IDENT,
+    TOK_REGEXP,
+    /* warning: order matters (see js_parse_assign_expr) */
+    TOK_MUL_ASSIGN,
+    TOK_DIV_ASSIGN,
+    TOK_MOD_ASSIGN,
+    TOK_PLUS_ASSIGN,
+    TOK_MINUS_ASSIGN,
+    TOK_SHL_ASSIGN,
+    TOK_SAR_ASSIGN,
+    TOK_SHR_ASSIGN,
+    TOK_AND_ASSIGN,
+    TOK_XOR_ASSIGN,
+    TOK_OR_ASSIGN,
+#ifdef CONFIG_BIGNUM
+    TOK_MATH_POW_ASSIGN,
+#endif
+    TOK_POW_ASSIGN,
+    TOK_LAND_ASSIGN,
+    TOK_LOR_ASSIGN,
+    TOK_DOUBLE_QUESTION_MARK_ASSIGN,
+    TOK_DEC,
+    TOK_INC,
+    TOK_SHL,
+    TOK_SAR,
+    TOK_SHR,
+    TOK_LT,
+    TOK_LTE,
+    TOK_GT,
+    TOK_GTE,
+    TOK_EQ,
+    TOK_STRICT_EQ,
+    TOK_NEQ,
+    TOK_STRICT_NEQ,
+    TOK_LAND,
+    TOK_LOR,
+#ifdef CONFIG_BIGNUM
+    TOK_MATH_POW,
+#endif
+    TOK_POW,
+    TOK_ARROW,
+    TOK_ELLIPSIS,
+    TOK_DOUBLE_QUESTION_MARK,
+    TOK_QUESTION_MARK_DOT,
+    TOK_ERROR,
+    TOK_PRIVATE_NAME,
+    TOK_EOF,
+    /* keywords: WARNING: same order as atoms */
+    TOK_NULL, /* must be first */
+    TOK_FALSE,
+    TOK_TRUE,
+    TOK_IF,
+    TOK_ELSE,
+    TOK_RETURN,
+    TOK_VAR,
+    TOK_THIS,
+    TOK_DELETE,
+    TOK_VOID,
+    TOK_TYPEOF,
+    TOK_NEW,
+    TOK_IN,
+    TOK_INSTANCEOF,
+    TOK_DO,
+    TOK_WHILE,
+    TOK_FOR,
+    TOK_BREAK,
+    TOK_CONTINUE,
+    TOK_SWITCH,
+    TOK_CASE,
+    TOK_DEFAULT,
+    TOK_THROW,
+    TOK_TRY,
+    TOK_CATCH,
+    TOK_FINALLY,
+    TOK_FUNCTION,
+    TOK_DEBUGGER,
+    TOK_WITH,
+    /* FutureReservedWord */
+    TOK_CLASS,
+    TOK_CONST,
+    TOK_ENUM,
+    TOK_EXPORT,
+    TOK_EXTENDS,
+    TOK_IMPORT,
+    TOK_SUPER,
+    /* FutureReservedWords when parsing strict mode code */
+    TOK_IMPLEMENTS,
+    TOK_INTERFACE,
+    TOK_LET,
+    TOK_PACKAGE,
+    TOK_PRIVATE,
+    TOK_PROTECTED,
+    TOK_PUBLIC,
+    TOK_STATIC,
+    TOK_YIELD,
+    TOK_AWAIT, /* must be last */
+    TOK_OF,     /* only used for js_parse_skip_parens_token() */
+};
+
+#define TOK_FIRST_KEYWORD   TOK_NULL
+#define TOK_LAST_KEYWORD    TOK_AWAIT
+
+/* unicode code points */
+#define CP_NBSP 0x00a0
+#define CP_BOM  0xfeff
+
+#define CP_LS   0x2028
+#define CP_PS   0x2029
+
+typedef struct BlockEnv {
+    struct BlockEnv *prev;
+    JSAtom label_name; /* JS_ATOM_NULL if none */
+    int label_break; /* -1 if none */
+    int label_cont; /* -1 if none */
+    int drop_count; /* number of stack elements to drop */
+    int label_finally; /* -1 if none */
+    int scope_level;
+    int has_iterator;
+} BlockEnv;
+
+typedef struct JSGlobalVar {
+    int cpool_idx; /* if >= 0, index in the constant pool for hoisted
+                      function defintion*/
+    uint8_t force_init : 1; /* force initialization to undefined */
+    uint8_t is_lexical : 1; /* global let/const definition */
+    uint8_t is_const   : 1; /* const definition */
+    int scope_level;    /* scope of definition */
+    JSAtom var_name;  /* variable name */
+} JSGlobalVar;
+
+typedef struct RelocEntry {
+    struct RelocEntry *next;
+    uint32_t addr; /* address to patch */
+    int size;   /* address size: 1, 2 or 4 bytes */
+} RelocEntry;
+
+typedef struct JumpSlot {
+    int op;
+    int size;
+    int pos;
+    int label;
+} JumpSlot;
+
+typedef struct LabelSlot {
+    int ref_count;
+    int pos;    /* phase 1 address, -1 means not resolved yet */
+    int pos2;   /* phase 2 address, -1 means not resolved yet */
+    int addr;   /* phase 3 address, -1 means not resolved yet */
+    RelocEntry *first_reloc;
+} LabelSlot;
+
+typedef struct LineNumberSlot {
+    uint32_t pc;
+    int line_num;
+} LineNumberSlot;
+
+typedef enum JSParseFunctionEnum {
+    JS_PARSE_FUNC_STATEMENT,
+    JS_PARSE_FUNC_VAR,
+    JS_PARSE_FUNC_EXPR,
+    JS_PARSE_FUNC_ARROW,
+    JS_PARSE_FUNC_GETTER,
+    JS_PARSE_FUNC_SETTER,
+    JS_PARSE_FUNC_METHOD,
+    JS_PARSE_FUNC_CLASS_STATIC_INIT,
+    JS_PARSE_FUNC_CLASS_CONSTRUCTOR,
+    JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR,
+} JSParseFunctionEnum;
+
+typedef enum JSParseExportEnum {
+    JS_PARSE_EXPORT_NONE,
+    JS_PARSE_EXPORT_NAMED,
+    JS_PARSE_EXPORT_DEFAULT,
+} JSParseExportEnum;
+
+typedef struct JSFunctionDef {
+    JSContext *ctx;
+    struct JSFunctionDef *parent;
+    int parent_cpool_idx; /* index in the constant pool of the parent
+                             or -1 if none */
+    int parent_scope_level; /* scope level in parent at point of definition */
+    struct list_head child_list; /* list of JSFunctionDef.link */
+    struct list_head link;
+
+    BOOL is_eval; /* TRUE if eval code */
+    int eval_type; /* only valid if is_eval = TRUE */
+    BOOL is_global_var; /* TRUE if variables are not defined locally:
+                           eval global, eval module or non strict eval */
+    BOOL is_func_expr; /* TRUE if function expression */
+    BOOL has_home_object; /* TRUE if the home object is available */
+    BOOL has_prototype; /* true if a prototype field is necessary */
+    BOOL has_simple_parameter_list;
+    BOOL has_parameter_expressions; /* if true, an argument scope is created */
+    BOOL has_use_strict; /* to reject directive in special cases */
+    BOOL has_eval_call; /* true if the function contains a call to eval() */
+    BOOL has_arguments_binding; /* true if the 'arguments' binding is
+                                   available in the function */
+    BOOL has_this_binding; /* true if the 'this' and new.target binding are
+                              available in the function */
+    BOOL new_target_allowed; /* true if the 'new.target' does not
+                                throw a syntax error */
+    BOOL super_call_allowed; /* true if super() is allowed */
+    BOOL super_allowed; /* true if super. or super[] is allowed */
+    BOOL arguments_allowed; /* true if the 'arguments' identifier is allowed */
+    BOOL is_derived_class_constructor;
+    BOOL in_function_body;
+    BOOL backtrace_barrier;
+    JSFunctionKindEnum func_kind : 8;
+    JSParseFunctionEnum func_type : 8;
+    uint8_t js_mode; /* bitmap of JS_MODE_x */
+    JSAtom func_name; /* JS_ATOM_NULL if no name */
+
+    JSVarDef *vars;
+    int var_size; /* allocated size for vars[] */
+    int var_count;
+    JSVarDef *args;
+    int arg_size; /* allocated size for args[] */
+    int arg_count; /* number of arguments */
+    int defined_arg_count;
+    int var_object_idx; /* -1 if none */
+    int arg_var_object_idx; /* -1 if none (var object for the argument scope) */
+    int arguments_var_idx; /* -1 if none */
+    int arguments_arg_idx; /* argument variable definition in argument scope,
+                              -1 if none */
+    int func_var_idx; /* variable containing the current function (-1
+                         if none, only used if is_func_expr is true) */
+    int eval_ret_idx; /* variable containing the return value of the eval, -1 if none */
+    int this_var_idx; /* variable containg the 'this' value, -1 if none */
+    int new_target_var_idx; /* variable containg the 'new.target' value, -1 if none */
+    int this_active_func_var_idx; /* variable containg the 'this.active_func' value, -1 if none */
+    int home_object_var_idx;
+    BOOL need_home_object;
+
+    int scope_level;    /* index into fd->scopes if the current lexical scope */
+    int scope_first;    /* index into vd->vars of first lexically scoped variable */
+    int scope_size;     /* allocated size of fd->scopes array */
+    int scope_count;    /* number of entries used in the fd->scopes array */
+    JSVarScope *scopes;
+    JSVarScope def_scope_array[4];
+    int body_scope; /* scope of the body of the function or eval */
+
+    int global_var_count;
+    int global_var_size;
+    JSGlobalVar *global_vars;
+
+    DynBuf byte_code;
+    int last_opcode_pos; /* -1 if no last opcode */
+    int last_opcode_line_num;
+    BOOL use_short_opcodes; /* true if short opcodes are used in byte_code */
+
+    LabelSlot *label_slots;
+    int label_size; /* allocated size for label_slots[] */
+    int label_count;
+    BlockEnv *top_break; /* break/continue label stack */
+
+    /* constant pool (strings, functions, numbers) */
+    JSValue *cpool;
+    int cpool_count;
+    int cpool_size;
+
+    /* list of variables in the closure */
+    int closure_var_count;
+    int closure_var_size;
+    JSClosureVar *closure_var;
+
+    JumpSlot *jump_slots;
+    int jump_size;
+    int jump_count;
+
+    LineNumberSlot *line_number_slots;
+    int line_number_size;
+    int line_number_count;
+    int line_number_last;
+    int line_number_last_pc;
+
+    /* pc2line table */
+    JSAtom filename;
+    int line_num;
+    DynBuf pc2line;
+
+    char *source;  /* raw source, utf-8 encoded */
+    int source_len;
+
+    JSModuleDef *module; /* != NULL when parsing a module */
+    BOOL has_await; /* TRUE if await is used (used in module eval) */
+} JSFunctionDef;
+
+typedef struct JSToken {
+    int val;
+    int line_num;   /* line number of token start */
+    const uint8_t *ptr;
+    union {
+        struct {
+            JSValue str;
+            int sep;
+        } str;
+        struct {
+            JSValue val;
+#ifdef CONFIG_BIGNUM
+            slimb_t exponent; /* may be != 0 only if val is a float */
+#endif
+        } num;
+        struct {
+            JSAtom atom;
+            BOOL has_escape;
+            BOOL is_reserved;
+        } ident;
+        struct {
+            JSValue body;
+            JSValue flags;
+        } regexp;
+    } u;
+} JSToken;
+
+typedef struct JSParseState {
+    JSContext *ctx;
+    int last_line_num;  /* line number of last token */
+    int line_num;       /* line number of current offset */
+    const char *filename;
+    JSToken token;
+    BOOL got_lf; /* true if got line feed before the current token */
+    const uint8_t *last_ptr;
+    const uint8_t *buf_ptr;
+    const uint8_t *buf_end;
+
+    /* current function code */
+    JSFunctionDef *cur_func;
+    BOOL is_module; /* parsing a module */
+    BOOL allow_html_comments;
+    BOOL ext_json; /* true if accepting JSON superset */
+} JSParseState;
+
+typedef struct JSOpCode {
+#ifdef DUMP_BYTECODE
+    const char *name;
+#endif
+    uint8_t size; /* in bytes */
+    /* the opcodes remove n_pop items from the top of the stack, then
+       pushes n_push items */
+    uint8_t n_pop;
+    uint8_t n_push;
+    uint8_t fmt;
+} JSOpCode;
+
+static const JSOpCode opcode_info[OP_COUNT + (OP_TEMP_END - OP_TEMP_START)] = {
+#define FMT(f)
+#ifdef DUMP_BYTECODE
+#define DEF(id, size, n_pop, n_push, f) { #id, size, n_pop, n_push, OP_FMT_ ## f },
+#else
+#define DEF(id, size, n_pop, n_push, f) { size, n_pop, n_push, OP_FMT_ ## f },
+#endif
+#include "quickjs-opcode.h"
+#undef DEF
+#undef FMT
+};
+
+#if SHORT_OPCODES
+/* After the final compilation pass, short opcodes are used. Their
+   opcodes overlap with the temporary opcodes which cannot appear in
+   the final bytecode. Their description is after the temporary
+   opcodes in opcode_info[]. */
+#define short_opcode_info(op)           \
+    opcode_info[(op) >= OP_TEMP_START ? \
+                (op) + (OP_TEMP_END - OP_TEMP_START) : (op)]
+#else
+#define short_opcode_info(op) opcode_info[op]
+#endif
+
+static __exception int next_token(JSParseState *s);
+
+static void free_token(JSParseState *s, JSToken *token)
+{
+    switch(token->val) {
+    case TOK_NUMBER:
+        JS_FreeValue(s->ctx, token->u.num.val);
+        break;
+    case TOK_STRING:
+    case TOK_TEMPLATE:
+        JS_FreeValue(s->ctx, token->u.str.str);
+        break;
+    case TOK_REGEXP:
+        JS_FreeValue(s->ctx, token->u.regexp.body);
+        JS_FreeValue(s->ctx, token->u.regexp.flags);
+        break;
+    case TOK_IDENT:
+    case TOK_PRIVATE_NAME:
+        JS_FreeAtom(s->ctx, token->u.ident.atom);
+        break;
+    default:
+        if (token->val >= TOK_FIRST_KEYWORD &&
+            token->val <= TOK_LAST_KEYWORD) {
+            JS_FreeAtom(s->ctx, token->u.ident.atom);
+        }
+        break;
+    }
+}
+
+static void __maybe_unused dump_token(JSParseState *s,
+                                             const JSToken *token)
+{
+    switch(token->val) {
+    case TOK_NUMBER:
+        {
+            double d;
+            JS_ToFloat64(s->ctx, &d, token->u.num.val);  /* no exception possible */
+            printf("number: %.14g\n", d);
+        }
+        break;
+    case TOK_IDENT:
+    dump_atom:
+        {
+            char buf[ATOM_GET_STR_BUF_SIZE];
+            printf("ident: '%s'\n",
+                   JS_AtomGetStr(s->ctx, buf, sizeof(buf), token->u.ident.atom));
+        }
+        break;
+    case TOK_STRING:
+        {
+            const char *str;
+            /* XXX: quote the string */
+            str = JS_ToCString(s->ctx, token->u.str.str);
+            printf("string: '%s'\n", str);
+            JS_FreeCString(s->ctx, str);
+        }
+        break;
+    case TOK_TEMPLATE:
+        {
+            const char *str;
+            str = JS_ToCString(s->ctx, token->u.str.str);
+            printf("template: `%s`\n", str);
+            JS_FreeCString(s->ctx, str);
+        }
+        break;
+    case TOK_REGEXP:
+        {
+            const char *str, *str2;
+            str = JS_ToCString(s->ctx, token->u.regexp.body);
+            str2 = JS_ToCString(s->ctx, token->u.regexp.flags);
+            printf("regexp: '%s' '%s'\n", str, str2);
+            JS_FreeCString(s->ctx, str);
+            JS_FreeCString(s->ctx, str2);
+        }
+        break;
+    case TOK_EOF:
+        printf("eof\n");
+        break;
+    default:
+        if (s->token.val >= TOK_NULL && s->token.val <= TOK_LAST_KEYWORD) {
+            goto dump_atom;
+        } else if (s->token.val >= 256) {
+            printf("token: %d\n", token->val);
+        } else {
+            printf("token: '%c'\n", token->val);
+        }
+        break;
+    }
+}
+
+int FORMAT_ATTR(2, 3) js_parse_error(JSParseState *s, const char *fmt, ...)
+{
+    JSContext *ctx = s->ctx;
+    va_list ap;
+    int backtrace_flags;
+
+    va_start(ap, fmt);
+    JS_ThrowError2(ctx, JS_SYNTAX_ERROR, fmt, ap, FALSE);
+    va_end(ap);
+    backtrace_flags = 0;
+    if (s->cur_func && s->cur_func->backtrace_barrier)
+        backtrace_flags = JS_BACKTRACE_FLAG_SINGLE_LEVEL;
+    build_backtrace(ctx, ctx->rt->current_exception, s->filename, s->line_num,
+                    backtrace_flags);
+    return -1;
+}
+
+static int js_parse_expect(JSParseState *s, int tok)
+{
+    if (s->token.val != tok) {
+        /* XXX: dump token correctly in all cases */
+        return js_parse_error(s, "expecting '%c'", tok);
+    }
+    return next_token(s);
+}
+
+static int js_parse_expect_semi(JSParseState *s)
+{
+    if (s->token.val != ';') {
+        /* automatic insertion of ';' */
+        if (s->token.val == TOK_EOF || s->token.val == '}' || s->got_lf) {
+            return 0;
+        }
+        return js_parse_error(s, "expecting '%c'", ';');
+    }
+    return next_token(s);
+}
+
+static int js_parse_error_reserved_identifier(JSParseState *s)
+{
+    char buf1[ATOM_GET_STR_BUF_SIZE];
+    return js_parse_error(s, "'%s' is a reserved identifier",
+                          JS_AtomGetStr(s->ctx, buf1, sizeof(buf1),
+                                        s->token.u.ident.atom));
+}
+
+static __exception int js_parse_template_part(JSParseState *s, const uint8_t *p)
+{
+    uint32_t c;
+    StringBuffer b_s, *b = &b_s;
+
+    /* p points to the first byte of the template part */
+    if (string_buffer_init(s->ctx, b, 32))
+        goto fail;
+    for(;;) {
+        if (p >= s->buf_end)
+            goto unexpected_eof;
+        c = *p++;
+        if (c == '`') {
+            /* template end part */
+            break;
+        }
+        if (c == '$' && *p == '{') {
+            /* template start or middle part */
+            p++;
+            break;
+        }
+        if (c == '\\') {
+            if (string_buffer_putc8(b, c))
+                goto fail;
+            if (p >= s->buf_end)
+                goto unexpected_eof;
+            c = *p++;
+        }
+        /* newline sequences are normalized as single '\n' bytes */
+        if (c == '\r') {
+            if (*p == '\n')
+                p++;
+            c = '\n';
+        }
+        if (c == '\n') {
+            s->line_num++;
+        } else if (c >= 0x80) {
+            const uint8_t *p_next;
+            c = unicode_from_utf8(p - 1, UTF8_CHAR_LEN_MAX, &p_next);
+            if (c > 0x10FFFF) {
+                js_parse_error(s, "invalid UTF-8 sequence");
+                goto fail;
+            }
+            p = p_next;
+        }
+        if (string_buffer_putc(b, c))
+            goto fail;
+    }
+    s->token.val = TOK_TEMPLATE;
+    s->token.u.str.sep = c;
+    s->token.u.str.str = string_buffer_end(b);
+    s->buf_ptr = p;
+    return 0;
+
+ unexpected_eof:
+    js_parse_error(s, "unexpected end of string");
+ fail:
+    string_buffer_free(b);
+    return -1;
+}
+
+static __exception int js_parse_string(JSParseState *s, int sep,
+                                       BOOL do_throw, const uint8_t *p,
+                                       JSToken *token, const uint8_t **pp)
+{
+    int ret;
+    uint32_t c;
+    StringBuffer b_s, *b = &b_s;
+
+    /* string */
+    if (string_buffer_init(s->ctx, b, 32))
+        goto fail;
+    for(;;) {
+        if (p >= s->buf_end)
+            goto invalid_char;
+        c = *p;
+        if (c < 0x20) {
+            if (!s->cur_func) {
+                if (do_throw)
+                    js_parse_error(s, "invalid character in a JSON string");
+                goto fail;
+            }
+            if (sep == '`') {
+                if (c == '\r') {
+                    if (p[1] == '\n')
+                        p++;
+                    c = '\n';
+                }
+                /* do not update s->line_num */
+            } else if (c == '\n' || c == '\r')
+                goto invalid_char;
+        }
+        p++;
+        if (c == sep)
+            break;
+        if (c == '$' && *p == '{' && sep == '`') {
+            /* template start or middle part */
+            p++;
+            break;
+        }
+        if (c == '\\') {
+            c = *p;
+            /* XXX: need a specific JSON case to avoid
+               accepting invalid escapes */
+            switch(c) {
+            case '\0':
+                if (p >= s->buf_end)
+                    goto invalid_char;
+                p++;
+                break;
+            case '\'':
+            case '\"':
+            case '\\':
+                p++;
+                break;
+            case '\r':  /* accept DOS and MAC newline sequences */
+                if (p[1] == '\n') {
+                    p++;
+                }
+                /* fall thru */
+            case '\n':
+                /* ignore escaped newline sequence */
+                p++;
+                if (sep != '`')
+                    s->line_num++;
+                continue;
+            default:
+                if (c >= '0' && c <= '9') {
+                    if (!s->cur_func)
+                        goto invalid_escape; /* JSON case */
+                    if (!(s->cur_func->js_mode & JS_MODE_STRICT) && sep != '`')
+                        goto parse_escape;
+                    if (c == '0' && !(p[1] >= '0' && p[1] <= '9')) {
+                        p++;
+                        c = '\0';
+                    } else {
+                        if (c >= '8' || sep == '`') {
+                            /* Note: according to ES2021, \8 and \9 are not
+                               accepted in strict mode or in templates. */
+                            goto invalid_escape;
+                        } else {
+                            if (do_throw)
+                                js_parse_error(s, "octal escape sequences are not allowed in strict mode");
+                        }
+                        goto fail;
+                    }
+                } else if (c >= 0x80) {
+                    const uint8_t *p_next;
+                    c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p_next);
+                    if (c > 0x10FFFF) {
+                        goto invalid_utf8;
+                    }
+                    p = p_next;
+                    /* LS or PS are skipped */
+                    if (c == CP_LS || c == CP_PS)
+                        continue;
+                } else {
+                parse_escape:
+                    ret = lre_parse_escape(&p, TRUE);
+                    if (ret == -1) {
+                    invalid_escape:
+                        if (do_throw)
+                            js_parse_error(s, "malformed escape sequence in string literal");
+                        goto fail;
+                    } else if (ret < 0) {
+                        /* ignore the '\' (could output a warning) */
+                        p++;
+                    } else {
+                        c = ret;
+                    }
+                }
+                break;
+            }
+        } else if (c >= 0x80) {
+            const uint8_t *p_next;
+            c = unicode_from_utf8(p - 1, UTF8_CHAR_LEN_MAX, &p_next);
+            if (c > 0x10FFFF)
+                goto invalid_utf8;
+            p = p_next;
+        }
+        if (string_buffer_putc(b, c))
+            goto fail;
+    }
+    token->val = TOK_STRING;
+    token->u.str.sep = c;
+    token->u.str.str = string_buffer_end(b);
+    *pp = p;
+    return 0;
+
+ invalid_utf8:
+    if (do_throw)
+        js_parse_error(s, "invalid UTF-8 sequence");
+    goto fail;
+ invalid_char:
+    if (do_throw)
+        js_parse_error(s, "unexpected end of string");
+ fail:
+    string_buffer_free(b);
+    return -1;
+}
+
+static inline BOOL token_is_pseudo_keyword(JSParseState *s, JSAtom atom) {
+    return s->token.val == TOK_IDENT && s->token.u.ident.atom == atom &&
+        !s->token.u.ident.has_escape;
+}
+
+static __exception int js_parse_regexp(JSParseState *s)
+{
+    const uint8_t *p;
+    BOOL in_class;
+    StringBuffer b_s, *b = &b_s;
+    StringBuffer b2_s, *b2 = &b2_s;
+    uint32_t c;
+
+    p = s->buf_ptr;
+    p++;
+    in_class = FALSE;
+    if (string_buffer_init(s->ctx, b, 32))
+        return -1;
+    if (string_buffer_init(s->ctx, b2, 1))
+        goto fail;
+    for(;;) {
+        if (p >= s->buf_end) {
+        eof_error:
+            js_parse_error(s, "unexpected end of regexp");
+            goto fail;
+        }
+        c = *p++;
+        if (c == '\n' || c == '\r') {
+            goto eol_error;
+        } else if (c == '/') {
+            if (!in_class)
+                break;
+        } else if (c == '[') {
+            in_class = TRUE;
+        } else if (c == ']') {
+            /* XXX: incorrect as the first character in a class */
+            in_class = FALSE;
+        } else if (c == '\\') {
+            if (string_buffer_putc8(b, c))
+                goto fail;
+            c = *p++;
+            if (c == '\n' || c == '\r')
+                goto eol_error;
+            else if (c == '\0' && p >= s->buf_end)
+                goto eof_error;
+            else if (c >= 0x80) {
+                const uint8_t *p_next;
+                c = unicode_from_utf8(p - 1, UTF8_CHAR_LEN_MAX, &p_next);
+                if (c > 0x10FFFF) {
+                    goto invalid_utf8;
+                }
+                p = p_next;
+                if (c == CP_LS || c == CP_PS)
+                    goto eol_error;
+            }
+        } else if (c >= 0x80) {
+            const uint8_t *p_next;
+            c = unicode_from_utf8(p - 1, UTF8_CHAR_LEN_MAX, &p_next);
+            if (c > 0x10FFFF) {
+            invalid_utf8:
+                js_parse_error(s, "invalid UTF-8 sequence");
+                goto fail;
+            }
+            p = p_next;
+            /* LS or PS are considered as line terminator */
+            if (c == CP_LS || c == CP_PS) {
+            eol_error:
+                js_parse_error(s, "unexpected line terminator in regexp");
+                goto fail;
+            }
+        }
+        if (string_buffer_putc(b, c))
+            goto fail;
+    }
+
+    /* flags */
+    for(;;) {
+        const uint8_t *p_next = p;
+        c = *p_next++;
+        if (c >= 0x80) {
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p_next);
+            if (c > 0x10FFFF) {
+                goto invalid_utf8;
+            }
+        }
+        if (!lre_js_is_ident_next(c))
+            break;
+        if (string_buffer_putc(b2, c))
+            goto fail;
+        p = p_next;
+    }
+
+    s->token.val = TOK_REGEXP;
+    s->token.u.regexp.body = string_buffer_end(b);
+    s->token.u.regexp.flags = string_buffer_end(b2);
+    s->buf_ptr = p;
+    return 0;
+ fail:
+    string_buffer_free(b);
+    string_buffer_free(b2);
+    return -1;
+}
+
+static __exception int ident_realloc(JSContext *ctx, char **pbuf, size_t *psize,
+                                     const char *static_buf)
+{
+    char *buf, *new_buf;
+    size_t size, new_size;
+
+    buf = *pbuf;
+    size = *psize;
+    if (size >= (SIZE_MAX / 3) * 2)
+        new_size = SIZE_MAX;
+    else
+        new_size = size + (size >> 1);
+    if (buf == static_buf) {
+        new_buf = js_malloc(ctx, new_size);
+        if (!new_buf)
+            return -1;
+        memcpy(new_buf, buf, size);
+    } else {
+        new_buf = js_realloc(ctx, buf, new_size);
+        if (!new_buf)
+            return -1;
+    }
+    *pbuf = new_buf;
+    *psize = new_size;
+    return 0;
+}
+
+/* convert a TOK_IDENT to a keyword when needed */
+static void update_token_ident(JSParseState *s)
+{
+    if (s->token.u.ident.atom <= JS_ATOM_LAST_KEYWORD ||
+        (s->token.u.ident.atom <= JS_ATOM_LAST_STRICT_KEYWORD &&
+         (s->cur_func->js_mode & JS_MODE_STRICT)) ||
+        (s->token.u.ident.atom == JS_ATOM_yield &&
+         ((s->cur_func->func_kind & JS_FUNC_GENERATOR) ||
+          (s->cur_func->func_type == JS_PARSE_FUNC_ARROW &&
+           !s->cur_func->in_function_body && s->cur_func->parent &&
+           (s->cur_func->parent->func_kind & JS_FUNC_GENERATOR)))) ||
+        (s->token.u.ident.atom == JS_ATOM_await &&
+         (s->is_module ||
+          (s->cur_func->func_kind & JS_FUNC_ASYNC) ||
+          s->cur_func->func_type == JS_PARSE_FUNC_CLASS_STATIC_INIT ||
+          (s->cur_func->func_type == JS_PARSE_FUNC_ARROW &&
+           !s->cur_func->in_function_body && s->cur_func->parent &&
+           ((s->cur_func->parent->func_kind & JS_FUNC_ASYNC) ||
+            s->cur_func->parent->func_type == JS_PARSE_FUNC_CLASS_STATIC_INIT))))) {
+        if (s->token.u.ident.has_escape) {
+            s->token.u.ident.is_reserved = TRUE;
+            s->token.val = TOK_IDENT;
+        } else {
+            /* The keywords atoms are pre allocated */
+            s->token.val = s->token.u.ident.atom - 1 + TOK_FIRST_KEYWORD;
+        }
+    }
+}
+
+/* if the current token is an identifier or keyword, reparse it
+   according to the current function type */
+static void reparse_ident_token(JSParseState *s)
+{
+    if (s->token.val == TOK_IDENT ||
+        (s->token.val >= TOK_FIRST_KEYWORD &&
+         s->token.val <= TOK_LAST_KEYWORD)) {
+        s->token.val = TOK_IDENT;
+        s->token.u.ident.is_reserved = FALSE;
+        update_token_ident(s);
+    }
+}
+
+/* 'c' is the first character. Return JS_ATOM_NULL in case of error */
+static JSAtom parse_ident(JSParseState *s, const uint8_t **pp,
+                          BOOL *pident_has_escape, int c, BOOL is_private)
+{
+    const uint8_t *p, *p1;
+    char ident_buf[128], *buf;
+    size_t ident_size, ident_pos;
+    JSAtom atom;
+
+    p = *pp;
+    buf = ident_buf;
+    ident_size = sizeof(ident_buf);
+    ident_pos = 0;
+    if (is_private)
+        buf[ident_pos++] = '#';
+    for(;;) {
+        p1 = p;
+
+        if (c < 128) {
+            buf[ident_pos++] = c;
+        } else {
+            ident_pos += unicode_to_utf8((uint8_t*)buf + ident_pos, c);
+        }
+        c = *p1++;
+        if (c == '\\' && *p1 == 'u') {
+            c = lre_parse_escape(&p1, TRUE);
+            *pident_has_escape = TRUE;
+        } else if (c >= 128) {
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p1);
+        }
+        if (!lre_js_is_ident_next(c))
+            break;
+        p = p1;
+        if (unlikely(ident_pos >= ident_size - UTF8_CHAR_LEN_MAX)) {
+            if (ident_realloc(s->ctx, &buf, &ident_size, ident_buf)) {
+                atom = JS_ATOM_NULL;
+                goto done;
+            }
+        }
+    }
+    atom = JS_NewAtomLen(s->ctx, buf, ident_pos);
+ done:
+    if (unlikely(buf != ident_buf))
+        js_free(s->ctx, buf);
+    *pp = p;
+    return atom;
+}
+
+
+static __exception int next_token(JSParseState *s)
+{
+    const uint8_t *p;
+    int c;
+    BOOL ident_has_escape;
+    JSAtom atom;
+
+    if (js_check_stack_overflow(s->ctx->rt, 0)) {
+        return js_parse_error(s, "stack overflow");
+    }
+
+    free_token(s, &s->token);
+
+    p = s->last_ptr = s->buf_ptr;
+    s->got_lf = FALSE;
+    s->last_line_num = s->token.line_num;
+ redo:
+    s->token.line_num = s->line_num;
+    s->token.ptr = p;
+    c = *p;
+    switch(c) {
+    case 0:
+        if (p >= s->buf_end) {
+            s->token.val = TOK_EOF;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '`':
+        if (js_parse_template_part(s, p + 1))
+            goto fail;
+        p = s->buf_ptr;
+        break;
+    case '\'':
+    case '\"':
+        if (js_parse_string(s, c, TRUE, p + 1, &s->token, &p))
+            goto fail;
+        break;
+    case '\r':  /* accept DOS and MAC newline sequences */
+        if (p[1] == '\n') {
+            p++;
+        }
+        /* fall thru */
+    case '\n':
+        p++;
+    line_terminator:
+        s->got_lf = TRUE;
+        s->line_num++;
+        goto redo;
+    case '\f':
+    case '\v':
+    case ' ':
+    case '\t':
+        p++;
+        goto redo;
+    case '/':
+        if (p[1] == '*') {
+            /* comment */
+            p += 2;
+            for(;;) {
+                if (*p == '\0' && p >= s->buf_end) {
+                    js_parse_error(s, "unexpected end of comment");
+                    goto fail;
+                }
+                if (p[0] == '*' && p[1] == '/') {
+                    p += 2;
+                    break;
+                }
+                if (*p == '\n') {
+                    s->line_num++;
+                    s->got_lf = TRUE; /* considered as LF for ASI */
+                    p++;
+                } else if (*p == '\r') {
+                    s->got_lf = TRUE; /* considered as LF for ASI */
+                    p++;
+                } else if (*p >= 0x80) {
+                    c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+                    if (c == CP_LS || c == CP_PS) {
+                        s->got_lf = TRUE; /* considered as LF for ASI */
+                    } else if (c == -1) {
+                        p++; /* skip invalid UTF-8 */
+                    }
+                } else {
+                    p++;
+                }
+            }
+            goto redo;
+        } else if (p[1] == '/') {
+            /* line comment */
+            p += 2;
+        skip_line_comment:
+            for(;;) {
+                if (*p == '\0' && p >= s->buf_end)
+                    break;
+                if (*p == '\r' || *p == '\n')
+                    break;
+                if (*p >= 0x80) {
+                    c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+                    /* LS or PS are considered as line terminator */
+                    if (c == CP_LS || c == CP_PS) {
+                        break;
+                    } else if (c == -1) {
+                        p++; /* skip invalid UTF-8 */
+                    }
+                } else {
+                    p++;
+                }
+            }
+            goto redo;
+        } else if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_DIV_ASSIGN;
+        } else {
+            p++;
+            s->token.val = c;
+        }
+        break;
+    case '\\':
+        if (p[1] == 'u') {
+            const uint8_t *p1 = p + 1;
+            int c1 = lre_parse_escape(&p1, TRUE);
+            if (c1 >= 0 && lre_js_is_ident_first(c1)) {
+                c = c1;
+                p = p1;
+                ident_has_escape = TRUE;
+                goto has_ident;
+            } else {
+                /* XXX: syntax error? */
+            }
+        }
+        goto def_token;
+    case 'a': case 'b': case 'c': case 'd':
+    case 'e': case 'f': case 'g': case 'h':
+    case 'i': case 'j': case 'k': case 'l':
+    case 'm': case 'n': case 'o': case 'p':
+    case 'q': case 'r': case 's': case 't':
+    case 'u': case 'v': case 'w': case 'x':
+    case 'y': case 'z':
+    case 'A': case 'B': case 'C': case 'D':
+    case 'E': case 'F': case 'G': case 'H':
+    case 'I': case 'J': case 'K': case 'L':
+    case 'M': case 'N': case 'O': case 'P':
+    case 'Q': case 'R': case 'S': case 'T':
+    case 'U': case 'V': case 'W': case 'X':
+    case 'Y': case 'Z':
+    case '_':
+    case '$':
+        /* identifier */
+        p++;
+        ident_has_escape = FALSE;
+    has_ident:
+        atom = parse_ident(s, &p, &ident_has_escape, c, FALSE);
+        if (atom == JS_ATOM_NULL)
+            goto fail;
+        s->token.u.ident.atom = atom;
+        s->token.u.ident.has_escape = ident_has_escape;
+        s->token.u.ident.is_reserved = FALSE;
+        s->token.val = TOK_IDENT;
+        update_token_ident(s);
+        break;
+    case '#':
+        /* private name */
+        {
+            const uint8_t *p1;
+            p++;
+            p1 = p;
+            c = *p1++;
+            if (c == '\\' && *p1 == 'u') {
+                c = lre_parse_escape(&p1, TRUE);
+            } else if (c >= 128) {
+                c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p1);
+            }
+            if (!lre_js_is_ident_first(c)) {
+                js_parse_error(s, "invalid first character of private name");
+                goto fail;
+            }
+            p = p1;
+            ident_has_escape = FALSE; /* not used */
+            atom = parse_ident(s, &p, &ident_has_escape, c, TRUE);
+            if (atom == JS_ATOM_NULL)
+                goto fail;
+            s->token.u.ident.atom = atom;
+            s->token.val = TOK_PRIVATE_NAME;
+        }
+        break;
+    case '.':
+        if (p[1] == '.' && p[2] == '.') {
+            p += 3;
+            s->token.val = TOK_ELLIPSIS;
+            break;
+        }
+        if (p[1] >= '0' && p[1] <= '9') {
+            goto parse_number;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '0':
+        /* in strict mode, octal literals are not accepted */
+        if (is_digit(p[1]) && (s->cur_func->js_mode & JS_MODE_STRICT)) {
+            js_parse_error(s, "octal literals are deprecated in strict mode");
+            goto fail;
+        }
+        goto parse_number;
+    case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8':
+    case '9':
+        /* number */
+    parse_number:
+        {
+            JSValue ret;
+            const uint8_t *p1;
+            int flags, radix;
+            flags = ATOD_ACCEPT_BIN_OCT | ATOD_ACCEPT_LEGACY_OCTAL |
+                ATOD_ACCEPT_UNDERSCORES;
+            flags |= ATOD_ACCEPT_SUFFIX;
+#ifdef CONFIG_BIGNUM
+            if (s->cur_func->js_mode & JS_MODE_MATH) {
+                flags |= ATOD_MODE_BIGINT;
+                if (s->cur_func->js_mode & JS_MODE_MATH)
+                    flags |= ATOD_TYPE_BIG_FLOAT;
+            }
+#endif
+            radix = 0;
+#ifdef CONFIG_BIGNUM
+            s->token.u.num.exponent = 0;
+            ret = js_atof2(s->ctx, (const char *)p, (const char **)&p, radix,
+                           flags, &s->token.u.num.exponent);
+#else
+            ret = js_atof(s->ctx, (const char *)p, (const char **)&p, radix,
+                          flags);
+#endif
+            if (JS_IsException(ret))
+                goto fail;
+            /* reject `10instanceof Number` */
+            if (JS_VALUE_IS_NAN(ret) ||
+                lre_js_is_ident_next(unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p1))) {
+                JS_FreeValue(s->ctx, ret);
+                js_parse_error(s, "invalid number literal");
+                goto fail;
+            }
+            s->token.val = TOK_NUMBER;
+            s->token.u.num.val = ret;
+        }
+        break;
+    case '*':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_MUL_ASSIGN;
+        } else if (p[1] == '*') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_POW_ASSIGN;
+            } else {
+                p += 2;
+                s->token.val = TOK_POW;
+            }
+        } else {
+            goto def_token;
+        }
+        break;
+    case '%':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_MOD_ASSIGN;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '+':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_PLUS_ASSIGN;
+        } else if (p[1] == '+') {
+            p += 2;
+            s->token.val = TOK_INC;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '-':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_MINUS_ASSIGN;
+        } else if (p[1] == '-') {
+            if (s->allow_html_comments &&
+                p[2] == '>' && s->last_line_num != s->line_num) {
+                /* Annex B: `-->` at beginning of line is an html comment end.
+                   It extends to the end of the line.
+                 */
+                goto skip_line_comment;
+            }
+            p += 2;
+            s->token.val = TOK_DEC;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '<':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_LTE;
+        } else if (p[1] == '<') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_SHL_ASSIGN;
+            } else {
+                p += 2;
+                s->token.val = TOK_SHL;
+            }
+        } else if (s->allow_html_comments &&
+                   p[1] == '!' && p[2] == '-' && p[3] == '-') {
+            /* Annex B: handle `<!--` single line html comments */
+            goto skip_line_comment;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '>':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_GTE;
+        } else if (p[1] == '>') {
+            if (p[2] == '>') {
+                if (p[3] == '=') {
+                    p += 4;
+                    s->token.val = TOK_SHR_ASSIGN;
+                } else {
+                    p += 3;
+                    s->token.val = TOK_SHR;
+                }
+            } else if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_SAR_ASSIGN;
+            } else {
+                p += 2;
+                s->token.val = TOK_SAR;
+            }
+        } else {
+            goto def_token;
+        }
+        break;
+    case '=':
+        if (p[1] == '=') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_STRICT_EQ;
+            } else {
+                p += 2;
+                s->token.val = TOK_EQ;
+            }
+        } else if (p[1] == '>') {
+            p += 2;
+            s->token.val = TOK_ARROW;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '!':
+        if (p[1] == '=') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_STRICT_NEQ;
+            } else {
+                p += 2;
+                s->token.val = TOK_NEQ;
+            }
+        } else {
+            goto def_token;
+        }
+        break;
+    case '&':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_AND_ASSIGN;
+        } else if (p[1] == '&') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_LAND_ASSIGN;
+            } else {
+                p += 2;
+                s->token.val = TOK_LAND;
+            }
+        } else {
+            goto def_token;
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+        /* in math mode, '^' is the power operator. '^^' is always the
+           xor operator and '**' is always the power operator */
+    case '^':
+        if (p[1] == '=') {
+            p += 2;
+            if (s->cur_func->js_mode & JS_MODE_MATH)
+                s->token.val = TOK_MATH_POW_ASSIGN;
+            else
+                s->token.val = TOK_XOR_ASSIGN;
+        } else if (p[1] == '^') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_XOR_ASSIGN;
+            } else {
+                p += 2;
+                s->token.val = '^';
+            }
+        } else {
+            p++;
+            if (s->cur_func->js_mode & JS_MODE_MATH)
+                s->token.val = TOK_MATH_POW;
+            else
+                s->token.val = '^';
+        }
+        break;
+#else
+    case '^':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_XOR_ASSIGN;
+        } else {
+            goto def_token;
+        }
+        break;
+#endif
+    case '|':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_OR_ASSIGN;
+        } else if (p[1] == '|') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_LOR_ASSIGN;
+            } else {
+                p += 2;
+                s->token.val = TOK_LOR;
+            }
+        } else {
+            goto def_token;
+        }
+        break;
+    case '?':
+        if (p[1] == '?') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_DOUBLE_QUESTION_MARK_ASSIGN;
+            } else {
+                p += 2;
+                s->token.val = TOK_DOUBLE_QUESTION_MARK;
+            }
+        } else if (p[1] == '.' && !(p[2] >= '0' && p[2] <= '9')) {
+            p += 2;
+            s->token.val = TOK_QUESTION_MARK_DOT;
+        } else {
+            goto def_token;
+        }
+        break;
+    default:
+        if (c >= 128) {
+            /* unicode value */
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+            switch(c) {
+            case CP_PS:
+            case CP_LS:
+                /* XXX: should avoid incrementing line_number, but
+                   needed to handle HTML comments */
+                goto line_terminator;
+            default:
+                if (lre_is_space(c)) {
+                    goto redo;
+                } else if (lre_js_is_ident_first(c)) {
+                    ident_has_escape = FALSE;
+                    goto has_ident;
+                } else {
+                    js_parse_error(s, "unexpected character");
+                    goto fail;
+                }
+            }
+        }
+    def_token:
+        s->token.val = c;
+        p++;
+        break;
+    }
+    s->buf_ptr = p;
+
+    //    dump_token(s, &s->token);
+    return 0;
+
+ fail:
+    s->token.val = TOK_ERROR;
+    return -1;
+}
+
+/* 'c' is the first character. Return JS_ATOM_NULL in case of error */
+static JSAtom json_parse_ident(JSParseState *s, const uint8_t **pp, int c)
+{
+    const uint8_t *p;
+    char ident_buf[128], *buf;
+    size_t ident_size, ident_pos;
+    JSAtom atom;
+
+    p = *pp;
+    buf = ident_buf;
+    ident_size = sizeof(ident_buf);
+    ident_pos = 0;
+    for(;;) {
+        buf[ident_pos++] = c;
+        c = *p;
+        if (c >= 128 || !lre_is_id_continue_byte(c))
+            break;
+        p++;
+        if (unlikely(ident_pos >= ident_size - UTF8_CHAR_LEN_MAX)) {
+            if (ident_realloc(s->ctx, &buf, &ident_size, ident_buf)) {
+                atom = JS_ATOM_NULL;
+                goto done;
+            }
+        }
+    }
+    atom = JS_NewAtomLen(s->ctx, buf, ident_pos);
+ done:
+    if (unlikely(buf != ident_buf))
+        js_free(s->ctx, buf);
+    *pp = p;
+    return atom;
+}
+
+static __exception int json_next_token(JSParseState *s)
+{
+    const uint8_t *p;
+    int c;
+    JSAtom atom;
+
+    if (js_check_stack_overflow(s->ctx->rt, 0)) {
+        return js_parse_error(s, "stack overflow");
+    }
+
+    free_token(s, &s->token);
+
+    p = s->last_ptr = s->buf_ptr;
+    s->last_line_num = s->token.line_num;
+ redo:
+    s->token.line_num = s->line_num;
+    s->token.ptr = p;
+    c = *p;
+    switch(c) {
+    case 0:
+        if (p >= s->buf_end) {
+            s->token.val = TOK_EOF;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '\'':
+        if (!s->ext_json) {
+            /* JSON does not accept single quoted strings */
+            goto def_token;
+        }
+        /* fall through */
+    case '\"':
+        if (js_parse_string(s, c, TRUE, p + 1, &s->token, &p))
+            goto fail;
+        break;
+    case '\r':  /* accept DOS and MAC newline sequences */
+        if (p[1] == '\n') {
+            p++;
+        }
+        /* fall thru */
+    case '\n':
+        p++;
+        s->line_num++;
+        goto redo;
+    case '\f':
+    case '\v':
+        if (!s->ext_json) {
+            /* JSONWhitespace does not match <VT>, nor <FF> */
+            goto def_token;
+        }
+        /* fall through */
+    case ' ':
+    case '\t':
+        p++;
+        goto redo;
+    case '/':
+        if (!s->ext_json) {
+            /* JSON does not accept comments */
+            goto def_token;
+        }
+        if (p[1] == '*') {
+            /* comment */
+            p += 2;
+            for(;;) {
+                if (*p == '\0' && p >= s->buf_end) {
+                    js_parse_error(s, "unexpected end of comment");
+                    goto fail;
+                }
+                if (p[0] == '*' && p[1] == '/') {
+                    p += 2;
+                    break;
+                }
+                if (*p == '\n') {
+                    s->line_num++;
+                    p++;
+                } else if (*p == '\r') {
+                    p++;
+                } else if (*p >= 0x80) {
+                    c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+                    if (c == -1) {
+                        p++; /* skip invalid UTF-8 */
+                    }
+                } else {
+                    p++;
+                }
+            }
+            goto redo;
+        } else if (p[1] == '/') {
+            /* line comment */
+            p += 2;
+            for(;;) {
+                if (*p == '\0' && p >= s->buf_end)
+                    break;
+                if (*p == '\r' || *p == '\n')
+                    break;
+                if (*p >= 0x80) {
+                    c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+                    /* LS or PS are considered as line terminator */
+                    if (c == CP_LS || c == CP_PS) {
+                        break;
+                    } else if (c == -1) {
+                        p++; /* skip invalid UTF-8 */
+                    }
+                } else {
+                    p++;
+                }
+            }
+            goto redo;
+        } else {
+            goto def_token;
+        }
+        break;
+    case 'a': case 'b': case 'c': case 'd':
+    case 'e': case 'f': case 'g': case 'h':
+    case 'i': case 'j': case 'k': case 'l':
+    case 'm': case 'n': case 'o': case 'p':
+    case 'q': case 'r': case 's': case 't':
+    case 'u': case 'v': case 'w': case 'x':
+    case 'y': case 'z':
+    case 'A': case 'B': case 'C': case 'D':
+    case 'E': case 'F': case 'G': case 'H':
+    case 'I': case 'J': case 'K': case 'L':
+    case 'M': case 'N': case 'O': case 'P':
+    case 'Q': case 'R': case 'S': case 'T':
+    case 'U': case 'V': case 'W': case 'X':
+    case 'Y': case 'Z':
+    case '_':
+    case '$':
+        /* identifier : only pure ascii characters are accepted */
+        p++;
+        atom = json_parse_ident(s, &p, c);
+        if (atom == JS_ATOM_NULL)
+            goto fail;
+        s->token.u.ident.atom = atom;
+        s->token.u.ident.has_escape = FALSE;
+        s->token.u.ident.is_reserved = FALSE;
+        s->token.val = TOK_IDENT;
+        break;
+    case '+':
+        if (!s->ext_json || !is_digit(p[1]))
+            goto def_token;
+        goto parse_number;
+    case '0':
+        if (is_digit(p[1]))
+            goto def_token;
+        goto parse_number;
+    case '-':
+        if (!is_digit(p[1]))
+            goto def_token;
+        goto parse_number;
+    case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8':
+    case '9':
+        /* number */
+    parse_number:
+        {
+            JSValue ret;
+            int flags, radix;
+            if (!s->ext_json) {
+                flags = 0;
+                radix = 10;
+            } else {
+                flags = ATOD_ACCEPT_BIN_OCT;
+                radix = 0;
+            }
+            ret = js_atof(s->ctx, (const char *)p, (const char **)&p, radix,
+                          flags);
+            if (JS_IsException(ret))
+                goto fail;
+            s->token.val = TOK_NUMBER;
+            s->token.u.num.val = ret;
+        }
+        break;
+    default:
+        if (c >= 128) {
+            js_parse_error(s, "unexpected character");
+            goto fail;
+        }
+    def_token:
+        s->token.val = c;
+        p++;
+        break;
+    }
+    s->buf_ptr = p;
+
+    //    dump_token(s, &s->token);
+    return 0;
+
+ fail:
+    s->token.val = TOK_ERROR;
+    return -1;
+}
+
+static int match_identifier(const uint8_t *p, const char *s) {
+    uint32_t c;
+    while (*s) {
+        if ((uint8_t)*s++ != *p++)
+            return 0;
+    }
+    c = *p;
+    if (c >= 128)
+        c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+    return !lre_js_is_ident_next(c);
+}
+
+/* simple_next_token() is used to check for the next token in simple cases.
+   It is only used for ':' and '=>', 'let' or 'function' look-ahead.
+   (*pp) is only set if TOK_IMPORT is returned for JS_DetectModule()
+   Whitespace and comments are skipped correctly.
+   Then the next token is analyzed, only for specific words.
+   Return values:
+   - '\n' if !no_line_terminator
+   - TOK_ARROW, TOK_IN, TOK_IMPORT, TOK_OF, TOK_EXPORT, TOK_FUNCTION
+   - TOK_IDENT is returned for other identifiers and keywords
+   - otherwise the next character or unicode codepoint is returned.
+ */
+static int simple_next_token(const uint8_t **pp, BOOL no_line_terminator)
+{
+    const uint8_t *p;
+    uint32_t c;
+
+    /* skip spaces and comments */
+    p = *pp;
+    for (;;) {
+        switch(c = *p++) {
+        case '\r':
+        case '\n':
+            if (no_line_terminator)
+                return '\n';
+            continue;
+        case ' ':
+        case '\t':
+        case '\v':
+        case '\f':
+            continue;
+        case '/':
+            if (*p == '/') {
+                if (no_line_terminator)
+                    return '\n';
+                while (*p && *p != '\r' && *p != '\n')
+                    p++;
+                continue;
+            }
+            if (*p == '*') {
+                while (*++p) {
+                    if ((*p == '\r' || *p == '\n') && no_line_terminator)
+                        return '\n';
+                    if (*p == '*' && p[1] == '/') {
+                        p += 2;
+                        break;
+                    }
+                }
+                continue;
+            }
+            break;
+        case '=':
+            if (*p == '>')
+                return TOK_ARROW;
+            break;
+        case 'i':
+            if (match_identifier(p, "n"))
+                return TOK_IN;
+            if (match_identifier(p, "mport")) {
+                *pp = p + 5;
+                return TOK_IMPORT;
+            }
+            return TOK_IDENT;
+        case 'o':
+            if (match_identifier(p, "f"))
+                return TOK_OF;
+            return TOK_IDENT;
+        case 'e':
+            if (match_identifier(p, "xport"))
+                return TOK_EXPORT;
+            return TOK_IDENT;
+        case 'f':
+            if (match_identifier(p, "unction"))
+                return TOK_FUNCTION;
+            return TOK_IDENT;
+        case '\\':
+            if (*p == 'u') {
+                if (lre_js_is_ident_first(lre_parse_escape(&p, TRUE)))
+                    return TOK_IDENT;
+            }
+            break;
+        default:
+            if (c >= 128) {
+                c = unicode_from_utf8(p - 1, UTF8_CHAR_LEN_MAX, &p);
+                if (no_line_terminator && (c == CP_PS || c == CP_LS))
+                    return '\n';
+            }
+            if (lre_is_space(c))
+                continue;
+            if (lre_js_is_ident_first(c))
+                return TOK_IDENT;
+            break;
+        }
+        return c;
+    }
+}
+
+static int peek_token(JSParseState *s, BOOL no_line_terminator)
+{
+    const uint8_t *p = s->buf_ptr;
+    return simple_next_token(&p, no_line_terminator);
+}
+
+static void skip_shebang(const uint8_t **pp, const uint8_t *buf_end)
+{
+    const uint8_t *p = *pp;
+    int c;
+
+    if (p[0] == '#' && p[1] == '!') {
+        p += 2;
+        while (p < buf_end) {
+            if (*p == '\n' || *p == '\r') {
+                break;
+            } else if (*p >= 0x80) {
+                c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+                if (c == CP_LS || c == CP_PS) {
+                    break;
+                } else if (c == -1) {
+                    p++; /* skip invalid UTF-8 */
+                }
+            } else {
+                p++;
+            }
+        }
+        *pp = p;
+    }
+}
+
+/* return true if 'input' contains the source of a module
+   (heuristic). 'input' must be a zero terminated.
+
+   Heuristic: skip comments and expect 'import' keyword not followed
+   by '(' or '.' or export keyword.
+*/
+BOOL JS_DetectModule(const char *input, size_t input_len)
+{
+    const uint8_t *p = (const uint8_t *)input;
+    int tok;
+
+    skip_shebang(&p, p + input_len);
+    switch(simple_next_token(&p, FALSE)) {
+    case TOK_IMPORT:
+        tok = simple_next_token(&p, FALSE);
+        return (tok != '.' && tok != '(');
+    case TOK_EXPORT:
+        return TRUE;
+    default:
+        return FALSE;
+    }
+}
+
+static inline int get_prev_opcode(JSFunctionDef *fd) {
+    if (fd->last_opcode_pos < 0)
+        return OP_invalid;
+    else
+        return fd->byte_code.buf[fd->last_opcode_pos];
+}
+
+static BOOL js_is_live_code(JSParseState *s) {
+    switch (get_prev_opcode(s->cur_func)) {
+    case OP_tail_call:
+    case OP_tail_call_method:
+    case OP_return:
+    case OP_return_undef:
+    case OP_return_async:
+    case OP_throw:
+    case OP_throw_error:
+    case OP_goto:
+#if SHORT_OPCODES
+    case OP_goto8:
+    case OP_goto16:
+#endif
+    case OP_ret:
+        return FALSE;
+    default:
+        return TRUE;
+    }
+}
+
+static void emit_u8(JSParseState *s, uint8_t val)
+{
+    dbuf_putc(&s->cur_func->byte_code, val);
+}
+
+static void emit_u16(JSParseState *s, uint16_t val)
+{
+    dbuf_put_u16(&s->cur_func->byte_code, val);
+}
+
+static void emit_u32(JSParseState *s, uint32_t val)
+{
+    dbuf_put_u32(&s->cur_func->byte_code, val);
+}
+
+static void emit_op(JSParseState *s, uint8_t val)
+{
+    JSFunctionDef *fd = s->cur_func;
+    DynBuf *bc = &fd->byte_code;
+
+    /* Use the line number of the last token used, not the next token,
+       nor the current offset in the source file.
+     */
+    if (unlikely(fd->last_opcode_line_num != s->last_line_num)) {
+        dbuf_putc(bc, OP_line_num);
+        dbuf_put_u32(bc, s->last_line_num);
+        fd->last_opcode_line_num = s->last_line_num;
+    }
+    fd->last_opcode_pos = bc->size;
+    dbuf_putc(bc, val);
+}
+
+static void emit_atom(JSParseState *s, JSAtom name)
+{
+    emit_u32(s, JS_DupAtom(s->ctx, name));
+}
+
+static int update_label(JSFunctionDef *s, int label, int delta)
+{
+    LabelSlot *ls;
+
+    assert(label >= 0 && label < s->label_count);
+    ls = &s->label_slots[label];
+    ls->ref_count += delta;
+    assert(ls->ref_count >= 0);
+    return ls->ref_count;
+}
+
+static int new_label_fd(JSFunctionDef *fd, int label)
+{
+    LabelSlot *ls;
+
+    if (label < 0) {
+        if (js_resize_array(fd->ctx, (void *)&fd->label_slots,
+                            sizeof(fd->label_slots[0]),
+                            &fd->label_size, fd->label_count + 1))
+            return -1;
+        label = fd->label_count++;
+        ls = &fd->label_slots[label];
+        ls->ref_count = 0;
+        ls->pos = -1;
+        ls->pos2 = -1;
+        ls->addr = -1;
+        ls->first_reloc = NULL;
+    }
+    return label;
+}
+
+static int new_label(JSParseState *s)
+{
+    return new_label_fd(s->cur_func, -1);
+}
+
+/* don't update the last opcode and don't emit line number info */
+static void emit_label_raw(JSParseState *s, int label)
+{
+    emit_u8(s, OP_label);
+    emit_u32(s, label);
+    s->cur_func->label_slots[label].pos = s->cur_func->byte_code.size;
+}
+
+/* return the label ID offset */
+static int emit_label(JSParseState *s, int label)
+{
+    if (label >= 0) {
+        emit_op(s, OP_label);
+        emit_u32(s, label);
+        s->cur_func->label_slots[label].pos = s->cur_func->byte_code.size;
+        return s->cur_func->byte_code.size - 4;
+    } else {
+        return -1;
+    }
+}
+
+/* return label or -1 if dead code */
+static int emit_goto(JSParseState *s, int opcode, int label)
+{
+    if (js_is_live_code(s)) {
+        if (label < 0)
+            label = new_label(s);
+        emit_op(s, opcode);
+        emit_u32(s, label);
+        s->cur_func->label_slots[label].ref_count++;
+        return label;
+    }
+    return -1;
+}
+
+/* return the constant pool index. 'val' is not duplicated. */
+static int cpool_add(JSParseState *s, JSValue val)
+{
+    JSFunctionDef *fd = s->cur_func;
+
+    if (js_resize_array(s->ctx, (void *)&fd->cpool, sizeof(fd->cpool[0]),
+                        &fd->cpool_size, fd->cpool_count + 1))
+        return -1;
+    fd->cpool[fd->cpool_count++] = val;
+    return fd->cpool_count - 1;
+}
+
+static __exception int emit_push_const(JSParseState *s, JSValueConst val,
+                                       BOOL as_atom)
+{
+    int idx;
+
+    if (JS_VALUE_GET_TAG(val) == JS_TAG_STRING && as_atom) {
+        JSAtom atom;
+        /* warning: JS_NewAtomStr frees the string value */
+        JS_DupValue(s->ctx, val);
+        atom = JS_NewAtomStr(s->ctx, JS_VALUE_GET_STRING(val));
+        if (atom != JS_ATOM_NULL && !__JS_AtomIsTaggedInt(atom)) {
+            emit_op(s, OP_push_atom_value);
+            emit_u32(s, atom);
+            return 0;
+        }
+    }
+
+    idx = cpool_add(s, JS_DupValue(s->ctx, val));
+    if (idx < 0)
+        return -1;
+    emit_op(s, OP_push_const);
+    emit_u32(s, idx);
+    return 0;
+}
+
+/* return the variable index or -1 if not found,
+   add ARGUMENT_VAR_OFFSET for argument variables */
+static int find_arg(JSContext *ctx, JSFunctionDef *fd, JSAtom name)
+{
+    int i;
+    for(i = fd->arg_count; i-- > 0;) {
+        if (fd->args[i].var_name == name)
+            return i | ARGUMENT_VAR_OFFSET;
+    }
+    return -1;
+}
+
+static int find_var(JSContext *ctx, JSFunctionDef *fd, JSAtom name)
+{
+    int i;
+    for(i = fd->var_count; i-- > 0;) {
+        if (fd->vars[i].var_name == name && fd->vars[i].scope_level == 0)
+            return i;
+    }
+    return find_arg(ctx, fd, name);
+}
+
+/* find a variable declaration in a given scope */
+static int find_var_in_scope(JSContext *ctx, JSFunctionDef *fd,
+                             JSAtom name, int scope_level)
+{
+    int scope_idx;
+    for(scope_idx = fd->scopes[scope_level].first; scope_idx >= 0;
+        scope_idx = fd->vars[scope_idx].scope_next) {
+        if (fd->vars[scope_idx].scope_level != scope_level)
+            break;
+        if (fd->vars[scope_idx].var_name == name)
+            return scope_idx;
+    }
+    return -1;
+}
+
+/* return true if scope == parent_scope or if scope is a child of
+   parent_scope */
+static BOOL is_child_scope(JSContext *ctx, JSFunctionDef *fd,
+                           int scope, int parent_scope)
+{
+    while (scope >= 0) {
+        if (scope == parent_scope)
+            return TRUE;
+        scope = fd->scopes[scope].parent;
+    }
+    return FALSE;
+}
+
+/* find a 'var' declaration in the same scope or a child scope */
+static int find_var_in_child_scope(JSContext *ctx, JSFunctionDef *fd,
+                                   JSAtom name, int scope_level)
+{
+    int i;
+    for(i = 0; i < fd->var_count; i++) {
+        JSVarDef *vd = &fd->vars[i];
+        if (vd->var_name == name && vd->scope_level == 0) {
+            if (is_child_scope(ctx, fd, vd->scope_next,
+                               scope_level))
+                return i;
+        }
+    }
+    return -1;
+}
+
+
+static JSGlobalVar *find_global_var(JSFunctionDef *fd, JSAtom name)
+{
+    int i;
+    for(i = 0; i < fd->global_var_count; i++) {
+        JSGlobalVar *hf = &fd->global_vars[i];
+        if (hf->var_name == name)
+            return hf;
+    }
+    return NULL;
+
+}
+
+static JSGlobalVar *find_lexical_global_var(JSFunctionDef *fd, JSAtom name)
+{
+    JSGlobalVar *hf = find_global_var(fd, name);
+    if (hf && hf->is_lexical)
+        return hf;
+    else
+        return NULL;
+}
+
+static int find_lexical_decl(JSContext *ctx, JSFunctionDef *fd, JSAtom name,
+                             int scope_idx, BOOL check_catch_var)
+{
+    while (scope_idx >= 0) {
+        JSVarDef *vd = &fd->vars[scope_idx];
+        if (vd->var_name == name &&
+            (vd->is_lexical || (vd->var_kind == JS_VAR_CATCH &&
+                                check_catch_var)))
+            return scope_idx;
+        scope_idx = vd->scope_next;
+    }
+
+    if (fd->is_eval && fd->eval_type == JS_EVAL_TYPE_GLOBAL) {
+        if (find_lexical_global_var(fd, name))
+            return GLOBAL_VAR_OFFSET;
+    }
+    return -1;
+}
+
+static int push_scope(JSParseState *s) {
+    if (s->cur_func) {
+        JSFunctionDef *fd = s->cur_func;
+        int scope = fd->scope_count;
+        /* XXX: should check for scope overflow */
+        if ((fd->scope_count + 1) > fd->scope_size) {
+            int new_size;
+            size_t slack;
+            JSVarScope *new_buf;
+            /* XXX: potential arithmetic overflow */
+            new_size = max_int(fd->scope_count + 1, fd->scope_size * 3 / 2);
+            if (fd->scopes == fd->def_scope_array) {
+                new_buf = js_realloc2(s->ctx, NULL, new_size * sizeof(*fd->scopes), &slack);
+                if (!new_buf)
+                    return -1;
+                memcpy(new_buf, fd->scopes, fd->scope_count * sizeof(*fd->scopes));
+            } else {
+                new_buf = js_realloc2(s->ctx, fd->scopes, new_size * sizeof(*fd->scopes), &slack);
+                if (!new_buf)
+                    return -1;
+            }
+            new_size += slack / sizeof(*new_buf);
+            fd->scopes = new_buf;
+            fd->scope_size = new_size;
+        }
+        fd->scope_count++;
+        fd->scopes[scope].parent = fd->scope_level;
+        fd->scopes[scope].first = fd->scope_first;
+        emit_op(s, OP_enter_scope);
+        emit_u16(s, scope);
+        return fd->scope_level = scope;
+    }
+    return 0;
+}
+
+static int get_first_lexical_var(JSFunctionDef *fd, int scope)
+{
+    while (scope >= 0) {
+        int scope_idx = fd->scopes[scope].first;
+        if (scope_idx >= 0)
+            return scope_idx;
+        scope = fd->scopes[scope].parent;
+    }
+    return -1;
+}
+
+static void pop_scope(JSParseState *s) {
+    if (s->cur_func) {
+        /* disable scoped variables */
+        JSFunctionDef *fd = s->cur_func;
+        int scope = fd->scope_level;
+        emit_op(s, OP_leave_scope);
+        emit_u16(s, scope);
+        fd->scope_level = fd->scopes[scope].parent;
+        fd->scope_first = get_first_lexical_var(fd, fd->scope_level);
+    }
+}
+
+static void close_scopes(JSParseState *s, int scope, int scope_stop)
+{
+    while (scope > scope_stop) {
+        emit_op(s, OP_leave_scope);
+        emit_u16(s, scope);
+        scope = s->cur_func->scopes[scope].parent;
+    }
+}
+
+/* return the variable index or -1 if error */
+static int add_var(JSContext *ctx, JSFunctionDef *fd, JSAtom name)
+{
+    JSVarDef *vd;
+
+    /* the local variable indexes are currently stored on 16 bits */
+    if (fd->var_count >= JS_MAX_LOCAL_VARS) {
+        JS_ThrowInternalError(ctx, "too many local variables");
+        return -1;
+    }
+    if (js_resize_array(ctx, (void **)&fd->vars, sizeof(fd->vars[0]),
+                        &fd->var_size, fd->var_count + 1))
+        return -1;
+    vd = &fd->vars[fd->var_count++];
+    memset(vd, 0, sizeof(*vd));
+    vd->var_name = JS_DupAtom(ctx, name);
+    vd->func_pool_idx = -1;
+    return fd->var_count - 1;
+}
+
+static int add_scope_var(JSContext *ctx, JSFunctionDef *fd, JSAtom name,
+                         JSVarKindEnum var_kind)
+{
+    int idx = add_var(ctx, fd, name);
+    if (idx >= 0) {
+        JSVarDef *vd = &fd->vars[idx];
+        vd->var_kind = var_kind;
+        vd->scope_level = fd->scope_level;
+        vd->scope_next = fd->scope_first;
+        fd->scopes[fd->scope_level].first = idx;
+        fd->scope_first = idx;
+    }
+    return idx;
+}
+
+static int add_func_var(JSContext *ctx, JSFunctionDef *fd, JSAtom name)
+{
+    int idx = fd->func_var_idx;
+    if (idx < 0 && (idx = add_var(ctx, fd, name)) >= 0) {
+        fd->func_var_idx = idx;
+        fd->vars[idx].var_kind = JS_VAR_FUNCTION_NAME;
+        if (fd->js_mode & JS_MODE_STRICT)
+            fd->vars[idx].is_const = TRUE;
+    }
+    return idx;
+}
+
+static int add_arguments_var(JSContext *ctx, JSFunctionDef *fd)
+{
+    int idx = fd->arguments_var_idx;
+    if (idx < 0 && (idx = add_var(ctx, fd, JS_ATOM_arguments)) >= 0) {
+        fd->arguments_var_idx = idx;
+    }
+    return idx;
+}
+
+/* add an argument definition in the argument scope. Only needed when
+   "eval()" may be called in the argument scope. Return 0 if OK. */
+static int add_arguments_arg(JSContext *ctx, JSFunctionDef *fd)
+{
+    int idx;
+    if (fd->arguments_arg_idx < 0) {
+        idx = find_var_in_scope(ctx, fd, JS_ATOM_arguments, ARG_SCOPE_INDEX);
+        if (idx < 0) {
+            /* XXX: the scope links are not fully updated. May be an
+               issue if there are child scopes of the argument
+               scope */
+            idx = add_var(ctx, fd, JS_ATOM_arguments);
+            if (idx < 0)
+                return -1;
+            fd->vars[idx].scope_next = fd->scopes[ARG_SCOPE_INDEX].first;
+            fd->scopes[ARG_SCOPE_INDEX].first = idx;
+            fd->vars[idx].scope_level = ARG_SCOPE_INDEX;
+            fd->vars[idx].is_lexical = TRUE;
+
+            fd->arguments_arg_idx = idx;
+        }
+    }
+    return 0;
+}
+
+static int add_arg(JSContext *ctx, JSFunctionDef *fd, JSAtom name)
+{
+    JSVarDef *vd;
+
+    /* the local variable indexes are currently stored on 16 bits */
+    if (fd->arg_count >= JS_MAX_LOCAL_VARS) {
+        JS_ThrowInternalError(ctx, "too many arguments");
+        return -1;
+    }
+    if (js_resize_array(ctx, (void **)&fd->args, sizeof(fd->args[0]),
+                        &fd->arg_size, fd->arg_count + 1))
+        return -1;
+    vd = &fd->args[fd->arg_count++];
+    memset(vd, 0, sizeof(*vd));
+    vd->var_name = JS_DupAtom(ctx, name);
+    vd->func_pool_idx = -1;
+    return fd->arg_count - 1;
+}
+
+/* add a global variable definition */
+static JSGlobalVar *add_global_var(JSContext *ctx, JSFunctionDef *s,
+                                     JSAtom name)
+{
+    JSGlobalVar *hf;
+
+    if (js_resize_array(ctx, (void **)&s->global_vars,
+                        sizeof(s->global_vars[0]),
+                        &s->global_var_size, s->global_var_count + 1))
+        return NULL;
+    hf = &s->global_vars[s->global_var_count++];
+    hf->cpool_idx = -1;
+    hf->force_init = FALSE;
+    hf->is_lexical = FALSE;
+    hf->is_const = FALSE;
+    hf->scope_level = s->scope_level;
+    hf->var_name = JS_DupAtom(ctx, name);
+    return hf;
+}
+
+typedef enum {
+    JS_VAR_DEF_WITH,
+    JS_VAR_DEF_LET,
+    JS_VAR_DEF_CONST,
+    JS_VAR_DEF_FUNCTION_DECL, /* function declaration */
+    JS_VAR_DEF_NEW_FUNCTION_DECL, /* async/generator function declaration */
+    JS_VAR_DEF_CATCH,
+    JS_VAR_DEF_VAR,
+} JSVarDefEnum;
+
+static int define_var(JSParseState *s, JSFunctionDef *fd, JSAtom name,
+                      JSVarDefEnum var_def_type)
+{
+    JSContext *ctx = s->ctx;
+    JSVarDef *vd;
+    int idx;
+
+    switch (var_def_type) {
+    case JS_VAR_DEF_WITH:
+        idx = add_scope_var(ctx, fd, name, JS_VAR_NORMAL);
+        break;
+
+    case JS_VAR_DEF_LET:
+    case JS_VAR_DEF_CONST:
+    case JS_VAR_DEF_FUNCTION_DECL:
+    case JS_VAR_DEF_NEW_FUNCTION_DECL:
+        idx = find_lexical_decl(ctx, fd, name, fd->scope_first, TRUE);
+        if (idx >= 0) {
+            if (idx < GLOBAL_VAR_OFFSET) {
+                if (fd->vars[idx].scope_level == fd->scope_level) {
+                    /* same scope: in non strict mode, functions
+                       can be redefined (annex B.3.3.4). */
+                    if (!(!(fd->js_mode & JS_MODE_STRICT) &&
+                          var_def_type == JS_VAR_DEF_FUNCTION_DECL &&
+                          fd->vars[idx].var_kind == JS_VAR_FUNCTION_DECL)) {
+                        goto redef_lex_error;
+                    }
+                } else if (fd->vars[idx].var_kind == JS_VAR_CATCH && (fd->vars[idx].scope_level + 2) == fd->scope_level) {
+                    goto redef_lex_error;
+                }
+            } else {
+                if (fd->scope_level == fd->body_scope) {
+                redef_lex_error:
+                    /* redefining a scoped var in the same scope: error */
+                    return js_parse_error(s, "invalid redefinition of lexical identifier");
+                }
+            }
+        }
+        if (var_def_type != JS_VAR_DEF_FUNCTION_DECL &&
+            var_def_type != JS_VAR_DEF_NEW_FUNCTION_DECL &&
+            fd->scope_level == fd->body_scope &&
+            find_arg(ctx, fd, name) >= 0) {
+            /* lexical variable redefines a parameter name */
+            return js_parse_error(s, "invalid redefinition of parameter name");
+        }
+
+        if (find_var_in_child_scope(ctx, fd, name, fd->scope_level) >= 0) {
+            return js_parse_error(s, "invalid redefinition of a variable");
+        }
+
+        if (fd->is_global_var) {
+            JSGlobalVar *hf;
+            hf = find_global_var(fd, name);
+            if (hf && is_child_scope(ctx, fd, hf->scope_level,
+                                     fd->scope_level)) {
+                return js_parse_error(s, "invalid redefinition of global identifier");
+            }
+        }
+
+        if (fd->is_eval &&
+            (fd->eval_type == JS_EVAL_TYPE_GLOBAL ||
+             fd->eval_type == JS_EVAL_TYPE_MODULE) &&
+            fd->scope_level == fd->body_scope) {
+            JSGlobalVar *hf;
+            hf = add_global_var(s->ctx, fd, name);
+            if (!hf)
+                return -1;
+            hf->is_lexical = TRUE;
+            hf->is_const = (var_def_type == JS_VAR_DEF_CONST);
+            idx = GLOBAL_VAR_OFFSET;
+        } else {
+            JSVarKindEnum var_kind;
+            if (var_def_type == JS_VAR_DEF_FUNCTION_DECL)
+                var_kind = JS_VAR_FUNCTION_DECL;
+            else if (var_def_type == JS_VAR_DEF_NEW_FUNCTION_DECL)
+                var_kind = JS_VAR_NEW_FUNCTION_DECL;
+            else
+                var_kind = JS_VAR_NORMAL;
+            idx = add_scope_var(ctx, fd, name, var_kind);
+            if (idx >= 0) {
+                vd = &fd->vars[idx];
+                vd->is_lexical = 1;
+                vd->is_const = (var_def_type == JS_VAR_DEF_CONST);
+            }
+        }
+        break;
+
+    case JS_VAR_DEF_CATCH:
+        idx = add_scope_var(ctx, fd, name, JS_VAR_CATCH);
+        break;
+
+    case JS_VAR_DEF_VAR:
+        if (find_lexical_decl(ctx, fd, name, fd->scope_first,
+                              FALSE) >= 0) {
+       invalid_lexical_redefinition:
+            /* error to redefine a var that inside a lexical scope */
+            return js_parse_error(s, "invalid redefinition of lexical identifier");
+        }
+        if (fd->is_global_var) {
+            JSGlobalVar *hf;
+            hf = find_global_var(fd, name);
+            if (hf && hf->is_lexical && hf->scope_level == fd->scope_level &&
+                fd->eval_type == JS_EVAL_TYPE_MODULE) {
+                goto invalid_lexical_redefinition;
+            }
+            hf = add_global_var(s->ctx, fd, name);
+            if (!hf)
+                return -1;
+            idx = GLOBAL_VAR_OFFSET;
+        } else {
+            /* if the variable already exists, don't add it again  */
+            idx = find_var(ctx, fd, name);
+            if (idx >= 0)
+                break;
+            idx = add_var(ctx, fd, name);
+            if (idx >= 0) {
+                if (name == JS_ATOM_arguments && fd->has_arguments_binding)
+                    fd->arguments_var_idx = idx;
+                fd->vars[idx].scope_next = fd->scope_level;
+            }
+        }
+        break;
+    default:
+        abort();
+    }
+    return idx;
+}
+
+/* add a private field variable in the current scope */
+static int add_private_class_field(JSParseState *s, JSFunctionDef *fd,
+                                   JSAtom name, JSVarKindEnum var_kind, BOOL is_static)
+{
+    JSContext *ctx = s->ctx;
+    JSVarDef *vd;
+    int idx;
+
+    idx = add_scope_var(ctx, fd, name, var_kind);
+    if (idx < 0)
+        return idx;
+    vd = &fd->vars[idx];
+    vd->is_lexical = 1;
+    vd->is_const = 1;
+    vd->is_static_private = is_static;
+    return idx;
+}
+
+static __exception int js_parse_expr(JSParseState *s);
+static __exception int js_parse_function_decl(JSParseState *s,
+                                              JSParseFunctionEnum func_type,
+                                              JSFunctionKindEnum func_kind,
+                                              JSAtom func_name, const uint8_t *ptr,
+                                              int start_line);
+static JSFunctionDef *js_parse_function_class_fields_init(JSParseState *s);
+static __exception int js_parse_function_decl2(JSParseState *s,
+                                               JSParseFunctionEnum func_type,
+                                               JSFunctionKindEnum func_kind,
+                                               JSAtom func_name,
+                                               const uint8_t *ptr,
+                                               int function_line_num,
+                                               JSParseExportEnum export_flag,
+                                               JSFunctionDef **pfd);
+static __exception int js_parse_assign_expr2(JSParseState *s, int parse_flags);
+static __exception int js_parse_assign_expr(JSParseState *s);
+static __exception int js_parse_unary(JSParseState *s, int parse_flags);
+static void push_break_entry(JSFunctionDef *fd, BlockEnv *be,
+                             JSAtom label_name,
+                             int label_break, int label_cont,
+                             int drop_count);
+static void pop_break_entry(JSFunctionDef *fd);
+static JSExportEntry *add_export_entry(JSParseState *s, JSModuleDef *m,
+                                       JSAtom local_name, JSAtom export_name,
+                                       JSExportTypeEnum export_type);
+
+/* Note: all the fields are already sealed except length */
+static int seal_template_obj(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+
+    p = JS_VALUE_GET_OBJ(obj);
+    prs = find_own_property1(p, JS_ATOM_length);
+    if (prs) {
+        if (js_update_property_flags(ctx, p, &prs,
+                                     prs->flags & ~(JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)))
+            return -1;
+    }
+    p->extensible = FALSE;
+    return 0;
+}
+
+static __exception int js_parse_template(JSParseState *s, int call, int *argc)
+{
+    JSContext *ctx = s->ctx;
+    JSValue raw_array, template_object;
+    JSToken cooked;
+    int depth, ret;
+
+    raw_array = JS_UNDEFINED; /* avoid warning */
+    template_object = JS_UNDEFINED; /* avoid warning */
+    if (call) {
+        /* Create a template object: an array of cooked strings */
+        /* Create an array of raw strings and store it to the raw property */
+        template_object = JS_NewArray(ctx);
+        if (JS_IsException(template_object))
+            return -1;
+        //        pool_idx = s->cur_func->cpool_count;
+        ret = emit_push_const(s, template_object, 0);
+        JS_FreeValue(ctx, template_object);
+        if (ret)
+            return -1;
+        raw_array = JS_NewArray(ctx);
+        if (JS_IsException(raw_array))
+            return -1;
+        if (JS_DefinePropertyValue(ctx, template_object, JS_ATOM_raw,
+                                   raw_array, JS_PROP_THROW) < 0) {
+            return -1;
+        }
+    }
+
+    depth = 0;
+    while (s->token.val == TOK_TEMPLATE) {
+        const uint8_t *p = s->token.ptr + 1;
+        cooked = s->token;
+        if (call) {
+            if (JS_DefinePropertyValueUint32(ctx, raw_array, depth,
+                                             JS_DupValue(ctx, s->token.u.str.str),
+                                             JS_PROP_ENUMERABLE | JS_PROP_THROW) < 0) {
+                return -1;
+            }
+            /* re-parse the string with escape sequences but do not throw a
+               syntax error if it contains invalid sequences
+             */
+            if (js_parse_string(s, '`', FALSE, p, &cooked, &p)) {
+                cooked.u.str.str = JS_UNDEFINED;
+            }
+            if (JS_DefinePropertyValueUint32(ctx, template_object, depth,
+                                             cooked.u.str.str,
+                                             JS_PROP_ENUMERABLE | JS_PROP_THROW) < 0) {
+                return -1;
+            }
+        } else {
+            JSString *str;
+            /* re-parse the string with escape sequences and throw a
+               syntax error if it contains invalid sequences
+             */
+            JS_FreeValue(ctx, s->token.u.str.str);
+            s->token.u.str.str = JS_UNDEFINED;
+            if (js_parse_string(s, '`', TRUE, p, &cooked, &p))
+                return -1;
+            str = JS_VALUE_GET_STRING(cooked.u.str.str);
+            if (str->len != 0 || depth == 0) {
+                ret = emit_push_const(s, cooked.u.str.str, 1);
+                JS_FreeValue(s->ctx, cooked.u.str.str);
+                if (ret)
+                    return -1;
+                if (depth == 0) {
+                    if (s->token.u.str.sep == '`')
+                        goto done1;
+                    emit_op(s, OP_get_field2);
+                    emit_atom(s, JS_ATOM_concat);
+                }
+                depth++;
+            } else {
+                JS_FreeValue(s->ctx, cooked.u.str.str);
+            }
+        }
+        if (s->token.u.str.sep == '`')
+            goto done;
+        if (next_token(s))
+            return -1;
+        if (js_parse_expr(s))
+            return -1;
+        depth++;
+        if (s->token.val != '}') {
+            return js_parse_error(s, "expected '}' after template expression");
+        }
+        /* XXX: should convert to string at this stage? */
+        free_token(s, &s->token);
+        /* Resume TOK_TEMPLATE parsing (s->token.line_num and
+         * s->token.ptr are OK) */
+        s->got_lf = FALSE;
+        s->last_line_num = s->token.line_num;
+        if (js_parse_template_part(s, s->buf_ptr))
+            return -1;
+    }
+    return js_parse_expect(s, TOK_TEMPLATE);
+
+ done:
+    if (call) {
+        /* Seal the objects */
+        seal_template_obj(ctx, raw_array);
+        seal_template_obj(ctx, template_object);
+        *argc = depth + 1;
+    } else {
+        emit_op(s, OP_call_method);
+        emit_u16(s, depth - 1);
+    }
+ done1:
+    return next_token(s);
+}
+
+
+#define PROP_TYPE_IDENT 0
+#define PROP_TYPE_VAR   1
+#define PROP_TYPE_GET   2
+#define PROP_TYPE_SET   3
+#define PROP_TYPE_STAR  4
+#define PROP_TYPE_ASYNC 5
+#define PROP_TYPE_ASYNC_STAR 6
+
+#define PROP_TYPE_PRIVATE (1 << 4)
+
+static BOOL token_is_ident(int tok)
+{
+    /* Accept keywords and reserved words as property names */
+    return (tok == TOK_IDENT ||
+            (tok >= TOK_FIRST_KEYWORD &&
+             tok <= TOK_LAST_KEYWORD));
+}
+
+/* if the property is an expression, name = JS_ATOM_NULL */
+static int __exception js_parse_property_name(JSParseState *s,
+                                              JSAtom *pname,
+                                              BOOL allow_method, BOOL allow_var,
+                                              BOOL allow_private)
+{
+    int is_private = 0;
+    BOOL is_non_reserved_ident;
+    JSAtom name;
+    int prop_type;
+
+    prop_type = PROP_TYPE_IDENT;
+    if (allow_method) {
+        if (token_is_pseudo_keyword(s, JS_ATOM_get)
+        ||  token_is_pseudo_keyword(s, JS_ATOM_set)) {
+            /* get x(), set x() */
+            name = JS_DupAtom(s->ctx, s->token.u.ident.atom);
+            if (next_token(s))
+                goto fail1;
+            if (s->token.val == ':' || s->token.val == ',' ||
+                s->token.val == '}' || s->token.val == '(' ||
+                s->token.val == '=') {
+                is_non_reserved_ident = TRUE;
+                goto ident_found;
+            }
+            prop_type = PROP_TYPE_GET + (name == JS_ATOM_set);
+            JS_FreeAtom(s->ctx, name);
+        } else if (s->token.val == '*') {
+            if (next_token(s))
+                goto fail;
+            prop_type = PROP_TYPE_STAR;
+        } else if (token_is_pseudo_keyword(s, JS_ATOM_async) &&
+                   peek_token(s, TRUE) != '\n') {
+            name = JS_DupAtom(s->ctx, s->token.u.ident.atom);
+            if (next_token(s))
+                goto fail1;
+            if (s->token.val == ':' || s->token.val == ',' ||
+                s->token.val == '}' || s->token.val == '(' ||
+                s->token.val == '=') {
+                is_non_reserved_ident = TRUE;
+                goto ident_found;
+            }
+            JS_FreeAtom(s->ctx, name);
+            if (s->token.val == '*') {
+                if (next_token(s))
+                    goto fail;
+                prop_type = PROP_TYPE_ASYNC_STAR;
+            } else {
+                prop_type = PROP_TYPE_ASYNC;
+            }
+        }
+    }
+
+    if (token_is_ident(s->token.val)) {
+        /* variable can only be a non-reserved identifier */
+        is_non_reserved_ident =
+            (s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved);
+        /* keywords and reserved words have a valid atom */
+        name = JS_DupAtom(s->ctx, s->token.u.ident.atom);
+        if (next_token(s))
+            goto fail1;
+    ident_found:
+        if (is_non_reserved_ident &&
+            prop_type == PROP_TYPE_IDENT && allow_var) {
+            if (!(s->token.val == ':' ||
+                  (s->token.val == '(' && allow_method))) {
+                prop_type = PROP_TYPE_VAR;
+            }
+        }
+    } else if (s->token.val == TOK_STRING) {
+        name = JS_ValueToAtom(s->ctx, s->token.u.str.str);
+        if (name == JS_ATOM_NULL)
+            goto fail;
+        if (next_token(s))
+            goto fail1;
+    } else if (s->token.val == TOK_NUMBER) {
+        JSValue val;
+        val = s->token.u.num.val;
+#ifdef CONFIG_BIGNUM
+        if (JS_VALUE_GET_TAG(val) == JS_TAG_BIG_FLOAT) {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            val = s->ctx->rt->bigfloat_ops.
+                mul_pow10_to_float64(s->ctx, &p->num,
+                                     s->token.u.num.exponent);
+            if (JS_IsException(val))
+                goto fail;
+            name = JS_ValueToAtom(s->ctx, val);
+            JS_FreeValue(s->ctx, val);
+        } else
+#endif
+        {
+            name = JS_ValueToAtom(s->ctx, val);
+        }
+        if (name == JS_ATOM_NULL)
+            goto fail;
+        if (next_token(s))
+            goto fail1;
+    } else if (s->token.val == '[') {
+        if (next_token(s))
+            goto fail;
+        if (js_parse_expr(s))
+            goto fail;
+        if (js_parse_expect(s, ']'))
+            goto fail;
+        name = JS_ATOM_NULL;
+    } else if (s->token.val == TOK_PRIVATE_NAME && allow_private) {
+        name = JS_DupAtom(s->ctx, s->token.u.ident.atom);
+        if (next_token(s))
+            goto fail1;
+        is_private = PROP_TYPE_PRIVATE;
+    } else {
+        goto invalid_prop;
+    }
+    if (prop_type != PROP_TYPE_IDENT && prop_type != PROP_TYPE_VAR &&
+        s->token.val != '(') {
+        JS_FreeAtom(s->ctx, name);
+    invalid_prop:
+        js_parse_error(s, "invalid property name");
+        goto fail;
+    }
+    *pname = name;
+    return prop_type | is_private;
+ fail1:
+    JS_FreeAtom(s->ctx, name);
+ fail:
+    *pname = JS_ATOM_NULL;
+    return -1;
+}
+
+typedef struct JSParsePos {
+    int last_line_num;
+    int line_num;
+    BOOL got_lf;
+    const uint8_t *ptr;
+} JSParsePos;
+
+static int js_parse_get_pos(JSParseState *s, JSParsePos *sp)
+{
+    sp->last_line_num = s->last_line_num;
+    sp->line_num = s->token.line_num;
+    sp->ptr = s->token.ptr;
+    sp->got_lf = s->got_lf;
+    return 0;
+}
+
+static __exception int js_parse_seek_token(JSParseState *s, const JSParsePos *sp)
+{
+    s->token.line_num = sp->last_line_num;
+    s->line_num = sp->line_num;
+    s->buf_ptr = sp->ptr;
+    s->got_lf = sp->got_lf;
+    return next_token(s);
+}
+
+/* return TRUE if a regexp literal is allowed after this token */
+static BOOL is_regexp_allowed(int tok)
+{
+    switch (tok) {
+    case TOK_NUMBER:
+    case TOK_STRING:
+    case TOK_REGEXP:
+    case TOK_DEC:
+    case TOK_INC:
+    case TOK_NULL:
+    case TOK_FALSE:
+    case TOK_TRUE:
+    case TOK_THIS:
+    case ')':
+    case ']':
+    case '}': /* XXX: regexp may occur after */
+    case TOK_IDENT:
+        return FALSE;
+    default:
+        return TRUE;
+    }
+}
+
+#define SKIP_HAS_SEMI       (1 << 0)
+#define SKIP_HAS_ELLIPSIS   (1 << 1)
+#define SKIP_HAS_ASSIGNMENT (1 << 2)
+
+/* XXX: improve speed with early bailout */
+/* XXX: no longer works if regexps are present. Could use previous
+   regexp parsing heuristics to handle most cases */
+static int js_parse_skip_parens_token(JSParseState *s, int *pbits, BOOL no_line_terminator)
+{
+    char state[256];
+    size_t level = 0;
+    JSParsePos pos;
+    int last_tok, tok = TOK_EOF;
+    int tok_len, bits = 0;
+    char c;
+
+    /* protect from underflow */
+    state[level++] = 0;
+
+    js_parse_get_pos(s, &pos);
+    last_tok = 0;
+    for (;;) {
+        switch(s->token.val) {
+        case '(':
+        case '[':
+        case '{':
+            if (level >= sizeof(state))
+                goto done;
+            state[level++] = s->token.val;
+            break;
+        case ')':
+            if (state[--level] != '(')
+                goto done;
+            break;
+        case ']':
+            if (state[--level] != '[')
+                goto done;
+            break;
+        case '}':
+            c = state[--level];
+            if (c == '`') {
+                /* continue the parsing of the template */
+                free_token(s, &s->token);
+                /* Resume TOK_TEMPLATE parsing (s->token.line_num and
+                 * s->token.ptr are OK) */
+                s->got_lf = FALSE;
+                s->last_line_num = s->token.line_num;
+                if (js_parse_template_part(s, s->buf_ptr))
+                    goto done;
+                goto handle_template;
+            } else if (c != '{') {
+                goto done;
+            }
+            break;
+        case TOK_TEMPLATE:
+        handle_template:
+            if (s->token.u.str.sep != '`') {
+                /* '${' inside the template : closing '}' and continue
+                   parsing the template */
+                if (level >= sizeof(state))
+                    goto done;
+                state[level++] = '`';
+            }
+            break;
+        case TOK_EOF:
+            goto done;
+        case ';':
+            if (level == 2) {
+                bits |= SKIP_HAS_SEMI;
+            }
+            break;
+        case TOK_ELLIPSIS:
+            if (level == 2) {
+                bits |= SKIP_HAS_ELLIPSIS;
+            }
+            break;
+        case '=':
+            bits |= SKIP_HAS_ASSIGNMENT;
+            break;
+
+        case TOK_DIV_ASSIGN:
+            tok_len = 2;
+            goto parse_regexp;
+        case '/':
+            tok_len = 1;
+        parse_regexp:
+            if (is_regexp_allowed(last_tok)) {
+                s->buf_ptr -= tok_len;
+                if (js_parse_regexp(s)) {
+                    /* XXX: should clear the exception */
+                    goto done;
+                }
+            }
+            break;
+        }
+        /* last_tok is only used to recognize regexps */
+        if (s->token.val == TOK_IDENT &&
+            (token_is_pseudo_keyword(s, JS_ATOM_of) ||
+             token_is_pseudo_keyword(s, JS_ATOM_yield))) {
+            last_tok = TOK_OF;
+        } else {
+            last_tok = s->token.val;
+        }
+        if (next_token(s)) {
+            /* XXX: should clear the exception generated by next_token() */
+            break;
+        }
+        if (level <= 1) {
+            tok = s->token.val;
+            if (token_is_pseudo_keyword(s, JS_ATOM_of))
+                tok = TOK_OF;
+            if (no_line_terminator && s->last_line_num != s->token.line_num)
+                tok = '\n';
+            break;
+        }
+    }
+ done:
+    if (pbits) {
+        *pbits = bits;
+    }
+    if (js_parse_seek_token(s, &pos))
+        return -1;
+    return tok;
+}
+
+static void set_object_name(JSParseState *s, JSAtom name)
+{
+    JSFunctionDef *fd = s->cur_func;
+    int opcode;
+
+    opcode = get_prev_opcode(fd);
+    if (opcode == OP_set_name) {
+        /* XXX: should free atom after OP_set_name? */
+        fd->byte_code.size = fd->last_opcode_pos;
+        fd->last_opcode_pos = -1;
+        emit_op(s, OP_set_name);
+        emit_atom(s, name);
+    } else if (opcode == OP_set_class_name) {
+        int define_class_pos;
+        JSAtom atom;
+        define_class_pos = fd->last_opcode_pos + 1 -
+            get_u32(fd->byte_code.buf + fd->last_opcode_pos + 1);
+        assert(fd->byte_code.buf[define_class_pos] == OP_define_class);
+        /* for consistency we free the previous atom which is
+           JS_ATOM_empty_string */
+        atom = get_u32(fd->byte_code.buf + define_class_pos + 1);
+        JS_FreeAtom(s->ctx, atom);
+        put_u32(fd->byte_code.buf + define_class_pos + 1,
+                JS_DupAtom(s->ctx, name));
+        fd->last_opcode_pos = -1;
+    }
+}
+
+static void set_object_name_computed(JSParseState *s)
+{
+    JSFunctionDef *fd = s->cur_func;
+    int opcode;
+
+    opcode = get_prev_opcode(fd);
+    if (opcode == OP_set_name) {
+        /* XXX: should free atom after OP_set_name? */
+        fd->byte_code.size = fd->last_opcode_pos;
+        fd->last_opcode_pos = -1;
+        emit_op(s, OP_set_name_computed);
+    } else if (opcode == OP_set_class_name) {
+        int define_class_pos;
+        define_class_pos = fd->last_opcode_pos + 1 -
+            get_u32(fd->byte_code.buf + fd->last_opcode_pos + 1);
+        assert(fd->byte_code.buf[define_class_pos] == OP_define_class);
+        fd->byte_code.buf[define_class_pos] = OP_define_class_computed;
+        fd->last_opcode_pos = -1;
+    }
+}
+
+static __exception int js_parse_object_literal(JSParseState *s)
+{
+    JSAtom name = JS_ATOM_NULL;
+    const uint8_t *start_ptr;
+    int start_line, prop_type;
+    BOOL has_proto;
+
+    if (next_token(s))
+        goto fail;
+    /* XXX: add an initial length that will be patched back */
+    emit_op(s, OP_object);
+    has_proto = FALSE;
+    while (s->token.val != '}') {
+        /* specific case for getter/setter */
+        start_ptr = s->token.ptr;
+        start_line = s->token.line_num;
+
+        if (s->token.val == TOK_ELLIPSIS) {
+            if (next_token(s))
+                return -1;
+            if (js_parse_assign_expr(s))
+                return -1;
+            emit_op(s, OP_null);  /* dummy excludeList */
+            emit_op(s, OP_copy_data_properties);
+            emit_u8(s, 2 | (1 << 2) | (0 << 5));
+            emit_op(s, OP_drop); /* pop excludeList */
+            emit_op(s, OP_drop); /* pop src object */
+            goto next;
+        }
+
+        prop_type = js_parse_property_name(s, &name, TRUE, TRUE, FALSE);
+        if (prop_type < 0)
+            goto fail;
+
+        if (prop_type == PROP_TYPE_VAR) {
+            /* shortcut for x: x */
+            emit_op(s, OP_scope_get_var);
+            emit_atom(s, name);
+            emit_u16(s, s->cur_func->scope_level);
+            emit_op(s, OP_define_field);
+            emit_atom(s, name);
+        } else if (s->token.val == '(') {
+            BOOL is_getset = (prop_type == PROP_TYPE_GET ||
+                              prop_type == PROP_TYPE_SET);
+            JSParseFunctionEnum func_type;
+            JSFunctionKindEnum func_kind;
+            int op_flags;
+
+            func_kind = JS_FUNC_NORMAL;
+            if (is_getset) {
+                func_type = JS_PARSE_FUNC_GETTER + prop_type - PROP_TYPE_GET;
+            } else {
+                func_type = JS_PARSE_FUNC_METHOD;
+                if (prop_type == PROP_TYPE_STAR)
+                    func_kind = JS_FUNC_GENERATOR;
+                else if (prop_type == PROP_TYPE_ASYNC)
+                    func_kind = JS_FUNC_ASYNC;
+                else if (prop_type == PROP_TYPE_ASYNC_STAR)
+                    func_kind = JS_FUNC_ASYNC_GENERATOR;
+            }
+            if (js_parse_function_decl(s, func_type, func_kind, JS_ATOM_NULL,
+                                       start_ptr, start_line))
+                goto fail;
+            if (name == JS_ATOM_NULL) {
+                emit_op(s, OP_define_method_computed);
+            } else {
+                emit_op(s, OP_define_method);
+                emit_atom(s, name);
+            }
+            if (is_getset) {
+                op_flags = OP_DEFINE_METHOD_GETTER +
+                    prop_type - PROP_TYPE_GET;
+            } else {
+                op_flags = OP_DEFINE_METHOD_METHOD;
+            }
+            emit_u8(s, op_flags | OP_DEFINE_METHOD_ENUMERABLE);
+        } else {
+            if (js_parse_expect(s, ':'))
+                goto fail;
+            if (js_parse_assign_expr(s))
+                goto fail;
+            if (name == JS_ATOM_NULL) {
+                set_object_name_computed(s);
+                emit_op(s, OP_define_array_el);
+                emit_op(s, OP_drop);
+            } else if (name == JS_ATOM___proto__) {
+                if (has_proto) {
+                    js_parse_error(s, "duplicate __proto__ property name");
+                    goto fail;
+                }
+                emit_op(s, OP_set_proto);
+                has_proto = TRUE;
+            } else {
+                set_object_name(s, name);
+                emit_op(s, OP_define_field);
+                emit_atom(s, name);
+            }
+        }
+        JS_FreeAtom(s->ctx, name);
+    next:
+        name = JS_ATOM_NULL;
+        if (s->token.val != ',')
+            break;
+        if (next_token(s))
+            goto fail;
+    }
+    if (js_parse_expect(s, '}'))
+        goto fail;
+    return 0;
+ fail:
+    JS_FreeAtom(s->ctx, name);
+    return -1;
+}
+
+/* allow the 'in' binary operator */
+#define PF_IN_ACCEPTED  (1 << 0)
+/* allow function calls parsing in js_parse_postfix_expr() */
+#define PF_POSTFIX_CALL (1 << 1)
+/* allow the exponentiation operator in js_parse_unary() */
+#define PF_POW_ALLOWED  (1 << 2)
+/* forbid the exponentiation operator in js_parse_unary() */
+#define PF_POW_FORBIDDEN (1 << 3)
+
+static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags);
+
+static __exception int js_parse_left_hand_side_expr(JSParseState *s)
+{
+    return js_parse_postfix_expr(s, PF_POSTFIX_CALL);
+}
+
+/* XXX: could generate specific bytecode */
+static __exception int js_parse_class_default_ctor(JSParseState *s,
+                                                   BOOL has_super,
+                                                   JSFunctionDef **pfd)
+{
+    JSParsePos pos;
+    const char *str;
+    int ret, line_num;
+    JSParseFunctionEnum func_type;
+    const uint8_t *saved_buf_end;
+
+    js_parse_get_pos(s, &pos);
+    if (has_super) {
+        /* spec change: no argument evaluation */
+        str = "(){super(...arguments);}";
+        func_type = JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR;
+    } else {
+        str = "(){}";
+        func_type = JS_PARSE_FUNC_CLASS_CONSTRUCTOR;
+    }
+    line_num = s->token.line_num;
+    saved_buf_end = s->buf_end;
+    s->buf_ptr = (uint8_t *)str;
+    s->buf_end = (uint8_t *)(str + strlen(str));
+    ret = next_token(s);
+    if (!ret) {
+        ret = js_parse_function_decl2(s, func_type, JS_FUNC_NORMAL,
+                                      JS_ATOM_NULL, (uint8_t *)str,
+                                      line_num, JS_PARSE_EXPORT_NONE, pfd);
+    }
+    s->buf_end = saved_buf_end;
+    ret |= js_parse_seek_token(s, &pos);
+    return ret;
+}
+
+/* find field in the current scope */
+static int find_private_class_field(JSContext *ctx, JSFunctionDef *fd,
+                                    JSAtom name, int scope_level)
+{
+    int idx;
+    idx = fd->scopes[scope_level].first;
+    while (idx != -1) {
+        if (fd->vars[idx].scope_level != scope_level)
+            break;
+        if (fd->vars[idx].var_name == name)
+            return idx;
+        idx = fd->vars[idx].scope_next;
+    }
+    return -1;
+}
+
+/* initialize the class fields, called by the constructor. Note:
+   super() can be called in an arrow function, so <this> and
+   <class_fields_init> can be variable references */
+static void emit_class_field_init(JSParseState *s)
+{
+    int label_next;
+
+    emit_op(s, OP_scope_get_var);
+    emit_atom(s, JS_ATOM_class_fields_init);
+    emit_u16(s, s->cur_func->scope_level);
+
+    /* no need to call the class field initializer if not defined */
+    emit_op(s, OP_dup);
+    label_next = emit_goto(s, OP_if_false, -1);
+
+    emit_op(s, OP_scope_get_var);
+    emit_atom(s, JS_ATOM_this);
+    emit_u16(s, 0);
+
+    emit_op(s, OP_swap);
+
+    emit_op(s, OP_call_method);
+    emit_u16(s, 0);
+
+    emit_label(s, label_next);
+    emit_op(s, OP_drop);
+}
+
+/* build a private setter function name from the private getter name */
+static JSAtom get_private_setter_name(JSContext *ctx, JSAtom name)
+{
+    return js_atom_concat_str(ctx, name, "<set>");
+}
+
+typedef struct {
+    JSFunctionDef *fields_init_fd;
+    int computed_fields_count;
+    BOOL need_brand;
+    int brand_push_pos;
+    BOOL is_static;
+} ClassFieldsDef;
+
+static __exception int emit_class_init_start(JSParseState *s,
+                                             ClassFieldsDef *cf)
+{
+    int label_add_brand;
+
+    cf->fields_init_fd = js_parse_function_class_fields_init(s);
+    if (!cf->fields_init_fd)
+        return -1;
+
+    s->cur_func = cf->fields_init_fd;
+
+    if (!cf->is_static) {
+        /* add the brand to the newly created instance */
+        /* XXX: would be better to add the code only if needed, maybe in a
+           later pass */
+        emit_op(s, OP_push_false); /* will be patched later */
+        cf->brand_push_pos = cf->fields_init_fd->last_opcode_pos;
+        label_add_brand = emit_goto(s, OP_if_false, -1);
+
+        emit_op(s, OP_scope_get_var);
+        emit_atom(s, JS_ATOM_this);
+        emit_u16(s, 0);
+
+        emit_op(s, OP_scope_get_var);
+        emit_atom(s, JS_ATOM_home_object);
+        emit_u16(s, 0);
+
+        emit_op(s, OP_add_brand);
+
+        emit_label(s, label_add_brand);
+    }
+    s->cur_func = s->cur_func->parent;
+    return 0;
+}
+
+static void emit_class_init_end(JSParseState *s, ClassFieldsDef *cf)
+{
+    int cpool_idx;
+
+    s->cur_func = cf->fields_init_fd;
+    emit_op(s, OP_return_undef);
+    s->cur_func = s->cur_func->parent;
+
+    cpool_idx = cpool_add(s, JS_NULL);
+    cf->fields_init_fd->parent_cpool_idx = cpool_idx;
+    emit_op(s, OP_fclosure);
+    emit_u32(s, cpool_idx);
+    emit_op(s, OP_set_home_object);
+}
+
+
+static __exception int js_parse_class(JSParseState *s, BOOL is_class_expr,
+                                      JSParseExportEnum export_flag)
+{
+    JSContext *ctx = s->ctx;
+    JSFunctionDef *fd = s->cur_func;
+    JSAtom name = JS_ATOM_NULL, class_name = JS_ATOM_NULL, class_name1;
+    JSAtom class_var_name = JS_ATOM_NULL;
+    JSFunctionDef *method_fd, *ctor_fd;
+    int saved_js_mode, class_name_var_idx, prop_type, ctor_cpool_offset;
+    int class_flags = 0, i, define_class_offset;
+    BOOL is_static, is_private;
+    const uint8_t *class_start_ptr = s->token.ptr;
+    const uint8_t *start_ptr;
+    ClassFieldsDef class_fields[2];
+
+    /* classes are parsed and executed in strict mode */
+    saved_js_mode = fd->js_mode;
+    fd->js_mode |= JS_MODE_STRICT;
+    if (next_token(s))
+        goto fail;
+    if (s->token.val == TOK_IDENT) {
+        if (s->token.u.ident.is_reserved) {
+            js_parse_error_reserved_identifier(s);
+            goto fail;
+        }
+        class_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+        if (next_token(s))
+            goto fail;
+    } else if (!is_class_expr && export_flag != JS_PARSE_EXPORT_DEFAULT) {
+        js_parse_error(s, "class statement requires a name");
+        goto fail;
+    }
+    if (!is_class_expr) {
+        if (class_name == JS_ATOM_NULL)
+            class_var_name = JS_ATOM__default_; /* export default */
+        else
+            class_var_name = class_name;
+        class_var_name = JS_DupAtom(ctx, class_var_name);
+    }
+
+    push_scope(s);
+
+    if (s->token.val == TOK_EXTENDS) {
+        class_flags = JS_DEFINE_CLASS_HAS_HERITAGE;
+        if (next_token(s))
+            goto fail;
+        if (js_parse_left_hand_side_expr(s))
+            goto fail;
+    } else {
+        emit_op(s, OP_undefined);
+    }
+
+    /* add a 'const' definition for the class name */
+    if (class_name != JS_ATOM_NULL) {
+        class_name_var_idx = define_var(s, fd, class_name, JS_VAR_DEF_CONST);
+        if (class_name_var_idx < 0)
+            goto fail;
+    }
+
+    if (js_parse_expect(s, '{'))
+        goto fail;
+
+    /* this scope contains the private fields */
+    push_scope(s);
+
+    emit_op(s, OP_push_const);
+    ctor_cpool_offset = fd->byte_code.size;
+    emit_u32(s, 0); /* will be patched at the end of the class parsing */
+
+    if (class_name == JS_ATOM_NULL) {
+        if (class_var_name != JS_ATOM_NULL)
+            class_name1 = JS_ATOM_default;
+        else
+            class_name1 = JS_ATOM_empty_string;
+    } else {
+        class_name1 = class_name;
+    }
+
+    emit_op(s, OP_define_class);
+    emit_atom(s, class_name1);
+    emit_u8(s, class_flags);
+    define_class_offset = fd->last_opcode_pos;
+
+    for(i = 0; i < 2; i++) {
+        ClassFieldsDef *cf = &class_fields[i];
+        cf->fields_init_fd = NULL;
+        cf->computed_fields_count = 0;
+        cf->need_brand = FALSE;
+        cf->is_static = i;
+    }
+
+    ctor_fd = NULL;
+    while (s->token.val != '}') {
+        if (s->token.val == ';') {
+            if (next_token(s))
+                goto fail;
+            continue;
+        }
+        is_static = FALSE;
+        if (s->token.val == TOK_STATIC) {
+            int next = peek_token(s, TRUE);
+            if (!(next == ';' || next == '}' || next == '(' || next == '='))
+                is_static = TRUE;
+        }
+        prop_type = -1;
+        if (is_static) {
+            if (next_token(s))
+                goto fail;
+            if (s->token.val == '{') {
+                ClassFieldsDef *cf = &class_fields[is_static];
+                JSFunctionDef *init;
+                if (!cf->fields_init_fd) {
+                    if (emit_class_init_start(s, cf))
+                        goto fail;
+                }
+                s->cur_func = cf->fields_init_fd;
+                /* XXX: could try to avoid creating a new function and
+                   reuse 'fields_init_fd' with a specific 'var'
+                   scope */
+                // stack is now: <empty>
+                if (js_parse_function_decl2(s, JS_PARSE_FUNC_CLASS_STATIC_INIT,
+                                            JS_FUNC_NORMAL, JS_ATOM_NULL,
+                                            s->token.ptr, s->token.line_num,
+                                            JS_PARSE_EXPORT_NONE, &init) < 0) {
+                    goto fail;
+                }
+                // stack is now: fclosure
+                push_scope(s);
+                emit_op(s, OP_scope_get_var);
+                emit_atom(s, JS_ATOM_this);
+                emit_u16(s, 0);
+                // stack is now: fclosure this
+                emit_op(s, OP_swap);
+                // stack is now: this fclosure
+                emit_op(s, OP_call_method);
+                emit_u16(s, 0);
+                // stack is now: returnvalue
+                emit_op(s, OP_drop);
+                // stack is now: <empty>
+                pop_scope(s);
+                s->cur_func = s->cur_func->parent;
+                continue;
+            }
+            /* allow "static" field name */
+            if (s->token.val == ';' || s->token.val == '=') {
+                is_static = FALSE;
+                name = JS_DupAtom(ctx, JS_ATOM_static);
+                prop_type = PROP_TYPE_IDENT;
+            }
+        }
+        if (is_static)
+            emit_op(s, OP_swap);
+        start_ptr = s->token.ptr;
+        if (prop_type < 0) {
+            prop_type = js_parse_property_name(s, &name, TRUE, FALSE, TRUE);
+            if (prop_type < 0)
+                goto fail;
+        }
+        is_private = prop_type & PROP_TYPE_PRIVATE;
+        prop_type &= ~PROP_TYPE_PRIVATE;
+
+        if ((name == JS_ATOM_constructor && !is_static &&
+             prop_type != PROP_TYPE_IDENT) ||
+            (name == JS_ATOM_prototype && is_static) ||
+            name == JS_ATOM_hash_constructor) {
+            js_parse_error(s, "invalid method name");
+            goto fail;
+        }
+        if (prop_type == PROP_TYPE_GET || prop_type == PROP_TYPE_SET) {
+            BOOL is_set = prop_type - PROP_TYPE_GET;
+            JSFunctionDef *method_fd;
+
+            if (is_private) {
+                int idx, var_kind, is_static1;
+                idx = find_private_class_field(ctx, fd, name, fd->scope_level);
+                if (idx >= 0) {
+                    var_kind = fd->vars[idx].var_kind;
+                    is_static1 = fd->vars[idx].is_static_private;
+                    if (var_kind == JS_VAR_PRIVATE_FIELD ||
+                        var_kind == JS_VAR_PRIVATE_METHOD ||
+                        var_kind == JS_VAR_PRIVATE_GETTER_SETTER ||
+                        var_kind == (JS_VAR_PRIVATE_GETTER + is_set) ||
+                        (var_kind == (JS_VAR_PRIVATE_GETTER + 1 - is_set) &&
+                         is_static != is_static1)) {
+                        goto private_field_already_defined;
+                    }
+                    fd->vars[idx].var_kind = JS_VAR_PRIVATE_GETTER_SETTER;
+                } else {
+                    if (add_private_class_field(s, fd, name,
+                                                JS_VAR_PRIVATE_GETTER + is_set, is_static) < 0)
+                        goto fail;
+                }
+                class_fields[is_static].need_brand = TRUE;
+            }
+
+            if (js_parse_function_decl2(s, JS_PARSE_FUNC_GETTER + is_set,
+                                        JS_FUNC_NORMAL, JS_ATOM_NULL,
+                                        start_ptr, s->token.line_num,
+                                        JS_PARSE_EXPORT_NONE, &method_fd))
+                goto fail;
+            if (is_private) {
+                method_fd->need_home_object = TRUE; /* needed for brand check */
+                emit_op(s, OP_set_home_object);
+                /* XXX: missing function name */
+                emit_op(s, OP_scope_put_var_init);
+                if (is_set) {
+                    JSAtom setter_name;
+                    int ret;
+
+                    setter_name = get_private_setter_name(ctx, name);
+                    if (setter_name == JS_ATOM_NULL)
+                        goto fail;
+                    emit_atom(s, setter_name);
+                    ret = add_private_class_field(s, fd, setter_name,
+                                                  JS_VAR_PRIVATE_SETTER, is_static);
+                    JS_FreeAtom(ctx, setter_name);
+                    if (ret < 0)
+                        goto fail;
+                } else {
+                    emit_atom(s, name);
+                }
+                emit_u16(s, s->cur_func->scope_level);
+            } else {
+                if (name == JS_ATOM_NULL) {
+                    emit_op(s, OP_define_method_computed);
+                } else {
+                    emit_op(s, OP_define_method);
+                    emit_atom(s, name);
+                }
+                emit_u8(s, OP_DEFINE_METHOD_GETTER + is_set);
+            }
+        } else if (prop_type == PROP_TYPE_IDENT && s->token.val != '(') {
+            ClassFieldsDef *cf = &class_fields[is_static];
+            JSAtom field_var_name = JS_ATOM_NULL;
+
+            /* class field */
+
+            /* XXX: spec: not consistent with method name checks */
+            if (name == JS_ATOM_constructor || name == JS_ATOM_prototype) {
+                js_parse_error(s, "invalid field name");
+                goto fail;
+            }
+
+            if (is_private) {
+                if (find_private_class_field(ctx, fd, name,
+                                             fd->scope_level) >= 0) {
+                    goto private_field_already_defined;
+                }
+                if (add_private_class_field(s, fd, name,
+                                            JS_VAR_PRIVATE_FIELD, is_static) < 0)
+                    goto fail;
+                emit_op(s, OP_private_symbol);
+                emit_atom(s, name);
+                emit_op(s, OP_scope_put_var_init);
+                emit_atom(s, name);
+                emit_u16(s, s->cur_func->scope_level);
+            }
+
+            if (!cf->fields_init_fd) {
+                if (emit_class_init_start(s, cf))
+                    goto fail;
+            }
+            if (name == JS_ATOM_NULL ) {
+                /* save the computed field name into a variable */
+                field_var_name = js_atom_concat_num(ctx, JS_ATOM_computed_field + is_static, cf->computed_fields_count);
+                if (field_var_name == JS_ATOM_NULL)
+                    goto fail;
+                if (define_var(s, fd, field_var_name, JS_VAR_DEF_CONST) < 0) {
+                    JS_FreeAtom(ctx, field_var_name);
+                    goto fail;
+                }
+                emit_op(s, OP_to_propkey);
+                emit_op(s, OP_scope_put_var_init);
+                emit_atom(s, field_var_name);
+                emit_u16(s, s->cur_func->scope_level);
+            }
+            s->cur_func = cf->fields_init_fd;
+            emit_op(s, OP_scope_get_var);
+            emit_atom(s, JS_ATOM_this);
+            emit_u16(s, 0);
+
+            if (name == JS_ATOM_NULL) {
+                emit_op(s, OP_scope_get_var);
+                emit_atom(s, field_var_name);
+                emit_u16(s, s->cur_func->scope_level);
+                cf->computed_fields_count++;
+                JS_FreeAtom(ctx, field_var_name);
+            } else if (is_private) {
+                emit_op(s, OP_scope_get_var);
+                emit_atom(s, name);
+                emit_u16(s, s->cur_func->scope_level);
+            }
+
+            if (s->token.val == '=') {
+                if (next_token(s))
+                    goto fail;
+                if (js_parse_assign_expr(s))
+                    goto fail;
+            } else {
+                emit_op(s, OP_undefined);
+            }
+            if (is_private) {
+                set_object_name_computed(s);
+                emit_op(s, OP_define_private_field);
+            } else if (name == JS_ATOM_NULL) {
+                set_object_name_computed(s);
+                emit_op(s, OP_define_array_el);
+                emit_op(s, OP_drop);
+            } else {
+                set_object_name(s, name);
+                emit_op(s, OP_define_field);
+                emit_atom(s, name);
+            }
+            s->cur_func = s->cur_func->parent;
+            if (js_parse_expect_semi(s))
+                goto fail;
+        } else {
+            JSParseFunctionEnum func_type;
+            JSFunctionKindEnum func_kind;
+
+            func_type = JS_PARSE_FUNC_METHOD;
+            func_kind = JS_FUNC_NORMAL;
+            if (prop_type == PROP_TYPE_STAR) {
+                func_kind = JS_FUNC_GENERATOR;
+            } else if (prop_type == PROP_TYPE_ASYNC) {
+                func_kind = JS_FUNC_ASYNC;
+            } else if (prop_type == PROP_TYPE_ASYNC_STAR) {
+                func_kind = JS_FUNC_ASYNC_GENERATOR;
+            } else if (name == JS_ATOM_constructor && !is_static) {
+                if (ctor_fd) {
+                    js_parse_error(s, "property constructor appears more than once");
+                    goto fail;
+                }
+                if (class_flags & JS_DEFINE_CLASS_HAS_HERITAGE)
+                    func_type = JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR;
+                else
+                    func_type = JS_PARSE_FUNC_CLASS_CONSTRUCTOR;
+            }
+            if (is_private) {
+                class_fields[is_static].need_brand = TRUE;
+            }
+            if (js_parse_function_decl2(s, func_type, func_kind, JS_ATOM_NULL, start_ptr, s->token.line_num, JS_PARSE_EXPORT_NONE, &method_fd))
+                goto fail;
+            if (func_type == JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR ||
+                func_type == JS_PARSE_FUNC_CLASS_CONSTRUCTOR) {
+                ctor_fd = method_fd;
+            } else if (is_private) {
+                method_fd->need_home_object = TRUE; /* needed for brand check */
+                if (find_private_class_field(ctx, fd, name,
+                                             fd->scope_level) >= 0) {
+                private_field_already_defined:
+                    js_parse_error(s, "private class field is already defined");
+                    goto fail;
+                }
+                if (add_private_class_field(s, fd, name,
+                                            JS_VAR_PRIVATE_METHOD, is_static) < 0)
+                    goto fail;
+                emit_op(s, OP_set_home_object);
+                emit_op(s, OP_set_name);
+                emit_atom(s, name);
+                emit_op(s, OP_scope_put_var_init);
+                emit_atom(s, name);
+                emit_u16(s, s->cur_func->scope_level);
+            } else {
+                if (name == JS_ATOM_NULL) {
+                    emit_op(s, OP_define_method_computed);
+                } else {
+                    emit_op(s, OP_define_method);
+                    emit_atom(s, name);
+                }
+                emit_u8(s, OP_DEFINE_METHOD_METHOD);
+            }
+        }
+        if (is_static)
+            emit_op(s, OP_swap);
+        JS_FreeAtom(ctx, name);
+        name = JS_ATOM_NULL;
+    }
+
+    if (s->token.val != '}') {
+        js_parse_error(s, "expecting '%c'", '}');
+        goto fail;
+    }
+
+    if (!ctor_fd) {
+        if (js_parse_class_default_ctor(s, class_flags & JS_DEFINE_CLASS_HAS_HERITAGE, &ctor_fd))
+            goto fail;
+    }
+    /* patch the constant pool index for the constructor */
+    put_u32(fd->byte_code.buf + ctor_cpool_offset, ctor_fd->parent_cpool_idx);
+
+    /* store the class source code in the constructor. */
+    if (!(fd->js_mode & JS_MODE_STRIP)) {
+        js_free(ctx, ctor_fd->source);
+        ctor_fd->source_len = s->buf_ptr - class_start_ptr;
+        ctor_fd->source = js_strndup(ctx, (const char *)class_start_ptr,
+                                     ctor_fd->source_len);
+        if (!ctor_fd->source)
+            goto fail;
+    }
+
+    /* consume the '}' */
+    if (next_token(s))
+        goto fail;
+
+    {
+        ClassFieldsDef *cf = &class_fields[0];
+        int var_idx;
+
+        if (cf->need_brand) {
+            /* add a private brand to the prototype */
+            emit_op(s, OP_dup);
+            emit_op(s, OP_null);
+            emit_op(s, OP_swap);
+            emit_op(s, OP_add_brand);
+
+            /* define the brand field in 'this' of the initializer */
+            if (!cf->fields_init_fd) {
+                if (emit_class_init_start(s, cf))
+                    goto fail;
+            }
+            /* patch the start of the function to enable the
+               OP_add_brand_instance code */
+            cf->fields_init_fd->byte_code.buf[cf->brand_push_pos] = OP_push_true;
+        }
+
+        /* store the function to initialize the fields to that it can be
+           referenced by the constructor */
+        var_idx = define_var(s, fd, JS_ATOM_class_fields_init,
+                             JS_VAR_DEF_CONST);
+        if (var_idx < 0)
+            goto fail;
+        if (cf->fields_init_fd) {
+            emit_class_init_end(s, cf);
+        } else {
+            emit_op(s, OP_undefined);
+        }
+        emit_op(s, OP_scope_put_var_init);
+        emit_atom(s, JS_ATOM_class_fields_init);
+        emit_u16(s, s->cur_func->scope_level);
+    }
+
+    /* drop the prototype */
+    emit_op(s, OP_drop);
+
+    if (class_fields[1].need_brand) {
+        /* add a private brand to the class */
+        emit_op(s, OP_dup);
+        emit_op(s, OP_dup);
+        emit_op(s, OP_add_brand);
+    }
+
+    if (class_name != JS_ATOM_NULL) {
+        /* store the class name in the scoped class name variable (it
+           is independent from the class statement variable
+           definition) */
+        emit_op(s, OP_dup);
+        emit_op(s, OP_scope_put_var_init);
+        emit_atom(s, class_name);
+        emit_u16(s, fd->scope_level);
+    }
+
+    /* initialize the static fields */
+    if (class_fields[1].fields_init_fd != NULL) {
+        ClassFieldsDef *cf = &class_fields[1];
+        emit_op(s, OP_dup);
+        emit_class_init_end(s, cf);
+        emit_op(s, OP_call_method);
+        emit_u16(s, 0);
+        emit_op(s, OP_drop);
+    }
+
+    pop_scope(s);
+    pop_scope(s);
+
+    /* the class statements have a block level scope */
+    if (class_var_name != JS_ATOM_NULL) {
+        if (define_var(s, fd, class_var_name, JS_VAR_DEF_LET) < 0)
+            goto fail;
+        emit_op(s, OP_scope_put_var_init);
+        emit_atom(s, class_var_name);
+        emit_u16(s, fd->scope_level);
+    } else {
+        if (class_name == JS_ATOM_NULL) {
+            /* cannot use OP_set_name because the name of the class
+               must be defined before the static initializers are
+               executed */
+            emit_op(s, OP_set_class_name);
+            emit_u32(s, fd->last_opcode_pos + 1 - define_class_offset);
+        }
+    }
+
+    if (export_flag != JS_PARSE_EXPORT_NONE) {
+        if (!add_export_entry(s, fd->module,
+                              class_var_name,
+                              export_flag == JS_PARSE_EXPORT_NAMED ? class_var_name : JS_ATOM_default,
+                              JS_EXPORT_TYPE_LOCAL))
+            goto fail;
+    }
+
+    JS_FreeAtom(ctx, class_name);
+    JS_FreeAtom(ctx, class_var_name);
+    fd->js_mode = saved_js_mode;
+    return 0;
+ fail:
+    JS_FreeAtom(ctx, name);
+    JS_FreeAtom(ctx, class_name);
+    JS_FreeAtom(ctx, class_var_name);
+    fd->js_mode = saved_js_mode;
+    return -1;
+}
+
+static __exception int js_parse_array_literal(JSParseState *s)
+{
+    uint32_t idx;
+    BOOL need_length;
+
+    if (next_token(s))
+        return -1;
+    /* small regular arrays are created on the stack */
+    idx = 0;
+    while (s->token.val != ']' && idx < 32) {
+        if (s->token.val == ',' || s->token.val == TOK_ELLIPSIS)
+            break;
+        if (js_parse_assign_expr(s))
+            return -1;
+        idx++;
+        /* accept trailing comma */
+        if (s->token.val == ',') {
+            if (next_token(s))
+                return -1;
+        } else
+        if (s->token.val != ']')
+            goto done;
+    }
+    emit_op(s, OP_array_from);
+    emit_u16(s, idx);
+
+    /* larger arrays and holes are handled with explicit indices */
+    need_length = FALSE;
+    while (s->token.val != ']' && idx < 0x7fffffff) {
+        if (s->token.val == TOK_ELLIPSIS)
+            break;
+        need_length = TRUE;
+        if (s->token.val != ',') {
+            if (js_parse_assign_expr(s))
+                return -1;
+            emit_op(s, OP_define_field);
+            emit_u32(s, __JS_AtomFromUInt32(idx));
+            need_length = FALSE;
+        }
+        idx++;
+        /* accept trailing comma */
+        if (s->token.val == ',') {
+            if (next_token(s))
+                return -1;
+        }
+    }
+    if (s->token.val == ']') {
+        if (need_length) {
+            /* Set the length: Cannot use OP_define_field because
+               length is not configurable */
+            emit_op(s, OP_dup);
+            emit_op(s, OP_push_i32);
+            emit_u32(s, idx);
+            emit_op(s, OP_put_field);
+            emit_atom(s, JS_ATOM_length);
+        }
+        goto done;
+    }
+
+    /* huge arrays and spread elements require a dynamic index on the stack */
+    emit_op(s, OP_push_i32);
+    emit_u32(s, idx);
+
+    /* stack has array, index */
+    while (s->token.val != ']') {
+        if (s->token.val == TOK_ELLIPSIS) {
+            if (next_token(s))
+                return -1;
+            if (js_parse_assign_expr(s))
+                return -1;
+#if 1
+            emit_op(s, OP_append);
+#else
+            int label_next, label_done;
+            label_next = new_label(s);
+            label_done = new_label(s);
+            /* enumerate object */
+            emit_op(s, OP_for_of_start);
+            emit_op(s, OP_rot5l);
+            emit_op(s, OP_rot5l);
+            emit_label(s, label_next);
+            /* on stack: enum_rec array idx */
+            emit_op(s, OP_for_of_next);
+            emit_u8(s, 2);
+            emit_goto(s, OP_if_true, label_done);
+            /* append element */
+            /* enum_rec array idx val -> enum_rec array new_idx */
+            emit_op(s, OP_define_array_el);
+            emit_op(s, OP_inc);
+            emit_goto(s, OP_goto, label_next);
+            emit_label(s, label_done);
+            /* close enumeration */
+            emit_op(s, OP_drop); /* drop undef val */
+            emit_op(s, OP_nip1); /* drop enum_rec */
+            emit_op(s, OP_nip1);
+            emit_op(s, OP_nip1);
+#endif
+        } else {
+            need_length = TRUE;
+            if (s->token.val != ',') {
+                if (js_parse_assign_expr(s))
+                    return -1;
+                /* a idx val */
+                emit_op(s, OP_define_array_el);
+                need_length = FALSE;
+            }
+            emit_op(s, OP_inc);
+        }
+        if (s->token.val != ',')
+            break;
+        if (next_token(s))
+            return -1;
+    }
+    if (need_length) {
+        /* Set the length: cannot use OP_define_field because
+           length is not configurable */
+        emit_op(s, OP_dup1);    /* array length - array array length */
+        emit_op(s, OP_put_field);
+        emit_atom(s, JS_ATOM_length);
+    } else {
+        emit_op(s, OP_drop);    /* array length - array */
+    }
+done:
+    return js_parse_expect(s, ']');
+}
+
+/* XXX: remove */
+static BOOL has_with_scope(JSFunctionDef *s, int scope_level)
+{
+    /* check if scope chain contains a with statement */
+    while (s) {
+        int scope_idx = s->scopes[scope_level].first;
+        while (scope_idx >= 0) {
+            JSVarDef *vd = &s->vars[scope_idx];
+
+            if (vd->var_name == JS_ATOM__with_)
+                return TRUE;
+            scope_idx = vd->scope_next;
+        }
+        /* check parent scopes */
+        scope_level = s->parent_scope_level;
+        s = s->parent;
+    }
+    return FALSE;
+}
+
+static __exception int get_lvalue(JSParseState *s, int *popcode, int *pscope,
+                                  JSAtom *pname, int *plabel, int *pdepth, BOOL keep,
+                                  int tok)
+{
+    JSFunctionDef *fd;
+    int opcode, scope, label, depth;
+    JSAtom name;
+
+    /* we check the last opcode to get the lvalue type */
+    fd = s->cur_func;
+    scope = 0;
+    name = JS_ATOM_NULL;
+    label = -1;
+    depth = 0;
+    switch(opcode = get_prev_opcode(fd)) {
+    case OP_scope_get_var:
+        name = get_u32(fd->byte_code.buf + fd->last_opcode_pos + 1);
+        scope = get_u16(fd->byte_code.buf + fd->last_opcode_pos + 5);
+        if ((name == JS_ATOM_arguments || name == JS_ATOM_eval) &&
+            (fd->js_mode & JS_MODE_STRICT)) {
+            return js_parse_error(s, "invalid lvalue in strict mode");
+        }
+        if (name == JS_ATOM_this || name == JS_ATOM_new_target)
+            goto invalid_lvalue;
+        depth = 2;  /* will generate OP_get_ref_value */
+        break;
+    case OP_get_field:
+        name = get_u32(fd->byte_code.buf + fd->last_opcode_pos + 1);
+        depth = 1;
+        break;
+    case OP_scope_get_private_field:
+        name = get_u32(fd->byte_code.buf + fd->last_opcode_pos + 1);
+        scope = get_u16(fd->byte_code.buf + fd->last_opcode_pos + 5);
+        depth = 1;
+        break;
+    case OP_get_array_el:
+        depth = 2;
+        break;
+    case OP_get_super_value:
+        depth = 3;
+        break;
+    default:
+    invalid_lvalue:
+        if (tok == TOK_FOR) {
+            return js_parse_error(s, "invalid for in/of left hand-side");
+        } else if (tok == TOK_INC || tok == TOK_DEC) {
+            return js_parse_error(s, "invalid increment/decrement operand");
+        } else if (tok == '[' || tok == '{') {
+            return js_parse_error(s, "invalid destructuring target");
+        } else {
+            return js_parse_error(s, "invalid assignment left-hand side");
+        }
+    }
+    /* remove the last opcode */
+    fd->byte_code.size = fd->last_opcode_pos;
+    fd->last_opcode_pos = -1;
+
+    if (keep) {
+        /* get the value but keep the object/fields on the stack */
+        switch(opcode) {
+        case OP_scope_get_var:
+            label = new_label(s);
+            emit_op(s, OP_scope_make_ref);
+            emit_atom(s, name);
+            emit_u32(s, label);
+            emit_u16(s, scope);
+            update_label(fd, label, 1);
+            emit_op(s, OP_get_ref_value);
+            opcode = OP_get_ref_value;
+            break;
+        case OP_get_field:
+            emit_op(s, OP_get_field2);
+            emit_atom(s, name);
+            break;
+        case OP_scope_get_private_field:
+            emit_op(s, OP_scope_get_private_field2);
+            emit_atom(s, name);
+            emit_u16(s, scope);
+            break;
+        case OP_get_array_el:
+            /* XXX: replace by a single opcode ? */
+            emit_op(s, OP_to_propkey2);
+            emit_op(s, OP_dup2);
+            emit_op(s, OP_get_array_el);
+            break;
+        case OP_get_super_value:
+            emit_op(s, OP_to_propkey);
+            emit_op(s, OP_dup3);
+            emit_op(s, OP_get_super_value);
+            break;
+        default:
+            abort();
+        }
+    } else {
+        switch(opcode) {
+        case OP_scope_get_var:
+            label = new_label(s);
+            emit_op(s, OP_scope_make_ref);
+            emit_atom(s, name);
+            emit_u32(s, label);
+            emit_u16(s, scope);
+            update_label(fd, label, 1);
+            opcode = OP_get_ref_value;
+            break;
+        case OP_get_array_el:
+            emit_op(s, OP_to_propkey2);
+            break;
+        case OP_get_super_value:
+            emit_op(s, OP_to_propkey);
+            break;
+        }
+    }
+
+    *popcode = opcode;
+    *pscope = scope;
+    /* name has refcount for OP_get_field and OP_get_ref_value,
+       and JS_ATOM_NULL for other opcodes */
+    *pname = name;
+    *plabel = label;
+    if (pdepth)
+        *pdepth = depth;
+    return 0;
+}
+
+typedef enum {
+    PUT_LVALUE_NOKEEP, /* [depth] v -> */
+    PUT_LVALUE_NOKEEP_DEPTH, /* [depth] v -> , keep depth (currently
+                                just disable optimizations) */
+    PUT_LVALUE_KEEP_TOP,  /* [depth] v -> v */
+    PUT_LVALUE_KEEP_SECOND, /* [depth] v0 v -> v0 */
+    PUT_LVALUE_NOKEEP_BOTTOM, /* v [depth] -> */
+} PutLValueEnum;
+
+/* name has a live reference. 'is_let' is only used with opcode =
+   OP_scope_get_var which is never generated by get_lvalue(). */
+static void put_lvalue(JSParseState *s, int opcode, int scope,
+                       JSAtom name, int label, PutLValueEnum special,
+                       BOOL is_let)
+{
+    switch(opcode) {
+    case OP_get_field:
+    case OP_scope_get_private_field:
+        /* depth = 1 */
+        switch(special) {
+        case PUT_LVALUE_NOKEEP:
+        case PUT_LVALUE_NOKEEP_DEPTH:
+            break;
+        case PUT_LVALUE_KEEP_TOP:
+            emit_op(s, OP_insert2); /* obj v -> v obj v */
+            break;
+        case PUT_LVALUE_KEEP_SECOND:
+            emit_op(s, OP_perm3); /* obj v0 v -> v0 obj v */
+            break;
+        case PUT_LVALUE_NOKEEP_BOTTOM:
+            emit_op(s, OP_swap);
+            break;
+        default:
+            abort();
+        }
+        break;
+    case OP_get_array_el:
+    case OP_get_ref_value:
+        /* depth = 2 */
+        if (opcode == OP_get_ref_value) {
+            JS_FreeAtom(s->ctx, name);
+            emit_label(s, label);
+        }
+        switch(special) {
+        case PUT_LVALUE_NOKEEP:
+            emit_op(s, OP_nop); /* will trigger optimization */
+            break;
+        case PUT_LVALUE_NOKEEP_DEPTH:
+            break;
+        case PUT_LVALUE_KEEP_TOP:
+            emit_op(s, OP_insert3); /* obj prop v -> v obj prop v */
+            break;
+        case PUT_LVALUE_KEEP_SECOND:
+            emit_op(s, OP_perm4); /* obj prop v0 v -> v0 obj prop v */
+            break;
+        case PUT_LVALUE_NOKEEP_BOTTOM:
+            emit_op(s, OP_rot3l);
+            break;
+        default:
+            abort();
+        }
+        break;
+    case OP_get_super_value:
+        /* depth = 3 */
+        switch(special) {
+        case PUT_LVALUE_NOKEEP:
+        case PUT_LVALUE_NOKEEP_DEPTH:
+            break;
+        case PUT_LVALUE_KEEP_TOP:
+            emit_op(s, OP_insert4); /* this obj prop v -> v this obj prop v */
+            break;
+        case PUT_LVALUE_KEEP_SECOND:
+            emit_op(s, OP_perm5); /* this obj prop v0 v -> v0 this obj prop v */
+            break;
+        case PUT_LVALUE_NOKEEP_BOTTOM:
+            emit_op(s, OP_rot4l);
+            break;
+        default:
+            abort();
+        }
+        break;
+    default:
+        break;
+    }
+
+    switch(opcode) {
+    case OP_scope_get_var:  /* val -- */
+        assert(special == PUT_LVALUE_NOKEEP ||
+               special == PUT_LVALUE_NOKEEP_DEPTH);
+        emit_op(s, is_let ? OP_scope_put_var_init : OP_scope_put_var);
+        emit_u32(s, name);  /* has refcount */
+        emit_u16(s, scope);
+        break;
+    case OP_get_field:
+        emit_op(s, OP_put_field);
+        emit_u32(s, name);  /* name has refcount */
+        break;
+    case OP_scope_get_private_field:
+        emit_op(s, OP_scope_put_private_field);
+        emit_u32(s, name);  /* name has refcount */
+        emit_u16(s, scope);
+        break;
+    case OP_get_array_el:
+        emit_op(s, OP_put_array_el);
+        break;
+    case OP_get_ref_value:
+        emit_op(s, OP_put_ref_value);
+        break;
+    case OP_get_super_value:
+        emit_op(s, OP_put_super_value);
+        break;
+    default:
+        abort();
+    }
+}
+
+static __exception int js_parse_expr_paren(JSParseState *s)
+{
+    if (js_parse_expect(s, '('))
+        return -1;
+    if (js_parse_expr(s))
+        return -1;
+    if (js_parse_expect(s, ')'))
+        return -1;
+    return 0;
+}
+
+static int js_unsupported_keyword(JSParseState *s, JSAtom atom)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+    return js_parse_error(s, "unsupported keyword: %s",
+                          JS_AtomGetStr(s->ctx, buf, sizeof(buf), atom));
+}
+
+static __exception int js_define_var(JSParseState *s, JSAtom name, int tok)
+{
+    JSFunctionDef *fd = s->cur_func;
+    JSVarDefEnum var_def_type;
+
+    if (name == JS_ATOM_yield && fd->func_kind == JS_FUNC_GENERATOR) {
+        return js_parse_error(s, "yield is a reserved identifier");
+    }
+    if ((name == JS_ATOM_arguments || name == JS_ATOM_eval)
+    &&  (fd->js_mode & JS_MODE_STRICT)) {
+        return js_parse_error(s, "invalid variable name in strict mode");
+    }
+    if ((name == JS_ATOM_let || name == JS_ATOM_undefined)
+    &&  (tok == TOK_LET || tok == TOK_CONST)) {
+        return js_parse_error(s, "invalid lexical variable name");
+    }
+    switch(tok) {
+    case TOK_LET:
+        var_def_type = JS_VAR_DEF_LET;
+        break;
+    case TOK_CONST:
+        var_def_type = JS_VAR_DEF_CONST;
+        break;
+    case TOK_VAR:
+        var_def_type = JS_VAR_DEF_VAR;
+        break;
+    case TOK_CATCH:
+        var_def_type = JS_VAR_DEF_CATCH;
+        break;
+    default:
+        abort();
+    }
+    if (define_var(s, fd, name, var_def_type) < 0)
+        return -1;
+    return 0;
+}
+
+static void js_emit_spread_code(JSParseState *s, int depth)
+{
+    int label_rest_next, label_rest_done;
+
+    /* XXX: could check if enum object is an actual array and optimize
+       slice extraction. enumeration record and target array are in a
+       different order from OP_append case. */
+    /* enum_rec xxx -- enum_rec xxx array 0 */
+    emit_op(s, OP_array_from);
+    emit_u16(s, 0);
+    emit_op(s, OP_push_i32);
+    emit_u32(s, 0);
+    emit_label(s, label_rest_next = new_label(s));
+    emit_op(s, OP_for_of_next);
+    emit_u8(s, 2 + depth);
+    label_rest_done = emit_goto(s, OP_if_true, -1);
+    /* array idx val -- array idx */
+    emit_op(s, OP_define_array_el);
+    emit_op(s, OP_inc);
+    emit_goto(s, OP_goto, label_rest_next);
+    emit_label(s, label_rest_done);
+    /* enum_rec xxx array idx undef -- enum_rec xxx array */
+    emit_op(s, OP_drop);
+    emit_op(s, OP_drop);
+}
+
+static int js_parse_check_duplicate_parameter(JSParseState *s, JSAtom name)
+{
+    /* Check for duplicate parameter names */
+    JSFunctionDef *fd = s->cur_func;
+    int i;
+    for (i = 0; i < fd->arg_count; i++) {
+        if (fd->args[i].var_name == name)
+            goto duplicate;
+    }
+    for (i = 0; i < fd->var_count; i++) {
+        if (fd->vars[i].var_name == name)
+            goto duplicate;
+    }
+    return 0;
+
+duplicate:
+    return js_parse_error(s, "duplicate parameter names not allowed in this context");
+}
+
+static JSAtom js_parse_destructuring_var(JSParseState *s, int tok, int is_arg)
+{
+    JSAtom name;
+
+    if (!(s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved)
+    ||  ((s->cur_func->js_mode & JS_MODE_STRICT) &&
+         (s->token.u.ident.atom == JS_ATOM_eval || s->token.u.ident.atom == JS_ATOM_arguments))) {
+        js_parse_error(s, "invalid destructuring target");
+        return JS_ATOM_NULL;
+    }
+    name = JS_DupAtom(s->ctx, s->token.u.ident.atom);
+    if (is_arg && js_parse_check_duplicate_parameter(s, name))
+        goto fail;
+    if (next_token(s))
+        goto fail;
+
+    return name;
+fail:
+    JS_FreeAtom(s->ctx, name);
+    return JS_ATOM_NULL;
+}
+
+/* Return -1 if error, 0 if no initializer, 1 if an initializer is
+   present at the top level. */
+static int js_parse_destructuring_element(JSParseState *s, int tok, int is_arg,
+                                        int hasval, int has_ellipsis,
+                                        BOOL allow_initializer)
+{
+    int label_parse, label_assign, label_done, label_lvalue, depth_lvalue;
+    int start_addr, assign_addr;
+    JSAtom prop_name, var_name;
+    int opcode, scope, tok1, skip_bits;
+    BOOL has_initializer;
+
+    if (has_ellipsis < 0) {
+        /* pre-parse destructuration target for spread detection */
+        js_parse_skip_parens_token(s, &skip_bits, FALSE);
+        has_ellipsis = skip_bits & SKIP_HAS_ELLIPSIS;
+    }
+
+    label_parse = new_label(s);
+    label_assign = new_label(s);
+
+    start_addr = s->cur_func->byte_code.size;
+    if (hasval) {
+        /* consume value from the stack */
+        emit_op(s, OP_dup);
+        emit_op(s, OP_undefined);
+        emit_op(s, OP_strict_eq);
+        emit_goto(s, OP_if_true, label_parse);
+        emit_label(s, label_assign);
+    } else {
+        emit_goto(s, OP_goto, label_parse);
+        emit_label(s, label_assign);
+        /* leave value on the stack */
+        emit_op(s, OP_dup);
+    }
+    assign_addr = s->cur_func->byte_code.size;
+    if (s->token.val == '{') {
+        if (next_token(s))
+            return -1;
+        /* throw an exception if the value cannot be converted to an object */
+        emit_op(s, OP_to_object);
+        if (has_ellipsis) {
+            /* add excludeList on stack just below src object */
+            emit_op(s, OP_object);
+            emit_op(s, OP_swap);
+        }
+        while (s->token.val != '}') {
+            int prop_type;
+            if (s->token.val == TOK_ELLIPSIS) {
+                if (!has_ellipsis) {
+                    JS_ThrowInternalError(s->ctx, "unexpected ellipsis token");
+                    return -1;
+                }
+                if (next_token(s))
+                    return -1;
+                if (tok) {
+                    var_name = js_parse_destructuring_var(s, tok, is_arg);
+                    if (var_name == JS_ATOM_NULL)
+                        return -1;
+                    opcode = OP_scope_get_var;
+                    scope = s->cur_func->scope_level;
+                    label_lvalue = -1;
+                    depth_lvalue = 0;
+                } else {
+                    if (js_parse_left_hand_side_expr(s))
+                        return -1;
+
+                    if (get_lvalue(s, &opcode, &scope, &var_name,
+                                   &label_lvalue, &depth_lvalue, FALSE, '{'))
+                        return -1;
+                }
+                if (s->token.val != '}') {
+                    js_parse_error(s, "assignment rest property must be last");
+                    goto var_error;
+                }
+                emit_op(s, OP_object);  /* target */
+                emit_op(s, OP_copy_data_properties);
+                emit_u8(s, 0 | ((depth_lvalue + 1) << 2) | ((depth_lvalue + 2) << 5));
+                goto set_val;
+            }
+            prop_type = js_parse_property_name(s, &prop_name, FALSE, TRUE, FALSE);
+            if (prop_type < 0)
+                return -1;
+            var_name = JS_ATOM_NULL;
+            opcode = OP_scope_get_var;
+            scope = s->cur_func->scope_level;
+            label_lvalue = -1;
+            depth_lvalue = 0;
+            if (prop_type == PROP_TYPE_IDENT) {
+                if (next_token(s))
+                    goto prop_error;
+                if ((s->token.val == '[' || s->token.val == '{')
+                    &&  ((tok1 = js_parse_skip_parens_token(s, &skip_bits, FALSE)) == ',' ||
+                         tok1 == '=' || tok1 == '}')) {
+                    if (prop_name == JS_ATOM_NULL) {
+                        /* computed property name on stack */
+                        if (has_ellipsis) {
+                            /* define the property in excludeList */
+                            emit_op(s, OP_to_propkey); /* avoid calling ToString twice */
+                            emit_op(s, OP_perm3); /* TOS: src excludeList prop */
+                            emit_op(s, OP_null); /* TOS: src excludeList prop null */
+                            emit_op(s, OP_define_array_el); /* TOS: src excludeList prop */
+                            emit_op(s, OP_perm3); /* TOS: excludeList src prop */
+                        }
+                        /* get the computed property from the source object */
+                        emit_op(s, OP_get_array_el2);
+                    } else {
+                        /* named property */
+                        if (has_ellipsis) {
+                            /* define the property in excludeList */
+                            emit_op(s, OP_swap); /* TOS: src excludeList */
+                            emit_op(s, OP_null); /* TOS: src excludeList null */
+                            emit_op(s, OP_define_field); /* TOS: src excludeList */
+                            emit_atom(s, prop_name);
+                            emit_op(s, OP_swap); /* TOS: excludeList src */
+                        }
+                        /* get the named property from the source object */
+                        emit_op(s, OP_get_field2);
+                        emit_u32(s, prop_name);
+                    }
+                    if (js_parse_destructuring_element(s, tok, is_arg, TRUE, -1, TRUE) < 0)
+                        return -1;
+                    if (s->token.val == '}')
+                        break;
+                    /* accept a trailing comma before the '}' */
+                    if (js_parse_expect(s, ','))
+                        return -1;
+                    continue;
+                }
+                if (prop_name == JS_ATOM_NULL) {
+                    emit_op(s, OP_to_propkey2);
+                    if (has_ellipsis) {
+                        /* define the property in excludeList */
+                        emit_op(s, OP_perm3);
+                        emit_op(s, OP_null);
+                        emit_op(s, OP_define_array_el);
+                        emit_op(s, OP_perm3);
+                    }
+                    /* source prop -- source source prop */
+                    emit_op(s, OP_dup1);
+                } else {
+                    if (has_ellipsis) {
+                        /* define the property in excludeList */
+                        emit_op(s, OP_swap);
+                        emit_op(s, OP_null);
+                        emit_op(s, OP_define_field);
+                        emit_atom(s, prop_name);
+                        emit_op(s, OP_swap);
+                    }
+                    /* source -- source source */
+                    emit_op(s, OP_dup);
+                }
+                if (tok) {
+                    var_name = js_parse_destructuring_var(s, tok, is_arg);
+                    if (var_name == JS_ATOM_NULL)
+                        goto prop_error;
+                } else {
+                    if (js_parse_left_hand_side_expr(s))
+                        goto prop_error;
+                lvalue:
+                    if (get_lvalue(s, &opcode, &scope, &var_name,
+                                   &label_lvalue, &depth_lvalue, FALSE, '{'))
+                        goto prop_error;
+                    /* swap ref and lvalue object if any */
+                    if (prop_name == JS_ATOM_NULL) {
+                        switch(depth_lvalue) {
+                        case 1:
+                            /* source prop x -> x source prop */
+                            emit_op(s, OP_rot3r);
+                            break;
+                        case 2:
+                            /* source prop x y -> x y source prop */
+                            emit_op(s, OP_swap2);   /* t p2 s p1 */
+                            break;
+                        case 3:
+                            /* source prop x y z -> x y z source prop */
+                            emit_op(s, OP_rot5l);
+                            emit_op(s, OP_rot5l);
+                            break;
+                        }
+                    } else {
+                        switch(depth_lvalue) {
+                        case 1:
+                            /* source x -> x source */
+                            emit_op(s, OP_swap);
+                            break;
+                        case 2:
+                            /* source x y -> x y source */
+                            emit_op(s, OP_rot3l);
+                            break;
+                        case 3:
+                            /* source x y z -> x y z source */
+                            emit_op(s, OP_rot4l);
+                            break;
+                        }
+                    }
+                }
+                if (prop_name == JS_ATOM_NULL) {
+                    /* computed property name on stack */
+                    /* XXX: should have OP_get_array_el2x with depth */
+                    /* source prop -- val */
+                    emit_op(s, OP_get_array_el);
+                } else {
+                    /* named property */
+                    /* XXX: should have OP_get_field2x with depth */
+                    /* source -- val */
+                    emit_op(s, OP_get_field);
+                    emit_u32(s, prop_name);
+                }
+            } else {
+                /* prop_type = PROP_TYPE_VAR, cannot be a computed property */
+                if (is_arg && js_parse_check_duplicate_parameter(s, prop_name))
+                    goto prop_error;
+                if ((s->cur_func->js_mode & JS_MODE_STRICT) &&
+                    (prop_name == JS_ATOM_eval || prop_name == JS_ATOM_arguments)) {
+                    js_parse_error(s, "invalid destructuring target");
+                    goto prop_error;
+                }
+                if (has_ellipsis) {
+                    /* define the property in excludeList */
+                    emit_op(s, OP_swap);
+                    emit_op(s, OP_null);
+                    emit_op(s, OP_define_field);
+                    emit_atom(s, prop_name);
+                    emit_op(s, OP_swap);
+                }
+                if (!tok || tok == TOK_VAR) {
+                    /* generate reference */
+                    /* source -- source source */
+                    emit_op(s, OP_dup);
+                    emit_op(s, OP_scope_get_var);
+                    emit_atom(s, prop_name);
+                    emit_u16(s, s->cur_func->scope_level);
+                    goto lvalue;
+                }
+                var_name = JS_DupAtom(s->ctx, prop_name);
+                /* source -- source val */
+                emit_op(s, OP_get_field2);
+                emit_u32(s, prop_name);
+            }
+        set_val:
+            if (tok) {
+                if (js_define_var(s, var_name, tok))
+                    goto var_error;
+                scope = s->cur_func->scope_level;
+            }
+            if (s->token.val == '=') {  /* handle optional default value */
+                int label_hasval;
+                emit_op(s, OP_dup);
+                emit_op(s, OP_undefined);
+                emit_op(s, OP_strict_eq);
+                label_hasval = emit_goto(s, OP_if_false, -1);
+                if (next_token(s))
+                    goto var_error;
+                emit_op(s, OP_drop);
+                if (js_parse_assign_expr(s))
+                    goto var_error;
+                if (opcode == OP_scope_get_var || opcode == OP_get_ref_value)
+                    set_object_name(s, var_name);
+                emit_label(s, label_hasval);
+            }
+            /* store value into lvalue object */
+            put_lvalue(s, opcode, scope, var_name, label_lvalue,
+                       PUT_LVALUE_NOKEEP_DEPTH,
+                       (tok == TOK_CONST || tok == TOK_LET));
+            if (s->token.val == '}')
+                break;
+            /* accept a trailing comma before the '}' */
+            if (js_parse_expect(s, ','))
+                return -1;
+        }
+        /* drop the source object */
+        emit_op(s, OP_drop);
+        if (has_ellipsis) {
+            emit_op(s, OP_drop); /* pop excludeList */
+        }
+        if (next_token(s))
+            return -1;
+    } else if (s->token.val == '[') {
+        BOOL has_spread;
+        int enum_depth;
+        BlockEnv block_env;
+
+        if (next_token(s))
+            return -1;
+        /* the block environment is only needed in generators in case
+           'yield' triggers a 'return' */
+        push_break_entry(s->cur_func, &block_env,
+                         JS_ATOM_NULL, -1, -1, 2);
+        block_env.has_iterator = TRUE;
+        emit_op(s, OP_for_of_start);
+        has_spread = FALSE;
+        while (s->token.val != ']') {
+            /* get the next value */
+            if (s->token.val == TOK_ELLIPSIS) {
+                if (next_token(s))
+                    return -1;
+                if (s->token.val == ',' || s->token.val == ']')
+                    return js_parse_error(s, "missing binding pattern...");
+                has_spread = TRUE;
+            }
+            if (s->token.val == ',') {
+                /* do nothing, skip the value, has_spread is false */
+                emit_op(s, OP_for_of_next);
+                emit_u8(s, 0);
+                emit_op(s, OP_drop);
+                emit_op(s, OP_drop);
+            } else if ((s->token.val == '[' || s->token.val == '{')
+                   &&  ((tok1 = js_parse_skip_parens_token(s, &skip_bits, FALSE)) == ',' ||
+                        tok1 == '=' || tok1 == ']')) {
+                if (has_spread) {
+                    if (tok1 == '=')
+                        return js_parse_error(s, "rest element cannot have a default value");
+                    js_emit_spread_code(s, 0);
+                } else {
+                    emit_op(s, OP_for_of_next);
+                    emit_u8(s, 0);
+                    emit_op(s, OP_drop);
+                }
+                if (js_parse_destructuring_element(s, tok, is_arg, TRUE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE) < 0)
+                    return -1;
+            } else {
+                var_name = JS_ATOM_NULL;
+                enum_depth = 0;
+                if (tok) {
+                    var_name = js_parse_destructuring_var(s, tok, is_arg);
+                    if (var_name == JS_ATOM_NULL)
+                        goto var_error;
+                    if (js_define_var(s, var_name, tok))
+                        goto var_error;
+                    opcode = OP_scope_get_var;
+                    scope = s->cur_func->scope_level;
+                } else {
+                    if (js_parse_left_hand_side_expr(s))
+                        return -1;
+                    if (get_lvalue(s, &opcode, &scope, &var_name,
+                                   &label_lvalue, &enum_depth, FALSE, '[')) {
+                        return -1;
+                    }
+                }
+                if (has_spread) {
+                    js_emit_spread_code(s, enum_depth);
+                } else {
+                    emit_op(s, OP_for_of_next);
+                    emit_u8(s, enum_depth);
+                    emit_op(s, OP_drop);
+                }
+                if (s->token.val == '=' && !has_spread) {
+                    /* handle optional default value */
+                    int label_hasval;
+                    emit_op(s, OP_dup);
+                    emit_op(s, OP_undefined);
+                    emit_op(s, OP_strict_eq);
+                    label_hasval = emit_goto(s, OP_if_false, -1);
+                    if (next_token(s))
+                        goto var_error;
+                    emit_op(s, OP_drop);
+                    if (js_parse_assign_expr(s))
+                        goto var_error;
+                    if (opcode == OP_scope_get_var || opcode == OP_get_ref_value)
+                        set_object_name(s, var_name);
+                    emit_label(s, label_hasval);
+                }
+                /* store value into lvalue object */
+                put_lvalue(s, opcode, scope, var_name,
+                           label_lvalue, PUT_LVALUE_NOKEEP_DEPTH,
+                           (tok == TOK_CONST || tok == TOK_LET));
+            }
+            if (s->token.val == ']')
+                break;
+            if (has_spread)
+                return js_parse_error(s, "rest element must be the last one");
+            /* accept a trailing comma before the ']' */
+            if (js_parse_expect(s, ','))
+                return -1;
+        }
+        /* close iterator object:
+           if completed, enum_obj has been replaced by undefined */
+        emit_op(s, OP_iterator_close);
+        pop_break_entry(s->cur_func);
+        if (next_token(s))
+            return -1;
+    } else {
+        return js_parse_error(s, "invalid assignment syntax");
+    }
+    if (s->token.val == '=' && allow_initializer) {
+        label_done = emit_goto(s, OP_goto, -1);
+        if (next_token(s))
+            return -1;
+        emit_label(s, label_parse);
+        if (hasval)
+            emit_op(s, OP_drop);
+        if (js_parse_assign_expr(s))
+            return -1;
+        emit_goto(s, OP_goto, label_assign);
+        emit_label(s, label_done);
+        has_initializer = TRUE;
+    } else {
+        /* normally hasval is true except if
+           js_parse_skip_parens_token() was wrong in the parsing */
+        //        assert(hasval);
+        if (!hasval) {
+            js_parse_error(s, "too complicated destructuring expression");
+            return -1;
+        }
+        /* remove test and decrement label ref count */
+        memset(s->cur_func->byte_code.buf + start_addr, OP_nop,
+               assign_addr - start_addr);
+        s->cur_func->label_slots[label_parse].ref_count--;
+        has_initializer = FALSE;
+    }
+    return has_initializer;
+
+ prop_error:
+    JS_FreeAtom(s->ctx, prop_name);
+ var_error:
+    JS_FreeAtom(s->ctx, var_name);
+    return -1;
+}
+
+typedef enum FuncCallType {
+    FUNC_CALL_NORMAL,
+    FUNC_CALL_NEW,
+    FUNC_CALL_SUPER_CTOR,
+    FUNC_CALL_TEMPLATE,
+} FuncCallType;
+
+static void optional_chain_test(JSParseState *s, int *poptional_chaining_label,
+                                int drop_count)
+{
+    int label_next, i;
+    if (*poptional_chaining_label < 0)
+        *poptional_chaining_label = new_label(s);
+   /* XXX: could be more efficient with a specific opcode */
+    emit_op(s, OP_dup);
+    emit_op(s, OP_is_undefined_or_null);
+    label_next = emit_goto(s, OP_if_false, -1);
+    for(i = 0; i < drop_count; i++)
+        emit_op(s, OP_drop);
+    emit_op(s, OP_undefined);
+    emit_goto(s, OP_goto, *poptional_chaining_label);
+    emit_label(s, label_next);
+}
+
+/* allowed parse_flags: PF_POSTFIX_CALL */
+static __exception int js_parse_postfix_expr(JSParseState *s, int parse_flags)
+{
+    FuncCallType call_type;
+    int optional_chaining_label;
+    BOOL accept_lparen = (parse_flags & PF_POSTFIX_CALL) != 0;
+
+    call_type = FUNC_CALL_NORMAL;
+    switch(s->token.val) {
+    case TOK_NUMBER:
+        {
+            JSValue val;
+            val = s->token.u.num.val;
+
+            if (JS_VALUE_GET_TAG(val) == JS_TAG_INT) {
+                emit_op(s, OP_push_i32);
+                emit_u32(s, JS_VALUE_GET_INT(val));
+            } else
+#ifdef CONFIG_BIGNUM
+            if (JS_VALUE_GET_TAG(val) == JS_TAG_BIG_FLOAT) {
+                slimb_t e;
+                int ret;
+
+                /* need a runtime conversion */
+                /* XXX: could add a cache and/or do it once at
+                   the start of the function */
+                if (emit_push_const(s, val, 0) < 0)
+                    return -1;
+                e = s->token.u.num.exponent;
+                if (e == (int32_t)e) {
+                    emit_op(s, OP_push_i32);
+                    emit_u32(s, e);
+                } else {
+                    val = JS_NewBigInt64_1(s->ctx, e);
+                    if (JS_IsException(val))
+                        return -1;
+                    ret = emit_push_const(s, val, 0);
+                    JS_FreeValue(s->ctx, val);
+                    if (ret < 0)
+                        return -1;
+                }
+                emit_op(s, OP_mul_pow10);
+            } else
+#endif
+            {
+                if (emit_push_const(s, val, 0) < 0)
+                    return -1;
+            }
+        }
+        if (next_token(s))
+            return -1;
+        break;
+    case TOK_TEMPLATE:
+        if (js_parse_template(s, 0, NULL))
+            return -1;
+        break;
+    case TOK_STRING:
+        if (emit_push_const(s, s->token.u.str.str, 1))
+            return -1;
+        if (next_token(s))
+            return -1;
+        break;
+
+    case TOK_DIV_ASSIGN:
+        s->buf_ptr -= 2;
+        goto parse_regexp;
+    case '/':
+        s->buf_ptr--;
+    parse_regexp:
+        {
+            JSValue str;
+            int ret, backtrace_flags;
+            if (!s->ctx->compile_regexp)
+                return js_parse_error(s, "RegExp are not supported");
+            /* the previous token is '/' or '/=', so no need to free */
+            if (js_parse_regexp(s))
+                return -1;
+            ret = emit_push_const(s, s->token.u.regexp.body, 0);
+            str = s->ctx->compile_regexp(s->ctx, s->token.u.regexp.body,
+                                         s->token.u.regexp.flags);
+            if (JS_IsException(str)) {
+                /* add the line number info */
+                backtrace_flags = 0;
+                if (s->cur_func && s->cur_func->backtrace_barrier)
+                    backtrace_flags = JS_BACKTRACE_FLAG_SINGLE_LEVEL;
+                build_backtrace(s->ctx, s->ctx->rt->current_exception,
+                                s->filename, s->token.line_num,
+                                backtrace_flags);
+                return -1;
+            }
+            ret = emit_push_const(s, str, 0);
+            JS_FreeValue(s->ctx, str);
+            if (ret)
+                return -1;
+            /* we use a specific opcode to be sure the correct
+               function is called (otherwise the bytecode would have
+               to be verified by the RegExp constructor) */
+            emit_op(s, OP_regexp);
+            if (next_token(s))
+                return -1;
+        }
+        break;
+    case '(':
+        if (js_parse_expr_paren(s))
+            return -1;
+        break;
+    case TOK_FUNCTION:
+        if (js_parse_function_decl(s, JS_PARSE_FUNC_EXPR,
+                                   JS_FUNC_NORMAL, JS_ATOM_NULL,
+                                   s->token.ptr, s->token.line_num))
+            return -1;
+        break;
+    case TOK_CLASS:
+        if (js_parse_class(s, TRUE, JS_PARSE_EXPORT_NONE))
+            return -1;
+        break;
+    case TOK_NULL:
+        if (next_token(s))
+            return -1;
+        emit_op(s, OP_null);
+        break;
+    case TOK_THIS:
+        if (next_token(s))
+            return -1;
+        emit_op(s, OP_scope_get_var);
+        emit_atom(s, JS_ATOM_this);
+        emit_u16(s, 0);
+        break;
+    case TOK_FALSE:
+        if (next_token(s))
+            return -1;
+        emit_op(s, OP_push_false);
+        break;
+    case TOK_TRUE:
+        if (next_token(s))
+            return -1;
+        emit_op(s, OP_push_true);
+        break;
+    case TOK_IDENT:
+        {
+            JSAtom name;
+            if (s->token.u.ident.is_reserved) {
+                return js_parse_error_reserved_identifier(s);
+            }
+            if (token_is_pseudo_keyword(s, JS_ATOM_async) &&
+                peek_token(s, TRUE) != '\n') {
+                const uint8_t *source_ptr;
+                int source_line_num;
+
+                source_ptr = s->token.ptr;
+                source_line_num = s->token.line_num;
+                if (next_token(s))
+                    return -1;
+                if (s->token.val == TOK_FUNCTION) {
+                    if (js_parse_function_decl(s, JS_PARSE_FUNC_EXPR,
+                                               JS_FUNC_ASYNC, JS_ATOM_NULL,
+                                               source_ptr, source_line_num))
+                        return -1;
+                } else {
+                    name = JS_DupAtom(s->ctx, JS_ATOM_async);
+                    goto do_get_var;
+                }
+            } else {
+                if (s->token.u.ident.atom == JS_ATOM_arguments &&
+                    !s->cur_func->arguments_allowed) {
+                    js_parse_error(s, "'arguments' identifier is not allowed in class field initializer");
+                    return -1;
+                }
+                name = JS_DupAtom(s->ctx, s->token.u.ident.atom);
+                if (next_token(s)) {  /* update line number before emitting code */
+                    JS_FreeAtom(s->ctx, name);
+                    return -1;
+                }
+            do_get_var:
+                emit_op(s, OP_scope_get_var);
+                emit_u32(s, name);
+                emit_u16(s, s->cur_func->scope_level);
+            }
+        }
+        break;
+    case '{':
+    case '[':
+        {
+            int skip_bits;
+            if (js_parse_skip_parens_token(s, &skip_bits, FALSE) == '=') {
+                if (js_parse_destructuring_element(s, 0, 0, FALSE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE) < 0)
+                    return -1;
+            } else {
+                if (s->token.val == '{') {
+                    if (js_parse_object_literal(s))
+                        return -1;
+                } else {
+                    if (js_parse_array_literal(s))
+                        return -1;
+                }
+            }
+        }
+        break;
+    case TOK_NEW:
+        if (next_token(s))
+            return -1;
+        if (s->token.val == '.') {
+            if (next_token(s))
+                return -1;
+            if (!token_is_pseudo_keyword(s, JS_ATOM_target))
+                return js_parse_error(s, "expecting target");
+            if (!s->cur_func->new_target_allowed)
+                return js_parse_error(s, "new.target only allowed within functions");
+            if (next_token(s))
+                return -1;
+            emit_op(s, OP_scope_get_var);
+            emit_atom(s, JS_ATOM_new_target);
+            emit_u16(s, 0);
+        } else {
+            if (js_parse_postfix_expr(s, 0))
+                return -1;
+            accept_lparen = TRUE;
+            if (s->token.val != '(') {
+                /* new operator on an object */
+                emit_op(s, OP_dup);
+                emit_op(s, OP_call_constructor);
+                emit_u16(s, 0);
+            } else {
+                call_type = FUNC_CALL_NEW;
+            }
+        }
+        break;
+    case TOK_SUPER:
+        if (next_token(s))
+            return -1;
+        if (s->token.val == '(') {
+            if (!s->cur_func->super_call_allowed)
+                return js_parse_error(s, "super() is only valid in a derived class constructor");
+            call_type = FUNC_CALL_SUPER_CTOR;
+        } else if (s->token.val == '.' || s->token.val == '[') {
+            if (!s->cur_func->super_allowed)
+                return js_parse_error(s, "'super' is only valid in a method");
+            emit_op(s, OP_scope_get_var);
+            emit_atom(s, JS_ATOM_this);
+            emit_u16(s, 0);
+            emit_op(s, OP_scope_get_var);
+            emit_atom(s, JS_ATOM_home_object);
+            emit_u16(s, 0);
+            emit_op(s, OP_get_super);
+        } else {
+            return js_parse_error(s, "invalid use of 'super'");
+        }
+        break;
+    case TOK_IMPORT:
+        if (next_token(s))
+            return -1;
+        if (s->token.val == '.') {
+            if (next_token(s))
+                return -1;
+            if (!token_is_pseudo_keyword(s, JS_ATOM_meta))
+                return js_parse_error(s, "meta expected");
+            if (!s->is_module)
+                return js_parse_error(s, "import.meta only valid in module code");
+            if (next_token(s))
+                return -1;
+            emit_op(s, OP_special_object);
+            emit_u8(s, OP_SPECIAL_OBJECT_IMPORT_META);
+        } else {
+            if (js_parse_expect(s, '('))
+                return -1;
+            if (!accept_lparen)
+                return js_parse_error(s, "invalid use of 'import()'");
+            if (js_parse_assign_expr(s))
+                return -1;
+            if (js_parse_expect(s, ')'))
+                return -1;
+            emit_op(s, OP_import);
+        }
+        break;
+    default:
+        return js_parse_error(s, "unexpected token in expression: '%.*s'",
+                              (int)(s->buf_ptr - s->token.ptr), s->token.ptr);
+    }
+
+    optional_chaining_label = -1;
+    for(;;) {
+        JSFunctionDef *fd = s->cur_func;
+        BOOL has_optional_chain = FALSE;
+
+        if (s->token.val == TOK_QUESTION_MARK_DOT) {
+            /* optional chaining */
+            if (next_token(s))
+                return -1;
+            has_optional_chain = TRUE;
+            if (s->token.val == '(' && accept_lparen) {
+                goto parse_func_call;
+            } else if (s->token.val == '[') {
+                goto parse_array_access;
+            } else {
+                goto parse_property;
+            }
+        } else if (s->token.val == TOK_TEMPLATE &&
+                   call_type == FUNC_CALL_NORMAL) {
+            if (optional_chaining_label >= 0) {
+                return js_parse_error(s, "template literal cannot appear in an optional chain");
+            }
+            call_type = FUNC_CALL_TEMPLATE;
+            goto parse_func_call2;
+        } else if (s->token.val == '(' && accept_lparen) {
+            int opcode, arg_count, drop_count;
+
+            /* function call */
+        parse_func_call:
+            if (next_token(s))
+                return -1;
+
+            if (call_type == FUNC_CALL_NORMAL) {
+            parse_func_call2:
+                switch(opcode = get_prev_opcode(fd)) {
+                case OP_get_field:
+                    /* keep the object on the stack */
+                    fd->byte_code.buf[fd->last_opcode_pos] = OP_get_field2;
+                    drop_count = 2;
+                    break;
+                case OP_get_field_opt_chain:
+                    {
+                        int opt_chain_label, next_label;
+                        opt_chain_label = get_u32(fd->byte_code.buf +
+                                                  fd->last_opcode_pos + 1 + 4 + 1);
+                        /* keep the object on the stack */
+                        fd->byte_code.buf[fd->last_opcode_pos] = OP_get_field2;
+                        fd->byte_code.size = fd->last_opcode_pos + 1 + 4;
+                        next_label = emit_goto(s, OP_goto, -1);
+                        emit_label(s, opt_chain_label);
+                        /* need an additional undefined value for the
+                           case where the optional field does not
+                           exists */
+                        emit_op(s, OP_undefined);
+                        emit_label(s, next_label);
+                        drop_count = 2;
+                        opcode = OP_get_field;
+                    }
+                    break;
+                case OP_scope_get_private_field:
+                    /* keep the object on the stack */
+                    fd->byte_code.buf[fd->last_opcode_pos] = OP_scope_get_private_field2;
+                    drop_count = 2;
+                    break;
+                case OP_get_array_el:
+                    /* keep the object on the stack */
+                    fd->byte_code.buf[fd->last_opcode_pos] = OP_get_array_el2;
+                    drop_count = 2;
+                    break;
+                case OP_get_array_el_opt_chain:
+                    {
+                        int opt_chain_label, next_label;
+                        opt_chain_label = get_u32(fd->byte_code.buf +
+                                                  fd->last_opcode_pos + 1 + 1);
+                        /* keep the object on the stack */
+                        fd->byte_code.buf[fd->last_opcode_pos] = OP_get_array_el2;
+                        fd->byte_code.size = fd->last_opcode_pos + 1;
+                        next_label = emit_goto(s, OP_goto, -1);
+                        emit_label(s, opt_chain_label);
+                        /* need an additional undefined value for the
+                           case where the optional field does not
+                           exists */
+                        emit_op(s, OP_undefined);
+                        emit_label(s, next_label);
+                        drop_count = 2;
+                        opcode = OP_get_array_el;
+                    }
+                    break;
+                case OP_scope_get_var:
+                    {
+                        JSAtom name;
+                        int scope;
+                        name = get_u32(fd->byte_code.buf + fd->last_opcode_pos + 1);
+                        scope = get_u16(fd->byte_code.buf + fd->last_opcode_pos + 5);
+                        if (name == JS_ATOM_eval && call_type == FUNC_CALL_NORMAL && !has_optional_chain) {
+                            /* direct 'eval' */
+                            opcode = OP_eval;
+                        } else {
+                            /* verify if function name resolves to a simple
+                               get_loc/get_arg: a function call inside a `with`
+                               statement can resolve to a method call of the
+                               `with` context object
+                             */
+                            /* XXX: always generate the OP_scope_get_ref
+                               and remove it in variable resolution
+                               pass ? */
+                            if (has_with_scope(fd, scope)) {
+                                opcode = OP_scope_get_ref;
+                                fd->byte_code.buf[fd->last_opcode_pos] = opcode;
+                            }
+                        }
+                        drop_count = 1;
+                    }
+                    break;
+                case OP_get_super_value:
+                    fd->byte_code.buf[fd->last_opcode_pos] = OP_get_array_el;
+                    /* on stack: this func_obj */
+                    opcode = OP_get_array_el;
+                    drop_count = 2;
+                    break;
+                default:
+                    opcode = OP_invalid;
+                    drop_count = 1;
+                    break;
+                }
+                if (has_optional_chain) {
+                    optional_chain_test(s, &optional_chaining_label,
+                                        drop_count);
+                }
+            } else {
+                opcode = OP_invalid;
+            }
+
+            if (call_type == FUNC_CALL_TEMPLATE) {
+                if (js_parse_template(s, 1, &arg_count))
+                    return -1;
+                goto emit_func_call;
+            } else if (call_type == FUNC_CALL_SUPER_CTOR) {
+                emit_op(s, OP_scope_get_var);
+                emit_atom(s, JS_ATOM_this_active_func);
+                emit_u16(s, 0);
+
+                emit_op(s, OP_get_super);
+
+                emit_op(s, OP_scope_get_var);
+                emit_atom(s, JS_ATOM_new_target);
+                emit_u16(s, 0);
+            } else if (call_type == FUNC_CALL_NEW) {
+                emit_op(s, OP_dup); /* new.target = function */
+            }
+
+            /* parse arguments */
+            arg_count = 0;
+            while (s->token.val != ')') {
+                if (arg_count >= 65535) {
+                    return js_parse_error(s, "Too many call arguments");
+                }
+                if (s->token.val == TOK_ELLIPSIS)
+                    break;
+                if (js_parse_assign_expr(s))
+                    return -1;
+                arg_count++;
+                if (s->token.val == ')')
+                    break;
+                /* accept a trailing comma before the ')' */
+                if (js_parse_expect(s, ','))
+                    return -1;
+            }
+            if (s->token.val == TOK_ELLIPSIS) {
+                emit_op(s, OP_array_from);
+                emit_u16(s, arg_count);
+                emit_op(s, OP_push_i32);
+                emit_u32(s, arg_count);
+
+                /* on stack: array idx */
+                while (s->token.val != ')') {
+                    if (s->token.val == TOK_ELLIPSIS) {
+                        if (next_token(s))
+                            return -1;
+                        if (js_parse_assign_expr(s))
+                            return -1;
+#if 1
+                        /* XXX: could pass is_last indicator? */
+                        emit_op(s, OP_append);
+#else
+                        int label_next, label_done;
+                        label_next = new_label(s);
+                        label_done = new_label(s);
+                        /* push enumerate object below array/idx pair */
+                        emit_op(s, OP_for_of_start);
+                        emit_op(s, OP_rot5l);
+                        emit_op(s, OP_rot5l);
+                        emit_label(s, label_next);
+                        /* on stack: enum_rec array idx */
+                        emit_op(s, OP_for_of_next);
+                        emit_u8(s, 2);
+                        emit_goto(s, OP_if_true, label_done);
+                        /* append element */
+                        /* enum_rec array idx val -> enum_rec array new_idx */
+                        emit_op(s, OP_define_array_el);
+                        emit_op(s, OP_inc);
+                        emit_goto(s, OP_goto, label_next);
+                        emit_label(s, label_done);
+                        /* close enumeration, drop enum_rec and idx */
+                        emit_op(s, OP_drop); /* drop undef */
+                        emit_op(s, OP_nip1); /* drop enum_rec */
+                        emit_op(s, OP_nip1);
+                        emit_op(s, OP_nip1);
+#endif
+                    } else {
+                        if (js_parse_assign_expr(s))
+                            return -1;
+                        /* array idx val */
+                        emit_op(s, OP_define_array_el);
+                        emit_op(s, OP_inc);
+                    }
+                    if (s->token.val == ')')
+                        break;
+                    /* accept a trailing comma before the ')' */
+                    if (js_parse_expect(s, ','))
+                        return -1;
+                }
+                if (next_token(s))
+                    return -1;
+                /* drop the index */
+                emit_op(s, OP_drop);
+
+                /* apply function call */
+                switch(opcode) {
+                case OP_get_field:
+                case OP_scope_get_private_field:
+                case OP_get_array_el:
+                case OP_scope_get_ref:
+                    /* obj func array -> func obj array */
+                    emit_op(s, OP_perm3);
+                    emit_op(s, OP_apply);
+                    emit_u16(s, call_type == FUNC_CALL_NEW);
+                    break;
+                case OP_eval:
+                    emit_op(s, OP_apply_eval);
+                    emit_u16(s, fd->scope_level);
+                    fd->has_eval_call = TRUE;
+                    break;
+                default:
+                    if (call_type == FUNC_CALL_SUPER_CTOR) {
+                        emit_op(s, OP_apply);
+                        emit_u16(s, 1);
+                        /* set the 'this' value */
+                        emit_op(s, OP_dup);
+                        emit_op(s, OP_scope_put_var_init);
+                        emit_atom(s, JS_ATOM_this);
+                        emit_u16(s, 0);
+
+                        emit_class_field_init(s);
+                    } else if (call_type == FUNC_CALL_NEW) {
+                        /* obj func array -> func obj array */
+                        emit_op(s, OP_perm3);
+                        emit_op(s, OP_apply);
+                        emit_u16(s, 1);
+                    } else {
+                        /* func array -> func undef array */
+                        emit_op(s, OP_undefined);
+                        emit_op(s, OP_swap);
+                        emit_op(s, OP_apply);
+                        emit_u16(s, 0);
+                    }
+                    break;
+                }
+            } else {
+                if (next_token(s))
+                    return -1;
+            emit_func_call:
+                switch(opcode) {
+                case OP_get_field:
+                case OP_scope_get_private_field:
+                case OP_get_array_el:
+                case OP_scope_get_ref:
+                    emit_op(s, OP_call_method);
+                    emit_u16(s, arg_count);
+                    break;
+                case OP_eval:
+                    emit_op(s, OP_eval);
+                    emit_u16(s, arg_count);
+                    emit_u16(s, fd->scope_level);
+                    fd->has_eval_call = TRUE;
+                    break;
+                default:
+                    if (call_type == FUNC_CALL_SUPER_CTOR) {
+                        emit_op(s, OP_call_constructor);
+                        emit_u16(s, arg_count);
+
+                        /* set the 'this' value */
+                        emit_op(s, OP_dup);
+                        emit_op(s, OP_scope_put_var_init);
+                        emit_atom(s, JS_ATOM_this);
+                        emit_u16(s, 0);
+
+                        emit_class_field_init(s);
+                    } else if (call_type == FUNC_CALL_NEW) {
+                        emit_op(s, OP_call_constructor);
+                        emit_u16(s, arg_count);
+                    } else {
+                        emit_op(s, OP_call);
+                        emit_u16(s, arg_count);
+                    }
+                    break;
+                }
+            }
+            call_type = FUNC_CALL_NORMAL;
+        } else if (s->token.val == '.') {
+            if (next_token(s))
+                return -1;
+        parse_property:
+            if (s->token.val == TOK_PRIVATE_NAME) {
+                /* private class field */
+                if (get_prev_opcode(fd) == OP_get_super) {
+                    return js_parse_error(s, "private class field forbidden after super");
+                }
+                if (has_optional_chain) {
+                    optional_chain_test(s, &optional_chaining_label, 1);
+                }
+                emit_op(s, OP_scope_get_private_field);
+                emit_atom(s, s->token.u.ident.atom);
+                emit_u16(s, s->cur_func->scope_level);
+            } else {
+                if (!token_is_ident(s->token.val)) {
+                    return js_parse_error(s, "expecting field name");
+                }
+                if (get_prev_opcode(fd) == OP_get_super) {
+                    JSValue val;
+                    int ret;
+                    val = JS_AtomToValue(s->ctx, s->token.u.ident.atom);
+                    ret = emit_push_const(s, val, 1);
+                    JS_FreeValue(s->ctx, val);
+                    if (ret)
+                        return -1;
+                    emit_op(s, OP_get_super_value);
+                } else {
+                    if (has_optional_chain) {
+                        optional_chain_test(s, &optional_chaining_label, 1);
+                    }
+                    emit_op(s, OP_get_field);
+                    emit_atom(s, s->token.u.ident.atom);
+                }
+            }
+            if (next_token(s))
+                return -1;
+        } else if (s->token.val == '[') {
+            int prev_op;
+
+        parse_array_access:
+            prev_op = get_prev_opcode(fd);
+            if (has_optional_chain) {
+                optional_chain_test(s, &optional_chaining_label, 1);
+            }
+            if (next_token(s))
+                return -1;
+            if (js_parse_expr(s))
+                return -1;
+            if (js_parse_expect(s, ']'))
+                return -1;
+            if (prev_op == OP_get_super) {
+                emit_op(s, OP_get_super_value);
+            } else {
+                emit_op(s, OP_get_array_el);
+            }
+        } else {
+            break;
+        }
+    }
+    if (optional_chaining_label >= 0) {
+        JSFunctionDef *fd = s->cur_func;
+        int opcode;
+        emit_label_raw(s, optional_chaining_label);
+        /* modify the last opcode so that it is an indicator of an
+           optional chain */
+        opcode = get_prev_opcode(fd);
+        if (opcode == OP_get_field || opcode == OP_get_array_el) {
+            if (opcode == OP_get_field)
+                opcode = OP_get_field_opt_chain;
+            else
+                opcode = OP_get_array_el_opt_chain;
+            fd->byte_code.buf[fd->last_opcode_pos] = opcode;
+        } else {
+            fd->last_opcode_pos = -1;
+        }
+    }
+    return 0;
+}
+
+static __exception int js_parse_delete(JSParseState *s)
+{
+    JSFunctionDef *fd = s->cur_func;
+    JSAtom name;
+    int opcode;
+
+    if (next_token(s))
+        return -1;
+    if (js_parse_unary(s, PF_POW_FORBIDDEN))
+        return -1;
+    switch(opcode = get_prev_opcode(fd)) {
+    case OP_get_field:
+    case OP_get_field_opt_chain:
+        {
+            JSValue val;
+            int ret, opt_chain_label, next_label;
+            if (opcode == OP_get_field_opt_chain) {
+                opt_chain_label = get_u32(fd->byte_code.buf +
+                                          fd->last_opcode_pos + 1 + 4 + 1);
+            } else {
+                opt_chain_label = -1;
+            }
+            name = get_u32(fd->byte_code.buf + fd->last_opcode_pos + 1);
+            fd->byte_code.size = fd->last_opcode_pos;
+            val = JS_AtomToValue(s->ctx, name);
+            ret = emit_push_const(s, val, 1);
+            JS_FreeValue(s->ctx, val);
+            JS_FreeAtom(s->ctx, name);
+            if (ret)
+                return ret;
+            emit_op(s, OP_delete);
+            if (opt_chain_label >= 0) {
+                next_label = emit_goto(s, OP_goto, -1);
+                emit_label(s, opt_chain_label);
+                /* if the optional chain is not taken, return 'true' */
+                emit_op(s, OP_drop);
+                emit_op(s, OP_push_true);
+                emit_label(s, next_label);
+            }
+            fd->last_opcode_pos = -1;
+        }
+        break;
+    case OP_get_array_el:
+        fd->byte_code.size = fd->last_opcode_pos;
+        fd->last_opcode_pos = -1;
+        emit_op(s, OP_delete);
+        break;
+    case OP_get_array_el_opt_chain:
+        {
+            int opt_chain_label, next_label;
+            opt_chain_label = get_u32(fd->byte_code.buf +
+                                      fd->last_opcode_pos + 1 + 1);
+            fd->byte_code.size = fd->last_opcode_pos;
+            emit_op(s, OP_delete);
+            next_label = emit_goto(s, OP_goto, -1);
+            emit_label(s, opt_chain_label);
+            /* if the optional chain is not taken, return 'true' */
+            emit_op(s, OP_drop);
+            emit_op(s, OP_push_true);
+            emit_label(s, next_label);
+            fd->last_opcode_pos = -1;
+        }
+        break;
+    case OP_scope_get_var:
+        /* 'delete this': this is not a reference */
+        name = get_u32(fd->byte_code.buf + fd->last_opcode_pos + 1);
+        if (name == JS_ATOM_this || name == JS_ATOM_new_target)
+            goto ret_true;
+        if (fd->js_mode & JS_MODE_STRICT) {
+            return js_parse_error(s, "cannot delete a direct reference in strict mode");
+        } else {
+            fd->byte_code.buf[fd->last_opcode_pos] = OP_scope_delete_var;
+        }
+        break;
+    case OP_scope_get_private_field:
+        return js_parse_error(s, "cannot delete a private class field");
+    case OP_get_super_value:
+        fd->byte_code.size = fd->last_opcode_pos;
+        fd->last_opcode_pos = -1;
+        emit_op(s, OP_throw_error);
+        emit_atom(s, JS_ATOM_NULL);
+        emit_u8(s, JS_THROW_ERROR_DELETE_SUPER);
+        break;
+    default:
+    ret_true:
+        emit_op(s, OP_drop);
+        emit_op(s, OP_push_true);
+        break;
+    }
+    return 0;
+}
+
+/* allowed parse_flags: PF_POW_ALLOWED, PF_POW_FORBIDDEN */
+static __exception int js_parse_unary(JSParseState *s, int parse_flags)
+{
+    int op;
+
+    switch(s->token.val) {
+    case '+':
+    case '-':
+    case '!':
+    case '~':
+    case TOK_VOID:
+        op = s->token.val;
+        if (next_token(s))
+            return -1;
+        if (js_parse_unary(s, PF_POW_FORBIDDEN))
+            return -1;
+        switch(op) {
+        case '-':
+            emit_op(s, OP_neg);
+            break;
+        case '+':
+            emit_op(s, OP_plus);
+            break;
+        case '!':
+            emit_op(s, OP_lnot);
+            break;
+        case '~':
+            emit_op(s, OP_not);
+            break;
+        case TOK_VOID:
+            emit_op(s, OP_drop);
+            emit_op(s, OP_undefined);
+            break;
+        default:
+            abort();
+        }
+        parse_flags = 0;
+        break;
+    case TOK_DEC:
+    case TOK_INC:
+        {
+            int opcode, op, scope, label;
+            JSAtom name;
+            op = s->token.val;
+            if (next_token(s))
+                return -1;
+            if (js_parse_unary(s, 0))
+                return -1;
+            if (get_lvalue(s, &opcode, &scope, &name, &label, NULL, TRUE, op))
+                return -1;
+            emit_op(s, OP_dec + op - TOK_DEC);
+            put_lvalue(s, opcode, scope, name, label, PUT_LVALUE_KEEP_TOP,
+                       FALSE);
+        }
+        break;
+    case TOK_TYPEOF:
+        {
+            JSFunctionDef *fd;
+            if (next_token(s))
+                return -1;
+            if (js_parse_unary(s, PF_POW_FORBIDDEN))
+                return -1;
+            /* reference access should not return an exception, so we
+               patch the get_var */
+            fd = s->cur_func;
+            if (get_prev_opcode(fd) == OP_scope_get_var) {
+                fd->byte_code.buf[fd->last_opcode_pos] = OP_scope_get_var_undef;
+            }
+            emit_op(s, OP_typeof);
+            parse_flags = 0;
+        }
+        break;
+    case TOK_DELETE:
+        if (js_parse_delete(s))
+            return -1;
+        parse_flags = 0;
+        break;
+    case TOK_AWAIT:
+        if (!(s->cur_func->func_kind & JS_FUNC_ASYNC))
+            return js_parse_error(s, "unexpected 'await' keyword");
+        if (!s->cur_func->in_function_body)
+            return js_parse_error(s, "await in default expression");
+        if (next_token(s))
+            return -1;
+        if (js_parse_unary(s, PF_POW_FORBIDDEN))
+            return -1;
+        s->cur_func->has_await = TRUE;
+        emit_op(s, OP_await);
+        parse_flags = 0;
+        break;
+    default:
+        if (js_parse_postfix_expr(s, PF_POSTFIX_CALL))
+            return -1;
+        if (!s->got_lf &&
+            (s->token.val == TOK_DEC || s->token.val == TOK_INC)) {
+            int opcode, op, scope, label;
+            JSAtom name;
+            op = s->token.val;
+            if (get_lvalue(s, &opcode, &scope, &name, &label, NULL, TRUE, op))
+                return -1;
+            emit_op(s, OP_post_dec + op - TOK_DEC);
+            put_lvalue(s, opcode, scope, name, label, PUT_LVALUE_KEEP_SECOND,
+                       FALSE);
+            if (next_token(s))
+                return -1;
+        }
+        break;
+    }
+    if (parse_flags & (PF_POW_ALLOWED | PF_POW_FORBIDDEN)) {
+#ifdef CONFIG_BIGNUM
+        if (s->token.val == TOK_POW || s->token.val == TOK_MATH_POW) {
+            /* Extended exponentiation syntax rules: we extend the ES7
+               grammar in order to have more intuitive semantics:
+               -2**2 evaluates to -4. */
+            if (!(s->cur_func->js_mode & JS_MODE_MATH)) {
+                if (parse_flags & PF_POW_FORBIDDEN) {
+                    JS_ThrowSyntaxError(s->ctx, "unparenthesized unary expression can't appear on the left-hand side of '**'");
+                    return -1;
+                }
+            }
+            if (next_token(s))
+                return -1;
+            if (js_parse_unary(s, PF_POW_ALLOWED))
+                return -1;
+            emit_op(s, OP_pow);
+        }
+#else
+        if (s->token.val == TOK_POW) {
+            /* Strict ES7 exponentiation syntax rules: To solve
+               conficting semantics between different implementations
+               regarding the precedence of prefix operators and the
+               postifx exponential, ES7 specifies that -2**2 is a
+               syntax error. */
+            if (parse_flags & PF_POW_FORBIDDEN) {
+                JS_ThrowSyntaxError(s->ctx, "unparenthesized unary expression can't appear on the left-hand side of '**'");
+                return -1;
+            }
+            if (next_token(s))
+                return -1;
+            if (js_parse_unary(s, PF_POW_ALLOWED))
+                return -1;
+            emit_op(s, OP_pow);
+        }
+#endif
+    }
+    return 0;
+}
+
+/* allowed parse_flags: PF_IN_ACCEPTED */
+static __exception int js_parse_expr_binary(JSParseState *s, int level,
+                                            int parse_flags)
+{
+    int op, opcode;
+
+    if (level == 0) {
+        return js_parse_unary(s, PF_POW_ALLOWED);
+    } else if (s->token.val == TOK_PRIVATE_NAME &&
+               (parse_flags & PF_IN_ACCEPTED) && level == 4 &&
+               peek_token(s, FALSE) == TOK_IN) {
+        JSAtom atom;
+
+        atom = JS_DupAtom(s->ctx, s->token.u.ident.atom);
+        if (next_token(s))
+            goto fail_private_in;
+        if (s->token.val != TOK_IN)
+            goto fail_private_in;
+        if (next_token(s))
+            goto fail_private_in;
+        if (js_parse_expr_binary(s, level - 1, parse_flags)) {
+        fail_private_in:
+            JS_FreeAtom(s->ctx, atom);
+            return -1;
+        }
+        emit_op(s, OP_scope_in_private_field);
+        emit_atom(s, atom);
+        emit_u16(s, s->cur_func->scope_level);
+        JS_FreeAtom(s->ctx, atom);
+        return 0;
+    } else {
+        if (js_parse_expr_binary(s, level - 1, parse_flags))
+            return -1;
+    }
+    for(;;) {
+        op = s->token.val;
+        switch(level) {
+        case 1:
+            switch(op) {
+            case '*':
+                opcode = OP_mul;
+                break;
+            case '/':
+                opcode = OP_div;
+                break;
+            case '%':
+#ifdef CONFIG_BIGNUM
+                if (s->cur_func->js_mode & JS_MODE_MATH)
+                    opcode = OP_math_mod;
+                else
+#endif
+                    opcode = OP_mod;
+                break;
+            default:
+                return 0;
+            }
+            break;
+        case 2:
+            switch(op) {
+            case '+':
+                opcode = OP_add;
+                break;
+            case '-':
+                opcode = OP_sub;
+                break;
+            default:
+                return 0;
+            }
+            break;
+        case 3:
+            switch(op) {
+            case TOK_SHL:
+                opcode = OP_shl;
+                break;
+            case TOK_SAR:
+                opcode = OP_sar;
+                break;
+            case TOK_SHR:
+                opcode = OP_shr;
+                break;
+            default:
+                return 0;
+            }
+            break;
+        case 4:
+            switch(op) {
+            case '<':
+                opcode = OP_lt;
+                break;
+            case '>':
+                opcode = OP_gt;
+                break;
+            case TOK_LTE:
+                opcode = OP_lte;
+                break;
+            case TOK_GTE:
+                opcode = OP_gte;
+                break;
+            case TOK_INSTANCEOF:
+                opcode = OP_instanceof;
+                break;
+            case TOK_IN:
+                if (parse_flags & PF_IN_ACCEPTED) {
+                    opcode = OP_in;
+                } else {
+                    return 0;
+                }
+                break;
+            default:
+                return 0;
+            }
+            break;
+        case 5:
+            switch(op) {
+            case TOK_EQ:
+                opcode = OP_eq;
+                break;
+            case TOK_NEQ:
+                opcode = OP_neq;
+                break;
+            case TOK_STRICT_EQ:
+                opcode = OP_strict_eq;
+                break;
+            case TOK_STRICT_NEQ:
+                opcode = OP_strict_neq;
+                break;
+            default:
+                return 0;
+            }
+            break;
+        case 6:
+            switch(op) {
+            case '&':
+                opcode = OP_and;
+                break;
+            default:
+                return 0;
+            }
+            break;
+        case 7:
+            switch(op) {
+            case '^':
+                opcode = OP_xor;
+                break;
+            default:
+                return 0;
+            }
+            break;
+        case 8:
+            switch(op) {
+            case '|':
+                opcode = OP_or;
+                break;
+            default:
+                return 0;
+            }
+            break;
+        default:
+            abort();
+        }
+        if (next_token(s))
+            return -1;
+        if (js_parse_expr_binary(s, level - 1, parse_flags))
+            return -1;
+        emit_op(s, opcode);
+    }
+    return 0;
+}
+
+/* allowed parse_flags: PF_IN_ACCEPTED */
+static __exception int js_parse_logical_and_or(JSParseState *s, int op,
+                                               int parse_flags)
+{
+    int label1;
+
+    if (op == TOK_LAND) {
+        if (js_parse_expr_binary(s, 8, parse_flags))
+            return -1;
+    } else {
+        if (js_parse_logical_and_or(s, TOK_LAND, parse_flags))
+            return -1;
+    }
+    if (s->token.val == op) {
+        label1 = new_label(s);
+
+        for(;;) {
+            if (next_token(s))
+                return -1;
+            emit_op(s, OP_dup);
+            emit_goto(s, op == TOK_LAND ? OP_if_false : OP_if_true, label1);
+            emit_op(s, OP_drop);
+
+            if (op == TOK_LAND) {
+                if (js_parse_expr_binary(s, 8, parse_flags))
+                    return -1;
+            } else {
+                if (js_parse_logical_and_or(s, TOK_LAND,
+                                            parse_flags))
+                    return -1;
+            }
+            if (s->token.val != op) {
+                if (s->token.val == TOK_DOUBLE_QUESTION_MARK)
+                    return js_parse_error(s, "cannot mix ?? with && or ||");
+                break;
+            }
+        }
+
+        emit_label(s, label1);
+    }
+    return 0;
+}
+
+static __exception int js_parse_coalesce_expr(JSParseState *s, int parse_flags)
+{
+    int label1;
+
+    if (js_parse_logical_and_or(s, TOK_LOR, parse_flags))
+        return -1;
+    if (s->token.val == TOK_DOUBLE_QUESTION_MARK) {
+        label1 = new_label(s);
+        for(;;) {
+            if (next_token(s))
+                return -1;
+
+            emit_op(s, OP_dup);
+            emit_op(s, OP_is_undefined_or_null);
+            emit_goto(s, OP_if_false, label1);
+            emit_op(s, OP_drop);
+
+            if (js_parse_expr_binary(s, 8, parse_flags))
+                return -1;
+            if (s->token.val != TOK_DOUBLE_QUESTION_MARK)
+                break;
+        }
+        emit_label(s, label1);
+    }
+    return 0;
+}
+
+/* allowed parse_flags: PF_IN_ACCEPTED */
+static __exception int js_parse_cond_expr(JSParseState *s, int parse_flags)
+{
+    int label1, label2;
+
+    if (js_parse_coalesce_expr(s, parse_flags))
+        return -1;
+    if (s->token.val == '?') {
+        if (next_token(s))
+            return -1;
+        label1 = emit_goto(s, OP_if_false, -1);
+
+        if (js_parse_assign_expr(s))
+            return -1;
+        if (js_parse_expect(s, ':'))
+            return -1;
+
+        label2 = emit_goto(s, OP_goto, -1);
+
+        emit_label(s, label1);
+
+        if (js_parse_assign_expr2(s, parse_flags & PF_IN_ACCEPTED))
+            return -1;
+
+        emit_label(s, label2);
+    }
+    return 0;
+}
+
+static void emit_return(JSParseState *s, BOOL hasval);
+
+/* allowed parse_flags: PF_IN_ACCEPTED */
+static __exception int js_parse_assign_expr2(JSParseState *s, int parse_flags)
+{
+    int opcode, op, scope;
+    JSAtom name0 = JS_ATOM_NULL;
+    JSAtom name;
+
+    if (s->token.val == TOK_YIELD) {
+        BOOL is_star = FALSE, is_async;
+
+        if (!(s->cur_func->func_kind & JS_FUNC_GENERATOR))
+            return js_parse_error(s, "unexpected 'yield' keyword");
+        if (!s->cur_func->in_function_body)
+            return js_parse_error(s, "yield in default expression");
+        if (next_token(s))
+            return -1;
+        /* XXX: is there a better method to detect 'yield' without
+           parameters ? */
+        if (s->token.val != ';' && s->token.val != ')' &&
+            s->token.val != ']' && s->token.val != '}' &&
+            s->token.val != ',' && s->token.val != ':' && !s->got_lf) {
+            if (s->token.val == '*') {
+                is_star = TRUE;
+                if (next_token(s))
+                    return -1;
+            }
+            if (js_parse_assign_expr2(s, parse_flags))
+                return -1;
+        } else {
+            emit_op(s, OP_undefined);
+        }
+        is_async = (s->cur_func->func_kind == JS_FUNC_ASYNC_GENERATOR);
+
+        if (is_star) {
+            int label_loop, label_return, label_next;
+            int label_return1, label_yield, label_throw, label_throw1;
+            int label_throw2;
+
+            label_loop = new_label(s);
+            label_yield = new_label(s);
+
+            emit_op(s, is_async ? OP_for_await_of_start : OP_for_of_start);
+
+            /* remove the catch offset (XXX: could avoid pushing back
+               undefined) */
+            emit_op(s, OP_drop);
+            emit_op(s, OP_undefined);
+
+            emit_op(s, OP_undefined); /* initial value */
+
+            emit_label(s, label_loop);
+            emit_op(s, OP_iterator_next);
+            if (is_async)
+                emit_op(s, OP_await);
+            emit_op(s, OP_iterator_check_object);
+            emit_op(s, OP_get_field2);
+            emit_atom(s, JS_ATOM_done);
+            label_next = emit_goto(s, OP_if_true, -1); /* end of loop */
+            emit_label(s, label_yield);
+            if (is_async) {
+                /* OP_async_yield_star takes the value as parameter */
+                emit_op(s, OP_get_field);
+                emit_atom(s, JS_ATOM_value);
+                emit_op(s, OP_async_yield_star);
+            } else {
+                /* OP_yield_star takes (value, done) as parameter */
+                emit_op(s, OP_yield_star);
+            }
+            emit_op(s, OP_dup);
+            label_return = emit_goto(s, OP_if_true, -1);
+            emit_op(s, OP_drop);
+            emit_goto(s, OP_goto, label_loop);
+
+            emit_label(s, label_return);
+            emit_op(s, OP_push_i32);
+            emit_u32(s, 2);
+            emit_op(s, OP_strict_eq);
+            label_throw = emit_goto(s, OP_if_true, -1);
+
+            /* return handling */
+            if (is_async)
+                emit_op(s, OP_await);
+            emit_op(s, OP_iterator_call);
+            emit_u8(s, 0);
+            label_return1 = emit_goto(s, OP_if_true, -1);
+            if (is_async)
+                emit_op(s, OP_await);
+            emit_op(s, OP_iterator_check_object);
+            emit_op(s, OP_get_field2);
+            emit_atom(s, JS_ATOM_done);
+            emit_goto(s, OP_if_false, label_yield);
+
+            emit_op(s, OP_get_field);
+            emit_atom(s, JS_ATOM_value);
+
+            emit_label(s, label_return1);
+            emit_op(s, OP_nip);
+            emit_op(s, OP_nip);
+            emit_op(s, OP_nip);
+            emit_return(s, TRUE);
+
+            /* throw handling */
+            emit_label(s, label_throw);
+            emit_op(s, OP_iterator_call);
+            emit_u8(s, 1);
+            label_throw1 = emit_goto(s, OP_if_true, -1);
+            if (is_async)
+                emit_op(s, OP_await);
+            emit_op(s, OP_iterator_check_object);
+            emit_op(s, OP_get_field2);
+            emit_atom(s, JS_ATOM_done);
+            emit_goto(s, OP_if_false, label_yield);
+            emit_goto(s, OP_goto, label_next);
+            /* close the iterator and throw a type error exception */
+            emit_label(s, label_throw1);
+            emit_op(s, OP_iterator_call);
+            emit_u8(s, 2);
+            label_throw2 = emit_goto(s, OP_if_true, -1);
+            if (is_async)
+                emit_op(s, OP_await);
+            emit_label(s, label_throw2);
+
+            emit_op(s, OP_throw_error);
+            emit_atom(s, JS_ATOM_NULL);
+            emit_u8(s, JS_THROW_ERROR_ITERATOR_THROW);
+
+            emit_label(s, label_next);
+            emit_op(s, OP_get_field);
+            emit_atom(s, JS_ATOM_value);
+            emit_op(s, OP_nip); /* keep the value associated with
+                                   done = true */
+            emit_op(s, OP_nip);
+            emit_op(s, OP_nip);
+        } else {
+            int label_next;
+
+            if (is_async)
+                emit_op(s, OP_await);
+            emit_op(s, OP_yield);
+            label_next = emit_goto(s, OP_if_false, -1);
+            emit_return(s, TRUE);
+            emit_label(s, label_next);
+        }
+        return 0;
+    } else if (s->token.val == '(' &&
+               js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) {
+        return js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
+                                      JS_FUNC_NORMAL, JS_ATOM_NULL,
+                                      s->token.ptr, s->token.line_num);
+    } else if (token_is_pseudo_keyword(s, JS_ATOM_async)) {
+        const uint8_t *source_ptr;
+        int source_line_num, tok;
+        JSParsePos pos;
+
+        /* fast test */
+        tok = peek_token(s, TRUE);
+        if (tok == TOK_FUNCTION || tok == '\n')
+            goto next;
+
+        source_ptr = s->token.ptr;
+        source_line_num = s->token.line_num;
+        js_parse_get_pos(s, &pos);
+        if (next_token(s))
+            return -1;
+        if ((s->token.val == '(' &&
+             js_parse_skip_parens_token(s, NULL, TRUE) == TOK_ARROW) ||
+            (s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved &&
+             peek_token(s, TRUE) == TOK_ARROW)) {
+            return js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
+                                          JS_FUNC_ASYNC, JS_ATOM_NULL,
+                                          source_ptr, source_line_num);
+        } else {
+            /* undo the token parsing */
+            if (js_parse_seek_token(s, &pos))
+                return -1;
+        }
+    } else if (s->token.val == TOK_IDENT &&
+               peek_token(s, TRUE) == TOK_ARROW) {
+        return js_parse_function_decl(s, JS_PARSE_FUNC_ARROW,
+                                      JS_FUNC_NORMAL, JS_ATOM_NULL,
+                                      s->token.ptr, s->token.line_num);
+    }
+ next:
+    if (s->token.val == TOK_IDENT) {
+        /* name0 is used to check for OP_set_name pattern, not duplicated */
+        name0 = s->token.u.ident.atom;
+    }
+    if (js_parse_cond_expr(s, parse_flags))
+        return -1;
+
+    op = s->token.val;
+    if (op == '=' || (op >= TOK_MUL_ASSIGN && op <= TOK_POW_ASSIGN)) {
+        int label;
+        if (next_token(s))
+            return -1;
+        if (get_lvalue(s, &opcode, &scope, &name, &label, NULL, (op != '='), op) < 0)
+            return -1;
+
+        if (js_parse_assign_expr2(s, parse_flags)) {
+            JS_FreeAtom(s->ctx, name);
+            return -1;
+        }
+
+        if (op == '=') {
+            if (opcode == OP_get_ref_value && name == name0) {
+                set_object_name(s, name);
+            }
+        } else {
+            static const uint8_t assign_opcodes[] = {
+                OP_mul, OP_div, OP_mod, OP_add, OP_sub,
+                OP_shl, OP_sar, OP_shr, OP_and, OP_xor, OP_or,
+#ifdef CONFIG_BIGNUM
+                OP_pow,
+#endif
+                OP_pow,
+            };
+            op = assign_opcodes[op - TOK_MUL_ASSIGN];
+#ifdef CONFIG_BIGNUM
+            if (s->cur_func->js_mode & JS_MODE_MATH) {
+                if (op == OP_mod)
+                    op = OP_math_mod;
+            }
+#endif
+            emit_op(s, op);
+        }
+        put_lvalue(s, opcode, scope, name, label, PUT_LVALUE_KEEP_TOP, FALSE);
+    } else if (op >= TOK_LAND_ASSIGN && op <= TOK_DOUBLE_QUESTION_MARK_ASSIGN) {
+        int label, label1, depth_lvalue, label2;
+
+        if (next_token(s))
+            return -1;
+        if (get_lvalue(s, &opcode, &scope, &name, &label,
+                       &depth_lvalue, TRUE, op) < 0)
+            return -1;
+
+        emit_op(s, OP_dup);
+        if (op == TOK_DOUBLE_QUESTION_MARK_ASSIGN)
+            emit_op(s, OP_is_undefined_or_null);
+        label1 = emit_goto(s, op == TOK_LOR_ASSIGN ? OP_if_true : OP_if_false,
+                           -1);
+        emit_op(s, OP_drop);
+
+        if (js_parse_assign_expr2(s, parse_flags)) {
+            JS_FreeAtom(s->ctx, name);
+            return -1;
+        }
+
+        if (opcode == OP_get_ref_value && name == name0) {
+            set_object_name(s, name);
+        }
+
+        switch(depth_lvalue) {
+        case 1:
+            emit_op(s, OP_insert2);
+            break;
+        case 2:
+            emit_op(s, OP_insert3);
+            break;
+        case 3:
+            emit_op(s, OP_insert4);
+            break;
+        default:
+            abort();
+        }
+
+        /* XXX: we disable the OP_put_ref_value optimization by not
+           using put_lvalue() otherwise depth_lvalue is not correct */
+        put_lvalue(s, opcode, scope, name, label, PUT_LVALUE_NOKEEP_DEPTH,
+                   FALSE);
+        label2 = emit_goto(s, OP_goto, -1);
+
+        emit_label(s, label1);
+
+        /* remove the lvalue stack entries */
+        while (depth_lvalue != 0) {
+            emit_op(s, OP_nip);
+            depth_lvalue--;
+        }
+
+        emit_label(s, label2);
+    }
+    return 0;
+}
+
+static __exception int js_parse_assign_expr(JSParseState *s)
+{
+    return js_parse_assign_expr2(s, PF_IN_ACCEPTED);
+}
+
+/* allowed parse_flags: PF_IN_ACCEPTED */
+static __exception int js_parse_expr2(JSParseState *s, int parse_flags)
+{
+    BOOL comma = FALSE;
+    for(;;) {
+        if (js_parse_assign_expr2(s, parse_flags))
+            return -1;
+        if (comma) {
+            /* prevent get_lvalue from using the last expression
+               as an lvalue. This also prevents the conversion of
+               of get_var to get_ref for method lookup in function
+               call inside `with` statement.
+             */
+            s->cur_func->last_opcode_pos = -1;
+        }
+        if (s->token.val != ',')
+            break;
+        comma = TRUE;
+        if (next_token(s))
+            return -1;
+        emit_op(s, OP_drop);
+    }
+    return 0;
+}
+
+static __exception int js_parse_expr(JSParseState *s)
+{
+    return js_parse_expr2(s, PF_IN_ACCEPTED);
+}
+
+static void push_break_entry(JSFunctionDef *fd, BlockEnv *be,
+                             JSAtom label_name,
+                             int label_break, int label_cont,
+                             int drop_count)
+{
+    be->prev = fd->top_break;
+    fd->top_break = be;
+    be->label_name = label_name;
+    be->label_break = label_break;
+    be->label_cont = label_cont;
+    be->drop_count = drop_count;
+    be->label_finally = -1;
+    be->scope_level = fd->scope_level;
+    be->has_iterator = FALSE;
+}
+
+static void pop_break_entry(JSFunctionDef *fd)
+{
+    BlockEnv *be;
+    be = fd->top_break;
+    fd->top_break = be->prev;
+}
+
+static __exception int emit_break(JSParseState *s, JSAtom name, int is_cont)
+{
+    BlockEnv *top;
+    int i, scope_level;
+
+    scope_level = s->cur_func->scope_level;
+    top = s->cur_func->top_break;
+    while (top != NULL) {
+        close_scopes(s, scope_level, top->scope_level);
+        scope_level = top->scope_level;
+        if (is_cont &&
+            top->label_cont != -1 &&
+            (name == JS_ATOM_NULL || top->label_name == name)) {
+            /* continue stays inside the same block */
+            emit_goto(s, OP_goto, top->label_cont);
+            return 0;
+        }
+        if (!is_cont &&
+            top->label_break != -1 &&
+            (name == JS_ATOM_NULL || top->label_name == name)) {
+            emit_goto(s, OP_goto, top->label_break);
+            return 0;
+        }
+        i = 0;
+        if (top->has_iterator) {
+            emit_op(s, OP_iterator_close);
+            i += 3;
+        }
+        for(; i < top->drop_count; i++)
+            emit_op(s, OP_drop);
+        if (top->label_finally != -1) {
+            /* must push dummy value to keep same stack depth */
+            emit_op(s, OP_undefined);
+            emit_goto(s, OP_gosub, top->label_finally);
+            emit_op(s, OP_drop);
+        }
+        top = top->prev;
+    }
+    if (name == JS_ATOM_NULL) {
+        if (is_cont)
+            return js_parse_error(s, "continue must be inside loop");
+        else
+            return js_parse_error(s, "break must be inside loop or switch");
+    } else {
+        return js_parse_error(s, "break/continue label not found");
+    }
+}
+
+/* execute the finally blocks before return */
+static void emit_return(JSParseState *s, BOOL hasval)
+{
+    BlockEnv *top;
+
+    if (s->cur_func->func_kind != JS_FUNC_NORMAL) {
+        if (!hasval) {
+            /* no value: direct return in case of async generator */
+            emit_op(s, OP_undefined);
+            hasval = TRUE;
+        } else if (s->cur_func->func_kind == JS_FUNC_ASYNC_GENERATOR) {
+            /* the await must be done before handling the "finally" in
+               case it raises an exception */
+            emit_op(s, OP_await);
+        }
+    }
+
+    top = s->cur_func->top_break;
+    while (top != NULL) {
+        if (top->has_iterator || top->label_finally != -1) {
+            if (!hasval) {
+                emit_op(s, OP_undefined);
+                hasval = TRUE;
+            }
+            /* Remove the stack elements up to and including the catch
+               offset. When 'yield' is used in an expression we have
+               no easy way to count them, so we use this specific
+               instruction instead. */
+            emit_op(s, OP_nip_catch);
+            /* stack: iter_obj next ret_val */
+            if (top->has_iterator) {
+                if (s->cur_func->func_kind == JS_FUNC_ASYNC_GENERATOR) {
+                    int label_next, label_next2;
+                    emit_op(s, OP_nip); /* next */
+                    emit_op(s, OP_swap);
+                    emit_op(s, OP_get_field2);
+                    emit_atom(s, JS_ATOM_return);
+                    /* stack: iter_obj return_func */
+                    emit_op(s, OP_dup);
+                    emit_op(s, OP_is_undefined_or_null);
+                    label_next = emit_goto(s, OP_if_true, -1);
+                    emit_op(s, OP_call_method);
+                    emit_u16(s, 0);
+                    emit_op(s, OP_iterator_check_object);
+                    emit_op(s, OP_await);
+                    label_next2 = emit_goto(s, OP_goto, -1);
+                    emit_label(s, label_next);
+                    emit_op(s, OP_drop);
+                    emit_label(s, label_next2);
+                    emit_op(s, OP_drop);
+                } else {
+                    emit_op(s, OP_rot3r);
+                    emit_op(s, OP_undefined); /* dummy catch offset */
+                    emit_op(s, OP_iterator_close);
+                }
+            } else {
+                /* execute the "finally" block */
+                emit_goto(s, OP_gosub, top->label_finally);
+            }
+        }
+        top = top->prev;
+    }
+    if (s->cur_func->is_derived_class_constructor) {
+        int label_return;
+
+        /* 'this' can be uninitialized, so it may be accessed only if
+           the derived class constructor does not return an object */
+        if (hasval) {
+            emit_op(s, OP_check_ctor_return);
+            label_return = emit_goto(s, OP_if_false, -1);
+            emit_op(s, OP_drop);
+        } else {
+            label_return = -1;
+        }
+
+        /* The error should be raised in the caller context, so we use
+           a specific opcode */
+        emit_op(s, OP_scope_get_var_checkthis);
+        emit_atom(s, JS_ATOM_this);
+        emit_u16(s, 0);
+
+        emit_label(s, label_return);
+        emit_op(s, OP_return);
+    } else if (s->cur_func->func_kind != JS_FUNC_NORMAL) {
+        emit_op(s, OP_return_async);
+    } else {
+        emit_op(s, hasval ? OP_return : OP_return_undef);
+    }
+}
+
+#define DECL_MASK_FUNC  (1 << 0) /* allow normal function declaration */
+/* ored with DECL_MASK_FUNC if function declarations are allowed with a label */
+#define DECL_MASK_FUNC_WITH_LABEL (1 << 1)
+#define DECL_MASK_OTHER (1 << 2) /* all other declarations */
+#define DECL_MASK_ALL   (DECL_MASK_FUNC | DECL_MASK_FUNC_WITH_LABEL | DECL_MASK_OTHER)
+
+static __exception int js_parse_statement_or_decl(JSParseState *s,
+                                                  int decl_mask);
+
+static __exception int js_parse_statement(JSParseState *s)
+{
+    return js_parse_statement_or_decl(s, 0);
+}
+
+static __exception int js_parse_block(JSParseState *s)
+{
+    if (js_parse_expect(s, '{'))
+        return -1;
+    if (s->token.val != '}') {
+        push_scope(s);
+        for(;;) {
+            if (js_parse_statement_or_decl(s, DECL_MASK_ALL))
+                return -1;
+            if (s->token.val == '}')
+                break;
+        }
+        pop_scope(s);
+    }
+    if (next_token(s))
+        return -1;
+    return 0;
+}
+
+/* allowed parse_flags: PF_IN_ACCEPTED */
+static __exception int js_parse_var(JSParseState *s, int parse_flags, int tok,
+                                    BOOL export_flag)
+{
+    JSContext *ctx = s->ctx;
+    JSFunctionDef *fd = s->cur_func;
+    JSAtom name = JS_ATOM_NULL;
+
+    for (;;) {
+        if (s->token.val == TOK_IDENT) {
+            if (s->token.u.ident.is_reserved) {
+                return js_parse_error_reserved_identifier(s);
+            }
+            name = JS_DupAtom(ctx, s->token.u.ident.atom);
+            if (name == JS_ATOM_let && (tok == TOK_LET || tok == TOK_CONST)) {
+                js_parse_error(s, "'let' is not a valid lexical identifier");
+                goto var_error;
+            }
+            if (next_token(s))
+                goto var_error;
+            if (js_define_var(s, name, tok))
+                goto var_error;
+            if (export_flag) {
+                if (!add_export_entry(s, s->cur_func->module, name, name,
+                                      JS_EXPORT_TYPE_LOCAL))
+                    goto var_error;
+            }
+
+            if (s->token.val == '=') {
+                if (next_token(s))
+                    goto var_error;
+                if (tok == TOK_VAR) {
+                    /* Must make a reference for proper `with` semantics */
+                    int opcode, scope, label;
+                    JSAtom name1;
+
+                    emit_op(s, OP_scope_get_var);
+                    emit_atom(s, name);
+                    emit_u16(s, fd->scope_level);
+                    if (get_lvalue(s, &opcode, &scope, &name1, &label, NULL, FALSE, '=') < 0)
+                        goto var_error;
+                    if (js_parse_assign_expr2(s, parse_flags)) {
+                        JS_FreeAtom(ctx, name1);
+                        goto var_error;
+                    }
+                    set_object_name(s, name);
+                    put_lvalue(s, opcode, scope, name1, label,
+                               PUT_LVALUE_NOKEEP, FALSE);
+                } else {
+                    if (js_parse_assign_expr2(s, parse_flags))
+                        goto var_error;
+                    set_object_name(s, name);
+                    emit_op(s, (tok == TOK_CONST || tok == TOK_LET) ?
+                        OP_scope_put_var_init : OP_scope_put_var);
+                    emit_atom(s, name);
+                    emit_u16(s, fd->scope_level);
+                }
+            } else {
+                if (tok == TOK_CONST) {
+                    js_parse_error(s, "missing initializer for const variable");
+                    goto var_error;
+                }
+                if (tok == TOK_LET) {
+                    /* initialize lexical variable upon entering its scope */
+                    emit_op(s, OP_undefined);
+                    emit_op(s, OP_scope_put_var_init);
+                    emit_atom(s, name);
+                    emit_u16(s, fd->scope_level);
+                }
+            }
+            JS_FreeAtom(ctx, name);
+        } else {
+            int skip_bits;
+            if ((s->token.val == '[' || s->token.val == '{')
+            &&  js_parse_skip_parens_token(s, &skip_bits, FALSE) == '=') {
+                emit_op(s, OP_undefined);
+                if (js_parse_destructuring_element(s, tok, 0, TRUE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE) < 0)
+                    return -1;
+            } else {
+                return js_parse_error(s, "variable name expected");
+            }
+        }
+        if (s->token.val != ',')
+            break;
+        if (next_token(s))
+            return -1;
+    }
+    return 0;
+
+ var_error:
+    JS_FreeAtom(ctx, name);
+    return -1;
+}
+
+/* test if the current token is a label. Use simplistic look-ahead scanner */
+static BOOL is_label(JSParseState *s)
+{
+    return (s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved &&
+            peek_token(s, FALSE) == ':');
+}
+
+/* test if the current token is a let keyword. Use simplistic look-ahead scanner */
+static int is_let(JSParseState *s, int decl_mask)
+{
+    int res = FALSE;
+
+    if (token_is_pseudo_keyword(s, JS_ATOM_let)) {
+        JSParsePos pos;
+        js_parse_get_pos(s, &pos);
+        for (;;) {
+            if (next_token(s)) {
+                res = -1;
+                break;
+            }
+            if (s->token.val == '[') {
+                /* let [ is a syntax restriction:
+                   it never introduces an ExpressionStatement */
+                res = TRUE;
+                break;
+            }
+            if (s->token.val == '{' ||
+                (s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved) ||
+                s->token.val == TOK_LET ||
+                s->token.val == TOK_YIELD ||
+                s->token.val == TOK_AWAIT) {
+                /* Check for possible ASI if not scanning for Declaration */
+                /* XXX: should also check that `{` introduces a BindingPattern,
+                   but Firefox does not and rejects eval("let=1;let\n{if(1)2;}") */
+                if (s->last_line_num == s->token.line_num || (decl_mask & DECL_MASK_OTHER)) {
+                    res = TRUE;
+                    break;
+                }
+                break;
+            }
+            break;
+        }
+        if (js_parse_seek_token(s, &pos)) {
+            res = -1;
+        }
+    }
+    return res;
+}
+
+/* XXX: handle IteratorClose when exiting the loop before the
+   enumeration is done */
+static __exception int js_parse_for_in_of(JSParseState *s, int label_name,
+                                          BOOL is_async)
+{
+    JSContext *ctx = s->ctx;
+    JSFunctionDef *fd = s->cur_func;
+    JSAtom var_name;
+    BOOL has_initializer, is_for_of, has_destructuring;
+    int tok, tok1, opcode, scope, block_scope_level;
+    int label_next, label_expr, label_cont, label_body, label_break;
+    int pos_next, pos_expr;
+    BlockEnv break_entry;
+
+    has_initializer = FALSE;
+    has_destructuring = FALSE;
+    is_for_of = FALSE;
+    block_scope_level = fd->scope_level;
+    label_cont = new_label(s);
+    label_body = new_label(s);
+    label_break = new_label(s);
+    label_next = new_label(s);
+
+    /* create scope for the lexical variables declared in the enumeration
+       expressions. XXX: Not completely correct because of weird capturing
+       semantics in `for (i of o) a.push(function(){return i})` */
+    push_scope(s);
+
+    /* local for_in scope starts here so individual elements
+       can be closed in statement. */
+    push_break_entry(s->cur_func, &break_entry,
+                     label_name, label_break, label_cont, 1);
+    break_entry.scope_level = block_scope_level;
+
+    label_expr = emit_goto(s, OP_goto, -1);
+
+    pos_next = s->cur_func->byte_code.size;
+    emit_label(s, label_next);
+
+    tok = s->token.val;
+    switch (is_let(s, DECL_MASK_OTHER)) {
+    case TRUE:
+        tok = TOK_LET;
+        break;
+    case FALSE:
+        break;
+    default:
+        return -1;
+    }
+    if (tok == TOK_VAR || tok == TOK_LET || tok == TOK_CONST) {
+        if (next_token(s))
+            return -1;
+
+        if (!(s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved)) {
+            if (s->token.val == '[' || s->token.val == '{') {
+                if (js_parse_destructuring_element(s, tok, 0, TRUE, -1, FALSE) < 0)
+                    return -1;
+                has_destructuring = TRUE;
+            } else {
+                return js_parse_error(s, "variable name expected");
+            }
+            var_name = JS_ATOM_NULL;
+        } else {
+            var_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+            if (next_token(s)) {
+                JS_FreeAtom(s->ctx, var_name);
+                return -1;
+            }
+            if (js_define_var(s, var_name, tok)) {
+                JS_FreeAtom(s->ctx, var_name);
+                return -1;
+            }
+            emit_op(s, (tok == TOK_CONST || tok == TOK_LET) ?
+                    OP_scope_put_var_init : OP_scope_put_var);
+            emit_atom(s, var_name);
+            emit_u16(s, fd->scope_level);
+        }
+    } else if (!is_async && token_is_pseudo_keyword(s, JS_ATOM_async) &&
+               peek_token(s, FALSE) == TOK_OF) {
+        return js_parse_error(s, "'for of' expression cannot start with 'async'");
+    } else {
+        int skip_bits;
+        if ((s->token.val == '[' || s->token.val == '{')
+        &&  ((tok1 = js_parse_skip_parens_token(s, &skip_bits, FALSE)) == TOK_IN || tok1 == TOK_OF)) {
+            if (js_parse_destructuring_element(s, 0, 0, TRUE, skip_bits & SKIP_HAS_ELLIPSIS, TRUE) < 0)
+                return -1;
+        } else {
+            int lvalue_label;
+            if (js_parse_left_hand_side_expr(s))
+                return -1;
+            if (get_lvalue(s, &opcode, &scope, &var_name, &lvalue_label,
+                           NULL, FALSE, TOK_FOR))
+                return -1;
+            put_lvalue(s, opcode, scope, var_name, lvalue_label,
+                       PUT_LVALUE_NOKEEP_BOTTOM, FALSE);
+        }
+        var_name = JS_ATOM_NULL;
+    }
+    emit_goto(s, OP_goto, label_body);
+
+    pos_expr = s->cur_func->byte_code.size;
+    emit_label(s, label_expr);
+    if (s->token.val == '=') {
+        /* XXX: potential scoping issue if inside `with` statement */
+        has_initializer = TRUE;
+        /* parse and evaluate initializer prior to evaluating the
+           object (only used with "for in" with a non lexical variable
+           in non strict mode */
+        if (next_token(s) || js_parse_assign_expr2(s, 0)) {
+            JS_FreeAtom(ctx, var_name);
+            return -1;
+        }
+        if (var_name != JS_ATOM_NULL) {
+            emit_op(s, OP_scope_put_var);
+            emit_atom(s, var_name);
+            emit_u16(s, fd->scope_level);
+        }
+    }
+    JS_FreeAtom(ctx, var_name);
+
+    if (token_is_pseudo_keyword(s, JS_ATOM_of)) {
+        break_entry.has_iterator = is_for_of = TRUE;
+        break_entry.drop_count += 2;
+        if (has_initializer)
+            goto initializer_error;
+    } else if (s->token.val == TOK_IN) {
+        if (is_async)
+            return js_parse_error(s, "'for await' loop should be used with 'of'");
+        if (has_initializer &&
+            (tok != TOK_VAR || (fd->js_mode & JS_MODE_STRICT) ||
+             has_destructuring)) {
+        initializer_error:
+            return js_parse_error(s, "a declaration in the head of a for-%s loop can't have an initializer",
+                                  is_for_of ? "of" : "in");
+        }
+    } else {
+        return js_parse_error(s, "expected 'of' or 'in' in for control expression");
+    }
+    if (next_token(s))
+        return -1;
+    if (is_for_of) {
+        if (js_parse_assign_expr(s))
+            return -1;
+    } else {
+        if (js_parse_expr(s))
+            return -1;
+    }
+    /* close the scope after having evaluated the expression so that
+       the TDZ values are in the closures */
+    close_scopes(s, s->cur_func->scope_level, block_scope_level);
+    if (is_for_of) {
+        if (is_async)
+            emit_op(s, OP_for_await_of_start);
+        else
+            emit_op(s, OP_for_of_start);
+        /* on stack: enum_rec */
+    } else {
+        emit_op(s, OP_for_in_start);
+        /* on stack: enum_obj */
+    }
+    emit_goto(s, OP_goto, label_cont);
+
+    if (js_parse_expect(s, ')'))
+        return -1;
+
+    if (OPTIMIZE) {
+        /* move the `next` code here */
+        DynBuf *bc = &s->cur_func->byte_code;
+        int chunk_size = pos_expr - pos_next;
+        int offset = bc->size - pos_next;
+        int i;
+        dbuf_realloc(bc, bc->size + chunk_size);
+        dbuf_put(bc, bc->buf + pos_next, chunk_size);
+        memset(bc->buf + pos_next, OP_nop, chunk_size);
+        /* `next` part ends with a goto */
+        s->cur_func->last_opcode_pos = bc->size - 5;
+        /* relocate labels */
+        for (i = label_cont; i < s->cur_func->label_count; i++) {
+            LabelSlot *ls = &s->cur_func->label_slots[i];
+            if (ls->pos >= pos_next && ls->pos < pos_expr)
+                ls->pos += offset;
+        }
+    }
+
+    emit_label(s, label_body);
+    if (js_parse_statement(s))
+        return -1;
+
+    close_scopes(s, s->cur_func->scope_level, block_scope_level);
+
+    emit_label(s, label_cont);
+    if (is_for_of) {
+        if (is_async) {
+            /* call the next method */
+            /* stack: iter_obj next catch_offset */
+            emit_op(s, OP_dup3);
+            emit_op(s, OP_drop);
+            emit_op(s, OP_call_method);
+            emit_u16(s, 0);
+            /* get the result of the promise */
+            emit_op(s, OP_await);
+            /* unwrap the value and done values */
+            emit_op(s, OP_iterator_get_value_done);
+        } else {
+            emit_op(s, OP_for_of_next);
+            emit_u8(s, 0);
+        }
+    } else {
+        emit_op(s, OP_for_in_next);
+    }
+    /* on stack: enum_rec / enum_obj value bool */
+    emit_goto(s, OP_if_false, label_next);
+    /* drop the undefined value from for_xx_next */
+    emit_op(s, OP_drop);
+
+    emit_label(s, label_break);
+    if (is_for_of) {
+        /* close and drop enum_rec */
+        emit_op(s, OP_iterator_close);
+    } else {
+        emit_op(s, OP_drop);
+    }
+    pop_break_entry(s->cur_func);
+    pop_scope(s);
+    return 0;
+}
+
+static void set_eval_ret_undefined(JSParseState *s)
+{
+    if (s->cur_func->eval_ret_idx >= 0) {
+        emit_op(s, OP_undefined);
+        emit_op(s, OP_put_loc);
+        emit_u16(s, s->cur_func->eval_ret_idx);
+    }
+}
+
+static __exception int js_parse_statement_or_decl(JSParseState *s,
+                                                  int decl_mask)
+{
+    JSContext *ctx = s->ctx;
+    JSAtom label_name;
+    int tok;
+
+    /* specific label handling */
+    /* XXX: support multiple labels on loop statements */
+    label_name = JS_ATOM_NULL;
+    if (is_label(s)) {
+        BlockEnv *be;
+
+        label_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+
+        for (be = s->cur_func->top_break; be; be = be->prev) {
+            if (be->label_name == label_name) {
+                js_parse_error(s, "duplicate label name");
+                goto fail;
+            }
+        }
+
+        if (next_token(s))
+            goto fail;
+        if (js_parse_expect(s, ':'))
+            goto fail;
+        if (s->token.val != TOK_FOR
+        &&  s->token.val != TOK_DO
+        &&  s->token.val != TOK_WHILE) {
+            /* labelled regular statement */
+            int label_break, mask;
+            BlockEnv break_entry;
+
+            label_break = new_label(s);
+            push_break_entry(s->cur_func, &break_entry,
+                             label_name, label_break, -1, 0);
+            if (!(s->cur_func->js_mode & JS_MODE_STRICT) &&
+                (decl_mask & DECL_MASK_FUNC_WITH_LABEL)) {
+                mask = DECL_MASK_FUNC | DECL_MASK_FUNC_WITH_LABEL;
+            } else {
+                mask = 0;
+            }
+            if (js_parse_statement_or_decl(s, mask))
+                goto fail;
+            emit_label(s, label_break);
+            pop_break_entry(s->cur_func);
+            goto done;
+        }
+    }
+
+    switch(tok = s->token.val) {
+    case '{':
+        if (js_parse_block(s))
+            goto fail;
+        break;
+    case TOK_RETURN:
+        if (s->cur_func->is_eval) {
+            js_parse_error(s, "return not in a function");
+            goto fail;
+        }
+        if (s->cur_func->func_type == JS_PARSE_FUNC_CLASS_STATIC_INIT) {
+            js_parse_error(s, "return in a static initializer block");
+            goto fail;
+        }
+        if (next_token(s))
+            goto fail;
+        if (s->token.val != ';' && s->token.val != '}' && !s->got_lf) {
+            if (js_parse_expr(s))
+                goto fail;
+            emit_return(s, TRUE);
+        } else {
+            emit_return(s, FALSE);
+        }
+        if (js_parse_expect_semi(s))
+            goto fail;
+        break;
+    case TOK_THROW:
+        if (next_token(s))
+            goto fail;
+        if (s->got_lf) {
+            js_parse_error(s, "line terminator not allowed after throw");
+            goto fail;
+        }
+        if (js_parse_expr(s))
+            goto fail;
+        emit_op(s, OP_throw);
+        if (js_parse_expect_semi(s))
+            goto fail;
+        break;
+    case TOK_LET:
+    case TOK_CONST:
+    haslet:
+        if (!(decl_mask & DECL_MASK_OTHER)) {
+            js_parse_error(s, "lexical declarations can't appear in single-statement context");
+            goto fail;
+        }
+        /* fall thru */
+    case TOK_VAR:
+        if (next_token(s))
+            goto fail;
+        if (js_parse_var(s, TRUE, tok, FALSE))
+            goto fail;
+        if (js_parse_expect_semi(s))
+            goto fail;
+        break;
+    case TOK_IF:
+        {
+            int label1, label2, mask;
+            if (next_token(s))
+                goto fail;
+            /* create a new scope for `let f;if(1) function f(){}` */
+            push_scope(s);
+            set_eval_ret_undefined(s);
+            if (js_parse_expr_paren(s))
+                goto fail;
+            label1 = emit_goto(s, OP_if_false, -1);
+            if (s->cur_func->js_mode & JS_MODE_STRICT)
+                mask = 0;
+            else
+                mask = DECL_MASK_FUNC; /* Annex B.3.4 */
+
+            if (js_parse_statement_or_decl(s, mask))
+                goto fail;
+
+            if (s->token.val == TOK_ELSE) {
+                label2 = emit_goto(s, OP_goto, -1);
+                if (next_token(s))
+                    goto fail;
+
+                emit_label(s, label1);
+                if (js_parse_statement_or_decl(s, mask))
+                    goto fail;
+
+                label1 = label2;
+            }
+            emit_label(s, label1);
+            pop_scope(s);
+        }
+        break;
+    case TOK_WHILE:
+        {
+            int label_cont, label_break;
+            BlockEnv break_entry;
+
+            label_cont = new_label(s);
+            label_break = new_label(s);
+
+            push_break_entry(s->cur_func, &break_entry,
+                             label_name, label_break, label_cont, 0);
+
+            if (next_token(s))
+                goto fail;
+
+            set_eval_ret_undefined(s);
+
+            emit_label(s, label_cont);
+            if (js_parse_expr_paren(s))
+                goto fail;
+            emit_goto(s, OP_if_false, label_break);
+
+            if (js_parse_statement(s))
+                goto fail;
+            emit_goto(s, OP_goto, label_cont);
+
+            emit_label(s, label_break);
+
+            pop_break_entry(s->cur_func);
+        }
+        break;
+    case TOK_DO:
+        {
+            int label_cont, label_break, label1;
+            BlockEnv break_entry;
+
+            label_cont = new_label(s);
+            label_break = new_label(s);
+            label1 = new_label(s);
+
+            push_break_entry(s->cur_func, &break_entry,
+                             label_name, label_break, label_cont, 0);
+
+            if (next_token(s))
+                goto fail;
+
+            emit_label(s, label1);
+
+            set_eval_ret_undefined(s);
+
+            if (js_parse_statement(s))
+                goto fail;
+
+            emit_label(s, label_cont);
+            if (js_parse_expect(s, TOK_WHILE))
+                goto fail;
+            if (js_parse_expr_paren(s))
+                goto fail;
+            /* Insert semicolon if missing */
+            if (s->token.val == ';') {
+                if (next_token(s))
+                    goto fail;
+            }
+            emit_goto(s, OP_if_true, label1);
+
+            emit_label(s, label_break);
+
+            pop_break_entry(s->cur_func);
+        }
+        break;
+    case TOK_FOR:
+        {
+            int label_cont, label_break, label_body, label_test;
+            int pos_cont, pos_body, block_scope_level;
+            BlockEnv break_entry;
+            int tok, bits;
+            BOOL is_async;
+
+            if (next_token(s))
+                goto fail;
+
+            set_eval_ret_undefined(s);
+            bits = 0;
+            is_async = FALSE;
+            if (s->token.val == '(') {
+                js_parse_skip_parens_token(s, &bits, FALSE);
+            } else if (s->token.val == TOK_AWAIT) {
+                if (!(s->cur_func->func_kind & JS_FUNC_ASYNC)) {
+                    js_parse_error(s, "for await is only valid in asynchronous functions");
+                    goto fail;
+                }
+                is_async = TRUE;
+                if (next_token(s))
+                    goto fail;
+                s->cur_func->has_await = TRUE;
+            }
+            if (js_parse_expect(s, '('))
+                goto fail;
+
+            if (!(bits & SKIP_HAS_SEMI)) {
+                /* parse for/in or for/of */
+                if (js_parse_for_in_of(s, label_name, is_async))
+                    goto fail;
+                break;
+            }
+            block_scope_level = s->cur_func->scope_level;
+
+            /* create scope for the lexical variables declared in the initial,
+               test and increment expressions */
+            push_scope(s);
+            /* initial expression */
+            tok = s->token.val;
+            if (tok != ';') {
+                switch (is_let(s, DECL_MASK_OTHER)) {
+                case TRUE:
+                    tok = TOK_LET;
+                    break;
+                case FALSE:
+                    break;
+                default:
+                    goto fail;
+                }
+                if (tok == TOK_VAR || tok == TOK_LET || tok == TOK_CONST) {
+                    if (next_token(s))
+                        goto fail;
+                    if (js_parse_var(s, FALSE, tok, FALSE))
+                        goto fail;
+                } else {
+                    if (js_parse_expr2(s, FALSE))
+                        goto fail;
+                    emit_op(s, OP_drop);
+                }
+
+                /* close the closures before the first iteration */
+                close_scopes(s, s->cur_func->scope_level, block_scope_level);
+            }
+            if (js_parse_expect(s, ';'))
+                goto fail;
+
+            label_test = new_label(s);
+            label_cont = new_label(s);
+            label_body = new_label(s);
+            label_break = new_label(s);
+
+            push_break_entry(s->cur_func, &break_entry,
+                             label_name, label_break, label_cont, 0);
+
+            /* test expression */
+            if (s->token.val == ';') {
+                /* no test expression */
+                label_test = label_body;
+            } else {
+                emit_label(s, label_test);
+                if (js_parse_expr(s))
+                    goto fail;
+                emit_goto(s, OP_if_false, label_break);
+            }
+            if (js_parse_expect(s, ';'))
+                goto fail;
+
+            if (s->token.val == ')') {
+                /* no end expression */
+                break_entry.label_cont = label_cont = label_test;
+                pos_cont = 0; /* avoid warning */
+            } else {
+                /* skip the end expression */
+                emit_goto(s, OP_goto, label_body);
+
+                pos_cont = s->cur_func->byte_code.size;
+                emit_label(s, label_cont);
+                if (js_parse_expr(s))
+                    goto fail;
+                emit_op(s, OP_drop);
+                if (label_test != label_body)
+                    emit_goto(s, OP_goto, label_test);
+            }
+            if (js_parse_expect(s, ')'))
+                goto fail;
+
+            pos_body = s->cur_func->byte_code.size;
+            emit_label(s, label_body);
+            if (js_parse_statement(s))
+                goto fail;
+
+            /* close the closures before the next iteration */
+            /* XXX: check continue case */
+            close_scopes(s, s->cur_func->scope_level, block_scope_level);
+
+            if (OPTIMIZE && label_test != label_body && label_cont != label_test) {
+                /* move the increment code here */
+                DynBuf *bc = &s->cur_func->byte_code;
+                int chunk_size = pos_body - pos_cont;
+                int offset = bc->size - pos_cont;
+                int i;
+                dbuf_realloc(bc, bc->size + chunk_size);
+                dbuf_put(bc, bc->buf + pos_cont, chunk_size);
+                memset(bc->buf + pos_cont, OP_nop, chunk_size);
+                /* increment part ends with a goto */
+                s->cur_func->last_opcode_pos = bc->size - 5;
+                /* relocate labels */
+                for (i = label_cont; i < s->cur_func->label_count; i++) {
+                    LabelSlot *ls = &s->cur_func->label_slots[i];
+                    if (ls->pos >= pos_cont && ls->pos < pos_body)
+                        ls->pos += offset;
+                }
+            } else {
+                emit_goto(s, OP_goto, label_cont);
+            }
+
+            emit_label(s, label_break);
+
+            pop_break_entry(s->cur_func);
+            pop_scope(s);
+        }
+        break;
+    case TOK_BREAK:
+    case TOK_CONTINUE:
+        {
+            int is_cont = s->token.val - TOK_BREAK;
+            int label;
+
+            if (next_token(s))
+                goto fail;
+            if (!s->got_lf && s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved)
+                label = s->token.u.ident.atom;
+            else
+                label = JS_ATOM_NULL;
+            if (emit_break(s, label, is_cont))
+                goto fail;
+            if (label != JS_ATOM_NULL) {
+                if (next_token(s))
+                    goto fail;
+            }
+            if (js_parse_expect_semi(s))
+                goto fail;
+        }
+        break;
+    case TOK_SWITCH:
+        {
+            int label_case, label_break, label1;
+            int default_label_pos;
+            BlockEnv break_entry;
+
+            if (next_token(s))
+                goto fail;
+
+            set_eval_ret_undefined(s);
+            if (js_parse_expr_paren(s))
+                goto fail;
+
+            push_scope(s);
+            label_break = new_label(s);
+            push_break_entry(s->cur_func, &break_entry,
+                             label_name, label_break, -1, 1);
+
+            if (js_parse_expect(s, '{'))
+                goto fail;
+
+            default_label_pos = -1;
+            label_case = -1;
+            while (s->token.val != '}') {
+                if (s->token.val == TOK_CASE) {
+                    label1 = -1;
+                    if (label_case >= 0) {
+                        /* skip the case if needed */
+                        label1 = emit_goto(s, OP_goto, -1);
+                    }
+                    emit_label(s, label_case);
+                    label_case = -1;
+                    for (;;) {
+                        /* parse a sequence of case clauses */
+                        if (next_token(s))
+                            goto fail;
+                        emit_op(s, OP_dup);
+                        if (js_parse_expr(s))
+                            goto fail;
+                        if (js_parse_expect(s, ':'))
+                            goto fail;
+                        emit_op(s, OP_strict_eq);
+                        if (s->token.val == TOK_CASE) {
+                            label1 = emit_goto(s, OP_if_true, label1);
+                        } else {
+                            label_case = emit_goto(s, OP_if_false, -1);
+                            emit_label(s, label1);
+                            break;
+                        }
+                    }
+                } else if (s->token.val == TOK_DEFAULT) {
+                    if (next_token(s))
+                        goto fail;
+                    if (js_parse_expect(s, ':'))
+                        goto fail;
+                    if (default_label_pos >= 0) {
+                        js_parse_error(s, "duplicate default");
+                        goto fail;
+                    }
+                    if (label_case < 0) {
+                        /* falling thru direct from switch expression */
+                        label_case = emit_goto(s, OP_goto, -1);
+                    }
+                    /* Emit a dummy label opcode. Label will be patched after
+                       the end of the switch body. Do not use emit_label(s, 0)
+                       because it would clobber label 0 address, preventing
+                       proper optimizer operation.
+                     */
+                    emit_op(s, OP_label);
+                    emit_u32(s, 0);
+                    default_label_pos = s->cur_func->byte_code.size - 4;
+                } else {
+                    if (label_case < 0) {
+                        /* falling thru direct from switch expression */
+                        js_parse_error(s, "invalid switch statement");
+                        goto fail;
+                    }
+                    if (js_parse_statement_or_decl(s, DECL_MASK_ALL))
+                        goto fail;
+                }
+            }
+            if (js_parse_expect(s, '}'))
+                goto fail;
+            if (default_label_pos >= 0) {
+                /* Ugly patch for the the `default` label, shameful and risky */
+                put_u32(s->cur_func->byte_code.buf + default_label_pos,
+                        label_case);
+                s->cur_func->label_slots[label_case].pos = default_label_pos + 4;
+            } else {
+                emit_label(s, label_case);
+            }
+            emit_label(s, label_break);
+            emit_op(s, OP_drop); /* drop the switch expression */
+
+            pop_break_entry(s->cur_func);
+            pop_scope(s);
+        }
+        break;
+    case TOK_TRY:
+        {
+            int label_catch, label_catch2, label_finally, label_end;
+            JSAtom name;
+            BlockEnv block_env;
+
+            set_eval_ret_undefined(s);
+            if (next_token(s))
+                goto fail;
+            label_catch = new_label(s);
+            label_catch2 = new_label(s);
+            label_finally = new_label(s);
+            label_end = new_label(s);
+
+            emit_goto(s, OP_catch, label_catch);
+
+            push_break_entry(s->cur_func, &block_env,
+                             JS_ATOM_NULL, -1, -1, 1);
+            block_env.label_finally = label_finally;
+
+            if (js_parse_block(s))
+                goto fail;
+
+            pop_break_entry(s->cur_func);
+
+            if (js_is_live_code(s)) {
+                /* drop the catch offset */
+                emit_op(s, OP_drop);
+                /* must push dummy value to keep same stack size */
+                emit_op(s, OP_undefined);
+                emit_goto(s, OP_gosub, label_finally);
+                emit_op(s, OP_drop);
+
+                emit_goto(s, OP_goto, label_end);
+            }
+
+            if (s->token.val == TOK_CATCH) {
+                if (next_token(s))
+                    goto fail;
+
+                push_scope(s);  /* catch variable */
+                emit_label(s, label_catch);
+
+                if (s->token.val == '{') {
+                    /* support optional-catch-binding feature */
+                    emit_op(s, OP_drop);    /* pop the exception object */
+                } else {
+                    if (js_parse_expect(s, '('))
+                        goto fail;
+                    if (!(s->token.val == TOK_IDENT && !s->token.u.ident.is_reserved)) {
+                        if (s->token.val == '[' || s->token.val == '{') {
+                            /* XXX: TOK_LET is not completely correct */
+                            if (js_parse_destructuring_element(s, TOK_LET, 0, TRUE, -1, TRUE) < 0)
+                                goto fail;
+                        } else {
+                            js_parse_error(s, "identifier expected");
+                            goto fail;
+                        }
+                    } else {
+                        name = JS_DupAtom(ctx, s->token.u.ident.atom);
+                        if (next_token(s)
+                        ||  js_define_var(s, name, TOK_CATCH) < 0) {
+                            JS_FreeAtom(ctx, name);
+                            goto fail;
+                        }
+                        /* store the exception value in the catch variable */
+                        emit_op(s, OP_scope_put_var);
+                        emit_u32(s, name);
+                        emit_u16(s, s->cur_func->scope_level);
+                    }
+                    if (js_parse_expect(s, ')'))
+                        goto fail;
+                }
+                /* XXX: should keep the address to nop it out if there is no finally block */
+                emit_goto(s, OP_catch, label_catch2);
+
+                push_scope(s);  /* catch block */
+                push_break_entry(s->cur_func, &block_env, JS_ATOM_NULL,
+                                 -1, -1, 1);
+                block_env.label_finally = label_finally;
+
+                if (js_parse_block(s))
+                    goto fail;
+
+                pop_break_entry(s->cur_func);
+                pop_scope(s);  /* catch block */
+                pop_scope(s);  /* catch variable */
+
+                if (js_is_live_code(s)) {
+                    /* drop the catch2 offset */
+                    emit_op(s, OP_drop);
+                    /* XXX: should keep the address to nop it out if there is no finally block */
+                    /* must push dummy value to keep same stack size */
+                    emit_op(s, OP_undefined);
+                    emit_goto(s, OP_gosub, label_finally);
+                    emit_op(s, OP_drop);
+                    emit_goto(s, OP_goto, label_end);
+                }
+                /* catch exceptions thrown in the catch block to execute the
+                 * finally clause and rethrow the exception */
+                emit_label(s, label_catch2);
+                /* catch value is at TOS, no need to push undefined */
+                emit_goto(s, OP_gosub, label_finally);
+                emit_op(s, OP_throw);
+
+            } else if (s->token.val == TOK_FINALLY) {
+                /* finally without catch : execute the finally clause
+                 * and rethrow the exception */
+                emit_label(s, label_catch);
+                /* catch value is at TOS, no need to push undefined */
+                emit_goto(s, OP_gosub, label_finally);
+                emit_op(s, OP_throw);
+            } else {
+                js_parse_error(s, "expecting catch or finally");
+                goto fail;
+            }
+            emit_label(s, label_finally);
+            if (s->token.val == TOK_FINALLY) {
+                int saved_eval_ret_idx = 0; /* avoid warning */
+
+                if (next_token(s))
+                    goto fail;
+                /* on the stack: ret_value gosub_ret_value */
+                push_break_entry(s->cur_func, &block_env, JS_ATOM_NULL,
+                                 -1, -1, 2);
+
+                if (s->cur_func->eval_ret_idx >= 0) {
+                    /* 'finally' updates eval_ret only if not a normal
+                       termination */
+                    saved_eval_ret_idx =
+                        add_var(s->ctx, s->cur_func, JS_ATOM__ret_);
+                    if (saved_eval_ret_idx < 0)
+                        goto fail;
+                    emit_op(s, OP_get_loc);
+                    emit_u16(s, s->cur_func->eval_ret_idx);
+                    emit_op(s, OP_put_loc);
+                    emit_u16(s, saved_eval_ret_idx);
+                    set_eval_ret_undefined(s);
+                }
+
+                if (js_parse_block(s))
+                    goto fail;
+
+                if (s->cur_func->eval_ret_idx >= 0) {
+                    emit_op(s, OP_get_loc);
+                    emit_u16(s, saved_eval_ret_idx);
+                    emit_op(s, OP_put_loc);
+                    emit_u16(s, s->cur_func->eval_ret_idx);
+                }
+                pop_break_entry(s->cur_func);
+            }
+            emit_op(s, OP_ret);
+            emit_label(s, label_end);
+        }
+        break;
+    case ';':
+        /* empty statement */
+        if (next_token(s))
+            goto fail;
+        break;
+    case TOK_WITH:
+        if (s->cur_func->js_mode & JS_MODE_STRICT) {
+            js_parse_error(s, "invalid keyword: with");
+            goto fail;
+        } else {
+            int with_idx;
+
+            if (next_token(s))
+                goto fail;
+
+            if (js_parse_expr_paren(s))
+                goto fail;
+
+            push_scope(s);
+            with_idx = define_var(s, s->cur_func, JS_ATOM__with_,
+                                  JS_VAR_DEF_WITH);
+            if (with_idx < 0)
+                goto fail;
+            emit_op(s, OP_to_object);
+            emit_op(s, OP_put_loc);
+            emit_u16(s, with_idx);
+
+            set_eval_ret_undefined(s);
+            if (js_parse_statement(s))
+                goto fail;
+
+            /* Popping scope drops lexical context for the with object variable */
+            pop_scope(s);
+        }
+        break;
+    case TOK_FUNCTION:
+        /* ES6 Annex B.3.2 and B.3.3 semantics */
+        if (!(decl_mask & DECL_MASK_FUNC))
+            goto func_decl_error;
+        if (!(decl_mask & DECL_MASK_OTHER) && peek_token(s, FALSE) == '*')
+            goto func_decl_error;
+        goto parse_func_var;
+    case TOK_IDENT:
+        if (s->token.u.ident.is_reserved) {
+            js_parse_error_reserved_identifier(s);
+            goto fail;
+        }
+        /* Determine if `let` introduces a Declaration or an ExpressionStatement */
+        switch (is_let(s, decl_mask)) {
+        case TRUE:
+            tok = TOK_LET;
+            goto haslet;
+        case FALSE:
+            break;
+        default:
+            goto fail;
+        }
+        if (token_is_pseudo_keyword(s, JS_ATOM_async) &&
+            peek_token(s, TRUE) == TOK_FUNCTION) {
+            if (!(decl_mask & DECL_MASK_OTHER)) {
+            func_decl_error:
+                js_parse_error(s, "function declarations can't appear in single-statement context");
+                goto fail;
+            }
+        parse_func_var:
+            if (js_parse_function_decl(s, JS_PARSE_FUNC_VAR,
+                                       JS_FUNC_NORMAL, JS_ATOM_NULL,
+                                       s->token.ptr, s->token.line_num))
+                goto fail;
+            break;
+        }
+        goto hasexpr;
+
+    case TOK_CLASS:
+        if (!(decl_mask & DECL_MASK_OTHER)) {
+            js_parse_error(s, "class declarations can't appear in single-statement context");
+            goto fail;
+        }
+        if (js_parse_class(s, FALSE, JS_PARSE_EXPORT_NONE))
+            return -1;
+        break;
+
+    case TOK_DEBUGGER:
+        /* currently no debugger, so just skip the keyword */
+        if (next_token(s))
+            goto fail;
+        if (js_parse_expect_semi(s))
+            goto fail;
+        break;
+
+    case TOK_ENUM:
+    case TOK_EXPORT:
+    case TOK_EXTENDS:
+        js_unsupported_keyword(s, s->token.u.ident.atom);
+        goto fail;
+
+    default:
+    hasexpr:
+        if (js_parse_expr(s))
+            goto fail;
+        if (s->cur_func->eval_ret_idx >= 0) {
+            /* store the expression value so that it can be returned
+               by eval() */
+            emit_op(s, OP_put_loc);
+            emit_u16(s, s->cur_func->eval_ret_idx);
+        } else {
+            emit_op(s, OP_drop); /* drop the result */
+        }
+        if (js_parse_expect_semi(s))
+            goto fail;
+        break;
+    }
+done:
+    JS_FreeAtom(ctx, label_name);
+    return 0;
+fail:
+    JS_FreeAtom(ctx, label_name);
+    return -1;
+}
+
+/* 'name' is freed */
+static JSModuleDef *js_new_module_def(JSContext *ctx, JSAtom name)
+{
+    JSModuleDef *m;
+    m = js_mallocz(ctx, sizeof(*m));
+    if (!m) {
+        JS_FreeAtom(ctx, name);
+        return NULL;
+    }
+    m->header.ref_count = 1;
+    m->module_name = name;
+    m->module_ns = JS_UNDEFINED;
+    m->func_obj = JS_UNDEFINED;
+    m->eval_exception = JS_UNDEFINED;
+    m->meta_obj = JS_UNDEFINED;
+    m->promise = JS_UNDEFINED;
+    m->resolving_funcs[0] = JS_UNDEFINED;
+    m->resolving_funcs[1] = JS_UNDEFINED;
+    list_add_tail(&m->link, &ctx->loaded_modules);
+    return m;
+}
+
+static void js_mark_module_def(JSRuntime *rt, JSModuleDef *m,
+                               JS_MarkFunc *mark_func)
+{
+    int i;
+
+    for(i = 0; i < m->export_entries_count; i++) {
+        JSExportEntry *me = &m->export_entries[i];
+        if (me->export_type == JS_EXPORT_TYPE_LOCAL &&
+            me->u.local.var_ref) {
+            mark_func(rt, &me->u.local.var_ref->header);
+        }
+    }
+
+    JS_MarkValue(rt, m->module_ns, mark_func);
+    JS_MarkValue(rt, m->func_obj, mark_func);
+    JS_MarkValue(rt, m->eval_exception, mark_func);
+    JS_MarkValue(rt, m->meta_obj, mark_func);
+    JS_MarkValue(rt, m->promise, mark_func);
+    JS_MarkValue(rt, m->resolving_funcs[0], mark_func);
+    JS_MarkValue(rt, m->resolving_funcs[1], mark_func);
+}
+
+static void js_free_module_def(JSContext *ctx, JSModuleDef *m)
+{
+    int i;
+
+    JS_FreeAtom(ctx, m->module_name);
+
+    for(i = 0; i < m->req_module_entries_count; i++) {
+        JSReqModuleEntry *rme = &m->req_module_entries[i];
+        JS_FreeAtom(ctx, rme->module_name);
+    }
+    js_free(ctx, m->req_module_entries);
+
+    for(i = 0; i < m->export_entries_count; i++) {
+        JSExportEntry *me = &m->export_entries[i];
+        if (me->export_type == JS_EXPORT_TYPE_LOCAL)
+            free_var_ref(ctx->rt, me->u.local.var_ref);
+        JS_FreeAtom(ctx, me->export_name);
+        JS_FreeAtom(ctx, me->local_name);
+    }
+    js_free(ctx, m->export_entries);
+
+    js_free(ctx, m->star_export_entries);
+
+    for(i = 0; i < m->import_entries_count; i++) {
+        JSImportEntry *mi = &m->import_entries[i];
+        JS_FreeAtom(ctx, mi->import_name);
+    }
+    js_free(ctx, m->import_entries);
+    js_free(ctx, m->async_parent_modules);
+
+    JS_FreeValue(ctx, m->module_ns);
+    JS_FreeValue(ctx, m->func_obj);
+    JS_FreeValue(ctx, m->eval_exception);
+    JS_FreeValue(ctx, m->meta_obj);
+    JS_FreeValue(ctx, m->promise);
+    JS_FreeValue(ctx, m->resolving_funcs[0]);
+    JS_FreeValue(ctx, m->resolving_funcs[1]);
+    list_del(&m->link);
+    js_free(ctx, m);
+}
+
+static int add_req_module_entry(JSContext *ctx, JSModuleDef *m,
+                                JSAtom module_name)
+{
+    JSReqModuleEntry *rme;
+    int i;
+
+    /* no need to add the module request if it is already present */
+    for(i = 0; i < m->req_module_entries_count; i++) {
+        rme = &m->req_module_entries[i];
+        if (rme->module_name == module_name)
+            return i;
+    }
+
+    if (js_resize_array(ctx, (void **)&m->req_module_entries,
+                        sizeof(JSReqModuleEntry),
+                        &m->req_module_entries_size,
+                        m->req_module_entries_count + 1))
+        return -1;
+    rme = &m->req_module_entries[m->req_module_entries_count++];
+    rme->module_name = JS_DupAtom(ctx, module_name);
+    rme->module = NULL;
+    return i;
+}
+
+static JSExportEntry *find_export_entry(JSContext *ctx, JSModuleDef *m,
+                                        JSAtom export_name)
+{
+    JSExportEntry *me;
+    int i;
+    for(i = 0; i < m->export_entries_count; i++) {
+        me = &m->export_entries[i];
+        if (me->export_name == export_name)
+            return me;
+    }
+    return NULL;
+}
+
+static JSExportEntry *add_export_entry2(JSContext *ctx,
+                                        JSParseState *s, JSModuleDef *m,
+                                       JSAtom local_name, JSAtom export_name,
+                                       JSExportTypeEnum export_type)
+{
+    JSExportEntry *me;
+
+    if (find_export_entry(ctx, m, export_name)) {
+        char buf1[ATOM_GET_STR_BUF_SIZE];
+        if (s) {
+            js_parse_error(s, "duplicate exported name '%s'",
+                           JS_AtomGetStr(ctx, buf1, sizeof(buf1), export_name));
+        } else {
+            JS_ThrowSyntaxErrorAtom(ctx, "duplicate exported name '%s'", export_name);
+        }
+        return NULL;
+    }
+
+    if (js_resize_array(ctx, (void **)&m->export_entries,
+                        sizeof(JSExportEntry),
+                        &m->export_entries_size,
+                        m->export_entries_count + 1))
+        return NULL;
+    me = &m->export_entries[m->export_entries_count++];
+    memset(me, 0, sizeof(*me));
+    me->local_name = JS_DupAtom(ctx, local_name);
+    me->export_name = JS_DupAtom(ctx, export_name);
+    me->export_type = export_type;
+    return me;
+}
+
+static JSExportEntry *add_export_entry(JSParseState *s, JSModuleDef *m,
+                                       JSAtom local_name, JSAtom export_name,
+                                       JSExportTypeEnum export_type)
+{
+    return add_export_entry2(s->ctx, s, m, local_name, export_name,
+                             export_type);
+}
+
+static int add_star_export_entry(JSContext *ctx, JSModuleDef *m,
+                                 int req_module_idx)
+{
+    JSStarExportEntry *se;
+
+    if (js_resize_array(ctx, (void **)&m->star_export_entries,
+                        sizeof(JSStarExportEntry),
+                        &m->star_export_entries_size,
+                        m->star_export_entries_count + 1))
+        return -1;
+    se = &m->star_export_entries[m->star_export_entries_count++];
+    se->req_module_idx = req_module_idx;
+    return 0;
+}
+
+/* create a C module */
+JSModuleDef *JS_NewCModule(JSContext *ctx, const char *name_str,
+                           JSModuleInitFunc *func)
+{
+    JSModuleDef *m;
+    JSAtom name;
+    name = JS_NewAtom(ctx, name_str);
+    if (name == JS_ATOM_NULL)
+        return NULL;
+    m = js_new_module_def(ctx, name);
+    m->init_func = func;
+    return m;
+}
+
+int JS_AddModuleExport(JSContext *ctx, JSModuleDef *m, const char *export_name)
+{
+    JSExportEntry *me;
+    JSAtom name;
+    name = JS_NewAtom(ctx, export_name);
+    if (name == JS_ATOM_NULL)
+        return -1;
+    me = add_export_entry2(ctx, NULL, m, JS_ATOM_NULL, name,
+                           JS_EXPORT_TYPE_LOCAL);
+    JS_FreeAtom(ctx, name);
+    if (!me)
+        return -1;
+    else
+        return 0;
+}
+
+int JS_SetModuleExport(JSContext *ctx, JSModuleDef *m, const char *export_name,
+                       JSValue val)
+{
+    JSExportEntry *me;
+    JSAtom name;
+    name = JS_NewAtom(ctx, export_name);
+    if (name == JS_ATOM_NULL)
+        goto fail;
+    me = find_export_entry(ctx, m, name);
+    JS_FreeAtom(ctx, name);
+    if (!me)
+        goto fail;
+    set_value(ctx, me->u.local.var_ref->pvalue, val);
+    return 0;
+ fail:
+    JS_FreeValue(ctx, val);
+    return -1;
+}
+
+void JS_SetModuleLoaderFunc(JSRuntime *rt,
+                            JSModuleNormalizeFunc *module_normalize,
+                            JSModuleLoaderFunc *module_loader, void *opaque)
+{
+    rt->module_normalize_func = module_normalize;
+    rt->module_loader_func = module_loader;
+    rt->module_loader_opaque = opaque;
+}
+
+/* default module filename normalizer */
+static char *js_default_module_normalize_name(JSContext *ctx,
+                                              const char *base_name,
+                                              const char *name)
+{
+    char *filename, *p;
+    const char *r;
+    int cap;
+    int len;
+
+    if (name[0] != '.') {
+        /* if no initial dot, the module name is not modified */
+        return js_strdup(ctx, name);
+    }
+
+    p = strrchr(base_name, '/');
+    if (p)
+        len = p - base_name;
+    else
+        len = 0;
+
+    cap = len + strlen(name) + 1 + 1;
+    filename = js_malloc(ctx, cap);
+    if (!filename)
+        return NULL;
+    memcpy(filename, base_name, len);
+    filename[len] = '\0';
+
+    /* we only normalize the leading '..' or '.' */
+    r = name;
+    for(;;) {
+        if (r[0] == '.' && r[1] == '/') {
+            r += 2;
+        } else if (r[0] == '.' && r[1] == '.' && r[2] == '/') {
+            /* remove the last path element of filename, except if "."
+               or ".." */
+            if (filename[0] == '\0')
+                break;
+            p = strrchr(filename, '/');
+            if (!p)
+                p = filename;
+            else
+                p++;
+            if (!strcmp(p, ".") || !strcmp(p, ".."))
+                break;
+            if (p > filename)
+                p--;
+            *p = '\0';
+            r += 3;
+        } else {
+            break;
+        }
+    }
+    if (filename[0] != '\0')
+        pstrcat(filename, cap, "/");
+    pstrcat(filename, cap, r);
+    //    printf("normalize: %s %s -> %s\n", base_name, name, filename);
+    return filename;
+}
+
+static JSModuleDef *js_find_loaded_module(JSContext *ctx, JSAtom name)
+{
+    struct list_head *el;
+    JSModuleDef *m;
+
+    /* first look at the loaded modules */
+    list_for_each(el, &ctx->loaded_modules) {
+        m = list_entry(el, JSModuleDef, link);
+        if (m->module_name == name)
+            return m;
+    }
+    return NULL;
+}
+
+/* return NULL in case of exception (e.g. module could not be loaded) */
+static JSModuleDef *js_host_resolve_imported_module(JSContext *ctx,
+                                                    const char *base_cname,
+                                                    const char *cname1)
+{
+    JSRuntime *rt = ctx->rt;
+    JSModuleDef *m;
+    char *cname;
+    JSAtom module_name;
+
+    if (!rt->module_normalize_func) {
+        cname = js_default_module_normalize_name(ctx, base_cname, cname1);
+    } else {
+        cname = rt->module_normalize_func(ctx, base_cname, cname1,
+                                          rt->module_loader_opaque);
+    }
+    if (!cname)
+        return NULL;
+
+    module_name = JS_NewAtom(ctx, cname);
+    if (module_name == JS_ATOM_NULL) {
+        js_free(ctx, cname);
+        return NULL;
+    }
+
+    /* first look at the loaded modules */
+    m = js_find_loaded_module(ctx, module_name);
+    if (m) {
+        js_free(ctx, cname);
+        JS_FreeAtom(ctx, module_name);
+        return m;
+    }
+
+    JS_FreeAtom(ctx, module_name);
+
+    /* load the module */
+    if (!rt->module_loader_func) {
+        /* XXX: use a syntax error ? */
+        JS_ThrowReferenceError(ctx, "could not load module '%s'",
+                               cname);
+        js_free(ctx, cname);
+        return NULL;
+    }
+
+    m = rt->module_loader_func(ctx, cname, rt->module_loader_opaque);
+    js_free(ctx, cname);
+    return m;
+}
+
+static JSModuleDef *js_host_resolve_imported_module_atom(JSContext *ctx,
+                                                    JSAtom base_module_name,
+                                                    JSAtom module_name1)
+{
+    const char *base_cname, *cname;
+    JSModuleDef *m;
+
+    base_cname = JS_AtomToCString(ctx, base_module_name);
+    if (!base_cname)
+        return NULL;
+    cname = JS_AtomToCString(ctx, module_name1);
+    if (!cname) {
+        JS_FreeCString(ctx, base_cname);
+        return NULL;
+    }
+    m = js_host_resolve_imported_module(ctx, base_cname, cname);
+    JS_FreeCString(ctx, base_cname);
+    JS_FreeCString(ctx, cname);
+    return m;
+}
+
+typedef struct JSResolveEntry {
+    JSModuleDef *module;
+    JSAtom name;
+} JSResolveEntry;
+
+typedef struct JSResolveState {
+    JSResolveEntry *array;
+    int size;
+    int count;
+} JSResolveState;
+
+static int find_resolve_entry(JSResolveState *s,
+                              JSModuleDef *m, JSAtom name)
+{
+    int i;
+    for(i = 0; i < s->count; i++) {
+        JSResolveEntry *re = &s->array[i];
+        if (re->module == m && re->name == name)
+            return i;
+    }
+    return -1;
+}
+
+static int add_resolve_entry(JSContext *ctx, JSResolveState *s,
+                             JSModuleDef *m, JSAtom name)
+{
+    JSResolveEntry *re;
+
+    if (js_resize_array(ctx, (void **)&s->array,
+                        sizeof(JSResolveEntry),
+                        &s->size, s->count + 1))
+        return -1;
+    re = &s->array[s->count++];
+    re->module = m;
+    re->name = JS_DupAtom(ctx, name);
+    return 0;
+}
+
+typedef enum JSResolveResultEnum {
+    JS_RESOLVE_RES_EXCEPTION = -1, /* memory alloc error */
+    JS_RESOLVE_RES_FOUND = 0,
+    JS_RESOLVE_RES_NOT_FOUND,
+    JS_RESOLVE_RES_CIRCULAR,
+    JS_RESOLVE_RES_AMBIGUOUS,
+} JSResolveResultEnum;
+
+static JSResolveResultEnum js_resolve_export1(JSContext *ctx,
+                                              JSModuleDef **pmodule,
+                                              JSExportEntry **pme,
+                                              JSModuleDef *m,
+                                              JSAtom export_name,
+                                              JSResolveState *s)
+{
+    JSExportEntry *me;
+
+    *pmodule = NULL;
+    *pme = NULL;
+    if (find_resolve_entry(s, m, export_name) >= 0)
+        return JS_RESOLVE_RES_CIRCULAR;
+    if (add_resolve_entry(ctx, s, m, export_name) < 0)
+        return JS_RESOLVE_RES_EXCEPTION;
+    me = find_export_entry(ctx, m, export_name);
+    if (me) {
+        if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
+            /* local export */
+            *pmodule = m;
+            *pme = me;
+            return JS_RESOLVE_RES_FOUND;
+        } else {
+            /* indirect export */
+            JSModuleDef *m1;
+            m1 = m->req_module_entries[me->u.req_module_idx].module;
+            if (me->local_name == JS_ATOM__star_) {
+                /* export ns from */
+                *pmodule = m;
+                *pme = me;
+                return JS_RESOLVE_RES_FOUND;
+            } else {
+                return js_resolve_export1(ctx, pmodule, pme, m1,
+                                          me->local_name, s);
+            }
+        }
+    } else {
+        if (export_name != JS_ATOM_default) {
+            /* not found in direct or indirect exports: try star exports */
+            int i;
+
+            for(i = 0; i < m->star_export_entries_count; i++) {
+                JSStarExportEntry *se = &m->star_export_entries[i];
+                JSModuleDef *m1, *res_m;
+                JSExportEntry *res_me;
+                JSResolveResultEnum ret;
+
+                m1 = m->req_module_entries[se->req_module_idx].module;
+                ret = js_resolve_export1(ctx, &res_m, &res_me, m1,
+                                         export_name, s);
+                if (ret == JS_RESOLVE_RES_AMBIGUOUS ||
+                    ret == JS_RESOLVE_RES_EXCEPTION) {
+                    return ret;
+                } else if (ret == JS_RESOLVE_RES_FOUND) {
+                    if (*pme != NULL) {
+                        if (*pmodule != res_m ||
+                            res_me->local_name != (*pme)->local_name) {
+                            *pmodule = NULL;
+                            *pme = NULL;
+                            return JS_RESOLVE_RES_AMBIGUOUS;
+                        }
+                    } else {
+                        *pmodule = res_m;
+                        *pme = res_me;
+                    }
+                }
+            }
+            if (*pme != NULL)
+                return JS_RESOLVE_RES_FOUND;
+        }
+        return JS_RESOLVE_RES_NOT_FOUND;
+    }
+}
+
+/* If the return value is JS_RESOLVE_RES_FOUND, return the module
+  (*pmodule) and the corresponding local export entry
+  (*pme). Otherwise return (NULL, NULL) */
+static JSResolveResultEnum js_resolve_export(JSContext *ctx,
+                                             JSModuleDef **pmodule,
+                                             JSExportEntry **pme,
+                                             JSModuleDef *m,
+                                             JSAtom export_name)
+{
+    JSResolveState ss, *s = &ss;
+    int i;
+    JSResolveResultEnum ret;
+
+    s->array = NULL;
+    s->size = 0;
+    s->count = 0;
+
+    ret = js_resolve_export1(ctx, pmodule, pme, m, export_name, s);
+
+    for(i = 0; i < s->count; i++)
+        JS_FreeAtom(ctx, s->array[i].name);
+    js_free(ctx, s->array);
+
+    return ret;
+}
+
+static void js_resolve_export_throw_error(JSContext *ctx,
+                                          JSResolveResultEnum res,
+                                          JSModuleDef *m, JSAtom export_name)
+{
+    char buf1[ATOM_GET_STR_BUF_SIZE];
+    char buf2[ATOM_GET_STR_BUF_SIZE];
+    switch(res) {
+    case JS_RESOLVE_RES_EXCEPTION:
+        break;
+    default:
+    case JS_RESOLVE_RES_NOT_FOUND:
+        JS_ThrowSyntaxError(ctx, "Could not find export '%s' in module '%s'",
+                            JS_AtomGetStr(ctx, buf1, sizeof(buf1), export_name),
+                            JS_AtomGetStr(ctx, buf2, sizeof(buf2), m->module_name));
+        break;
+    case JS_RESOLVE_RES_CIRCULAR:
+        JS_ThrowSyntaxError(ctx, "circular reference when looking for export '%s' in module '%s'",
+                            JS_AtomGetStr(ctx, buf1, sizeof(buf1), export_name),
+                            JS_AtomGetStr(ctx, buf2, sizeof(buf2), m->module_name));
+        break;
+    case JS_RESOLVE_RES_AMBIGUOUS:
+        JS_ThrowSyntaxError(ctx, "export '%s' in module '%s' is ambiguous",
+                            JS_AtomGetStr(ctx, buf1, sizeof(buf1), export_name),
+                            JS_AtomGetStr(ctx, buf2, sizeof(buf2), m->module_name));
+        break;
+    }
+}
+
+
+typedef enum {
+    EXPORTED_NAME_AMBIGUOUS,
+    EXPORTED_NAME_NORMAL,
+    EXPORTED_NAME_NS,
+} ExportedNameEntryEnum;
+
+typedef struct ExportedNameEntry {
+    JSAtom export_name;
+    ExportedNameEntryEnum export_type;
+    union {
+        JSExportEntry *me; /* using when the list is built */
+        JSVarRef *var_ref; /* EXPORTED_NAME_NORMAL */
+        JSModuleDef *module; /* for EXPORTED_NAME_NS */
+    } u;
+} ExportedNameEntry;
+
+typedef struct GetExportNamesState {
+    JSModuleDef **modules;
+    int modules_size;
+    int modules_count;
+
+    ExportedNameEntry *exported_names;
+    int exported_names_size;
+    int exported_names_count;
+} GetExportNamesState;
+
+static int find_exported_name(GetExportNamesState *s, JSAtom name)
+{
+    int i;
+    for(i = 0; i < s->exported_names_count; i++) {
+        if (s->exported_names[i].export_name == name)
+            return i;
+    }
+    return -1;
+}
+
+static __exception int get_exported_names(JSContext *ctx,
+                                          GetExportNamesState *s,
+                                          JSModuleDef *m, BOOL from_star)
+{
+    ExportedNameEntry *en;
+    int i, j;
+
+    /* check circular reference */
+    for(i = 0; i < s->modules_count; i++) {
+        if (s->modules[i] == m)
+            return 0;
+    }
+    if (js_resize_array(ctx, (void **)&s->modules, sizeof(s->modules[0]),
+                        &s->modules_size, s->modules_count + 1))
+        return -1;
+    s->modules[s->modules_count++] = m;
+
+    for(i = 0; i < m->export_entries_count; i++) {
+        JSExportEntry *me = &m->export_entries[i];
+        if (from_star && me->export_name == JS_ATOM_default)
+            continue;
+        j = find_exported_name(s, me->export_name);
+        if (j < 0) {
+            if (js_resize_array(ctx, (void **)&s->exported_names, sizeof(s->exported_names[0]),
+                                &s->exported_names_size,
+                                s->exported_names_count + 1))
+                return -1;
+            en = &s->exported_names[s->exported_names_count++];
+            en->export_name = me->export_name;
+            /* avoid a second lookup for simple module exports */
+            if (from_star || me->export_type != JS_EXPORT_TYPE_LOCAL)
+                en->u.me = NULL;
+            else
+                en->u.me = me;
+        } else {
+            en = &s->exported_names[j];
+            en->u.me = NULL;
+        }
+    }
+    for(i = 0; i < m->star_export_entries_count; i++) {
+        JSStarExportEntry *se = &m->star_export_entries[i];
+        JSModuleDef *m1;
+        m1 = m->req_module_entries[se->req_module_idx].module;
+        if (get_exported_names(ctx, s, m1, TRUE))
+            return -1;
+    }
+    return 0;
+}
+
+/* Unfortunately, the spec gives a different behavior from GetOwnProperty ! */
+static int js_module_ns_has(JSContext *ctx, JSValueConst obj, JSAtom atom)
+{
+    return (find_own_property1(JS_VALUE_GET_OBJ(obj), atom) != NULL);
+}
+
+static const JSClassExoticMethods js_module_ns_exotic_methods = {
+    .has_property = js_module_ns_has,
+};
+
+static int exported_names_cmp(const void *p1, const void *p2, void *opaque)
+{
+    JSContext *ctx = opaque;
+    const ExportedNameEntry *me1 = p1;
+    const ExportedNameEntry *me2 = p2;
+    JSValue str1, str2;
+    int ret;
+
+    /* XXX: should avoid allocation memory in atom comparison */
+    str1 = JS_AtomToString(ctx, me1->export_name);
+    str2 = JS_AtomToString(ctx, me2->export_name);
+    if (JS_IsException(str1) || JS_IsException(str2)) {
+        /* XXX: raise an error ? */
+        ret = 0;
+    } else {
+        ret = js_string_compare(ctx, JS_VALUE_GET_STRING(str1),
+                                JS_VALUE_GET_STRING(str2));
+    }
+    JS_FreeValue(ctx, str1);
+    JS_FreeValue(ctx, str2);
+    return ret;
+}
+
+static JSValue js_module_ns_autoinit(JSContext *ctx, JSObject *p, JSAtom atom,
+                                     void *opaque)
+{
+    JSModuleDef *m = opaque;
+    return JS_GetModuleNamespace(ctx, m);
+}
+
+static JSValue js_build_module_ns(JSContext *ctx, JSModuleDef *m)
+{
+    JSValue obj;
+    JSObject *p;
+    GetExportNamesState s_s, *s = &s_s;
+    int i, ret;
+    JSProperty *pr;
+
+    obj = JS_NewObjectClass(ctx, JS_CLASS_MODULE_NS);
+    if (JS_IsException(obj))
+        return obj;
+    p = JS_VALUE_GET_OBJ(obj);
+
+    memset(s, 0, sizeof(*s));
+    ret = get_exported_names(ctx, s, m, FALSE);
+    js_free(ctx, s->modules);
+    if (ret)
+        goto fail;
+
+    /* Resolve the exported names. The ambiguous exports are removed */
+    for(i = 0; i < s->exported_names_count; i++) {
+        ExportedNameEntry *en = &s->exported_names[i];
+        JSResolveResultEnum res;
+        JSExportEntry *res_me;
+        JSModuleDef *res_m;
+
+        if (en->u.me) {
+            res_me = en->u.me; /* fast case: no resolution needed */
+            res_m = m;
+            res = JS_RESOLVE_RES_FOUND;
+        } else {
+            res = js_resolve_export(ctx, &res_m, &res_me, m,
+                                    en->export_name);
+        }
+        if (res != JS_RESOLVE_RES_FOUND) {
+            if (res != JS_RESOLVE_RES_AMBIGUOUS) {
+                js_resolve_export_throw_error(ctx, res, m, en->export_name);
+                goto fail;
+            }
+            en->export_type = EXPORTED_NAME_AMBIGUOUS;
+        } else {
+            if (res_me->local_name == JS_ATOM__star_) {
+                en->export_type = EXPORTED_NAME_NS;
+                en->u.module = res_m->req_module_entries[res_me->u.req_module_idx].module;
+            } else {
+                en->export_type = EXPORTED_NAME_NORMAL;
+                if (res_me->u.local.var_ref) {
+                    en->u.var_ref = res_me->u.local.var_ref;
+                } else {
+                    JSObject *p1 = JS_VALUE_GET_OBJ(res_m->func_obj);
+                    en->u.var_ref = p1->u.func.var_refs[res_me->u.local.var_idx];
+                }
+            }
+        }
+    }
+
+    /* sort the exported names */
+    rqsort(s->exported_names, s->exported_names_count,
+           sizeof(s->exported_names[0]), exported_names_cmp, ctx);
+
+    for(i = 0; i < s->exported_names_count; i++) {
+        ExportedNameEntry *en = &s->exported_names[i];
+        switch(en->export_type) {
+        case EXPORTED_NAME_NORMAL:
+            {
+                JSVarRef *var_ref = en->u.var_ref;
+                pr = add_property(ctx, p, en->export_name,
+                                  JS_PROP_ENUMERABLE | JS_PROP_WRITABLE |
+                                  JS_PROP_VARREF);
+                if (!pr)
+                    goto fail;
+                var_ref->header.ref_count++;
+                pr->u.var_ref = var_ref;
+            }
+            break;
+        case EXPORTED_NAME_NS:
+            /* the exported namespace must be created on demand */
+            if (JS_DefineAutoInitProperty(ctx, obj,
+                                          en->export_name,
+                                          JS_AUTOINIT_ID_MODULE_NS,
+                                          en->u.module, JS_PROP_ENUMERABLE | JS_PROP_WRITABLE) < 0)
+                goto fail;
+            break;
+        default:
+            break;
+        }
+    }
+
+    js_free(ctx, s->exported_names);
+
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_Symbol_toStringTag,
+                           JS_AtomToString(ctx, JS_ATOM_Module),
+                           0);
+
+    p->extensible = FALSE;
+    return obj;
+ fail:
+    js_free(ctx, s->exported_names);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+JSValue JS_GetModuleNamespace(JSContext *ctx, JSModuleDef *m)
+{
+    if (JS_IsUndefined(m->module_ns)) {
+        JSValue val;
+        val = js_build_module_ns(ctx, m);
+        if (JS_IsException(val))
+            return JS_EXCEPTION;
+        m->module_ns = val;
+    }
+    return JS_DupValue(ctx, m->module_ns);
+}
+
+/* Load all the required modules for module 'm' */
+static int js_resolve_module(JSContext *ctx, JSModuleDef *m)
+{
+    int i;
+    JSModuleDef *m1;
+
+    if (m->resolved)
+        return 0;
+#ifdef DUMP_MODULE_RESOLVE
+    {
+        char buf1[ATOM_GET_STR_BUF_SIZE];
+        printf("resolving module '%s':\n", JS_AtomGetStr(ctx, buf1, sizeof(buf1), m->module_name));
+    }
+#endif
+    m->resolved = TRUE;
+    /* resolve each requested module */
+    for(i = 0; i < m->req_module_entries_count; i++) {
+        JSReqModuleEntry *rme = &m->req_module_entries[i];
+        m1 = js_host_resolve_imported_module_atom(ctx, m->module_name,
+                                                  rme->module_name);
+        if (!m1)
+            return -1;
+        rme->module = m1;
+        /* already done in js_host_resolve_imported_module() except if
+           the module was loaded with JS_EvalBinary() */
+        if (js_resolve_module(ctx, m1) < 0)
+            return -1;
+    }
+    return 0;
+}
+
+static JSVarRef *js_create_module_var(JSContext *ctx, BOOL is_lexical)
+{
+    JSVarRef *var_ref;
+    var_ref = js_malloc(ctx, sizeof(JSVarRef));
+    if (!var_ref)
+        return NULL;
+    var_ref->header.ref_count = 1;
+    if (is_lexical)
+        var_ref->value = JS_UNINITIALIZED;
+    else
+        var_ref->value = JS_UNDEFINED;
+    var_ref->pvalue = &var_ref->value;
+    var_ref->is_detached = TRUE;
+    add_gc_object(ctx->rt, &var_ref->header, JS_GC_OBJ_TYPE_VAR_REF);
+    return var_ref;
+}
+
+/* Create the <eval> function associated with the module */
+static int js_create_module_bytecode_function(JSContext *ctx, JSModuleDef *m)
+{
+    JSFunctionBytecode *b;
+    int i;
+    JSVarRef **var_refs;
+    JSValue func_obj, bfunc;
+    JSObject *p;
+
+    bfunc = m->func_obj;
+    func_obj = JS_NewObjectProtoClass(ctx, ctx->function_proto,
+                                      JS_CLASS_BYTECODE_FUNCTION);
+
+    if (JS_IsException(func_obj))
+        return -1;
+    b = JS_VALUE_GET_PTR(bfunc);
+
+    p = JS_VALUE_GET_OBJ(func_obj);
+    p->u.func.function_bytecode = b;
+    b->header.ref_count++;
+    p->u.func.home_object = NULL;
+    p->u.func.var_refs = NULL;
+    if (b->closure_var_count) {
+        var_refs = js_mallocz(ctx, sizeof(var_refs[0]) * b->closure_var_count);
+        if (!var_refs)
+            goto fail;
+        p->u.func.var_refs = var_refs;
+
+        /* create the global variables. The other variables are
+           imported from other modules */
+        for(i = 0; i < b->closure_var_count; i++) {
+            JSClosureVar *cv = &b->closure_var[i];
+            JSVarRef *var_ref;
+            if (cv->is_local) {
+                var_ref = js_create_module_var(ctx, cv->is_lexical);
+                if (!var_ref)
+                    goto fail;
+#ifdef DUMP_MODULE_RESOLVE
+                printf("local %d: %p\n", i, var_ref);
+#endif
+                var_refs[i] = var_ref;
+            }
+        }
+    }
+    m->func_obj = func_obj;
+    JS_FreeValue(ctx, bfunc);
+    return 0;
+ fail:
+    JS_FreeValue(ctx, func_obj);
+    return -1;
+}
+
+/* must be done before js_link_module() because of cyclic references */
+static int js_create_module_function(JSContext *ctx, JSModuleDef *m)
+{
+    BOOL is_c_module;
+    int i;
+    JSVarRef *var_ref;
+
+    if (m->func_created)
+        return 0;
+
+    is_c_module = (m->init_func != NULL);
+
+    if (is_c_module) {
+        /* initialize the exported variables */
+        for(i = 0; i < m->export_entries_count; i++) {
+            JSExportEntry *me = &m->export_entries[i];
+            if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
+                var_ref = js_create_module_var(ctx, FALSE);
+                if (!var_ref)
+                    return -1;
+                me->u.local.var_ref = var_ref;
+            }
+        }
+    } else {
+        if (js_create_module_bytecode_function(ctx, m))
+            return -1;
+    }
+    m->func_created = TRUE;
+
+    /* do it on the dependencies */
+
+    for(i = 0; i < m->req_module_entries_count; i++) {
+        JSReqModuleEntry *rme = &m->req_module_entries[i];
+        if (js_create_module_function(ctx, rme->module) < 0)
+            return -1;
+    }
+
+    return 0;
+}
+
+
+/* Prepare a module to be executed by resolving all the imported
+   variables. */
+static int js_inner_module_linking(JSContext *ctx, JSModuleDef *m,
+                                   JSModuleDef **pstack_top, int index)
+{
+    int i;
+    JSImportEntry *mi;
+    JSModuleDef *m1;
+    JSVarRef **var_refs, *var_ref;
+    JSObject *p;
+    BOOL is_c_module;
+    JSValue ret_val;
+
+    if (js_check_stack_overflow(ctx->rt, 0)) {
+        JS_ThrowStackOverflow(ctx);
+        return -1;
+    }
+
+#ifdef DUMP_MODULE_RESOLVE
+    {
+        char buf1[ATOM_GET_STR_BUF_SIZE];
+        printf("js_inner_module_linking '%s':\n", JS_AtomGetStr(ctx, buf1, sizeof(buf1), m->module_name));
+    }
+#endif
+
+    if (m->status == JS_MODULE_STATUS_LINKING ||
+        m->status == JS_MODULE_STATUS_LINKED ||
+        m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+        m->status == JS_MODULE_STATUS_EVALUATED)
+        return index;
+
+    assert(m->status == JS_MODULE_STATUS_UNLINKED);
+    m->status = JS_MODULE_STATUS_LINKING;
+    m->dfs_index = index;
+    m->dfs_ancestor_index = index;
+    index++;
+    /* push 'm' on stack */
+    m->stack_prev = *pstack_top;
+    *pstack_top = m;
+
+    for(i = 0; i < m->req_module_entries_count; i++) {
+        JSReqModuleEntry *rme = &m->req_module_entries[i];
+        m1 = rme->module;
+        index = js_inner_module_linking(ctx, m1, pstack_top, index);
+        if (index < 0)
+            goto fail;
+        assert(m1->status == JS_MODULE_STATUS_LINKING ||
+               m1->status == JS_MODULE_STATUS_LINKED ||
+               m1->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+               m1->status == JS_MODULE_STATUS_EVALUATED);
+        if (m1->status == JS_MODULE_STATUS_LINKING) {
+            m->dfs_ancestor_index = min_int(m->dfs_ancestor_index,
+                                            m1->dfs_ancestor_index);
+        }
+    }
+
+#ifdef DUMP_MODULE_RESOLVE
+    {
+        char buf1[ATOM_GET_STR_BUF_SIZE];
+        printf("instantiating module '%s':\n", JS_AtomGetStr(ctx, buf1, sizeof(buf1), m->module_name));
+    }
+#endif
+    /* check the indirect exports */
+    for(i = 0; i < m->export_entries_count; i++) {
+        JSExportEntry *me = &m->export_entries[i];
+        if (me->export_type == JS_EXPORT_TYPE_INDIRECT &&
+            me->local_name != JS_ATOM__star_) {
+            JSResolveResultEnum ret;
+            JSExportEntry *res_me;
+            JSModuleDef *res_m, *m1;
+            m1 = m->req_module_entries[me->u.req_module_idx].module;
+            ret = js_resolve_export(ctx, &res_m, &res_me, m1, me->local_name);
+            if (ret != JS_RESOLVE_RES_FOUND) {
+                js_resolve_export_throw_error(ctx, ret, m, me->export_name);
+                goto fail;
+            }
+        }
+    }
+
+#ifdef DUMP_MODULE_RESOLVE
+    {
+        printf("exported bindings:\n");
+        for(i = 0; i < m->export_entries_count; i++) {
+            JSExportEntry *me = &m->export_entries[i];
+            printf(" name="); print_atom(ctx, me->export_name);
+            printf(" local="); print_atom(ctx, me->local_name);
+            printf(" type=%d idx=%d\n", me->export_type, me->u.local.var_idx);
+        }
+    }
+#endif
+
+    is_c_module = (m->init_func != NULL);
+
+    if (!is_c_module) {
+        p = JS_VALUE_GET_OBJ(m->func_obj);
+        var_refs = p->u.func.var_refs;
+
+        for(i = 0; i < m->import_entries_count; i++) {
+            mi = &m->import_entries[i];
+#ifdef DUMP_MODULE_RESOLVE
+            printf("import var_idx=%d name=", mi->var_idx);
+            print_atom(ctx, mi->import_name);
+            printf(": ");
+#endif
+            m1 = m->req_module_entries[mi->req_module_idx].module;
+            if (mi->import_name == JS_ATOM__star_) {
+                JSValue val;
+                /* name space import */
+                val = JS_GetModuleNamespace(ctx, m1);
+                if (JS_IsException(val))
+                    goto fail;
+                set_value(ctx, &var_refs[mi->var_idx]->value, val);
+#ifdef DUMP_MODULE_RESOLVE
+                printf("namespace\n");
+#endif
+            } else {
+                JSResolveResultEnum ret;
+                JSExportEntry *res_me;
+                JSModuleDef *res_m;
+                JSObject *p1;
+
+                ret = js_resolve_export(ctx, &res_m,
+                                        &res_me, m1, mi->import_name);
+                if (ret != JS_RESOLVE_RES_FOUND) {
+                    js_resolve_export_throw_error(ctx, ret, m1, mi->import_name);
+                    goto fail;
+                }
+                if (res_me->local_name == JS_ATOM__star_) {
+                    JSValue val;
+                    JSModuleDef *m2;
+                    /* name space import from */
+                    m2 = res_m->req_module_entries[res_me->u.req_module_idx].module;
+                    val = JS_GetModuleNamespace(ctx, m2);
+                    if (JS_IsException(val))
+                        goto fail;
+                    var_ref = js_create_module_var(ctx, TRUE);
+                    if (!var_ref) {
+                        JS_FreeValue(ctx, val);
+                        goto fail;
+                    }
+                    set_value(ctx, &var_ref->value, val);
+                    var_refs[mi->var_idx] = var_ref;
+#ifdef DUMP_MODULE_RESOLVE
+                    printf("namespace from\n");
+#endif
+                } else {
+                    var_ref = res_me->u.local.var_ref;
+                    if (!var_ref) {
+                        p1 = JS_VALUE_GET_OBJ(res_m->func_obj);
+                        var_ref = p1->u.func.var_refs[res_me->u.local.var_idx];
+                    }
+                    var_ref->header.ref_count++;
+                    var_refs[mi->var_idx] = var_ref;
+#ifdef DUMP_MODULE_RESOLVE
+                    printf("local export (var_ref=%p)\n", var_ref);
+#endif
+                }
+            }
+        }
+
+        /* keep the exported variables in the module export entries (they
+           are used when the eval function is deleted and cannot be
+           initialized before in case imports are exported) */
+        for(i = 0; i < m->export_entries_count; i++) {
+            JSExportEntry *me = &m->export_entries[i];
+            if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
+                var_ref = var_refs[me->u.local.var_idx];
+                var_ref->header.ref_count++;
+                me->u.local.var_ref = var_ref;
+            }
+        }
+
+        /* initialize the global variables */
+        ret_val = JS_Call(ctx, m->func_obj, JS_TRUE, 0, NULL);
+        if (JS_IsException(ret_val))
+            goto fail;
+        JS_FreeValue(ctx, ret_val);
+    }
+
+    assert(m->dfs_ancestor_index <= m->dfs_index);
+    if (m->dfs_index == m->dfs_ancestor_index) {
+        for(;;) {
+            /* pop m1 from stack */
+            m1 = *pstack_top;
+            *pstack_top = m1->stack_prev;
+            m1->status = JS_MODULE_STATUS_LINKED;
+            if (m1 == m)
+                break;
+        }
+    }
+
+#ifdef DUMP_MODULE_RESOLVE
+    printf("js_inner_module_linking done\n");
+#endif
+    return index;
+ fail:
+    return -1;
+}
+
+/* Prepare a module to be executed by resolving all the imported
+   variables. */
+static int js_link_module(JSContext *ctx, JSModuleDef *m)
+{
+    JSModuleDef *stack_top, *m1;
+
+#ifdef DUMP_MODULE_RESOLVE
+    {
+        char buf1[ATOM_GET_STR_BUF_SIZE];
+        printf("js_link_module '%s':\n", JS_AtomGetStr(ctx, buf1, sizeof(buf1), m->module_name));
+    }
+#endif
+    assert(m->status == JS_MODULE_STATUS_UNLINKED ||
+           m->status == JS_MODULE_STATUS_LINKED ||
+           m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+           m->status == JS_MODULE_STATUS_EVALUATED);
+    stack_top = NULL;
+    if (js_inner_module_linking(ctx, m, &stack_top, 0) < 0) {
+        while (stack_top != NULL) {
+            m1 = stack_top;
+            assert(m1->status == JS_MODULE_STATUS_LINKING);
+            m1->status = JS_MODULE_STATUS_UNLINKED;
+            stack_top = m1->stack_prev;
+        }
+        return -1;
+    }
+    assert(stack_top == NULL);
+    assert(m->status == JS_MODULE_STATUS_LINKED ||
+           m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+           m->status == JS_MODULE_STATUS_EVALUATED);
+    return 0;
+}
+
+/* return JS_ATOM_NULL if the name cannot be found. Only works with
+   not striped bytecode functions. */
+JSAtom JS_GetScriptOrModuleName(JSContext *ctx, int n_stack_levels)
+{
+    JSStackFrame *sf;
+    JSFunctionBytecode *b;
+    JSObject *p;
+    /* XXX: currently we just use the filename of the englobing
+       function from the debug info. May need to add a ScriptOrModule
+       info in JSFunctionBytecode. */
+    sf = ctx->rt->current_stack_frame;
+    if (!sf)
+        return JS_ATOM_NULL;
+    while (n_stack_levels-- > 0) {
+        sf = sf->prev_frame;
+        if (!sf)
+            return JS_ATOM_NULL;
+    }
+    for(;;) {
+        if (JS_VALUE_GET_TAG(sf->cur_func) != JS_TAG_OBJECT)
+            return JS_ATOM_NULL;
+        p = JS_VALUE_GET_OBJ(sf->cur_func);
+        if (!js_class_has_bytecode(p->class_id))
+            return JS_ATOM_NULL;
+        b = p->u.func.function_bytecode;
+        if (!b->is_direct_or_indirect_eval) {
+            if (!b->has_debug)
+                return JS_ATOM_NULL;
+            return JS_DupAtom(ctx, b->debug.filename);
+        } else {
+            sf = sf->prev_frame;
+            if (!sf)
+                return JS_ATOM_NULL;
+        }
+    }
+}
+
+JSAtom JS_GetModuleName(JSContext *ctx, JSModuleDef *m)
+{
+    return JS_DupAtom(ctx, m->module_name);
+}
+
+JSValue JS_GetImportMeta(JSContext *ctx, JSModuleDef *m)
+{
+    JSValue obj;
+    /* allocate meta_obj only if requested to save memory */
+    obj = m->meta_obj;
+    if (JS_IsUndefined(obj)) {
+        obj = JS_NewObjectProto(ctx, JS_NULL);
+        if (JS_IsException(obj))
+            return JS_EXCEPTION;
+        m->meta_obj = obj;
+    }
+    return JS_DupValue(ctx, obj);
+}
+
+static JSValue js_import_meta(JSContext *ctx)
+{
+    JSAtom filename;
+    JSModuleDef *m;
+
+    filename = JS_GetScriptOrModuleName(ctx, 0);
+    if (filename == JS_ATOM_NULL)
+        goto fail;
+
+    /* XXX: inefficient, need to add a module or script pointer in
+       JSFunctionBytecode */
+    m = js_find_loaded_module(ctx, filename);
+    JS_FreeAtom(ctx, filename);
+    if (!m) {
+    fail:
+        JS_ThrowTypeError(ctx, "import.meta not supported in this context");
+        return JS_EXCEPTION;
+    }
+    return JS_GetImportMeta(ctx, m);
+}
+
+static JSValue JS_NewModuleValue(JSContext *ctx, JSModuleDef *m)
+{
+    return JS_DupValue(ctx, JS_MKPTR(JS_TAG_MODULE, m));
+}
+
+static JSValue js_load_module_rejected(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv, int magic, JSValue *func_data)
+{
+    JSValueConst *resolving_funcs = (JSValueConst *)func_data;
+    JSValueConst error;
+    JSValue ret;
+
+    /* XXX: check if the test is necessary */
+    if (argc >= 1)
+        error = argv[0];
+    else
+        error = JS_UNDEFINED;
+    ret = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED,
+                  1, &error);
+    JS_FreeValue(ctx, ret);
+    return JS_UNDEFINED;
+}
+
+static JSValue js_load_module_fulfilled(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv, int magic, JSValue *func_data)
+{
+    JSValueConst *resolving_funcs = (JSValueConst *)func_data;
+    JSModuleDef *m = JS_VALUE_GET_PTR(func_data[2]);
+    JSValue ret, ns;
+
+    /* return the module namespace */
+    ns = JS_GetModuleNamespace(ctx, m);
+    if (JS_IsException(ns)) {
+        JSValue err = JS_GetException(ctx);
+        js_load_module_rejected(ctx, JS_UNDEFINED, 1, (JSValueConst *)&err, 0, func_data);
+        return JS_UNDEFINED;
+    }
+    ret = JS_Call(ctx, resolving_funcs[0], JS_UNDEFINED,
+                   1, (JSValueConst *)&ns);
+    JS_FreeValue(ctx, ret);
+    JS_FreeValue(ctx, ns);
+    return JS_UNDEFINED;
+}
+
+static void JS_LoadModuleInternal(JSContext *ctx, const char *basename,
+                                  const char *filename,
+                                  JSValueConst *resolving_funcs)
+{
+    JSValue evaluate_promise;
+    JSModuleDef *m;
+    JSValue ret, err, func_obj, evaluate_resolving_funcs[2];
+    JSValueConst func_data[3];
+
+    m = js_host_resolve_imported_module(ctx, basename, filename);
+    if (!m)
+        goto fail;
+
+    if (js_resolve_module(ctx, m) < 0) {
+        js_free_modules(ctx, JS_FREE_MODULE_NOT_RESOLVED);
+        goto fail;
+    }
+
+    /* Evaluate the module code */
+    func_obj = JS_NewModuleValue(ctx, m);
+    evaluate_promise = JS_EvalFunction(ctx, func_obj);
+    if (JS_IsException(evaluate_promise)) {
+    fail:
+        err = JS_GetException(ctx);
+        ret = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED,
+                      1, (JSValueConst *)&err);
+        JS_FreeValue(ctx, ret); /* XXX: what to do if exception ? */
+        JS_FreeValue(ctx, err);
+        return;
+    }
+
+    func_obj = JS_NewModuleValue(ctx, m);
+    func_data[0] = resolving_funcs[0];
+    func_data[1] = resolving_funcs[1];
+    func_data[2] = func_obj;
+    evaluate_resolving_funcs[0] = JS_NewCFunctionData(ctx, js_load_module_fulfilled, 0, 0, 3, func_data);
+    evaluate_resolving_funcs[1] = JS_NewCFunctionData(ctx, js_load_module_rejected, 0, 0, 3, func_data);
+    JS_FreeValue(ctx, func_obj);
+    ret = js_promise_then(ctx, evaluate_promise, 2, (JSValueConst *)evaluate_resolving_funcs);
+    JS_FreeValue(ctx, ret);
+    JS_FreeValue(ctx, evaluate_resolving_funcs[0]);
+    JS_FreeValue(ctx, evaluate_resolving_funcs[1]);
+    JS_FreeValue(ctx, evaluate_promise);
+}
+
+/* Return a promise or an exception in case of memory error. Used by
+   os.Worker() */
+JSValue JS_LoadModule(JSContext *ctx, const char *basename,
+                      const char *filename)
+{
+    JSValue promise, resolving_funcs[2];
+
+    promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+    if (JS_IsException(promise))
+        return JS_EXCEPTION;
+    JS_LoadModuleInternal(ctx, basename, filename,
+                          (JSValueConst *)resolving_funcs);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    return promise;
+}
+
+static JSValue js_dynamic_import_job(JSContext *ctx,
+                                     int argc, JSValueConst *argv)
+{
+    JSValueConst *resolving_funcs = argv;
+    JSValueConst basename_val = argv[2];
+    JSValueConst specifier = argv[3];
+    const char *basename = NULL, *filename;
+    JSValue ret, err;
+
+    if (!JS_IsString(basename_val)) {
+        JS_ThrowTypeError(ctx, "no function filename for import()");
+        goto exception;
+    }
+    basename = JS_ToCString(ctx, basename_val);
+    if (!basename)
+        goto exception;
+
+    filename = JS_ToCString(ctx, specifier);
+    if (!filename)
+        goto exception;
+
+    JS_LoadModuleInternal(ctx, basename, filename,
+                          resolving_funcs);
+    JS_FreeCString(ctx, filename);
+    JS_FreeCString(ctx, basename);
+    return JS_UNDEFINED;
+ exception:
+    err = JS_GetException(ctx);
+    ret = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED,
+                   1, (JSValueConst *)&err);
+    JS_FreeValue(ctx, ret); /* XXX: what to do if exception ? */
+    JS_FreeValue(ctx, err);
+    JS_FreeCString(ctx, basename);
+    return JS_UNDEFINED;
+}
+
+static JSValue js_dynamic_import(JSContext *ctx, JSValueConst specifier)
+{
+    JSAtom basename;
+    JSValue promise, resolving_funcs[2], basename_val;
+    JSValueConst args[4];
+
+    basename = JS_GetScriptOrModuleName(ctx, 0);
+    if (basename == JS_ATOM_NULL)
+        basename_val = JS_NULL;
+    else
+        basename_val = JS_AtomToValue(ctx, basename);
+    JS_FreeAtom(ctx, basename);
+    if (JS_IsException(basename_val))
+        return basename_val;
+
+    promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+    if (JS_IsException(promise)) {
+        JS_FreeValue(ctx, basename_val);
+        return promise;
+    }
+
+    args[0] = resolving_funcs[0];
+    args[1] = resolving_funcs[1];
+    args[2] = basename_val;
+    args[3] = specifier;
+
+    /* cannot run JS_LoadModuleInternal synchronously because it would
+       cause an unexpected recursion in js_evaluate_module() */
+    JS_EnqueueJob(ctx, js_dynamic_import_job, 4, args);
+
+    JS_FreeValue(ctx, basename_val);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    return promise;
+}
+
+static void js_set_module_evaluated(JSContext *ctx, JSModuleDef *m)
+{
+    m->status = JS_MODULE_STATUS_EVALUATED;
+    if (!JS_IsUndefined(m->promise)) {
+        JSValue value, ret_val;
+        assert(m->cycle_root == m);
+        value = JS_UNDEFINED;
+        ret_val = JS_Call(ctx, m->resolving_funcs[0], JS_UNDEFINED,
+                          1, (JSValueConst *)&value);
+        JS_FreeValue(ctx, ret_val);
+    }
+}
+
+typedef struct {
+    JSModuleDef **tab;
+    int count;
+    int size;
+} ExecModuleList;
+
+/* XXX: slow. Could use a linked list instead of ExecModuleList */
+static BOOL find_in_exec_module_list(ExecModuleList *exec_list, JSModuleDef *m)
+{
+    int i;
+    for(i = 0; i < exec_list->count; i++) {
+        if (exec_list->tab[i] == m)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+static int gather_available_ancestors(JSContext *ctx, JSModuleDef *module,
+                                      ExecModuleList *exec_list)
+{
+    int i;
+
+    if (js_check_stack_overflow(ctx->rt, 0)) {
+        JS_ThrowStackOverflow(ctx);
+        return -1;
+    }
+    for(i = 0; i < module->async_parent_modules_count; i++) {
+        JSModuleDef *m = module->async_parent_modules[i];
+        if (!find_in_exec_module_list(exec_list, m) &&
+            !m->cycle_root->eval_has_exception) {
+            assert(m->status == JS_MODULE_STATUS_EVALUATING_ASYNC);
+            assert(!m->eval_has_exception);
+            assert(m->async_evaluation);
+            assert(m->pending_async_dependencies > 0);
+            m->pending_async_dependencies--;
+            if (m->pending_async_dependencies == 0) {
+                if (js_resize_array(ctx, (void **)&exec_list->tab, sizeof(exec_list->tab[0]), &exec_list->size, exec_list->count + 1)) {
+                    return -1;
+                }
+                exec_list->tab[exec_list->count++] = m;
+                if (!m->has_tla) {
+                    if (gather_available_ancestors(ctx, m, exec_list))
+                        return -1;
+                }
+            }
+        }
+    }
+    return 0;
+}
+
+static int exec_module_list_cmp(const void *p1, const void *p2, void *opaque)
+{
+    JSModuleDef *m1 = *(JSModuleDef **)p1;
+    JSModuleDef *m2 = *(JSModuleDef **)p2;
+    return (m1->async_evaluation_timestamp > m2->async_evaluation_timestamp) -
+        (m1->async_evaluation_timestamp < m2->async_evaluation_timestamp);
+}
+
+static int js_execute_async_module(JSContext *ctx, JSModuleDef *m);
+static int js_execute_sync_module(JSContext *ctx, JSModuleDef *m,
+                                  JSValue *pvalue);
+
+static JSValue js_async_module_execution_rejected(JSContext *ctx, JSValueConst this_val,
+                                                  int argc, JSValueConst *argv, int magic, JSValue *func_data)
+{
+    JSModuleDef *module = JS_VALUE_GET_PTR(func_data[0]);
+    JSValueConst error = argv[0];
+    int i;
+
+    if (js_check_stack_overflow(ctx->rt, 0))
+        return JS_ThrowStackOverflow(ctx);
+
+    if (module->status == JS_MODULE_STATUS_EVALUATED) {
+        assert(module->eval_has_exception);
+        return JS_UNDEFINED;
+    }
+
+    assert(module->status == JS_MODULE_STATUS_EVALUATING_ASYNC);
+    assert(!module->eval_has_exception);
+    assert(module->async_evaluation);
+
+    module->eval_has_exception = TRUE;
+    module->eval_exception = JS_DupValue(ctx, error);
+    module->status = JS_MODULE_STATUS_EVALUATED;
+
+    for(i = 0; i < module->async_parent_modules_count; i++) {
+        JSModuleDef *m = module->async_parent_modules[i];
+        JSValue m_obj = JS_NewModuleValue(ctx, m);
+        js_async_module_execution_rejected(ctx, JS_UNDEFINED, 1, &error, 0,
+                                           &m_obj);
+        JS_FreeValue(ctx, m_obj);
+    }
+
+    if (!JS_IsUndefined(module->promise)) {
+        JSValue ret_val;
+        assert(module->cycle_root == module);
+        ret_val = JS_Call(ctx, module->resolving_funcs[1], JS_UNDEFINED,
+                          1, &error);
+        JS_FreeValue(ctx, ret_val);
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_async_module_execution_fulfilled(JSContext *ctx, JSValueConst this_val,
+                                                   int argc, JSValueConst *argv, int magic, JSValue *func_data)
+{
+    JSModuleDef *module = JS_VALUE_GET_PTR(func_data[0]);
+    ExecModuleList exec_list_s, *exec_list = &exec_list_s;
+    int i;
+
+    if (module->status == JS_MODULE_STATUS_EVALUATED) {
+        assert(module->eval_has_exception);
+        return JS_UNDEFINED;
+    }
+    assert(module->status == JS_MODULE_STATUS_EVALUATING_ASYNC);
+    assert(!module->eval_has_exception);
+    assert(module->async_evaluation);
+    module->async_evaluation = FALSE;
+    js_set_module_evaluated(ctx, module);
+
+    exec_list->tab = NULL;
+    exec_list->count = 0;
+    exec_list->size = 0;
+
+    if (gather_available_ancestors(ctx, module, exec_list) < 0) {
+        js_free(ctx, exec_list->tab);
+        return JS_EXCEPTION;
+    }
+
+    /* sort by increasing async_evaluation timestamp */
+    rqsort(exec_list->tab, exec_list->count, sizeof(exec_list->tab[0]),
+           exec_module_list_cmp, NULL);
+
+    for(i = 0; i < exec_list->count; i++) {
+        JSModuleDef *m = exec_list->tab[i];
+        if (m->status == JS_MODULE_STATUS_EVALUATED) {
+            assert(m->eval_has_exception);
+        } else if (m->has_tla) {
+            js_execute_async_module(ctx, m);
+        } else {
+            JSValue error;
+            if (js_execute_sync_module(ctx, m, &error) < 0) {
+                JSValue m_obj = JS_NewModuleValue(ctx, m);
+                js_async_module_execution_rejected(ctx, JS_UNDEFINED,
+                                                   1, (JSValueConst *)&error, 0,
+                                                   &m_obj);
+                JS_FreeValue(ctx, m_obj);
+                JS_FreeValue(ctx, error);
+            } else {
+                js_set_module_evaluated(ctx, m);
+            }
+        }
+    }
+    js_free(ctx, exec_list->tab);
+    return JS_UNDEFINED;
+}
+
+static int js_execute_async_module(JSContext *ctx, JSModuleDef *m)
+{
+    JSValue promise, m_obj;
+    JSValue resolve_funcs[2], ret_val;
+    promise = js_async_function_call(ctx, m->func_obj, JS_UNDEFINED, 0, NULL, 0);
+    if (JS_IsException(promise))
+        return -1;
+    m_obj = JS_NewModuleValue(ctx, m);
+    resolve_funcs[0] = JS_NewCFunctionData(ctx, js_async_module_execution_fulfilled, 0, 0, 1, (JSValueConst *)&m_obj);
+    resolve_funcs[1] = JS_NewCFunctionData(ctx, js_async_module_execution_rejected, 0, 0, 1, (JSValueConst *)&m_obj);
+    ret_val = js_promise_then(ctx, promise, 2, (JSValueConst *)resolve_funcs);
+    JS_FreeValue(ctx, ret_val);
+    JS_FreeValue(ctx, m_obj);
+    JS_FreeValue(ctx, resolve_funcs[0]);
+    JS_FreeValue(ctx, resolve_funcs[1]);
+    JS_FreeValue(ctx, promise);
+    return 0;
+}
+
+/* return < 0 in case of exception. *pvalue contains the exception. */
+static int js_execute_sync_module(JSContext *ctx, JSModuleDef *m,
+                                  JSValue *pvalue)
+{
+    if (m->init_func) {
+        /* C module init : no asynchronous execution */
+        if (m->init_func(ctx, m) < 0)
+            goto fail;
+    } else {
+        JSValue promise;
+        JSPromiseStateEnum state;
+
+        promise = js_async_function_call(ctx, m->func_obj, JS_UNDEFINED, 0, NULL, 0);
+        if (JS_IsException(promise))
+            goto fail;
+        state = JS_PromiseState(ctx, promise);
+        if (state == JS_PROMISE_FULFILLED) {
+            JS_FreeValue(ctx, promise);
+        } else if (state == JS_PROMISE_REJECTED) {
+            *pvalue = JS_PromiseResult(ctx, promise);
+            JS_FreeValue(ctx, promise);
+            return -1;
+        } else {
+            JS_FreeValue(ctx, promise);
+            JS_ThrowTypeError(ctx, "promise is pending");
+        fail:
+            *pvalue = JS_GetException(ctx);
+            return -1;
+        }
+    }
+    *pvalue = JS_UNDEFINED;
+    return 0;
+}
+
+/* spec: InnerModuleEvaluation. Return (index, JS_UNDEFINED) or (-1,
+   exception) */
+static int js_inner_module_evaluation(JSContext *ctx, JSModuleDef *m,
+                                      int index, JSModuleDef **pstack_top,
+                                      JSValue *pvalue)
+{
+    JSModuleDef *m1;
+    int i;
+
+    if (js_check_stack_overflow(ctx->rt, 0)) {
+        JS_ThrowStackOverflow(ctx);
+        *pvalue = JS_GetException(ctx);
+        return -1;
+    }
+
+#ifdef DUMP_MODULE_RESOLVE
+    {
+        char buf1[ATOM_GET_STR_BUF_SIZE];
+        printf("js_inner_module_evaluation '%s':\n", JS_AtomGetStr(ctx, buf1, sizeof(buf1), m->module_name));
+    }
+#endif
+
+    if (m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+        m->status == JS_MODULE_STATUS_EVALUATED) {
+        if (m->eval_has_exception) {
+            *pvalue = JS_DupValue(ctx, m->eval_exception);
+            return -1;
+        } else {
+            *pvalue = JS_UNDEFINED;
+            return index;
+        }
+    }
+    if (m->status == JS_MODULE_STATUS_EVALUATING) {
+        *pvalue = JS_UNDEFINED;
+        return index;
+    }
+    assert(m->status == JS_MODULE_STATUS_LINKED);
+
+    m->status = JS_MODULE_STATUS_EVALUATING;
+    m->dfs_index = index;
+    m->dfs_ancestor_index = index;
+    m->pending_async_dependencies = 0;
+    index++;
+    /* push 'm' on stack */
+    m->stack_prev = *pstack_top;
+    *pstack_top = m;
+
+    for(i = 0; i < m->req_module_entries_count; i++) {
+        JSReqModuleEntry *rme = &m->req_module_entries[i];
+        m1 = rme->module;
+        index = js_inner_module_evaluation(ctx, m1, index, pstack_top, pvalue);
+        if (index < 0)
+            return -1;
+        assert(m1->status == JS_MODULE_STATUS_EVALUATING ||
+               m1->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+               m1->status == JS_MODULE_STATUS_EVALUATED);
+        if (m1->status == JS_MODULE_STATUS_EVALUATING) {
+            m->dfs_ancestor_index = min_int(m->dfs_ancestor_index,
+                                            m1->dfs_ancestor_index);
+        } else {
+            m1 = m1->cycle_root;
+            assert(m1->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+                   m1->status == JS_MODULE_STATUS_EVALUATED);
+            if (m1->eval_has_exception) {
+                *pvalue = JS_DupValue(ctx, m1->eval_exception);
+                return -1;
+            }
+        }
+        if (m1->async_evaluation) {
+            m->pending_async_dependencies++;
+            if (js_resize_array(ctx, (void **)&m1->async_parent_modules, sizeof(m1->async_parent_modules[0]), &m1->async_parent_modules_size, m1->async_parent_modules_count + 1)) {
+                *pvalue = JS_GetException(ctx);
+                return -1;
+            }
+            m1->async_parent_modules[m1->async_parent_modules_count++] = m;
+        }
+    }
+
+    if (m->pending_async_dependencies > 0) {
+        assert(!m->async_evaluation);
+        m->async_evaluation = TRUE;
+        m->async_evaluation_timestamp =
+            ctx->rt->module_async_evaluation_next_timestamp++;
+    } else if (m->has_tla) {
+        assert(!m->async_evaluation);
+        m->async_evaluation = TRUE;
+        m->async_evaluation_timestamp =
+            ctx->rt->module_async_evaluation_next_timestamp++;
+        js_execute_async_module(ctx, m);
+    } else {
+        if (js_execute_sync_module(ctx, m, pvalue) < 0)
+            return -1;
+    }
+
+    assert(m->dfs_ancestor_index <= m->dfs_index);
+    if (m->dfs_index == m->dfs_ancestor_index) {
+        for(;;) {
+            /* pop m1 from stack */
+            m1 = *pstack_top;
+            *pstack_top = m1->stack_prev;
+            if (!m1->async_evaluation) {
+                m1->status = JS_MODULE_STATUS_EVALUATED;
+            } else {
+                m1->status = JS_MODULE_STATUS_EVALUATING_ASYNC;
+            }
+            /* spec bug: cycle_root must be assigned before the test */
+            m1->cycle_root = m;
+            if (m1 == m)
+                break;
+        }
+    }
+    *pvalue = JS_UNDEFINED;
+    return index;
+}
+
+/* Run the <eval> function of the module and of all its requested
+   modules. Return a promise or an exception. */
+static JSValue js_evaluate_module(JSContext *ctx, JSModuleDef *m)
+{
+    JSModuleDef *m1, *stack_top;
+    JSValue ret_val, result;
+
+    assert(m->status == JS_MODULE_STATUS_LINKED ||
+           m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+           m->status == JS_MODULE_STATUS_EVALUATED);
+    if (m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+        m->status == JS_MODULE_STATUS_EVALUATED) {
+        m = m->cycle_root;
+    }
+    /* a promise may be created only on the cycle_root of a cycle */
+    if (!JS_IsUndefined(m->promise))
+        return JS_DupValue(ctx, m->promise);
+    m->promise = JS_NewPromiseCapability(ctx, m->resolving_funcs);
+    if (JS_IsException(m->promise))
+        return JS_EXCEPTION;
+
+    stack_top = NULL;
+    if (js_inner_module_evaluation(ctx, m, 0, &stack_top, &result) < 0) {
+        while (stack_top != NULL) {
+            m1 = stack_top;
+            assert(m1->status == JS_MODULE_STATUS_EVALUATING);
+            m1->status = JS_MODULE_STATUS_EVALUATED;
+            m1->eval_has_exception = TRUE;
+            m1->eval_exception = JS_DupValue(ctx, result);
+            m1->cycle_root = m; /* spec bug: should be present */
+            stack_top = m1->stack_prev;
+        }
+        JS_FreeValue(ctx, result);
+        assert(m->status == JS_MODULE_STATUS_EVALUATED);
+        assert(m->eval_has_exception);
+        ret_val = JS_Call(ctx, m->resolving_funcs[1], JS_UNDEFINED,
+                          1, (JSValueConst *)&m->eval_exception);
+        JS_FreeValue(ctx, ret_val);
+    } else {
+        assert(m->status == JS_MODULE_STATUS_EVALUATING_ASYNC ||
+               m->status == JS_MODULE_STATUS_EVALUATED);
+        assert(!m->eval_has_exception);
+        if (!m->async_evaluation) {
+            JSValue value;
+            assert(m->status == JS_MODULE_STATUS_EVALUATED);
+            value = JS_UNDEFINED;
+            ret_val = JS_Call(ctx, m->resolving_funcs[0], JS_UNDEFINED,
+                              1, (JSValueConst *)&value);
+            JS_FreeValue(ctx, ret_val);
+        }
+        assert(stack_top == NULL);
+    }
+    return JS_DupValue(ctx, m->promise);
+}
+
+static __exception JSAtom js_parse_from_clause(JSParseState *s)
+{
+    JSAtom module_name;
+    if (!token_is_pseudo_keyword(s, JS_ATOM_from)) {
+        js_parse_error(s, "from clause expected");
+        return JS_ATOM_NULL;
+    }
+    if (next_token(s))
+        return JS_ATOM_NULL;
+    if (s->token.val != TOK_STRING) {
+        js_parse_error(s, "string expected");
+        return JS_ATOM_NULL;
+    }
+    module_name = JS_ValueToAtom(s->ctx, s->token.u.str.str);
+    if (module_name == JS_ATOM_NULL)
+        return JS_ATOM_NULL;
+    if (next_token(s)) {
+        JS_FreeAtom(s->ctx, module_name);
+        return JS_ATOM_NULL;
+    }
+    return module_name;
+}
+
+static __exception int js_parse_export(JSParseState *s)
+{
+    JSContext *ctx = s->ctx;
+    JSModuleDef *m = s->cur_func->module;
+    JSAtom local_name, export_name;
+    int first_export, idx, i, tok;
+    JSAtom module_name;
+    JSExportEntry *me;
+
+    if (next_token(s))
+        return -1;
+
+    tok = s->token.val;
+    if (tok == TOK_CLASS) {
+        return js_parse_class(s, FALSE, JS_PARSE_EXPORT_NAMED);
+    } else if (tok == TOK_FUNCTION ||
+               (token_is_pseudo_keyword(s, JS_ATOM_async) &&
+                peek_token(s, TRUE) == TOK_FUNCTION)) {
+        return js_parse_function_decl2(s, JS_PARSE_FUNC_STATEMENT,
+                                       JS_FUNC_NORMAL, JS_ATOM_NULL,
+                                       s->token.ptr, s->token.line_num,
+                                       JS_PARSE_EXPORT_NAMED, NULL);
+    }
+
+    if (next_token(s))
+        return -1;
+
+    switch(tok) {
+    case '{':
+        first_export = m->export_entries_count;
+        while (s->token.val != '}') {
+            if (!token_is_ident(s->token.val)) {
+                js_parse_error(s, "identifier expected");
+                return -1;
+            }
+            local_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+            export_name = JS_ATOM_NULL;
+            if (next_token(s))
+                goto fail;
+            if (token_is_pseudo_keyword(s, JS_ATOM_as)) {
+                if (next_token(s))
+                    goto fail;
+                if (!token_is_ident(s->token.val)) {
+                    js_parse_error(s, "identifier expected");
+                    goto fail;
+                }
+                export_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+                if (next_token(s)) {
+                fail:
+                    JS_FreeAtom(ctx, local_name);
+                fail1:
+                    JS_FreeAtom(ctx, export_name);
+                    return -1;
+                }
+            } else {
+                export_name = JS_DupAtom(ctx, local_name);
+            }
+            me = add_export_entry(s, m, local_name, export_name,
+                                  JS_EXPORT_TYPE_LOCAL);
+            JS_FreeAtom(ctx, local_name);
+            JS_FreeAtom(ctx, export_name);
+            if (!me)
+                return -1;
+            if (s->token.val != ',')
+                break;
+            if (next_token(s))
+                return -1;
+        }
+        if (js_parse_expect(s, '}'))
+            return -1;
+        if (token_is_pseudo_keyword(s, JS_ATOM_from)) {
+            module_name = js_parse_from_clause(s);
+            if (module_name == JS_ATOM_NULL)
+                return -1;
+            idx = add_req_module_entry(ctx, m, module_name);
+            JS_FreeAtom(ctx, module_name);
+            if (idx < 0)
+                return -1;
+            for(i = first_export; i < m->export_entries_count; i++) {
+                me = &m->export_entries[i];
+                me->export_type = JS_EXPORT_TYPE_INDIRECT;
+                me->u.req_module_idx = idx;
+            }
+        }
+        break;
+    case '*':
+        if (token_is_pseudo_keyword(s, JS_ATOM_as)) {
+            /* export ns from */
+            if (next_token(s))
+                return -1;
+            if (!token_is_ident(s->token.val)) {
+                js_parse_error(s, "identifier expected");
+                return -1;
+            }
+            export_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+            if (next_token(s))
+                goto fail1;
+            module_name = js_parse_from_clause(s);
+            if (module_name == JS_ATOM_NULL)
+                goto fail1;
+            idx = add_req_module_entry(ctx, m, module_name);
+            JS_FreeAtom(ctx, module_name);
+            if (idx < 0)
+                goto fail1;
+            me = add_export_entry(s, m, JS_ATOM__star_, export_name,
+                                  JS_EXPORT_TYPE_INDIRECT);
+            JS_FreeAtom(ctx, export_name);
+            if (!me)
+                return -1;
+            me->u.req_module_idx = idx;
+        } else {
+            module_name = js_parse_from_clause(s);
+            if (module_name == JS_ATOM_NULL)
+                return -1;
+            idx = add_req_module_entry(ctx, m, module_name);
+            JS_FreeAtom(ctx, module_name);
+            if (idx < 0)
+                return -1;
+            if (add_star_export_entry(ctx, m, idx) < 0)
+                return -1;
+        }
+        break;
+    case TOK_DEFAULT:
+        if (s->token.val == TOK_CLASS) {
+            return js_parse_class(s, FALSE, JS_PARSE_EXPORT_DEFAULT);
+        } else if (s->token.val == TOK_FUNCTION ||
+                   (token_is_pseudo_keyword(s, JS_ATOM_async) &&
+                    peek_token(s, TRUE) == TOK_FUNCTION)) {
+            return js_parse_function_decl2(s, JS_PARSE_FUNC_STATEMENT,
+                                           JS_FUNC_NORMAL, JS_ATOM_NULL,
+                                           s->token.ptr, s->token.line_num,
+                                           JS_PARSE_EXPORT_DEFAULT, NULL);
+        } else {
+            if (js_parse_assign_expr(s))
+                return -1;
+        }
+        /* set the name of anonymous functions */
+        set_object_name(s, JS_ATOM_default);
+
+        /* store the value in the _default_ global variable and export
+           it */
+        local_name = JS_ATOM__default_;
+        if (define_var(s, s->cur_func, local_name, JS_VAR_DEF_LET) < 0)
+            return -1;
+        emit_op(s, OP_scope_put_var_init);
+        emit_atom(s, local_name);
+        emit_u16(s, 0);
+
+        if (!add_export_entry(s, m, local_name, JS_ATOM_default,
+                              JS_EXPORT_TYPE_LOCAL))
+            return -1;
+        break;
+    case TOK_VAR:
+    case TOK_LET:
+    case TOK_CONST:
+        return js_parse_var(s, TRUE, tok, TRUE);
+    default:
+        return js_parse_error(s, "invalid export syntax");
+    }
+    return js_parse_expect_semi(s);
+}
+
+static int add_closure_var(JSContext *ctx, JSFunctionDef *s,
+                           BOOL is_local, BOOL is_arg,
+                           int var_idx, JSAtom var_name,
+                           BOOL is_const, BOOL is_lexical,
+                           JSVarKindEnum var_kind);
+
+static int add_import(JSParseState *s, JSModuleDef *m,
+                      JSAtom local_name, JSAtom import_name)
+{
+    JSContext *ctx = s->ctx;
+    int i, var_idx;
+    JSImportEntry *mi;
+    BOOL is_local;
+
+    if (local_name == JS_ATOM_arguments || local_name == JS_ATOM_eval)
+        return js_parse_error(s, "invalid import binding");
+
+    if (local_name != JS_ATOM_default) {
+        for (i = 0; i < s->cur_func->closure_var_count; i++) {
+            if (s->cur_func->closure_var[i].var_name == local_name)
+                return js_parse_error(s, "duplicate import binding");
+        }
+    }
+
+    is_local = (import_name == JS_ATOM__star_);
+    var_idx = add_closure_var(ctx, s->cur_func, is_local, FALSE,
+                              m->import_entries_count,
+                              local_name, TRUE, TRUE, FALSE);
+    if (var_idx < 0)
+        return -1;
+    if (js_resize_array(ctx, (void **)&m->import_entries,
+                        sizeof(JSImportEntry),
+                        &m->import_entries_size,
+                        m->import_entries_count + 1))
+        return -1;
+    mi = &m->import_entries[m->import_entries_count++];
+    mi->import_name = JS_DupAtom(ctx, import_name);
+    mi->var_idx = var_idx;
+    return 0;
+}
+
+static __exception int js_parse_import(JSParseState *s)
+{
+    JSContext *ctx = s->ctx;
+    JSModuleDef *m = s->cur_func->module;
+    JSAtom local_name, import_name, module_name;
+    int first_import, i, idx;
+
+    if (next_token(s))
+        return -1;
+
+    first_import = m->import_entries_count;
+    if (s->token.val == TOK_STRING) {
+        module_name = JS_ValueToAtom(ctx, s->token.u.str.str);
+        if (module_name == JS_ATOM_NULL)
+            return -1;
+        if (next_token(s)) {
+            JS_FreeAtom(ctx, module_name);
+            return -1;
+        }
+    } else {
+        if (s->token.val == TOK_IDENT) {
+            if (s->token.u.ident.is_reserved) {
+                return js_parse_error_reserved_identifier(s);
+            }
+            /* "default" import */
+            local_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+            import_name = JS_ATOM_default;
+            if (next_token(s))
+                goto fail;
+            if (add_import(s, m, local_name, import_name))
+                goto fail;
+            JS_FreeAtom(ctx, local_name);
+
+            if (s->token.val != ',')
+                goto end_import_clause;
+            if (next_token(s))
+                return -1;
+        }
+
+        if (s->token.val == '*') {
+            /* name space import */
+            if (next_token(s))
+                return -1;
+            if (!token_is_pseudo_keyword(s, JS_ATOM_as))
+                return js_parse_error(s, "expecting 'as'");
+            if (next_token(s))
+                return -1;
+            if (!token_is_ident(s->token.val)) {
+                js_parse_error(s, "identifier expected");
+                return -1;
+            }
+            local_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+            import_name = JS_ATOM__star_;
+            if (next_token(s))
+                goto fail;
+            if (add_import(s, m, local_name, import_name))
+                goto fail;
+            JS_FreeAtom(ctx, local_name);
+        } else if (s->token.val == '{') {
+            if (next_token(s))
+                return -1;
+
+            while (s->token.val != '}') {
+                if (!token_is_ident(s->token.val)) {
+                    js_parse_error(s, "identifier expected");
+                    return -1;
+                }
+                import_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+                local_name = JS_ATOM_NULL;
+                if (next_token(s))
+                    goto fail;
+                if (token_is_pseudo_keyword(s, JS_ATOM_as)) {
+                    if (next_token(s))
+                        goto fail;
+                    if (!token_is_ident(s->token.val)) {
+                        js_parse_error(s, "identifier expected");
+                        goto fail;
+                    }
+                    local_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+                    if (next_token(s)) {
+                    fail:
+                        JS_FreeAtom(ctx, local_name);
+                        JS_FreeAtom(ctx, import_name);
+                        return -1;
+                    }
+                } else {
+                    local_name = JS_DupAtom(ctx, import_name);
+                }
+                if (add_import(s, m, local_name, import_name))
+                    goto fail;
+                JS_FreeAtom(ctx, local_name);
+                JS_FreeAtom(ctx, import_name);
+                if (s->token.val != ',')
+                    break;
+                if (next_token(s))
+                    return -1;
+            }
+            if (js_parse_expect(s, '}'))
+                return -1;
+        }
+    end_import_clause:
+        module_name = js_parse_from_clause(s);
+        if (module_name == JS_ATOM_NULL)
+            return -1;
+    }
+    idx = add_req_module_entry(ctx, m, module_name);
+    JS_FreeAtom(ctx, module_name);
+    if (idx < 0)
+        return -1;
+    for(i = first_import; i < m->import_entries_count; i++)
+        m->import_entries[i].req_module_idx = idx;
+
+    return js_parse_expect_semi(s);
+}
+
+static __exception int js_parse_source_element(JSParseState *s)
+{
+    JSFunctionDef *fd = s->cur_func;
+    int tok;
+
+    if (s->token.val == TOK_FUNCTION ||
+        (token_is_pseudo_keyword(s, JS_ATOM_async) &&
+         peek_token(s, TRUE) == TOK_FUNCTION)) {
+        if (js_parse_function_decl(s, JS_PARSE_FUNC_STATEMENT,
+                                   JS_FUNC_NORMAL, JS_ATOM_NULL,
+                                   s->token.ptr, s->token.line_num))
+            return -1;
+    } else if (s->token.val == TOK_EXPORT && fd->module) {
+        if (js_parse_export(s))
+            return -1;
+    } else if (s->token.val == TOK_IMPORT && fd->module &&
+               ((tok = peek_token(s, FALSE)) != '(' && tok != '.'))  {
+        /* the peek_token is needed to avoid confusion with ImportCall
+           (dynamic import) or import.meta */
+        if (js_parse_import(s))
+            return -1;
+    } else {
+        if (js_parse_statement_or_decl(s, DECL_MASK_ALL))
+            return -1;
+    }
+    return 0;
+}
+
+static JSFunctionDef *js_new_function_def(JSContext *ctx,
+                                          JSFunctionDef *parent,
+                                          BOOL is_eval,
+                                          BOOL is_func_expr,
+                                          const char *filename, int line_num)
+{
+    JSFunctionDef *fd;
+
+    fd = js_mallocz(ctx, sizeof(*fd));
+    if (!fd)
+        return NULL;
+
+    fd->ctx = ctx;
+    init_list_head(&fd->child_list);
+
+    /* insert in parent list */
+    fd->parent = parent;
+    fd->parent_cpool_idx = -1;
+    if (parent) {
+        list_add_tail(&fd->link, &parent->child_list);
+        fd->js_mode = parent->js_mode;
+        fd->parent_scope_level = parent->scope_level;
+    }
+
+    fd->is_eval = is_eval;
+    fd->is_func_expr = is_func_expr;
+    js_dbuf_init(ctx, &fd->byte_code);
+    fd->last_opcode_pos = -1;
+    fd->func_name = JS_ATOM_NULL;
+    fd->var_object_idx = -1;
+    fd->arg_var_object_idx = -1;
+    fd->arguments_var_idx = -1;
+    fd->arguments_arg_idx = -1;
+    fd->func_var_idx = -1;
+    fd->eval_ret_idx = -1;
+    fd->this_var_idx = -1;
+    fd->new_target_var_idx = -1;
+    fd->this_active_func_var_idx = -1;
+    fd->home_object_var_idx = -1;
+
+    /* XXX: should distinguish arg, var and var object and body scopes */
+    fd->scopes = fd->def_scope_array;
+    fd->scope_size = countof(fd->def_scope_array);
+    fd->scope_count = 1;
+    fd->scopes[0].first = -1;
+    fd->scopes[0].parent = -1;
+    fd->scope_level = 0;  /* 0: var/arg scope */
+    fd->scope_first = -1;
+    fd->body_scope = -1;
+
+    fd->filename = JS_NewAtom(ctx, filename);
+    fd->line_num = line_num;
+
+    js_dbuf_init(ctx, &fd->pc2line);
+    //fd->pc2line_last_line_num = line_num;
+    //fd->pc2line_last_pc = 0;
+    fd->last_opcode_line_num = line_num;
+
+    return fd;
+}
+
+static void free_bytecode_atoms(JSRuntime *rt,
+                                const uint8_t *bc_buf, int bc_len,
+                                BOOL use_short_opcodes)
+{
+    int pos, len, op;
+    JSAtom atom;
+    const JSOpCode *oi;
+
+    pos = 0;
+    while (pos < bc_len) {
+        op = bc_buf[pos];
+        if (use_short_opcodes)
+            oi = &short_opcode_info(op);
+        else
+            oi = &opcode_info[op];
+
+        len = oi->size;
+        switch(oi->fmt) {
+        case OP_FMT_atom:
+        case OP_FMT_atom_u8:
+        case OP_FMT_atom_u16:
+        case OP_FMT_atom_label_u8:
+        case OP_FMT_atom_label_u16:
+            atom = get_u32(bc_buf + pos + 1);
+            JS_FreeAtomRT(rt, atom);
+            break;
+        default:
+            break;
+        }
+        pos += len;
+    }
+}
+
+static void js_free_function_def(JSContext *ctx, JSFunctionDef *fd)
+{
+    int i;
+    struct list_head *el, *el1;
+
+    /* free the child functions */
+    list_for_each_safe(el, el1, &fd->child_list) {
+        JSFunctionDef *fd1;
+        fd1 = list_entry(el, JSFunctionDef, link);
+        js_free_function_def(ctx, fd1);
+    }
+
+    free_bytecode_atoms(ctx->rt, fd->byte_code.buf, fd->byte_code.size,
+                        fd->use_short_opcodes);
+    dbuf_free(&fd->byte_code);
+    js_free(ctx, fd->jump_slots);
+    js_free(ctx, fd->label_slots);
+    js_free(ctx, fd->line_number_slots);
+
+    for(i = 0; i < fd->cpool_count; i++) {
+        JS_FreeValue(ctx, fd->cpool[i]);
+    }
+    js_free(ctx, fd->cpool);
+
+    JS_FreeAtom(ctx, fd->func_name);
+
+    for(i = 0; i < fd->var_count; i++) {
+        JS_FreeAtom(ctx, fd->vars[i].var_name);
+    }
+    js_free(ctx, fd->vars);
+    for(i = 0; i < fd->arg_count; i++) {
+        JS_FreeAtom(ctx, fd->args[i].var_name);
+    }
+    js_free(ctx, fd->args);
+
+    for(i = 0; i < fd->global_var_count; i++) {
+        JS_FreeAtom(ctx, fd->global_vars[i].var_name);
+    }
+    js_free(ctx, fd->global_vars);
+
+    for(i = 0; i < fd->closure_var_count; i++) {
+        JSClosureVar *cv = &fd->closure_var[i];
+        JS_FreeAtom(ctx, cv->var_name);
+    }
+    js_free(ctx, fd->closure_var);
+
+    if (fd->scopes != fd->def_scope_array)
+        js_free(ctx, fd->scopes);
+
+    JS_FreeAtom(ctx, fd->filename);
+    dbuf_free(&fd->pc2line);
+
+    js_free(ctx, fd->source);
+
+    if (fd->parent) {
+        /* remove in parent list */
+        list_del(&fd->link);
+    }
+    js_free(ctx, fd);
+}
+
+#ifdef DUMP_BYTECODE
+static const char *skip_lines(const char *p, int n) {
+    while (n-- > 0 && *p) {
+        while (*p && *p++ != '\n')
+            continue;
+    }
+    return p;
+}
+
+static void print_lines(const char *source, int line, int line1) {
+    const char *s = source;
+    const char *p = skip_lines(s, line);
+    if (*p) {
+        while (line++ < line1) {
+            p = skip_lines(s = p, 1);
+            printf(";; %.*s", (int)(p - s), s);
+            if (!*p) {
+                if (p[-1] != '\n')
+                    printf("\n");
+                break;
+            }
+        }
+    }
+}
+
+static void dump_byte_code(JSContext *ctx, int pass,
+                           const uint8_t *tab, int len,
+                           const JSVarDef *args, int arg_count,
+                           const JSVarDef *vars, int var_count,
+                           const JSClosureVar *closure_var, int closure_var_count,
+                           const JSValue *cpool, uint32_t cpool_count,
+                           const char *source, int line_num,
+                           const LabelSlot *label_slots, JSFunctionBytecode *b)
+{
+    const JSOpCode *oi;
+    int pos, pos_next, op, size, idx, addr, line, line1, in_source;
+    uint8_t *bits = js_mallocz(ctx, len * sizeof(*bits));
+    BOOL use_short_opcodes = (b != NULL);
+
+    /* scan for jump targets */
+    for (pos = 0; pos < len; pos = pos_next) {
+        op = tab[pos];
+        if (use_short_opcodes)
+            oi = &short_opcode_info(op);
+        else
+            oi = &opcode_info[op];
+        pos_next = pos + oi->size;
+        if (op < OP_COUNT) {
+            switch (oi->fmt) {
+#if SHORT_OPCODES
+            case OP_FMT_label8:
+                pos++;
+                addr = (int8_t)tab[pos];
+                goto has_addr;
+            case OP_FMT_label16:
+                pos++;
+                addr = (int16_t)get_u16(tab + pos);
+                goto has_addr;
+#endif
+            case OP_FMT_atom_label_u8:
+            case OP_FMT_atom_label_u16:
+                pos += 4;
+                /* fall thru */
+            case OP_FMT_label:
+            case OP_FMT_label_u16:
+                pos++;
+                addr = get_u32(tab + pos);
+                goto has_addr;
+            has_addr:
+                if (pass == 1)
+                    addr = label_slots[addr].pos;
+                if (pass == 2)
+                    addr = label_slots[addr].pos2;
+                if (pass == 3)
+                    addr += pos;
+                if (addr >= 0 && addr < len)
+                    bits[addr] |= 1;
+                break;
+            }
+        }
+    }
+    in_source = 0;
+    if (source) {
+        /* Always print first line: needed if single line */
+        print_lines(source, 0, 1);
+        in_source = 1;
+    }
+    line1 = line = 1;
+    pos = 0;
+    while (pos < len) {
+        op = tab[pos];
+        if (source) {
+            if (b) {
+                line1 = find_line_num(ctx, b, pos) - line_num + 1;
+            } else if (op == OP_line_num) {
+                line1 = get_u32(tab + pos + 1) - line_num + 1;
+            }
+            if (line1 > line) {
+                if (!in_source)
+                    printf("\n");
+                in_source = 1;
+                print_lines(source, line, line1);
+                line = line1;
+                //bits[pos] |= 2;
+            }
+        }
+        if (in_source)
+            printf("\n");
+        in_source = 0;
+        if (op >= OP_COUNT) {
+            printf("invalid opcode (0x%02x)\n", op);
+            pos++;
+            continue;
+        }
+        if (use_short_opcodes)
+            oi = &short_opcode_info(op);
+        else
+            oi = &opcode_info[op];
+        size = oi->size;
+        if (pos + size > len) {
+            printf("truncated opcode (0x%02x)\n", op);
+            break;
+        }
+#if defined(DUMP_BYTECODE) && (DUMP_BYTECODE & 16)
+        {
+            int i, x, x0;
+            x = x0 = printf("%5d ", pos);
+            for (i = 0; i < size; i++) {
+                if (i == 6) {
+                    printf("\n%*s", x = x0, "");
+                }
+                x += printf(" %02X", tab[pos + i]);
+            }
+            printf("%*s", x0 + 20 - x, "");
+        }
+#endif
+        if (bits[pos]) {
+            printf("%5d:  ", pos);
+        } else {
+            printf("        ");
+        }
+        printf("%s", oi->name);
+        pos++;
+        switch(oi->fmt) {
+        case OP_FMT_none_int:
+            printf(" %d", op - OP_push_0);
+            break;
+        case OP_FMT_npopx:
+            printf(" %d", op - OP_call0);
+            break;
+        case OP_FMT_u8:
+            printf(" %u", get_u8(tab + pos));
+            break;
+        case OP_FMT_i8:
+            printf(" %d", get_i8(tab + pos));
+            break;
+        case OP_FMT_u16:
+        case OP_FMT_npop:
+            printf(" %u", get_u16(tab + pos));
+            break;
+        case OP_FMT_npop_u16:
+            printf(" %u,%u", get_u16(tab + pos), get_u16(tab + pos + 2));
+            break;
+        case OP_FMT_i16:
+            printf(" %d", get_i16(tab + pos));
+            break;
+        case OP_FMT_i32:
+            printf(" %d", get_i32(tab + pos));
+            break;
+        case OP_FMT_u32:
+            printf(" %u", get_u32(tab + pos));
+            break;
+#if SHORT_OPCODES
+        case OP_FMT_label8:
+            addr = get_i8(tab + pos);
+            goto has_addr1;
+        case OP_FMT_label16:
+            addr = get_i16(tab + pos);
+            goto has_addr1;
+#endif
+        case OP_FMT_label:
+            addr = get_u32(tab + pos);
+            goto has_addr1;
+        has_addr1:
+            if (pass == 1)
+                printf(" %u:%u", addr, label_slots[addr].pos);
+            if (pass == 2)
+                printf(" %u:%u", addr, label_slots[addr].pos2);
+            if (pass == 3)
+                printf(" %u", addr + pos);
+            break;
+        case OP_FMT_label_u16:
+            addr = get_u32(tab + pos);
+            if (pass == 1)
+                printf(" %u:%u", addr, label_slots[addr].pos);
+            if (pass == 2)
+                printf(" %u:%u", addr, label_slots[addr].pos2);
+            if (pass == 3)
+                printf(" %u", addr + pos);
+            printf(",%u", get_u16(tab + pos + 4));
+            break;
+#if SHORT_OPCODES
+        case OP_FMT_const8:
+            idx = get_u8(tab + pos);
+            goto has_pool_idx;
+#endif
+        case OP_FMT_const:
+            idx = get_u32(tab + pos);
+            goto has_pool_idx;
+        has_pool_idx:
+            printf(" %u: ", idx);
+            if (idx < cpool_count) {
+                JS_DumpValue(ctx, cpool[idx]);
+            }
+            break;
+        case OP_FMT_atom:
+            printf(" ");
+            print_atom(ctx, get_u32(tab + pos));
+            break;
+        case OP_FMT_atom_u8:
+            printf(" ");
+            print_atom(ctx, get_u32(tab + pos));
+            printf(",%d", get_u8(tab + pos + 4));
+            break;
+        case OP_FMT_atom_u16:
+            printf(" ");
+            print_atom(ctx, get_u32(tab + pos));
+            printf(",%d", get_u16(tab + pos + 4));
+            break;
+        case OP_FMT_atom_label_u8:
+        case OP_FMT_atom_label_u16:
+            printf(" ");
+            print_atom(ctx, get_u32(tab + pos));
+            addr = get_u32(tab + pos + 4);
+            if (pass == 1)
+                printf(",%u:%u", addr, label_slots[addr].pos);
+            if (pass == 2)
+                printf(",%u:%u", addr, label_slots[addr].pos2);
+            if (pass == 3)
+                printf(",%u", addr + pos + 4);
+            if (oi->fmt == OP_FMT_atom_label_u8)
+                printf(",%u", get_u8(tab + pos + 8));
+            else
+                printf(",%u", get_u16(tab + pos + 8));
+            break;
+        case OP_FMT_none_loc:
+            idx = (op - OP_get_loc0) % 4;
+            goto has_loc;
+        case OP_FMT_loc8:
+            idx = get_u8(tab + pos);
+            goto has_loc;
+        case OP_FMT_loc:
+            idx = get_u16(tab + pos);
+        has_loc:
+            printf(" %d: ", idx);
+            if (idx < var_count) {
+                print_atom(ctx, vars[idx].var_name);
+            }
+            break;
+        case OP_FMT_none_arg:
+            idx = (op - OP_get_arg0) % 4;
+            goto has_arg;
+        case OP_FMT_arg:
+            idx = get_u16(tab + pos);
+        has_arg:
+            printf(" %d: ", idx);
+            if (idx < arg_count) {
+                print_atom(ctx, args[idx].var_name);
+            }
+            break;
+        case OP_FMT_none_var_ref:
+            idx = (op - OP_get_var_ref0) % 4;
+            goto has_var_ref;
+        case OP_FMT_var_ref:
+            idx = get_u16(tab + pos);
+        has_var_ref:
+            printf(" %d: ", idx);
+            if (idx < closure_var_count) {
+                print_atom(ctx, closure_var[idx].var_name);
+            }
+            break;
+        default:
+            break;
+        }
+        printf("\n");
+        pos += oi->size - 1;
+    }
+    if (source) {
+        if (!in_source)
+            printf("\n");
+        print_lines(source, line, INT32_MAX);
+    }
+    js_free(ctx, bits);
+}
+
+static __maybe_unused void dump_pc2line(JSContext *ctx, const uint8_t *buf, int len,
+                                                 int line_num)
+{
+    const uint8_t *p_end, *p_next, *p;
+    int pc, v;
+    unsigned int op;
+
+    if (len <= 0)
+        return;
+
+    printf("%5s %5s\n", "PC", "LINE");
+
+    p = buf;
+    p_end = buf + len;
+    pc = 0;
+    while (p < p_end) {
+        op = *p++;
+        if (op == 0) {
+            v = unicode_from_utf8(p, p_end - p, &p_next);
+            if (v < 0)
+                goto fail;
+            pc += v;
+            p = p_next;
+            v = unicode_from_utf8(p, p_end - p, &p_next);
+            if (v < 0) {
+            fail:
+                printf("invalid pc2line encode pos=%d\n", (int)(p - buf));
+                return;
+            }
+            if (!(v & 1)) {
+                v = v >> 1;
+            } else {
+                v = -(v >> 1) - 1;
+            }
+            line_num += v;
+            p = p_next;
+        } else {
+            op -= PC2LINE_OP_FIRST;
+            pc += (op / PC2LINE_RANGE);
+            line_num += (op % PC2LINE_RANGE) + PC2LINE_BASE;
+        }
+        printf("%5d %5d\n", pc, line_num);
+    }
+}
+
+static __maybe_unused void js_dump_function_bytecode(JSContext *ctx, JSFunctionBytecode *b)
+{
+    int i;
+    char atom_buf[ATOM_GET_STR_BUF_SIZE];
+    const char *str;
+
+    if (b->has_debug && b->debug.filename != JS_ATOM_NULL) {
+        str = JS_AtomGetStr(ctx, atom_buf, sizeof(atom_buf), b->debug.filename);
+        printf("%s:%d: ", str, b->debug.line_num);
+    }
+
+    str = JS_AtomGetStr(ctx, atom_buf, sizeof(atom_buf), b->func_name);
+    printf("function: %s%s\n", &"*"[b->func_kind != JS_FUNC_GENERATOR], str);
+    if (b->js_mode) {
+        printf("  mode:");
+        if (b->js_mode & JS_MODE_STRICT)
+            printf(" strict");
+#ifdef CONFIG_BIGNUM
+        if (b->js_mode & JS_MODE_MATH)
+            printf(" math");
+#endif
+        printf("\n");
+    }
+    if (b->arg_count && b->vardefs) {
+        printf("  args:");
+        for(i = 0; i < b->arg_count; i++) {
+            printf(" %s", JS_AtomGetStr(ctx, atom_buf, sizeof(atom_buf),
+                                        b->vardefs[i].var_name));
+        }
+        printf("\n");
+    }
+    if (b->var_count && b->vardefs) {
+        printf("  locals:\n");
+        for(i = 0; i < b->var_count; i++) {
+            JSVarDef *vd = &b->vardefs[b->arg_count + i];
+            printf("%5d: %s %s", i,
+                   vd->var_kind == JS_VAR_CATCH ? "catch" :
+                   (vd->var_kind == JS_VAR_FUNCTION_DECL ||
+                    vd->var_kind == JS_VAR_NEW_FUNCTION_DECL) ? "function" :
+                   vd->is_const ? "const" :
+                   vd->is_lexical ? "let" : "var",
+                   JS_AtomGetStr(ctx, atom_buf, sizeof(atom_buf), vd->var_name));
+            if (vd->scope_level)
+                printf(" [level:%d next:%d]", vd->scope_level, vd->scope_next);
+            printf("\n");
+        }
+    }
+    if (b->closure_var_count) {
+        printf("  closure vars:\n");
+        for(i = 0; i < b->closure_var_count; i++) {
+            JSClosureVar *cv = &b->closure_var[i];
+            printf("%5d: %s %s:%s%d %s\n", i,
+                   JS_AtomGetStr(ctx, atom_buf, sizeof(atom_buf), cv->var_name),
+                   cv->is_local ? "local" : "parent",
+                   cv->is_arg ? "arg" : "loc", cv->var_idx,
+                   cv->is_const ? "const" :
+                   cv->is_lexical ? "let" : "var");
+        }
+    }
+    printf("  stack_size: %d\n", b->stack_size);
+    printf("  opcodes:\n");
+    dump_byte_code(ctx, 3, b->byte_code_buf, b->byte_code_len,
+                   b->vardefs, b->arg_count,
+                   b->vardefs ? b->vardefs + b->arg_count : NULL, b->var_count,
+                   b->closure_var, b->closure_var_count,
+                   b->cpool, b->cpool_count,
+                   b->has_debug ? b->debug.source : NULL,
+                   b->has_debug ? b->debug.line_num : -1, NULL, b);
+#if defined(DUMP_BYTECODE) && (DUMP_BYTECODE & 32)
+    if (b->has_debug)
+        dump_pc2line(ctx, b->debug.pc2line_buf, b->debug.pc2line_len, b->debug.line_num);
+#endif
+    printf("\n");
+}
+#endif
+
+static int add_closure_var(JSContext *ctx, JSFunctionDef *s,
+                           BOOL is_local, BOOL is_arg,
+                           int var_idx, JSAtom var_name,
+                           BOOL is_const, BOOL is_lexical,
+                           JSVarKindEnum var_kind)
+{
+    JSClosureVar *cv;
+
+    /* the closure variable indexes are currently stored on 16 bits */
+    if (s->closure_var_count >= JS_MAX_LOCAL_VARS) {
+        JS_ThrowInternalError(ctx, "too many closure variables");
+        return -1;
+    }
+
+    if (js_resize_array(ctx, (void **)&s->closure_var,
+                        sizeof(s->closure_var[0]),
+                        &s->closure_var_size, s->closure_var_count + 1))
+        return -1;
+    cv = &s->closure_var[s->closure_var_count++];
+    cv->is_local = is_local;
+    cv->is_arg = is_arg;
+    cv->is_const = is_const;
+    cv->is_lexical = is_lexical;
+    cv->var_kind = var_kind;
+    cv->var_idx = var_idx;
+    cv->var_name = JS_DupAtom(ctx, var_name);
+    return s->closure_var_count - 1;
+}
+
+static int find_closure_var(JSContext *ctx, JSFunctionDef *s,
+                            JSAtom var_name)
+{
+    int i;
+    for(i = 0; i < s->closure_var_count; i++) {
+        JSClosureVar *cv = &s->closure_var[i];
+        if (cv->var_name == var_name)
+            return i;
+    }
+    return -1;
+}
+
+/* 'fd' must be a parent of 's'. Create in 's' a closure referencing a
+   local variable (is_local = TRUE) or a closure (is_local = FALSE) in
+   'fd' */
+static int get_closure_var2(JSContext *ctx, JSFunctionDef *s,
+                            JSFunctionDef *fd, BOOL is_local,
+                            BOOL is_arg, int var_idx, JSAtom var_name,
+                            BOOL is_const, BOOL is_lexical,
+                            JSVarKindEnum var_kind)
+{
+    int i;
+
+    if (fd != s->parent) {
+        var_idx = get_closure_var2(ctx, s->parent, fd, is_local,
+                                   is_arg, var_idx, var_name,
+                                   is_const, is_lexical, var_kind);
+        if (var_idx < 0)
+            return -1;
+        is_local = FALSE;
+    }
+    for(i = 0; i < s->closure_var_count; i++) {
+        JSClosureVar *cv = &s->closure_var[i];
+        if (cv->var_idx == var_idx && cv->is_arg == is_arg &&
+            cv->is_local == is_local)
+            return i;
+    }
+    return add_closure_var(ctx, s, is_local, is_arg, var_idx, var_name,
+                           is_const, is_lexical, var_kind);
+}
+
+static int get_closure_var(JSContext *ctx, JSFunctionDef *s,
+                           JSFunctionDef *fd, BOOL is_arg,
+                           int var_idx, JSAtom var_name,
+                           BOOL is_const, BOOL is_lexical,
+                           JSVarKindEnum var_kind)
+{
+    return get_closure_var2(ctx, s, fd, TRUE, is_arg,
+                            var_idx, var_name, is_const, is_lexical,
+                            var_kind);
+}
+
+static int get_with_scope_opcode(int op)
+{
+    if (op == OP_scope_get_var_undef)
+        return OP_with_get_var;
+    else
+        return OP_with_get_var + (op - OP_scope_get_var);
+}
+
+static BOOL can_opt_put_ref_value(const uint8_t *bc_buf, int pos)
+{
+    int opcode = bc_buf[pos];
+    return (bc_buf[pos + 1] == OP_put_ref_value &&
+            (opcode == OP_insert3 ||
+             opcode == OP_perm4 ||
+             opcode == OP_nop ||
+             opcode == OP_rot3l));
+}
+
+static BOOL can_opt_put_global_ref_value(const uint8_t *bc_buf, int pos)
+{
+    int opcode = bc_buf[pos];
+    return (bc_buf[pos + 1] == OP_put_ref_value &&
+            (opcode == OP_insert3 ||
+             opcode == OP_perm4 ||
+             opcode == OP_nop ||
+             opcode == OP_rot3l));
+}
+
+static int optimize_scope_make_ref(JSContext *ctx, JSFunctionDef *s,
+                                   DynBuf *bc, uint8_t *bc_buf,
+                                   LabelSlot *ls, int pos_next,
+                                   int get_op, int var_idx)
+{
+    int label_pos, end_pos, pos;
+
+    /* XXX: should optimize `loc(a) += expr` as `expr add_loc(a)`
+       but only if expr does not modify `a`.
+       should scan the code between pos_next and label_pos
+       for operations that can potentially change `a`:
+       OP_scope_make_ref(a), function calls, jumps and gosub.
+     */
+    /* replace the reference get/put with normal variable
+       accesses */
+    if (bc_buf[pos_next] == OP_get_ref_value) {
+        dbuf_putc(bc, get_op);
+        dbuf_put_u16(bc, var_idx);
+        pos_next++;
+    }
+    /* remove the OP_label to make room for replacement */
+    /* label should have a refcount of 0 anyway */
+    /* XXX: should avoid this patch by inserting nops in phase 1 */
+    label_pos = ls->pos;
+    pos = label_pos - 5;
+    assert(bc_buf[pos] == OP_label);
+    /* label points to an instruction pair:
+       - insert3 / put_ref_value
+       - perm4 / put_ref_value
+       - rot3l / put_ref_value
+       - nop / put_ref_value
+     */
+    end_pos = label_pos + 2;
+    if (bc_buf[label_pos] == OP_insert3)
+        bc_buf[pos++] = OP_dup;
+    bc_buf[pos] = get_op + 1;
+    put_u16(bc_buf + pos + 1, var_idx);
+    pos += 3;
+    /* pad with OP_nop */
+    while (pos < end_pos)
+        bc_buf[pos++] = OP_nop;
+    return pos_next;
+}
+
+static int optimize_scope_make_global_ref(JSContext *ctx, JSFunctionDef *s,
+                                          DynBuf *bc, uint8_t *bc_buf,
+                                          LabelSlot *ls, int pos_next,
+                                          JSAtom var_name)
+{
+    int label_pos, end_pos, pos, op;
+    BOOL is_strict;
+    is_strict = ((s->js_mode & JS_MODE_STRICT) != 0);
+
+    /* replace the reference get/put with normal variable
+       accesses */
+    if (is_strict) {
+        /* need to check if the variable exists before evaluating the right
+           expression */
+        /* XXX: need an extra OP_true if destructuring an array */
+        dbuf_putc(bc, OP_check_var);
+        dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+    } else {
+        /* XXX: need 2 extra OP_true if destructuring an array */
+    }
+    if (bc_buf[pos_next] == OP_get_ref_value) {
+        dbuf_putc(bc, OP_get_var);
+        dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+        pos_next++;
+    }
+    /* remove the OP_label to make room for replacement */
+    /* label should have a refcount of 0 anyway */
+    /* XXX: should have emitted several OP_nop to avoid this kludge */
+    label_pos = ls->pos;
+    pos = label_pos - 5;
+    assert(bc_buf[pos] == OP_label);
+    end_pos = label_pos + 2;
+    op = bc_buf[label_pos];
+    if (is_strict) {
+        if (op != OP_nop) {
+            switch(op) {
+            case OP_insert3:
+                op = OP_insert2;
+                break;
+            case OP_perm4:
+                op = OP_perm3;
+                break;
+            case OP_rot3l:
+                op = OP_swap;
+                break;
+            default:
+                abort();
+            }
+            bc_buf[pos++] = op;
+        }
+    } else {
+        if (op == OP_insert3)
+            bc_buf[pos++] = OP_dup;
+    }
+    if (is_strict) {
+        bc_buf[pos] = OP_put_var_strict;
+        /* XXX: need 1 extra OP_drop if destructuring an array */
+    } else {
+        bc_buf[pos] = OP_put_var;
+        /* XXX: need 2 extra OP_drop if destructuring an array */
+    }
+    put_u32(bc_buf + pos + 1, JS_DupAtom(ctx, var_name));
+    pos += 5;
+    /* pad with OP_nop */
+    while (pos < end_pos)
+        bc_buf[pos++] = OP_nop;
+    return pos_next;
+}
+
+static int add_var_this(JSContext *ctx, JSFunctionDef *fd)
+{
+    int idx;
+    idx = add_var(ctx, fd, JS_ATOM_this);
+    if (idx >= 0 && fd->is_derived_class_constructor) {
+        JSVarDef *vd = &fd->vars[idx];
+        /* XXX: should have is_this flag or var type */
+        vd->is_lexical = 1; /* used to trigger 'uninitialized' checks
+                               in a derived class constructor */
+    }
+    return idx;
+}
+
+static int resolve_pseudo_var(JSContext *ctx, JSFunctionDef *s,
+                               JSAtom var_name)
+{
+    int var_idx;
+
+    if (!s->has_this_binding)
+        return -1;
+    switch(var_name) {
+    case JS_ATOM_home_object:
+        /* 'home_object' pseudo variable */
+        if (s->home_object_var_idx < 0)
+            s->home_object_var_idx = add_var(ctx, s, var_name);
+        var_idx = s->home_object_var_idx;
+        break;
+    case JS_ATOM_this_active_func:
+        /* 'this.active_func' pseudo variable */
+        if (s->this_active_func_var_idx < 0)
+            s->this_active_func_var_idx = add_var(ctx, s, var_name);
+        var_idx = s->this_active_func_var_idx;
+        break;
+    case JS_ATOM_new_target:
+        /* 'new.target' pseudo variable */
+        if (s->new_target_var_idx < 0)
+            s->new_target_var_idx = add_var(ctx, s, var_name);
+        var_idx = s->new_target_var_idx;
+        break;
+    case JS_ATOM_this:
+        /* 'this' pseudo variable */
+        if (s->this_var_idx < 0)
+            s->this_var_idx = add_var_this(ctx, s);
+        var_idx = s->this_var_idx;
+        break;
+    default:
+        var_idx = -1;
+        break;
+    }
+    return var_idx;
+}
+
+/* test if 'var_name' is in the variable object on the stack. If is it
+   the case, handle it and jump to 'label_done' */
+static void var_object_test(JSContext *ctx, JSFunctionDef *s,
+                            JSAtom var_name, int op, DynBuf *bc,
+                            int *plabel_done, BOOL is_with)
+{
+    dbuf_putc(bc, get_with_scope_opcode(op));
+    dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+    *plabel_done = new_label_fd(s, *plabel_done);
+    dbuf_put_u32(bc, *plabel_done);
+    dbuf_putc(bc, is_with);
+    update_label(s, *plabel_done, 1);
+    s->jump_size++;
+}
+
+/* return the position of the next opcode */
+static int resolve_scope_var(JSContext *ctx, JSFunctionDef *s,
+                             JSAtom var_name, int scope_level, int op,
+                             DynBuf *bc, uint8_t *bc_buf,
+                             LabelSlot *ls, int pos_next)
+{
+    int idx, var_idx, is_put;
+    int label_done;
+    JSFunctionDef *fd;
+    JSVarDef *vd;
+    BOOL is_pseudo_var, is_arg_scope;
+
+    label_done = -1;
+
+    /* XXX: could be simpler to use a specific function to
+       resolve the pseudo variables */
+    is_pseudo_var = (var_name == JS_ATOM_home_object ||
+                     var_name == JS_ATOM_this_active_func ||
+                     var_name == JS_ATOM_new_target ||
+                     var_name == JS_ATOM_this);
+
+    /* resolve local scoped variables */
+    var_idx = -1;
+    for (idx = s->scopes[scope_level].first; idx >= 0;) {
+        vd = &s->vars[idx];
+        if (vd->var_name == var_name) {
+            if (op == OP_scope_put_var || op == OP_scope_make_ref) {
+                if (vd->is_const) {
+                    dbuf_putc(bc, OP_throw_error);
+                    dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+                    dbuf_putc(bc, JS_THROW_VAR_RO);
+                    goto done;
+                }
+            }
+            var_idx = idx;
+            break;
+        } else
+        if (vd->var_name == JS_ATOM__with_ && !is_pseudo_var) {
+            dbuf_putc(bc, OP_get_loc);
+            dbuf_put_u16(bc, idx);
+            var_object_test(ctx, s, var_name, op, bc, &label_done, 1);
+        }
+        idx = vd->scope_next;
+    }
+    is_arg_scope = (idx == ARG_SCOPE_END);
+    if (var_idx < 0) {
+        /* argument scope: variables are not visible but pseudo
+           variables are visible */
+        if (!is_arg_scope) {
+            var_idx = find_var(ctx, s, var_name);
+        }
+
+        if (var_idx < 0 && is_pseudo_var)
+            var_idx = resolve_pseudo_var(ctx, s, var_name);
+
+        if (var_idx < 0 && var_name == JS_ATOM_arguments &&
+            s->has_arguments_binding) {
+            /* 'arguments' pseudo variable */
+            var_idx = add_arguments_var(ctx, s);
+        }
+        if (var_idx < 0 && s->is_func_expr && var_name == s->func_name) {
+            /* add a new variable with the function name */
+            var_idx = add_func_var(ctx, s, var_name);
+        }
+    }
+    if (var_idx >= 0) {
+        if ((op == OP_scope_put_var || op == OP_scope_make_ref) &&
+            !(var_idx & ARGUMENT_VAR_OFFSET) &&
+            s->vars[var_idx].is_const) {
+            /* only happens when assigning a function expression name
+               in strict mode */
+            dbuf_putc(bc, OP_throw_error);
+            dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+            dbuf_putc(bc, JS_THROW_VAR_RO);
+            goto done;
+        }
+        /* OP_scope_put_var_init is only used to initialize a
+           lexical variable, so it is never used in a with or var object. It
+           can be used with a closure (module global variable case). */
+        switch (op) {
+        case OP_scope_make_ref:
+            if (!(var_idx & ARGUMENT_VAR_OFFSET) &&
+                s->vars[var_idx].var_kind == JS_VAR_FUNCTION_NAME) {
+                /* Create a dummy object reference for the func_var */
+                dbuf_putc(bc, OP_object);
+                dbuf_putc(bc, OP_get_loc);
+                dbuf_put_u16(bc, var_idx);
+                dbuf_putc(bc, OP_define_field);
+                dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+                dbuf_putc(bc, OP_push_atom_value);
+                dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+            } else
+            if (label_done == -1 && can_opt_put_ref_value(bc_buf, ls->pos)) {
+                int get_op;
+                if (var_idx & ARGUMENT_VAR_OFFSET) {
+                    get_op = OP_get_arg;
+                    var_idx -= ARGUMENT_VAR_OFFSET;
+                } else {
+                    if (s->vars[var_idx].is_lexical)
+                        get_op = OP_get_loc_check;
+                    else
+                        get_op = OP_get_loc;
+                }
+                pos_next = optimize_scope_make_ref(ctx, s, bc, bc_buf, ls,
+                                                   pos_next, get_op, var_idx);
+            } else {
+                /* Create a dummy object with a named slot that is
+                   a reference to the local variable */
+                if (var_idx & ARGUMENT_VAR_OFFSET) {
+                    dbuf_putc(bc, OP_make_arg_ref);
+                    dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+                    dbuf_put_u16(bc, var_idx - ARGUMENT_VAR_OFFSET);
+                } else {
+                    dbuf_putc(bc, OP_make_loc_ref);
+                    dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+                    dbuf_put_u16(bc, var_idx);
+                }
+            }
+            break;
+        case OP_scope_get_ref:
+            dbuf_putc(bc, OP_undefined);
+            /* fall thru */
+        case OP_scope_get_var_checkthis:
+        case OP_scope_get_var_undef:
+        case OP_scope_get_var:
+        case OP_scope_put_var:
+        case OP_scope_put_var_init:
+            is_put = (op == OP_scope_put_var || op == OP_scope_put_var_init);
+            if (var_idx & ARGUMENT_VAR_OFFSET) {
+                dbuf_putc(bc, OP_get_arg + is_put);
+                dbuf_put_u16(bc, var_idx - ARGUMENT_VAR_OFFSET);
+            } else {
+                if (is_put) {
+                    if (s->vars[var_idx].is_lexical) {
+                        if (op == OP_scope_put_var_init) {
+                            /* 'this' can only be initialized once */
+                            if (var_name == JS_ATOM_this)
+                                dbuf_putc(bc, OP_put_loc_check_init);
+                            else
+                                dbuf_putc(bc, OP_put_loc);
+                        } else {
+                            dbuf_putc(bc, OP_put_loc_check);
+                        }
+                    } else {
+                        dbuf_putc(bc, OP_put_loc);
+                    }
+                } else {
+                    if (s->vars[var_idx].is_lexical) {
+                        if (op == OP_scope_get_var_checkthis) {
+                            /* only used for 'this' return in derived class constructors */
+                            dbuf_putc(bc, OP_get_loc_checkthis);
+                        } else {
+                            dbuf_putc(bc, OP_get_loc_check);
+                        }
+                    } else {
+                        dbuf_putc(bc, OP_get_loc);
+                    }
+                }
+                dbuf_put_u16(bc, var_idx);
+            }
+            break;
+        case OP_scope_delete_var:
+            dbuf_putc(bc, OP_push_false);
+            break;
+        }
+        goto done;
+    }
+    /* check eval object */
+    if (!is_arg_scope && s->var_object_idx >= 0 && !is_pseudo_var) {
+        dbuf_putc(bc, OP_get_loc);
+        dbuf_put_u16(bc, s->var_object_idx);
+        var_object_test(ctx, s, var_name, op, bc, &label_done, 0);
+    }
+    /* check eval object in argument scope */
+    if (s->arg_var_object_idx >= 0 && !is_pseudo_var) {
+        dbuf_putc(bc, OP_get_loc);
+        dbuf_put_u16(bc, s->arg_var_object_idx);
+        var_object_test(ctx, s, var_name, op, bc, &label_done, 0);
+    }
+
+    /* check parent scopes */
+    for (fd = s; fd->parent;) {
+        scope_level = fd->parent_scope_level;
+        fd = fd->parent;
+        for (idx = fd->scopes[scope_level].first; idx >= 0;) {
+            vd = &fd->vars[idx];
+            if (vd->var_name == var_name) {
+                if (op == OP_scope_put_var || op == OP_scope_make_ref) {
+                    if (vd->is_const) {
+                        dbuf_putc(bc, OP_throw_error);
+                        dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+                        dbuf_putc(bc, JS_THROW_VAR_RO);
+                        goto done;
+                    }
+                }
+                var_idx = idx;
+                break;
+            } else if (vd->var_name == JS_ATOM__with_ && !is_pseudo_var) {
+                vd->is_captured = 1;
+                idx = get_closure_var(ctx, s, fd, FALSE, idx, vd->var_name, FALSE, FALSE, JS_VAR_NORMAL);
+                if (idx >= 0) {
+                    dbuf_putc(bc, OP_get_var_ref);
+                    dbuf_put_u16(bc, idx);
+                    var_object_test(ctx, s, var_name, op, bc, &label_done, 1);
+                }
+            }
+            idx = vd->scope_next;
+        }
+        is_arg_scope = (idx == ARG_SCOPE_END);
+        if (var_idx >= 0)
+            break;
+
+        if (!is_arg_scope) {
+            var_idx = find_var(ctx, fd, var_name);
+            if (var_idx >= 0)
+                break;
+        }
+        if (is_pseudo_var) {
+            var_idx = resolve_pseudo_var(ctx, fd, var_name);
+            if (var_idx >= 0)
+                break;
+        }
+        if (var_name == JS_ATOM_arguments && fd->has_arguments_binding) {
+            var_idx = add_arguments_var(ctx, fd);
+            break;
+        }
+        if (fd->is_func_expr && fd->func_name == var_name) {
+            /* add a new variable with the function name */
+            var_idx = add_func_var(ctx, fd, var_name);
+            break;
+        }
+
+        /* check eval object */
+        if (!is_arg_scope && fd->var_object_idx >= 0 && !is_pseudo_var) {
+            vd = &fd->vars[fd->var_object_idx];
+            vd->is_captured = 1;
+            idx = get_closure_var(ctx, s, fd, FALSE,
+                                  fd->var_object_idx, vd->var_name,
+                                  FALSE, FALSE, JS_VAR_NORMAL);
+            dbuf_putc(bc, OP_get_var_ref);
+            dbuf_put_u16(bc, idx);
+            var_object_test(ctx, s, var_name, op, bc, &label_done, 0);
+        }
+
+        /* check eval object in argument scope */
+        if (fd->arg_var_object_idx >= 0 && !is_pseudo_var) {
+            vd = &fd->vars[fd->arg_var_object_idx];
+            vd->is_captured = 1;
+            idx = get_closure_var(ctx, s, fd, FALSE,
+                                  fd->arg_var_object_idx, vd->var_name,
+                                  FALSE, FALSE, JS_VAR_NORMAL);
+            dbuf_putc(bc, OP_get_var_ref);
+            dbuf_put_u16(bc, idx);
+            var_object_test(ctx, s, var_name, op, bc, &label_done, 0);
+        }
+
+        if (fd->is_eval)
+            break; /* it it necessarily the top level function */
+    }
+
+    /* check direct eval scope (in the closure of the eval function
+       which is necessarily at the top level) */
+    if (!fd)
+        fd = s;
+    if (var_idx < 0 && fd->is_eval) {
+        int idx1;
+        for (idx1 = 0; idx1 < fd->closure_var_count; idx1++) {
+            JSClosureVar *cv = &fd->closure_var[idx1];
+            if (var_name == cv->var_name) {
+                if (fd != s) {
+                    idx = get_closure_var2(ctx, s, fd,
+                                           FALSE,
+                                           cv->is_arg, idx1,
+                                           cv->var_name, cv->is_const,
+                                           cv->is_lexical, cv->var_kind);
+                } else {
+                    idx = idx1;
+                }
+                goto has_idx;
+            } else if ((cv->var_name == JS_ATOM__var_ ||
+                        cv->var_name == JS_ATOM__arg_var_ ||
+                        cv->var_name == JS_ATOM__with_) && !is_pseudo_var) {
+                int is_with = (cv->var_name == JS_ATOM__with_);
+                if (fd != s) {
+                    idx = get_closure_var2(ctx, s, fd,
+                                           FALSE,
+                                           cv->is_arg, idx1,
+                                           cv->var_name, FALSE, FALSE,
+                                           JS_VAR_NORMAL);
+                } else {
+                    idx = idx1;
+                }
+                dbuf_putc(bc, OP_get_var_ref);
+                dbuf_put_u16(bc, idx);
+                var_object_test(ctx, s, var_name, op, bc, &label_done, is_with);
+            }
+        }
+    }
+
+    if (var_idx >= 0) {
+        /* find the corresponding closure variable */
+        if (var_idx & ARGUMENT_VAR_OFFSET) {
+            fd->args[var_idx - ARGUMENT_VAR_OFFSET].is_captured = 1;
+            idx = get_closure_var(ctx, s, fd,
+                                  TRUE, var_idx - ARGUMENT_VAR_OFFSET,
+                                  var_name, FALSE, FALSE, JS_VAR_NORMAL);
+        } else {
+            fd->vars[var_idx].is_captured = 1;
+            idx = get_closure_var(ctx, s, fd,
+                                  FALSE, var_idx,
+                                  var_name,
+                                  fd->vars[var_idx].is_const,
+                                  fd->vars[var_idx].is_lexical,
+                                  fd->vars[var_idx].var_kind);
+        }
+        if (idx >= 0) {
+        has_idx:
+            if ((op == OP_scope_put_var || op == OP_scope_make_ref) &&
+                s->closure_var[idx].is_const) {
+                dbuf_putc(bc, OP_throw_error);
+                dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+                dbuf_putc(bc, JS_THROW_VAR_RO);
+                goto done;
+            }
+            switch (op) {
+            case OP_scope_make_ref:
+                if (s->closure_var[idx].var_kind == JS_VAR_FUNCTION_NAME) {
+                    /* Create a dummy object reference for the func_var */
+                    dbuf_putc(bc, OP_object);
+                    dbuf_putc(bc, OP_get_var_ref);
+                    dbuf_put_u16(bc, idx);
+                    dbuf_putc(bc, OP_define_field);
+                    dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+                    dbuf_putc(bc, OP_push_atom_value);
+                    dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+                } else
+                if (label_done == -1 &&
+                    can_opt_put_ref_value(bc_buf, ls->pos)) {
+                    int get_op;
+                    if (s->closure_var[idx].is_lexical)
+                        get_op = OP_get_var_ref_check;
+                    else
+                        get_op = OP_get_var_ref;
+                    pos_next = optimize_scope_make_ref(ctx, s, bc, bc_buf, ls,
+                                                       pos_next,
+                                                       get_op, idx);
+                } else {
+                    /* Create a dummy object with a named slot that is
+                       a reference to the closure variable */
+                    dbuf_putc(bc, OP_make_var_ref_ref);
+                    dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+                    dbuf_put_u16(bc, idx);
+                }
+                break;
+            case OP_scope_get_ref:
+                /* XXX: should create a dummy object with a named slot that is
+                   a reference to the closure variable */
+                dbuf_putc(bc, OP_undefined);
+                /* fall thru */
+            case OP_scope_get_var_undef:
+            case OP_scope_get_var:
+            case OP_scope_put_var:
+            case OP_scope_put_var_init:
+                is_put = (op == OP_scope_put_var ||
+                          op == OP_scope_put_var_init);
+                if (is_put) {
+                    if (s->closure_var[idx].is_lexical) {
+                        if (op == OP_scope_put_var_init) {
+                            /* 'this' can only be initialized once */
+                            if (var_name == JS_ATOM_this)
+                                dbuf_putc(bc, OP_put_var_ref_check_init);
+                            else
+                                dbuf_putc(bc, OP_put_var_ref);
+                        } else {
+                            dbuf_putc(bc, OP_put_var_ref_check);
+                        }
+                    } else {
+                        dbuf_putc(bc, OP_put_var_ref);
+                    }
+                } else {
+                    if (s->closure_var[idx].is_lexical) {
+                        dbuf_putc(bc, OP_get_var_ref_check);
+                    } else {
+                        dbuf_putc(bc, OP_get_var_ref);
+                    }
+                }
+                dbuf_put_u16(bc, idx);
+                break;
+            case OP_scope_delete_var:
+                dbuf_putc(bc, OP_push_false);
+                break;
+            }
+            goto done;
+        }
+    }
+
+    /* global variable access */
+
+    switch (op) {
+    case OP_scope_make_ref:
+        if (label_done == -1 && can_opt_put_global_ref_value(bc_buf, ls->pos)) {
+            pos_next = optimize_scope_make_global_ref(ctx, s, bc, bc_buf, ls,
+                                                      pos_next, var_name);
+        } else {
+            dbuf_putc(bc, OP_make_var_ref);
+            dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+        }
+        break;
+    case OP_scope_get_ref:
+        /* XXX: should create a dummy object with a named slot that is
+           a reference to the global variable */
+        dbuf_putc(bc, OP_undefined);
+        dbuf_putc(bc, OP_get_var);
+        dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+        break;
+    case OP_scope_get_var_undef:
+    case OP_scope_get_var:
+    case OP_scope_put_var:
+        dbuf_putc(bc, OP_get_var_undef + (op - OP_scope_get_var_undef));
+        dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+        break;
+    case OP_scope_put_var_init:
+        dbuf_putc(bc, OP_put_var_init);
+        dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+        break;
+    case OP_scope_delete_var:
+        dbuf_putc(bc, OP_delete_var);
+        dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+        break;
+    }
+done:
+    if (label_done >= 0) {
+        dbuf_putc(bc, OP_label);
+        dbuf_put_u32(bc, label_done);
+        s->label_slots[label_done].pos2 = bc->size;
+    }
+    return pos_next;
+}
+
+/* search in all scopes */
+static int find_private_class_field_all(JSContext *ctx, JSFunctionDef *fd,
+                                        JSAtom name, int scope_level)
+{
+    int idx;
+
+    idx = fd->scopes[scope_level].first;
+    while (idx >= 0) {
+        if (fd->vars[idx].var_name == name)
+            return idx;
+        idx = fd->vars[idx].scope_next;
+    }
+    return -1;
+}
+
+static void get_loc_or_ref(DynBuf *bc, BOOL is_ref, int idx)
+{
+    /* if the field is not initialized, the error is catched when
+       accessing it */
+    if (is_ref)
+        dbuf_putc(bc, OP_get_var_ref);
+    else
+        dbuf_putc(bc, OP_get_loc);
+    dbuf_put_u16(bc, idx);
+}
+
+static int resolve_scope_private_field1(JSContext *ctx,
+                                        BOOL *pis_ref, int *pvar_kind,
+                                        JSFunctionDef *s,
+                                        JSAtom var_name, int scope_level)
+{
+    int idx, var_kind;
+    JSFunctionDef *fd;
+    BOOL is_ref;
+
+    fd = s;
+    is_ref = FALSE;
+    for(;;) {
+        idx = find_private_class_field_all(ctx, fd, var_name, scope_level);
+        if (idx >= 0) {
+            var_kind = fd->vars[idx].var_kind;
+            if (is_ref) {
+                idx = get_closure_var(ctx, s, fd, FALSE, idx, var_name,
+                                      TRUE, TRUE, JS_VAR_NORMAL);
+                if (idx < 0)
+                    return -1;
+            }
+            break;
+        }
+        scope_level = fd->parent_scope_level;
+        if (!fd->parent) {
+            if (fd->is_eval) {
+                /* closure of the eval function (top level) */
+                for (idx = 0; idx < fd->closure_var_count; idx++) {
+                    JSClosureVar *cv = &fd->closure_var[idx];
+                    if (cv->var_name == var_name) {
+                        var_kind = cv->var_kind;
+                        is_ref = TRUE;
+                        if (fd != s) {
+                            idx = get_closure_var2(ctx, s, fd,
+                                                   FALSE,
+                                                   cv->is_arg, idx,
+                                                   cv->var_name, cv->is_const,
+                                                   cv->is_lexical,
+                                                   cv->var_kind);
+                            if (idx < 0)
+                                return -1;
+                        }
+                        goto done;
+                    }
+                }
+            }
+            /* XXX: no line number info */
+            JS_ThrowSyntaxErrorAtom(ctx, "undefined private field '%s'",
+                                    var_name);
+            return -1;
+        } else {
+            fd = fd->parent;
+        }
+        is_ref = TRUE;
+    }
+ done:
+    *pis_ref = is_ref;
+    *pvar_kind = var_kind;
+    return idx;
+}
+
+/* return 0 if OK or -1 if the private field could not be resolved */
+static int resolve_scope_private_field(JSContext *ctx, JSFunctionDef *s,
+                                       JSAtom var_name, int scope_level, int op,
+                                       DynBuf *bc)
+{
+    int idx, var_kind;
+    BOOL is_ref;
+
+    idx = resolve_scope_private_field1(ctx, &is_ref, &var_kind, s,
+                                       var_name, scope_level);
+    if (idx < 0)
+        return -1;
+    assert(var_kind != JS_VAR_NORMAL);
+    switch (op) {
+    case OP_scope_get_private_field:
+    case OP_scope_get_private_field2:
+        switch(var_kind) {
+        case JS_VAR_PRIVATE_FIELD:
+            if (op == OP_scope_get_private_field2)
+                dbuf_putc(bc, OP_dup);
+            get_loc_or_ref(bc, is_ref, idx);
+            dbuf_putc(bc, OP_get_private_field);
+            break;
+        case JS_VAR_PRIVATE_METHOD:
+            get_loc_or_ref(bc, is_ref, idx);
+            dbuf_putc(bc, OP_check_brand);
+            if (op != OP_scope_get_private_field2)
+                dbuf_putc(bc, OP_nip);
+            break;
+        case JS_VAR_PRIVATE_GETTER:
+        case JS_VAR_PRIVATE_GETTER_SETTER:
+            if (op == OP_scope_get_private_field2)
+                dbuf_putc(bc, OP_dup);
+            get_loc_or_ref(bc, is_ref, idx);
+            dbuf_putc(bc, OP_check_brand);
+            dbuf_putc(bc, OP_call_method);
+            dbuf_put_u16(bc, 0);
+            break;
+        case JS_VAR_PRIVATE_SETTER:
+            /* XXX: add clearer error message */
+            dbuf_putc(bc, OP_throw_error);
+            dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+            dbuf_putc(bc, JS_THROW_VAR_RO);
+            break;
+        default:
+            abort();
+        }
+        break;
+    case OP_scope_put_private_field:
+        switch(var_kind) {
+        case JS_VAR_PRIVATE_FIELD:
+            get_loc_or_ref(bc, is_ref, idx);
+            dbuf_putc(bc, OP_put_private_field);
+            break;
+        case JS_VAR_PRIVATE_METHOD:
+        case JS_VAR_PRIVATE_GETTER:
+            /* XXX: add clearer error message */
+            dbuf_putc(bc, OP_throw_error);
+            dbuf_put_u32(bc, JS_DupAtom(ctx, var_name));
+            dbuf_putc(bc, JS_THROW_VAR_RO);
+            break;
+        case JS_VAR_PRIVATE_SETTER:
+        case JS_VAR_PRIVATE_GETTER_SETTER:
+            {
+                JSAtom setter_name = get_private_setter_name(ctx, var_name);
+                if (setter_name == JS_ATOM_NULL)
+                    return -1;
+                idx = resolve_scope_private_field1(ctx, &is_ref,
+                                                   &var_kind, s,
+                                                   setter_name, scope_level);
+                JS_FreeAtom(ctx, setter_name);
+                if (idx < 0)
+                    return -1;
+                assert(var_kind == JS_VAR_PRIVATE_SETTER);
+                get_loc_or_ref(bc, is_ref, idx);
+                dbuf_putc(bc, OP_swap);
+                /* obj func value */
+                dbuf_putc(bc, OP_rot3r);
+                /* value obj func */
+                dbuf_putc(bc, OP_check_brand);
+                dbuf_putc(bc, OP_rot3l);
+                /* obj func value */
+                dbuf_putc(bc, OP_call_method);
+                dbuf_put_u16(bc, 1);
+                dbuf_putc(bc, OP_drop);
+            }
+            break;
+        default:
+            abort();
+        }
+        break;
+    case OP_scope_in_private_field:
+        get_loc_or_ref(bc, is_ref, idx);
+        dbuf_putc(bc, OP_private_in);
+        break;
+    default:
+        abort();
+    }
+    return 0;
+}
+
+static void mark_eval_captured_variables(JSContext *ctx, JSFunctionDef *s,
+                                         int scope_level)
+{
+    int idx;
+    JSVarDef *vd;
+
+    for (idx = s->scopes[scope_level].first; idx >= 0;) {
+        vd = &s->vars[idx];
+        vd->is_captured = 1;
+        idx = vd->scope_next;
+    }
+}
+
+/* XXX: should handle the argument scope generically */
+static BOOL is_var_in_arg_scope(const JSVarDef *vd)
+{
+    return (vd->var_name == JS_ATOM_home_object ||
+            vd->var_name == JS_ATOM_this_active_func ||
+            vd->var_name == JS_ATOM_new_target ||
+            vd->var_name == JS_ATOM_this ||
+            vd->var_name == JS_ATOM__arg_var_ ||
+            vd->var_kind == JS_VAR_FUNCTION_NAME);
+}
+
+static void add_eval_variables(JSContext *ctx, JSFunctionDef *s)
+{
+    JSFunctionDef *fd;
+    JSVarDef *vd;
+    int i, scope_level, scope_idx;
+    BOOL has_arguments_binding, has_this_binding, is_arg_scope;
+
+    /* in non strict mode, variables are created in the caller's
+       environment object */
+    if (!s->is_eval && !(s->js_mode & JS_MODE_STRICT)) {
+        s->var_object_idx = add_var(ctx, s, JS_ATOM__var_);
+        if (s->has_parameter_expressions) {
+            /* an additional variable object is needed for the
+               argument scope */
+            s->arg_var_object_idx = add_var(ctx, s, JS_ATOM__arg_var_);
+        }
+    }
+
+    /* eval can potentially use 'arguments' so we must define it */
+    has_this_binding = s->has_this_binding;
+    if (has_this_binding) {
+        if (s->this_var_idx < 0)
+            s->this_var_idx = add_var_this(ctx, s);
+        if (s->new_target_var_idx < 0)
+            s->new_target_var_idx = add_var(ctx, s, JS_ATOM_new_target);
+        if (s->is_derived_class_constructor && s->this_active_func_var_idx < 0)
+            s->this_active_func_var_idx = add_var(ctx, s, JS_ATOM_this_active_func);
+        if (s->has_home_object && s->home_object_var_idx < 0)
+            s->home_object_var_idx = add_var(ctx, s, JS_ATOM_home_object);
+    }
+    has_arguments_binding = s->has_arguments_binding;
+    if (has_arguments_binding) {
+        add_arguments_var(ctx, s);
+        /* also add an arguments binding in the argument scope to
+           raise an error if a direct eval in the argument scope tries
+           to redefine it */
+        if (s->has_parameter_expressions && !(s->js_mode & JS_MODE_STRICT))
+            add_arguments_arg(ctx, s);
+    }
+    if (s->is_func_expr && s->func_name != JS_ATOM_NULL)
+        add_func_var(ctx, s, s->func_name);
+
+    /* eval can use all the variables of the enclosing functions, so
+       they must be all put in the closure. The closure variables are
+       ordered by scope. It works only because no closure are created
+       before. */
+    assert(s->is_eval || s->closure_var_count == 0);
+
+    /* XXX: inefficient, but eval performance is less critical */
+    fd = s;
+    for(;;) {
+        scope_level = fd->parent_scope_level;
+        fd = fd->parent;
+        if (!fd)
+            break;
+        /* add 'this' if it was not previously added */
+        if (!has_this_binding && fd->has_this_binding) {
+            if (fd->this_var_idx < 0)
+                fd->this_var_idx = add_var_this(ctx, fd);
+            if (fd->new_target_var_idx < 0)
+                fd->new_target_var_idx = add_var(ctx, fd, JS_ATOM_new_target);
+            if (fd->is_derived_class_constructor && fd->this_active_func_var_idx < 0)
+                fd->this_active_func_var_idx = add_var(ctx, fd, JS_ATOM_this_active_func);
+            if (fd->has_home_object && fd->home_object_var_idx < 0)
+                fd->home_object_var_idx = add_var(ctx, fd, JS_ATOM_home_object);
+            has_this_binding = TRUE;
+        }
+        /* add 'arguments' if it was not previously added */
+        if (!has_arguments_binding && fd->has_arguments_binding) {
+            add_arguments_var(ctx, fd);
+            has_arguments_binding = TRUE;
+        }
+        /* add function name */
+        if (fd->is_func_expr && fd->func_name != JS_ATOM_NULL)
+            add_func_var(ctx, fd, fd->func_name);
+
+        /* add lexical variables */
+        scope_idx = fd->scopes[scope_level].first;
+        while (scope_idx >= 0) {
+            vd = &fd->vars[scope_idx];
+            vd->is_captured = 1;
+            get_closure_var(ctx, s, fd, FALSE, scope_idx,
+                            vd->var_name, vd->is_const, vd->is_lexical, vd->var_kind);
+            scope_idx = vd->scope_next;
+        }
+        is_arg_scope = (scope_idx == ARG_SCOPE_END);
+        if (!is_arg_scope) {
+            /* add unscoped variables */
+            /* XXX: propagate is_const and var_kind too ? */
+            for(i = 0; i < fd->arg_count; i++) {
+                vd = &fd->args[i];
+                if (vd->var_name != JS_ATOM_NULL) {
+                    get_closure_var(ctx, s, fd,
+                                    TRUE, i, vd->var_name, FALSE,
+                                    vd->is_lexical, JS_VAR_NORMAL);
+                }
+            }
+            for(i = 0; i < fd->var_count; i++) {
+                vd = &fd->vars[i];
+                /* do not close top level last result */
+                if (vd->scope_level == 0 &&
+                    vd->var_name != JS_ATOM__ret_ &&
+                    vd->var_name != JS_ATOM_NULL) {
+                    get_closure_var(ctx, s, fd,
+                                    FALSE, i, vd->var_name, FALSE,
+                                    vd->is_lexical, JS_VAR_NORMAL);
+                }
+            }
+        } else {
+            for(i = 0; i < fd->var_count; i++) {
+                vd = &fd->vars[i];
+                /* do not close top level last result */
+                if (vd->scope_level == 0 && is_var_in_arg_scope(vd)) {
+                    get_closure_var(ctx, s, fd,
+                                    FALSE, i, vd->var_name, FALSE,
+                                    vd->is_lexical, JS_VAR_NORMAL);
+                }
+            }
+        }
+        if (fd->is_eval) {
+            int idx;
+            /* add direct eval variables (we are necessarily at the
+               top level) */
+            for (idx = 0; idx < fd->closure_var_count; idx++) {
+                JSClosureVar *cv = &fd->closure_var[idx];
+                get_closure_var2(ctx, s, fd,
+                                 FALSE, cv->is_arg,
+                                 idx, cv->var_name, cv->is_const,
+                                 cv->is_lexical, cv->var_kind);
+            }
+        }
+    }
+}
+
+static void set_closure_from_var(JSContext *ctx, JSClosureVar *cv,
+                                 JSVarDef *vd, int var_idx)
+{
+    cv->is_local = TRUE;
+    cv->is_arg = FALSE;
+    cv->is_const = vd->is_const;
+    cv->is_lexical = vd->is_lexical;
+    cv->var_kind = vd->var_kind;
+    cv->var_idx = var_idx;
+    cv->var_name = JS_DupAtom(ctx, vd->var_name);
+}
+
+/* for direct eval compilation: add references to the variables of the
+   calling function */
+static __exception int add_closure_variables(JSContext *ctx, JSFunctionDef *s,
+                                             JSFunctionBytecode *b, int scope_idx)
+{
+    int i, count;
+    JSVarDef *vd;
+    BOOL is_arg_scope;
+
+    count = b->arg_count + b->var_count + b->closure_var_count;
+    s->closure_var = NULL;
+    s->closure_var_count = 0;
+    s->closure_var_size = count;
+    if (count == 0)
+        return 0;
+    s->closure_var = js_malloc(ctx, sizeof(s->closure_var[0]) * count);
+    if (!s->closure_var)
+        return -1;
+    /* Add lexical variables in scope at the point of evaluation */
+    for (i = scope_idx; i >= 0;) {
+        vd = &b->vardefs[b->arg_count + i];
+        if (vd->scope_level > 0) {
+            JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
+            set_closure_from_var(ctx, cv, vd, i);
+        }
+        i = vd->scope_next;
+    }
+    is_arg_scope = (i == ARG_SCOPE_END);
+    if (!is_arg_scope) {
+        /* Add argument variables */
+        for(i = 0; i < b->arg_count; i++) {
+            JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
+            vd = &b->vardefs[i];
+            cv->is_local = TRUE;
+            cv->is_arg = TRUE;
+            cv->is_const = FALSE;
+            cv->is_lexical = FALSE;
+            cv->var_kind = JS_VAR_NORMAL;
+            cv->var_idx = i;
+            cv->var_name = JS_DupAtom(ctx, vd->var_name);
+        }
+        /* Add local non lexical variables */
+        for(i = 0; i < b->var_count; i++) {
+            vd = &b->vardefs[b->arg_count + i];
+            if (vd->scope_level == 0 && vd->var_name != JS_ATOM__ret_) {
+                JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
+                set_closure_from_var(ctx, cv, vd, i);
+            }
+        }
+    } else {
+        /* only add pseudo variables */
+        for(i = 0; i < b->var_count; i++) {
+            vd = &b->vardefs[b->arg_count + i];
+            if (vd->scope_level == 0 && is_var_in_arg_scope(vd)) {
+                JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
+                set_closure_from_var(ctx, cv, vd, i);
+            }
+        }
+    }
+    for(i = 0; i < b->closure_var_count; i++) {
+        JSClosureVar *cv0 = &b->closure_var[i];
+        JSClosureVar *cv = &s->closure_var[s->closure_var_count++];
+        cv->is_local = FALSE;
+        cv->is_arg = cv0->is_arg;
+        cv->is_const = cv0->is_const;
+        cv->is_lexical = cv0->is_lexical;
+        cv->var_kind = cv0->var_kind;
+        cv->var_idx = i;
+        cv->var_name = JS_DupAtom(ctx, cv0->var_name);
+    }
+    return 0;
+}
+
+typedef struct CodeContext {
+    const uint8_t *bc_buf; /* code buffer */
+    int bc_len;   /* length of the code buffer */
+    int pos;      /* position past the matched code pattern */
+    int line_num; /* last visited OP_line_num parameter or -1 */
+    int op;
+    int idx;
+    int label;
+    int val;
+    JSAtom atom;
+} CodeContext;
+
+#define M2(op1, op2)            ((op1) | ((op2) << 8))
+#define M3(op1, op2, op3)       ((op1) | ((op2) << 8) | ((op3) << 16))
+#define M4(op1, op2, op3, op4)  ((op1) | ((op2) << 8) | ((op3) << 16) | ((op4) << 24))
+
+static BOOL code_match(CodeContext *s, int pos, ...)
+{
+    const uint8_t *tab = s->bc_buf;
+    int op, len, op1, line_num, pos_next;
+    va_list ap;
+    BOOL ret = FALSE;
+
+    line_num = -1;
+    va_start(ap, pos);
+
+    for(;;) {
+        op1 = va_arg(ap, int);
+        if (op1 == -1) {
+            s->pos = pos;
+            s->line_num = line_num;
+            ret = TRUE;
+            break;
+        }
+        for (;;) {
+            if (pos >= s->bc_len)
+                goto done;
+            op = tab[pos];
+            len = opcode_info[op].size;
+            pos_next = pos + len;
+            if (pos_next > s->bc_len)
+                goto done;
+            if (op == OP_line_num) {
+                line_num = get_u32(tab + pos + 1);
+                pos = pos_next;
+            } else {
+                break;
+            }
+        }
+        if (op != op1) {
+            if (op1 == (uint8_t)op1 || !op)
+                break;
+            if (op != (uint8_t)op1
+            &&  op != (uint8_t)(op1 >> 8)
+            &&  op != (uint8_t)(op1 >> 16)
+            &&  op != (uint8_t)(op1 >> 24)) {
+                break;
+            }
+            s->op = op;
+        }
+
+        pos++;
+        switch(opcode_info[op].fmt) {
+        case OP_FMT_loc8:
+        case OP_FMT_u8:
+            {
+                int idx = tab[pos];
+                int arg = va_arg(ap, int);
+                if (arg == -1) {
+                    s->idx = idx;
+                } else {
+                    if (arg != idx)
+                        goto done;
+                }
+                break;
+            }
+        case OP_FMT_u16:
+        case OP_FMT_npop:
+        case OP_FMT_loc:
+        case OP_FMT_arg:
+        case OP_FMT_var_ref:
+            {
+                int idx = get_u16(tab + pos);
+                int arg = va_arg(ap, int);
+                if (arg == -1) {
+                    s->idx = idx;
+                } else {
+                    if (arg != idx)
+                        goto done;
+                }
+                break;
+            }
+        case OP_FMT_i32:
+        case OP_FMT_u32:
+        case OP_FMT_label:
+        case OP_FMT_const:
+            {
+                s->label = get_u32(tab + pos);
+                break;
+            }
+        case OP_FMT_label_u16:
+            {
+                s->label = get_u32(tab + pos);
+                s->val = get_u16(tab + pos + 4);
+                break;
+            }
+        case OP_FMT_atom:
+            {
+                s->atom = get_u32(tab + pos);
+                break;
+            }
+        case OP_FMT_atom_u8:
+            {
+                s->atom = get_u32(tab + pos);
+                s->val = get_u8(tab + pos + 4);
+                break;
+            }
+        case OP_FMT_atom_u16:
+            {
+                s->atom = get_u32(tab + pos);
+                s->val = get_u16(tab + pos + 4);
+                break;
+            }
+        case OP_FMT_atom_label_u8:
+            {
+                s->atom = get_u32(tab + pos);
+                s->label = get_u32(tab + pos + 4);
+                s->val = get_u8(tab + pos + 8);
+                break;
+            }
+        default:
+            break;
+        }
+        pos = pos_next;
+    }
+ done:
+    va_end(ap);
+    return ret;
+}
+
+static void instantiate_hoisted_definitions(JSContext *ctx, JSFunctionDef *s, DynBuf *bc)
+{
+    int i, idx, label_next = -1;
+
+    /* add the hoisted functions in arguments and local variables */
+    for(i = 0; i < s->arg_count; i++) {
+        JSVarDef *vd = &s->args[i];
+        if (vd->func_pool_idx >= 0) {
+            dbuf_putc(bc, OP_fclosure);
+            dbuf_put_u32(bc, vd->func_pool_idx);
+            dbuf_putc(bc, OP_put_arg);
+            dbuf_put_u16(bc, i);
+        }
+    }
+    for(i = 0; i < s->var_count; i++) {
+        JSVarDef *vd = &s->vars[i];
+        if (vd->scope_level == 0 && vd->func_pool_idx >= 0) {
+            dbuf_putc(bc, OP_fclosure);
+            dbuf_put_u32(bc, vd->func_pool_idx);
+            dbuf_putc(bc, OP_put_loc);
+            dbuf_put_u16(bc, i);
+        }
+    }
+
+    /* the module global variables must be initialized before
+       evaluating the module so that the exported functions are
+       visible if there are cyclic module references */
+    if (s->module) {
+        label_next = new_label_fd(s, -1);
+
+        /* if 'this' is true, initialize the global variables and return */
+        dbuf_putc(bc, OP_push_this);
+        dbuf_putc(bc, OP_if_false);
+        dbuf_put_u32(bc, label_next);
+        update_label(s, label_next, 1);
+        s->jump_size++;
+    }
+
+    /* add the global variables (only happens if s->is_global_var is
+       true) */
+    for(i = 0; i < s->global_var_count; i++) {
+        JSGlobalVar *hf = &s->global_vars[i];
+        int has_closure = 0;
+        BOOL force_init = hf->force_init;
+        /* we are in an eval, so the closure contains all the
+           enclosing variables */
+        /* If the outer function has a variable environment,
+           create a property for the variable there */
+        for(idx = 0; idx < s->closure_var_count; idx++) {
+            JSClosureVar *cv = &s->closure_var[idx];
+            if (cv->var_name == hf->var_name) {
+                has_closure = 2;
+                force_init = FALSE;
+                break;
+            }
+            if (cv->var_name == JS_ATOM__var_ ||
+                cv->var_name == JS_ATOM__arg_var_) {
+                dbuf_putc(bc, OP_get_var_ref);
+                dbuf_put_u16(bc, idx);
+                has_closure = 1;
+                force_init = TRUE;
+                break;
+            }
+        }
+        if (!has_closure) {
+            int flags;
+
+            flags = 0;
+            if (s->eval_type != JS_EVAL_TYPE_GLOBAL)
+                flags |= JS_PROP_CONFIGURABLE;
+            if (hf->cpool_idx >= 0 && !hf->is_lexical) {
+                /* global function definitions need a specific handling */
+                dbuf_putc(bc, OP_fclosure);
+                dbuf_put_u32(bc, hf->cpool_idx);
+
+                dbuf_putc(bc, OP_define_func);
+                dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
+                dbuf_putc(bc, flags);
+
+                goto done_global_var;
+            } else {
+                if (hf->is_lexical) {
+                    flags |= DEFINE_GLOBAL_LEX_VAR;
+                    if (!hf->is_const)
+                        flags |= JS_PROP_WRITABLE;
+                }
+                dbuf_putc(bc, OP_define_var);
+                dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
+                dbuf_putc(bc, flags);
+            }
+        }
+        if (hf->cpool_idx >= 0 || force_init) {
+            if (hf->cpool_idx >= 0) {
+                dbuf_putc(bc, OP_fclosure);
+                dbuf_put_u32(bc, hf->cpool_idx);
+                if (hf->var_name == JS_ATOM__default_) {
+                    /* set default export function name */
+                    dbuf_putc(bc, OP_set_name);
+                    dbuf_put_u32(bc, JS_DupAtom(ctx, JS_ATOM_default));
+                }
+            } else {
+                dbuf_putc(bc, OP_undefined);
+            }
+            if (has_closure == 2) {
+                dbuf_putc(bc, OP_put_var_ref);
+                dbuf_put_u16(bc, idx);
+            } else if (has_closure == 1) {
+                dbuf_putc(bc, OP_define_field);
+                dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
+                dbuf_putc(bc, OP_drop);
+            } else {
+                /* XXX: Check if variable is writable and enumerable */
+                dbuf_putc(bc, OP_put_var);
+                dbuf_put_u32(bc, JS_DupAtom(ctx, hf->var_name));
+            }
+        }
+    done_global_var:
+        JS_FreeAtom(ctx, hf->var_name);
+    }
+
+    if (s->module) {
+        dbuf_putc(bc, OP_return_undef);
+
+        dbuf_putc(bc, OP_label);
+        dbuf_put_u32(bc, label_next);
+        s->label_slots[label_next].pos2 = bc->size;
+    }
+
+    js_free(ctx, s->global_vars);
+    s->global_vars = NULL;
+    s->global_var_count = 0;
+    s->global_var_size = 0;
+}
+
+static int skip_dead_code(JSFunctionDef *s, const uint8_t *bc_buf, int bc_len,
+                          int pos, int *linep)
+{
+    int op, len, label;
+
+    for (; pos < bc_len; pos += len) {
+        op = bc_buf[pos];
+        len = opcode_info[op].size;
+        if (op == OP_line_num) {
+            *linep = get_u32(bc_buf + pos + 1);
+        } else
+        if (op == OP_label) {
+            label = get_u32(bc_buf + pos + 1);
+            if (update_label(s, label, 0) > 0)
+                break;
+#if 0
+            if (s->label_slots[label].first_reloc) {
+                printf("line %d: unreferenced label %d:%d has relocations\n",
+                       *linep, label, s->label_slots[label].pos2);
+            }
+#endif
+            assert(s->label_slots[label].first_reloc == NULL);
+        } else {
+            /* XXX: output a warning for unreachable code? */
+            JSAtom atom;
+            switch(opcode_info[op].fmt) {
+            case OP_FMT_label:
+            case OP_FMT_label_u16:
+                label = get_u32(bc_buf + pos + 1);
+                update_label(s, label, -1);
+                break;
+            case OP_FMT_atom_label_u8:
+            case OP_FMT_atom_label_u16:
+                label = get_u32(bc_buf + pos + 5);
+                update_label(s, label, -1);
+                /* fall thru */
+            case OP_FMT_atom:
+            case OP_FMT_atom_u8:
+            case OP_FMT_atom_u16:
+                atom = get_u32(bc_buf + pos + 1);
+                JS_FreeAtom(s->ctx, atom);
+                break;
+            default:
+                break;
+            }
+        }
+    }
+    return pos;
+}
+
+static int get_label_pos(JSFunctionDef *s, int label)
+{
+    int i, pos;
+    for (i = 0; i < 20; i++) {
+        pos = s->label_slots[label].pos;
+        for (;;) {
+            switch (s->byte_code.buf[pos]) {
+            case OP_line_num:
+            case OP_label:
+                pos += 5;
+                continue;
+            case OP_goto:
+                label = get_u32(s->byte_code.buf + pos + 1);
+                break;
+            default:
+                return pos;
+            }
+            break;
+        }
+    }
+    return pos;
+}
+
+/* convert global variable accesses to local variables or closure
+   variables when necessary */
+static __exception int resolve_variables(JSContext *ctx, JSFunctionDef *s)
+{
+    int pos, pos_next, bc_len, op, len, i, idx, line_num;
+    uint8_t *bc_buf;
+    JSAtom var_name;
+    DynBuf bc_out;
+    CodeContext cc;
+    int scope;
+
+    cc.bc_buf = bc_buf = s->byte_code.buf;
+    cc.bc_len = bc_len = s->byte_code.size;
+    js_dbuf_init(ctx, &bc_out);
+
+    /* first pass for runtime checks (must be done before the
+       variables are created) */
+    for(i = 0; i < s->global_var_count; i++) {
+        JSGlobalVar *hf = &s->global_vars[i];
+        int flags;
+
+        /* check if global variable (XXX: simplify) */
+        for(idx = 0; idx < s->closure_var_count; idx++) {
+            JSClosureVar *cv = &s->closure_var[idx];
+            if (cv->var_name == hf->var_name) {
+                if (s->eval_type == JS_EVAL_TYPE_DIRECT &&
+                    cv->is_lexical) {
+                    /* Check if a lexical variable is
+                       redefined as 'var'. XXX: Could abort
+                       compilation here, but for consistency
+                       with the other checks, we delay the
+                       error generation. */
+                    dbuf_putc(&bc_out, OP_throw_error);
+                    dbuf_put_u32(&bc_out, JS_DupAtom(ctx, hf->var_name));
+                    dbuf_putc(&bc_out, JS_THROW_VAR_REDECL);
+                }
+                goto next;
+            }
+            if (cv->var_name == JS_ATOM__var_ ||
+                cv->var_name == JS_ATOM__arg_var_)
+                goto next;
+        }
+
+        dbuf_putc(&bc_out, OP_check_define_var);
+        dbuf_put_u32(&bc_out, JS_DupAtom(ctx, hf->var_name));
+        flags = 0;
+        if (hf->is_lexical)
+            flags |= DEFINE_GLOBAL_LEX_VAR;
+        if (hf->cpool_idx >= 0)
+            flags |= DEFINE_GLOBAL_FUNC_VAR;
+        dbuf_putc(&bc_out, flags);
+    next: ;
+    }
+
+    line_num = 0; /* avoid warning */
+    for (pos = 0; pos < bc_len; pos = pos_next) {
+        op = bc_buf[pos];
+        len = opcode_info[op].size;
+        pos_next = pos + len;
+        switch(op) {
+        case OP_line_num:
+            line_num = get_u32(bc_buf + pos + 1);
+            s->line_number_size++;
+            goto no_change;
+
+        case OP_eval: /* convert scope index to adjusted variable index */
+            {
+                int call_argc = get_u16(bc_buf + pos + 1);
+                scope = get_u16(bc_buf + pos + 1 + 2);
+                mark_eval_captured_variables(ctx, s, scope);
+                dbuf_putc(&bc_out, op);
+                dbuf_put_u16(&bc_out, call_argc);
+                dbuf_put_u16(&bc_out, s->scopes[scope].first + 1);
+            }
+            break;
+        case OP_apply_eval: /* convert scope index to adjusted variable index */
+            scope = get_u16(bc_buf + pos + 1);
+            mark_eval_captured_variables(ctx, s, scope);
+            dbuf_putc(&bc_out, op);
+            dbuf_put_u16(&bc_out, s->scopes[scope].first + 1);
+            break;
+        case OP_scope_get_var_checkthis:
+        case OP_scope_get_var_undef:
+        case OP_scope_get_var:
+        case OP_scope_put_var:
+        case OP_scope_delete_var:
+        case OP_scope_get_ref:
+        case OP_scope_put_var_init:
+            var_name = get_u32(bc_buf + pos + 1);
+            scope = get_u16(bc_buf + pos + 5);
+            pos_next = resolve_scope_var(ctx, s, var_name, scope, op, &bc_out,
+                                         NULL, NULL, pos_next);
+            JS_FreeAtom(ctx, var_name);
+            break;
+        case OP_scope_make_ref:
+            {
+                int label;
+                LabelSlot *ls;
+                var_name = get_u32(bc_buf + pos + 1);
+                label = get_u32(bc_buf + pos + 5);
+                scope = get_u16(bc_buf + pos + 9);
+                ls = &s->label_slots[label];
+                ls->ref_count--;  /* always remove label reference */
+                pos_next = resolve_scope_var(ctx, s, var_name, scope, op, &bc_out,
+                                             bc_buf, ls, pos_next);
+                JS_FreeAtom(ctx, var_name);
+            }
+            break;
+        case OP_scope_get_private_field:
+        case OP_scope_get_private_field2:
+        case OP_scope_put_private_field:
+        case OP_scope_in_private_field:
+            {
+                int ret;
+                var_name = get_u32(bc_buf + pos + 1);
+                scope = get_u16(bc_buf + pos + 5);
+                ret = resolve_scope_private_field(ctx, s, var_name, scope, op, &bc_out);
+                if (ret < 0)
+                    goto fail;
+                JS_FreeAtom(ctx, var_name);
+            }
+            break;
+        case OP_gosub:
+            s->jump_size++;
+            if (OPTIMIZE) {
+                /* remove calls to empty finalizers  */
+                int label;
+                LabelSlot *ls;
+
+                label = get_u32(bc_buf + pos + 1);
+                assert(label >= 0 && label < s->label_count);
+                ls = &s->label_slots[label];
+                if (code_match(&cc, ls->pos, OP_ret, -1)) {
+                    ls->ref_count--;
+                    break;
+                }
+            }
+            goto no_change;
+        case OP_drop:
+            if (0) {
+                /* remove drops before return_undef */
+                /* do not perform this optimization in pass2 because
+                   it breaks patterns recognised in resolve_labels */
+                int pos1 = pos_next;
+                int line1 = line_num;
+                while (code_match(&cc, pos1, OP_drop, -1)) {
+                    if (cc.line_num >= 0) line1 = cc.line_num;
+                    pos1 = cc.pos;
+                }
+                if (code_match(&cc, pos1, OP_return_undef, -1)) {
+                    pos_next = pos1;
+                    if (line1 != -1 && line1 != line_num) {
+                        line_num = line1;
+                        s->line_number_size++;
+                        dbuf_putc(&bc_out, OP_line_num);
+                        dbuf_put_u32(&bc_out, line_num);
+                    }
+                    break;
+                }
+            }
+            goto no_change;
+        case OP_insert3:
+            if (OPTIMIZE) {
+                /* Transformation: insert3 put_array_el|put_ref_value drop -> put_array_el|put_ref_value */
+                if (code_match(&cc, pos_next, M2(OP_put_array_el, OP_put_ref_value), OP_drop, -1)) {
+                    dbuf_putc(&bc_out, cc.op);
+                    pos_next = cc.pos;
+                    if (cc.line_num != -1 && cc.line_num != line_num) {
+                        line_num = cc.line_num;
+                        s->line_number_size++;
+                        dbuf_putc(&bc_out, OP_line_num);
+                        dbuf_put_u32(&bc_out, line_num);
+                    }
+                    break;
+                }
+            }
+            goto no_change;
+
+        case OP_goto:
+            s->jump_size++;
+            /* fall thru */
+        case OP_tail_call:
+        case OP_tail_call_method:
+        case OP_return:
+        case OP_return_undef:
+        case OP_throw:
+        case OP_throw_error:
+        case OP_ret:
+            if (OPTIMIZE) {
+                /* remove dead code */
+                int line = -1;
+                dbuf_put(&bc_out, bc_buf + pos, len);
+                pos = skip_dead_code(s, bc_buf, bc_len, pos + len, &line);
+                pos_next = pos;
+                if (pos < bc_len && line >= 0 && line_num != line) {
+                    line_num = line;
+                    s->line_number_size++;
+                    dbuf_putc(&bc_out, OP_line_num);
+                    dbuf_put_u32(&bc_out, line_num);
+                }
+                break;
+            }
+            goto no_change;
+
+        case OP_label:
+            {
+                int label;
+                LabelSlot *ls;
+
+                label = get_u32(bc_buf + pos + 1);
+                assert(label >= 0 && label < s->label_count);
+                ls = &s->label_slots[label];
+                ls->pos2 = bc_out.size + opcode_info[op].size;
+            }
+            goto no_change;
+
+        case OP_enter_scope:
+            {
+                int scope_idx, scope = get_u16(bc_buf + pos + 1);
+
+                if (scope == s->body_scope) {
+                    instantiate_hoisted_definitions(ctx, s, &bc_out);
+                }
+
+                for(scope_idx = s->scopes[scope].first; scope_idx >= 0;) {
+                    JSVarDef *vd = &s->vars[scope_idx];
+                    if (vd->scope_level == scope) {
+                        if (scope_idx != s->arguments_arg_idx) {
+                            if (vd->var_kind == JS_VAR_FUNCTION_DECL ||
+                                vd->var_kind == JS_VAR_NEW_FUNCTION_DECL) {
+                                /* Initialize lexical variable upon entering scope */
+                                dbuf_putc(&bc_out, OP_fclosure);
+                                dbuf_put_u32(&bc_out, vd->func_pool_idx);
+                                dbuf_putc(&bc_out, OP_put_loc);
+                                dbuf_put_u16(&bc_out, scope_idx);
+                            } else {
+                                /* XXX: should check if variable can be used
+                                   before initialization */
+                                dbuf_putc(&bc_out, OP_set_loc_uninitialized);
+                                dbuf_put_u16(&bc_out, scope_idx);
+                            }
+                        }
+                        scope_idx = vd->scope_next;
+                    } else {
+                        break;
+                    }
+                }
+            }
+            break;
+
+        case OP_leave_scope:
+            {
+                int scope_idx, scope = get_u16(bc_buf + pos + 1);
+
+                for(scope_idx = s->scopes[scope].first; scope_idx >= 0;) {
+                    JSVarDef *vd = &s->vars[scope_idx];
+                    if (vd->scope_level == scope) {
+                        if (vd->is_captured) {
+                            dbuf_putc(&bc_out, OP_close_loc);
+                            dbuf_put_u16(&bc_out, scope_idx);
+                        }
+                        scope_idx = vd->scope_next;
+                    } else {
+                        break;
+                    }
+                }
+            }
+            break;
+
+        case OP_set_name:
+            {
+                /* remove dummy set_name opcodes */
+                JSAtom name = get_u32(bc_buf + pos + 1);
+                if (name == JS_ATOM_NULL)
+                    break;
+            }
+            goto no_change;
+
+        case OP_if_false:
+        case OP_if_true:
+        case OP_catch:
+            s->jump_size++;
+            goto no_change;
+
+        case OP_dup:
+            if (OPTIMIZE) {
+                /* Transformation: dup if_false(l1) drop, l1: if_false(l2) -> if_false(l2) */
+                /* Transformation: dup if_true(l1) drop, l1: if_true(l2) -> if_true(l2) */
+                if (code_match(&cc, pos_next, M2(OP_if_false, OP_if_true), OP_drop, -1)) {
+                    int lab0, lab1, op1, pos1, line1, pos2;
+                    lab0 = lab1 = cc.label;
+                    assert(lab1 >= 0 && lab1 < s->label_count);
+                    op1 = cc.op;
+                    pos1 = cc.pos;
+                    line1 = cc.line_num;
+                    while (code_match(&cc, (pos2 = get_label_pos(s, lab1)), OP_dup, op1, OP_drop, -1)) {
+                        lab1 = cc.label;
+                    }
+                    if (code_match(&cc, pos2, op1, -1)) {
+                        s->jump_size++;
+                        update_label(s, lab0, -1);
+                        update_label(s, cc.label, +1);
+                        dbuf_putc(&bc_out, op1);
+                        dbuf_put_u32(&bc_out, cc.label);
+                        pos_next = pos1;
+                        if (line1 != -1 && line1 != line_num) {
+                            line_num = line1;
+                            s->line_number_size++;
+                            dbuf_putc(&bc_out, OP_line_num);
+                            dbuf_put_u32(&bc_out, line_num);
+                        }
+                        break;
+                    }
+                }
+            }
+            goto no_change;
+
+        case OP_nop:
+            /* remove erased code */
+            break;
+        case OP_set_class_name:
+            /* only used during parsing */
+            break;
+
+        case OP_get_field_opt_chain: /* equivalent to OP_get_field */
+            {
+                JSAtom name = get_u32(bc_buf + pos + 1);
+                dbuf_putc(&bc_out, OP_get_field);
+                dbuf_put_u32(&bc_out, name);
+            }
+            break;
+        case OP_get_array_el_opt_chain: /* equivalent to OP_get_array_el */
+            dbuf_putc(&bc_out, OP_get_array_el);
+            break;
+
+        default:
+        no_change:
+            dbuf_put(&bc_out, bc_buf + pos, len);
+            break;
+        }
+    }
+
+    /* set the new byte code */
+    dbuf_free(&s->byte_code);
+    s->byte_code = bc_out;
+    if (dbuf_error(&s->byte_code)) {
+        JS_ThrowOutOfMemory(ctx);
+        return -1;
+    }
+    return 0;
+ fail:
+    /* continue the copy to keep the atom refcounts consistent */
+    /* XXX: find a better solution ? */
+    for (; pos < bc_len; pos = pos_next) {
+        op = bc_buf[pos];
+        len = opcode_info[op].size;
+        pos_next = pos + len;
+        dbuf_put(&bc_out, bc_buf + pos, len);
+    }
+    dbuf_free(&s->byte_code);
+    s->byte_code = bc_out;
+    return -1;
+}
+
+/* the pc2line table gives a line number for each PC value */
+static void add_pc2line_info(JSFunctionDef *s, uint32_t pc, int line_num)
+{
+    if (s->line_number_slots != NULL
+    &&  s->line_number_count < s->line_number_size
+    &&  pc >= s->line_number_last_pc
+    &&  line_num != s->line_number_last) {
+        s->line_number_slots[s->line_number_count].pc = pc;
+        s->line_number_slots[s->line_number_count].line_num = line_num;
+        s->line_number_count++;
+        s->line_number_last_pc = pc;
+        s->line_number_last = line_num;
+    }
+}
+
+static void compute_pc2line_info(JSFunctionDef *s)
+{
+    if (!(s->js_mode & JS_MODE_STRIP) && s->line_number_slots) {
+        int last_line_num = s->line_num;
+        uint32_t last_pc = 0;
+        int i;
+
+        js_dbuf_init(s->ctx, &s->pc2line);
+        for (i = 0; i < s->line_number_count; i++) {
+            uint32_t pc = s->line_number_slots[i].pc;
+            int line_num = s->line_number_slots[i].line_num;
+            int diff_pc, diff_line;
+
+            if (line_num < 0)
+                continue;
+
+            diff_pc = pc - last_pc;
+            diff_line = line_num - last_line_num;
+            if (diff_line == 0 || diff_pc < 0)
+                continue;
+
+            if (diff_line >= PC2LINE_BASE &&
+                diff_line < PC2LINE_BASE + PC2LINE_RANGE &&
+                diff_pc <= PC2LINE_DIFF_PC_MAX) {
+                dbuf_putc(&s->pc2line, (diff_line - PC2LINE_BASE) +
+                          diff_pc * PC2LINE_RANGE + PC2LINE_OP_FIRST);
+            } else {
+                /* longer encoding */
+                dbuf_putc(&s->pc2line, 0);
+                dbuf_put_leb128(&s->pc2line, diff_pc);
+                dbuf_put_sleb128(&s->pc2line, diff_line);
+            }
+            last_pc = pc;
+            last_line_num = line_num;
+        }
+    }
+}
+
+static RelocEntry *add_reloc(JSContext *ctx, LabelSlot *ls, uint32_t addr, int size)
+{
+    RelocEntry *re;
+    re = js_malloc(ctx, sizeof(*re));
+    if (!re)
+        return NULL;
+    re->addr = addr;
+    re->size = size;
+    re->next = ls->first_reloc;
+    ls->first_reloc = re;
+    return re;
+}
+
+static BOOL code_has_label(CodeContext *s, int pos, int label)
+{
+    while (pos < s->bc_len) {
+        int op = s->bc_buf[pos];
+        if (op == OP_line_num) {
+            pos += 5;
+            continue;
+        }
+        if (op == OP_label) {
+            int lab = get_u32(s->bc_buf + pos + 1);
+            if (lab == label)
+                return TRUE;
+            pos += 5;
+            continue;
+        }
+        if (op == OP_goto) {
+            int lab = get_u32(s->bc_buf + pos + 1);
+            if (lab == label)
+                return TRUE;
+        }
+        break;
+    }
+    return FALSE;
+}
+
+/* return the target label, following the OP_goto jumps
+   the first opcode at destination is stored in *pop
+ */
+static int find_jump_target(JSFunctionDef *s, int label, int *pop, int *pline)
+{
+    int i, pos, op;
+
+    update_label(s, label, -1);
+    for (i = 0; i < 10; i++) {
+        assert(label >= 0 && label < s->label_count);
+        pos = s->label_slots[label].pos2;
+        for (;;) {
+            switch(op = s->byte_code.buf[pos]) {
+            case OP_line_num:
+                if (pline)
+                    *pline = get_u32(s->byte_code.buf + pos + 1);
+                /* fall thru */
+            case OP_label:
+                pos += opcode_info[op].size;
+                continue;
+            case OP_goto:
+                label = get_u32(s->byte_code.buf + pos + 1);
+                break;
+            case OP_drop:
+                /* ignore drop opcodes if followed by OP_return_undef */
+                while (s->byte_code.buf[++pos] == OP_drop)
+                    continue;
+                if (s->byte_code.buf[pos] == OP_return_undef)
+                    op = OP_return_undef;
+                /* fall thru */
+            default:
+                goto done;
+            }
+            break;
+        }
+    }
+    /* cycle detected, could issue a warning */
+ done:
+    *pop = op;
+    update_label(s, label, +1);
+    return label;
+}
+
+static void push_short_int(DynBuf *bc_out, int val)
+{
+#if SHORT_OPCODES
+    if (val >= -1 && val <= 7) {
+        dbuf_putc(bc_out, OP_push_0 + val);
+        return;
+    }
+    if (val == (int8_t)val) {
+        dbuf_putc(bc_out, OP_push_i8);
+        dbuf_putc(bc_out, val);
+        return;
+    }
+    if (val == (int16_t)val) {
+        dbuf_putc(bc_out, OP_push_i16);
+        dbuf_put_u16(bc_out, val);
+        return;
+    }
+#endif
+    dbuf_putc(bc_out, OP_push_i32);
+    dbuf_put_u32(bc_out, val);
+}
+
+static void put_short_code(DynBuf *bc_out, int op, int idx)
+{
+#if SHORT_OPCODES
+    if (idx < 4) {
+        switch (op) {
+        case OP_get_loc:
+            dbuf_putc(bc_out, OP_get_loc0 + idx);
+            return;
+        case OP_put_loc:
+            dbuf_putc(bc_out, OP_put_loc0 + idx);
+            return;
+        case OP_set_loc:
+            dbuf_putc(bc_out, OP_set_loc0 + idx);
+            return;
+        case OP_get_arg:
+            dbuf_putc(bc_out, OP_get_arg0 + idx);
+            return;
+        case OP_put_arg:
+            dbuf_putc(bc_out, OP_put_arg0 + idx);
+            return;
+        case OP_set_arg:
+            dbuf_putc(bc_out, OP_set_arg0 + idx);
+            return;
+        case OP_get_var_ref:
+            dbuf_putc(bc_out, OP_get_var_ref0 + idx);
+            return;
+        case OP_put_var_ref:
+            dbuf_putc(bc_out, OP_put_var_ref0 + idx);
+            return;
+        case OP_set_var_ref:
+            dbuf_putc(bc_out, OP_set_var_ref0 + idx);
+            return;
+        case OP_call:
+            dbuf_putc(bc_out, OP_call0 + idx);
+            return;
+        }
+    }
+    if (idx < 256) {
+        switch (op) {
+        case OP_get_loc:
+            dbuf_putc(bc_out, OP_get_loc8);
+            dbuf_putc(bc_out, idx);
+            return;
+        case OP_put_loc:
+            dbuf_putc(bc_out, OP_put_loc8);
+            dbuf_putc(bc_out, idx);
+            return;
+        case OP_set_loc:
+            dbuf_putc(bc_out, OP_set_loc8);
+            dbuf_putc(bc_out, idx);
+            return;
+        }
+    }
+#endif
+    dbuf_putc(bc_out, op);
+    dbuf_put_u16(bc_out, idx);
+}
+
+/* peephole optimizations and resolve goto/labels */
+static __exception int resolve_labels(JSContext *ctx, JSFunctionDef *s)
+{
+    int pos, pos_next, bc_len, op, op1, len, i, line_num;
+    const uint8_t *bc_buf;
+    DynBuf bc_out;
+    LabelSlot *label_slots, *ls;
+    RelocEntry *re, *re_next;
+    CodeContext cc;
+    int label;
+#if SHORT_OPCODES
+    JumpSlot *jp;
+#endif
+
+    label_slots = s->label_slots;
+
+    line_num = s->line_num;
+
+    cc.bc_buf = bc_buf = s->byte_code.buf;
+    cc.bc_len = bc_len = s->byte_code.size;
+    js_dbuf_init(ctx, &bc_out);
+
+#if SHORT_OPCODES
+    if (s->jump_size) {
+        s->jump_slots = js_mallocz(s->ctx, sizeof(*s->jump_slots) * s->jump_size);
+        if (s->jump_slots == NULL)
+            return -1;
+    }
+#endif
+    /* XXX: Should skip this phase if not generating SHORT_OPCODES */
+    if (s->line_number_size && !(s->js_mode & JS_MODE_STRIP)) {
+        s->line_number_slots = js_mallocz(s->ctx, sizeof(*s->line_number_slots) * s->line_number_size);
+        if (s->line_number_slots == NULL)
+            return -1;
+        s->line_number_last = s->line_num;
+        s->line_number_last_pc = 0;
+    }
+
+    /* initialize the 'home_object' variable if needed */
+    if (s->home_object_var_idx >= 0) {
+        dbuf_putc(&bc_out, OP_special_object);
+        dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_HOME_OBJECT);
+        put_short_code(&bc_out, OP_put_loc, s->home_object_var_idx);
+    }
+    /* initialize the 'this.active_func' variable if needed */
+    if (s->this_active_func_var_idx >= 0) {
+        dbuf_putc(&bc_out, OP_special_object);
+        dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_THIS_FUNC);
+        put_short_code(&bc_out, OP_put_loc, s->this_active_func_var_idx);
+    }
+    /* initialize the 'new.target' variable if needed */
+    if (s->new_target_var_idx >= 0) {
+        dbuf_putc(&bc_out, OP_special_object);
+        dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_NEW_TARGET);
+        put_short_code(&bc_out, OP_put_loc, s->new_target_var_idx);
+    }
+    /* initialize the 'this' variable if needed. In a derived class
+       constructor, this is initially uninitialized. */
+    if (s->this_var_idx >= 0) {
+        if (s->is_derived_class_constructor) {
+            dbuf_putc(&bc_out, OP_set_loc_uninitialized);
+            dbuf_put_u16(&bc_out, s->this_var_idx);
+        } else {
+            dbuf_putc(&bc_out, OP_push_this);
+            put_short_code(&bc_out, OP_put_loc, s->this_var_idx);
+        }
+    }
+    /* initialize the 'arguments' variable if needed */
+    if (s->arguments_var_idx >= 0) {
+        if ((s->js_mode & JS_MODE_STRICT) || !s->has_simple_parameter_list) {
+            dbuf_putc(&bc_out, OP_special_object);
+            dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_ARGUMENTS);
+        } else {
+            dbuf_putc(&bc_out, OP_special_object);
+            dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_MAPPED_ARGUMENTS);
+        }
+        if (s->arguments_arg_idx >= 0)
+            put_short_code(&bc_out, OP_set_loc, s->arguments_arg_idx);
+        put_short_code(&bc_out, OP_put_loc, s->arguments_var_idx);
+    }
+    /* initialize a reference to the current function if needed */
+    if (s->func_var_idx >= 0) {
+        dbuf_putc(&bc_out, OP_special_object);
+        dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_THIS_FUNC);
+        put_short_code(&bc_out, OP_put_loc, s->func_var_idx);
+    }
+    /* initialize the variable environment object if needed */
+    if (s->var_object_idx >= 0) {
+        dbuf_putc(&bc_out, OP_special_object);
+        dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_VAR_OBJECT);
+        put_short_code(&bc_out, OP_put_loc, s->var_object_idx);
+    }
+    if (s->arg_var_object_idx >= 0) {
+        dbuf_putc(&bc_out, OP_special_object);
+        dbuf_putc(&bc_out, OP_SPECIAL_OBJECT_VAR_OBJECT);
+        put_short_code(&bc_out, OP_put_loc, s->arg_var_object_idx);
+    }
+
+    for (pos = 0; pos < bc_len; pos = pos_next) {
+        int val;
+        op = bc_buf[pos];
+        len = opcode_info[op].size;
+        pos_next = pos + len;
+        switch(op) {
+        case OP_line_num:
+            /* line number info (for debug). We put it in a separate
+               compressed table to reduce memory usage and get better
+               performance */
+            line_num = get_u32(bc_buf + pos + 1);
+            break;
+
+        case OP_label:
+            {
+                label = get_u32(bc_buf + pos + 1);
+                assert(label >= 0 && label < s->label_count);
+                ls = &label_slots[label];
+                assert(ls->addr == -1);
+                ls->addr = bc_out.size;
+                /* resolve the relocation entries */
+                for(re = ls->first_reloc; re != NULL; re = re_next) {
+                    int diff = ls->addr - re->addr;
+                    re_next = re->next;
+                    switch (re->size) {
+                    case 4:
+                        put_u32(bc_out.buf + re->addr, diff);
+                        break;
+                    case 2:
+                        assert(diff == (int16_t)diff);
+                        put_u16(bc_out.buf + re->addr, diff);
+                        break;
+                    case 1:
+                        assert(diff == (int8_t)diff);
+                        put_u8(bc_out.buf + re->addr, diff);
+                        break;
+                    }
+                    js_free(ctx, re);
+                }
+                ls->first_reloc = NULL;
+            }
+            break;
+
+        case OP_call:
+        case OP_call_method:
+            {
+                /* detect and transform tail calls */
+                int argc;
+                argc = get_u16(bc_buf + pos + 1);
+                if (code_match(&cc, pos_next, OP_return, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    put_short_code(&bc_out, op + 1, argc);
+                    pos_next = skip_dead_code(s, bc_buf, bc_len, cc.pos, &line_num);
+                    break;
+                }
+                add_pc2line_info(s, bc_out.size, line_num);
+                put_short_code(&bc_out, op, argc);
+                break;
+            }
+            goto no_change;
+
+        case OP_return:
+        case OP_return_undef:
+        case OP_return_async:
+        case OP_throw:
+        case OP_throw_error:
+            pos_next = skip_dead_code(s, bc_buf, bc_len, pos_next, &line_num);
+            goto no_change;
+
+        case OP_goto:
+            label = get_u32(bc_buf + pos + 1);
+        has_goto:
+            if (OPTIMIZE) {
+                int line1 = -1;
+                /* Use custom matcher because multiple labels can follow */
+                label = find_jump_target(s, label, &op1, &line1);
+                if (code_has_label(&cc, pos_next, label)) {
+                    /* jump to next instruction: remove jump */
+                    update_label(s, label, -1);
+                    break;
+                }
+                if (op1 == OP_return || op1 == OP_return_undef || op1 == OP_throw) {
+                    /* jump to return/throw: remove jump, append return/throw */
+                    /* updating the line number obfuscates assembly listing */
+                    //if (line1 >= 0) line_num = line1;
+                    update_label(s, label, -1);
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, op1);
+                    pos_next = skip_dead_code(s, bc_buf, bc_len, pos_next, &line_num);
+                    break;
+                }
+                /* XXX: should duplicate single instructions followed by goto or return */
+                /* For example, can match one of these followed by return:
+                   push_i32 / push_const / push_atom_value / get_var /
+                   undefined / null / push_false / push_true / get_ref_value /
+                   get_loc / get_arg / get_var_ref
+                 */
+            }
+            goto has_label;
+
+        case OP_gosub:
+            label = get_u32(bc_buf + pos + 1);
+            if (0 && OPTIMIZE) {
+                label = find_jump_target(s, label, &op1, NULL);
+                if (op1 == OP_ret) {
+                    update_label(s, label, -1);
+                    /* empty finally clause: remove gosub */
+                    break;
+                }
+            }
+            goto has_label;
+
+        case OP_catch:
+            label = get_u32(bc_buf + pos + 1);
+            goto has_label;
+
+        case OP_if_true:
+        case OP_if_false:
+            label = get_u32(bc_buf + pos + 1);
+            if (OPTIMIZE) {
+                label = find_jump_target(s, label, &op1, NULL);
+                /* transform if_false/if_true(l1) label(l1) -> drop label(l1) */
+                if (code_has_label(&cc, pos_next, label)) {
+                    update_label(s, label, -1);
+                    dbuf_putc(&bc_out, OP_drop);
+                    break;
+                }
+                /* transform if_false(l1) goto(l2) label(l1) -> if_false(l2) label(l1) */
+                if (code_match(&cc, pos_next, OP_goto, -1)) {
+                    int pos1 = cc.pos;
+                    int line1 = cc.line_num;
+                    if (code_has_label(&cc, pos1, label)) {
+                        if (line1 >= 0) line_num = line1;
+                        pos_next = pos1;
+                        update_label(s, label, -1);
+                        label = cc.label;
+                        op ^= OP_if_true ^ OP_if_false;
+                    }
+                }
+            }
+        has_label:
+            add_pc2line_info(s, bc_out.size, line_num);
+            if (op == OP_goto) {
+                pos_next = skip_dead_code(s, bc_buf, bc_len, pos_next, &line_num);
+            }
+            assert(label >= 0 && label < s->label_count);
+            ls = &label_slots[label];
+#if SHORT_OPCODES
+            jp = &s->jump_slots[s->jump_count++];
+            jp->op = op;
+            jp->size = 4;
+            jp->pos = bc_out.size + 1;
+            jp->label = label;
+
+            if (ls->addr == -1) {
+                int diff = ls->pos2 - pos - 1;
+                if (diff < 128 && (op == OP_if_false || op == OP_if_true || op == OP_goto)) {
+                    jp->size = 1;
+                    jp->op = OP_if_false8 + (op - OP_if_false);
+                    dbuf_putc(&bc_out, OP_if_false8 + (op - OP_if_false));
+                    dbuf_putc(&bc_out, 0);
+                    if (!add_reloc(ctx, ls, bc_out.size - 1, 1))
+                        goto fail;
+                    break;
+                }
+                if (diff < 32768 && op == OP_goto) {
+                    jp->size = 2;
+                    jp->op = OP_goto16;
+                    dbuf_putc(&bc_out, OP_goto16);
+                    dbuf_put_u16(&bc_out, 0);
+                    if (!add_reloc(ctx, ls, bc_out.size - 2, 2))
+                        goto fail;
+                    break;
+                }
+            } else {
+                int diff = ls->addr - bc_out.size - 1;
+                if (diff == (int8_t)diff && (op == OP_if_false || op == OP_if_true || op == OP_goto)) {
+                    jp->size = 1;
+                    jp->op = OP_if_false8 + (op - OP_if_false);
+                    dbuf_putc(&bc_out, OP_if_false8 + (op - OP_if_false));
+                    dbuf_putc(&bc_out, diff);
+                    break;
+                }
+                if (diff == (int16_t)diff && op == OP_goto) {
+                    jp->size = 2;
+                    jp->op = OP_goto16;
+                    dbuf_putc(&bc_out, OP_goto16);
+                    dbuf_put_u16(&bc_out, diff);
+                    break;
+                }
+            }
+#endif
+            dbuf_putc(&bc_out, op);
+            dbuf_put_u32(&bc_out, ls->addr - bc_out.size);
+            if (ls->addr == -1) {
+                /* unresolved yet: create a new relocation entry */
+                if (!add_reloc(ctx, ls, bc_out.size - 4, 4))
+                    goto fail;
+            }
+            break;
+        case OP_with_get_var:
+        case OP_with_put_var:
+        case OP_with_delete_var:
+        case OP_with_make_ref:
+        case OP_with_get_ref:
+        case OP_with_get_ref_undef:
+            {
+                JSAtom atom;
+                int is_with;
+
+                atom = get_u32(bc_buf + pos + 1);
+                label = get_u32(bc_buf + pos + 5);
+                is_with = bc_buf[pos + 9];
+                if (OPTIMIZE) {
+                    label = find_jump_target(s, label, &op1, NULL);
+                }
+                assert(label >= 0 && label < s->label_count);
+                ls = &label_slots[label];
+                add_pc2line_info(s, bc_out.size, line_num);
+#if SHORT_OPCODES
+                jp = &s->jump_slots[s->jump_count++];
+                jp->op = op;
+                jp->size = 4;
+                jp->pos = bc_out.size + 5;
+                jp->label = label;
+#endif
+                dbuf_putc(&bc_out, op);
+                dbuf_put_u32(&bc_out, atom);
+                dbuf_put_u32(&bc_out, ls->addr - bc_out.size);
+                if (ls->addr == -1) {
+                    /* unresolved yet: create a new relocation entry */
+                    if (!add_reloc(ctx, ls, bc_out.size - 4, 4))
+                        goto fail;
+                }
+                dbuf_putc(&bc_out, is_with);
+            }
+            break;
+
+        case OP_drop:
+            if (OPTIMIZE) {
+                /* remove useless drops before return */
+                if (code_match(&cc, pos_next, OP_return_undef, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    break;
+                }
+            }
+            goto no_change;
+
+        case OP_null:
+#if SHORT_OPCODES
+            if (OPTIMIZE) {
+                /* transform null strict_eq into is_null */
+                if (code_match(&cc, pos_next, OP_strict_eq, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_is_null);
+                    pos_next = cc.pos;
+                    break;
+                }
+                /* transform null strict_neq if_false/if_true -> is_null if_true/if_false */
+                if (code_match(&cc, pos_next, OP_strict_neq, M2(OP_if_false, OP_if_true), -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_is_null);
+                    pos_next = cc.pos;
+                    label = cc.label;
+                    op = cc.op ^ OP_if_false ^ OP_if_true;
+                    goto has_label;
+                }
+            }
+#endif
+            /* fall thru */
+        case OP_push_false:
+        case OP_push_true:
+            if (OPTIMIZE) {
+                val = (op == OP_push_true);
+                if (code_match(&cc, pos_next, M2(OP_if_false, OP_if_true), -1)) {
+                has_constant_test:
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    if (val == cc.op - OP_if_false) {
+                        /* transform null if_false(l1) -> goto l1 */
+                        /* transform false if_false(l1) -> goto l1 */
+                        /* transform true if_true(l1) -> goto l1 */
+                        pos_next = cc.pos;
+                        op = OP_goto;
+                        label = cc.label;
+                        goto has_goto;
+                    } else {
+                        /* transform null if_true(l1) -> nop */
+                        /* transform false if_true(l1) -> nop */
+                        /* transform true if_false(l1) -> nop */
+                        pos_next = cc.pos;
+                        update_label(s, cc.label, -1);
+                        break;
+                    }
+                }
+            }
+            goto no_change;
+
+        case OP_push_i32:
+            if (OPTIMIZE) {
+                /* transform i32(val) neg -> i32(-val) */
+                val = get_i32(bc_buf + pos + 1);
+                if ((val != INT32_MIN && val != 0)
+                &&  code_match(&cc, pos_next, OP_neg, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    if (code_match(&cc, cc.pos, OP_drop, -1)) {
+                        if (cc.line_num >= 0) line_num = cc.line_num;
+                    } else {
+                        add_pc2line_info(s, bc_out.size, line_num);
+                        push_short_int(&bc_out, -val);
+                    }
+                    pos_next = cc.pos;
+                    break;
+                }
+                /* remove push/drop pairs generated by the parser */
+                if (code_match(&cc, pos_next, OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    pos_next = cc.pos;
+                    break;
+                }
+                /* Optimize constant tests: `if (0)`, `if (1)`, `if (!0)`... */
+                if (code_match(&cc, pos_next, M2(OP_if_false, OP_if_true), -1)) {
+                    val = (val != 0);
+                    goto has_constant_test;
+                }
+                add_pc2line_info(s, bc_out.size, line_num);
+                push_short_int(&bc_out, val);
+                break;
+            }
+            goto no_change;
+
+#if SHORT_OPCODES
+        case OP_push_const:
+        case OP_fclosure:
+            if (OPTIMIZE) {
+                int idx = get_u32(bc_buf + pos + 1);
+                if (idx < 256) {
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_push_const8 + op - OP_push_const);
+                    dbuf_putc(&bc_out, idx);
+                    break;
+                }
+            }
+            goto no_change;
+
+        case OP_get_field:
+            if (OPTIMIZE) {
+                JSAtom atom = get_u32(bc_buf + pos + 1);
+                if (atom == JS_ATOM_length) {
+                    JS_FreeAtom(ctx, atom);
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_get_length);
+                    break;
+                }
+            }
+            goto no_change;
+#endif
+        case OP_push_atom_value:
+            if (OPTIMIZE) {
+                JSAtom atom = get_u32(bc_buf + pos + 1);
+                /* remove push/drop pairs generated by the parser */
+                if (code_match(&cc, pos_next, OP_drop, -1)) {
+                    JS_FreeAtom(ctx, atom);
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    pos_next = cc.pos;
+                    break;
+                }
+#if SHORT_OPCODES
+                if (atom == JS_ATOM_empty_string) {
+                    JS_FreeAtom(ctx, atom);
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_push_empty_string);
+                    break;
+                }
+#endif
+            }
+            goto no_change;
+
+        case OP_to_propkey:
+        case OP_to_propkey2:
+            if (OPTIMIZE) {
+                /* remove redundant to_propkey/to_propkey2 opcodes when storing simple data */
+                if (code_match(&cc, pos_next, M3(OP_get_loc, OP_get_arg, OP_get_var_ref), -1, OP_put_array_el, -1)
+                ||  code_match(&cc, pos_next, M3(OP_push_i32, OP_push_const, OP_push_atom_value), OP_put_array_el, -1)
+                ||  code_match(&cc, pos_next, M4(OP_undefined, OP_null, OP_push_true, OP_push_false), OP_put_array_el, -1)) {
+                    break;
+                }
+            }
+            goto no_change;
+
+        case OP_undefined:
+            if (OPTIMIZE) {
+                /* remove push/drop pairs generated by the parser */
+                if (code_match(&cc, pos_next, OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    pos_next = cc.pos;
+                    break;
+                }
+                /* transform undefined return -> return_undefined */
+                if (code_match(&cc, pos_next, OP_return, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_return_undef);
+                    pos_next = cc.pos;
+                    break;
+                }
+                /* transform undefined if_true(l1)/if_false(l1) -> nop/goto(l1) */
+                if (code_match(&cc, pos_next, M2(OP_if_false, OP_if_true), -1)) {
+                    val = 0;
+                    goto has_constant_test;
+                }
+#if SHORT_OPCODES
+                /* transform undefined strict_eq -> is_undefined */
+                if (code_match(&cc, pos_next, OP_strict_eq, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_is_undefined);
+                    pos_next = cc.pos;
+                    break;
+                }
+                /* transform undefined strict_neq if_false/if_true -> is_undefined if_true/if_false */
+                if (code_match(&cc, pos_next, OP_strict_neq, M2(OP_if_false, OP_if_true), -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_is_undefined);
+                    pos_next = cc.pos;
+                    label = cc.label;
+                    op = cc.op ^ OP_if_false ^ OP_if_true;
+                    goto has_label;
+                }
+#endif
+            }
+            goto no_change;
+
+        case OP_insert2:
+            if (OPTIMIZE) {
+                /* Transformation:
+                   insert2 put_field(a) drop -> put_field(a)
+                   insert2 put_var_strict(a) drop -> put_var_strict(a)
+                */
+                if (code_match(&cc, pos_next, M2(OP_put_field, OP_put_var_strict), OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, cc.op);
+                    dbuf_put_u32(&bc_out, cc.atom);
+                    pos_next = cc.pos;
+                    break;
+                }
+            }
+            goto no_change;
+
+        case OP_dup:
+            if (OPTIMIZE) {
+                /* Transformation: dup put_x(n) drop -> put_x(n) */
+                int op1, line2 = -1;
+                /* Transformation: dup put_x(n) -> set_x(n) */
+                if (code_match(&cc, pos_next, M3(OP_put_loc, OP_put_arg, OP_put_var_ref), -1, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    op1 = cc.op + 1;  /* put_x -> set_x */
+                    pos_next = cc.pos;
+                    if (code_match(&cc, cc.pos, OP_drop, -1)) {
+                        if (cc.line_num >= 0) line_num = cc.line_num;
+                        op1 -= 1; /* set_x drop -> put_x */
+                        pos_next = cc.pos;
+                        if (code_match(&cc, cc.pos, op1 - 1, cc.idx, -1)) {
+                            line2 = cc.line_num; /* delay line number update */
+                            op1 += 1;   /* put_x(n) get_x(n) -> set_x(n) */
+                            pos_next = cc.pos;
+                        }
+                    }
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    put_short_code(&bc_out, op1, cc.idx);
+                    if (line2 >= 0) line_num = line2;
+                    break;
+                }
+            }
+            goto no_change;
+
+        case OP_get_loc:
+            if (OPTIMIZE) {
+                /* transformation:
+                   get_loc(n) post_dec put_loc(n) drop -> dec_loc(n)
+                   get_loc(n) post_inc put_loc(n) drop -> inc_loc(n)
+                   get_loc(n) dec dup put_loc(n) drop -> dec_loc(n)
+                   get_loc(n) inc dup put_loc(n) drop -> inc_loc(n)
+                 */
+                int idx;
+                idx = get_u16(bc_buf + pos + 1);
+                if (idx >= 256)
+                    goto no_change;
+                if (code_match(&cc, pos_next, M2(OP_post_dec, OP_post_inc), OP_put_loc, idx, OP_drop, -1) ||
+                    code_match(&cc, pos_next, M2(OP_dec, OP_inc), OP_dup, OP_put_loc, idx, OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, (cc.op == OP_inc || cc.op == OP_post_inc) ? OP_inc_loc : OP_dec_loc);
+                    dbuf_putc(&bc_out, idx);
+                    pos_next = cc.pos;
+                    break;
+                }
+                /* transformation:
+                   get_loc(n) push_atom_value(x) add dup put_loc(n) drop -> push_atom_value(x) add_loc(n)
+                 */
+                if (code_match(&cc, pos_next, OP_push_atom_value, OP_add, OP_dup, OP_put_loc, idx, OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+#if SHORT_OPCODES
+                    if (cc.atom == JS_ATOM_empty_string) {
+                        JS_FreeAtom(ctx, cc.atom);
+                        dbuf_putc(&bc_out, OP_push_empty_string);
+                    } else
+#endif
+                    {
+                        dbuf_putc(&bc_out, OP_push_atom_value);
+                        dbuf_put_u32(&bc_out, cc.atom);
+                    }
+                    dbuf_putc(&bc_out, OP_add_loc);
+                    dbuf_putc(&bc_out, idx);
+                    pos_next = cc.pos;
+                    break;
+                }
+                /* transformation:
+                   get_loc(n) push_i32(x) add dup put_loc(n) drop -> push_i32(x) add_loc(n)
+                 */
+                if (code_match(&cc, pos_next, OP_push_i32, OP_add, OP_dup, OP_put_loc, idx, OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    push_short_int(&bc_out, cc.label);
+                    dbuf_putc(&bc_out, OP_add_loc);
+                    dbuf_putc(&bc_out, idx);
+                    pos_next = cc.pos;
+                    break;
+                }
+                /* transformation: XXX: also do these:
+                   get_loc(n) get_loc(x) add dup put_loc(n) drop -> get_loc(x) add_loc(n)
+                   get_loc(n) get_arg(x) add dup put_loc(n) drop -> get_arg(x) add_loc(n)
+                   get_loc(n) get_var_ref(x) add dup put_loc(n) drop -> get_var_ref(x) add_loc(n)
+                 */
+                if (code_match(&cc, pos_next, M3(OP_get_loc, OP_get_arg, OP_get_var_ref), -1, OP_add, OP_dup, OP_put_loc, idx, OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    put_short_code(&bc_out, cc.op, cc.idx);
+                    dbuf_putc(&bc_out, OP_add_loc);
+                    dbuf_putc(&bc_out, idx);
+                    pos_next = cc.pos;
+                    break;
+                }
+                add_pc2line_info(s, bc_out.size, line_num);
+                put_short_code(&bc_out, op, idx);
+                break;
+            }
+            goto no_change;
+#if SHORT_OPCODES
+        case OP_get_arg:
+        case OP_get_var_ref:
+            if (OPTIMIZE) {
+                int idx;
+                idx = get_u16(bc_buf + pos + 1);
+                add_pc2line_info(s, bc_out.size, line_num);
+                put_short_code(&bc_out, op, idx);
+                break;
+            }
+            goto no_change;
+#endif
+        case OP_put_loc:
+        case OP_put_arg:
+        case OP_put_var_ref:
+            if (OPTIMIZE) {
+                /* transformation: put_x(n) get_x(n) -> set_x(n) */
+                int idx;
+                idx = get_u16(bc_buf + pos + 1);
+                if (code_match(&cc, pos_next, op - 1, idx, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    put_short_code(&bc_out, op + 1, idx);
+                    pos_next = cc.pos;
+                    break;
+                }
+                add_pc2line_info(s, bc_out.size, line_num);
+                put_short_code(&bc_out, op, idx);
+                break;
+            }
+            goto no_change;
+
+        case OP_post_inc:
+        case OP_post_dec:
+            if (OPTIMIZE) {
+                /* transformation:
+                   post_inc put_x drop -> inc put_x
+                   post_inc perm3 put_field drop -> inc put_field
+                   post_inc perm3 put_var_strict drop -> inc put_var_strict
+                   post_inc perm4 put_array_el drop -> inc put_array_el
+                 */
+                int op1, idx;
+                if (code_match(&cc, pos_next, M3(OP_put_loc, OP_put_arg, OP_put_var_ref), -1, OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    op1 = cc.op;
+                    idx = cc.idx;
+                    pos_next = cc.pos;
+                    if (code_match(&cc, cc.pos, op1 - 1, idx, -1)) {
+                        if (cc.line_num >= 0) line_num = cc.line_num;
+                        op1 += 1;   /* put_x(n) get_x(n) -> set_x(n) */
+                        pos_next = cc.pos;
+                    }
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_dec + (op - OP_post_dec));
+                    put_short_code(&bc_out, op1, idx);
+                    break;
+                }
+                if (code_match(&cc, pos_next, OP_perm3, M2(OP_put_field, OP_put_var_strict), OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_dec + (op - OP_post_dec));
+                    dbuf_putc(&bc_out, cc.op);
+                    dbuf_put_u32(&bc_out, cc.atom);
+                    pos_next = cc.pos;
+                    break;
+                }
+                if (code_match(&cc, pos_next, OP_perm4, OP_put_array_el, OP_drop, -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    add_pc2line_info(s, bc_out.size, line_num);
+                    dbuf_putc(&bc_out, OP_dec + (op - OP_post_dec));
+                    dbuf_putc(&bc_out, OP_put_array_el);
+                    pos_next = cc.pos;
+                    break;
+                }
+            }
+            goto no_change;
+
+#if SHORT_OPCODES
+        case OP_typeof:
+            if (OPTIMIZE) {
+                /* simplify typeof tests */
+                if (code_match(&cc, pos_next, OP_push_atom_value, M4(OP_strict_eq, OP_strict_neq, OP_eq, OP_neq), -1)) {
+                    if (cc.line_num >= 0) line_num = cc.line_num;
+                    int op1 = (cc.op == OP_strict_eq || cc.op == OP_eq) ? OP_strict_eq : OP_strict_neq;
+                    int op2 = -1;
+                    switch (cc.atom) {
+                    case JS_ATOM_undefined:
+                        op2 = OP_typeof_is_undefined;
+                        break;
+                    case JS_ATOM_function:
+                        op2 = OP_typeof_is_function;
+                        break;
+                    }
+                    if (op2 >= 0) {
+                        /* transform typeof(s) == "<type>" into is_<type> */
+                        if (op1 == OP_strict_eq) {
+                            add_pc2line_info(s, bc_out.size, line_num);
+                            dbuf_putc(&bc_out, op2);
+                            JS_FreeAtom(ctx, cc.atom);
+                            pos_next = cc.pos;
+                            break;
+                        }
+                        if (op1 == OP_strict_neq && code_match(&cc, cc.pos, OP_if_false, -1)) {
+                            /* transform typeof(s) != "<type>" if_false into is_<type> if_true */
+                            if (cc.line_num >= 0) line_num = cc.line_num;
+                            add_pc2line_info(s, bc_out.size, line_num);
+                            dbuf_putc(&bc_out, op2);
+                            JS_FreeAtom(ctx, cc.atom);
+                            pos_next = cc.pos;
+                            label = cc.label;
+                            op = OP_if_true;
+                            goto has_label;
+                        }
+                    }
+                }
+            }
+            goto no_change;
+#endif
+
+        default:
+        no_change:
+            add_pc2line_info(s, bc_out.size, line_num);
+            dbuf_put(&bc_out, bc_buf + pos, len);
+            break;
+        }
+    }
+
+    /* check that there were no missing labels */
+    for(i = 0; i < s->label_count; i++) {
+        assert(label_slots[i].first_reloc == NULL);
+    }
+#if SHORT_OPCODES
+    if (OPTIMIZE) {
+        /* more jump optimizations */
+        int patch_offsets = 0;
+        for (i = 0, jp = s->jump_slots; i < s->jump_count; i++, jp++) {
+            LabelSlot *ls;
+            JumpSlot *jp1;
+            int j, pos, diff, delta;
+
+            delta = 3;
+            switch (op = jp->op) {
+            case OP_goto16:
+                delta = 1;
+                /* fall thru */
+            case OP_if_false:
+            case OP_if_true:
+            case OP_goto:
+                pos = jp->pos;
+                diff = s->label_slots[jp->label].addr - pos;
+                if (diff >= -128 && diff <= 127 + delta) {
+                    //put_u8(bc_out.buf + pos, diff);
+                    jp->size = 1;
+                    if (op == OP_goto16) {
+                        bc_out.buf[pos - 1] = jp->op = OP_goto8;
+                    } else {
+                        bc_out.buf[pos - 1] = jp->op = OP_if_false8 + (op - OP_if_false);
+                    }
+                    goto shrink;
+                } else
+                if (diff == (int16_t)diff && op == OP_goto) {
+                    //put_u16(bc_out.buf + pos, diff);
+                    jp->size = 2;
+                    delta = 2;
+                    bc_out.buf[pos - 1] = jp->op = OP_goto16;
+                shrink:
+                    /* XXX: should reduce complexity, using 2 finger copy scheme */
+                    memmove(bc_out.buf + pos + jp->size, bc_out.buf + pos + jp->size + delta,
+                            bc_out.size - pos - jp->size - delta);
+                    bc_out.size -= delta;
+                    patch_offsets++;
+                    for (j = 0, ls = s->label_slots; j < s->label_count; j++, ls++) {
+                        if (ls->addr > pos)
+                            ls->addr -= delta;
+                    }
+                    for (j = i + 1, jp1 = jp + 1; j < s->jump_count; j++, jp1++) {
+                        if (jp1->pos > pos)
+                            jp1->pos -= delta;
+                    }
+                    for (j = 0; j < s->line_number_count; j++) {
+                        if (s->line_number_slots[j].pc > pos)
+                            s->line_number_slots[j].pc -= delta;
+                    }
+                    continue;
+                }
+                break;
+            }
+        }
+        if (patch_offsets) {
+            JumpSlot *jp1;
+            int j;
+            for (j = 0, jp1 = s->jump_slots; j < s->jump_count; j++, jp1++) {
+                int diff1 = s->label_slots[jp1->label].addr - jp1->pos;
+                switch (jp1->size) {
+                case 1:
+                    put_u8(bc_out.buf + jp1->pos, diff1);
+                    break;
+                case 2:
+                    put_u16(bc_out.buf + jp1->pos, diff1);
+                    break;
+                case 4:
+                    put_u32(bc_out.buf + jp1->pos, diff1);
+                    break;
+                }
+            }
+        }
+    }
+    js_free(ctx, s->jump_slots);
+    s->jump_slots = NULL;
+#endif
+    js_free(ctx, s->label_slots);
+    s->label_slots = NULL;
+    /* XXX: should delay until copying to runtime bytecode function */
+    compute_pc2line_info(s);
+    js_free(ctx, s->line_number_slots);
+    s->line_number_slots = NULL;
+    /* set the new byte code */
+    dbuf_free(&s->byte_code);
+    s->byte_code = bc_out;
+    s->use_short_opcodes = TRUE;
+    if (dbuf_error(&s->byte_code)) {
+        JS_ThrowOutOfMemory(ctx);
+        return -1;
+    }
+    return 0;
+ fail:
+    /* XXX: not safe */
+    dbuf_free(&bc_out);
+    return -1;
+}
+
+/* compute the maximum stack size needed by the function */
+
+typedef struct StackSizeState {
+    int bc_len;
+    int stack_len_max;
+    uint16_t *stack_level_tab;
+    int32_t *catch_pos_tab;
+    int *pc_stack;
+    int pc_stack_len;
+    int pc_stack_size;
+} StackSizeState;
+
+/* 'op' is only used for error indication */
+static __exception int ss_check(JSContext *ctx, StackSizeState *s,
+                                int pos, int op, int stack_len, int catch_pos)
+{
+    if ((unsigned)pos >= s->bc_len) {
+        JS_ThrowInternalError(ctx, "bytecode buffer overflow (op=%d, pc=%d)", op, pos);
+        return -1;
+    }
+    if (stack_len > s->stack_len_max) {
+        s->stack_len_max = stack_len;
+        if (s->stack_len_max > JS_STACK_SIZE_MAX) {
+            JS_ThrowInternalError(ctx, "stack overflow (op=%d, pc=%d)", op, pos);
+            return -1;
+        }
+    }
+    if (s->stack_level_tab[pos] != 0xffff) {
+        /* already explored: check that the stack size is consistent */
+        if (s->stack_level_tab[pos] != stack_len) {
+            JS_ThrowInternalError(ctx, "inconsistent stack size: %d %d (pc=%d)",
+                                  s->stack_level_tab[pos], stack_len, pos);
+            return -1;
+        } else if (s->catch_pos_tab[pos] != catch_pos) {
+            JS_ThrowInternalError(ctx, "inconsistent catch position: %d %d (pc=%d)",
+                                  s->catch_pos_tab[pos], catch_pos, pos);
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+
+    /* mark as explored and store the stack size */
+    s->stack_level_tab[pos] = stack_len;
+    s->catch_pos_tab[pos] = catch_pos;
+
+    /* queue the new PC to explore */
+    if (js_resize_array(ctx, (void **)&s->pc_stack, sizeof(s->pc_stack[0]),
+                        &s->pc_stack_size, s->pc_stack_len + 1))
+        return -1;
+    s->pc_stack[s->pc_stack_len++] = pos;
+    return 0;
+}
+
+static __exception int compute_stack_size(JSContext *ctx,
+                                          JSFunctionDef *fd,
+                                          int *pstack_size)
+{
+    StackSizeState s_s, *s = &s_s;
+    int i, diff, n_pop, pos_next, stack_len, pos, op, catch_pos, catch_level;
+    const JSOpCode *oi;
+    const uint8_t *bc_buf;
+
+    bc_buf = fd->byte_code.buf;
+    s->bc_len = fd->byte_code.size;
+    /* bc_len > 0 */
+    s->stack_level_tab = js_malloc(ctx, sizeof(s->stack_level_tab[0]) *
+                                   s->bc_len);
+    if (!s->stack_level_tab)
+        return -1;
+    for(i = 0; i < s->bc_len; i++)
+        s->stack_level_tab[i] = 0xffff;
+    s->pc_stack = NULL;
+    s->catch_pos_tab = js_malloc(ctx, sizeof(s->catch_pos_tab[0]) *
+                                   s->bc_len);
+    if (!s->catch_pos_tab)
+        goto fail;
+
+    s->stack_len_max = 0;
+    s->pc_stack_len = 0;
+    s->pc_stack_size = 0;
+
+    /* breadth-first graph exploration */
+    if (ss_check(ctx, s, 0, OP_invalid, 0, -1))
+        goto fail;
+
+    while (s->pc_stack_len > 0) {
+        pos = s->pc_stack[--s->pc_stack_len];
+        stack_len = s->stack_level_tab[pos];
+        catch_pos = s->catch_pos_tab[pos];
+        op = bc_buf[pos];
+        if (op == 0 || op >= OP_COUNT) {
+            JS_ThrowInternalError(ctx, "invalid opcode (op=%d, pc=%d)", op, pos);
+            goto fail;
+        }
+        oi = &short_opcode_info(op);
+#if defined(DUMP_BYTECODE) && (DUMP_BYTECODE & 64)
+        printf("%5d: %10s %5d %5d\n", pos, oi->name, stack_len, catch_pos);
+#endif
+        pos_next = pos + oi->size;
+        if (pos_next > s->bc_len) {
+            JS_ThrowInternalError(ctx, "bytecode buffer overflow (op=%d, pc=%d)", op, pos);
+            goto fail;
+        }
+        n_pop = oi->n_pop;
+        /* call pops a variable number of arguments */
+        if (oi->fmt == OP_FMT_npop || oi->fmt == OP_FMT_npop_u16) {
+            n_pop += get_u16(bc_buf + pos + 1);
+        } else {
+#if SHORT_OPCODES
+            if (oi->fmt == OP_FMT_npopx) {
+                n_pop += op - OP_call0;
+            }
+#endif
+        }
+
+        if (stack_len < n_pop) {
+            JS_ThrowInternalError(ctx, "stack underflow (op=%d, pc=%d)", op, pos);
+            goto fail;
+        }
+        stack_len += oi->n_push - n_pop;
+        if (stack_len > s->stack_len_max) {
+            s->stack_len_max = stack_len;
+            if (s->stack_len_max > JS_STACK_SIZE_MAX) {
+                JS_ThrowInternalError(ctx, "stack overflow (op=%d, pc=%d)", op, pos);
+                goto fail;
+            }
+        }
+        switch(op) {
+        case OP_tail_call:
+        case OP_tail_call_method:
+        case OP_return:
+        case OP_return_undef:
+        case OP_return_async:
+        case OP_throw:
+        case OP_throw_error:
+        case OP_ret:
+            goto done_insn;
+        case OP_goto:
+            diff = get_u32(bc_buf + pos + 1);
+            pos_next = pos + 1 + diff;
+            break;
+#if SHORT_OPCODES
+        case OP_goto16:
+            diff = (int16_t)get_u16(bc_buf + pos + 1);
+            pos_next = pos + 1 + diff;
+            break;
+        case OP_goto8:
+            diff = (int8_t)bc_buf[pos + 1];
+            pos_next = pos + 1 + diff;
+            break;
+        case OP_if_true8:
+        case OP_if_false8:
+            diff = (int8_t)bc_buf[pos + 1];
+            if (ss_check(ctx, s, pos + 1 + diff, op, stack_len, catch_pos))
+                goto fail;
+            break;
+#endif
+        case OP_if_true:
+        case OP_if_false:
+            diff = get_u32(bc_buf + pos + 1);
+            if (ss_check(ctx, s, pos + 1 + diff, op, stack_len, catch_pos))
+                goto fail;
+            break;
+        case OP_gosub:
+            diff = get_u32(bc_buf + pos + 1);
+            if (ss_check(ctx, s, pos + 1 + diff, op, stack_len + 1, catch_pos))
+                goto fail;
+            break;
+        case OP_with_get_var:
+        case OP_with_delete_var:
+            diff = get_u32(bc_buf + pos + 5);
+            if (ss_check(ctx, s, pos + 5 + diff, op, stack_len + 1, catch_pos))
+                goto fail;
+            break;
+        case OP_with_make_ref:
+        case OP_with_get_ref:
+        case OP_with_get_ref_undef:
+            diff = get_u32(bc_buf + pos + 5);
+            if (ss_check(ctx, s, pos + 5 + diff, op, stack_len + 2, catch_pos))
+                goto fail;
+            break;
+        case OP_with_put_var:
+            diff = get_u32(bc_buf + pos + 5);
+            if (ss_check(ctx, s, pos + 5 + diff, op, stack_len - 1, catch_pos))
+                goto fail;
+            break;
+        case OP_catch:
+            diff = get_u32(bc_buf + pos + 1);
+            if (ss_check(ctx, s, pos + 1 + diff, op, stack_len, catch_pos))
+                goto fail;
+            catch_pos = pos;
+            break;
+        case OP_for_of_start:
+        case OP_for_await_of_start:
+            catch_pos = pos;
+            break;
+            /* we assume the catch offset entry is only removed with
+               some op codes */
+        case OP_drop:
+            catch_level = stack_len;
+            goto check_catch;
+        case OP_nip:
+            catch_level = stack_len - 1;
+            goto check_catch;
+        case OP_nip1:
+            catch_level = stack_len - 1;
+            goto check_catch;
+        case OP_iterator_close:
+            catch_level = stack_len + 2;
+        check_catch:
+            /* Note: for for_of_start/for_await_of_start we consider
+               the catch offset is on the first stack entry instead of
+               the thirst */
+            if (catch_pos >= 0) {
+                int level;
+                level = s->stack_level_tab[catch_pos];
+                if (bc_buf[catch_pos] != OP_catch)
+                    level++; /* for_of_start, for_wait_of_start */
+                /* catch_level = stack_level before op_catch is executed ? */
+                if (catch_level == level) {
+                    catch_pos = s->catch_pos_tab[catch_pos];
+                }
+            }
+            break;
+        case OP_nip_catch:
+            if (catch_pos < 0) {
+                JS_ThrowInternalError(ctx, "nip_catch: no catch op (pc=%d)", pos);
+                goto fail;
+            }
+            stack_len = s->stack_level_tab[catch_pos];
+            if (bc_buf[catch_pos] != OP_catch)
+                stack_len++; /* for_of_start, for_wait_of_start */
+            stack_len++; /* no stack overflow is possible by construction */
+            catch_pos = s->catch_pos_tab[catch_pos];
+            break;
+        default:
+            break;
+        }
+        if (ss_check(ctx, s, pos_next, op, stack_len, catch_pos))
+            goto fail;
+    done_insn: ;
+    }
+    js_free(ctx, s->pc_stack);
+    js_free(ctx, s->catch_pos_tab);
+    js_free(ctx, s->stack_level_tab);
+    *pstack_size = s->stack_len_max;
+    return 0;
+ fail:
+    js_free(ctx, s->pc_stack);
+    js_free(ctx, s->catch_pos_tab);
+    js_free(ctx, s->stack_level_tab);
+    *pstack_size = 0;
+    return -1;
+}
+
+static int add_module_variables(JSContext *ctx, JSFunctionDef *fd)
+{
+    int i, idx;
+    JSModuleDef *m = fd->module;
+    JSExportEntry *me;
+    JSGlobalVar *hf;
+
+    /* The imported global variables were added as closure variables
+       in js_parse_import(). We add here the module global
+       variables. */
+
+    for(i = 0; i < fd->global_var_count; i++) {
+        hf = &fd->global_vars[i];
+        if (add_closure_var(ctx, fd, TRUE, FALSE, i, hf->var_name, hf->is_const,
+                            hf->is_lexical, FALSE) < 0)
+            return -1;
+    }
+
+    /* resolve the variable names of the local exports */
+    for(i = 0; i < m->export_entries_count; i++) {
+        me = &m->export_entries[i];
+        if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
+            idx = find_closure_var(ctx, fd, me->local_name);
+            if (idx < 0) {
+                JS_ThrowSyntaxErrorAtom(ctx, "exported variable '%s' does not exist",
+                                        me->local_name);
+                return -1;
+            }
+            me->u.local.var_idx = idx;
+        }
+    }
+    return 0;
+}
+
+/* create a function object from a function definition. The function
+   definition is freed. All the child functions are also created. It
+   must be done this way to resolve all the variables. */
+static JSValue js_create_function(JSContext *ctx, JSFunctionDef *fd)
+{
+    JSValue func_obj;
+    JSFunctionBytecode *b;
+    struct list_head *el, *el1;
+    int stack_size, scope, idx;
+    int function_size, byte_code_offset, cpool_offset;
+    int closure_var_offset, vardefs_offset;
+
+    /* recompute scope linkage */
+    for (scope = 0; scope < fd->scope_count; scope++) {
+        fd->scopes[scope].first = -1;
+    }
+    if (fd->has_parameter_expressions) {
+        /* special end of variable list marker for the argument scope */
+        fd->scopes[ARG_SCOPE_INDEX].first = ARG_SCOPE_END;
+    }
+    for (idx = 0; idx < fd->var_count; idx++) {
+        JSVarDef *vd = &fd->vars[idx];
+        vd->scope_next = fd->scopes[vd->scope_level].first;
+        fd->scopes[vd->scope_level].first = idx;
+    }
+    for (scope = 2; scope < fd->scope_count; scope++) {
+        JSVarScope *sd = &fd->scopes[scope];
+        if (sd->first < 0)
+            sd->first = fd->scopes[sd->parent].first;
+    }
+    for (idx = 0; idx < fd->var_count; idx++) {
+        JSVarDef *vd = &fd->vars[idx];
+        if (vd->scope_next < 0 && vd->scope_level > 1) {
+            scope = fd->scopes[vd->scope_level].parent;
+            vd->scope_next = fd->scopes[scope].first;
+        }
+    }
+
+    /* if the function contains an eval call, the closure variables
+       are used to compile the eval and they must be ordered by scope,
+       so it is necessary to create the closure variables before any
+       other variable lookup is done. */
+    if (fd->has_eval_call)
+        add_eval_variables(ctx, fd);
+
+    /* add the module global variables in the closure */
+    if (fd->module) {
+        if (add_module_variables(ctx, fd))
+            goto fail;
+    }
+
+    /* first create all the child functions */
+    list_for_each_safe(el, el1, &fd->child_list) {
+        JSFunctionDef *fd1;
+        int cpool_idx;
+
+        fd1 = list_entry(el, JSFunctionDef, link);
+        cpool_idx = fd1->parent_cpool_idx;
+        func_obj = js_create_function(ctx, fd1);
+        if (JS_IsException(func_obj))
+            goto fail;
+        /* save it in the constant pool */
+        assert(cpool_idx >= 0);
+        fd->cpool[cpool_idx] = func_obj;
+    }
+
+#if defined(DUMP_BYTECODE) && (DUMP_BYTECODE & 4)
+    if (!(fd->js_mode & JS_MODE_STRIP)) {
+        printf("pass 1\n");
+        dump_byte_code(ctx, 1, fd->byte_code.buf, fd->byte_code.size,
+                       fd->args, fd->arg_count, fd->vars, fd->var_count,
+                       fd->closure_var, fd->closure_var_count,
+                       fd->cpool, fd->cpool_count, fd->source, fd->line_num,
+                       fd->label_slots, NULL);
+        printf("\n");
+    }
+#endif
+
+    if (resolve_variables(ctx, fd))
+        goto fail;
+
+#if defined(DUMP_BYTECODE) && (DUMP_BYTECODE & 2)
+    if (!(fd->js_mode & JS_MODE_STRIP)) {
+        printf("pass 2\n");
+        dump_byte_code(ctx, 2, fd->byte_code.buf, fd->byte_code.size,
+                       fd->args, fd->arg_count, fd->vars, fd->var_count,
+                       fd->closure_var, fd->closure_var_count,
+                       fd->cpool, fd->cpool_count, fd->source, fd->line_num,
+                       fd->label_slots, NULL);
+        printf("\n");
+    }
+#endif
+
+    if (resolve_labels(ctx, fd))
+        goto fail;
+
+    if (compute_stack_size(ctx, fd, &stack_size) < 0)
+        goto fail;
+
+    if (fd->js_mode & JS_MODE_STRIP) {
+        function_size = offsetof(JSFunctionBytecode, debug);
+    } else {
+        function_size = sizeof(*b);
+    }
+    cpool_offset = function_size;
+    function_size += fd->cpool_count * sizeof(*fd->cpool);
+    vardefs_offset = function_size;
+    if (!(fd->js_mode & JS_MODE_STRIP) || fd->has_eval_call) {
+        function_size += (fd->arg_count + fd->var_count) * sizeof(*b->vardefs);
+    }
+    closure_var_offset = function_size;
+    function_size += fd->closure_var_count * sizeof(*fd->closure_var);
+    byte_code_offset = function_size;
+    function_size += fd->byte_code.size;
+
+    b = js_mallocz(ctx, function_size);
+    if (!b)
+        goto fail;
+    b->header.ref_count = 1;
+
+    b->byte_code_buf = (void *)((uint8_t*)b + byte_code_offset);
+    b->byte_code_len = fd->byte_code.size;
+    memcpy(b->byte_code_buf, fd->byte_code.buf, fd->byte_code.size);
+    js_free(ctx, fd->byte_code.buf);
+    fd->byte_code.buf = NULL;
+
+    b->func_name = fd->func_name;
+    if (fd->arg_count + fd->var_count > 0) {
+        if ((fd->js_mode & JS_MODE_STRIP) && !fd->has_eval_call) {
+            /* Strip variable definitions not needed at runtime */
+            int i;
+            for(i = 0; i < fd->var_count; i++) {
+                JS_FreeAtom(ctx, fd->vars[i].var_name);
+            }
+            for(i = 0; i < fd->arg_count; i++) {
+                JS_FreeAtom(ctx, fd->args[i].var_name);
+            }
+            for(i = 0; i < fd->closure_var_count; i++) {
+                JS_FreeAtom(ctx, fd->closure_var[i].var_name);
+                fd->closure_var[i].var_name = JS_ATOM_NULL;
+            }
+        } else {
+            b->vardefs = (void *)((uint8_t*)b + vardefs_offset);
+            memcpy_no_ub(b->vardefs, fd->args, fd->arg_count * sizeof(fd->args[0]));
+            memcpy_no_ub(b->vardefs + fd->arg_count, fd->vars, fd->var_count * sizeof(fd->vars[0]));
+        }
+        b->var_count = fd->var_count;
+        b->arg_count = fd->arg_count;
+        b->defined_arg_count = fd->defined_arg_count;
+        js_free(ctx, fd->args);
+        js_free(ctx, fd->vars);
+    }
+    b->cpool_count = fd->cpool_count;
+    if (b->cpool_count) {
+        b->cpool = (void *)((uint8_t*)b + cpool_offset);
+        memcpy(b->cpool, fd->cpool, b->cpool_count * sizeof(*b->cpool));
+    }
+    js_free(ctx, fd->cpool);
+    fd->cpool = NULL;
+
+    b->stack_size = stack_size;
+
+    if (fd->js_mode & JS_MODE_STRIP) {
+        JS_FreeAtom(ctx, fd->filename);
+        dbuf_free(&fd->pc2line);    // probably useless
+    } else {
+        /* XXX: source and pc2line info should be packed at the end of the
+           JSFunctionBytecode structure, avoiding allocation overhead
+         */
+        b->has_debug = 1;
+        b->debug.filename = fd->filename;
+        b->debug.line_num = fd->line_num;
+
+        //DynBuf pc2line;
+        //compute_pc2line_info(fd, &pc2line);
+        //js_free(ctx, fd->line_number_slots)
+        b->debug.pc2line_buf = js_realloc(ctx, fd->pc2line.buf, fd->pc2line.size);
+        if (!b->debug.pc2line_buf)
+            b->debug.pc2line_buf = fd->pc2line.buf;
+        b->debug.pc2line_len = fd->pc2line.size;
+        b->debug.source = fd->source;
+        b->debug.source_len = fd->source_len;
+    }
+    if (fd->scopes != fd->def_scope_array)
+        js_free(ctx, fd->scopes);
+
+    b->closure_var_count = fd->closure_var_count;
+    if (b->closure_var_count) {
+        b->closure_var = (void *)((uint8_t*)b + closure_var_offset);
+        memcpy(b->closure_var, fd->closure_var, b->closure_var_count * sizeof(*b->closure_var));
+    }
+    js_free(ctx, fd->closure_var);
+    fd->closure_var = NULL;
+
+    b->has_prototype = fd->has_prototype;
+    b->has_simple_parameter_list = fd->has_simple_parameter_list;
+    b->js_mode = fd->js_mode;
+    b->is_derived_class_constructor = fd->is_derived_class_constructor;
+    b->func_kind = fd->func_kind;
+    b->need_home_object = (fd->home_object_var_idx >= 0 ||
+                           fd->need_home_object);
+    b->new_target_allowed = fd->new_target_allowed;
+    b->super_call_allowed = fd->super_call_allowed;
+    b->super_allowed = fd->super_allowed;
+    b->arguments_allowed = fd->arguments_allowed;
+    b->backtrace_barrier = fd->backtrace_barrier;
+    b->is_direct_or_indirect_eval = (fd->eval_type == JS_EVAL_TYPE_DIRECT ||
+                                     fd->eval_type == JS_EVAL_TYPE_INDIRECT);
+    b->realm = JS_DupContext(ctx);
+
+    add_gc_object(ctx->rt, &b->header, JS_GC_OBJ_TYPE_FUNCTION_BYTECODE);
+
+#if defined(DUMP_BYTECODE) && (DUMP_BYTECODE & 1)
+    if (!(fd->js_mode & JS_MODE_STRIP)) {
+        js_dump_function_bytecode(ctx, b);
+    }
+#endif
+
+    if (fd->parent) {
+        /* remove from parent list */
+        list_del(&fd->link);
+    }
+
+    js_free(ctx, fd);
+    return JS_MKPTR(JS_TAG_FUNCTION_BYTECODE, b);
+ fail:
+    js_free_function_def(ctx, fd);
+    return JS_EXCEPTION;
+}
+
+static void free_function_bytecode(JSRuntime *rt, JSFunctionBytecode *b)
+{
+    int i;
+
+#if 0
+    {
+        char buf[ATOM_GET_STR_BUF_SIZE];
+        printf("freeing %s\n",
+               JS_AtomGetStrRT(rt, buf, sizeof(buf), b->func_name));
+    }
+#endif
+    free_bytecode_atoms(rt, b->byte_code_buf, b->byte_code_len, TRUE);
+
+    if (b->vardefs) {
+        for(i = 0; i < b->arg_count + b->var_count; i++) {
+            JS_FreeAtomRT(rt, b->vardefs[i].var_name);
+        }
+    }
+    for(i = 0; i < b->cpool_count; i++)
+        JS_FreeValueRT(rt, b->cpool[i]);
+
+    for(i = 0; i < b->closure_var_count; i++) {
+        JSClosureVar *cv = &b->closure_var[i];
+        JS_FreeAtomRT(rt, cv->var_name);
+    }
+    if (b->realm)
+        JS_FreeContext(b->realm);
+
+    JS_FreeAtomRT(rt, b->func_name);
+    if (b->has_debug) {
+        JS_FreeAtomRT(rt, b->debug.filename);
+        js_free_rt(rt, b->debug.pc2line_buf);
+        js_free_rt(rt, b->debug.source);
+    }
+
+    remove_gc_object(&b->header);
+    if (rt->gc_phase == JS_GC_PHASE_REMOVE_CYCLES && b->header.ref_count != 0) {
+        list_add_tail(&b->header.link, &rt->gc_zero_ref_count_list);
+    } else {
+        js_free_rt(rt, b);
+    }
+}
+
+static __exception int js_parse_directives(JSParseState *s)
+{
+    char str[20];
+    JSParsePos pos;
+    BOOL has_semi;
+
+    if (s->token.val != TOK_STRING)
+        return 0;
+
+    js_parse_get_pos(s, &pos);
+
+    while(s->token.val == TOK_STRING) {
+        /* Copy actual source string representation */
+        snprintf(str, sizeof str, "%.*s",
+                 (int)(s->buf_ptr - s->token.ptr - 2), s->token.ptr + 1);
+
+        if (next_token(s))
+            return -1;
+
+        has_semi = FALSE;
+        switch (s->token.val) {
+        case ';':
+            if (next_token(s))
+                return -1;
+            has_semi = TRUE;
+            break;
+        case '}':
+        case TOK_EOF:
+            has_semi = TRUE;
+            break;
+        case TOK_NUMBER:
+        case TOK_STRING:
+        case TOK_TEMPLATE:
+        case TOK_IDENT:
+        case TOK_REGEXP:
+        case TOK_DEC:
+        case TOK_INC:
+        case TOK_NULL:
+        case TOK_FALSE:
+        case TOK_TRUE:
+        case TOK_IF:
+        case TOK_RETURN:
+        case TOK_VAR:
+        case TOK_THIS:
+        case TOK_DELETE:
+        case TOK_TYPEOF:
+        case TOK_NEW:
+        case TOK_DO:
+        case TOK_WHILE:
+        case TOK_FOR:
+        case TOK_SWITCH:
+        case TOK_THROW:
+        case TOK_TRY:
+        case TOK_FUNCTION:
+        case TOK_DEBUGGER:
+        case TOK_WITH:
+        case TOK_CLASS:
+        case TOK_CONST:
+        case TOK_ENUM:
+        case TOK_EXPORT:
+        case TOK_IMPORT:
+        case TOK_SUPER:
+        case TOK_INTERFACE:
+        case TOK_LET:
+        case TOK_PACKAGE:
+        case TOK_PRIVATE:
+        case TOK_PROTECTED:
+        case TOK_PUBLIC:
+        case TOK_STATIC:
+            /* automatic insertion of ';' */
+            if (s->got_lf)
+                has_semi = TRUE;
+            break;
+        default:
+            break;
+        }
+        if (!has_semi)
+            break;
+        if (!strcmp(str, "use strict")) {
+            s->cur_func->has_use_strict = TRUE;
+            s->cur_func->js_mode |= JS_MODE_STRICT;
+        }
+#if !defined(DUMP_BYTECODE) || !(DUMP_BYTECODE & 8)
+        else if (!strcmp(str, "use strip")) {
+            s->cur_func->js_mode |= JS_MODE_STRIP;
+        }
+#endif
+#ifdef CONFIG_BIGNUM
+        else if (s->ctx->bignum_ext && !strcmp(str, "use math")) {
+            s->cur_func->js_mode |= JS_MODE_MATH;
+        }
+#endif
+    }
+    return js_parse_seek_token(s, &pos);
+}
+
+static int js_parse_function_check_names(JSParseState *s, JSFunctionDef *fd,
+                                         JSAtom func_name)
+{
+    JSAtom name;
+    int i, idx;
+
+    if (fd->js_mode & JS_MODE_STRICT) {
+        if (!fd->has_simple_parameter_list && fd->has_use_strict) {
+            return js_parse_error(s, "\"use strict\" not allowed in function with default or destructuring parameter");
+        }
+        if (func_name == JS_ATOM_eval || func_name == JS_ATOM_arguments) {
+            return js_parse_error(s, "invalid function name in strict code");
+        }
+        for (idx = 0; idx < fd->arg_count; idx++) {
+            name = fd->args[idx].var_name;
+
+            if (name == JS_ATOM_eval || name == JS_ATOM_arguments) {
+                return js_parse_error(s, "invalid argument name in strict code");
+            }
+        }
+    }
+    /* check async_generator case */
+    if ((fd->js_mode & JS_MODE_STRICT)
+    ||  !fd->has_simple_parameter_list
+    ||  (fd->func_type == JS_PARSE_FUNC_METHOD && fd->func_kind == JS_FUNC_ASYNC)
+    ||  fd->func_type == JS_PARSE_FUNC_ARROW
+    ||  fd->func_type == JS_PARSE_FUNC_METHOD) {
+        for (idx = 0; idx < fd->arg_count; idx++) {
+            name = fd->args[idx].var_name;
+            if (name != JS_ATOM_NULL) {
+                for (i = 0; i < idx; i++) {
+                    if (fd->args[i].var_name == name)
+                        goto duplicate;
+                }
+                /* Check if argument name duplicates a destructuring parameter */
+                /* XXX: should have a flag for such variables */
+                for (i = 0; i < fd->var_count; i++) {
+                    if (fd->vars[i].var_name == name &&
+                        fd->vars[i].scope_level == 0)
+                        goto duplicate;
+                }
+            }
+        }
+    }
+    return 0;
+
+duplicate:
+    return js_parse_error(s, "duplicate argument names not allowed in this context");
+}
+
+/* create a function to initialize class fields */
+static JSFunctionDef *js_parse_function_class_fields_init(JSParseState *s)
+{
+    JSFunctionDef *fd;
+
+    fd = js_new_function_def(s->ctx, s->cur_func, FALSE, FALSE,
+                             s->filename, 0);
+    if (!fd)
+        return NULL;
+    fd->func_name = JS_ATOM_NULL;
+    fd->has_prototype = FALSE;
+    fd->has_home_object = TRUE;
+
+    fd->has_arguments_binding = FALSE;
+    fd->has_this_binding = TRUE;
+    fd->is_derived_class_constructor = FALSE;
+    fd->new_target_allowed = TRUE;
+    fd->super_call_allowed = FALSE;
+    fd->super_allowed = fd->has_home_object;
+    fd->arguments_allowed = FALSE;
+
+    fd->func_kind = JS_FUNC_NORMAL;
+    fd->func_type = JS_PARSE_FUNC_METHOD;
+    return fd;
+}
+
+/* func_name must be JS_ATOM_NULL for JS_PARSE_FUNC_STATEMENT and
+   JS_PARSE_FUNC_EXPR, JS_PARSE_FUNC_ARROW and JS_PARSE_FUNC_VAR */
+static __exception int js_parse_function_decl2(JSParseState *s,
+                                               JSParseFunctionEnum func_type,
+                                               JSFunctionKindEnum func_kind,
+                                               JSAtom func_name,
+                                               const uint8_t *ptr,
+                                               int function_line_num,
+                                               JSParseExportEnum export_flag,
+                                               JSFunctionDef **pfd)
+{
+    JSContext *ctx = s->ctx;
+    JSFunctionDef *fd = s->cur_func;
+    BOOL is_expr;
+    int func_idx, lexical_func_idx = -1;
+    BOOL has_opt_arg;
+    BOOL create_func_var = FALSE;
+
+    is_expr = (func_type != JS_PARSE_FUNC_STATEMENT &&
+               func_type != JS_PARSE_FUNC_VAR);
+
+    if (func_type == JS_PARSE_FUNC_STATEMENT ||
+        func_type == JS_PARSE_FUNC_VAR ||
+        func_type == JS_PARSE_FUNC_EXPR) {
+        if (func_kind == JS_FUNC_NORMAL &&
+            token_is_pseudo_keyword(s, JS_ATOM_async) &&
+            peek_token(s, TRUE) != '\n') {
+            if (next_token(s))
+                return -1;
+            func_kind = JS_FUNC_ASYNC;
+        }
+        if (next_token(s))
+            return -1;
+        if (s->token.val == '*') {
+            if (next_token(s))
+                return -1;
+            func_kind |= JS_FUNC_GENERATOR;
+        }
+
+        if (s->token.val == TOK_IDENT) {
+            if (s->token.u.ident.is_reserved ||
+                (s->token.u.ident.atom == JS_ATOM_yield &&
+                 func_type == JS_PARSE_FUNC_EXPR &&
+                 (func_kind & JS_FUNC_GENERATOR)) ||
+                (s->token.u.ident.atom == JS_ATOM_await &&
+                 ((func_type == JS_PARSE_FUNC_EXPR &&
+                   (func_kind & JS_FUNC_ASYNC)) ||
+                  func_type == JS_PARSE_FUNC_CLASS_STATIC_INIT))) {
+                return js_parse_error_reserved_identifier(s);
+            }
+        }
+        if (s->token.val == TOK_IDENT ||
+            (((s->token.val == TOK_YIELD && !(fd->js_mode & JS_MODE_STRICT)) ||
+             (s->token.val == TOK_AWAIT && !s->is_module)) &&
+             func_type == JS_PARSE_FUNC_EXPR)) {
+            func_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+            if (next_token(s)) {
+                JS_FreeAtom(ctx, func_name);
+                return -1;
+            }
+        } else {
+            if (func_type != JS_PARSE_FUNC_EXPR &&
+                export_flag != JS_PARSE_EXPORT_DEFAULT) {
+                return js_parse_error(s, "function name expected");
+            }
+        }
+    } else if (func_type != JS_PARSE_FUNC_ARROW) {
+        func_name = JS_DupAtom(ctx, func_name);
+    }
+
+    if (fd->is_eval && fd->eval_type == JS_EVAL_TYPE_MODULE &&
+        (func_type == JS_PARSE_FUNC_STATEMENT || func_type == JS_PARSE_FUNC_VAR)) {
+        JSGlobalVar *hf;
+        hf = find_global_var(fd, func_name);
+        /* XXX: should check scope chain */
+        if (hf && hf->scope_level == fd->scope_level) {
+            js_parse_error(s, "invalid redefinition of global identifier in module code");
+            JS_FreeAtom(ctx, func_name);
+            return -1;
+        }
+    }
+
+    if (func_type == JS_PARSE_FUNC_VAR) {
+        if (!(fd->js_mode & JS_MODE_STRICT)
+        && func_kind == JS_FUNC_NORMAL
+        &&  find_lexical_decl(ctx, fd, func_name, fd->scope_first, FALSE) < 0
+        &&  !((func_idx = find_var(ctx, fd, func_name)) >= 0 && (func_idx & ARGUMENT_VAR_OFFSET))
+        &&  !(func_name == JS_ATOM_arguments && fd->has_arguments_binding)) {
+            create_func_var = TRUE;
+        }
+        /* Create the lexical name here so that the function closure
+           contains it */
+        if (fd->is_eval &&
+            (fd->eval_type == JS_EVAL_TYPE_GLOBAL ||
+             fd->eval_type == JS_EVAL_TYPE_MODULE) &&
+            fd->scope_level == fd->body_scope) {
+            /* avoid creating a lexical variable in the global
+               scope. XXX: check annex B */
+            JSGlobalVar *hf;
+            hf = find_global_var(fd, func_name);
+            /* XXX: should check scope chain */
+            if (hf && hf->scope_level == fd->scope_level) {
+                js_parse_error(s, "invalid redefinition of global identifier");
+                JS_FreeAtom(ctx, func_name);
+                return -1;
+            }
+        } else {
+            /* Always create a lexical name, fail if at the same scope as
+               existing name */
+            /* Lexical variable will be initialized upon entering scope */
+            lexical_func_idx = define_var(s, fd, func_name,
+                                          func_kind != JS_FUNC_NORMAL ?
+                                          JS_VAR_DEF_NEW_FUNCTION_DECL :
+                                          JS_VAR_DEF_FUNCTION_DECL);
+            if (lexical_func_idx < 0) {
+                JS_FreeAtom(ctx, func_name);
+                return -1;
+            }
+        }
+    }
+
+    fd = js_new_function_def(ctx, fd, FALSE, is_expr,
+                             s->filename, function_line_num);
+    if (!fd) {
+        JS_FreeAtom(ctx, func_name);
+        return -1;
+    }
+    if (pfd)
+        *pfd = fd;
+    s->cur_func = fd;
+    fd->func_name = func_name;
+    /* XXX: test !fd->is_generator is always false */
+    fd->has_prototype = (func_type == JS_PARSE_FUNC_STATEMENT ||
+                         func_type == JS_PARSE_FUNC_VAR ||
+                         func_type == JS_PARSE_FUNC_EXPR) &&
+                        func_kind == JS_FUNC_NORMAL;
+    fd->has_home_object = (func_type == JS_PARSE_FUNC_METHOD ||
+                           func_type == JS_PARSE_FUNC_GETTER ||
+                           func_type == JS_PARSE_FUNC_SETTER ||
+                           func_type == JS_PARSE_FUNC_CLASS_CONSTRUCTOR ||
+                           func_type == JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR);
+    fd->has_arguments_binding = (func_type != JS_PARSE_FUNC_ARROW &&
+                                 func_type != JS_PARSE_FUNC_CLASS_STATIC_INIT);
+    fd->has_this_binding = fd->has_arguments_binding;
+    fd->is_derived_class_constructor = (func_type == JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR);
+    if (func_type == JS_PARSE_FUNC_ARROW) {
+        fd->new_target_allowed = fd->parent->new_target_allowed;
+        fd->super_call_allowed = fd->parent->super_call_allowed;
+        fd->super_allowed = fd->parent->super_allowed;
+        fd->arguments_allowed = fd->parent->arguments_allowed;
+    } else if (func_type == JS_PARSE_FUNC_CLASS_STATIC_INIT) {
+        fd->new_target_allowed = TRUE; // although new.target === undefined
+        fd->super_call_allowed = FALSE;
+        fd->super_allowed = TRUE;
+        fd->arguments_allowed = FALSE;
+    } else {
+        fd->new_target_allowed = TRUE;
+        fd->super_call_allowed = fd->is_derived_class_constructor;
+        fd->super_allowed = fd->has_home_object;
+        fd->arguments_allowed = TRUE;
+    }
+
+    /* fd->in_function_body == FALSE prevents yield/await during the parsing
+       of the arguments in generator/async functions. They are parsed as
+       regular identifiers for other function kinds. */
+    fd->func_kind = func_kind;
+    fd->func_type = func_type;
+
+    if (func_type == JS_PARSE_FUNC_CLASS_CONSTRUCTOR ||
+        func_type == JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR) {
+        /* error if not invoked as a constructor */
+        emit_op(s, OP_check_ctor);
+    }
+
+    if (func_type == JS_PARSE_FUNC_CLASS_CONSTRUCTOR) {
+        emit_class_field_init(s);
+    }
+
+    /* parse arguments */
+    fd->has_simple_parameter_list = TRUE;
+    fd->has_parameter_expressions = FALSE;
+    has_opt_arg = FALSE;
+    if (func_type == JS_PARSE_FUNC_ARROW && s->token.val == TOK_IDENT) {
+        JSAtom name;
+        if (s->token.u.ident.is_reserved) {
+            js_parse_error_reserved_identifier(s);
+            goto fail;
+        }
+        name = s->token.u.ident.atom;
+        if (add_arg(ctx, fd, name) < 0)
+            goto fail;
+        fd->defined_arg_count = 1;
+    } else if (func_type != JS_PARSE_FUNC_CLASS_STATIC_INIT) {
+        if (s->token.val == '(') {
+            int skip_bits;
+            /* if there is an '=' inside the parameter list, we
+               consider there is a parameter expression inside */
+            js_parse_skip_parens_token(s, &skip_bits, FALSE);
+            if (skip_bits & SKIP_HAS_ASSIGNMENT)
+                fd->has_parameter_expressions = TRUE;
+            if (next_token(s))
+                goto fail;
+        } else {
+            if (js_parse_expect(s, '('))
+                goto fail;
+        }
+
+        if (fd->has_parameter_expressions) {
+            fd->scope_level = -1; /* force no parent scope */
+            if (push_scope(s) < 0)
+                return -1;
+        }
+
+        while (s->token.val != ')') {
+            JSAtom name;
+            BOOL rest = FALSE;
+            int idx, has_initializer;
+
+            if (s->token.val == TOK_ELLIPSIS) {
+                fd->has_simple_parameter_list = FALSE;
+                rest = TRUE;
+                if (next_token(s))
+                    goto fail;
+            }
+            if (s->token.val == '[' || s->token.val == '{') {
+                fd->has_simple_parameter_list = FALSE;
+                if (rest) {
+                    emit_op(s, OP_rest);
+                    emit_u16(s, fd->arg_count);
+                } else {
+                    /* unnamed arg for destructuring */
+                    idx = add_arg(ctx, fd, JS_ATOM_NULL);
+                    emit_op(s, OP_get_arg);
+                    emit_u16(s, idx);
+                }
+                has_initializer = js_parse_destructuring_element(s, fd->has_parameter_expressions ? TOK_LET : TOK_VAR, 1, TRUE, -1, TRUE);
+                if (has_initializer < 0)
+                    goto fail;
+                if (has_initializer)
+                    has_opt_arg = TRUE;
+                if (!has_opt_arg)
+                    fd->defined_arg_count++;
+            } else if (s->token.val == TOK_IDENT) {
+                if (s->token.u.ident.is_reserved) {
+                    js_parse_error_reserved_identifier(s);
+                    goto fail;
+                }
+                name = s->token.u.ident.atom;
+                if (name == JS_ATOM_yield && fd->func_kind == JS_FUNC_GENERATOR) {
+                    js_parse_error_reserved_identifier(s);
+                    goto fail;
+                }
+                if (fd->has_parameter_expressions) {
+                    if (js_parse_check_duplicate_parameter(s, name))
+                        goto fail;
+                    if (define_var(s, fd, name, JS_VAR_DEF_LET) < 0)
+                        goto fail;
+                }
+                /* XXX: could avoid allocating an argument if rest is true */
+                idx = add_arg(ctx, fd, name);
+                if (idx < 0)
+                    goto fail;
+                if (next_token(s))
+                    goto fail;
+                if (rest) {
+                    emit_op(s, OP_rest);
+                    emit_u16(s, idx);
+                    if (fd->has_parameter_expressions) {
+                        emit_op(s, OP_dup);
+                        emit_op(s, OP_scope_put_var_init);
+                        emit_atom(s, name);
+                        emit_u16(s, fd->scope_level);
+                    }
+                    emit_op(s, OP_put_arg);
+                    emit_u16(s, idx);
+                    fd->has_simple_parameter_list = FALSE;
+                    has_opt_arg = TRUE;
+                } else if (s->token.val == '=') {
+                    int label;
+
+                    fd->has_simple_parameter_list = FALSE;
+                    has_opt_arg = TRUE;
+
+                    if (next_token(s))
+                        goto fail;
+
+                    label = new_label(s);
+                    emit_op(s, OP_get_arg);
+                    emit_u16(s, idx);
+                    emit_op(s, OP_dup);
+                    emit_op(s, OP_undefined);
+                    emit_op(s, OP_strict_eq);
+                    emit_goto(s, OP_if_false, label);
+                    emit_op(s, OP_drop);
+                    if (js_parse_assign_expr(s))
+                        goto fail;
+                    set_object_name(s, name);
+                    emit_op(s, OP_dup);
+                    emit_op(s, OP_put_arg);
+                    emit_u16(s, idx);
+                    emit_label(s, label);
+                    emit_op(s, OP_scope_put_var_init);
+                    emit_atom(s, name);
+                    emit_u16(s, fd->scope_level);
+                } else {
+                    if (!has_opt_arg) {
+                        fd->defined_arg_count++;
+                    }
+                    if (fd->has_parameter_expressions) {
+                        /* copy the argument to the argument scope */
+                        emit_op(s, OP_get_arg);
+                        emit_u16(s, idx);
+                        emit_op(s, OP_scope_put_var_init);
+                        emit_atom(s, name);
+                        emit_u16(s, fd->scope_level);
+                    }
+                }
+            } else {
+                js_parse_error(s, "missing formal parameter");
+                goto fail;
+            }
+            if (rest && s->token.val != ')') {
+                js_parse_expect(s, ')');
+                goto fail;
+            }
+            if (s->token.val == ')')
+                break;
+            if (js_parse_expect(s, ','))
+                goto fail;
+        }
+        if ((func_type == JS_PARSE_FUNC_GETTER && fd->arg_count != 0) ||
+            (func_type == JS_PARSE_FUNC_SETTER && fd->arg_count != 1)) {
+            js_parse_error(s, "invalid number of arguments for getter or setter");
+            goto fail;
+        }
+    }
+
+    if (fd->has_parameter_expressions) {
+        int idx;
+
+        /* Copy the variables in the argument scope to the variable
+           scope (see FunctionDeclarationInstantiation() in spec). The
+           normal arguments are already present, so no need to copy
+           them. */
+        idx = fd->scopes[fd->scope_level].first;
+        while (idx >= 0) {
+            JSVarDef *vd = &fd->vars[idx];
+            if (vd->scope_level != fd->scope_level)
+                break;
+            if (find_var(ctx, fd, vd->var_name) < 0) {
+                if (add_var(ctx, fd, vd->var_name) < 0)
+                    goto fail;
+                vd = &fd->vars[idx]; /* fd->vars may have been reallocated */
+                emit_op(s, OP_scope_get_var);
+                emit_atom(s, vd->var_name);
+                emit_u16(s, fd->scope_level);
+                emit_op(s, OP_scope_put_var);
+                emit_atom(s, vd->var_name);
+                emit_u16(s, 0);
+            }
+            idx = vd->scope_next;
+        }
+
+        /* the argument scope has no parent, hence we don't use pop_scope(s) */
+        emit_op(s, OP_leave_scope);
+        emit_u16(s, fd->scope_level);
+
+        /* set the variable scope as the current scope */
+        fd->scope_level = 0;
+        fd->scope_first = fd->scopes[fd->scope_level].first;
+    }
+
+    if (next_token(s))
+        goto fail;
+
+    /* generator function: yield after the parameters are evaluated */
+    if (func_kind == JS_FUNC_GENERATOR ||
+        func_kind == JS_FUNC_ASYNC_GENERATOR)
+        emit_op(s, OP_initial_yield);
+
+    /* in generators, yield expression is forbidden during the parsing
+       of the arguments */
+    fd->in_function_body = TRUE;
+    push_scope(s);  /* enter body scope */
+    fd->body_scope = fd->scope_level;
+
+    if (s->token.val == TOK_ARROW) {
+        if (next_token(s))
+            goto fail;
+
+        if (s->token.val != '{') {
+            if (js_parse_function_check_names(s, fd, func_name))
+                goto fail;
+
+            if (js_parse_assign_expr(s))
+                goto fail;
+
+            if (func_kind != JS_FUNC_NORMAL)
+                emit_op(s, OP_return_async);
+            else
+                emit_op(s, OP_return);
+
+            if (!(fd->js_mode & JS_MODE_STRIP)) {
+                /* save the function source code */
+                /* the end of the function source code is after the last
+                   token of the function source stored into s->last_ptr */
+                fd->source_len = s->last_ptr - ptr;
+                fd->source = js_strndup(ctx, (const char *)ptr, fd->source_len);
+                if (!fd->source)
+                    goto fail;
+            }
+            goto done;
+        }
+    }
+
+    if (func_type != JS_PARSE_FUNC_CLASS_STATIC_INIT) {
+        if (js_parse_expect(s, '{'))
+            goto fail;
+    }
+
+    if (js_parse_directives(s))
+        goto fail;
+
+    /* in strict_mode, check function and argument names */
+    if (js_parse_function_check_names(s, fd, func_name))
+        goto fail;
+
+    while (s->token.val != '}') {
+        if (js_parse_source_element(s))
+            goto fail;
+    }
+    if (!(fd->js_mode & JS_MODE_STRIP)) {
+        /* save the function source code */
+        fd->source_len = s->buf_ptr - ptr;
+        fd->source = js_strndup(ctx, (const char *)ptr, fd->source_len);
+        if (!fd->source)
+            goto fail;
+    }
+
+    if (next_token(s)) {
+        /* consume the '}' */
+        goto fail;
+    }
+
+    /* in case there is no return, add one */
+    if (js_is_live_code(s)) {
+        emit_return(s, FALSE);
+    }
+ done:
+    s->cur_func = fd->parent;
+
+    /* Reparse identifiers after the function is terminated so that
+       the token is parsed in the englobing function. It could be done
+       by just using next_token() here for normal functions, but it is
+       necessary for arrow functions with an expression body. */
+    reparse_ident_token(s);
+
+    /* create the function object */
+    {
+        int idx;
+        JSAtom func_name = fd->func_name;
+
+        /* the real object will be set at the end of the compilation */
+        idx = cpool_add(s, JS_NULL);
+        fd->parent_cpool_idx = idx;
+
+        if (is_expr) {
+            /* for constructors, no code needs to be generated here */
+            if (func_type != JS_PARSE_FUNC_CLASS_CONSTRUCTOR &&
+                func_type != JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR) {
+                /* OP_fclosure creates the function object from the bytecode
+                   and adds the scope information */
+                emit_op(s, OP_fclosure);
+                emit_u32(s, idx);
+                if (func_name == JS_ATOM_NULL) {
+                    emit_op(s, OP_set_name);
+                    emit_u32(s, JS_ATOM_NULL);
+                }
+            }
+        } else if (func_type == JS_PARSE_FUNC_VAR) {
+            emit_op(s, OP_fclosure);
+            emit_u32(s, idx);
+            if (create_func_var) {
+                if (s->cur_func->is_global_var) {
+                    JSGlobalVar *hf;
+                    /* the global variable must be defined at the start of the
+                       function */
+                    hf = add_global_var(ctx, s->cur_func, func_name);
+                    if (!hf)
+                        goto fail;
+                    /* it is considered as defined at the top level
+                       (needed for annex B.3.3.4 and B.3.3.5
+                       checks) */
+                    hf->scope_level = 0;
+                    hf->force_init = ((s->cur_func->js_mode & JS_MODE_STRICT) != 0);
+                    /* store directly into global var, bypass lexical scope */
+                    emit_op(s, OP_dup);
+                    emit_op(s, OP_scope_put_var);
+                    emit_atom(s, func_name);
+                    emit_u16(s, 0);
+                } else {
+                    /* do not call define_var to bypass lexical scope check */
+                    func_idx = find_var(ctx, s->cur_func, func_name);
+                    if (func_idx < 0) {
+                        func_idx = add_var(ctx, s->cur_func, func_name);
+                        if (func_idx < 0)
+                            goto fail;
+                    }
+                    /* store directly into local var, bypass lexical catch scope */
+                    emit_op(s, OP_dup);
+                    emit_op(s, OP_scope_put_var);
+                    emit_atom(s, func_name);
+                    emit_u16(s, 0);
+                }
+            }
+            if (lexical_func_idx >= 0) {
+                /* lexical variable will be initialized upon entering scope */
+                s->cur_func->vars[lexical_func_idx].func_pool_idx = idx;
+                emit_op(s, OP_drop);
+            } else {
+                /* store function object into its lexical name */
+                /* XXX: could use OP_put_loc directly */
+                emit_op(s, OP_scope_put_var_init);
+                emit_atom(s, func_name);
+                emit_u16(s, s->cur_func->scope_level);
+            }
+        } else {
+            if (!s->cur_func->is_global_var) {
+                int var_idx = define_var(s, s->cur_func, func_name, JS_VAR_DEF_VAR);
+
+                if (var_idx < 0)
+                    goto fail;
+                /* the variable will be assigned at the top of the function */
+                if (var_idx & ARGUMENT_VAR_OFFSET) {
+                    s->cur_func->args[var_idx - ARGUMENT_VAR_OFFSET].func_pool_idx = idx;
+                } else {
+                    s->cur_func->vars[var_idx].func_pool_idx = idx;
+                }
+            } else {
+                JSAtom func_var_name;
+                JSGlobalVar *hf;
+                if (func_name == JS_ATOM_NULL)
+                    func_var_name = JS_ATOM__default_; /* export default */
+                else
+                    func_var_name = func_name;
+                /* the variable will be assigned at the top of the function */
+                hf = add_global_var(ctx, s->cur_func, func_var_name);
+                if (!hf)
+                    goto fail;
+                hf->cpool_idx = idx;
+                if (export_flag != JS_PARSE_EXPORT_NONE) {
+                    if (!add_export_entry(s, s->cur_func->module, func_var_name,
+                                          export_flag == JS_PARSE_EXPORT_NAMED ? func_var_name : JS_ATOM_default, JS_EXPORT_TYPE_LOCAL))
+                        goto fail;
+                }
+            }
+        }
+    }
+    return 0;
+ fail:
+    s->cur_func = fd->parent;
+    js_free_function_def(ctx, fd);
+    if (pfd)
+        *pfd = NULL;
+    return -1;
+}
+
+static __exception int js_parse_function_decl(JSParseState *s,
+                                              JSParseFunctionEnum func_type,
+                                              JSFunctionKindEnum func_kind,
+                                              JSAtom func_name,
+                                              const uint8_t *ptr,
+                                              int function_line_num)
+{
+    return js_parse_function_decl2(s, func_type, func_kind, func_name, ptr,
+                                   function_line_num, JS_PARSE_EXPORT_NONE,
+                                   NULL);
+}
+
+static __exception int js_parse_program(JSParseState *s)
+{
+    JSFunctionDef *fd = s->cur_func;
+    int idx;
+
+    if (next_token(s))
+        return -1;
+
+    if (js_parse_directives(s))
+        return -1;
+
+    fd->is_global_var = (fd->eval_type == JS_EVAL_TYPE_GLOBAL) ||
+        (fd->eval_type == JS_EVAL_TYPE_MODULE) ||
+        !(fd->js_mode & JS_MODE_STRICT);
+
+    if (!s->is_module) {
+        /* hidden variable for the return value */
+        fd->eval_ret_idx = idx = add_var(s->ctx, fd, JS_ATOM__ret_);
+        if (idx < 0)
+            return -1;
+    }
+
+    while (s->token.val != TOK_EOF) {
+        if (js_parse_source_element(s))
+            return -1;
+    }
+
+    if (!s->is_module) {
+        /* return the value of the hidden variable eval_ret_idx  */
+        if (fd->func_kind == JS_FUNC_ASYNC) {
+            /* wrap the return value in an object so that promises can
+               be safely returned */
+            emit_op(s, OP_object);
+            emit_op(s, OP_dup);
+
+            emit_op(s, OP_get_loc);
+            emit_u16(s, fd->eval_ret_idx);
+
+            emit_op(s, OP_put_field);
+            emit_atom(s, JS_ATOM_value);
+        } else {
+            emit_op(s, OP_get_loc);
+            emit_u16(s, fd->eval_ret_idx);
+        }
+        emit_return(s, TRUE);
+    } else {
+        emit_return(s, FALSE);
+    }
+
+    return 0;
+}
+
+static void js_parse_init(JSContext *ctx, JSParseState *s,
+                          const char *input, size_t input_len,
+                          const char *filename, int line)
+{
+    memset(s, 0, sizeof(*s));
+    s->ctx = ctx;
+    s->filename = filename;
+    s->line_num = line;
+    s->buf_ptr = (const uint8_t *)input;
+    s->buf_end = s->buf_ptr + input_len;
+    s->token.val = ' ';
+    s->token.line_num = 1;
+}
+
+static JSValue JS_EvalFunctionInternal(JSContext *ctx, JSValue fun_obj,
+                                       JSValueConst this_obj,
+                                       JSVarRef **var_refs, JSStackFrame *sf)
+{
+    JSValue ret_val;
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_TAG(fun_obj);
+    if (tag == JS_TAG_FUNCTION_BYTECODE) {
+        fun_obj = js_closure(ctx, fun_obj, var_refs, sf);
+        ret_val = JS_CallFree(ctx, fun_obj, this_obj, 0, NULL);
+    } else if (tag == JS_TAG_MODULE) {
+        JSModuleDef *m;
+        m = JS_VALUE_GET_PTR(fun_obj);
+        /* the module refcount should be >= 2 */
+        JS_FreeValue(ctx, fun_obj);
+        if (js_create_module_function(ctx, m) < 0)
+            goto fail;
+        if (js_link_module(ctx, m) < 0)
+            goto fail;
+        ret_val = js_evaluate_module(ctx, m);
+        if (JS_IsException(ret_val)) {
+        fail:
+            return JS_EXCEPTION;
+        }
+    } else {
+        JS_FreeValue(ctx, fun_obj);
+        ret_val = JS_ThrowTypeError(ctx, "bytecode function expected");
+    }
+    return ret_val;
+}
+
+JSValue JS_EvalFunction(JSContext *ctx, JSValue fun_obj)
+{
+    return JS_EvalFunctionInternal(ctx, fun_obj, ctx->global_obj, NULL, NULL);
+}
+
+/* 'input' must be zero terminated i.e. input[input_len] = '\0'. */
+static JSValue __JS_EvalInternal(JSContext *ctx, JSValueConst this_obj,
+                                 const char *input, size_t input_len,
+                                 const char *filename, int line, int flags, int scope_idx)
+{
+    JSParseState s1, *s = &s1;
+    int err, js_mode, eval_type;
+    JSValue fun_obj, ret_val;
+    JSStackFrame *sf;
+    JSVarRef **var_refs;
+    JSFunctionBytecode *b;
+    JSFunctionDef *fd;
+    JSModuleDef *m;
+
+    js_parse_init(ctx, s, input, input_len, filename, line);
+    skip_shebang(&s->buf_ptr, s->buf_end);
+
+    eval_type = flags & JS_EVAL_TYPE_MASK;
+    m = NULL;
+    if (eval_type == JS_EVAL_TYPE_DIRECT) {
+        JSObject *p;
+        sf = ctx->rt->current_stack_frame;
+        assert(sf != NULL);
+        assert(JS_VALUE_GET_TAG(sf->cur_func) == JS_TAG_OBJECT);
+        p = JS_VALUE_GET_OBJ(sf->cur_func);
+        assert(js_class_has_bytecode(p->class_id));
+        b = p->u.func.function_bytecode;
+        var_refs = p->u.func.var_refs;
+        js_mode = b->js_mode;
+    } else {
+        sf = NULL;
+        b = NULL;
+        var_refs = NULL;
+        js_mode = 0;
+        if (flags & JS_EVAL_FLAG_STRICT)
+            js_mode |= JS_MODE_STRICT;
+        if (flags & JS_EVAL_FLAG_STRIP)
+            js_mode |= JS_MODE_STRIP;
+        if (eval_type == JS_EVAL_TYPE_MODULE) {
+            JSAtom module_name = JS_NewAtom(ctx, filename);
+            if (module_name == JS_ATOM_NULL)
+                return JS_EXCEPTION;
+            m = js_new_module_def(ctx, module_name);
+            if (!m)
+                return JS_EXCEPTION;
+            js_mode |= JS_MODE_STRICT;
+        }
+    }
+    fd = js_new_function_def(ctx, NULL, TRUE, FALSE, filename, line);
+    if (!fd)
+        goto fail1;
+    s->cur_func = fd;
+    fd->eval_type = eval_type;
+    fd->has_this_binding = (eval_type != JS_EVAL_TYPE_DIRECT);
+    fd->backtrace_barrier = ((flags & JS_EVAL_FLAG_BACKTRACE_BARRIER) != 0);
+    if (eval_type == JS_EVAL_TYPE_DIRECT) {
+        fd->new_target_allowed = b->new_target_allowed;
+        fd->super_call_allowed = b->super_call_allowed;
+        fd->super_allowed = b->super_allowed;
+        fd->arguments_allowed = b->arguments_allowed;
+    } else {
+        fd->new_target_allowed = FALSE;
+        fd->super_call_allowed = FALSE;
+        fd->super_allowed = FALSE;
+        fd->arguments_allowed = TRUE;
+    }
+    fd->js_mode = js_mode;
+    fd->func_name = JS_DupAtom(ctx, JS_ATOM__eval_);
+    if (b) {
+        if (add_closure_variables(ctx, fd, b, scope_idx))
+            goto fail;
+    }
+    fd->module = m;
+    if (m != NULL || (flags & JS_EVAL_FLAG_ASYNC)) {
+        fd->in_function_body = TRUE;
+        fd->func_kind = JS_FUNC_ASYNC;
+    }
+    s->is_module = (m != NULL);
+    s->allow_html_comments = !s->is_module;
+
+    push_scope(s); /* body scope */
+    fd->body_scope = fd->scope_level;
+
+    err = js_parse_program(s);
+    if (err) {
+    fail:
+        free_token(s, &s->token);
+        js_free_function_def(ctx, fd);
+        goto fail1;
+    }
+
+    if (m != NULL)
+        m->has_tla = fd->has_await;
+
+    /* create the function object and all the enclosed functions */
+    fun_obj = js_create_function(ctx, fd);
+    if (JS_IsException(fun_obj))
+        goto fail1;
+    /* Could add a flag to avoid resolution if necessary */
+    if (m) {
+        m->func_obj = fun_obj;
+        if (js_resolve_module(ctx, m) < 0)
+            goto fail1;
+        fun_obj = JS_NewModuleValue(ctx, m);
+    }
+    if (flags & JS_EVAL_FLAG_COMPILE_ONLY) {
+        ret_val = fun_obj;
+    } else {
+        ret_val = JS_EvalFunctionInternal(ctx, fun_obj, this_obj, var_refs, sf);
+    }
+    return ret_val;
+ fail1:
+    /* XXX: should free all the unresolved dependencies */
+    if (m)
+        js_free_module_def(ctx, m);
+    return JS_EXCEPTION;
+}
+
+/* the indirection is needed to make 'eval' optional */
+static JSValue JS_EvalInternal(JSContext *ctx, JSValueConst this_obj,
+                               const char *input, size_t input_len,
+                               const char *filename, int line, int flags, int scope_idx)
+{
+    if (unlikely(!ctx->eval_internal)) {
+        return JS_ThrowTypeError(ctx, "eval is not supported");
+    }
+    return ctx->eval_internal(ctx, this_obj, input, input_len, filename, line,
+                              flags, scope_idx);
+}
+
+static JSValue JS_EvalObject(JSContext *ctx, JSValueConst this_obj,
+                             JSValueConst val, int flags, int scope_idx)
+{
+    JSValue ret;
+    const char *str;
+    size_t len;
+
+    if (!JS_IsString(val))
+        return JS_DupValue(ctx, val);
+    str = JS_ToCStringLen(ctx, &len, val);
+    if (!str)
+        return JS_EXCEPTION;
+    ret = JS_EvalInternal(ctx, this_obj, str, len, "<input>", 1, flags, scope_idx);
+    JS_FreeCString(ctx, str);
+    return ret;
+
+}
+
+JSValue JS_EvalThis(JSContext *ctx, JSValueConst this_obj,
+                    const char *input, size_t input_len,
+                    const char *filename, int line, int eval_flags)
+{
+    int eval_type = eval_flags & JS_EVAL_TYPE_MASK;
+    JSValue ret;
+
+    assert(eval_type == JS_EVAL_TYPE_GLOBAL ||
+           eval_type == JS_EVAL_TYPE_MODULE);
+    ret = JS_EvalInternal(ctx, this_obj, input, input_len, filename, line,
+                          eval_flags, -1);
+    return ret;
+}
+
+JSValue JS_Eval(JSContext *ctx, const char *input, size_t input_len,
+                const char *filename, int eval_flags)
+{
+    return JS_EvalThis(ctx, ctx->global_obj, input, input_len, filename, 1,
+                       eval_flags);
+}
+
+int JS_ResolveModule(JSContext *ctx, JSValueConst obj)
+{
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_MODULE) {
+        JSModuleDef *m = JS_VALUE_GET_PTR(obj);
+        if (js_resolve_module(ctx, m) < 0) {
+            js_free_modules(ctx, JS_FREE_MODULE_NOT_RESOLVED);
+            return -1;
+        }
+    }
+    return 0;
+}
+
+/*******************************************************************/
+/* object list */
+
+typedef struct {
+    JSObject *obj;
+    uint32_t hash_next; /* -1 if no next entry */
+} JSObjectListEntry;
+
+/* XXX: reuse it to optimize weak references */
+typedef struct {
+    JSObjectListEntry *object_tab;
+    int object_count;
+    int object_size;
+    uint32_t *hash_table;
+    uint32_t hash_size;
+} JSObjectList;
+
+static void js_object_list_init(JSObjectList *s)
+{
+    memset(s, 0, sizeof(*s));
+}
+
+static uint32_t js_object_list_get_hash(JSObject *p, uint32_t hash_size)
+{
+    return ((uintptr_t)p * 3163) & (hash_size - 1);
+}
+
+static int js_object_list_resize_hash(JSContext *ctx, JSObjectList *s,
+                                 uint32_t new_hash_size)
+{
+    JSObjectListEntry *e;
+    uint32_t i, h, *new_hash_table;
+
+    new_hash_table = js_malloc(ctx, sizeof(new_hash_table[0]) * new_hash_size);
+    if (!new_hash_table)
+        return -1;
+    js_free(ctx, s->hash_table);
+    s->hash_table = new_hash_table;
+    s->hash_size = new_hash_size;
+
+    for(i = 0; i < s->hash_size; i++) {
+        s->hash_table[i] = -1;
+    }
+    for(i = 0; i < s->object_count; i++) {
+        e = &s->object_tab[i];
+        h = js_object_list_get_hash(e->obj, s->hash_size);
+        e->hash_next = s->hash_table[h];
+        s->hash_table[h] = i;
+    }
+    return 0;
+}
+
+/* the reference count of 'obj' is not modified. Return 0 if OK, -1 if
+   memory error */
+static int js_object_list_add(JSContext *ctx, JSObjectList *s, JSObject *obj)
+{
+    JSObjectListEntry *e;
+    uint32_t h, new_hash_size;
+
+    if (js_resize_array(ctx, (void *)&s->object_tab,
+                        sizeof(s->object_tab[0]),
+                        &s->object_size, s->object_count + 1))
+        return -1;
+    if (unlikely((s->object_count + 1) >= s->hash_size)) {
+        new_hash_size = max_uint32(s->hash_size, 4);
+        while (new_hash_size <= s->object_count)
+            new_hash_size *= 2;
+        if (js_object_list_resize_hash(ctx, s, new_hash_size))
+            return -1;
+    }
+    e = &s->object_tab[s->object_count++];
+    h = js_object_list_get_hash(obj, s->hash_size);
+    e->obj = obj;
+    e->hash_next = s->hash_table[h];
+    s->hash_table[h] = s->object_count - 1;
+    return 0;
+}
+
+/* return -1 if not present or the object index */
+static int js_object_list_find(JSContext *ctx, JSObjectList *s, JSObject *obj)
+{
+    JSObjectListEntry *e;
+    uint32_t h, p;
+
+    /* must test empty size because there is no hash table */
+    if (s->object_count == 0)
+        return -1;
+    h = js_object_list_get_hash(obj, s->hash_size);
+    p = s->hash_table[h];
+    while (p != -1) {
+        e = &s->object_tab[p];
+        if (e->obj == obj)
+            return p;
+        p = e->hash_next;
+    }
+    return -1;
+}
+
+static void js_object_list_end(JSContext *ctx, JSObjectList *s)
+{
+    js_free(ctx, s->object_tab);
+    js_free(ctx, s->hash_table);
+}
+
+/*******************************************************************/
+/* binary object writer & reader */
+
+typedef enum BCTagEnum {
+    BC_TAG_NULL = 1,
+    BC_TAG_UNDEFINED,
+    BC_TAG_BOOL_FALSE,
+    BC_TAG_BOOL_TRUE,
+    BC_TAG_INT32,
+    BC_TAG_FLOAT64,
+    BC_TAG_STRING,
+    BC_TAG_OBJECT,
+    BC_TAG_ARRAY,
+    BC_TAG_BIG_INT,
+    BC_TAG_TEMPLATE_OBJECT,
+    BC_TAG_FUNCTION_BYTECODE,
+    BC_TAG_MODULE,
+    BC_TAG_TYPED_ARRAY,
+    BC_TAG_ARRAY_BUFFER,
+    BC_TAG_SHARED_ARRAY_BUFFER,
+    BC_TAG_DATE,
+    BC_TAG_OBJECT_VALUE,
+    BC_TAG_OBJECT_REFERENCE,
+#ifdef CONFIG_BIGNUM
+    BC_TAG_BIG_FLOAT,
+    BC_TAG_BIG_DECIMAL,
+#endif
+} BCTagEnum;
+
+#ifdef CONFIG_BIGNUM
+#define BC_VERSION 0x43
+#else
+#define BC_VERSION 3
+#endif
+
+typedef struct BCWriterState {
+    JSContext *ctx;
+    DynBuf dbuf;
+    BOOL allow_bytecode : 8;
+    BOOL allow_sab : 8;
+    BOOL allow_reference : 8;
+    uint32_t first_atom;
+    uint32_t *atom_to_idx;
+    int atom_to_idx_size;
+    JSAtom *idx_to_atom;
+    int idx_to_atom_count;
+    int idx_to_atom_size;
+    uint8_t **sab_tab;
+    int sab_tab_len;
+    int sab_tab_size;
+    /* list of referenced objects (used if allow_reference = TRUE) */
+    JSObjectList object_list;
+} BCWriterState;
+
+#ifdef DUMP_READ_OBJECT
+static const char * const bc_tag_str[] = {
+    "invalid",
+    "null",
+    "undefined",
+    "false",
+    "true",
+    "int32",
+    "float64",
+    "string",
+    "object",
+    "array",
+    "bigint",
+    "template",
+    "function",
+    "module",
+    "TypedArray",
+    "ArrayBuffer",
+    "SharedArrayBuffer",
+    "Date",
+    "ObjectValue",
+    "ObjectReference",
+#ifdef CONFIG_BIGNUM
+    "bigfloat",
+    "bigdecimal",
+#endif
+};
+#endif
+
+static inline BOOL is_be(void)
+{
+    union {
+        uint16_t a;
+        uint8_t  b;
+    } u = {0x100};
+    return u.b;
+}
+
+static void bc_put_u8(BCWriterState *s, uint8_t v)
+{
+    dbuf_putc(&s->dbuf, v);
+}
+
+static void bc_put_u16(BCWriterState *s, uint16_t v)
+{
+    if (is_be())
+        v = bswap16(v);
+    dbuf_put_u16(&s->dbuf, v);
+}
+
+static __maybe_unused void bc_put_u32(BCWriterState *s, uint32_t v)
+{
+    if (is_be())
+        v = bswap32(v);
+    dbuf_put_u32(&s->dbuf, v);
+}
+
+static void bc_put_u64(BCWriterState *s, uint64_t v)
+{
+    if (is_be())
+        v = bswap64(v);
+    dbuf_put(&s->dbuf, (uint8_t *)&v, sizeof(v));
+}
+
+static void bc_put_leb128(BCWriterState *s, uint32_t v)
+{
+    dbuf_put_leb128(&s->dbuf, v);
+}
+
+static void bc_put_sleb128(BCWriterState *s, int32_t v)
+{
+    dbuf_put_sleb128(&s->dbuf, v);
+}
+
+static void bc_set_flags(uint32_t *pflags, int *pidx, uint32_t val, int n)
+{
+    *pflags = *pflags | (val << *pidx);
+    *pidx += n;
+}
+
+static int bc_atom_to_idx(BCWriterState *s, uint32_t *pres, JSAtom atom)
+{
+    uint32_t v;
+
+    if (atom < s->first_atom || __JS_AtomIsTaggedInt(atom)) {
+        *pres = atom;
+        return 0;
+    }
+    atom -= s->first_atom;
+    if (atom < s->atom_to_idx_size && s->atom_to_idx[atom] != 0) {
+        *pres = s->atom_to_idx[atom];
+        return 0;
+    }
+    if (atom >= s->atom_to_idx_size) {
+        int old_size, i;
+        old_size = s->atom_to_idx_size;
+        if (js_resize_array(s->ctx, (void **)&s->atom_to_idx,
+                            sizeof(s->atom_to_idx[0]), &s->atom_to_idx_size,
+                            atom + 1))
+            return -1;
+        /* XXX: could add a specific js_resize_array() function to do it */
+        for(i = old_size; i < s->atom_to_idx_size; i++)
+            s->atom_to_idx[i] = 0;
+    }
+    if (js_resize_array(s->ctx, (void **)&s->idx_to_atom,
+                        sizeof(s->idx_to_atom[0]),
+                        &s->idx_to_atom_size, s->idx_to_atom_count + 1))
+        goto fail;
+
+    v = s->idx_to_atom_count++;
+    s->idx_to_atom[v] = atom + s->first_atom;
+    v += s->first_atom;
+    s->atom_to_idx[atom] = v;
+    *pres = v;
+    return 0;
+ fail:
+    *pres = 0;
+    return -1;
+}
+
+static int bc_put_atom(BCWriterState *s, JSAtom atom)
+{
+    uint32_t v;
+
+    if (__JS_AtomIsTaggedInt(atom)) {
+        v = (__JS_AtomToUInt32(atom) << 1) | 1;
+    } else {
+        if (bc_atom_to_idx(s, &v, atom))
+            return -1;
+        v <<= 1;
+    }
+    bc_put_leb128(s, v);
+    return 0;
+}
+
+static void bc_byte_swap(uint8_t *bc_buf, int bc_len)
+{
+    int pos, len, op, fmt;
+
+    pos = 0;
+    while (pos < bc_len) {
+        op = bc_buf[pos];
+        len = short_opcode_info(op).size;
+        fmt = short_opcode_info(op).fmt;
+        switch(fmt) {
+        case OP_FMT_u16:
+        case OP_FMT_i16:
+        case OP_FMT_label16:
+        case OP_FMT_npop:
+        case OP_FMT_loc:
+        case OP_FMT_arg:
+        case OP_FMT_var_ref:
+            put_u16(bc_buf + pos + 1,
+                    bswap16(get_u16(bc_buf + pos + 1)));
+            break;
+        case OP_FMT_i32:
+        case OP_FMT_u32:
+        case OP_FMT_const:
+        case OP_FMT_label:
+        case OP_FMT_atom:
+        case OP_FMT_atom_u8:
+            put_u32(bc_buf + pos + 1,
+                    bswap32(get_u32(bc_buf + pos + 1)));
+            break;
+        case OP_FMT_atom_u16:
+        case OP_FMT_label_u16:
+            put_u32(bc_buf + pos + 1,
+                    bswap32(get_u32(bc_buf + pos + 1)));
+            put_u16(bc_buf + pos + 1 + 4,
+                    bswap16(get_u16(bc_buf + pos + 1 + 4)));
+            break;
+        case OP_FMT_atom_label_u8:
+        case OP_FMT_atom_label_u16:
+            put_u32(bc_buf + pos + 1,
+                    bswap32(get_u32(bc_buf + pos + 1)));
+            put_u32(bc_buf + pos + 1 + 4,
+                    bswap32(get_u32(bc_buf + pos + 1 + 4)));
+            if (fmt == OP_FMT_atom_label_u16) {
+                put_u16(bc_buf + pos + 1 + 4 + 4,
+                        bswap16(get_u16(bc_buf + pos + 1 + 4 + 4)));
+            }
+            break;
+        case OP_FMT_npop_u16:
+            put_u16(bc_buf + pos + 1,
+                    bswap16(get_u16(bc_buf + pos + 1)));
+            put_u16(bc_buf + pos + 1 + 2,
+                    bswap16(get_u16(bc_buf + pos + 1 + 2)));
+            break;
+        default:
+            break;
+        }
+        pos += len;
+    }
+}
+
+static int JS_WriteFunctionBytecode(BCWriterState *s,
+                                    const uint8_t *bc_buf1, int bc_len)
+{
+    int pos, len, op;
+    JSAtom atom;
+    uint8_t *bc_buf;
+    uint32_t val;
+
+    bc_buf = js_malloc(s->ctx, bc_len);
+    if (!bc_buf)
+        return -1;
+    memcpy(bc_buf, bc_buf1, bc_len);
+
+    pos = 0;
+    while (pos < bc_len) {
+        op = bc_buf[pos];
+        len = short_opcode_info(op).size;
+        switch(short_opcode_info(op).fmt) {
+        case OP_FMT_atom:
+        case OP_FMT_atom_u8:
+        case OP_FMT_atom_u16:
+        case OP_FMT_atom_label_u8:
+        case OP_FMT_atom_label_u16:
+            atom = get_u32(bc_buf + pos + 1);
+            if (bc_atom_to_idx(s, &val, atom))
+                goto fail;
+            put_u32(bc_buf + pos + 1, val);
+            break;
+        default:
+            break;
+        }
+        pos += len;
+    }
+
+    if (is_be())
+        bc_byte_swap(bc_buf, bc_len);
+
+    dbuf_put(&s->dbuf, bc_buf, bc_len);
+
+    js_free(s->ctx, bc_buf);
+    return 0;
+ fail:
+    js_free(s->ctx, bc_buf);
+    return -1;
+}
+
+static void JS_WriteString(BCWriterState *s, JSString *p)
+{
+    int i;
+    bc_put_leb128(s, ((uint32_t)p->len << 1) | p->is_wide_char);
+    if (p->is_wide_char) {
+        for(i = 0; i < p->len; i++)
+            bc_put_u16(s, p->u.str16[i]);
+    } else {
+        dbuf_put(&s->dbuf, p->u.str8, p->len);
+    }
+}
+
+static int JS_WriteBigNum(BCWriterState *s, JSValueConst obj)
+{
+    uint32_t tag, tag1;
+    int64_t e;
+    JSBigFloat *bf = JS_VALUE_GET_PTR(obj);
+    bf_t *a = &bf->num;
+    size_t len, i, n1, j;
+    limb_t v;
+
+    tag = JS_VALUE_GET_TAG(obj);
+    switch(tag) {
+    case JS_TAG_BIG_INT:
+        tag1 = BC_TAG_BIG_INT;
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        tag1 = BC_TAG_BIG_FLOAT;
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        tag1 = BC_TAG_BIG_DECIMAL;
+        break;
+#endif
+    default:
+        abort();
+    }
+    bc_put_u8(s, tag1);
+
+    /* sign + exponent */
+    if (a->expn == BF_EXP_ZERO)
+        e = 0;
+    else if (a->expn == BF_EXP_INF)
+        e = 1;
+    else if (a->expn == BF_EXP_NAN)
+        e = 2;
+    else if (a->expn >= 0)
+        e = a->expn + 3;
+    else
+        e = a->expn;
+    e = (e * 2) | a->sign;
+    if (e < INT32_MIN || e > INT32_MAX) {
+        JS_ThrowInternalError(s->ctx, "bignum exponent is too large");
+        return -1;
+    }
+    bc_put_sleb128(s, e);
+
+    /* mantissa */
+    if (a->len != 0) {
+        if (tag != JS_TAG_BIG_DECIMAL) {
+            i = 0;
+            while (i < a->len && a->tab[i] == 0)
+                i++;
+            assert(i < a->len);
+            v = a->tab[i];
+            n1 = sizeof(limb_t);
+            while ((v & 0xff) == 0) {
+                n1--;
+                v >>= 8;
+            }
+            i++;
+            len = (a->len - i) * sizeof(limb_t) + n1;
+            if (len > INT32_MAX) {
+                JS_ThrowInternalError(s->ctx, "bignum is too large");
+                return -1;
+            }
+            bc_put_leb128(s, len);
+            /* always saved in byte based little endian representation */
+            for(j = 0; j < n1; j++) {
+                bc_put_u8(s, v >> (j * 8));
+            }
+            for(; i < a->len; i++) {
+                limb_t v = a->tab[i];
+#if LIMB_BITS == 32
+                bc_put_u32(s, v);
+#else
+                bc_put_u64(s, v);
+#endif
+            }
+        } else {
+            int bpos, d;
+            uint8_t v8;
+            size_t i0;
+
+            /* little endian BCD */
+            i = 0;
+            while (i < a->len && a->tab[i] == 0)
+                i++;
+            assert(i < a->len);
+            len = a->len * LIMB_DIGITS;
+            v = a->tab[i];
+            j = 0;
+            while ((v % 10) == 0) {
+                j++;
+                v /= 10;
+            }
+            len -= j;
+            assert(len > 0);
+            if (len > INT32_MAX) {
+                JS_ThrowInternalError(s->ctx, "bignum is too large");
+                return -1;
+            }
+            bc_put_leb128(s, len);
+
+            bpos = 0;
+            v8 = 0;
+            i0 = i;
+            for(; i < a->len; i++) {
+                if (i != i0) {
+                    v = a->tab[i];
+                    j = 0;
+                }
+                for(; j < LIMB_DIGITS; j++) {
+                    d = v % 10;
+                    v /= 10;
+                    if (bpos == 0) {
+                        v8 = d;
+                        bpos = 1;
+                    } else {
+                        bc_put_u8(s, v8 | (d << 4));
+                        bpos = 0;
+                    }
+                }
+            }
+            /* flush the last digit */
+            if (bpos) {
+                bc_put_u8(s, v8);
+            }
+        }
+    }
+    return 0;
+}
+
+static int JS_WriteObjectRec(BCWriterState *s, JSValueConst obj);
+
+static int JS_WriteFunctionTag(BCWriterState *s, JSValueConst obj)
+{
+    JSFunctionBytecode *b = JS_VALUE_GET_PTR(obj);
+    uint32_t flags;
+    int idx, i;
+
+    bc_put_u8(s, BC_TAG_FUNCTION_BYTECODE);
+    flags = idx = 0;
+    bc_set_flags(&flags, &idx, b->has_prototype, 1);
+    bc_set_flags(&flags, &idx, b->has_simple_parameter_list, 1);
+    bc_set_flags(&flags, &idx, b->is_derived_class_constructor, 1);
+    bc_set_flags(&flags, &idx, b->need_home_object, 1);
+    bc_set_flags(&flags, &idx, b->func_kind, 2);
+    bc_set_flags(&flags, &idx, b->new_target_allowed, 1);
+    bc_set_flags(&flags, &idx, b->super_call_allowed, 1);
+    bc_set_flags(&flags, &idx, b->super_allowed, 1);
+    bc_set_flags(&flags, &idx, b->arguments_allowed, 1);
+    bc_set_flags(&flags, &idx, b->has_debug, 1);
+    bc_set_flags(&flags, &idx, b->backtrace_barrier, 1);
+    bc_set_flags(&flags, &idx, b->is_direct_or_indirect_eval, 1);
+    assert(idx <= 16);
+    bc_put_u16(s, flags);
+    bc_put_u8(s, b->js_mode);
+    bc_put_atom(s, b->func_name);
+
+    bc_put_leb128(s, b->arg_count);
+    bc_put_leb128(s, b->var_count);
+    bc_put_leb128(s, b->defined_arg_count);
+    bc_put_leb128(s, b->stack_size);
+    bc_put_leb128(s, b->closure_var_count);
+    bc_put_leb128(s, b->cpool_count);
+    bc_put_leb128(s, b->byte_code_len);
+    if (b->vardefs) {
+        /* XXX: this field is redundant */
+        bc_put_leb128(s, b->arg_count + b->var_count);
+        for(i = 0; i < b->arg_count + b->var_count; i++) {
+            JSVarDef *vd = &b->vardefs[i];
+            bc_put_atom(s, vd->var_name);
+            bc_put_leb128(s, vd->scope_level);
+            bc_put_leb128(s, vd->scope_next + 1);
+            flags = idx = 0;
+            bc_set_flags(&flags, &idx, vd->var_kind, 4);
+            bc_set_flags(&flags, &idx, vd->is_const, 1);
+            bc_set_flags(&flags, &idx, vd->is_lexical, 1);
+            bc_set_flags(&flags, &idx, vd->is_captured, 1);
+            assert(idx <= 8);
+            bc_put_u8(s, flags);
+        }
+    } else {
+        bc_put_leb128(s, 0);
+    }
+
+    for(i = 0; i < b->closure_var_count; i++) {
+        JSClosureVar *cv = &b->closure_var[i];
+        bc_put_atom(s, cv->var_name);
+        bc_put_leb128(s, cv->var_idx);
+        flags = idx = 0;
+        bc_set_flags(&flags, &idx, cv->is_local, 1);
+        bc_set_flags(&flags, &idx, cv->is_arg, 1);
+        bc_set_flags(&flags, &idx, cv->is_const, 1);
+        bc_set_flags(&flags, &idx, cv->is_lexical, 1);
+        bc_set_flags(&flags, &idx, cv->var_kind, 4);
+        assert(idx <= 8);
+        bc_put_u8(s, flags);
+    }
+
+    if (JS_WriteFunctionBytecode(s, b->byte_code_buf, b->byte_code_len))
+        goto fail;
+
+    if (b->has_debug) {
+        bc_put_atom(s, b->debug.filename);
+        bc_put_leb128(s, b->debug.line_num);
+        bc_put_leb128(s, b->debug.pc2line_len);
+        dbuf_put(&s->dbuf, b->debug.pc2line_buf, b->debug.pc2line_len);
+    }
+
+    for(i = 0; i < b->cpool_count; i++) {
+        if (JS_WriteObjectRec(s, b->cpool[i]))
+            goto fail;
+    }
+    return 0;
+ fail:
+    return -1;
+}
+
+static int JS_WriteModule(BCWriterState *s, JSValueConst obj)
+{
+    JSModuleDef *m = JS_VALUE_GET_PTR(obj);
+    int i;
+
+    bc_put_u8(s, BC_TAG_MODULE);
+    bc_put_atom(s, m->module_name);
+
+    bc_put_leb128(s, m->req_module_entries_count);
+    for(i = 0; i < m->req_module_entries_count; i++) {
+        JSReqModuleEntry *rme = &m->req_module_entries[i];
+        bc_put_atom(s, rme->module_name);
+    }
+
+    bc_put_leb128(s, m->export_entries_count);
+    for(i = 0; i < m->export_entries_count; i++) {
+        JSExportEntry *me = &m->export_entries[i];
+        bc_put_u8(s, me->export_type);
+        if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
+            bc_put_leb128(s, me->u.local.var_idx);
+        } else {
+            bc_put_leb128(s, me->u.req_module_idx);
+            bc_put_atom(s, me->local_name);
+        }
+        bc_put_atom(s, me->export_name);
+    }
+
+    bc_put_leb128(s, m->star_export_entries_count);
+    for(i = 0; i < m->star_export_entries_count; i++) {
+        JSStarExportEntry *se = &m->star_export_entries[i];
+        bc_put_leb128(s, se->req_module_idx);
+    }
+
+    bc_put_leb128(s, m->import_entries_count);
+    for(i = 0; i < m->import_entries_count; i++) {
+        JSImportEntry *mi = &m->import_entries[i];
+        bc_put_leb128(s, mi->var_idx);
+        bc_put_atom(s, mi->import_name);
+        bc_put_leb128(s, mi->req_module_idx);
+    }
+
+    bc_put_u8(s, m->has_tla);
+
+    if (JS_WriteObjectRec(s, m->func_obj))
+        goto fail;
+    return 0;
+ fail:
+    return -1;
+}
+
+static int JS_WriteArray(BCWriterState *s, JSValueConst obj)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(obj);
+    uint32_t i, len;
+    JSValue val;
+    int ret;
+    BOOL is_template;
+
+    if (s->allow_bytecode && !p->extensible) {
+        /* not extensible array: we consider it is a
+           template when we are saving bytecode */
+        bc_put_u8(s, BC_TAG_TEMPLATE_OBJECT);
+        is_template = TRUE;
+    } else {
+        bc_put_u8(s, BC_TAG_ARRAY);
+        is_template = FALSE;
+    }
+    if (js_get_length32(s->ctx, &len, obj))
+        goto fail1;
+    bc_put_leb128(s, len);
+    for(i = 0; i < len; i++) {
+        val = JS_GetPropertyUint32(s->ctx, obj, i);
+        if (JS_IsException(val))
+            goto fail1;
+        ret = JS_WriteObjectRec(s, val);
+        JS_FreeValue(s->ctx, val);
+        if (ret)
+            goto fail1;
+    }
+    if (is_template) {
+        val = JS_GetProperty(s->ctx, obj, JS_ATOM_raw);
+        if (JS_IsException(val))
+            goto fail1;
+        ret = JS_WriteObjectRec(s, val);
+        JS_FreeValue(s->ctx, val);
+        if (ret)
+            goto fail1;
+    }
+    return 0;
+ fail1:
+    return -1;
+}
+
+static int JS_WriteObjectTag(BCWriterState *s, JSValueConst obj)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(obj);
+    uint32_t i, prop_count;
+    JSShape *sh;
+    JSShapeProperty *pr;
+    int pass;
+    JSAtom atom;
+
+    bc_put_u8(s, BC_TAG_OBJECT);
+    prop_count = 0;
+    sh = p->shape;
+    for(pass = 0; pass < 2; pass++) {
+        if (pass == 1)
+            bc_put_leb128(s, prop_count);
+        for(i = 0, pr = get_shape_prop(sh); i < sh->prop_count; i++, pr++) {
+            atom = pr->atom;
+            if (atom != JS_ATOM_NULL &&
+                JS_AtomIsString(s->ctx, atom) &&
+                (pr->flags & JS_PROP_ENUMERABLE)) {
+                if (pr->flags & JS_PROP_TMASK) {
+                    JS_ThrowTypeError(s->ctx, "only value properties are supported");
+                    goto fail;
+                }
+                if (pass == 0) {
+                    prop_count++;
+                } else {
+                    bc_put_atom(s, atom);
+                    if (JS_WriteObjectRec(s, p->prop[i].u.value))
+                        goto fail;
+                }
+            }
+        }
+    }
+    return 0;
+ fail:
+    return -1;
+}
+
+static int JS_WriteTypedArray(BCWriterState *s, JSValueConst obj)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(obj);
+    JSTypedArray *ta = p->u.typed_array;
+
+    bc_put_u8(s, BC_TAG_TYPED_ARRAY);
+    bc_put_u8(s, p->class_id - JS_CLASS_UINT8C_ARRAY);
+    bc_put_leb128(s, p->u.array.count);
+    bc_put_leb128(s, ta->offset);
+    if (JS_WriteObjectRec(s, JS_MKPTR(JS_TAG_OBJECT, ta->buffer)))
+        return -1;
+    return 0;
+}
+
+static int JS_WriteArrayBuffer(BCWriterState *s, JSValueConst obj)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(obj);
+    JSArrayBuffer *abuf = p->u.array_buffer;
+    if (abuf->detached) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(s->ctx);
+        return -1;
+    }
+    bc_put_u8(s, BC_TAG_ARRAY_BUFFER);
+    bc_put_leb128(s, abuf->byte_length);
+    dbuf_put(&s->dbuf, abuf->data, abuf->byte_length);
+    return 0;
+}
+
+static int JS_WriteSharedArrayBuffer(BCWriterState *s, JSValueConst obj)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(obj);
+    JSArrayBuffer *abuf = p->u.array_buffer;
+    assert(!abuf->detached); /* SharedArrayBuffer are never detached */
+    bc_put_u8(s, BC_TAG_SHARED_ARRAY_BUFFER);
+    bc_put_leb128(s, abuf->byte_length);
+    bc_put_u64(s, (uintptr_t)abuf->data);
+    if (js_resize_array(s->ctx, (void **)&s->sab_tab, sizeof(s->sab_tab[0]),
+                        &s->sab_tab_size, s->sab_tab_len + 1))
+        return -1;
+    /* keep the SAB pointer so that the user can clone it or free it */
+    s->sab_tab[s->sab_tab_len++] = abuf->data;
+    return 0;
+}
+
+static int JS_WriteObjectRec(BCWriterState *s, JSValueConst obj)
+{
+    uint32_t tag;
+
+    if (js_check_stack_overflow(s->ctx->rt, 0)) {
+        JS_ThrowStackOverflow(s->ctx);
+        return -1;
+    }
+
+    tag = JS_VALUE_GET_NORM_TAG(obj);
+    switch(tag) {
+    case JS_TAG_NULL:
+        bc_put_u8(s, BC_TAG_NULL);
+        break;
+    case JS_TAG_UNDEFINED:
+        bc_put_u8(s, BC_TAG_UNDEFINED);
+        break;
+    case JS_TAG_BOOL:
+        bc_put_u8(s, BC_TAG_BOOL_FALSE + JS_VALUE_GET_INT(obj));
+        break;
+    case JS_TAG_INT:
+        bc_put_u8(s, BC_TAG_INT32);
+        bc_put_sleb128(s, JS_VALUE_GET_INT(obj));
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            JSFloat64Union u;
+            bc_put_u8(s, BC_TAG_FLOAT64);
+            u.d = JS_VALUE_GET_FLOAT64(obj);
+            bc_put_u64(s, u.u64);
+        }
+        break;
+    case JS_TAG_STRING:
+        {
+            JSString *p = JS_VALUE_GET_STRING(obj);
+            bc_put_u8(s, BC_TAG_STRING);
+            JS_WriteString(s, p);
+        }
+        break;
+    case JS_TAG_FUNCTION_BYTECODE:
+        if (!s->allow_bytecode)
+            goto invalid_tag;
+        if (JS_WriteFunctionTag(s, obj))
+            goto fail;
+        break;
+    case JS_TAG_MODULE:
+        if (!s->allow_bytecode)
+            goto invalid_tag;
+        if (JS_WriteModule(s, obj))
+            goto fail;
+        break;
+    case JS_TAG_OBJECT:
+        {
+            JSObject *p = JS_VALUE_GET_OBJ(obj);
+            int ret, idx;
+
+            if (s->allow_reference) {
+                idx = js_object_list_find(s->ctx, &s->object_list, p);
+                if (idx >= 0) {
+                    bc_put_u8(s, BC_TAG_OBJECT_REFERENCE);
+                    bc_put_leb128(s, idx);
+                    break;
+                } else {
+                    if (js_object_list_add(s->ctx, &s->object_list, p))
+                        goto fail;
+                }
+            } else {
+                if (p->tmp_mark) {
+                    JS_ThrowTypeError(s->ctx, "circular reference");
+                    goto fail;
+                }
+                p->tmp_mark = 1;
+            }
+            switch(p->class_id) {
+            case JS_CLASS_ARRAY:
+                ret = JS_WriteArray(s, obj);
+                break;
+            case JS_CLASS_OBJECT:
+                ret = JS_WriteObjectTag(s, obj);
+                break;
+            case JS_CLASS_ARRAY_BUFFER:
+                ret = JS_WriteArrayBuffer(s, obj);
+                break;
+            case JS_CLASS_SHARED_ARRAY_BUFFER:
+                if (!s->allow_sab)
+                    goto invalid_tag;
+                ret = JS_WriteSharedArrayBuffer(s, obj);
+                break;
+            case JS_CLASS_DATE:
+                bc_put_u8(s, BC_TAG_DATE);
+                ret = JS_WriteObjectRec(s, p->u.object_data);
+                break;
+            case JS_CLASS_NUMBER:
+            case JS_CLASS_STRING:
+            case JS_CLASS_BOOLEAN:
+            case JS_CLASS_BIG_INT:
+#ifdef CONFIG_BIGNUM
+            case JS_CLASS_BIG_FLOAT:
+            case JS_CLASS_BIG_DECIMAL:
+#endif
+                bc_put_u8(s, BC_TAG_OBJECT_VALUE);
+                ret = JS_WriteObjectRec(s, p->u.object_data);
+                break;
+            default:
+                if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                    p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+                    ret = JS_WriteTypedArray(s, obj);
+                } else {
+                    JS_ThrowTypeError(s->ctx, "unsupported object class");
+                    ret = -1;
+                }
+                break;
+            }
+            p->tmp_mark = 0;
+            if (ret)
+                goto fail;
+        }
+        break;
+    case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+    case JS_TAG_BIG_DECIMAL:
+#endif
+        if (JS_WriteBigNum(s, obj))
+            goto fail;
+        break;
+    default:
+    invalid_tag:
+        JS_ThrowInternalError(s->ctx, "unsupported tag (%d)", tag);
+        goto fail;
+    }
+    return 0;
+
+ fail:
+    return -1;
+}
+
+/* create the atom table */
+static int JS_WriteObjectAtoms(BCWriterState *s)
+{
+    JSRuntime *rt = s->ctx->rt;
+    DynBuf dbuf1;
+    int i, atoms_size;
+
+    dbuf1 = s->dbuf;
+    js_dbuf_init(s->ctx, &s->dbuf);
+    bc_put_u8(s, BC_VERSION);
+
+    bc_put_leb128(s, s->idx_to_atom_count);
+    for(i = 0; i < s->idx_to_atom_count; i++) {
+        JSAtomStruct *p = rt->atom_array[s->idx_to_atom[i]];
+        JS_WriteString(s, p);
+    }
+    /* XXX: should check for OOM in above phase */
+
+    /* move the atoms at the start */
+    /* XXX: could just append dbuf1 data, but it uses more memory if
+       dbuf1 is larger than dbuf */
+    atoms_size = s->dbuf.size;
+    if (dbuf_realloc(&dbuf1, dbuf1.size + atoms_size))
+        goto fail;
+    memmove(dbuf1.buf + atoms_size, dbuf1.buf, dbuf1.size);
+    memcpy(dbuf1.buf, s->dbuf.buf, atoms_size);
+    dbuf1.size += atoms_size;
+    dbuf_free(&s->dbuf);
+    s->dbuf = dbuf1;
+    return 0;
+ fail:
+    dbuf_free(&dbuf1);
+    return -1;
+}
+
+uint8_t *JS_WriteObject2(JSContext *ctx, size_t *psize, JSValueConst obj,
+                         int flags, uint8_t ***psab_tab, size_t *psab_tab_len)
+{
+    BCWriterState ss, *s = &ss;
+
+    memset(s, 0, sizeof(*s));
+    s->ctx = ctx;
+    s->allow_bytecode = ((flags & JS_WRITE_OBJ_BYTECODE) != 0);
+    s->allow_sab = ((flags & JS_WRITE_OBJ_SAB) != 0);
+    s->allow_reference = ((flags & JS_WRITE_OBJ_REFERENCE) != 0);
+    /* XXX: could use a different version when bytecode is included */
+    if (s->allow_bytecode)
+        s->first_atom = JS_ATOM_END;
+    else
+        s->first_atom = 1;
+    js_dbuf_init(ctx, &s->dbuf);
+    js_object_list_init(&s->object_list);
+
+    if (JS_WriteObjectRec(s, obj))
+        goto fail;
+    if (JS_WriteObjectAtoms(s))
+        goto fail;
+    js_object_list_end(ctx, &s->object_list);
+    js_free(ctx, s->atom_to_idx);
+    js_free(ctx, s->idx_to_atom);
+    *psize = s->dbuf.size;
+    if (psab_tab)
+        *psab_tab = s->sab_tab;
+    if (psab_tab_len)
+        *psab_tab_len = s->sab_tab_len;
+    return s->dbuf.buf;
+ fail:
+    js_object_list_end(ctx, &s->object_list);
+    js_free(ctx, s->atom_to_idx);
+    js_free(ctx, s->idx_to_atom);
+    dbuf_free(&s->dbuf);
+    *psize = 0;
+    if (psab_tab)
+        *psab_tab = NULL;
+    if (psab_tab_len)
+        *psab_tab_len = 0;
+    return NULL;
+}
+
+uint8_t *JS_WriteObject(JSContext *ctx, size_t *psize, JSValueConst obj,
+                        int flags)
+{
+    return JS_WriteObject2(ctx, psize, obj, flags, NULL, NULL);
+}
+
+typedef struct BCReaderState {
+    JSContext *ctx;
+    const uint8_t *buf_start, *ptr, *buf_end;
+    uint32_t first_atom;
+    uint32_t idx_to_atom_count;
+    JSAtom *idx_to_atom;
+    int error_state;
+    BOOL allow_sab : 8;
+    BOOL allow_bytecode : 8;
+    BOOL is_rom_data : 8;
+    BOOL allow_reference : 8;
+    /* object references */
+    JSObject **objects;
+    int objects_count;
+    int objects_size;
+
+#ifdef DUMP_READ_OBJECT
+    const uint8_t *ptr_last;
+    int level;
+#endif
+} BCReaderState;
+
+#ifdef DUMP_READ_OBJECT
+static void FORMAT_ATTR(2, 3) bc_read_trace(BCReaderState *s, const char *fmt, ...) {
+    va_list ap;
+    int i, n, n0;
+
+    if (!s->ptr_last)
+        s->ptr_last = s->buf_start;
+
+    n = n0 = 0;
+    if (s->ptr > s->ptr_last || s->ptr == s->buf_start) {
+        n0 = printf("%04x: ", (int)(s->ptr_last - s->buf_start));
+        n += n0;
+    }
+    for (i = 0; s->ptr_last < s->ptr; i++) {
+        if ((i & 7) == 0 && i > 0) {
+            printf("\n%*s", n0, "");
+            n = n0;
+        }
+        n += printf(" %02x", *s->ptr_last++);
+    }
+    if (*fmt == '}')
+        s->level--;
+    if (n < 32 + s->level * 2) {
+        printf("%*s", 32 + s->level * 2 - n, "");
+    }
+    va_start(ap, fmt);
+    vfprintf(stdout, fmt, ap);
+    va_end(ap);
+    if (strchr(fmt, '{'))
+        s->level++;
+}
+#else
+#define bc_read_trace(...)
+#endif
+
+static int bc_read_error_end(BCReaderState *s)
+{
+    if (!s->error_state) {
+        JS_ThrowSyntaxError(s->ctx, "read after the end of the buffer");
+    }
+    return s->error_state = -1;
+}
+
+static int bc_get_u8(BCReaderState *s, uint8_t *pval)
+{
+    if (unlikely(s->buf_end - s->ptr < 1)) {
+        *pval = 0; /* avoid warning */
+        return bc_read_error_end(s);
+    }
+    *pval = *s->ptr++;
+    return 0;
+}
+
+static int bc_get_u16(BCReaderState *s, uint16_t *pval)
+{
+    uint16_t v;
+    if (unlikely(s->buf_end - s->ptr < 2)) {
+        *pval = 0; /* avoid warning */
+        return bc_read_error_end(s);
+    }
+    v = get_u16(s->ptr);
+    if (is_be())
+        v = bswap16(v);
+    *pval = v;
+    s->ptr += 2;
+    return 0;
+}
+
+static __maybe_unused int bc_get_u32(BCReaderState *s, uint32_t *pval)
+{
+    uint32_t v;
+    if (unlikely(s->buf_end - s->ptr < 4)) {
+        *pval = 0; /* avoid warning */
+        return bc_read_error_end(s);
+    }
+    v = get_u32(s->ptr);
+    if (is_be())
+        v = bswap32(v);
+    *pval = v;
+    s->ptr += 4;
+    return 0;
+}
+
+static int bc_get_u64(BCReaderState *s, uint64_t *pval)
+{
+    uint64_t v;
+    if (unlikely(s->buf_end - s->ptr < 8)) {
+        *pval = 0; /* avoid warning */
+        return bc_read_error_end(s);
+    }
+    v = get_u64(s->ptr);
+    if (is_be())
+        v = bswap64(v);
+    *pval = v;
+    s->ptr += 8;
+    return 0;
+}
+
+static int bc_get_leb128(BCReaderState *s, uint32_t *pval)
+{
+    int ret;
+    ret = get_leb128(pval, s->ptr, s->buf_end);
+    if (unlikely(ret < 0))
+        return bc_read_error_end(s);
+    s->ptr += ret;
+    return 0;
+}
+
+static int bc_get_sleb128(BCReaderState *s, int32_t *pval)
+{
+    int ret;
+    ret = get_sleb128(pval, s->ptr, s->buf_end);
+    if (unlikely(ret < 0))
+        return bc_read_error_end(s);
+    s->ptr += ret;
+    return 0;
+}
+
+/* XXX: used to read an `int` with a positive value */
+static int bc_get_leb128_int(BCReaderState *s, int *pval)
+{
+    return bc_get_leb128(s, (uint32_t *)pval);
+}
+
+static int bc_get_leb128_u16(BCReaderState *s, uint16_t *pval)
+{
+    uint32_t val;
+    if (bc_get_leb128(s, &val)) {
+        *pval = 0;
+        return -1;
+    }
+    *pval = val;
+    return 0;
+}
+
+static int bc_get_buf(BCReaderState *s, uint8_t *buf, uint32_t buf_len)
+{
+    if (buf_len != 0) {
+        if (unlikely(!buf || s->buf_end - s->ptr < buf_len))
+            return bc_read_error_end(s);
+        memcpy(buf, s->ptr, buf_len);
+        s->ptr += buf_len;
+    }
+    return 0;
+}
+
+static int bc_idx_to_atom(BCReaderState *s, JSAtom *patom, uint32_t idx)
+{
+    JSAtom atom;
+
+    if (__JS_AtomIsTaggedInt(idx)) {
+        atom = idx;
+    } else if (idx < s->first_atom) {
+        atom = JS_DupAtom(s->ctx, idx);
+    } else {
+        idx -= s->first_atom;
+        if (idx >= s->idx_to_atom_count) {
+            JS_ThrowSyntaxError(s->ctx, "invalid atom index (pos=%u)",
+                                (unsigned int)(s->ptr - s->buf_start));
+            *patom = JS_ATOM_NULL;
+            return s->error_state = -1;
+        }
+        atom = JS_DupAtom(s->ctx, s->idx_to_atom[idx]);
+    }
+    *patom = atom;
+    return 0;
+}
+
+static int bc_get_atom(BCReaderState *s, JSAtom *patom)
+{
+    uint32_t v;
+    if (bc_get_leb128(s, &v))
+        return -1;
+    if (v & 1) {
+        *patom = __JS_AtomFromUInt32(v >> 1);
+        return 0;
+    } else {
+        return bc_idx_to_atom(s, patom, v >> 1);
+    }
+}
+
+static JSString *JS_ReadString(BCReaderState *s)
+{
+    uint32_t len;
+    size_t size;
+    BOOL is_wide_char;
+    JSString *p;
+
+    if (bc_get_leb128(s, &len))
+        return NULL;
+    is_wide_char = len & 1;
+    len >>= 1;
+    p = js_alloc_string(s->ctx, len, is_wide_char);
+    if (!p) {
+        s->error_state = -1;
+        return NULL;
+    }
+    size = (size_t)len << is_wide_char;
+    if ((s->buf_end - s->ptr) < size) {
+        bc_read_error_end(s);
+        js_free_string(s->ctx->rt, p);
+        return NULL;
+    }
+    memcpy(p->u.str8, s->ptr, size);
+    s->ptr += size;
+    if (is_wide_char) {
+        if (is_be()) {
+            uint32_t i;
+            for (i = 0; i < len; i++)
+                p->u.str16[i] = bswap16(p->u.str16[i]);
+        }
+    } else {
+        p->u.str8[size] = '\0'; /* add the trailing zero for 8 bit strings */
+    }
+#ifdef DUMP_READ_OBJECT
+    JS_DumpString(s->ctx->rt, p); printf("\n");
+#endif
+    return p;
+}
+
+static uint32_t bc_get_flags(uint32_t flags, int *pidx, int n)
+{
+    uint32_t val;
+    /* XXX: this does not work for n == 32 */
+    val = (flags >> *pidx) & ((1U << n) - 1);
+    *pidx += n;
+    return val;
+}
+
+static int JS_ReadFunctionBytecode(BCReaderState *s, JSFunctionBytecode *b,
+                                   int byte_code_offset, uint32_t bc_len)
+{
+    uint8_t *bc_buf;
+    int pos, len, op;
+    JSAtom atom;
+    uint32_t idx;
+
+    if (s->is_rom_data) {
+        /* directly use the input buffer */
+        if (unlikely(s->buf_end - s->ptr < bc_len))
+            return bc_read_error_end(s);
+        bc_buf = (uint8_t *)s->ptr;
+        s->ptr += bc_len;
+    } else {
+        bc_buf = (void *)((uint8_t*)b + byte_code_offset);
+        if (bc_get_buf(s, bc_buf, bc_len))
+            return -1;
+    }
+    b->byte_code_buf = bc_buf;
+
+    if (is_be())
+        bc_byte_swap(bc_buf, bc_len);
+
+    pos = 0;
+    while (pos < bc_len) {
+        op = bc_buf[pos];
+        len = short_opcode_info(op).size;
+        switch(short_opcode_info(op).fmt) {
+        case OP_FMT_atom:
+        case OP_FMT_atom_u8:
+        case OP_FMT_atom_u16:
+        case OP_FMT_atom_label_u8:
+        case OP_FMT_atom_label_u16:
+            idx = get_u32(bc_buf + pos + 1);
+            if (s->is_rom_data) {
+                /* just increment the reference count of the atom */
+                JS_DupAtom(s->ctx, (JSAtom)idx);
+            } else {
+                if (bc_idx_to_atom(s, &atom, idx)) {
+                    /* Note: the atoms will be freed up to this position */
+                    b->byte_code_len = pos;
+                    return -1;
+                }
+                put_u32(bc_buf + pos + 1, atom);
+#ifdef DUMP_READ_OBJECT
+                bc_read_trace(s, "at %d, fixup atom: ", pos + 1); print_atom(s->ctx, atom); printf("\n");
+#endif
+            }
+            break;
+        default:
+            break;
+        }
+        pos += len;
+    }
+    return 0;
+}
+
+static JSValue JS_ReadBigNum(BCReaderState *s, int tag)
+{
+    JSValue obj = JS_UNDEFINED;
+    uint8_t v8;
+    int32_t e;
+    uint32_t len;
+    limb_t l, i, n;
+    JSBigFloat *p;
+    limb_t v;
+    bf_t *a;
+
+    p = js_new_bf(s->ctx);
+    if (!p)
+        goto fail;
+    switch(tag) {
+    case BC_TAG_BIG_INT:
+        obj = JS_MKPTR(JS_TAG_BIG_INT, p);
+        break;
+#ifdef CONFIG_BIGNUM
+    case BC_TAG_BIG_FLOAT:
+        obj = JS_MKPTR(JS_TAG_BIG_FLOAT, p);
+        break;
+    case BC_TAG_BIG_DECIMAL:
+        obj = JS_MKPTR(JS_TAG_BIG_DECIMAL, p);
+        break;
+#endif
+    default:
+        abort();
+    }
+
+    /* sign + exponent */
+    if (bc_get_sleb128(s, &e))
+        goto fail;
+
+    a = &p->num;
+    a->sign = e & 1;
+    e >>= 1;
+    if (e == 0)
+        a->expn = BF_EXP_ZERO;
+    else if (e == 1)
+        a->expn = BF_EXP_INF;
+    else if (e == 2)
+        a->expn = BF_EXP_NAN;
+    else if (e >= 3)
+        a->expn = e - 3;
+    else
+        a->expn = e;
+
+    /* mantissa */
+    if (a->expn != BF_EXP_ZERO &&
+        a->expn != BF_EXP_INF &&
+        a->expn != BF_EXP_NAN) {
+        if (bc_get_leb128(s, &len))
+            goto fail;
+        bc_read_trace(s, "len=%" PRId64 "\n", (int64_t)len);
+        if (len == 0) {
+            JS_ThrowInternalError(s->ctx, "invalid bignum length");
+            goto fail;
+        }
+#ifdef CONFIG_BIGNUM
+        if (tag == BC_TAG_BIG_DECIMAL) {
+            l = (len + LIMB_DIGITS - 1) / LIMB_DIGITS;
+        } else
+#endif
+        {
+            l = (len + sizeof(limb_t) - 1) / sizeof(limb_t);
+        }
+        if (bf_resize(a, l)) {
+            JS_ThrowOutOfMemory(s->ctx);
+            goto fail;
+        }
+#ifdef CONFIG_BIGNUM
+        if (tag == BC_TAG_BIG_DECIMAL) {
+            limb_t j;
+            int bpos, d;
+
+            bpos = 0;
+            for(i = 0; i < l; i++) {
+                if (i == 0 && (n = len % LIMB_DIGITS) != 0) {
+                    j = LIMB_DIGITS - n;
+                } else {
+                    j = 0;
+                }
+                v = 0;
+                for(; j < LIMB_DIGITS; j++) {
+                    if (bpos == 0) {
+                        if (bc_get_u8(s, &v8))
+                            goto fail;
+                        d = v8 & 0xf;
+                        bpos = 1;
+                    } else {
+                        d = v8 >> 4;
+                        bpos = 0;
+                    }
+                    if (d >= 10) {
+                        JS_ThrowInternalError(s->ctx, "invalid digit");
+                        goto fail;
+                    }
+                    v += mp_pow_dec[j] * d;
+                }
+                a->tab[i] = v;
+            }
+        } else
+#endif  /* CONFIG_BIGNUM */
+        {
+            n = len & (sizeof(limb_t) - 1);
+            if (n != 0) {
+                v = 0;
+                for(i = 0; i < n; i++) {
+                    if (bc_get_u8(s, &v8))
+                        goto fail;
+                    v |= (limb_t)v8 << ((sizeof(limb_t) - n + i) * 8);
+                }
+                a->tab[0] = v;
+                i = 1;
+            } else {
+                i = 0;
+            }
+            for(; i < l; i++) {
+#if LIMB_BITS == 32
+                if (bc_get_u32(s, &v))
+                    goto fail;
+#else
+                if (bc_get_u64(s, &v))
+                    goto fail;
+#endif
+                a->tab[i] = v;
+            }
+        }
+    }
+    bc_read_trace(s, "}\n");
+    return obj;
+ fail:
+    JS_FreeValue(s->ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadObjectRec(BCReaderState *s);
+
+static int BC_add_object_ref1(BCReaderState *s, JSObject *p)
+{
+    if (s->allow_reference) {
+        if (js_resize_array(s->ctx, (void *)&s->objects,
+                            sizeof(s->objects[0]),
+                            &s->objects_size, s->objects_count + 1))
+            return -1;
+        s->objects[s->objects_count++] = p;
+    }
+    return 0;
+}
+
+static int BC_add_object_ref(BCReaderState *s, JSValueConst obj)
+{
+    return BC_add_object_ref1(s, JS_VALUE_GET_OBJ(obj));
+}
+
+static JSValue JS_ReadFunctionTag(BCReaderState *s)
+{
+    JSContext *ctx = s->ctx;
+    JSFunctionBytecode bc, *b;
+    JSValue obj = JS_UNDEFINED;
+    uint16_t v16;
+    uint8_t v8;
+    int idx, i, local_count;
+    int function_size, cpool_offset, byte_code_offset;
+    int closure_var_offset, vardefs_offset;
+
+    memset(&bc, 0, sizeof(bc));
+    bc.header.ref_count = 1;
+    //bc.gc_header.mark = 0;
+
+    if (bc_get_u16(s, &v16))
+        goto fail;
+    idx = 0;
+    bc.has_prototype = bc_get_flags(v16, &idx, 1);
+    bc.has_simple_parameter_list = bc_get_flags(v16, &idx, 1);
+    bc.is_derived_class_constructor = bc_get_flags(v16, &idx, 1);
+    bc.need_home_object = bc_get_flags(v16, &idx, 1);
+    bc.func_kind = bc_get_flags(v16, &idx, 2);
+    bc.new_target_allowed = bc_get_flags(v16, &idx, 1);
+    bc.super_call_allowed = bc_get_flags(v16, &idx, 1);
+    bc.super_allowed = bc_get_flags(v16, &idx, 1);
+    bc.arguments_allowed = bc_get_flags(v16, &idx, 1);
+    bc.has_debug = bc_get_flags(v16, &idx, 1);
+    bc.backtrace_barrier = bc_get_flags(v16, &idx, 1);
+    bc.is_direct_or_indirect_eval = bc_get_flags(v16, &idx, 1);
+    bc.read_only_bytecode = s->is_rom_data;
+    if (bc_get_u8(s, &v8))
+        goto fail;
+    bc.js_mode = v8;
+    if (bc_get_atom(s, &bc.func_name))  //@ atom leak if failure
+        goto fail;
+    if (bc_get_leb128_u16(s, &bc.arg_count))
+        goto fail;
+    if (bc_get_leb128_u16(s, &bc.var_count))
+        goto fail;
+    if (bc_get_leb128_u16(s, &bc.defined_arg_count))
+        goto fail;
+    if (bc_get_leb128_u16(s, &bc.stack_size))
+        goto fail;
+    if (bc_get_leb128_int(s, &bc.closure_var_count))
+        goto fail;
+    if (bc_get_leb128_int(s, &bc.cpool_count))
+        goto fail;
+    if (bc_get_leb128_int(s, &bc.byte_code_len))
+        goto fail;
+    if (bc_get_leb128_int(s, &local_count))
+        goto fail;
+
+    if (bc.has_debug) {
+        function_size = sizeof(*b);
+    } else {
+        function_size = offsetof(JSFunctionBytecode, debug);
+    }
+    cpool_offset = function_size;
+    function_size += bc.cpool_count * sizeof(*bc.cpool);
+    vardefs_offset = function_size;
+    function_size += local_count * sizeof(*bc.vardefs);
+    closure_var_offset = function_size;
+    function_size += bc.closure_var_count * sizeof(*bc.closure_var);
+    byte_code_offset = function_size;
+    if (!bc.read_only_bytecode) {
+        function_size += bc.byte_code_len;
+    }
+
+    b = js_mallocz(ctx, function_size);
+    if (!b)
+        return JS_EXCEPTION;
+
+    memcpy(b, &bc, offsetof(JSFunctionBytecode, debug));
+    b->header.ref_count = 1;
+    if (local_count != 0) {
+        b->vardefs = (void *)((uint8_t*)b + vardefs_offset);
+    }
+    if (b->closure_var_count != 0) {
+        b->closure_var = (void *)((uint8_t*)b + closure_var_offset);
+    }
+    if (b->cpool_count != 0) {
+        b->cpool = (void *)((uint8_t*)b + cpool_offset);
+    }
+
+    add_gc_object(ctx->rt, &b->header, JS_GC_OBJ_TYPE_FUNCTION_BYTECODE);
+
+    obj = JS_MKPTR(JS_TAG_FUNCTION_BYTECODE, b);
+
+#ifdef DUMP_READ_OBJECT
+    bc_read_trace(s, "name: "); print_atom(s->ctx, b->func_name); printf("\n");
+#endif
+    bc_read_trace(s, "args=%d vars=%d defargs=%d closures=%d cpool=%d\n",
+                  b->arg_count, b->var_count, b->defined_arg_count,
+                  b->closure_var_count, b->cpool_count);
+    bc_read_trace(s, "stack=%d bclen=%d locals=%d\n",
+                  b->stack_size, b->byte_code_len, local_count);
+
+    if (local_count != 0) {
+        bc_read_trace(s, "vars {\n");
+        for(i = 0; i < local_count; i++) {
+            JSVarDef *vd = &b->vardefs[i];
+            if (bc_get_atom(s, &vd->var_name))
+                goto fail;
+            if (bc_get_leb128_int(s, &vd->scope_level))
+                goto fail;
+            if (bc_get_leb128_int(s, &vd->scope_next))
+                goto fail;
+            vd->scope_next--;
+            if (bc_get_u8(s, &v8))
+                goto fail;
+            idx = 0;
+            vd->var_kind = bc_get_flags(v8, &idx, 4);
+            vd->is_const = bc_get_flags(v8, &idx, 1);
+            vd->is_lexical = bc_get_flags(v8, &idx, 1);
+            vd->is_captured = bc_get_flags(v8, &idx, 1);
+#ifdef DUMP_READ_OBJECT
+            bc_read_trace(s, "name: "); print_atom(s->ctx, vd->var_name); printf("\n");
+#endif
+        }
+        bc_read_trace(s, "}\n");
+    }
+    if (b->closure_var_count != 0) {
+        bc_read_trace(s, "closure vars {\n");
+        for(i = 0; i < b->closure_var_count; i++) {
+            JSClosureVar *cv = &b->closure_var[i];
+            int var_idx;
+            if (bc_get_atom(s, &cv->var_name))
+                goto fail;
+            if (bc_get_leb128_int(s, &var_idx))
+                goto fail;
+            cv->var_idx = var_idx;
+            if (bc_get_u8(s, &v8))
+                goto fail;
+            idx = 0;
+            cv->is_local = bc_get_flags(v8, &idx, 1);
+            cv->is_arg = bc_get_flags(v8, &idx, 1);
+            cv->is_const = bc_get_flags(v8, &idx, 1);
+            cv->is_lexical = bc_get_flags(v8, &idx, 1);
+            cv->var_kind = bc_get_flags(v8, &idx, 4);
+#ifdef DUMP_READ_OBJECT
+            bc_read_trace(s, "name: "); print_atom(s->ctx, cv->var_name); printf("\n");
+#endif
+        }
+        bc_read_trace(s, "}\n");
+    }
+    {
+        bc_read_trace(s, "bytecode {\n");
+        if (JS_ReadFunctionBytecode(s, b, byte_code_offset, b->byte_code_len))
+            goto fail;
+        bc_read_trace(s, "}\n");
+    }
+    if (b->has_debug) {
+        /* read optional debug information */
+        bc_read_trace(s, "debug {\n");
+        if (bc_get_atom(s, &b->debug.filename))
+            goto fail;
+        if (bc_get_leb128_int(s, &b->debug.line_num))
+            goto fail;
+        if (bc_get_leb128_int(s, &b->debug.pc2line_len))
+            goto fail;
+        if (b->debug.pc2line_len) {
+            b->debug.pc2line_buf = js_mallocz(ctx, b->debug.pc2line_len);
+            if (!b->debug.pc2line_buf)
+                goto fail;
+            if (bc_get_buf(s, b->debug.pc2line_buf, b->debug.pc2line_len))
+                goto fail;
+        }
+#ifdef DUMP_READ_OBJECT
+        bc_read_trace(s, "filename: "); print_atom(s->ctx, b->debug.filename); printf("\n");
+#endif
+        bc_read_trace(s, "}\n");
+    }
+    if (b->cpool_count != 0) {
+        bc_read_trace(s, "cpool {\n");
+        for(i = 0; i < b->cpool_count; i++) {
+            JSValue val;
+            val = JS_ReadObjectRec(s);
+            if (JS_IsException(val))
+                goto fail;
+            b->cpool[i] = val;
+        }
+        bc_read_trace(s, "}\n");
+    }
+    b->realm = JS_DupContext(ctx);
+    return obj;
+ fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadModule(BCReaderState *s)
+{
+    JSContext *ctx = s->ctx;
+    JSValue obj;
+    JSModuleDef *m = NULL;
+    JSAtom module_name;
+    int i;
+    uint8_t v8;
+
+    if (bc_get_atom(s, &module_name))
+        goto fail;
+#ifdef DUMP_READ_OBJECT
+    bc_read_trace(s, "name: "); print_atom(s->ctx, module_name); printf("\n");
+#endif
+    m = js_new_module_def(ctx, module_name);
+    if (!m)
+        goto fail;
+    obj = JS_NewModuleValue(ctx, m);
+    if (bc_get_leb128_int(s, &m->req_module_entries_count))
+        goto fail;
+    if (m->req_module_entries_count != 0) {
+        m->req_module_entries_size = m->req_module_entries_count;
+        m->req_module_entries = js_mallocz(ctx, sizeof(m->req_module_entries[0]) * m->req_module_entries_size);
+        if (!m->req_module_entries)
+            goto fail;
+        for(i = 0; i < m->req_module_entries_count; i++) {
+            JSReqModuleEntry *rme = &m->req_module_entries[i];
+            if (bc_get_atom(s, &rme->module_name))
+                goto fail;
+        }
+    }
+
+    if (bc_get_leb128_int(s, &m->export_entries_count))
+        goto fail;
+    if (m->export_entries_count != 0) {
+        m->export_entries_size = m->export_entries_count;
+        m->export_entries = js_mallocz(ctx, sizeof(m->export_entries[0]) * m->export_entries_size);
+        if (!m->export_entries)
+            goto fail;
+        for(i = 0; i < m->export_entries_count; i++) {
+            JSExportEntry *me = &m->export_entries[i];
+            if (bc_get_u8(s, &v8))
+                goto fail;
+            me->export_type = v8;
+            if (me->export_type == JS_EXPORT_TYPE_LOCAL) {
+                if (bc_get_leb128_int(s, &me->u.local.var_idx))
+                    goto fail;
+            } else {
+                if (bc_get_leb128_int(s, &me->u.req_module_idx))
+                    goto fail;
+                if (bc_get_atom(s, &me->local_name))
+                    goto fail;
+            }
+            if (bc_get_atom(s, &me->export_name))
+                goto fail;
+        }
+    }
+
+    if (bc_get_leb128_int(s, &m->star_export_entries_count))
+        goto fail;
+    if (m->star_export_entries_count != 0) {
+        m->star_export_entries_size = m->star_export_entries_count;
+        m->star_export_entries = js_mallocz(ctx, sizeof(m->star_export_entries[0]) * m->star_export_entries_size);
+        if (!m->star_export_entries)
+            goto fail;
+        for(i = 0; i < m->star_export_entries_count; i++) {
+            JSStarExportEntry *se = &m->star_export_entries[i];
+            if (bc_get_leb128_int(s, &se->req_module_idx))
+                goto fail;
+        }
+    }
+
+    if (bc_get_leb128_int(s, &m->import_entries_count))
+        goto fail;
+    if (m->import_entries_count != 0) {
+        m->import_entries_size = m->import_entries_count;
+        m->import_entries = js_mallocz(ctx, sizeof(m->import_entries[0]) * m->import_entries_size);
+        if (!m->import_entries)
+            goto fail;
+        for(i = 0; i < m->import_entries_count; i++) {
+            JSImportEntry *mi = &m->import_entries[i];
+            if (bc_get_leb128_int(s, &mi->var_idx))
+                goto fail;
+            if (bc_get_atom(s, &mi->import_name))
+                goto fail;
+            if (bc_get_leb128_int(s, &mi->req_module_idx))
+                goto fail;
+        }
+    }
+
+    if (bc_get_u8(s, &v8))
+        goto fail;
+    m->has_tla = (v8 != 0);
+
+    m->func_obj = JS_ReadObjectRec(s);
+    if (JS_IsException(m->func_obj))
+        goto fail;
+    return obj;
+ fail:
+    if (m) {
+        js_free_module_def(ctx, m);
+    }
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadObjectTag(BCReaderState *s)
+{
+    JSContext *ctx = s->ctx;
+    JSValue obj;
+    uint32_t prop_count, i;
+    JSAtom atom;
+    JSValue val;
+    int ret;
+
+    obj = JS_NewObject(ctx);
+    if (BC_add_object_ref(s, obj))
+        goto fail;
+    if (bc_get_leb128(s, &prop_count))
+        goto fail;
+    for(i = 0; i < prop_count; i++) {
+        if (bc_get_atom(s, &atom))
+            goto fail;
+#ifdef DUMP_READ_OBJECT
+        bc_read_trace(s, "propname: "); print_atom(s->ctx, atom); printf("\n");
+#endif
+        val = JS_ReadObjectRec(s);
+        if (JS_IsException(val)) {
+            JS_FreeAtom(ctx, atom);
+            goto fail;
+        }
+        ret = JS_DefinePropertyValue(ctx, obj, atom, val, JS_PROP_C_W_E);
+        JS_FreeAtom(ctx, atom);
+        if (ret < 0)
+            goto fail;
+    }
+    return obj;
+ fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadArray(BCReaderState *s, int tag)
+{
+    JSContext *ctx = s->ctx;
+    JSValue obj;
+    uint32_t len, i;
+    JSValue val;
+    int ret, prop_flags;
+    BOOL is_template;
+
+    obj = JS_NewArray(ctx);
+    if (BC_add_object_ref(s, obj))
+        goto fail;
+    is_template = (tag == BC_TAG_TEMPLATE_OBJECT);
+    if (bc_get_leb128(s, &len))
+        goto fail;
+    for(i = 0; i < len; i++) {
+        val = JS_ReadObjectRec(s);
+        if (JS_IsException(val))
+            goto fail;
+        if (is_template)
+            prop_flags = JS_PROP_ENUMERABLE;
+        else
+            prop_flags = JS_PROP_C_W_E;
+        ret = JS_DefinePropertyValueUint32(ctx, obj, i, val,
+                                           prop_flags);
+        if (ret < 0)
+            goto fail;
+    }
+    if (is_template) {
+        val = JS_ReadObjectRec(s);
+        if (JS_IsException(val))
+            goto fail;
+        if (!JS_IsUndefined(val)) {
+            ret = JS_DefinePropertyValue(ctx, obj, JS_ATOM_raw, val, 0);
+            if (ret < 0)
+                goto fail;
+        }
+        JS_PreventExtensions(ctx, obj);
+    }
+    return obj;
+ fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadTypedArray(BCReaderState *s)
+{
+    JSContext *ctx = s->ctx;
+    JSValue obj = JS_UNDEFINED, array_buffer = JS_UNDEFINED;
+    uint8_t array_tag;
+    JSValueConst args[3];
+    uint32_t offset, len, idx;
+
+    if (bc_get_u8(s, &array_tag))
+        return JS_EXCEPTION;
+    if (array_tag >= JS_TYPED_ARRAY_COUNT)
+        return JS_ThrowTypeError(ctx, "invalid typed array");
+    if (bc_get_leb128(s, &len))
+        return JS_EXCEPTION;
+    if (bc_get_leb128(s, &offset))
+        return JS_EXCEPTION;
+    /* XXX: this hack could be avoided if the typed array could be
+       created before the array buffer */
+    idx = s->objects_count;
+    if (BC_add_object_ref1(s, NULL))
+        goto fail;
+    array_buffer = JS_ReadObjectRec(s);
+    if (JS_IsException(array_buffer))
+        return JS_EXCEPTION;
+    if (!js_get_array_buffer(ctx, array_buffer)) {
+        JS_FreeValue(ctx, array_buffer);
+        return JS_EXCEPTION;
+    }
+    args[0] = array_buffer;
+    args[1] = JS_NewInt64(ctx, offset);
+    args[2] = JS_NewInt64(ctx, len);
+    obj = js_typed_array_constructor(ctx, JS_UNDEFINED,
+                                     3, args,
+                                     JS_CLASS_UINT8C_ARRAY + array_tag);
+    if (JS_IsException(obj))
+        goto fail;
+    if (s->allow_reference) {
+        s->objects[idx] = JS_VALUE_GET_OBJ(obj);
+    }
+    JS_FreeValue(ctx, array_buffer);
+    return obj;
+ fail:
+    JS_FreeValue(ctx, array_buffer);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadArrayBuffer(BCReaderState *s)
+{
+    JSContext *ctx = s->ctx;
+    uint32_t byte_length;
+    JSValue obj;
+
+    if (bc_get_leb128(s, &byte_length))
+        return JS_EXCEPTION;
+    if (unlikely(s->buf_end - s->ptr < byte_length)) {
+        bc_read_error_end(s);
+        return JS_EXCEPTION;
+    }
+    obj = JS_NewArrayBufferCopy(ctx, s->ptr, byte_length);
+    if (JS_IsException(obj))
+        goto fail;
+    if (BC_add_object_ref(s, obj))
+        goto fail;
+    s->ptr += byte_length;
+    return obj;
+ fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadSharedArrayBuffer(BCReaderState *s)
+{
+    JSContext *ctx = s->ctx;
+    uint32_t byte_length;
+    uint8_t *data_ptr;
+    JSValue obj;
+    uint64_t u64;
+
+    if (bc_get_leb128(s, &byte_length))
+        return JS_EXCEPTION;
+    if (bc_get_u64(s, &u64))
+        return JS_EXCEPTION;
+    data_ptr = (uint8_t *)(uintptr_t)u64;
+    /* the SharedArrayBuffer is cloned */
+    obj = js_array_buffer_constructor3(ctx, JS_UNDEFINED, byte_length,
+                                       JS_CLASS_SHARED_ARRAY_BUFFER,
+                                       data_ptr,
+                                       NULL, NULL, FALSE);
+    if (JS_IsException(obj))
+        goto fail;
+    if (BC_add_object_ref(s, obj))
+        goto fail;
+    return obj;
+ fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadDate(BCReaderState *s)
+{
+    JSContext *ctx = s->ctx;
+    JSValue val, obj = JS_UNDEFINED;
+
+    val = JS_ReadObjectRec(s);
+    if (JS_IsException(val))
+        goto fail;
+    if (!JS_IsNumber(val)) {
+        JS_ThrowTypeError(ctx, "Number tag expected for date");
+        goto fail;
+    }
+    obj = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_DATE],
+                                 JS_CLASS_DATE);
+    if (JS_IsException(obj))
+        goto fail;
+    if (BC_add_object_ref(s, obj))
+        goto fail;
+    JS_SetObjectData(ctx, obj, val);
+    return obj;
+ fail:
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadObjectValue(BCReaderState *s)
+{
+    JSContext *ctx = s->ctx;
+    JSValue val, obj = JS_UNDEFINED;
+
+    val = JS_ReadObjectRec(s);
+    if (JS_IsException(val))
+        goto fail;
+    obj = JS_ToObject(ctx, val);
+    if (JS_IsException(obj))
+        goto fail;
+    if (BC_add_object_ref(s, obj))
+        goto fail;
+    JS_FreeValue(ctx, val);
+    return obj;
+ fail:
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ReadObjectRec(BCReaderState *s)
+{
+    JSContext *ctx = s->ctx;
+    uint8_t tag;
+    JSValue obj = JS_UNDEFINED;
+
+    if (js_check_stack_overflow(ctx->rt, 0))
+        return JS_ThrowStackOverflow(ctx);
+
+    if (bc_get_u8(s, &tag))
+        return JS_EXCEPTION;
+
+    bc_read_trace(s, "%s {\n", bc_tag_str[tag]);
+
+    switch(tag) {
+    case BC_TAG_NULL:
+        obj = JS_NULL;
+        break;
+    case BC_TAG_UNDEFINED:
+        obj = JS_UNDEFINED;
+        break;
+    case BC_TAG_BOOL_FALSE:
+    case BC_TAG_BOOL_TRUE:
+        obj = JS_NewBool(ctx, tag - BC_TAG_BOOL_FALSE);
+        break;
+    case BC_TAG_INT32:
+        {
+            int32_t val;
+            if (bc_get_sleb128(s, &val))
+                return JS_EXCEPTION;
+            bc_read_trace(s, "%d\n", val);
+            obj = JS_NewInt32(ctx, val);
+        }
+        break;
+    case BC_TAG_FLOAT64:
+        {
+            JSFloat64Union u;
+            if (bc_get_u64(s, &u.u64))
+                return JS_EXCEPTION;
+            bc_read_trace(s, "%g\n", u.d);
+            obj = __JS_NewFloat64(ctx, u.d);
+        }
+        break;
+    case BC_TAG_STRING:
+        {
+            JSString *p;
+            p = JS_ReadString(s);
+            if (!p)
+                return JS_EXCEPTION;
+            obj = JS_MKPTR(JS_TAG_STRING, p);
+        }
+        break;
+    case BC_TAG_FUNCTION_BYTECODE:
+        if (!s->allow_bytecode)
+            goto invalid_tag;
+        obj = JS_ReadFunctionTag(s);
+        break;
+    case BC_TAG_MODULE:
+        if (!s->allow_bytecode)
+            goto invalid_tag;
+        obj = JS_ReadModule(s);
+        break;
+    case BC_TAG_OBJECT:
+        obj = JS_ReadObjectTag(s);
+        break;
+    case BC_TAG_ARRAY:
+    case BC_TAG_TEMPLATE_OBJECT:
+        obj = JS_ReadArray(s, tag);
+        break;
+    case BC_TAG_TYPED_ARRAY:
+        obj = JS_ReadTypedArray(s);
+        break;
+    case BC_TAG_ARRAY_BUFFER:
+        obj = JS_ReadArrayBuffer(s);
+        break;
+    case BC_TAG_SHARED_ARRAY_BUFFER:
+        if (!s->allow_sab || !ctx->rt->sab_funcs.sab_dup)
+            goto invalid_tag;
+        obj = JS_ReadSharedArrayBuffer(s);
+        break;
+    case BC_TAG_DATE:
+        obj = JS_ReadDate(s);
+        break;
+    case BC_TAG_OBJECT_VALUE:
+        obj = JS_ReadObjectValue(s);
+        break;
+    case BC_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case BC_TAG_BIG_FLOAT:
+    case BC_TAG_BIG_DECIMAL:
+#endif
+        obj = JS_ReadBigNum(s, tag);
+        break;
+    case BC_TAG_OBJECT_REFERENCE:
+        {
+            uint32_t val;
+            if (!s->allow_reference)
+                return JS_ThrowSyntaxError(ctx, "object references are not allowed");
+            if (bc_get_leb128(s, &val))
+                return JS_EXCEPTION;
+            bc_read_trace(s, "%u\n", val);
+            if (val >= s->objects_count) {
+                return JS_ThrowSyntaxError(ctx, "invalid object reference (%u >= %u)",
+                                           val, s->objects_count);
+            }
+            obj = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, s->objects[val]));
+        }
+        break;
+    default:
+    invalid_tag:
+        return JS_ThrowSyntaxError(ctx, "invalid tag (tag=%d pos=%u)",
+                                   tag, (unsigned int)(s->ptr - s->buf_start));
+    }
+    bc_read_trace(s, "}\n");
+    return obj;
+}
+
+static int JS_ReadObjectAtoms(BCReaderState *s)
+{
+    uint8_t v8;
+    JSString *p;
+    int i;
+    JSAtom atom;
+
+    if (bc_get_u8(s, &v8))
+        return -1;
+    if (v8 != BC_VERSION) {
+        JS_ThrowSyntaxError(s->ctx, "invalid version (%d expected=%d)",
+                            v8, BC_VERSION);
+        return -1;
+    }
+    if (bc_get_leb128(s, &s->idx_to_atom_count))
+        return -1;
+
+    bc_read_trace(s, "%d atom indexes {\n", s->idx_to_atom_count);
+
+    if (s->idx_to_atom_count != 0) {
+        s->idx_to_atom = js_mallocz(s->ctx, s->idx_to_atom_count *
+                                    sizeof(s->idx_to_atom[0]));
+        if (!s->idx_to_atom)
+            return s->error_state = -1;
+    }
+    for(i = 0; i < s->idx_to_atom_count; i++) {
+        p = JS_ReadString(s);
+        if (!p)
+            return -1;
+        atom = JS_NewAtomStr(s->ctx, p);
+        if (atom == JS_ATOM_NULL)
+            return s->error_state = -1;
+        s->idx_to_atom[i] = atom;
+        if (s->is_rom_data && (atom != (i + s->first_atom)))
+            s->is_rom_data = FALSE; /* atoms must be relocated */
+    }
+    bc_read_trace(s, "}\n");
+    return 0;
+}
+
+static void bc_reader_free(BCReaderState *s)
+{
+    int i;
+    if (s->idx_to_atom) {
+        for(i = 0; i < s->idx_to_atom_count; i++) {
+            JS_FreeAtom(s->ctx, s->idx_to_atom[i]);
+        }
+        js_free(s->ctx, s->idx_to_atom);
+    }
+    js_free(s->ctx, s->objects);
+}
+
+JSValue JS_ReadObject(JSContext *ctx, const uint8_t *buf, size_t buf_len,
+                       int flags)
+{
+    BCReaderState ss, *s = &ss;
+    JSValue obj;
+
+    ctx->binary_object_count += 1;
+    ctx->binary_object_size += buf_len;
+
+    memset(s, 0, sizeof(*s));
+    s->ctx = ctx;
+    s->buf_start = buf;
+    s->buf_end = buf + buf_len;
+    s->ptr = buf;
+    s->allow_bytecode = ((flags & JS_READ_OBJ_BYTECODE) != 0);
+    s->is_rom_data = ((flags & JS_READ_OBJ_ROM_DATA) != 0);
+    s->allow_sab = ((flags & JS_READ_OBJ_SAB) != 0);
+    s->allow_reference = ((flags & JS_READ_OBJ_REFERENCE) != 0);
+    if (s->allow_bytecode)
+        s->first_atom = JS_ATOM_END;
+    else
+        s->first_atom = 1;
+    if (JS_ReadObjectAtoms(s)) {
+        obj = JS_EXCEPTION;
+    } else {
+        obj = JS_ReadObjectRec(s);
+    }
+    bc_reader_free(s);
+    return obj;
+}
+
+/*******************************************************************/
+/* runtime functions & objects */
+
+static JSValue js_string_constructor(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv);
+static JSValue js_boolean_constructor(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv);
+static JSValue js_number_constructor(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv);
+
+static int check_function(JSContext *ctx, JSValueConst obj)
+{
+    if (likely(JS_IsFunction(ctx, obj)))
+        return 0;
+    JS_ThrowTypeError(ctx, "not a function");
+    return -1;
+}
+
+static int check_exception_free(JSContext *ctx, JSValue obj)
+{
+    JS_FreeValue(ctx, obj);
+    return JS_IsException(obj);
+}
+
+static JSAtom find_atom(JSContext *ctx, const char *name)
+{
+    JSAtom atom;
+    int len;
+
+    if (*name == '[') {
+        name++;
+        len = strlen(name) - 1;
+        /* We assume 8 bit non null strings, which is the case for these
+           symbols */
+        for(atom = JS_ATOM_Symbol_toPrimitive; atom < JS_ATOM_END; atom++) {
+            JSAtomStruct *p = ctx->rt->atom_array[atom];
+            JSString *str = p;
+            if (str->len == len && !memcmp(str->u.str8, name, len))
+                return JS_DupAtom(ctx, atom);
+        }
+        abort();
+    } else {
+        atom = JS_NewAtom(ctx, name);
+    }
+    return atom;
+}
+
+static JSValue JS_InstantiateFunctionListItem2(JSContext *ctx, JSObject *p,
+                                               JSAtom atom, void *opaque)
+{
+    const JSCFunctionListEntry *e = opaque;
+    JSValue val;
+
+    switch(e->def_type) {
+    case JS_DEF_CFUNC:
+        val = JS_NewCFunction2(ctx, e->u.func.cfunc.generic,
+                               e->name, e->u.func.length, e->u.func.cproto, e->magic);
+        break;
+    case JS_DEF_PROP_STRING:
+        val = JS_NewAtomString(ctx, e->u.str);
+        break;
+    case JS_DEF_OBJECT:
+        val = JS_NewObject(ctx);
+        JS_SetPropertyFunctionList(ctx, val, e->u.prop_list.tab, e->u.prop_list.len);
+        break;
+    default:
+        abort();
+    }
+    return val;
+}
+
+static int JS_InstantiateFunctionListItem(JSContext *ctx, JSValueConst obj,
+                                          JSAtom atom,
+                                          const JSCFunctionListEntry *e)
+{
+    JSValue val;
+    int prop_flags = e->prop_flags;
+
+    switch(e->def_type) {
+    case JS_DEF_ALIAS: /* using autoinit for aliases is not safe */
+        {
+            JSAtom atom1 = find_atom(ctx, e->u.alias.name);
+            switch (e->u.alias.base) {
+            case -1:
+                val = JS_GetProperty(ctx, obj, atom1);
+                break;
+            case 0:
+                val = JS_GetProperty(ctx, ctx->global_obj, atom1);
+                break;
+            case 1:
+                val = JS_GetProperty(ctx, ctx->class_proto[JS_CLASS_ARRAY], atom1);
+                break;
+            default:
+                abort();
+            }
+            JS_FreeAtom(ctx, atom1);
+            if (atom == JS_ATOM_Symbol_toPrimitive) {
+                /* Symbol.toPrimitive functions are not writable */
+                prop_flags = JS_PROP_CONFIGURABLE;
+            } else if (atom == JS_ATOM_Symbol_hasInstance) {
+                /* Function.prototype[Symbol.hasInstance] is not writable nor configurable */
+                prop_flags = 0;
+            }
+        }
+        break;
+    case JS_DEF_CFUNC:
+        if (atom == JS_ATOM_Symbol_toPrimitive) {
+            /* Symbol.toPrimitive functions are not writable */
+            prop_flags = JS_PROP_CONFIGURABLE;
+        } else if (atom == JS_ATOM_Symbol_hasInstance) {
+            /* Function.prototype[Symbol.hasInstance] is not writable nor configurable */
+            prop_flags = 0;
+        }
+        JS_DefineAutoInitProperty(ctx, obj, atom, JS_AUTOINIT_ID_PROP,
+                                  (void *)e, prop_flags);
+        return 0;
+    case JS_DEF_CGETSET: /* XXX: use autoinit again ? */
+    case JS_DEF_CGETSET_MAGIC:
+        {
+            JSValue getter, setter;
+            char buf[64];
+
+            getter = JS_UNDEFINED;
+            if (e->u.getset.get.generic) {
+                snprintf(buf, sizeof(buf), "get %s", e->name);
+                getter = JS_NewCFunction2(ctx, e->u.getset.get.generic,
+                                          buf, 0, e->def_type == JS_DEF_CGETSET_MAGIC ? JS_CFUNC_getter_magic : JS_CFUNC_getter,
+                                          e->magic);
+            }
+            setter = JS_UNDEFINED;
+            if (e->u.getset.set.generic) {
+                snprintf(buf, sizeof(buf), "set %s", e->name);
+                setter = JS_NewCFunction2(ctx, e->u.getset.set.generic,
+                                          buf, 1, e->def_type == JS_DEF_CGETSET_MAGIC ? JS_CFUNC_setter_magic : JS_CFUNC_setter,
+                                          e->magic);
+            }
+            JS_DefinePropertyGetSet(ctx, obj, atom, getter, setter, prop_flags);
+            return 0;
+        }
+        break;
+    case JS_DEF_PROP_INT32:
+        val = JS_NewInt32(ctx, e->u.i32);
+        break;
+    case JS_DEF_PROP_INT64:
+        val = JS_NewInt64(ctx, e->u.i64);
+        break;
+    case JS_DEF_PROP_DOUBLE:
+        val = __JS_NewFloat64(ctx, e->u.f64);
+        break;
+    case JS_DEF_PROP_UNDEFINED:
+        val = JS_UNDEFINED;
+        break;
+    case JS_DEF_PROP_STRING:
+    case JS_DEF_OBJECT:
+        JS_DefineAutoInitProperty(ctx, obj, atom, JS_AUTOINIT_ID_PROP,
+                                  (void *)e, prop_flags);
+        return 0;
+    default:
+        abort();
+    }
+    JS_DefinePropertyValue(ctx, obj, atom, val, prop_flags);
+    return 0;
+}
+
+void JS_SetPropertyFunctionList(JSContext *ctx, JSValueConst obj,
+                                const JSCFunctionListEntry *tab, int len)
+{
+    int i;
+
+    for (i = 0; i < len; i++) {
+        const JSCFunctionListEntry *e = &tab[i];
+        JSAtom atom = find_atom(ctx, e->name);
+        JS_InstantiateFunctionListItem(ctx, obj, atom, e);
+        JS_FreeAtom(ctx, atom);
+    }
+}
+
+int JS_AddModuleExportList(JSContext *ctx, JSModuleDef *m,
+                           const JSCFunctionListEntry *tab, int len)
+{
+    int i;
+    for(i = 0; i < len; i++) {
+        if (JS_AddModuleExport(ctx, m, tab[i].name))
+            return -1;
+    }
+    return 0;
+}
+
+int JS_SetModuleExportList(JSContext *ctx, JSModuleDef *m,
+                           const JSCFunctionListEntry *tab, int len)
+{
+    int i;
+    JSValue val;
+
+    for(i = 0; i < len; i++) {
+        const JSCFunctionListEntry *e = &tab[i];
+        switch(e->def_type) {
+        case JS_DEF_CFUNC:
+            val = JS_NewCFunction2(ctx, e->u.func.cfunc.generic,
+                                   e->name, e->u.func.length, e->u.func.cproto, e->magic);
+            break;
+        case JS_DEF_PROP_STRING:
+            val = JS_NewString(ctx, e->u.str);
+            break;
+        case JS_DEF_PROP_INT32:
+            val = JS_NewInt32(ctx, e->u.i32);
+            break;
+        case JS_DEF_PROP_INT64:
+            val = JS_NewInt64(ctx, e->u.i64);
+            break;
+        case JS_DEF_PROP_DOUBLE:
+            val = __JS_NewFloat64(ctx, e->u.f64);
+            break;
+        case JS_DEF_OBJECT:
+            val = JS_NewObject(ctx);
+            JS_SetPropertyFunctionList(ctx, val, e->u.prop_list.tab, e->u.prop_list.len);
+            break;
+        default:
+            abort();
+        }
+        if (JS_SetModuleExport(ctx, m, e->name, val))
+            return -1;
+    }
+    return 0;
+}
+
+/* Note: 'func_obj' is not necessarily a constructor */
+static void JS_SetConstructor2(JSContext *ctx,
+                               JSValueConst func_obj,
+                               JSValueConst proto,
+                               int proto_flags, int ctor_flags)
+{
+    JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_prototype,
+                           JS_DupValue(ctx, proto), proto_flags);
+    JS_DefinePropertyValue(ctx, proto, JS_ATOM_constructor,
+                           JS_DupValue(ctx, func_obj),
+                           ctor_flags);
+    set_cycle_flag(ctx, func_obj);
+    set_cycle_flag(ctx, proto);
+}
+
+void JS_SetConstructor(JSContext *ctx, JSValueConst func_obj,
+                       JSValueConst proto)
+{
+    JS_SetConstructor2(ctx, func_obj, proto,
+                       0, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+}
+
+static void JS_NewGlobalCConstructor2(JSContext *ctx,
+                                      JSValue func_obj,
+                                      const char *name,
+                                      JSValueConst proto)
+{
+    JS_DefinePropertyValueStr(ctx, ctx->global_obj, name,
+                           JS_DupValue(ctx, func_obj),
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    JS_SetConstructor(ctx, func_obj, proto);
+    JS_FreeValue(ctx, func_obj);
+}
+
+static JSValueConst JS_NewGlobalCConstructor(JSContext *ctx, const char *name,
+                                             JSCFunction *func, int length,
+                                             JSValueConst proto)
+{
+    JSValue func_obj;
+    func_obj = JS_NewCFunction2(ctx, func, name, length, JS_CFUNC_constructor_or_func, 0);
+    JS_NewGlobalCConstructor2(ctx, func_obj, name, proto);
+    return func_obj;
+}
+
+static JSValueConst JS_NewGlobalCConstructorOnly(JSContext *ctx, const char *name,
+                                                 JSCFunction *func, int length,
+                                                 JSValueConst proto)
+{
+    JSValue func_obj;
+    func_obj = JS_NewCFunction2(ctx, func, name, length, JS_CFUNC_constructor, 0);
+    JS_NewGlobalCConstructor2(ctx, func_obj, name, proto);
+    return func_obj;
+}
+
+static JSValue js_global_eval(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    return JS_EvalObject(ctx, ctx->global_obj, argv[0], JS_EVAL_TYPE_INDIRECT, -1);
+}
+
+static JSValue js_global_isNaN(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    double d;
+
+    /* XXX: does this work for bigfloat? */
+    if (unlikely(JS_ToFloat64(ctx, &d, argv[0])))
+        return JS_EXCEPTION;
+    return JS_NewBool(ctx, isnan(d));
+}
+
+static JSValue js_global_isFinite(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    double d;
+    if (unlikely(JS_ToFloat64(ctx, &d, argv[0])))
+        return JS_EXCEPTION;
+    return JS_NewBool(ctx, isfinite(d));
+}
+
+/* Object class */
+
+static JSValue JS_ToObject(JSContext *ctx, JSValueConst val)
+{
+    int tag = JS_VALUE_GET_NORM_TAG(val);
+    JSValue obj;
+
+    switch(tag) {
+    default:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        return JS_ThrowTypeError(ctx, "cannot convert to object");
+    case JS_TAG_OBJECT:
+    case JS_TAG_EXCEPTION:
+        return JS_DupValue(ctx, val);
+    case JS_TAG_BIG_INT:
+        obj = JS_NewObjectClass(ctx, JS_CLASS_BIG_INT);
+        goto set_value;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+        obj = JS_NewObjectClass(ctx, JS_CLASS_BIG_FLOAT);
+        goto set_value;
+    case JS_TAG_BIG_DECIMAL:
+        obj = JS_NewObjectClass(ctx, JS_CLASS_BIG_DECIMAL);
+        goto set_value;
+#endif
+    case JS_TAG_INT:
+    case JS_TAG_FLOAT64:
+        obj = JS_NewObjectClass(ctx, JS_CLASS_NUMBER);
+        goto set_value;
+    case JS_TAG_STRING:
+        /* XXX: should call the string constructor */
+        {
+            JSString *p1 = JS_VALUE_GET_STRING(val);
+            obj = JS_NewObjectClass(ctx, JS_CLASS_STRING);
+            JS_DefinePropertyValue(ctx, obj, JS_ATOM_length, JS_NewInt32(ctx, p1->len), 0);
+        }
+        goto set_value;
+    case JS_TAG_BOOL:
+        obj = JS_NewObjectClass(ctx, JS_CLASS_BOOLEAN);
+        goto set_value;
+    case JS_TAG_SYMBOL:
+        obj = JS_NewObjectClass(ctx, JS_CLASS_SYMBOL);
+    set_value:
+        if (!JS_IsException(obj))
+            JS_SetObjectData(ctx, obj, JS_DupValue(ctx, val));
+        return obj;
+    }
+}
+
+static JSValue JS_ToObjectFree(JSContext *ctx, JSValue val)
+{
+    JSValue obj = JS_ToObject(ctx, val);
+    JS_FreeValue(ctx, val);
+    return obj;
+}
+
+static int js_obj_to_desc(JSContext *ctx, JSPropertyDescriptor *d,
+                          JSValueConst desc)
+{
+    JSValue val, getter, setter;
+    int flags;
+
+    if (!JS_IsObject(desc)) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    flags = 0;
+    val = JS_UNDEFINED;
+    getter = JS_UNDEFINED;
+    setter = JS_UNDEFINED;
+    if (JS_HasProperty(ctx, desc, JS_ATOM_configurable)) {
+        JSValue prop = JS_GetProperty(ctx, desc, JS_ATOM_configurable);
+        if (JS_IsException(prop))
+            goto fail;
+        flags |= JS_PROP_HAS_CONFIGURABLE;
+        if (JS_ToBoolFree(ctx, prop))
+            flags |= JS_PROP_CONFIGURABLE;
+    }
+    if (JS_HasProperty(ctx, desc, JS_ATOM_writable)) {
+        JSValue prop = JS_GetProperty(ctx, desc, JS_ATOM_writable);
+        if (JS_IsException(prop))
+            goto fail;
+        flags |= JS_PROP_HAS_WRITABLE;
+        if (JS_ToBoolFree(ctx, prop))
+            flags |= JS_PROP_WRITABLE;
+    }
+    if (JS_HasProperty(ctx, desc, JS_ATOM_enumerable)) {
+        JSValue prop = JS_GetProperty(ctx, desc, JS_ATOM_enumerable);
+        if (JS_IsException(prop))
+            goto fail;
+        flags |= JS_PROP_HAS_ENUMERABLE;
+        if (JS_ToBoolFree(ctx, prop))
+            flags |= JS_PROP_ENUMERABLE;
+    }
+    if (JS_HasProperty(ctx, desc, JS_ATOM_value)) {
+        flags |= JS_PROP_HAS_VALUE;
+        val = JS_GetProperty(ctx, desc, JS_ATOM_value);
+        if (JS_IsException(val))
+            goto fail;
+    }
+    if (JS_HasProperty(ctx, desc, JS_ATOM_get)) {
+        flags |= JS_PROP_HAS_GET;
+        getter = JS_GetProperty(ctx, desc, JS_ATOM_get);
+        if (JS_IsException(getter) ||
+            !(JS_IsUndefined(getter) || JS_IsFunction(ctx, getter))) {
+            JS_ThrowTypeError(ctx, "invalid getter");
+            goto fail;
+        }
+    }
+    if (JS_HasProperty(ctx, desc, JS_ATOM_set)) {
+        flags |= JS_PROP_HAS_SET;
+        setter = JS_GetProperty(ctx, desc, JS_ATOM_set);
+        if (JS_IsException(setter) ||
+            !(JS_IsUndefined(setter) || JS_IsFunction(ctx, setter))) {
+            JS_ThrowTypeError(ctx, "invalid setter");
+            goto fail;
+        }
+    }
+    if ((flags & (JS_PROP_HAS_SET | JS_PROP_HAS_GET)) &&
+        (flags & (JS_PROP_HAS_VALUE | JS_PROP_HAS_WRITABLE))) {
+        JS_ThrowTypeError(ctx, "cannot have setter/getter and value or writable");
+        goto fail;
+    }
+    d->flags = flags;
+    d->value = val;
+    d->getter = getter;
+    d->setter = setter;
+    return 0;
+ fail:
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, getter);
+    JS_FreeValue(ctx, setter);
+    return -1;
+}
+
+static __exception int JS_DefinePropertyDesc(JSContext *ctx, JSValueConst obj,
+                                             JSAtom prop, JSValueConst desc,
+                                             int flags)
+{
+    JSPropertyDescriptor d;
+    int ret;
+
+    if (js_obj_to_desc(ctx, &d, desc) < 0)
+        return -1;
+
+    ret = JS_DefineProperty(ctx, obj, prop,
+                            d.value, d.getter, d.setter, d.flags | flags);
+    js_free_desc(ctx, &d);
+    return ret;
+}
+
+static __exception int JS_ObjectDefineProperties(JSContext *ctx,
+                                                 JSValueConst obj,
+                                                 JSValueConst properties)
+{
+    JSValue props, desc;
+    JSObject *p;
+    JSPropertyEnum *atoms;
+    uint32_t len, i;
+    int ret = -1;
+
+    if (!JS_IsObject(obj)) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    desc = JS_UNDEFINED;
+    props = JS_ToObject(ctx, properties);
+    if (JS_IsException(props))
+        return -1;
+    p = JS_VALUE_GET_OBJ(props);
+    if (JS_GetOwnPropertyNamesInternal(ctx, &atoms, &len, p, JS_GPN_ENUM_ONLY | JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK) < 0)
+        goto exception;
+    for(i = 0; i < len; i++) {
+        JS_FreeValue(ctx, desc);
+        desc = JS_GetProperty(ctx, props, atoms[i].atom);
+        if (JS_IsException(desc))
+            goto exception;
+        if (JS_DefinePropertyDesc(ctx, obj, atoms[i].atom, desc, JS_PROP_THROW) < 0)
+            goto exception;
+    }
+    ret = 0;
+
+exception:
+    js_free_prop_enum(ctx, atoms, len);
+    JS_FreeValue(ctx, props);
+    JS_FreeValue(ctx, desc);
+    return ret;
+}
+
+static JSValue js_object_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue ret;
+    if (!JS_IsUndefined(new_target) &&
+        JS_VALUE_GET_OBJ(new_target) !=
+        JS_VALUE_GET_OBJ(JS_GetActiveFunction(ctx))) {
+        ret = js_create_from_ctor(ctx, new_target, JS_CLASS_OBJECT);
+    } else {
+        int tag = JS_VALUE_GET_NORM_TAG(argv[0]);
+        switch(tag) {
+        case JS_TAG_NULL:
+        case JS_TAG_UNDEFINED:
+            ret = JS_NewObject(ctx);
+            break;
+        default:
+            ret = JS_ToObject(ctx, argv[0]);
+            break;
+        }
+    }
+    return ret;
+}
+
+static JSValue js_object_create(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValueConst proto, props;
+    JSValue obj;
+
+    proto = argv[0];
+    if (!JS_IsObject(proto) && !JS_IsNull(proto))
+        return JS_ThrowTypeError(ctx, "not a prototype");
+    obj = JS_NewObjectProto(ctx, proto);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    props = argv[1];
+    if (!JS_IsUndefined(props)) {
+        if (JS_ObjectDefineProperties(ctx, obj, props)) {
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+    }
+    return obj;
+}
+
+static JSValue js_object_getPrototypeOf(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv, int magic)
+{
+    JSValueConst val;
+
+    val = argv[0];
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT) {
+        /* ES6 feature non compatible with ES5.1: primitive types are
+           accepted */
+        if (magic || JS_VALUE_GET_TAG(val) == JS_TAG_NULL ||
+            JS_VALUE_GET_TAG(val) == JS_TAG_UNDEFINED)
+            return JS_ThrowTypeErrorNotAnObject(ctx);
+    }
+    return JS_GetPrototype(ctx, val);
+}
+
+static JSValue js_object_setPrototypeOf(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    JSValueConst obj;
+    obj = argv[0];
+    if (JS_SetPrototypeInternal(ctx, obj, argv[1], TRUE) < 0)
+        return JS_EXCEPTION;
+    return JS_DupValue(ctx, obj);
+}
+
+/* magic = 1 if called as Reflect.defineProperty */
+static JSValue js_object_defineProperty(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv, int magic)
+{
+    JSValueConst obj, prop, desc;
+    int ret, flags;
+    JSAtom atom;
+
+    obj = argv[0];
+    prop = argv[1];
+    desc = argv[2];
+
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    atom = JS_ValueToAtom(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    flags = 0;
+    if (!magic)
+        flags |= JS_PROP_THROW;
+    ret = JS_DefinePropertyDesc(ctx, obj, atom, desc, flags);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0) {
+        return JS_EXCEPTION;
+    } else if (magic) {
+        return JS_NewBool(ctx, ret);
+    } else {
+        return JS_DupValue(ctx, obj);
+    }
+}
+
+static JSValue js_object_defineProperties(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv)
+{
+    // defineProperties(obj, properties)
+    JSValueConst obj = argv[0];
+
+    if (JS_ObjectDefineProperties(ctx, obj, argv[1]))
+        return JS_EXCEPTION;
+    else
+        return JS_DupValue(ctx, obj);
+}
+
+/* magic = 1 if called as __defineSetter__ */
+static JSValue js_object___defineGetter__(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv, int magic)
+{
+    JSValue obj;
+    JSValueConst prop, value, get, set;
+    int ret, flags;
+    JSAtom atom;
+
+    prop = argv[0];
+    value = argv[1];
+
+    obj = JS_ToObject(ctx, this_val);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+
+    if (check_function(ctx, value)) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    atom = JS_ValueToAtom(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL)) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    flags = JS_PROP_THROW |
+        JS_PROP_HAS_ENUMERABLE | JS_PROP_ENUMERABLE |
+        JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE;
+    if (magic) {
+        get = JS_UNDEFINED;
+        set = value;
+        flags |= JS_PROP_HAS_SET;
+    } else {
+        get = value;
+        set = JS_UNDEFINED;
+        flags |= JS_PROP_HAS_GET;
+    }
+    ret = JS_DefineProperty(ctx, obj, atom, JS_UNDEFINED, get, set, flags);
+    JS_FreeValue(ctx, obj);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0) {
+        return JS_EXCEPTION;
+    } else {
+        return JS_UNDEFINED;
+    }
+}
+
+static JSValue js_object_getOwnPropertyDescriptor(JSContext *ctx, JSValueConst this_val,
+                                                  int argc, JSValueConst *argv, int magic)
+{
+    JSValueConst prop;
+    JSAtom atom;
+    JSValue ret, obj;
+    JSPropertyDescriptor desc;
+    int res, flags;
+
+    if (magic) {
+        /* Reflect.getOwnPropertyDescriptor case */
+        if (JS_VALUE_GET_TAG(argv[0]) != JS_TAG_OBJECT)
+            return JS_ThrowTypeErrorNotAnObject(ctx);
+        obj = JS_DupValue(ctx, argv[0]);
+    } else {
+        obj = JS_ToObject(ctx, argv[0]);
+        if (JS_IsException(obj))
+            return obj;
+    }
+    prop = argv[1];
+    atom = JS_ValueToAtom(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL))
+        goto exception;
+    ret = JS_UNDEFINED;
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        res = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(obj), atom);
+        if (res < 0)
+            goto exception;
+        if (res) {
+            ret = JS_NewObject(ctx);
+            if (JS_IsException(ret))
+                goto exception1;
+            flags = JS_PROP_C_W_E | JS_PROP_THROW;
+            if (desc.flags & JS_PROP_GETSET) {
+                if (JS_DefinePropertyValue(ctx, ret, JS_ATOM_get, JS_DupValue(ctx, desc.getter), flags) < 0
+                ||  JS_DefinePropertyValue(ctx, ret, JS_ATOM_set, JS_DupValue(ctx, desc.setter), flags) < 0)
+                    goto exception1;
+            } else {
+                if (JS_DefinePropertyValue(ctx, ret, JS_ATOM_value, JS_DupValue(ctx, desc.value), flags) < 0
+                ||  JS_DefinePropertyValue(ctx, ret, JS_ATOM_writable,
+                                           JS_NewBool(ctx, desc.flags & JS_PROP_WRITABLE), flags) < 0)
+                    goto exception1;
+            }
+            if (JS_DefinePropertyValue(ctx, ret, JS_ATOM_enumerable,
+                                       JS_NewBool(ctx, desc.flags & JS_PROP_ENUMERABLE), flags) < 0
+            ||  JS_DefinePropertyValue(ctx, ret, JS_ATOM_configurable,
+                                       JS_NewBool(ctx, desc.flags & JS_PROP_CONFIGURABLE), flags) < 0)
+                goto exception1;
+            js_free_desc(ctx, &desc);
+        }
+    }
+    JS_FreeAtom(ctx, atom);
+    JS_FreeValue(ctx, obj);
+    return ret;
+
+exception1:
+    js_free_desc(ctx, &desc);
+    JS_FreeValue(ctx, ret);
+exception:
+    JS_FreeAtom(ctx, atom);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_object_getOwnPropertyDescriptors(JSContext *ctx, JSValueConst this_val,
+                                                   int argc, JSValueConst *argv)
+{
+    //getOwnPropertyDescriptors(obj)
+    JSValue obj, r;
+    JSObject *p;
+    JSPropertyEnum *props;
+    uint32_t len, i;
+
+    r = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, argv[0]);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+
+    p = JS_VALUE_GET_OBJ(obj);
+    if (JS_GetOwnPropertyNamesInternal(ctx, &props, &len, p,
+                               JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK))
+        goto exception;
+    r = JS_NewObject(ctx);
+    if (JS_IsException(r))
+        goto exception;
+    for(i = 0; i < len; i++) {
+        JSValue atomValue, desc;
+        JSValueConst args[2];
+
+        atomValue = JS_AtomToValue(ctx, props[i].atom);
+        if (JS_IsException(atomValue))
+            goto exception;
+        args[0] = obj;
+        args[1] = atomValue;
+        desc = js_object_getOwnPropertyDescriptor(ctx, JS_UNDEFINED, 2, args, 0);
+        JS_FreeValue(ctx, atomValue);
+        if (JS_IsException(desc))
+            goto exception;
+        if (!JS_IsUndefined(desc)) {
+            if (JS_DefinePropertyValue(ctx, r, props[i].atom, desc,
+                                       JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    js_free_prop_enum(ctx, props, len);
+    JS_FreeValue(ctx, obj);
+    return r;
+
+exception:
+    js_free_prop_enum(ctx, props, len);
+    JS_FreeValue(ctx, obj);
+    JS_FreeValue(ctx, r);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_GetOwnPropertyNames2(JSContext *ctx, JSValueConst obj1,
+                                       int flags, int kind)
+{
+    JSValue obj, r, val, key, value;
+    JSObject *p;
+    JSPropertyEnum *atoms;
+    uint32_t len, i, j;
+
+    r = JS_UNDEFINED;
+    val = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, obj1);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (JS_GetOwnPropertyNamesInternal(ctx, &atoms, &len, p, flags & ~JS_GPN_ENUM_ONLY))
+        goto exception;
+    r = JS_NewArray(ctx);
+    if (JS_IsException(r))
+        goto exception;
+    for(j = i = 0; i < len; i++) {
+        JSAtom atom = atoms[i].atom;
+        if (flags & JS_GPN_ENUM_ONLY) {
+            JSPropertyDescriptor desc;
+            int res;
+
+            /* Check if property is still enumerable */
+            res = JS_GetOwnPropertyInternal(ctx, &desc, p, atom);
+            if (res < 0)
+                goto exception;
+            if (!res)
+                continue;
+            js_free_desc(ctx, &desc);
+            if (!(desc.flags & JS_PROP_ENUMERABLE))
+                continue;
+        }
+        switch(kind) {
+        default:
+        case JS_ITERATOR_KIND_KEY:
+            val = JS_AtomToValue(ctx, atom);
+            if (JS_IsException(val))
+                goto exception;
+            break;
+        case JS_ITERATOR_KIND_VALUE:
+            val = JS_GetProperty(ctx, obj, atom);
+            if (JS_IsException(val))
+                goto exception;
+            break;
+        case JS_ITERATOR_KIND_KEY_AND_VALUE:
+            val = JS_NewArray(ctx);
+            if (JS_IsException(val))
+                goto exception;
+            key = JS_AtomToValue(ctx, atom);
+            if (JS_IsException(key))
+                goto exception1;
+            if (JS_CreateDataPropertyUint32(ctx, val, 0, key, JS_PROP_THROW) < 0)
+                goto exception1;
+            value = JS_GetProperty(ctx, obj, atom);
+            if (JS_IsException(value))
+                goto exception1;
+            if (JS_CreateDataPropertyUint32(ctx, val, 1, value, JS_PROP_THROW) < 0)
+                goto exception1;
+            break;
+        }
+        if (JS_CreateDataPropertyUint32(ctx, r, j++, val, 0) < 0)
+            goto exception;
+    }
+    goto done;
+
+exception1:
+    JS_FreeValue(ctx, val);
+exception:
+    JS_FreeValue(ctx, r);
+    r = JS_EXCEPTION;
+done:
+    js_free_prop_enum(ctx, atoms, len);
+    JS_FreeValue(ctx, obj);
+    return r;
+}
+
+static JSValue js_object_getOwnPropertyNames(JSContext *ctx, JSValueConst this_val,
+                                             int argc, JSValueConst *argv)
+{
+    return JS_GetOwnPropertyNames2(ctx, argv[0],
+                                   JS_GPN_STRING_MASK, JS_ITERATOR_KIND_KEY);
+}
+
+static JSValue js_object_getOwnPropertySymbols(JSContext *ctx, JSValueConst this_val,
+                                             int argc, JSValueConst *argv)
+{
+    return JS_GetOwnPropertyNames2(ctx, argv[0],
+                                   JS_GPN_SYMBOL_MASK, JS_ITERATOR_KIND_KEY);
+}
+
+static JSValue js_object_keys(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int kind)
+{
+    return JS_GetOwnPropertyNames2(ctx, argv[0],
+                                   JS_GPN_ENUM_ONLY | JS_GPN_STRING_MASK, kind);
+}
+
+static JSValue js_object_isExtensible(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv, int reflect)
+{
+    JSValueConst obj;
+    int ret;
+
+    obj = argv[0];
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT) {
+        if (reflect)
+            return JS_ThrowTypeErrorNotAnObject(ctx);
+        else
+            return JS_FALSE;
+    }
+    ret = JS_IsExtensible(ctx, obj);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_object_preventExtensions(JSContext *ctx, JSValueConst this_val,
+                                           int argc, JSValueConst *argv, int reflect)
+{
+    JSValueConst obj;
+    int ret;
+
+    obj = argv[0];
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT) {
+        if (reflect)
+            return JS_ThrowTypeErrorNotAnObject(ctx);
+        else
+            return JS_DupValue(ctx, obj);
+    }
+    ret = JS_PreventExtensions(ctx, obj);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    if (reflect) {
+        return JS_NewBool(ctx, ret);
+    } else {
+        if (!ret)
+            return JS_ThrowTypeError(ctx, "proxy preventExtensions handler returned false");
+        return JS_DupValue(ctx, obj);
+    }
+}
+
+static JSValue js_object_hasOwnProperty(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    JSAtom atom;
+    JSObject *p;
+    BOOL ret;
+
+    atom = JS_ValueToAtom(ctx, argv[0]); /* must be done first */
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    obj = JS_ToObject(ctx, this_val);
+    if (JS_IsException(obj)) {
+        JS_FreeAtom(ctx, atom);
+        return obj;
+    }
+    p = JS_VALUE_GET_OBJ(obj);
+    ret = JS_GetOwnPropertyInternal(ctx, NULL, p, atom);
+    JS_FreeAtom(ctx, atom);
+    JS_FreeValue(ctx, obj);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_object_hasOwn(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    JSAtom atom;
+    JSObject *p;
+    BOOL ret;
+
+    obj = JS_ToObject(ctx, argv[0]);
+    if (JS_IsException(obj))
+        return obj;
+    atom = JS_ValueToAtom(ctx, argv[1]);
+    if (unlikely(atom == JS_ATOM_NULL)) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    p = JS_VALUE_GET_OBJ(obj);
+    ret = JS_GetOwnPropertyInternal(ctx, NULL, p, atom);
+    JS_FreeAtom(ctx, atom);
+    JS_FreeValue(ctx, obj);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_object_valueOf(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return JS_ToObject(ctx, this_val);
+}
+
+static JSValue js_object_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue obj, tag;
+    int is_array;
+    JSAtom atom;
+    JSObject *p;
+
+    if (JS_IsNull(this_val)) {
+        tag = JS_NewString(ctx, "Null");
+    } else if (JS_IsUndefined(this_val)) {
+        tag = JS_NewString(ctx, "Undefined");
+    } else {
+        obj = JS_ToObject(ctx, this_val);
+        if (JS_IsException(obj))
+            return obj;
+        is_array = JS_IsArray(ctx, obj);
+        if (is_array < 0) {
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+        if (is_array) {
+            atom = JS_ATOM_Array;
+        } else if (JS_IsFunction(ctx, obj)) {
+            atom = JS_ATOM_Function;
+        } else {
+            p = JS_VALUE_GET_OBJ(obj);
+            switch(p->class_id) {
+            case JS_CLASS_STRING:
+            case JS_CLASS_ARGUMENTS:
+            case JS_CLASS_MAPPED_ARGUMENTS:
+            case JS_CLASS_ERROR:
+            case JS_CLASS_BOOLEAN:
+            case JS_CLASS_NUMBER:
+            case JS_CLASS_DATE:
+            case JS_CLASS_REGEXP:
+                atom = ctx->rt->class_array[p->class_id].class_name;
+                break;
+            default:
+                atom = JS_ATOM_Object;
+                break;
+            }
+        }
+        tag = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_toStringTag);
+        JS_FreeValue(ctx, obj);
+        if (JS_IsException(tag))
+            return JS_EXCEPTION;
+        if (!JS_IsString(tag)) {
+            JS_FreeValue(ctx, tag);
+            tag = JS_AtomToString(ctx, atom);
+        }
+    }
+    return JS_ConcatString3(ctx, "[object ", tag, "]");
+}
+
+static JSValue js_object_toLocaleString(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    return JS_Invoke(ctx, this_val, JS_ATOM_toString, 0, NULL);
+}
+
+static JSValue js_object_assign(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    // Object.assign(obj, source1)
+    JSValue obj, s;
+    int i;
+
+    s = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, argv[0]);
+    if (JS_IsException(obj))
+        goto exception;
+    for (i = 1; i < argc; i++) {
+        if (!JS_IsNull(argv[i]) && !JS_IsUndefined(argv[i])) {
+            s = JS_ToObject(ctx, argv[i]);
+            if (JS_IsException(s))
+                goto exception;
+            if (JS_CopyDataProperties(ctx, obj, s, JS_UNDEFINED, TRUE))
+                goto exception;
+            JS_FreeValue(ctx, s);
+        }
+    }
+    return obj;
+exception:
+    JS_FreeValue(ctx, obj);
+    JS_FreeValue(ctx, s);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_object_seal(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int freeze_flag)
+{
+    JSValueConst obj = argv[0];
+    JSObject *p;
+    JSPropertyEnum *props;
+    uint32_t len, i;
+    int flags, desc_flags, res;
+
+    if (!JS_IsObject(obj))
+        return JS_DupValue(ctx, obj);
+
+    res = JS_PreventExtensions(ctx, obj);
+    if (res < 0)
+        return JS_EXCEPTION;
+    if (!res) {
+        return JS_ThrowTypeError(ctx, "proxy preventExtensions handler returned false");
+    }
+
+    p = JS_VALUE_GET_OBJ(obj);
+    flags = JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK;
+    if (JS_GetOwnPropertyNamesInternal(ctx, &props, &len, p, flags))
+        return JS_EXCEPTION;
+
+    for(i = 0; i < len; i++) {
+        JSPropertyDescriptor desc;
+        JSAtom prop = props[i].atom;
+
+        desc_flags = JS_PROP_THROW | JS_PROP_HAS_CONFIGURABLE;
+        if (freeze_flag) {
+            res = JS_GetOwnPropertyInternal(ctx, &desc, p, prop);
+            if (res < 0)
+                goto exception;
+            if (res) {
+                if (desc.flags & JS_PROP_WRITABLE)
+                    desc_flags |= JS_PROP_HAS_WRITABLE;
+                js_free_desc(ctx, &desc);
+            }
+        }
+        if (JS_DefineProperty(ctx, obj, prop, JS_UNDEFINED,
+                              JS_UNDEFINED, JS_UNDEFINED, desc_flags) < 0)
+            goto exception;
+    }
+    js_free_prop_enum(ctx, props, len);
+    return JS_DupValue(ctx, obj);
+
+ exception:
+    js_free_prop_enum(ctx, props, len);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_object_isSealed(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int is_frozen)
+{
+    JSValueConst obj = argv[0];
+    JSObject *p;
+    JSPropertyEnum *props;
+    uint32_t len, i;
+    int flags, res;
+
+    if (!JS_IsObject(obj))
+        return JS_TRUE;
+
+    p = JS_VALUE_GET_OBJ(obj);
+    flags = JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK;
+    if (JS_GetOwnPropertyNamesInternal(ctx, &props, &len, p, flags))
+        return JS_EXCEPTION;
+
+    for(i = 0; i < len; i++) {
+        JSPropertyDescriptor desc;
+        JSAtom prop = props[i].atom;
+
+        res = JS_GetOwnPropertyInternal(ctx, &desc, p, prop);
+        if (res < 0)
+            goto exception;
+        if (res) {
+            js_free_desc(ctx, &desc);
+            if ((desc.flags & JS_PROP_CONFIGURABLE)
+            ||  (is_frozen && (desc.flags & JS_PROP_WRITABLE))) {
+                res = FALSE;
+                goto done;
+            }
+        }
+    }
+    res = JS_IsExtensible(ctx, obj);
+    if (res < 0)
+        return JS_EXCEPTION;
+    res ^= 1;
+done:
+    js_free_prop_enum(ctx, props, len);
+    return JS_NewBool(ctx, res);
+
+exception:
+    js_free_prop_enum(ctx, props, len);
+    return JS_EXCEPTION;
+}
+
+JSValue JS_ObjectSeal(JSContext *ctx, JSValueConst obj, int freeze)
+{
+    JSValueConst argv[] = {obj};
+    JS_FreeValue(ctx, js_object_seal(ctx, JS_UNDEFINED, 1, argv, freeze));
+    return obj;
+}
+
+static JSValue js_object_fromEntries(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue obj, iter, next_method = JS_UNDEFINED;
+    JSValueConst iterable;
+    BOOL done;
+
+    /*  RequireObjectCoercible() not necessary because it is tested in
+        JS_GetIterator() by JS_GetProperty() */
+    iterable = argv[0];
+
+    obj = JS_NewObject(ctx);
+    if (JS_IsException(obj))
+        return obj;
+
+    iter = JS_GetIterator(ctx, iterable, FALSE);
+    if (JS_IsException(iter))
+        goto fail;
+    next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+    if (JS_IsException(next_method))
+        goto fail;
+
+    for(;;) {
+        JSValue key, value, item;
+        item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+        if (JS_IsException(item))
+            goto fail;
+        if (done) {
+            JS_FreeValue(ctx, item);
+            break;
+        }
+
+        key = JS_UNDEFINED;
+        value = JS_UNDEFINED;
+        if (!JS_IsObject(item)) {
+            JS_ThrowTypeErrorNotAnObject(ctx);
+            goto fail1;
+        }
+        key = JS_GetPropertyUint32(ctx, item, 0);
+        if (JS_IsException(key))
+            goto fail1;
+        value = JS_GetPropertyUint32(ctx, item, 1);
+        if (JS_IsException(value)) {
+            JS_FreeValue(ctx, key);
+            goto fail1;
+        }
+        if (JS_DefinePropertyValueValue(ctx, obj, key, value,
+                                        JS_PROP_C_W_E | JS_PROP_THROW) < 0) {
+        fail1:
+            JS_FreeValue(ctx, item);
+            goto fail;
+        }
+        JS_FreeValue(ctx, item);
+    }
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    return obj;
+ fail:
+    if (JS_IsObject(iter)) {
+        /* close the iterator object, preserving pending exception */
+        JS_IteratorClose(ctx, iter, TRUE);
+    }
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+#if 0
+/* Note: corresponds to ECMA spec: CreateDataPropertyOrThrow() */
+static JSValue js_object___setOwnProperty(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv)
+{
+    int ret;
+    ret = JS_DefinePropertyValueValue(ctx, argv[0], JS_DupValue(ctx, argv[1]),
+                                      JS_DupValue(ctx, argv[2]),
+                                      JS_PROP_C_W_E | JS_PROP_THROW);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_object___toObject(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    return JS_ToObject(ctx, argv[0]);
+}
+
+static JSValue js_object___toPrimitive(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    int hint = HINT_NONE;
+
+    if (JS_VALUE_GET_TAG(argv[1]) == JS_TAG_INT)
+        hint = JS_VALUE_GET_INT(argv[1]);
+
+    return JS_ToPrimitive(ctx, argv[0], hint);
+}
+#endif
+
+/* return an empty string if not an object */
+static JSValue js_object___getClass(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSAtom atom;
+    JSObject *p;
+    uint32_t tag;
+    int class_id;
+
+    tag = JS_VALUE_GET_NORM_TAG(argv[0]);
+    if (tag == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(argv[0]);
+        class_id = p->class_id;
+        if (class_id == JS_CLASS_PROXY && JS_IsFunction(ctx, argv[0]))
+            class_id = JS_CLASS_BYTECODE_FUNCTION;
+        atom = ctx->rt->class_array[class_id].class_name;
+    } else {
+        atom = JS_ATOM_empty_string;
+    }
+    return JS_AtomToString(ctx, atom);
+}
+
+static JSValue js_object_is(JSContext *ctx, JSValueConst this_val,
+                            int argc, JSValueConst *argv)
+{
+    return JS_NewBool(ctx, js_same_value(ctx, argv[0], argv[1]));
+}
+
+#if 0
+static JSValue js_object___getObjectData(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    return JS_GetObjectData(ctx, argv[0]);
+}
+
+static JSValue js_object___setObjectData(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    if (JS_SetObjectData(ctx, argv[0], JS_DupValue(ctx, argv[1])))
+        return JS_EXCEPTION;
+    return JS_DupValue(ctx, argv[1]);
+}
+
+static JSValue js_object___toPropertyKey(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    return JS_ToPropertyKey(ctx, argv[0]);
+}
+
+static JSValue js_object___isObject(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    return JS_NewBool(ctx, JS_IsObject(argv[0]));
+}
+
+static JSValue js_object___isSameValueZero(JSContext *ctx, JSValueConst this_val,
+                                           int argc, JSValueConst *argv)
+{
+    return JS_NewBool(ctx, js_same_value_zero(ctx, argv[0], argv[1]));
+}
+
+static JSValue js_object___isConstructor(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    return JS_NewBool(ctx, JS_IsConstructor(ctx, argv[0]));
+}
+#endif
+
+static JSValue JS_SpeciesConstructor(JSContext *ctx, JSValueConst obj,
+                                     JSValueConst defaultConstructor)
+{
+    JSValue ctor, species;
+
+    if (!JS_IsObject(obj))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    ctor = JS_GetProperty(ctx, obj, JS_ATOM_constructor);
+    if (JS_IsException(ctor))
+        return ctor;
+    if (JS_IsUndefined(ctor))
+        return JS_DupValue(ctx, defaultConstructor);
+    if (!JS_IsObject(ctor)) {
+        JS_FreeValue(ctx, ctor);
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    }
+    species = JS_GetProperty(ctx, ctor, JS_ATOM_Symbol_species);
+    JS_FreeValue(ctx, ctor);
+    if (JS_IsException(species))
+        return species;
+    if (JS_IsUndefined(species) || JS_IsNull(species))
+        return JS_DupValue(ctx, defaultConstructor);
+    if (!JS_IsConstructor(ctx, species)) {
+        JS_FreeValue(ctx, species);
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    }
+    return species;
+}
+
+#if 0
+static JSValue js_object___speciesConstructor(JSContext *ctx, JSValueConst this_val,
+                                              int argc, JSValueConst *argv)
+{
+    return JS_SpeciesConstructor(ctx, argv[0], argv[1]);
+}
+#endif
+
+static JSValue js_object_get___proto__(JSContext *ctx, JSValueConst this_val)
+{
+    JSValue val, ret;
+
+    val = JS_ToObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    ret = JS_GetPrototype(ctx, val);
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue js_object_set___proto__(JSContext *ctx, JSValueConst this_val,
+                                       JSValueConst proto)
+{
+    if (JS_IsUndefined(this_val) || JS_IsNull(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    if (!JS_IsObject(proto) && !JS_IsNull(proto))
+        return JS_UNDEFINED;
+    if (JS_SetPrototypeInternal(ctx, this_val, proto, TRUE) < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_UNDEFINED;
+}
+
+static JSValue js_object_isPrototypeOf(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue obj, v1;
+    JSValueConst v;
+    int res;
+
+    v = argv[0];
+    if (!JS_IsObject(v))
+        return JS_FALSE;
+    obj = JS_ToObject(ctx, this_val);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    v1 = JS_DupValue(ctx, v);
+    for(;;) {
+        v1 = JS_GetPrototypeFree(ctx, v1);
+        if (JS_IsException(v1))
+            goto exception;
+        if (JS_IsNull(v1)) {
+            res = FALSE;
+            break;
+        }
+        if (JS_VALUE_GET_OBJ(obj) == JS_VALUE_GET_OBJ(v1)) {
+            res = TRUE;
+            break;
+        }
+        /* avoid infinite loop (possible with proxies) */
+        if (js_poll_interrupts(ctx))
+            goto exception;
+    }
+    JS_FreeValue(ctx, v1);
+    JS_FreeValue(ctx, obj);
+    return JS_NewBool(ctx, res);
+
+exception:
+    JS_FreeValue(ctx, v1);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_object_propertyIsEnumerable(JSContext *ctx, JSValueConst this_val,
+                                              int argc, JSValueConst *argv)
+{
+    JSValue obj, res = JS_EXCEPTION;
+    JSAtom prop = JS_ATOM_NULL;
+    JSPropertyDescriptor desc;
+    int has_prop;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (JS_IsException(obj))
+        goto exception;
+    prop = JS_ValueToAtom(ctx, argv[0]);
+    if (unlikely(prop == JS_ATOM_NULL))
+        goto exception;
+
+    has_prop = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(obj), prop);
+    if (has_prop < 0)
+        goto exception;
+    if (has_prop) {
+        res = JS_NewBool(ctx, desc.flags & JS_PROP_ENUMERABLE);
+        js_free_desc(ctx, &desc);
+    } else {
+        res = JS_FALSE;
+    }
+
+exception:
+    JS_FreeAtom(ctx, prop);
+    JS_FreeValue(ctx, obj);
+    return res;
+}
+
+static JSValue js_object___lookupGetter__(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv, int setter)
+{
+    JSValue obj, res = JS_EXCEPTION;
+    JSAtom prop = JS_ATOM_NULL;
+    JSPropertyDescriptor desc;
+    int has_prop;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (JS_IsException(obj))
+        goto exception;
+    prop = JS_ValueToAtom(ctx, argv[0]);
+    if (unlikely(prop == JS_ATOM_NULL))
+        goto exception;
+
+    for (;;) {
+        has_prop = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(obj), prop);
+        if (has_prop < 0)
+            goto exception;
+        if (has_prop) {
+            if (desc.flags & JS_PROP_GETSET)
+                res = JS_DupValue(ctx, setter ? desc.setter : desc.getter);
+            else
+                res = JS_UNDEFINED;
+            js_free_desc(ctx, &desc);
+            break;
+        }
+        obj = JS_GetPrototypeFree(ctx, obj);
+        if (JS_IsException(obj))
+            goto exception;
+        if (JS_IsNull(obj)) {
+            res = JS_UNDEFINED;
+            break;
+        }
+        /* avoid infinite loop (possible with proxies) */
+        if (js_poll_interrupts(ctx))
+            goto exception;
+    }
+
+exception:
+    JS_FreeAtom(ctx, prop);
+    JS_FreeValue(ctx, obj);
+    return res;
+}
+
+static const JSCFunctionListEntry js_object_funcs[] = {
+    JS_CFUNC_DEF("create", 2, js_object_create ),
+    JS_CFUNC_MAGIC_DEF("getPrototypeOf", 1, js_object_getPrototypeOf, 0 ),
+    JS_CFUNC_DEF("setPrototypeOf", 2, js_object_setPrototypeOf ),
+    JS_CFUNC_MAGIC_DEF("defineProperty", 3, js_object_defineProperty, 0 ),
+    JS_CFUNC_DEF("defineProperties", 2, js_object_defineProperties ),
+    JS_CFUNC_DEF("getOwnPropertyNames", 1, js_object_getOwnPropertyNames ),
+    JS_CFUNC_DEF("getOwnPropertySymbols", 1, js_object_getOwnPropertySymbols ),
+    JS_CFUNC_MAGIC_DEF("groupBy", 2, js_object_groupBy, 0 ),
+    JS_CFUNC_MAGIC_DEF("keys", 1, js_object_keys, JS_ITERATOR_KIND_KEY ),
+    JS_CFUNC_MAGIC_DEF("values", 1, js_object_keys, JS_ITERATOR_KIND_VALUE ),
+    JS_CFUNC_MAGIC_DEF("entries", 1, js_object_keys, JS_ITERATOR_KIND_KEY_AND_VALUE ),
+    JS_CFUNC_MAGIC_DEF("isExtensible", 1, js_object_isExtensible, 0 ),
+    JS_CFUNC_MAGIC_DEF("preventExtensions", 1, js_object_preventExtensions, 0 ),
+    JS_CFUNC_MAGIC_DEF("getOwnPropertyDescriptor", 2, js_object_getOwnPropertyDescriptor, 0 ),
+    JS_CFUNC_DEF("getOwnPropertyDescriptors", 1, js_object_getOwnPropertyDescriptors ),
+    JS_CFUNC_DEF("is", 2, js_object_is ),
+    JS_CFUNC_DEF("assign", 2, js_object_assign ),
+    JS_CFUNC_MAGIC_DEF("seal", 1, js_object_seal, 0 ),
+    JS_CFUNC_MAGIC_DEF("freeze", 1, js_object_seal, 1 ),
+    JS_CFUNC_MAGIC_DEF("isSealed", 1, js_object_isSealed, 0 ),
+    JS_CFUNC_MAGIC_DEF("isFrozen", 1, js_object_isSealed, 1 ),
+    JS_CFUNC_DEF("__getClass", 1, js_object___getClass ),
+    //JS_CFUNC_DEF("__isObject", 1, js_object___isObject ),
+    //JS_CFUNC_DEF("__isConstructor", 1, js_object___isConstructor ),
+    //JS_CFUNC_DEF("__toObject", 1, js_object___toObject ),
+    //JS_CFUNC_DEF("__setOwnProperty", 3, js_object___setOwnProperty ),
+    //JS_CFUNC_DEF("__toPrimitive", 2, js_object___toPrimitive ),
+    //JS_CFUNC_DEF("__toPropertyKey", 1, js_object___toPropertyKey ),
+    //JS_CFUNC_DEF("__speciesConstructor", 2, js_object___speciesConstructor ),
+    //JS_CFUNC_DEF("__isSameValueZero", 2, js_object___isSameValueZero ),
+    //JS_CFUNC_DEF("__getObjectData", 1, js_object___getObjectData ),
+    //JS_CFUNC_DEF("__setObjectData", 2, js_object___setObjectData ),
+    JS_CFUNC_DEF("fromEntries", 1, js_object_fromEntries ),
+    JS_CFUNC_DEF("hasOwn", 2, js_object_hasOwn ),
+};
+
+static const JSCFunctionListEntry js_object_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_object_toString ),
+    JS_CFUNC_DEF("toLocaleString", 0, js_object_toLocaleString ),
+    JS_CFUNC_DEF("valueOf", 0, js_object_valueOf ),
+    JS_CFUNC_DEF("hasOwnProperty", 1, js_object_hasOwnProperty ),
+    JS_CFUNC_DEF("isPrototypeOf", 1, js_object_isPrototypeOf ),
+    JS_CFUNC_DEF("propertyIsEnumerable", 1, js_object_propertyIsEnumerable ),
+    JS_CGETSET_DEF("__proto__", js_object_get___proto__, js_object_set___proto__ ),
+    JS_CFUNC_MAGIC_DEF("__defineGetter__", 2, js_object___defineGetter__, 0 ),
+    JS_CFUNC_MAGIC_DEF("__defineSetter__", 2, js_object___defineGetter__, 1 ),
+    JS_CFUNC_MAGIC_DEF("__lookupGetter__", 1, js_object___lookupGetter__, 0 ),
+    JS_CFUNC_MAGIC_DEF("__lookupSetter__", 1, js_object___lookupGetter__, 1 ),
+};
+
+/* Function class */
+
+static JSValue js_function_proto(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return JS_UNDEFINED;
+}
+
+/* XXX: add a specific eval mode so that Function("}), ({") is rejected */
+static JSValue js_function_constructor(JSContext *ctx, JSValueConst new_target,
+                                       int argc, JSValueConst *argv, int magic)
+{
+    JSFunctionKindEnum func_kind = magic;
+    int i, n, ret;
+    JSValue s, proto, obj = JS_UNDEFINED;
+    StringBuffer b_s, *b = &b_s;
+
+    string_buffer_init(ctx, b, 0);
+    string_buffer_putc8(b, '(');
+
+    if (func_kind == JS_FUNC_ASYNC || func_kind == JS_FUNC_ASYNC_GENERATOR) {
+        string_buffer_puts8(b, "async ");
+    }
+    string_buffer_puts8(b, "function");
+
+    if (func_kind == JS_FUNC_GENERATOR || func_kind == JS_FUNC_ASYNC_GENERATOR) {
+        string_buffer_putc8(b, '*');
+    }
+    string_buffer_puts8(b, " anonymous(");
+
+    n = argc - 1;
+    for(i = 0; i < n; i++) {
+        if (i != 0) {
+            string_buffer_putc8(b, ',');
+        }
+        if (string_buffer_concat_value(b, argv[i]))
+            goto fail;
+    }
+    string_buffer_puts8(b, "\n) {\n");
+    if (n >= 0) {
+        if (string_buffer_concat_value(b, argv[n]))
+            goto fail;
+    }
+    string_buffer_puts8(b, "\n})");
+    s = string_buffer_end(b);
+    if (JS_IsException(s))
+        goto fail1;
+
+    obj = JS_EvalObject(ctx, ctx->global_obj, s, JS_EVAL_TYPE_INDIRECT, -1);
+    JS_FreeValue(ctx, s);
+    if (JS_IsException(obj))
+        goto fail1;
+    if (!JS_IsUndefined(new_target)) {
+        /* set the prototype */
+        proto = JS_GetProperty(ctx, new_target, JS_ATOM_prototype);
+        if (JS_IsException(proto))
+            goto fail1;
+        if (!JS_IsObject(proto)) {
+            JSContext *realm;
+            JS_FreeValue(ctx, proto);
+            realm = JS_GetFunctionRealm(ctx, new_target);
+            if (!realm)
+                goto fail1;
+            proto = JS_DupValue(ctx, realm->class_proto[func_kind_to_class_id[func_kind]]);
+        }
+        ret = JS_SetPrototypeInternal(ctx, obj, proto, TRUE);
+        JS_FreeValue(ctx, proto);
+        if (ret < 0)
+            goto fail1;
+    }
+    return obj;
+
+ fail:
+    string_buffer_free(b);
+ fail1:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static __exception int js_get_length32(JSContext *ctx, uint32_t *pres,
+                                       JSValueConst obj)
+{
+    JSValue len_val;
+    len_val = JS_GetProperty(ctx, obj, JS_ATOM_length);
+    if (JS_IsException(len_val)) {
+        *pres = 0;
+        return -1;
+    }
+    return JS_ToUint32Free(ctx, pres, len_val);
+}
+
+static __exception int js_get_length64(JSContext *ctx, int64_t *pres,
+                                       JSValueConst obj)
+{
+    JSValue len_val;
+    len_val = JS_GetProperty(ctx, obj, JS_ATOM_length);
+    if (JS_IsException(len_val)) {
+        *pres = 0;
+        return -1;
+    }
+    return JS_ToLengthFree(ctx, pres, len_val);
+}
+
+static void free_arg_list(JSContext *ctx, JSValue *tab, uint32_t len)
+{
+    uint32_t i;
+    for(i = 0; i < len; i++) {
+        JS_FreeValue(ctx, tab[i]);
+    }
+    js_free(ctx, tab);
+}
+
+/* XXX: should use ValueArray */
+static JSValue *build_arg_list(JSContext *ctx, uint32_t *plen,
+                               JSValueConst array_arg)
+{
+    uint32_t len, i;
+    JSValue *tab, ret;
+    JSObject *p;
+
+    if (JS_VALUE_GET_TAG(array_arg) != JS_TAG_OBJECT) {
+        JS_ThrowTypeError(ctx, "not a object");
+        return NULL;
+    }
+    if (js_get_length32(ctx, &len, array_arg))
+        return NULL;
+    if (len > JS_MAX_LOCAL_VARS) {
+        // XXX: check for stack overflow?
+        JS_ThrowRangeError(ctx, "too many arguments in function call (only %d allowed)",
+                           JS_MAX_LOCAL_VARS);
+        return NULL;
+    }
+    /* avoid allocating 0 bytes */
+    tab = js_mallocz(ctx, sizeof(tab[0]) * max_uint32(1, len));
+    if (!tab)
+        return NULL;
+    p = JS_VALUE_GET_OBJ(array_arg);
+    if ((p->class_id == JS_CLASS_ARRAY || p->class_id == JS_CLASS_ARGUMENTS) &&
+        p->fast_array &&
+        len == p->u.array.count) {
+        for(i = 0; i < len; i++) {
+            tab[i] = JS_DupValue(ctx, p->u.array.u.values[i]);
+        }
+    } else {
+        for(i = 0; i < len; i++) {
+            ret = JS_GetPropertyUint32(ctx, array_arg, i);
+            if (JS_IsException(ret)) {
+                free_arg_list(ctx, tab, i);
+                return NULL;
+            }
+            tab[i] = ret;
+        }
+    }
+    *plen = len;
+    return tab;
+}
+
+/* magic value: 0 = normal apply, 1 = apply for constructor, 2 =
+   Reflect.apply */
+static JSValue js_function_apply(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int magic)
+{
+    JSValueConst this_arg, array_arg;
+    uint32_t len;
+    JSValue *tab, ret;
+
+    if (check_function(ctx, this_val))
+        return JS_EXCEPTION;
+    this_arg = argv[0];
+    array_arg = argv[1];
+    if ((JS_VALUE_GET_TAG(array_arg) == JS_TAG_UNDEFINED ||
+         JS_VALUE_GET_TAG(array_arg) == JS_TAG_NULL) && magic != 2) {
+        return JS_Call(ctx, this_val, this_arg, 0, NULL);
+    }
+    tab = build_arg_list(ctx, &len, array_arg);
+    if (!tab)
+        return JS_EXCEPTION;
+    if (magic & 1) {
+        ret = JS_CallConstructor2(ctx, this_val, this_arg, len, (JSValueConst *)tab);
+    } else {
+        ret = JS_Call(ctx, this_val, this_arg, len, (JSValueConst *)tab);
+    }
+    free_arg_list(ctx, tab, len);
+    return ret;
+}
+
+static JSValue js_function_call(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    if (argc <= 0) {
+        return JS_Call(ctx, this_val, JS_UNDEFINED, 0, NULL);
+    } else {
+        return JS_Call(ctx, this_val, argv[0], argc - 1, argv + 1);
+    }
+}
+
+static JSValue js_function_bind(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSBoundFunction *bf;
+    JSValue func_obj, name1, len_val;
+    JSObject *p;
+    int arg_count, i, ret;
+
+    if (check_function(ctx, this_val))
+        return JS_EXCEPTION;
+
+    func_obj = JS_NewObjectProtoClass(ctx, ctx->function_proto,
+                                 JS_CLASS_BOUND_FUNCTION);
+    if (JS_IsException(func_obj))
+        return JS_EXCEPTION;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    p->is_constructor = JS_IsConstructor(ctx, this_val);
+    arg_count = max_int(0, argc - 1);
+    bf = js_malloc(ctx, sizeof(*bf) + arg_count * sizeof(JSValue));
+    if (!bf)
+        goto exception;
+    bf->func_obj = JS_DupValue(ctx, this_val);
+    bf->this_val = JS_DupValue(ctx, argv[0]);
+    bf->argc = arg_count;
+    for(i = 0; i < arg_count; i++) {
+        bf->argv[i] = JS_DupValue(ctx, argv[i + 1]);
+    }
+    p->u.bound_function = bf;
+
+    /* XXX: the spec could be simpler by only using GetOwnProperty */
+    ret = JS_GetOwnProperty(ctx, NULL, this_val, JS_ATOM_length);
+    if (ret < 0)
+        goto exception;
+    if (!ret) {
+        len_val = JS_NewInt32(ctx, 0);
+    } else {
+        len_val = JS_GetProperty(ctx, this_val, JS_ATOM_length);
+        if (JS_IsException(len_val))
+            goto exception;
+        if (JS_VALUE_GET_TAG(len_val) == JS_TAG_INT) {
+            /* most common case */
+            int len1 = JS_VALUE_GET_INT(len_val);
+            if (len1 <= arg_count)
+                len1 = 0;
+            else
+                len1 -= arg_count;
+            len_val = JS_NewInt32(ctx, len1);
+        } else if (JS_VALUE_GET_NORM_TAG(len_val) == JS_TAG_FLOAT64) {
+            double d = JS_VALUE_GET_FLOAT64(len_val);
+            if (isnan(d)) {
+                d = 0.0;
+            } else {
+                d = trunc(d);
+                if (d <= (double)arg_count)
+                    d = 0.0;
+                else
+                    d -= (double)arg_count; /* also converts -0 to +0 */
+            }
+            len_val = JS_NewFloat64(ctx, d);
+        } else {
+            JS_FreeValue(ctx, len_val);
+            len_val = JS_NewInt32(ctx, 0);
+        }
+    }
+    JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_length,
+                           len_val, JS_PROP_CONFIGURABLE);
+
+    name1 = JS_GetProperty(ctx, this_val, JS_ATOM_name);
+    if (JS_IsException(name1))
+        goto exception;
+    if (!JS_IsString(name1)) {
+        JS_FreeValue(ctx, name1);
+        name1 = JS_AtomToString(ctx, JS_ATOM_empty_string);
+    }
+    name1 = JS_ConcatString3(ctx, "bound ", name1, "");
+    if (JS_IsException(name1))
+        goto exception;
+    JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_name, name1,
+                           JS_PROP_CONFIGURABLE);
+    return func_obj;
+ exception:
+    JS_FreeValue(ctx, func_obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_function_toString(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    JSFunctionKindEnum func_kind = JS_FUNC_NORMAL;
+
+    if (check_function(ctx, this_val))
+        return JS_EXCEPTION;
+
+    p = JS_VALUE_GET_OBJ(this_val);
+    if (js_class_has_bytecode(p->class_id)) {
+        JSFunctionBytecode *b = p->u.func.function_bytecode;
+        if (b->has_debug && b->debug.source) {
+            return JS_NewStringLen(ctx, b->debug.source, b->debug.source_len);
+        }
+        func_kind = b->func_kind;
+    }
+    {
+        JSValue name;
+        const char *pref, *suff;
+
+        switch(func_kind) {
+        default:
+        case JS_FUNC_NORMAL:
+            pref = "function ";
+            break;
+        case JS_FUNC_GENERATOR:
+            pref = "function *";
+            break;
+        case JS_FUNC_ASYNC:
+            pref = "async function ";
+            break;
+        case JS_FUNC_ASYNC_GENERATOR:
+            pref = "async function *";
+            break;
+        }
+        suff = "() {\n    [native code]\n}";
+        name = JS_GetProperty(ctx, this_val, JS_ATOM_name);
+        if (JS_IsUndefined(name))
+            name = JS_AtomToString(ctx, JS_ATOM_empty_string);
+        return JS_ConcatString3(ctx, pref, name, suff);
+    }
+}
+
+static JSValue js_function_hasInstance(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    int ret;
+    ret = JS_OrdinaryIsInstanceOf(ctx, argv[0], this_val);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static const JSCFunctionListEntry js_function_proto_funcs[] = {
+    JS_CFUNC_DEF("call", 1, js_function_call ),
+    JS_CFUNC_MAGIC_DEF("apply", 2, js_function_apply, 0 ),
+    JS_CFUNC_DEF("bind", 1, js_function_bind ),
+    JS_CFUNC_DEF("toString", 0, js_function_toString ),
+    JS_CFUNC_DEF("[Symbol.hasInstance]", 1, js_function_hasInstance ),
+    JS_CGETSET_DEF("fileName", js_function_proto_fileName, NULL ),
+    JS_CGETSET_DEF("lineNumber", js_function_proto_lineNumber, NULL ),
+};
+
+/* Error class */
+
+static JSValue iterator_to_array(JSContext *ctx, JSValueConst items)
+{
+    JSValue iter, next_method = JS_UNDEFINED;
+    JSValue v, r = JS_UNDEFINED;
+    int64_t k;
+    BOOL done;
+
+    iter = JS_GetIterator(ctx, items, FALSE);
+    if (JS_IsException(iter))
+        goto exception;
+    next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+    if (JS_IsException(next_method))
+        goto exception;
+    r = JS_NewArray(ctx);
+    if (JS_IsException(r))
+        goto exception;
+    for (k = 0;; k++) {
+        v = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+        if (JS_IsException(v))
+            goto exception_close;
+        if (done)
+            break;
+        if (JS_DefinePropertyValueInt64(ctx, r, k, v,
+                                        JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+            goto exception_close;
+    }
+ done:
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    return r;
+ exception_close:
+    JS_IteratorClose(ctx, iter, TRUE);
+ exception:
+    JS_FreeValue(ctx, r);
+    r = JS_EXCEPTION;
+    goto done;
+}
+
+static JSValue js_error_constructor(JSContext *ctx, JSValueConst new_target,
+                                    int argc, JSValueConst *argv, int magic)
+{
+    JSValue obj, msg, proto;
+    JSValueConst message, options;
+    int arg_index;
+
+    if (JS_IsUndefined(new_target))
+        new_target = JS_GetActiveFunction(ctx);
+    proto = JS_GetProperty(ctx, new_target, JS_ATOM_prototype);
+    if (JS_IsException(proto))
+        return proto;
+    if (!JS_IsObject(proto)) {
+        JSContext *realm;
+        JSValueConst proto1;
+
+        JS_FreeValue(ctx, proto);
+        realm = JS_GetFunctionRealm(ctx, new_target);
+        if (!realm)
+            return JS_EXCEPTION;
+        if (magic < 0) {
+            proto1 = realm->class_proto[JS_CLASS_ERROR];
+        } else {
+            proto1 = realm->native_error_proto[magic];
+        }
+        proto = JS_DupValue(ctx, proto1);
+    }
+    obj = JS_NewObjectProtoClass(ctx, proto, JS_CLASS_ERROR);
+    JS_FreeValue(ctx, proto);
+    if (JS_IsException(obj))
+        return obj;
+    arg_index = (magic == JS_AGGREGATE_ERROR);
+
+    message = argv[arg_index++];
+    if (!JS_IsUndefined(message)) {
+        msg = JS_ToString(ctx, message);
+        if (unlikely(JS_IsException(msg)))
+            goto exception;
+        JS_DefinePropertyValue(ctx, obj, JS_ATOM_message, msg,
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    }
+
+    if (arg_index < argc) {
+        options = argv[arg_index];
+        if (JS_IsObject(options)) {
+            int present = JS_HasProperty(ctx, options, JS_ATOM_cause);
+            if (present < 0)
+                goto exception;
+            if (present) {
+                JSValue cause = JS_GetProperty(ctx, options, JS_ATOM_cause);
+                if (JS_IsException(cause))
+                    goto exception;
+                JS_DefinePropertyValue(ctx, obj, JS_ATOM_cause, cause,
+                                       JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+            }
+        }
+    }
+
+    if (magic == JS_AGGREGATE_ERROR) {
+        JSValue error_list = iterator_to_array(ctx, argv[0]);
+        if (JS_IsException(error_list))
+            goto exception;
+        JS_DefinePropertyValue(ctx, obj, JS_ATOM_errors, error_list,
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    }
+
+    /* skip the Error() function in the backtrace */
+    build_backtrace(ctx, obj, NULL, 0, JS_BACKTRACE_FLAG_SKIP_FIRST_LEVEL);
+    return obj;
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_error_toString(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue name, msg;
+
+    if (!JS_IsObject(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    name = JS_GetProperty(ctx, this_val, JS_ATOM_name);
+    if (JS_IsUndefined(name))
+        name = JS_AtomToString(ctx, JS_ATOM_Error);
+    else
+        name = JS_ToStringFree(ctx, name);
+    if (JS_IsException(name))
+        return JS_EXCEPTION;
+
+    msg = JS_GetProperty(ctx, this_val, JS_ATOM_message);
+    if (JS_IsUndefined(msg))
+        msg = JS_AtomToString(ctx, JS_ATOM_empty_string);
+    else
+        msg = JS_ToStringFree(ctx, msg);
+    if (JS_IsException(msg)) {
+        JS_FreeValue(ctx, name);
+        return JS_EXCEPTION;
+    }
+    if (!JS_IsEmptyString(name) && !JS_IsEmptyString(msg))
+        name = JS_ConcatString3(ctx, "", name, ": ");
+    return JS_ConcatString(ctx, name, msg);
+}
+
+static const JSCFunctionListEntry js_error_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_error_toString ),
+    JS_PROP_STRING_DEF("name", "Error", JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+    JS_PROP_STRING_DEF("message", "", JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+/* AggregateError */
+
+/* used by C code. */
+static JSValue js_aggregate_error_constructor(JSContext *ctx,
+                                              JSValueConst errors)
+{
+    JSValue obj;
+
+    obj = JS_NewObjectProtoClass(ctx,
+                                 ctx->native_error_proto[JS_AGGREGATE_ERROR],
+                                 JS_CLASS_ERROR);
+    if (JS_IsException(obj))
+        return obj;
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_errors, JS_DupValue(ctx, errors),
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    return obj;
+}
+
+/* Array */
+
+static int JS_CopySubArray(JSContext *ctx,
+                           JSValueConst obj, int64_t to_pos,
+                           int64_t from_pos, int64_t count, int dir)
+{
+    JSObject *p;
+    int64_t i, from, to, len;
+    JSValue val;
+    int fromPresent;
+
+    p = NULL;
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(obj);
+        if (p->class_id != JS_CLASS_ARRAY || !p->fast_array) {
+            p = NULL;
+        }
+    }
+
+    for (i = 0; i < count; ) {
+        if (dir < 0) {
+            from = from_pos + count - i - 1;
+            to = to_pos + count - i - 1;
+        } else {
+            from = from_pos + i;
+            to = to_pos + i;
+        }
+        if (p && p->fast_array &&
+            from >= 0 && from < (len = p->u.array.count)  &&
+            to >= 0 && to < len) {
+            int64_t l, j;
+            /* Fast path for fast arrays. Since we don't look at the
+               prototype chain, we can optimize only the cases where
+               all the elements are present in the array. */
+            l = count - i;
+            if (dir < 0) {
+                l = min_int64(l, from + 1);
+                l = min_int64(l, to + 1);
+                for(j = 0; j < l; j++) {
+                    set_value(ctx, &p->u.array.u.values[to - j],
+                              JS_DupValue(ctx, p->u.array.u.values[from - j]));
+                }
+            } else {
+                l = min_int64(l, len - from);
+                l = min_int64(l, len - to);
+                for(j = 0; j < l; j++) {
+                    set_value(ctx, &p->u.array.u.values[to + j],
+                              JS_DupValue(ctx, p->u.array.u.values[from + j]));
+                }
+            }
+            i += l;
+        } else {
+            fromPresent = JS_TryGetPropertyInt64(ctx, obj, from, &val);
+            if (fromPresent < 0)
+                goto exception;
+
+            if (fromPresent) {
+                if (JS_SetPropertyInt64(ctx, obj, to, val) < 0)
+                    goto exception;
+            } else {
+                if (JS_DeletePropertyInt64(ctx, obj, to, JS_PROP_THROW) < 0)
+                    goto exception;
+            }
+            i++;
+        }
+    }
+    return 0;
+
+ exception:
+    return -1;
+}
+
+static JSValue js_array_constructor(JSContext *ctx, JSValueConst new_target,
+                                    int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    int i;
+
+    obj = js_create_from_ctor(ctx, new_target, JS_CLASS_ARRAY);
+    if (JS_IsException(obj))
+        return obj;
+    if (argc == 1 && JS_IsNumber(argv[0])) {
+        uint32_t len;
+        if (JS_ToArrayLengthFree(ctx, &len, JS_DupValue(ctx, argv[0]), TRUE))
+            goto fail;
+        if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewUint32(ctx, len)) < 0)
+            goto fail;
+    } else {
+        for(i = 0; i < argc; i++) {
+            if (JS_SetPropertyUint32(ctx, obj, i, JS_DupValue(ctx, argv[i])) < 0)
+                goto fail;
+        }
+    }
+    return obj;
+fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_from(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    // from(items, mapfn = void 0, this_arg = void 0)
+    JSValueConst items = argv[0], mapfn, this_arg;
+    JSValueConst args[2];
+    JSValue stack[2];
+    JSValue iter, r, v, v2, arrayLike;
+    int64_t k, len;
+    int done, mapping;
+
+    mapping = FALSE;
+    mapfn = JS_UNDEFINED;
+    this_arg = JS_UNDEFINED;
+    r = JS_UNDEFINED;
+    arrayLike = JS_UNDEFINED;
+    stack[0] = JS_UNDEFINED;
+    stack[1] = JS_UNDEFINED;
+
+    if (argc > 1) {
+        mapfn = argv[1];
+        if (!JS_IsUndefined(mapfn)) {
+            if (check_function(ctx, mapfn))
+                goto exception;
+            mapping = 1;
+            if (argc > 2)
+                this_arg = argv[2];
+        }
+    }
+    iter = JS_GetProperty(ctx, items, JS_ATOM_Symbol_iterator);
+    if (JS_IsException(iter))
+        goto exception;
+    if (!JS_IsUndefined(iter)) {
+        JS_FreeValue(ctx, iter);
+        if (JS_IsConstructor(ctx, this_val))
+            r = JS_CallConstructor(ctx, this_val, 0, NULL);
+        else
+            r = JS_NewArray(ctx);
+        if (JS_IsException(r))
+            goto exception;
+        stack[0] = JS_DupValue(ctx, items);
+        if (js_for_of_start(ctx, &stack[1], FALSE))
+            goto exception;
+        for (k = 0;; k++) {
+            v = JS_IteratorNext(ctx, stack[0], stack[1], 0, NULL, &done);
+            if (JS_IsException(v))
+                goto exception_close;
+            if (done)
+                break;
+            if (mapping) {
+                args[0] = v;
+                args[1] = JS_NewInt32(ctx, k);
+                v2 = JS_Call(ctx, mapfn, this_arg, 2, args);
+                JS_FreeValue(ctx, v);
+                v = v2;
+                if (JS_IsException(v))
+                    goto exception_close;
+            }
+            if (JS_DefinePropertyValueInt64(ctx, r, k, v,
+                                            JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception_close;
+        }
+    } else {
+        arrayLike = JS_ToObject(ctx, items);
+        if (JS_IsException(arrayLike))
+            goto exception;
+        if (js_get_length64(ctx, &len, arrayLike) < 0)
+            goto exception;
+        v = JS_NewInt64(ctx, len);
+        args[0] = v;
+        if (JS_IsConstructor(ctx, this_val)) {
+            r = JS_CallConstructor(ctx, this_val, 1, args);
+        } else {
+            r = js_array_constructor(ctx, JS_UNDEFINED, 1, args);
+        }
+        JS_FreeValue(ctx, v);
+        if (JS_IsException(r))
+            goto exception;
+        for(k = 0; k < len; k++) {
+            v = JS_GetPropertyInt64(ctx, arrayLike, k);
+            if (JS_IsException(v))
+                goto exception;
+            if (mapping) {
+                args[0] = v;
+                args[1] = JS_NewInt32(ctx, k);
+                v2 = JS_Call(ctx, mapfn, this_arg, 2, args);
+                JS_FreeValue(ctx, v);
+                v = v2;
+                if (JS_IsException(v))
+                    goto exception;
+            }
+            if (JS_DefinePropertyValueInt64(ctx, r, k, v,
+                                            JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    if (JS_SetProperty(ctx, r, JS_ATOM_length, JS_NewUint32(ctx, k)) < 0)
+        goto exception;
+    goto done;
+
+ exception_close:
+    if (!JS_IsUndefined(stack[0]))
+        JS_IteratorClose(ctx, stack[0], TRUE);
+ exception:
+    JS_FreeValue(ctx, r);
+    r = JS_EXCEPTION;
+ done:
+    JS_FreeValue(ctx, arrayLike);
+    JS_FreeValue(ctx, stack[0]);
+    JS_FreeValue(ctx, stack[1]);
+    return r;
+}
+
+static JSValue js_array_of(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv)
+{
+    JSValue obj, args[1];
+    int i;
+
+    if (JS_IsConstructor(ctx, this_val)) {
+        args[0] = JS_NewInt32(ctx, argc);
+        obj = JS_CallConstructor(ctx, this_val, 1, (JSValueConst *)args);
+    } else {
+        obj = JS_NewArray(ctx);
+    }
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    for(i = 0; i < argc; i++) {
+        if (JS_CreateDataPropertyUint32(ctx, obj, i, JS_DupValue(ctx, argv[i]),
+                                        JS_PROP_THROW) < 0) {
+            goto fail;
+        }
+    }
+    if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewUint32(ctx, argc)) < 0) {
+    fail:
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    return obj;
+}
+
+static JSValue js_array_isArray(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    int ret;
+    ret = JS_IsArray(ctx, argv[0]);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_get_this(JSContext *ctx,
+                           JSValueConst this_val)
+{
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue JS_ArraySpeciesCreate(JSContext *ctx, JSValueConst obj,
+                                     JSValueConst len_val)
+{
+    JSValue ctor, ret, species;
+    int res;
+    JSContext *realm;
+
+    res = JS_IsArray(ctx, obj);
+    if (res < 0)
+        return JS_EXCEPTION;
+    if (!res)
+        return js_array_constructor(ctx, JS_UNDEFINED, 1, &len_val);
+    ctor = JS_GetProperty(ctx, obj, JS_ATOM_constructor);
+    if (JS_IsException(ctor))
+        return ctor;
+    if (JS_IsConstructor(ctx, ctor)) {
+        /* legacy web compatibility */
+        realm = JS_GetFunctionRealm(ctx, ctor);
+        if (!realm) {
+            JS_FreeValue(ctx, ctor);
+            return JS_EXCEPTION;
+        }
+        if (realm != ctx &&
+            js_same_value(ctx, ctor, realm->array_ctor)) {
+            JS_FreeValue(ctx, ctor);
+            ctor = JS_UNDEFINED;
+        }
+    }
+    if (JS_IsObject(ctor)) {
+        species = JS_GetProperty(ctx, ctor, JS_ATOM_Symbol_species);
+        JS_FreeValue(ctx, ctor);
+        if (JS_IsException(species))
+            return species;
+        ctor = species;
+        if (JS_IsNull(ctor))
+            ctor = JS_UNDEFINED;
+    }
+    if (JS_IsUndefined(ctor)) {
+        return js_array_constructor(ctx, JS_UNDEFINED, 1, &len_val);
+    } else {
+        ret = JS_CallConstructor(ctx, ctor, 1, &len_val);
+        JS_FreeValue(ctx, ctor);
+        return ret;
+    }
+}
+
+static const JSCFunctionListEntry js_array_funcs[] = {
+    JS_CFUNC_DEF("isArray", 1, js_array_isArray ),
+    JS_CFUNC_DEF("from", 1, js_array_from ),
+    JS_CFUNC_DEF("of", 0, js_array_of ),
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+};
+
+static int JS_isConcatSpreadable(JSContext *ctx, JSValueConst obj)
+{
+    JSValue val;
+
+    if (!JS_IsObject(obj))
+        return FALSE;
+    val = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_isConcatSpreadable);
+    if (JS_IsException(val))
+        return -1;
+    if (!JS_IsUndefined(val))
+        return JS_ToBoolFree(ctx, val);
+    return JS_IsArray(ctx, obj);
+}
+
+static JSValue js_array_at(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv)
+{
+    JSValue obj, ret;
+    int64_t len, idx;
+    JSValue *arrp;
+    uint32_t count;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    if (JS_ToInt64Sat(ctx, &idx, argv[0]))
+        goto exception;
+
+    if (idx < 0)
+        idx = len + idx;
+    if (idx < 0 || idx >= len) {
+        ret = JS_UNDEFINED;
+    } else if (js_get_fast_array(ctx, obj, &arrp, &count) && idx < count) {
+        ret = JS_DupValue(ctx, arrp[idx]);
+    } else {
+        int present = JS_TryGetPropertyInt64(ctx, obj, idx, &ret);
+        if (present < 0)
+            goto exception;
+        if (!present)
+            ret = JS_UNDEFINED;
+    }
+    JS_FreeValue(ctx, obj);
+    return ret;
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_with(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    JSValue arr, obj, ret, *arrp, *pval;
+    JSObject *p;
+    int64_t i, len, idx;
+    uint32_t count32;
+
+    ret = JS_EXCEPTION;
+    arr = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    if (JS_ToInt64Sat(ctx, &idx, argv[0]))
+        goto exception;
+
+    if (idx < 0)
+        idx = len + idx;
+
+    if (idx < 0 || idx >= len) {
+        JS_ThrowRangeError(ctx, "invalid array index: %" PRId64, idx);
+        goto exception;
+    }
+
+    arr = js_allocate_fast_array(ctx, len);
+    if (JS_IsException(arr))
+        goto exception;
+
+    p = JS_VALUE_GET_OBJ(arr);
+    i = 0;
+    pval = p->u.array.u.values;
+    if (js_get_fast_array(ctx, obj, &arrp, &count32) && count32 == len) {
+        for (; i < idx; i++, pval++)
+            *pval = JS_DupValue(ctx, arrp[i]);
+        *pval = JS_DupValue(ctx, argv[1]);
+        for (i++, pval++; i < len; i++, pval++)
+            *pval = JS_DupValue(ctx, arrp[i]);
+    } else {
+        for (; i < idx; i++, pval++)
+            if (-1 == JS_TryGetPropertyInt64(ctx, obj, i, pval))
+                goto fill_and_fail;
+        *pval = JS_DupValue(ctx, argv[1]);
+        for (i++, pval++; i < len; i++, pval++) {
+            if (-1 == JS_TryGetPropertyInt64(ctx, obj, i, pval)) {
+            fill_and_fail:
+                for (; i < len; i++, pval++)
+                    *pval = JS_UNDEFINED;
+                goto exception;
+            }
+        }
+    }
+
+    if (JS_SetProperty(ctx, arr, JS_ATOM_length, JS_NewInt64(ctx, len)) < 0)
+        goto exception;
+
+    ret = arr;
+    arr = JS_UNDEFINED;
+
+exception:
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, obj);
+    return ret;
+}
+
+static JSValue js_array_concat(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    JSValue obj, arr, val;
+    JSValueConst e;
+    int64_t len, k, n;
+    int i, res;
+
+    arr = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (JS_IsException(obj))
+        goto exception;
+
+    arr = JS_ArraySpeciesCreate(ctx, obj, JS_NewInt32(ctx, 0));
+    if (JS_IsException(arr))
+        goto exception;
+    n = 0;
+    for (i = -1; i < argc; i++) {
+        if (i < 0)
+            e = obj;
+        else
+            e = argv[i];
+
+        res = JS_isConcatSpreadable(ctx, e);
+        if (res < 0)
+            goto exception;
+        if (res) {
+            if (js_get_length64(ctx, &len, e))
+                goto exception;
+            if (n + len > MAX_SAFE_INTEGER) {
+                JS_ThrowTypeError(ctx, "Array loo long");
+                goto exception;
+            }
+            for (k = 0; k < len; k++, n++) {
+                res = JS_TryGetPropertyInt64(ctx, e, k, &val);
+                if (res < 0)
+                    goto exception;
+                if (res) {
+                    if (JS_DefinePropertyValueInt64(ctx, arr, n, val,
+                                                    JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                        goto exception;
+                }
+            }
+        } else {
+            if (n >= MAX_SAFE_INTEGER) {
+                JS_ThrowTypeError(ctx, "Array loo long");
+                goto exception;
+            }
+            if (JS_DefinePropertyValueInt64(ctx, arr, n, JS_DupValue(ctx, e),
+                                            JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception;
+            n++;
+        }
+    }
+    if (JS_SetProperty(ctx, arr, JS_ATOM_length, JS_NewInt64(ctx, n)) < 0)
+        goto exception;
+
+    JS_FreeValue(ctx, obj);
+    return arr;
+
+exception:
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+#define special_every    0
+#define special_some     1
+#define special_forEach  2
+#define special_map      3
+#define special_filter   4
+#define special_TA       8
+
+static int js_typed_array_get_length_internal(JSContext *ctx, JSValueConst obj);
+
+static JSValue js_typed_array___speciesCreate(JSContext *ctx,
+                                              JSValueConst this_val,
+                                              int argc, JSValueConst *argv);
+
+static JSValue js_array_every(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int special)
+{
+    JSValue obj, val, index_val, res, ret;
+    JSValueConst args[3];
+    JSValueConst func, this_arg;
+    int64_t len, k, n;
+    int present;
+
+    ret = JS_UNDEFINED;
+    val = JS_UNDEFINED;
+    if (special & special_TA) {
+        obj = JS_DupValue(ctx, this_val);
+        len = js_typed_array_get_length_internal(ctx, obj);
+        if (len < 0)
+            goto exception;
+    } else {
+        obj = JS_ToObject(ctx, this_val);
+        if (js_get_length64(ctx, &len, obj))
+            goto exception;
+    }
+    func = argv[0];
+    this_arg = JS_UNDEFINED;
+    if (argc > 1)
+        this_arg = argv[1];
+
+    if (check_function(ctx, func))
+        goto exception;
+
+    switch (special) {
+    case special_every:
+    case special_every | special_TA:
+        ret = JS_TRUE;
+        break;
+    case special_some:
+    case special_some | special_TA:
+        ret = JS_FALSE;
+        break;
+    case special_map:
+        /* XXX: JS_ArraySpeciesCreate should take int64_t */
+        ret = JS_ArraySpeciesCreate(ctx, obj, JS_NewInt64(ctx, len));
+        if (JS_IsException(ret))
+            goto exception;
+        break;
+    case special_filter:
+        ret = JS_ArraySpeciesCreate(ctx, obj, JS_NewInt32(ctx, 0));
+        if (JS_IsException(ret))
+            goto exception;
+        break;
+    case special_map | special_TA:
+        args[0] = obj;
+        args[1] = JS_NewInt32(ctx, len);
+        ret = js_typed_array___speciesCreate(ctx, JS_UNDEFINED, 2, args);
+        if (JS_IsException(ret))
+            goto exception;
+        break;
+    case special_filter | special_TA:
+        ret = JS_NewArray(ctx);
+        if (JS_IsException(ret))
+            goto exception;
+        break;
+    }
+    n = 0;
+
+    for(k = 0; k < len; k++) {
+        if (special & special_TA) {
+            val = JS_GetPropertyInt64(ctx, obj, k);
+            if (JS_IsException(val))
+                goto exception;
+            present = TRUE;
+        } else {
+            present = JS_TryGetPropertyInt64(ctx, obj, k, &val);
+            if (present < 0)
+                goto exception;
+        }
+        if (present) {
+            index_val = JS_NewInt64(ctx, k);
+            if (JS_IsException(index_val))
+                goto exception;
+            args[0] = val;
+            args[1] = index_val;
+            args[2] = obj;
+            res = JS_Call(ctx, func, this_arg, 3, args);
+            JS_FreeValue(ctx, index_val);
+            if (JS_IsException(res))
+                goto exception;
+            switch (special) {
+            case special_every:
+            case special_every | special_TA:
+                if (!JS_ToBoolFree(ctx, res)) {
+                    ret = JS_FALSE;
+                    goto done;
+                }
+                break;
+            case special_some:
+            case special_some | special_TA:
+                if (JS_ToBoolFree(ctx, res)) {
+                    ret = JS_TRUE;
+                    goto done;
+                }
+                break;
+            case special_map:
+                if (JS_DefinePropertyValueInt64(ctx, ret, k, res,
+                                                JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                    goto exception;
+                break;
+            case special_map | special_TA:
+                if (JS_SetPropertyValue(ctx, ret, JS_NewInt32(ctx, k), res, JS_PROP_THROW) < 0)
+                    goto exception;
+                break;
+            case special_filter:
+            case special_filter | special_TA:
+                if (JS_ToBoolFree(ctx, res)) {
+                    if (JS_DefinePropertyValueInt64(ctx, ret, n++, JS_DupValue(ctx, val),
+                                                    JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                        goto exception;
+                }
+                break;
+            default:
+                JS_FreeValue(ctx, res);
+                break;
+            }
+            JS_FreeValue(ctx, val);
+            val = JS_UNDEFINED;
+        }
+    }
+done:
+    if (special == (special_filter | special_TA)) {
+        JSValue arr;
+        args[0] = obj;
+        args[1] = JS_NewInt32(ctx, n);
+        arr = js_typed_array___speciesCreate(ctx, JS_UNDEFINED, 2, args);
+        if (JS_IsException(arr))
+            goto exception;
+        args[0] = ret;
+        res = JS_Invoke(ctx, arr, JS_ATOM_set, 1, args);
+        if (check_exception_free(ctx, res))
+            goto exception;
+        JS_FreeValue(ctx, ret);
+        ret = arr;
+    }
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return ret;
+
+exception:
+    JS_FreeValue(ctx, ret);
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+#define special_reduce       0
+#define special_reduceRight  1
+
+static JSValue js_array_reduce(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv, int special)
+{
+    JSValue obj, val, index_val, acc, acc1;
+    JSValueConst args[4];
+    JSValueConst func;
+    int64_t len, k, k1;
+    int present;
+
+    acc = JS_UNDEFINED;
+    val = JS_UNDEFINED;
+    if (special & special_TA) {
+        obj = JS_DupValue(ctx, this_val);
+        len = js_typed_array_get_length_internal(ctx, obj);
+        if (len < 0)
+            goto exception;
+    } else {
+        obj = JS_ToObject(ctx, this_val);
+        if (js_get_length64(ctx, &len, obj))
+            goto exception;
+    }
+    func = argv[0];
+
+    if (check_function(ctx, func))
+        goto exception;
+
+    k = 0;
+    if (argc > 1) {
+        acc = JS_DupValue(ctx, argv[1]);
+    } else {
+        for(;;) {
+            if (k >= len) {
+                JS_ThrowTypeError(ctx, "empty array");
+                goto exception;
+            }
+            k1 = (special & special_reduceRight) ? len - k - 1 : k;
+            k++;
+            if (special & special_TA) {
+                acc = JS_GetPropertyInt64(ctx, obj, k1);
+                if (JS_IsException(acc))
+                    goto exception;
+                break;
+            } else {
+                present = JS_TryGetPropertyInt64(ctx, obj, k1, &acc);
+                if (present < 0)
+                    goto exception;
+                if (present)
+                    break;
+            }
+        }
+    }
+    for (; k < len; k++) {
+        k1 = (special & special_reduceRight) ? len - k - 1 : k;
+        if (special & special_TA) {
+            val = JS_GetPropertyInt64(ctx, obj, k1);
+            if (JS_IsException(val))
+                goto exception;
+            present = TRUE;
+        } else {
+            present = JS_TryGetPropertyInt64(ctx, obj, k1, &val);
+            if (present < 0)
+                goto exception;
+        }
+        if (present) {
+            index_val = JS_NewInt64(ctx, k1);
+            if (JS_IsException(index_val))
+                goto exception;
+            args[0] = acc;
+            args[1] = val;
+            args[2] = index_val;
+            args[3] = obj;
+            acc1 = JS_Call(ctx, func, JS_UNDEFINED, 4, args);
+            JS_FreeValue(ctx, index_val);
+            JS_FreeValue(ctx, val);
+            val = JS_UNDEFINED;
+            if (JS_IsException(acc1))
+                goto exception;
+            JS_FreeValue(ctx, acc);
+            acc = acc1;
+        }
+    }
+    JS_FreeValue(ctx, obj);
+    return acc;
+
+exception:
+    JS_FreeValue(ctx, acc);
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_fill(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    int64_t len, start, end;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    start = 0;
+    if (argc > 1 && !JS_IsUndefined(argv[1])) {
+        if (JS_ToInt64Clamp(ctx, &start, argv[1], 0, len, len))
+            goto exception;
+    }
+
+    end = len;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        if (JS_ToInt64Clamp(ctx, &end, argv[2], 0, len, len))
+            goto exception;
+    }
+
+    /* XXX: should special case fast arrays */
+    while (start < end) {
+        if (JS_SetPropertyInt64(ctx, obj, start,
+                                JS_DupValue(ctx, argv[0])) < 0)
+            goto exception;
+        start++;
+    }
+    return obj;
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_includes(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue obj, val;
+    int64_t len, n;
+    JSValue *arrp;
+    uint32_t count;
+    int res;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    res = FALSE;
+    if (len > 0) {
+        n = 0;
+        if (argc > 1) {
+            if (JS_ToInt64Clamp(ctx, &n, argv[1], 0, len, len))
+                goto exception;
+        }
+        if (js_get_fast_array(ctx, obj, &arrp, &count)) {
+            for (; n < count; n++) {
+                if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]),
+                                  JS_DupValue(ctx, arrp[n]),
+                                  JS_EQ_SAME_VALUE_ZERO)) {
+                    res = TRUE;
+                    goto done;
+                }
+            }
+        }
+        for (; n < len; n++) {
+            val = JS_GetPropertyInt64(ctx, obj, n);
+            if (JS_IsException(val))
+                goto exception;
+            if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]), val,
+                              JS_EQ_SAME_VALUE_ZERO)) {
+                res = TRUE;
+                break;
+            }
+        }
+    }
+ done:
+    JS_FreeValue(ctx, obj);
+    return JS_NewBool(ctx, res);
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_indexOf(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue obj, val;
+    int64_t len, n, res;
+    JSValue *arrp;
+    uint32_t count;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    res = -1;
+    if (len > 0) {
+        n = 0;
+        if (argc > 1) {
+            if (JS_ToInt64Clamp(ctx, &n, argv[1], 0, len, len))
+                goto exception;
+        }
+        if (js_get_fast_array(ctx, obj, &arrp, &count)) {
+            for (; n < count; n++) {
+                if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]),
+                                  JS_DupValue(ctx, arrp[n]), JS_EQ_STRICT)) {
+                    res = n;
+                    goto done;
+                }
+            }
+        }
+        for (; n < len; n++) {
+            int present = JS_TryGetPropertyInt64(ctx, obj, n, &val);
+            if (present < 0)
+                goto exception;
+            if (present) {
+                if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]), val, JS_EQ_STRICT)) {
+                    res = n;
+                    break;
+                }
+            }
+        }
+    }
+ done:
+    JS_FreeValue(ctx, obj);
+    return JS_NewInt64(ctx, res);
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_lastIndexOf(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValue obj, val;
+    int64_t len, n, res;
+    int present;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    res = -1;
+    if (len > 0) {
+        n = len - 1;
+        if (argc > 1) {
+            if (JS_ToInt64Clamp(ctx, &n, argv[1], -1, len - 1, len))
+                goto exception;
+        }
+        /* XXX: should special case fast arrays */
+        for (; n >= 0; n--) {
+            present = JS_TryGetPropertyInt64(ctx, obj, n, &val);
+            if (present < 0)
+                goto exception;
+            if (present) {
+                if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]), val, JS_EQ_STRICT)) {
+                    res = n;
+                    break;
+                }
+            }
+        }
+    }
+    JS_FreeValue(ctx, obj);
+    return JS_NewInt64(ctx, res);
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+enum {
+    ArrayFind,
+    ArrayFindIndex,
+    ArrayFindLast,
+    ArrayFindLastIndex,
+};
+
+static JSValue js_array_find(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int mode)
+{
+    JSValueConst func, this_arg;
+    JSValueConst args[3];
+    JSValue obj, val, index_val, res;
+    int64_t len, k, end;
+    int dir;
+
+    index_val = JS_UNDEFINED;
+    val = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    func = argv[0];
+    if (check_function(ctx, func))
+        goto exception;
+
+    this_arg = JS_UNDEFINED;
+    if (argc > 1)
+        this_arg = argv[1];
+
+    k = 0;
+    dir = 1;
+    end = len;
+    if (mode == ArrayFindLast || mode == ArrayFindLastIndex) {
+        k = len - 1;
+        dir = -1;
+        end = -1;
+    }
+
+    // TODO(bnoordhuis) add fast path for fast arrays
+    for(; k != end; k += dir) {
+        index_val = JS_NewInt64(ctx, k);
+        if (JS_IsException(index_val))
+            goto exception;
+        val = JS_GetPropertyValue(ctx, obj, index_val);
+        if (JS_IsException(val))
+            goto exception;
+        args[0] = val;
+        args[1] = index_val;
+        args[2] = this_val;
+        res = JS_Call(ctx, func, this_arg, 3, args);
+        if (JS_IsException(res))
+            goto exception;
+        if (JS_ToBoolFree(ctx, res)) {
+            if (mode == ArrayFindIndex || mode == ArrayFindLastIndex) {
+                JS_FreeValue(ctx, val);
+                JS_FreeValue(ctx, obj);
+                return index_val;
+            } else {
+                JS_FreeValue(ctx, index_val);
+                JS_FreeValue(ctx, obj);
+                return val;
+            }
+        }
+        JS_FreeValue(ctx, val);
+        JS_FreeValue(ctx, index_val);
+    }
+    JS_FreeValue(ctx, obj);
+    if (mode == ArrayFindIndex || mode == ArrayFindLastIndex)
+        return JS_NewInt32(ctx, -1);
+    else
+        return JS_UNDEFINED;
+
+exception:
+    JS_FreeValue(ctx, index_val);
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_toString(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue obj, method, ret;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    method = JS_GetProperty(ctx, obj, JS_ATOM_join);
+    if (JS_IsException(method)) {
+        ret = JS_EXCEPTION;
+    } else
+    if (!JS_IsFunction(ctx, method)) {
+        /* Use intrinsic Object.prototype.toString */
+        JS_FreeValue(ctx, method);
+        ret = js_object_toString(ctx, obj, 0, NULL);
+    } else {
+        ret = JS_CallFree(ctx, method, obj, 0, NULL);
+    }
+    JS_FreeValue(ctx, obj);
+    return ret;
+}
+
+static JSValue js_array_join(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int toLocaleString)
+{
+    JSValue obj, sep = JS_UNDEFINED, el;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p = NULL;
+    int64_t i, n;
+    int c;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &n, obj))
+        goto exception;
+
+    c = ',';    /* default separator */
+    if (!toLocaleString && argc > 0 && !JS_IsUndefined(argv[0])) {
+        sep = JS_ToString(ctx, argv[0]);
+        if (JS_IsException(sep))
+            goto exception;
+        p = JS_VALUE_GET_STRING(sep);
+        if (p->len == 1 && !p->is_wide_char)
+            c = p->u.str8[0];
+        else
+            c = -1;
+    }
+    string_buffer_init(ctx, b, 0);
+
+    for(i = 0; i < n; i++) {
+        if (i > 0) {
+            if (c >= 0) {
+                string_buffer_putc8(b, c);
+            } else {
+                string_buffer_concat(b, p, 0, p->len);
+            }
+        }
+        el = JS_GetPropertyUint32(ctx, obj, i);
+        if (JS_IsException(el))
+            goto fail;
+        if (!JS_IsNull(el) && !JS_IsUndefined(el)) {
+            if (toLocaleString) {
+                el = JS_ToLocaleStringFree(ctx, el);
+            }
+            if (string_buffer_concat_value_free(b, el))
+                goto fail;
+        }
+    }
+    JS_FreeValue(ctx, sep);
+    JS_FreeValue(ctx, obj);
+    return string_buffer_end(b);
+
+fail:
+    string_buffer_free(b);
+    JS_FreeValue(ctx, sep);
+exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_pop(JSContext *ctx, JSValueConst this_val,
+                            int argc, JSValueConst *argv, int shift)
+{
+    JSValue obj, res = JS_UNDEFINED;
+    int64_t len, newLen;
+    JSValue *arrp;
+    uint32_t count32;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+    newLen = 0;
+    if (len > 0) {
+        newLen = len - 1;
+        /* Special case fast arrays */
+        if (js_get_fast_array(ctx, obj, &arrp, &count32) && count32 == len) {
+            JSObject *p = JS_VALUE_GET_OBJ(obj);
+            if (shift) {
+                res = arrp[0];
+                memmove(arrp, arrp + 1, (count32 - 1) * sizeof(*arrp));
+                p->u.array.count--;
+            } else {
+                res = arrp[count32 - 1];
+                p->u.array.count--;
+            }
+        } else {
+            if (shift) {
+                res = JS_GetPropertyInt64(ctx, obj, 0);
+                if (JS_IsException(res))
+                    goto exception;
+                if (JS_CopySubArray(ctx, obj, 0, 1, len - 1, +1))
+                    goto exception;
+            } else {
+                res = JS_GetPropertyInt64(ctx, obj, newLen);
+                if (JS_IsException(res))
+                    goto exception;
+            }
+            if (JS_DeletePropertyInt64(ctx, obj, newLen, JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewInt64(ctx, newLen)) < 0)
+        goto exception;
+
+    JS_FreeValue(ctx, obj);
+    return res;
+
+ exception:
+    JS_FreeValue(ctx, res);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_push(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int unshift)
+{
+    JSValue obj;
+    int i;
+    int64_t len, from, newLen;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+    newLen = len + argc;
+    if (newLen > MAX_SAFE_INTEGER) {
+        JS_ThrowTypeError(ctx, "Array loo long");
+        goto exception;
+    }
+    from = len;
+    if (unshift && argc > 0) {
+        if (JS_CopySubArray(ctx, obj, argc, 0, len, -1))
+            goto exception;
+        from = 0;
+    }
+    for(i = 0; i < argc; i++) {
+        if (JS_SetPropertyInt64(ctx, obj, from + i,
+                                JS_DupValue(ctx, argv[i])) < 0)
+            goto exception;
+    }
+    if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewInt64(ctx, newLen)) < 0)
+        goto exception;
+
+    JS_FreeValue(ctx, obj);
+    return JS_NewInt64(ctx, newLen);
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_reverse(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue obj, lval, hval;
+    JSValue *arrp;
+    int64_t len, l, h;
+    int l_present, h_present;
+    uint32_t count32;
+
+    lval = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    /* Special case fast arrays */
+    if (js_get_fast_array(ctx, obj, &arrp, &count32) && count32 == len) {
+        uint32_t ll, hh;
+
+        if (count32 > 1) {
+            for (ll = 0, hh = count32 - 1; ll < hh; ll++, hh--) {
+                lval = arrp[ll];
+                arrp[ll] = arrp[hh];
+                arrp[hh] = lval;
+            }
+        }
+        return obj;
+    }
+
+    for (l = 0, h = len - 1; l < h; l++, h--) {
+        l_present = JS_TryGetPropertyInt64(ctx, obj, l, &lval);
+        if (l_present < 0)
+            goto exception;
+        h_present = JS_TryGetPropertyInt64(ctx, obj, h, &hval);
+        if (h_present < 0)
+            goto exception;
+        if (h_present) {
+            if (JS_SetPropertyInt64(ctx, obj, l, hval) < 0)
+                goto exception;
+
+            if (l_present) {
+                if (JS_SetPropertyInt64(ctx, obj, h, lval) < 0) {
+                    lval = JS_UNDEFINED;
+                    goto exception;
+                }
+                lval = JS_UNDEFINED;
+            } else {
+                if (JS_DeletePropertyInt64(ctx, obj, h, JS_PROP_THROW) < 0)
+                    goto exception;
+            }
+        } else {
+            if (l_present) {
+                if (JS_DeletePropertyInt64(ctx, obj, l, JS_PROP_THROW) < 0)
+                    goto exception;
+                if (JS_SetPropertyInt64(ctx, obj, h, lval) < 0) {
+                    lval = JS_UNDEFINED;
+                    goto exception;
+                }
+                lval = JS_UNDEFINED;
+            }
+        }
+    }
+    return obj;
+
+ exception:
+    JS_FreeValue(ctx, lval);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+// Note: a.toReversed() is a.slice().reverse() with the twist that a.slice()
+// leaves holes in sparse arrays intact whereas a.toReversed() replaces them
+// with undefined, thus in effect creating a dense array.
+// Does not use Array[@@species], always returns a base Array.
+static JSValue js_array_toReversed(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSValue arr, obj, ret, *arrp, *pval;
+    JSObject *p;
+    int64_t i, len;
+    uint32_t count32;
+
+    ret = JS_EXCEPTION;
+    arr = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    arr = js_allocate_fast_array(ctx, len);
+    if (JS_IsException(arr))
+        goto exception;
+
+    if (len > 0) {
+        p = JS_VALUE_GET_OBJ(arr);
+
+        i = len - 1;
+        pval = p->u.array.u.values;
+        if (js_get_fast_array(ctx, obj, &arrp, &count32) && count32 == len) {
+            for (; i >= 0; i--, pval++)
+                *pval = JS_DupValue(ctx, arrp[i]);
+        } else {
+            // Query order is observable; test262 expects descending order.
+            for (; i >= 0; i--, pval++) {
+                if (-1 == JS_TryGetPropertyInt64(ctx, obj, i, pval)) {
+                    // Exception; initialize remaining elements.
+                    for (; i >= 0; i--, pval++)
+                        *pval = JS_UNDEFINED;
+                    goto exception;
+                }
+            }
+        }
+
+        if (JS_SetProperty(ctx, arr, JS_ATOM_length, JS_NewInt64(ctx, len)) < 0)
+            goto exception;
+    }
+
+    ret = arr;
+    arr = JS_UNDEFINED;
+
+exception:
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, obj);
+    return ret;
+}
+
+static JSValue js_array_slice(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int splice)
+{
+    JSValue obj, arr, val, len_val;
+    int64_t len, start, k, final, n, count, del_count, new_len;
+    int kPresent;
+    JSValue *arrp;
+    uint32_t count32, i, item_count;
+
+    arr = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    if (JS_ToInt64Clamp(ctx, &start, argv[0], 0, len, len))
+        goto exception;
+
+    if (splice) {
+        if (argc == 0) {
+            item_count = 0;
+            del_count = 0;
+        } else
+        if (argc == 1) {
+            item_count = 0;
+            del_count = len - start;
+        } else {
+            item_count = argc - 2;
+            if (JS_ToInt64Clamp(ctx, &del_count, argv[1], 0, len - start, 0))
+                goto exception;
+        }
+        if (len + item_count - del_count > MAX_SAFE_INTEGER) {
+            JS_ThrowTypeError(ctx, "Array loo long");
+            goto exception;
+        }
+        count = del_count;
+    } else {
+        item_count = 0; /* avoid warning */
+        final = len;
+        if (!JS_IsUndefined(argv[1])) {
+            if (JS_ToInt64Clamp(ctx, &final, argv[1], 0, len, len))
+                goto exception;
+        }
+        count = max_int64(final - start, 0);
+    }
+    len_val = JS_NewInt64(ctx, count);
+    arr = JS_ArraySpeciesCreate(ctx, obj, len_val);
+    JS_FreeValue(ctx, len_val);
+    if (JS_IsException(arr))
+        goto exception;
+
+    k = start;
+    final = start + count;
+    n = 0;
+    /* The fast array test on arr ensures that
+       JS_CreateDataPropertyUint32() won't modify obj in case arr is
+       an exotic object */
+    /* Special case fast arrays */
+    if (js_get_fast_array(ctx, obj, &arrp, &count32) &&
+        js_is_fast_array(ctx, arr)) {
+        /* XXX: should share code with fast array constructor */
+        for (; k < final && k < count32; k++, n++) {
+            if (JS_CreateDataPropertyUint32(ctx, arr, n, JS_DupValue(ctx, arrp[k]), JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    /* Copy the remaining elements if any (handle case of inherited properties) */
+    for (; k < final; k++, n++) {
+        kPresent = JS_TryGetPropertyInt64(ctx, obj, k, &val);
+        if (kPresent < 0)
+            goto exception;
+        if (kPresent) {
+            if (JS_CreateDataPropertyUint32(ctx, arr, n, val, JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    if (JS_SetProperty(ctx, arr, JS_ATOM_length, JS_NewInt64(ctx, n)) < 0)
+        goto exception;
+
+    if (splice) {
+        new_len = len + item_count - del_count;
+        if (item_count != del_count) {
+            if (JS_CopySubArray(ctx, obj, start + item_count,
+                                start + del_count, len - (start + del_count),
+                                item_count <= del_count ? +1 : -1) < 0)
+                goto exception;
+
+            for (k = len; k-- > new_len; ) {
+                if (JS_DeletePropertyInt64(ctx, obj, k, JS_PROP_THROW) < 0)
+                    goto exception;
+            }
+        }
+        for (i = 0; i < item_count; i++) {
+            if (JS_SetPropertyInt64(ctx, obj, start + i, JS_DupValue(ctx, argv[i + 2])) < 0)
+                goto exception;
+        }
+        if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewInt64(ctx, new_len)) < 0)
+            goto exception;
+    }
+    JS_FreeValue(ctx, obj);
+    return arr;
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_toSpliced(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue arr, obj, ret, *arrp, *pval, *last;
+    JSObject *p;
+    int64_t i, j, len, newlen, start, add, del;
+    uint32_t count32;
+
+    pval = NULL;
+    last = NULL;
+    ret = JS_EXCEPTION;
+    arr = JS_UNDEFINED;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    start = 0;
+    if (argc > 0)
+        if (JS_ToInt64Clamp(ctx, &start, argv[0], 0, len, len))
+            goto exception;
+
+    del = 0;
+    if (argc > 0)
+        del = len - start;
+    if (argc > 1)
+        if (JS_ToInt64Clamp(ctx, &del, argv[1], 0, del, 0))
+            goto exception;
+
+    add = 0;
+    if (argc > 2)
+        add = argc - 2;
+
+    newlen = len + add - del;
+    if (newlen > MAX_SAFE_INTEGER) {
+        JS_ThrowTypeError(ctx, "invalid array length");
+        goto exception;
+    }
+
+    arr = js_allocate_fast_array(ctx, newlen);
+    if (JS_IsException(arr))
+        goto exception;
+
+    if (newlen <= 0)
+        goto done;
+
+    p = JS_VALUE_GET_OBJ(arr);
+    pval = &p->u.array.u.values[0];
+    last = &p->u.array.u.values[newlen];
+
+    if (js_get_fast_array(ctx, obj, &arrp, &count32) && count32 == len) {
+        for (i = 0; i < start; i++, pval++)
+            *pval = JS_DupValue(ctx, arrp[i]);
+        for (j = 0; j < add; j++, pval++)
+            *pval = JS_DupValue(ctx, argv[2 + j]);
+        for (i += del; i < len; i++, pval++)
+            *pval = JS_DupValue(ctx, arrp[i]);
+    } else {
+        for (i = 0; i < start; i++, pval++)
+            if (-1 == JS_TryGetPropertyInt64(ctx, obj, i, pval))
+                goto exception;
+        for (j = 0; j < add; j++, pval++)
+            *pval = JS_DupValue(ctx, argv[2 + j]);
+        for (i += del; i < len; i++, pval++)
+            if (-1 == JS_TryGetPropertyInt64(ctx, obj, i, pval))
+                goto exception;
+    }
+
+    assert(pval == last);
+
+    if (JS_SetProperty(ctx, arr, JS_ATOM_length, JS_NewInt64(ctx, newlen)) < 0)
+        goto exception;
+
+done:
+    ret = arr;
+    arr = JS_UNDEFINED;
+
+exception:
+    while (pval != last)
+        *pval++ = JS_UNDEFINED;
+
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, obj);
+    return ret;
+}
+
+static JSValue js_array_copyWithin(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    int64_t len, from, to, final, count;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    if (JS_ToInt64Clamp(ctx, &to, argv[0], 0, len, len))
+        goto exception;
+
+    if (JS_ToInt64Clamp(ctx, &from, argv[1], 0, len, len))
+        goto exception;
+
+    final = len;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        if (JS_ToInt64Clamp(ctx, &final, argv[2], 0, len, len))
+            goto exception;
+    }
+
+    count = min_int64(final - from, len - to);
+
+    if (JS_CopySubArray(ctx, obj, to, from, count,
+                        (from < to && to < from + count) ? -1 : +1))
+        goto exception;
+
+    return obj;
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static int64_t JS_FlattenIntoArray(JSContext *ctx, JSValueConst target,
+                                   JSValueConst source, int64_t sourceLen,
+                                   int64_t targetIndex, int depth,
+                                   JSValueConst mapperFunction,
+                                   JSValueConst thisArg)
+{
+    JSValue element;
+    int64_t sourceIndex, elementLen;
+    int present, is_array;
+
+    if (js_check_stack_overflow(ctx->rt, 0)) {
+        JS_ThrowStackOverflow(ctx);
+        return -1;
+    }
+
+    for (sourceIndex = 0; sourceIndex < sourceLen; sourceIndex++) {
+        present = JS_TryGetPropertyInt64(ctx, source, sourceIndex, &element);
+        if (present < 0)
+            return -1;
+        if (!present)
+            continue;
+        if (!JS_IsUndefined(mapperFunction)) {
+            JSValueConst args[3] = { element, JS_NewInt64(ctx, sourceIndex), source };
+            element = JS_Call(ctx, mapperFunction, thisArg, 3, args);
+            JS_FreeValue(ctx, args[0]);
+            JS_FreeValue(ctx, args[1]);
+            if (JS_IsException(element))
+                return -1;
+        }
+        if (depth > 0) {
+            is_array = JS_IsArray(ctx, element);
+            if (is_array < 0)
+                goto fail;
+            if (is_array) {
+                if (js_get_length64(ctx, &elementLen, element) < 0)
+                    goto fail;
+                targetIndex = JS_FlattenIntoArray(ctx, target, element,
+                                                  elementLen, targetIndex,
+                                                  depth - 1,
+                                                  JS_UNDEFINED, JS_UNDEFINED);
+                if (targetIndex < 0)
+                    goto fail;
+                JS_FreeValue(ctx, element);
+                continue;
+            }
+        }
+        if (targetIndex >= MAX_SAFE_INTEGER) {
+            JS_ThrowTypeError(ctx, "Array too long");
+            goto fail;
+        }
+        if (JS_DefinePropertyValueInt64(ctx, target, targetIndex, element,
+                                        JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+            return -1;
+        targetIndex++;
+    }
+    return targetIndex;
+
+fail:
+    JS_FreeValue(ctx, element);
+    return -1;
+}
+
+static JSValue js_array_flatten(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv, int map)
+{
+    JSValue obj, arr;
+    JSValueConst mapperFunction, thisArg;
+    int64_t sourceLen;
+    int depthNum;
+
+    arr = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &sourceLen, obj))
+        goto exception;
+
+    depthNum = 1;
+    mapperFunction = JS_UNDEFINED;
+    thisArg = JS_UNDEFINED;
+    if (map) {
+        mapperFunction = argv[0];
+        if (argc > 1) {
+            thisArg = argv[1];
+        }
+        if (check_function(ctx, mapperFunction))
+            goto exception;
+    } else {
+        if (argc > 0 && !JS_IsUndefined(argv[0])) {
+            if (JS_ToInt32Sat(ctx, &depthNum, argv[0]) < 0)
+                goto exception;
+        }
+    }
+    arr = JS_ArraySpeciesCreate(ctx, obj, JS_NewInt32(ctx, 0));
+    if (JS_IsException(arr))
+        goto exception;
+    if (JS_FlattenIntoArray(ctx, arr, obj, sourceLen, 0, depthNum,
+                            mapperFunction, thisArg) < 0)
+        goto exception;
+    JS_FreeValue(ctx, obj);
+    return arr;
+
+exception:
+    JS_FreeValue(ctx, obj);
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+/* Array sort */
+
+typedef struct ValueSlot {
+    JSValue val;
+    JSString *str;
+    int64_t pos;
+} ValueSlot;
+
+struct array_sort_context {
+    JSContext *ctx;
+    int exception;
+    int has_method;
+    JSValueConst method;
+};
+
+static int js_array_cmp_generic(const void *a, const void *b, void *opaque) {
+    struct array_sort_context *psc = opaque;
+    JSContext *ctx = psc->ctx;
+    JSValueConst argv[2];
+    JSValue res;
+    ValueSlot *ap = (ValueSlot *)(void *)a;
+    ValueSlot *bp = (ValueSlot *)(void *)b;
+    int cmp;
+
+    if (psc->exception)
+        return 0;
+
+    if (psc->has_method) {
+        /* custom sort function is specified as returning 0 for identical
+         * objects: avoid method call overhead.
+         */
+        if (!memcmp(&ap->val, &bp->val, sizeof(ap->val)))
+            goto cmp_same;
+        argv[0] = ap->val;
+        argv[1] = bp->val;
+        res = JS_Call(ctx, psc->method, JS_UNDEFINED, 2, argv);
+        if (JS_IsException(res))
+            goto exception;
+        if (JS_VALUE_GET_TAG(res) == JS_TAG_INT) {
+            int val = JS_VALUE_GET_INT(res);
+            cmp = (val > 0) - (val < 0);
+        } else {
+            double val;
+            if (JS_ToFloat64Free(ctx, &val, res) < 0)
+                goto exception;
+            cmp = (val > 0) - (val < 0);
+        }
+    } else {
+        /* Not supposed to bypass ToString even for identical objects as
+         * tested in test262/test/built-ins/Array/prototype/sort/bug_596_1.js
+         */
+        if (!ap->str) {
+            JSValue str = JS_ToString(ctx, ap->val);
+            if (JS_IsException(str))
+                goto exception;
+            ap->str = JS_VALUE_GET_STRING(str);
+        }
+        if (!bp->str) {
+            JSValue str = JS_ToString(ctx, bp->val);
+            if (JS_IsException(str))
+                goto exception;
+            bp->str = JS_VALUE_GET_STRING(str);
+        }
+        cmp = js_string_compare(ctx, ap->str, bp->str);
+    }
+    if (cmp != 0)
+        return cmp;
+cmp_same:
+    /* make sort stable: compare array offsets */
+    return (ap->pos > bp->pos) - (ap->pos < bp->pos);
+
+exception:
+    psc->exception = 1;
+    return 0;
+}
+
+static JSValue js_array_sort(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    struct array_sort_context asc = { ctx, 0, 0, argv[0] };
+    JSValue obj = JS_UNDEFINED;
+    ValueSlot *array = NULL;
+    size_t array_size = 0, pos = 0, n = 0;
+    int64_t i, len, undefined_count = 0;
+    int present;
+
+    if (!JS_IsUndefined(asc.method)) {
+        if (check_function(ctx, asc.method))
+            goto exception;
+        asc.has_method = 1;
+    }
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    /* XXX: should special case fast arrays */
+    for (i = 0; i < len; i++) {
+        if (pos >= array_size) {
+            size_t new_size, slack;
+            ValueSlot *new_array;
+            new_size = (array_size + (array_size >> 1) + 31) & ~15;
+            new_array = js_realloc2(ctx, array, new_size * sizeof(*array), &slack);
+            if (new_array == NULL)
+                goto exception;
+            new_size += slack / sizeof(*new_array);
+            array = new_array;
+            array_size = new_size;
+        }
+        present = JS_TryGetPropertyInt64(ctx, obj, i, &array[pos].val);
+        if (present < 0)
+            goto exception;
+        if (present == 0)
+            continue;
+        if (JS_IsUndefined(array[pos].val)) {
+            undefined_count++;
+            continue;
+        }
+        array[pos].str = NULL;
+        array[pos].pos = i;
+        pos++;
+    }
+    rqsort(array, pos, sizeof(*array), js_array_cmp_generic, &asc);
+    if (asc.exception)
+        goto exception;
+
+    /* XXX: should special case fast arrays */
+    while (n < pos) {
+        if (array[n].str)
+            JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, array[n].str));
+        if (array[n].pos == n) {
+            JS_FreeValue(ctx, array[n].val);
+        } else {
+            if (JS_SetPropertyInt64(ctx, obj, n, array[n].val) < 0) {
+                n++;
+                goto exception;
+            }
+        }
+        n++;
+    }
+    js_free(ctx, array);
+    for (i = n; undefined_count-- > 0; i++) {
+        if (JS_SetPropertyInt64(ctx, obj, i, JS_UNDEFINED) < 0)
+            goto fail;
+    }
+    for (; i < len; i++) {
+        if (JS_DeletePropertyInt64(ctx, obj, i, JS_PROP_THROW) < 0)
+            goto fail;
+    }
+    return obj;
+
+exception:
+    for (; n < pos; n++) {
+        JS_FreeValue(ctx, array[n].val);
+        if (array[n].str)
+            JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, array[n].str));
+    }
+    js_free(ctx, array);
+fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+// Note: a.toSorted() is a.slice().sort() with the twist that a.slice()
+// leaves holes in sparse arrays intact whereas a.toSorted() replaces them
+// with undefined, thus in effect creating a dense array.
+// Does not use Array[@@species], always returns a base Array.
+static JSValue js_array_toSorted(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue arr, obj, ret, *arrp, *pval;
+    JSObject *p;
+    int64_t i, len;
+    uint32_t count32;
+    int ok;
+
+    ok = JS_IsUndefined(argv[0]) || JS_IsFunction(ctx, argv[0]);
+    if (!ok)
+        return JS_ThrowTypeError(ctx, "not a function");
+
+    ret = JS_EXCEPTION;
+    arr = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    arr = js_allocate_fast_array(ctx, len);
+    if (JS_IsException(arr))
+        goto exception;
+
+    if (len > 0) {
+        p = JS_VALUE_GET_OBJ(arr);
+        i = 0;
+        pval = p->u.array.u.values;
+        if (js_get_fast_array(ctx, obj, &arrp, &count32) && count32 == len) {
+            for (; i < len; i++, pval++)
+                *pval = JS_DupValue(ctx, arrp[i]);
+        } else {
+            for (; i < len; i++, pval++) {
+                if (-1 == JS_TryGetPropertyInt64(ctx, obj, i, pval)) {
+                    for (; i < len; i++, pval++)
+                        *pval = JS_UNDEFINED;
+                    goto exception;
+                }
+            }
+        }
+
+        if (JS_SetProperty(ctx, arr, JS_ATOM_length, JS_NewInt64(ctx, len)) < 0)
+            goto exception;
+    }
+
+    ret = js_array_sort(ctx, arr, argc, argv);
+    if (JS_IsException(ret))
+        goto exception;
+    JS_FreeValue(ctx, ret);
+
+    ret = arr;
+    arr = JS_UNDEFINED;
+
+exception:
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, obj);
+    return ret;
+}
+
+typedef struct JSArrayIteratorData {
+    JSValue obj;
+    JSIteratorKindEnum kind;
+    uint32_t idx;
+} JSArrayIteratorData;
+
+static void js_array_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSArrayIteratorData *it = p->u.array_iterator_data;
+    if (it) {
+        JS_FreeValueRT(rt, it->obj);
+        js_free_rt(rt, it);
+    }
+}
+
+static void js_array_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                   JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSArrayIteratorData *it = p->u.array_iterator_data;
+    if (it) {
+        JS_MarkValue(rt, it->obj, mark_func);
+    }
+}
+
+static JSValue js_create_array(JSContext *ctx, int len, JSValueConst *tab)
+{
+    JSValue obj;
+    int i;
+
+    obj = JS_NewArray(ctx);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    for(i = 0; i < len; i++) {
+        if (JS_CreateDataPropertyUint32(ctx, obj, i, JS_DupValue(ctx, tab[i]), 0) < 0) {
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+    }
+    return obj;
+}
+
+static JSValue js_create_array_iterator(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv, int magic)
+{
+    JSValue enum_obj, arr;
+    JSArrayIteratorData *it;
+    JSIteratorKindEnum kind;
+    int class_id;
+
+    kind = magic & 3;
+    if (magic & 4) {
+        /* string iterator case */
+        arr = JS_ToStringCheckObject(ctx, this_val);
+        class_id = JS_CLASS_STRING_ITERATOR;
+    } else {
+        arr = JS_ToObject(ctx, this_val);
+        class_id = JS_CLASS_ARRAY_ITERATOR;
+    }
+    if (JS_IsException(arr))
+        goto fail;
+    enum_obj = JS_NewObjectClass(ctx, class_id);
+    if (JS_IsException(enum_obj))
+        goto fail;
+    it = js_malloc(ctx, sizeof(*it));
+    if (!it)
+        goto fail1;
+    it->obj = arr;
+    it->kind = kind;
+    it->idx = 0;
+    JS_SetOpaque(enum_obj, it);
+    return enum_obj;
+ fail1:
+    JS_FreeValue(ctx, enum_obj);
+ fail:
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv,
+                                      BOOL *pdone, int magic)
+{
+    JSArrayIteratorData *it;
+    uint32_t len, idx;
+    JSValue val, obj;
+    JSObject *p;
+
+    it = JS_GetOpaque2(ctx, this_val, JS_CLASS_ARRAY_ITERATOR);
+    if (!it)
+        goto fail1;
+    if (JS_IsUndefined(it->obj))
+        goto done;
+    p = JS_VALUE_GET_OBJ(it->obj);
+    if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+        p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+        if (typed_array_is_detached(ctx, p)) {
+            JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+            goto fail1;
+        }
+        len = p->u.array.count;
+    } else {
+        if (js_get_length32(ctx, &len, it->obj)) {
+        fail1:
+            *pdone = FALSE;
+            return JS_EXCEPTION;
+        }
+    }
+    idx = it->idx;
+    if (idx >= len) {
+        JS_FreeValue(ctx, it->obj);
+        it->obj = JS_UNDEFINED;
+    done:
+        *pdone = TRUE;
+        return JS_UNDEFINED;
+    }
+    it->idx = idx + 1;
+    *pdone = FALSE;
+    if (it->kind == JS_ITERATOR_KIND_KEY) {
+        return JS_NewUint32(ctx, idx);
+    } else {
+        val = JS_GetPropertyUint32(ctx, it->obj, idx);
+        if (JS_IsException(val))
+            return JS_EXCEPTION;
+        if (it->kind == JS_ITERATOR_KIND_VALUE) {
+            return val;
+        } else {
+            JSValueConst args[2];
+            JSValue num;
+            num = JS_NewUint32(ctx, idx);
+            args[0] = num;
+            args[1] = val;
+            obj = js_create_array(ctx, 2, args);
+            JS_FreeValue(ctx, val);
+            JS_FreeValue(ctx, num);
+            return obj;
+        }
+    }
+}
+
+static JSValue js_iterator_proto_iterator(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv)
+{
+    return JS_DupValue(ctx, this_val);
+}
+
+static const JSCFunctionListEntry js_iterator_proto_funcs[] = {
+    JS_CFUNC_DEF("[Symbol.iterator]", 0, js_iterator_proto_iterator ),
+};
+
+static const JSCFunctionListEntry js_array_proto_funcs[] = {
+    JS_CFUNC_DEF("at", 1, js_array_at ),
+    JS_CFUNC_DEF("with", 2, js_array_with ),
+    JS_CFUNC_DEF("concat", 1, js_array_concat ),
+    JS_CFUNC_MAGIC_DEF("every", 1, js_array_every, special_every ),
+    JS_CFUNC_MAGIC_DEF("some", 1, js_array_every, special_some ),
+    JS_CFUNC_MAGIC_DEF("forEach", 1, js_array_every, special_forEach ),
+    JS_CFUNC_MAGIC_DEF("map", 1, js_array_every, special_map ),
+    JS_CFUNC_MAGIC_DEF("filter", 1, js_array_every, special_filter ),
+    JS_CFUNC_MAGIC_DEF("reduce", 1, js_array_reduce, special_reduce ),
+    JS_CFUNC_MAGIC_DEF("reduceRight", 1, js_array_reduce, special_reduceRight ),
+    JS_CFUNC_DEF("fill", 1, js_array_fill ),
+    JS_CFUNC_MAGIC_DEF("find", 1, js_array_find, ArrayFind ),
+    JS_CFUNC_MAGIC_DEF("findIndex", 1, js_array_find, ArrayFindIndex ),
+    JS_CFUNC_MAGIC_DEF("findLast", 1, js_array_find, ArrayFindLast ),
+    JS_CFUNC_MAGIC_DEF("findLastIndex", 1, js_array_find, ArrayFindLastIndex ),
+    JS_CFUNC_DEF("indexOf", 1, js_array_indexOf ),
+    JS_CFUNC_DEF("lastIndexOf", 1, js_array_lastIndexOf ),
+    JS_CFUNC_DEF("includes", 1, js_array_includes ),
+    JS_CFUNC_MAGIC_DEF("join", 1, js_array_join, 0 ),
+    JS_CFUNC_DEF("toString", 0, js_array_toString ),
+    JS_CFUNC_MAGIC_DEF("toLocaleString", 0, js_array_join, 1 ),
+    JS_CFUNC_MAGIC_DEF("pop", 0, js_array_pop, 0 ),
+    JS_CFUNC_MAGIC_DEF("push", 1, js_array_push, 0 ),
+    JS_CFUNC_MAGIC_DEF("shift", 0, js_array_pop, 1 ),
+    JS_CFUNC_MAGIC_DEF("unshift", 1, js_array_push, 1 ),
+    JS_CFUNC_DEF("reverse", 0, js_array_reverse ),
+    JS_CFUNC_DEF("toReversed", 0, js_array_toReversed ),
+    JS_CFUNC_DEF("sort", 1, js_array_sort ),
+    JS_CFUNC_DEF("toSorted", 1, js_array_toSorted ),
+    JS_CFUNC_MAGIC_DEF("slice", 2, js_array_slice, 0 ),
+    JS_CFUNC_MAGIC_DEF("splice", 2, js_array_slice, 1 ),
+    JS_CFUNC_DEF("toSpliced", 2, js_array_toSpliced ),
+    JS_CFUNC_DEF("copyWithin", 2, js_array_copyWithin ),
+    JS_CFUNC_MAGIC_DEF("flatMap", 1, js_array_flatten, 1 ),
+    JS_CFUNC_MAGIC_DEF("flat", 0, js_array_flatten, 0 ),
+    JS_CFUNC_MAGIC_DEF("values", 0, js_create_array_iterator, JS_ITERATOR_KIND_VALUE ),
+    JS_ALIAS_DEF("[Symbol.iterator]", "values" ),
+    JS_CFUNC_MAGIC_DEF("keys", 0, js_create_array_iterator, JS_ITERATOR_KIND_KEY ),
+    JS_CFUNC_MAGIC_DEF("entries", 0, js_create_array_iterator, JS_ITERATOR_KIND_KEY_AND_VALUE ),
+};
+
+static const JSCFunctionListEntry js_array_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_array_iterator_next, 0 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Array Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+/* Number */
+
+static JSValue js_number_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, obj;
+    if (argc == 0) {
+        val = JS_NewInt32(ctx, 0);
+    } else {
+        val = JS_ToNumeric(ctx, argv[0]);
+        if (JS_IsException(val))
+            return val;
+        switch(JS_VALUE_GET_TAG(val)) {
+        case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+        case JS_TAG_BIG_FLOAT:
+#endif
+            {
+                JSBigFloat *p = JS_VALUE_GET_PTR(val);
+                double d;
+                bf_get_float64(&p->num, &d, BF_RNDN);
+                JS_FreeValue(ctx, val);
+                val = JS_NewFloat64(ctx, d);
+            }
+            break;
+#ifdef CONFIG_BIGNUM
+        case JS_TAG_BIG_DECIMAL:
+            val = JS_ToStringFree(ctx, val);
+            if (JS_IsException(val))
+                return val;
+            val = JS_ToNumberFree(ctx, val);
+            if (JS_IsException(val))
+                return val;
+            break;
+#endif
+        default:
+            break;
+        }
+    }
+    if (!JS_IsUndefined(new_target)) {
+        obj = js_create_from_ctor(ctx, new_target, JS_CLASS_NUMBER);
+        if (!JS_IsException(obj))
+            JS_SetObjectData(ctx, obj, val);
+        return obj;
+    } else {
+        return val;
+    }
+}
+
+#if 0
+static JSValue js_number___toInteger(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    return JS_ToIntegerFree(ctx, JS_DupValue(ctx, argv[0]));
+}
+
+static JSValue js_number___toLength(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    int64_t v;
+    if (JS_ToLengthFree(ctx, &v, JS_DupValue(ctx, argv[0])))
+        return JS_EXCEPTION;
+    return JS_NewInt64(ctx, v);
+}
+#endif
+
+static JSValue js_number_isNaN(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    if (!JS_IsNumber(argv[0]))
+        return JS_FALSE;
+    return js_global_isNaN(ctx, this_val, argc, argv);
+}
+
+static JSValue js_number_isFinite(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    if (!JS_IsNumber(argv[0]))
+        return JS_FALSE;
+    return js_global_isFinite(ctx, this_val, argc, argv);
+}
+
+static JSValue js_number_isInteger(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    int ret;
+    ret = JS_NumberIsInteger(ctx, argv[0]);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_number_isSafeInteger(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    double d;
+    if (!JS_IsNumber(argv[0]))
+        return JS_FALSE;
+    if (unlikely(JS_ToFloat64(ctx, &d, argv[0])))
+        return JS_EXCEPTION;
+    return JS_NewBool(ctx, is_safe_integer(d));
+}
+
+static const JSCFunctionListEntry js_number_funcs[] = {
+    /* global ParseInt and parseFloat should be defined already or delayed */
+    JS_ALIAS_BASE_DEF("parseInt", "parseInt", 0 ),
+    JS_ALIAS_BASE_DEF("parseFloat", "parseFloat", 0 ),
+    JS_CFUNC_DEF("isNaN", 1, js_number_isNaN ),
+    JS_CFUNC_DEF("isFinite", 1, js_number_isFinite ),
+    JS_CFUNC_DEF("isInteger", 1, js_number_isInteger ),
+    JS_CFUNC_DEF("isSafeInteger", 1, js_number_isSafeInteger ),
+    JS_PROP_DOUBLE_DEF("MAX_VALUE", 1.7976931348623157e+308, 0 ),
+    JS_PROP_DOUBLE_DEF("MIN_VALUE", 5e-324, 0 ),
+    JS_PROP_DOUBLE_DEF("NaN", NAN, 0 ),
+    JS_PROP_DOUBLE_DEF("NEGATIVE_INFINITY", -INFINITY, 0 ),
+    JS_PROP_DOUBLE_DEF("POSITIVE_INFINITY", INFINITY, 0 ),
+    JS_PROP_DOUBLE_DEF("EPSILON", 2.220446049250313e-16, 0 ), /* ES6 */
+    JS_PROP_DOUBLE_DEF("MAX_SAFE_INTEGER", 9007199254740991.0, 0 ), /* ES6 */
+    JS_PROP_DOUBLE_DEF("MIN_SAFE_INTEGER", -9007199254740991.0, 0 ), /* ES6 */
+    //JS_CFUNC_DEF("__toInteger", 1, js_number___toInteger ),
+    //JS_CFUNC_DEF("__toLength", 1, js_number___toLength ),
+};
+
+static JSValue js_thisNumberValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_IsNumber(this_val))
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_NUMBER) {
+            if (JS_IsNumber(p->u.object_data))
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a number");
+}
+
+static JSValue js_number_valueOf(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return js_thisNumberValue(ctx, this_val);
+}
+
+static int js_get_radix(JSContext *ctx, JSValueConst val)
+{
+    int radix;
+    if (JS_ToInt32Sat(ctx, &radix, val))
+        return -1;
+    if (radix < 2 || radix > 36) {
+        JS_ThrowRangeError(ctx, "radix must be between 2 and 36");
+        return -1;
+    }
+    return radix;
+}
+
+static JSValue js_number_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int magic)
+{
+    JSValue val;
+    int base;
+    double d;
+
+    val = js_thisNumberValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (magic || JS_IsUndefined(argv[0])) {
+        base = 10;
+    } else {
+        base = js_get_radix(ctx, argv[0]);
+        if (base < 0)
+            goto fail;
+    }
+    if (JS_VALUE_GET_TAG(val) == JS_TAG_INT) {
+        char buf1[70], *ptr;
+        ptr = i64toa(buf1 + sizeof(buf1), JS_VALUE_GET_INT(val), base);
+        return JS_NewString(ctx, ptr);
+    }
+    if (JS_ToFloat64Free(ctx, &d, val))
+        return JS_EXCEPTION;
+    if (base != 10 && isfinite(d)) {
+        return js_dtoa_radix(ctx, d, base);
+    }
+    return js_dtoa(ctx, d, base, 0, JS_DTOA_VAR_FORMAT);
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_number_toFixed(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int f;
+    double d;
+
+    val = js_thisNumberValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToFloat64Free(ctx, &d, val))
+        return JS_EXCEPTION;
+    if (JS_ToInt32Sat(ctx, &f, argv[0]))
+        return JS_EXCEPTION;
+    if (f < 0 || f > 100)
+        return JS_ThrowRangeError(ctx, "invalid number of digits");
+    if (fabs(d) >= 1e21) {
+        return JS_ToStringFree(ctx, __JS_NewFloat64(ctx, d));
+    } else {
+        return js_dtoa(ctx, d, 10, f, JS_DTOA_FRAC_FORMAT);
+    }
+}
+
+static JSValue js_number_toExponential(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int f, flags;
+    double d;
+
+    val = js_thisNumberValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToFloat64Free(ctx, &d, val))
+        return JS_EXCEPTION;
+    if (JS_ToInt32Sat(ctx, &f, argv[0]))
+        return JS_EXCEPTION;
+    if (!isfinite(d)) {
+        return JS_ToStringFree(ctx,  __JS_NewFloat64(ctx, d));
+    }
+    if (JS_IsUndefined(argv[0])) {
+        flags = 0;
+        f = 0;
+    } else {
+        if (f < 0 || f > 100)
+            return JS_ThrowRangeError(ctx, "invalid number of digits");
+        f++;
+        flags = JS_DTOA_FIXED_FORMAT;
+    }
+    return js_dtoa(ctx, d, 10, f, flags | JS_DTOA_FORCE_EXP);
+}
+
+static JSValue js_number_toPrecision(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int p;
+    double d;
+
+    val = js_thisNumberValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToFloat64Free(ctx, &d, val))
+        return JS_EXCEPTION;
+    if (JS_IsUndefined(argv[0]))
+        goto to_string;
+    if (JS_ToInt32Sat(ctx, &p, argv[0]))
+        return JS_EXCEPTION;
+    if (!isfinite(d)) {
+    to_string:
+        return JS_ToStringFree(ctx,  __JS_NewFloat64(ctx, d));
+    }
+    if (p < 1 || p > 100)
+        return JS_ThrowRangeError(ctx, "invalid number of digits");
+    return js_dtoa(ctx, d, 10, p, JS_DTOA_FIXED_FORMAT);
+}
+
+static const JSCFunctionListEntry js_number_proto_funcs[] = {
+    JS_CFUNC_DEF("toExponential", 1, js_number_toExponential ),
+    JS_CFUNC_DEF("toFixed", 1, js_number_toFixed ),
+    JS_CFUNC_DEF("toPrecision", 1, js_number_toPrecision ),
+    JS_CFUNC_MAGIC_DEF("toString", 1, js_number_toString, 0 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleString", 0, js_number_toString, 1 ),
+    JS_CFUNC_DEF("valueOf", 0, js_number_valueOf ),
+};
+
+static JSValue js_parseInt(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv)
+{
+    const char *str, *p;
+    int radix, flags;
+    JSValue ret;
+
+    str = JS_ToCString(ctx, argv[0]);
+    if (!str)
+        return JS_EXCEPTION;
+    if (JS_ToInt32(ctx, &radix, argv[1])) {
+        JS_FreeCString(ctx, str);
+        return JS_EXCEPTION;
+    }
+    if (radix != 0 && (radix < 2 || radix > 36)) {
+        ret = JS_NAN;
+    } else {
+        p = str;
+        p += skip_spaces(p);
+        flags = ATOD_INT_ONLY | ATOD_ACCEPT_PREFIX_AFTER_SIGN;
+        ret = js_atof(ctx, p, NULL, radix, flags);
+    }
+    JS_FreeCString(ctx, str);
+    return ret;
+}
+
+static JSValue js_parseFloat(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    const char *str, *p;
+    JSValue ret;
+
+    str = JS_ToCString(ctx, argv[0]);
+    if (!str)
+        return JS_EXCEPTION;
+    p = str;
+    p += skip_spaces(p);
+    ret = js_atof(ctx, p, NULL, 10, 0);
+    JS_FreeCString(ctx, str);
+    return ret;
+}
+
+/* Boolean */
+static JSValue js_boolean_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, obj;
+    val = JS_NewBool(ctx, JS_ToBool(ctx, argv[0]));
+    if (!JS_IsUndefined(new_target)) {
+        obj = js_create_from_ctor(ctx, new_target, JS_CLASS_BOOLEAN);
+        if (!JS_IsException(obj))
+            JS_SetObjectData(ctx, obj, val);
+        return obj;
+    } else {
+        return val;
+    }
+}
+
+static JSValue js_thisBooleanValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_BOOL)
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_BOOLEAN) {
+            if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_BOOL)
+                return p->u.object_data;
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a boolean");
+}
+
+static JSValue js_boolean_toString(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSValue val = js_thisBooleanValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    return JS_AtomToString(ctx, JS_VALUE_GET_BOOL(val) ?
+                       JS_ATOM_true : JS_ATOM_false);
+}
+
+static JSValue js_boolean_valueOf(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    return js_thisBooleanValue(ctx, this_val);
+}
+
+static const JSCFunctionListEntry js_boolean_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_boolean_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_boolean_valueOf ),
+};
+
+/* String */
+
+static int js_string_get_own_property(JSContext *ctx,
+                                      JSPropertyDescriptor *desc,
+                                      JSValueConst obj, JSAtom prop)
+{
+    JSObject *p;
+    JSString *p1;
+    uint32_t idx, ch;
+
+    /* This is a class exotic method: obj class_id is JS_CLASS_STRING */
+    if (__JS_AtomIsTaggedInt(prop)) {
+        p = JS_VALUE_GET_OBJ(obj);
+        if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_STRING) {
+            p1 = JS_VALUE_GET_STRING(p->u.object_data);
+            idx = __JS_AtomToUInt32(prop);
+            if (idx < p1->len) {
+                if (desc) {
+                    ch = string_get(p1, idx);
+                    desc->flags = JS_PROP_ENUMERABLE;
+                    desc->value = js_new_string_char(ctx, ch);
+                    desc->getter = JS_UNDEFINED;
+                    desc->setter = JS_UNDEFINED;
+                }
+                return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
+static int js_string_define_own_property(JSContext *ctx,
+                                         JSValueConst this_obj,
+                                         JSAtom prop, JSValueConst val,
+                                         JSValueConst getter,
+                                         JSValueConst setter, int flags)
+{
+    uint32_t idx;
+    JSObject *p;
+    JSString *p1, *p2;
+
+    if (__JS_AtomIsTaggedInt(prop)) {
+        idx = __JS_AtomToUInt32(prop);
+        p = JS_VALUE_GET_OBJ(this_obj);
+        if (JS_VALUE_GET_TAG(p->u.object_data) != JS_TAG_STRING)
+            goto def;
+        p1 = JS_VALUE_GET_STRING(p->u.object_data);
+        if (idx >= p1->len)
+            goto def;
+        if (!check_define_prop_flags(JS_PROP_ENUMERABLE, flags))
+            goto fail;
+        /* check that the same value is configured */
+        if (flags & JS_PROP_HAS_VALUE) {
+            if (JS_VALUE_GET_TAG(val) != JS_TAG_STRING)
+                goto fail;
+            p2 = JS_VALUE_GET_STRING(val);
+            if (p2->len != 1)
+                goto fail;
+            if (string_get(p1, idx) != string_get(p2, 0)) {
+            fail:
+                return JS_ThrowTypeErrorOrFalse(ctx, flags, "property is not configurable");
+            }
+        }
+        return TRUE;
+    } else {
+    def:
+        return JS_DefineProperty(ctx, this_obj, prop, val, getter, setter,
+                                 flags | JS_PROP_NO_EXOTIC);
+    }
+}
+
+static int js_string_delete_property(JSContext *ctx,
+                                     JSValueConst obj, JSAtom prop)
+{
+    uint32_t idx;
+
+    if (__JS_AtomIsTaggedInt(prop)) {
+        idx = __JS_AtomToUInt32(prop);
+        if (idx < js_string_obj_get_length(ctx, obj)) {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+static const JSClassExoticMethods js_string_exotic_methods = {
+    .get_own_property = js_string_get_own_property,
+    .define_own_property = js_string_define_own_property,
+    .delete_property = js_string_delete_property,
+};
+
+static JSValue js_string_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, obj;
+    if (argc == 0) {
+        val = JS_AtomToString(ctx, JS_ATOM_empty_string);
+    } else {
+        if (JS_IsUndefined(new_target) && JS_IsSymbol(argv[0])) {
+            JSAtomStruct *p = JS_VALUE_GET_PTR(argv[0]);
+            val = JS_ConcatString3(ctx, "Symbol(", JS_AtomToString(ctx, js_get_atom_index(ctx->rt, p)), ")");
+        } else {
+            val = JS_ToString(ctx, argv[0]);
+        }
+        if (JS_IsException(val))
+            return val;
+    }
+    if (!JS_IsUndefined(new_target)) {
+        JSString *p1 = JS_VALUE_GET_STRING(val);
+
+        obj = js_create_from_ctor(ctx, new_target, JS_CLASS_STRING);
+        if (!JS_IsException(obj)) {
+            JS_SetObjectData(ctx, obj, val);
+            JS_DefinePropertyValue(ctx, obj, JS_ATOM_length, JS_NewInt32(ctx, p1->len), 0);
+        }
+        return obj;
+    } else {
+        return val;
+    }
+}
+
+static JSValue js_thisStringValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_STRING)
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_STRING) {
+            if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_STRING)
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a string");
+}
+
+static JSValue js_string_fromCharCode(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    int i;
+    StringBuffer b_s, *b = &b_s;
+
+    string_buffer_init(ctx, b, argc);
+
+    for(i = 0; i < argc; i++) {
+        int32_t c;
+        if (JS_ToInt32(ctx, &c, argv[i]) || string_buffer_putc16(b, c & 0xffff)) {
+            string_buffer_free(b);
+            return JS_EXCEPTION;
+        }
+    }
+    return string_buffer_end(b);
+}
+
+static JSValue js_string_fromCodePoint(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    double d;
+    int i, c;
+    StringBuffer b_s, *b = &b_s;
+
+    /* XXX: could pre-compute string length if all arguments are JS_TAG_INT */
+
+    if (string_buffer_init(ctx, b, argc))
+        goto fail;
+    for(i = 0; i < argc; i++) {
+        if (JS_VALUE_GET_TAG(argv[i]) == JS_TAG_INT) {
+            c = JS_VALUE_GET_INT(argv[i]);
+            if (c < 0 || c > 0x10ffff)
+                goto range_error;
+        } else {
+            if (JS_ToFloat64(ctx, &d, argv[i]))
+                goto fail;
+            if (isnan(d) || d < 0 || d > 0x10ffff || (c = (int)d) != d)
+                goto range_error;
+        }
+        if (string_buffer_putc(b, c))
+            goto fail;
+    }
+    return string_buffer_end(b);
+
+ range_error:
+    JS_ThrowRangeError(ctx, "invalid code point");
+ fail:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_raw(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    // raw(temp,...a)
+    JSValue cooked, val, raw;
+    StringBuffer b_s, *b = &b_s;
+    int64_t i, n;
+
+    string_buffer_init(ctx, b, 0);
+    raw = JS_UNDEFINED;
+    cooked = JS_ToObject(ctx, argv[0]);
+    if (JS_IsException(cooked))
+        goto exception;
+    raw = JS_ToObjectFree(ctx, JS_GetProperty(ctx, cooked, JS_ATOM_raw));
+    if (JS_IsException(raw))
+        goto exception;
+    if (js_get_length64(ctx, &n, raw) < 0)
+        goto exception;
+
+    for (i = 0; i < n; i++) {
+        val = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, raw, i));
+        if (JS_IsException(val))
+            goto exception;
+        string_buffer_concat_value_free(b, val);
+        if (i < n - 1 && i + 1 < argc) {
+            if (string_buffer_concat_value(b, argv[i + 1]))
+                goto exception;
+        }
+    }
+    JS_FreeValue(ctx, cooked);
+    JS_FreeValue(ctx, raw);
+    return string_buffer_end(b);
+
+exception:
+    JS_FreeValue(ctx, cooked);
+    JS_FreeValue(ctx, raw);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+/* only used in test262 */
+JSValue js_string_codePointRange(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    uint32_t start, end, i, n;
+    StringBuffer b_s, *b = &b_s;
+
+    if (JS_ToUint32(ctx, &start, argv[0]) ||
+        JS_ToUint32(ctx, &end, argv[1]))
+        return JS_EXCEPTION;
+    end = min_uint32(end, 0x10ffff + 1);
+
+    if (start > end) {
+        start = end;
+    }
+    n = end - start;
+    if (end > 0x10000) {
+        n += end - max_uint32(start, 0x10000);
+    }
+    if (string_buffer_init2(ctx, b, n, end >= 0x100))
+        return JS_EXCEPTION;
+    for(i = start; i < end; i++) {
+        string_buffer_putc(b, i);
+    }
+    return string_buffer_end(b);
+}
+
+#if 0
+static JSValue js_string___isSpace(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    int c;
+    if (JS_ToInt32(ctx, &c, argv[0]))
+        return JS_EXCEPTION;
+    return JS_NewBool(ctx, lre_is_space(c));
+}
+#endif
+
+static JSValue js_string_charCodeAt(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    JSString *p;
+    int idx, c;
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+    if (JS_ToInt32Sat(ctx, &idx, argv[0])) {
+        JS_FreeValue(ctx, val);
+        return JS_EXCEPTION;
+    }
+    if (idx < 0 || idx >= p->len) {
+        ret = JS_NAN;
+    } else {
+        c = string_get(p, idx);
+        ret = JS_NewInt32(ctx, c);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue js_string_charAt(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv, int is_at)
+{
+    JSValue val, ret;
+    JSString *p;
+    int idx, c;
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+    if (JS_ToInt32Sat(ctx, &idx, argv[0])) {
+        JS_FreeValue(ctx, val);
+        return JS_EXCEPTION;
+    }
+    if (idx < 0 && is_at)
+        idx += p->len;
+    if (idx < 0 || idx >= p->len) {
+        if (is_at)
+            ret = JS_UNDEFINED;
+        else
+            ret = js_new_string8(ctx, NULL, 0);
+    } else {
+        c = string_get(p, idx);
+        ret = js_new_string_char(ctx, c);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue js_string_codePointAt(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    JSString *p;
+    int idx, c;
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+    if (JS_ToInt32Sat(ctx, &idx, argv[0])) {
+        JS_FreeValue(ctx, val);
+        return JS_EXCEPTION;
+    }
+    if (idx < 0 || idx >= p->len) {
+        ret = JS_UNDEFINED;
+    } else {
+        c = string_getc(p, &idx);
+        ret = JS_NewInt32(ctx, c);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue js_string_concat(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue r;
+    int i;
+
+    /* XXX: Use more efficient method */
+    /* XXX: This method is OK if r has a single refcount */
+    /* XXX: should use string_buffer? */
+    r = JS_ToStringCheckObject(ctx, this_val);
+    for (i = 0; i < argc; i++) {
+        if (JS_IsException(r))
+            break;
+        r = JS_ConcatString(ctx, r, JS_DupValue(ctx, argv[i]));
+    }
+    return r;
+}
+
+static int string_cmp(JSString *p1, JSString *p2, int x1, int x2, int len)
+{
+    int i, c1, c2;
+    for (i = 0; i < len; i++) {
+        if ((c1 = string_get(p1, x1 + i)) != (c2 = string_get(p2, x2 + i)))
+            return c1 - c2;
+    }
+    return 0;
+}
+
+static int string_indexof_char(JSString *p, int c, int from)
+{
+    /* assuming 0 <= from <= p->len */
+    int i, len = p->len;
+    if (p->is_wide_char) {
+        for (i = from; i < len; i++) {
+            if (p->u.str16[i] == c)
+                return i;
+        }
+    } else {
+        if ((c & ~0xff) == 0) {
+            for (i = from; i < len; i++) {
+                if (p->u.str8[i] == (uint8_t)c)
+                    return i;
+            }
+        }
+    }
+    return -1;
+}
+
+static int string_indexof(JSString *p1, JSString *p2, int from)
+{
+    /* assuming 0 <= from <= p1->len */
+    int c, i, j, len1 = p1->len, len2 = p2->len;
+    if (len2 == 0)
+        return from;
+    for (i = from, c = string_get(p2, 0); i + len2 <= len1; i = j + 1) {
+        j = string_indexof_char(p1, c, i);
+        if (j < 0 || j + len2 > len1)
+            break;
+        if (!string_cmp(p1, p2, j + 1, 1, len2 - 1))
+            return j;
+    }
+    return -1;
+}
+
+static int64_t string_advance_index(JSString *p, int64_t index, BOOL unicode)
+{
+    if (!unicode || index >= p->len || !p->is_wide_char) {
+        index++;
+    } else {
+        int index32 = (int)index;
+        string_getc(p, &index32);
+        index = index32;
+    }
+    return index;
+}
+
+/* return the position of the first invalid character in the string or
+   -1 if none */
+static int js_string_find_invalid_codepoint(JSString *p)
+{
+    int i;
+    if (!p->is_wide_char)
+        return -1;
+    for(i = 0; i < p->len; i++) {
+        uint32_t c = p->u.str16[i];
+        if (is_surrogate(c)) {
+            if (is_hi_surrogate(c) && (i + 1) < p->len
+            &&  is_lo_surrogate(p->u.str16[i + 1])) {
+                i++;
+            } else {
+                return i;
+            }
+        }
+    }
+    return -1;
+}
+
+static JSValue js_string_isWellFormed(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    JSValue str;
+    JSString *p;
+    BOOL ret;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return JS_EXCEPTION;
+    p = JS_VALUE_GET_STRING(str);
+    ret = (js_string_find_invalid_codepoint(p) < 0);
+    JS_FreeValue(ctx, str);
+    return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_string_toWellFormed(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    JSValue str, ret;
+    JSString *p;
+    int i;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return JS_EXCEPTION;
+
+    p = JS_VALUE_GET_STRING(str);
+    /* avoid reallocating the string if it is well-formed */
+    i = js_string_find_invalid_codepoint(p);
+    if (i < 0)
+        return str;
+
+    ret = js_new_string16(ctx, p->u.str16, p->len);
+    JS_FreeValue(ctx, str);
+    if (JS_IsException(ret))
+        return JS_EXCEPTION;
+
+    p = JS_VALUE_GET_STRING(ret);
+    for (; i < p->len; i++) {
+        uint32_t c = p->u.str16[i];
+        if (is_surrogate(c)) {
+            if (is_hi_surrogate(c) && (i + 1) < p->len
+            &&  is_lo_surrogate(p->u.str16[i + 1])) {
+                i++;
+            } else {
+                p->u.str16[i] = 0xFFFD;
+            }
+        }
+    }
+    return ret;
+}
+
+static JSValue js_string_indexOf(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int lastIndexOf)
+{
+    JSValue str, v;
+    int i, len, v_len, pos, start, stop, ret, inc;
+    JSString *p;
+    JSString *p1;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    v = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(v))
+        goto fail;
+    p = JS_VALUE_GET_STRING(str);
+    p1 = JS_VALUE_GET_STRING(v);
+    len = p->len;
+    v_len = p1->len;
+    if (lastIndexOf) {
+        pos = len - v_len;
+        if (argc > 1) {
+            double d;
+            if (JS_ToFloat64(ctx, &d, argv[1]))
+                goto fail;
+            if (!isnan(d)) {
+                if (d <= 0)
+                    pos = 0;
+                else if (d < pos)
+                    pos = d;
+            }
+        }
+        start = pos;
+        stop = 0;
+        inc = -1;
+    } else {
+        pos = 0;
+        if (argc > 1) {
+            if (JS_ToInt32Clamp(ctx, &pos, argv[1], 0, len, 0))
+                goto fail;
+        }
+        start = pos;
+        stop = len - v_len;
+        inc = 1;
+    }
+    ret = -1;
+    if (len >= v_len && inc * (stop - start) >= 0) {
+        for (i = start;; i += inc) {
+            if (!string_cmp(p, p1, i, 0, v_len)) {
+                ret = i;
+                break;
+            }
+            if (i == stop)
+                break;
+        }
+    }
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, v);
+    return JS_NewInt32(ctx, ret);
+
+fail:
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, v);
+    return JS_EXCEPTION;
+}
+
+/* return < 0 if exception or TRUE/FALSE */
+static int js_is_regexp(JSContext *ctx, JSValueConst obj);
+
+static JSValue js_string_includes(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int magic)
+{
+    JSValue str, v = JS_UNDEFINED;
+    int i, len, v_len, pos, start, stop, ret;
+    JSString *p;
+    JSString *p1;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    ret = js_is_regexp(ctx, argv[0]);
+    if (ret) {
+        if (ret > 0)
+            JS_ThrowTypeError(ctx, "regexp not supported");
+        goto fail;
+    }
+    v = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(v))
+        goto fail;
+    p = JS_VALUE_GET_STRING(str);
+    p1 = JS_VALUE_GET_STRING(v);
+    len = p->len;
+    v_len = p1->len;
+    pos = (magic == 2) ? len : 0;
+    if (argc > 1 && !JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &pos, argv[1], 0, len, 0))
+            goto fail;
+    }
+    len -= v_len;
+    ret = 0;
+    if (magic == 0) {
+        start = pos;
+        stop = len;
+    } else {
+        if (magic == 1) {
+            if (pos > len)
+                goto done;
+        } else {
+            pos -= v_len;
+        }
+        start = stop = pos;
+    }
+    if (start >= 0 && start <= stop) {
+        for (i = start;; i++) {
+            if (!string_cmp(p, p1, i, 0, v_len)) {
+                ret = 1;
+                break;
+            }
+            if (i == stop)
+                break;
+        }
+    }
+ done:
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, v);
+    return JS_NewBool(ctx, ret);
+
+fail:
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, v);
+    return JS_EXCEPTION;
+}
+
+static int check_regexp_g_flag(JSContext *ctx, JSValueConst regexp)
+{
+    int ret;
+    JSValue flags;
+
+    ret = js_is_regexp(ctx, regexp);
+    if (ret < 0)
+        return -1;
+    if (ret) {
+        flags = JS_GetProperty(ctx, regexp, JS_ATOM_flags);
+        if (JS_IsException(flags))
+            return -1;
+        if (JS_IsUndefined(flags) || JS_IsNull(flags)) {
+            JS_ThrowTypeError(ctx, "cannot convert to object");
+            return -1;
+        }
+        flags = JS_ToStringFree(ctx, flags);
+        if (JS_IsException(flags))
+            return -1;
+        ret = string_indexof_char(JS_VALUE_GET_STRING(flags), 'g', 0);
+        JS_FreeValue(ctx, flags);
+        if (ret < 0) {
+            JS_ThrowTypeError(ctx, "regexp must have the 'g' flag");
+            return -1;
+        }
+    }
+    return 0;
+}
+
+static JSValue js_string_match(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv, int atom)
+{
+    // match(rx), search(rx), matchAll(rx)
+    // atom is JS_ATOM_Symbol_match, JS_ATOM_Symbol_search, or JS_ATOM_Symbol_matchAll
+    JSValueConst O = this_val, regexp = argv[0], args[2];
+    JSValue matcher, S, rx, result, str;
+    int args_len;
+
+    if (JS_IsUndefined(O) || JS_IsNull(O))
+        return JS_ThrowTypeError(ctx, "cannot convert to object");
+
+    if (!JS_IsUndefined(regexp) && !JS_IsNull(regexp)) {
+        matcher = JS_GetProperty(ctx, regexp, atom);
+        if (JS_IsException(matcher))
+            return JS_EXCEPTION;
+        if (atom == JS_ATOM_Symbol_matchAll) {
+            if (check_regexp_g_flag(ctx, regexp) < 0) {
+                JS_FreeValue(ctx, matcher);
+                return JS_EXCEPTION;
+            }
+        }
+        if (!JS_IsUndefined(matcher) && !JS_IsNull(matcher)) {
+            return JS_CallFree(ctx, matcher, regexp, 1, &O);
+        }
+    }
+    S = JS_ToString(ctx, O);
+    if (JS_IsException(S))
+        return JS_EXCEPTION;
+    args_len = 1;
+    args[0] = regexp;
+    str = JS_UNDEFINED;
+    if (atom == JS_ATOM_Symbol_matchAll) {
+        str = JS_NewString(ctx, "g");
+        if (JS_IsException(str))
+            goto fail;
+        args[args_len++] = str;
+    }
+    rx = JS_CallConstructor(ctx, ctx->regexp_ctor, args_len, args);
+    JS_FreeValue(ctx, str);
+    if (JS_IsException(rx)) {
+    fail:
+        JS_FreeValue(ctx, S);
+        return JS_EXCEPTION;
+    }
+    result = JS_InvokeFree(ctx, rx, atom, 1, (JSValueConst *)&S);
+    JS_FreeValue(ctx, S);
+    return result;
+}
+
+static JSValue js_string___GetSubstitution(JSContext *ctx, JSValueConst this_val,
+                                           int argc, JSValueConst *argv)
+{
+    // GetSubstitution(matched, str, position, captures, namedCaptures, rep)
+    JSValueConst matched, str, captures, namedCaptures, rep;
+    JSValue capture, name, s;
+    uint32_t position, len, matched_len, captures_len;
+    int i, j, j0, k, k1;
+    int c, c1;
+    StringBuffer b_s, *b = &b_s;
+    JSString *sp, *rp;
+
+    matched = argv[0];
+    str = argv[1];
+    captures = argv[3];
+    namedCaptures = argv[4];
+    rep = argv[5];
+
+    if (!JS_IsString(rep) || !JS_IsString(str))
+        return JS_ThrowTypeError(ctx, "not a string");
+
+    sp = JS_VALUE_GET_STRING(str);
+    rp = JS_VALUE_GET_STRING(rep);
+
+    string_buffer_init(ctx, b, 0);
+
+    captures_len = 0;
+    if (!JS_IsUndefined(captures)) {
+        if (js_get_length32(ctx, &captures_len, captures))
+            goto exception;
+    }
+    if (js_get_length32(ctx, &matched_len, matched))
+        goto exception;
+    if (JS_ToUint32(ctx, &position, argv[2]) < 0)
+        goto exception;
+
+    len = rp->len;
+    i = 0;
+    for(;;) {
+        j = string_indexof_char(rp, '$', i);
+        if (j < 0 || j + 1 >= len)
+            break;
+        string_buffer_concat(b, rp, i, j);
+        j0 = j++;
+        c = string_get(rp, j++);
+        if (c == '$') {
+            string_buffer_putc8(b, '$');
+        } else if (c == '&') {
+            if (string_buffer_concat_value(b, matched))
+                goto exception;
+        } else if (c == '`') {
+            string_buffer_concat(b, sp, 0, position);
+        } else if (c == '\'') {
+            string_buffer_concat(b, sp, position + matched_len, sp->len);
+        } else if (c >= '0' && c <= '9') {
+            k = c - '0';
+            if (j < len) {
+                c1 = string_get(rp, j);
+                if (c1 >= '0' && c1 <= '9') {
+                    /* This behavior is specified in ES6 and refined in ECMA 2019 */
+                    /* ECMA 2019 does not have the extra test, but
+                       Test262 S15.5.4.11_A3_T1..3 require this behavior */
+                    k1 = k * 10 + c1 - '0';
+                    if (k1 >= 1 && k1 < captures_len) {
+                        k = k1;
+                        j++;
+                    }
+                }
+            }
+            if (k >= 1 && k < captures_len) {
+                s = JS_GetPropertyInt64(ctx, captures, k);
+                if (JS_IsException(s))
+                    goto exception;
+                if (!JS_IsUndefined(s)) {
+                    if (string_buffer_concat_value_free(b, s))
+                        goto exception;
+                }
+            } else {
+                goto norep;
+            }
+        } else if (c == '<' && !JS_IsUndefined(namedCaptures)) {
+            k = string_indexof_char(rp, '>', j);
+            if (k < 0)
+                goto norep;
+            name = js_sub_string(ctx, rp, j, k);
+            if (JS_IsException(name))
+                goto exception;
+            capture = JS_GetPropertyValue(ctx, namedCaptures, name);
+            if (JS_IsException(capture))
+                goto exception;
+            if (!JS_IsUndefined(capture)) {
+                if (string_buffer_concat_value_free(b, capture))
+                    goto exception;
+            }
+            j = k + 1;
+        } else {
+        norep:
+            string_buffer_concat(b, rp, j0, j);
+        }
+        i = j;
+    }
+    string_buffer_concat(b, rp, i, rp->len);
+    return string_buffer_end(b);
+exception:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_replace(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv,
+                                 int is_replaceAll)
+{
+    // replace(rx, rep)
+    JSValueConst O = this_val, searchValue = argv[0], replaceValue = argv[1];
+    JSValueConst args[6];
+    JSValue str, search_str, replaceValue_str, repl_str;
+    JSString *sp, *searchp;
+    StringBuffer b_s, *b = &b_s;
+    int pos, functionalReplace, endOfLastMatch;
+    BOOL is_first;
+
+    if (JS_IsUndefined(O) || JS_IsNull(O))
+        return JS_ThrowTypeError(ctx, "cannot convert to object");
+
+    search_str = JS_UNDEFINED;
+    replaceValue_str = JS_UNDEFINED;
+    repl_str = JS_UNDEFINED;
+
+    if (!JS_IsUndefined(searchValue) && !JS_IsNull(searchValue)) {
+        JSValue replacer;
+        if (is_replaceAll) {
+            if (check_regexp_g_flag(ctx, searchValue) < 0)
+                return JS_EXCEPTION;
+        }
+        replacer = JS_GetProperty(ctx, searchValue, JS_ATOM_Symbol_replace);
+        if (JS_IsException(replacer))
+            return JS_EXCEPTION;
+        if (!JS_IsUndefined(replacer) && !JS_IsNull(replacer)) {
+            args[0] = O;
+            args[1] = replaceValue;
+            return JS_CallFree(ctx, replacer, searchValue, 2, args);
+        }
+    }
+    string_buffer_init(ctx, b, 0);
+
+    str = JS_ToString(ctx, O);
+    if (JS_IsException(str))
+        goto exception;
+    search_str = JS_ToString(ctx, searchValue);
+    if (JS_IsException(search_str))
+        goto exception;
+    functionalReplace = JS_IsFunction(ctx, replaceValue);
+    if (!functionalReplace) {
+        replaceValue_str = JS_ToString(ctx, replaceValue);
+        if (JS_IsException(replaceValue_str))
+            goto exception;
+    }
+
+    sp = JS_VALUE_GET_STRING(str);
+    searchp = JS_VALUE_GET_STRING(search_str);
+    endOfLastMatch = 0;
+    is_first = TRUE;
+    for(;;) {
+        if (unlikely(searchp->len == 0)) {
+            if (is_first)
+                pos = 0;
+            else if (endOfLastMatch >= sp->len)
+                pos = -1;
+            else
+                pos = endOfLastMatch + 1;
+        } else {
+            pos = string_indexof(sp, searchp, endOfLastMatch);
+        }
+        if (pos < 0) {
+            if (is_first) {
+                string_buffer_free(b);
+                JS_FreeValue(ctx, search_str);
+                JS_FreeValue(ctx, replaceValue_str);
+                return str;
+            } else {
+                break;
+            }
+        }
+        if (functionalReplace) {
+            args[0] = search_str;
+            args[1] = JS_NewInt32(ctx, pos);
+            args[2] = str;
+            repl_str = JS_ToStringFree(ctx, JS_Call(ctx, replaceValue, JS_UNDEFINED, 3, args));
+        } else {
+            args[0] = search_str;
+            args[1] = str;
+            args[2] = JS_NewInt32(ctx, pos);
+            args[3] = JS_UNDEFINED;
+            args[4] = JS_UNDEFINED;
+            args[5] = replaceValue_str;
+            repl_str = js_string___GetSubstitution(ctx, JS_UNDEFINED, 6, args);
+        }
+        if (JS_IsException(repl_str))
+            goto exception;
+
+        string_buffer_concat(b, sp, endOfLastMatch, pos);
+        string_buffer_concat_value_free(b, repl_str);
+        endOfLastMatch = pos + searchp->len;
+        is_first = FALSE;
+        if (!is_replaceAll)
+            break;
+    }
+    string_buffer_concat(b, sp, endOfLastMatch, sp->len);
+    JS_FreeValue(ctx, search_str);
+    JS_FreeValue(ctx, replaceValue_str);
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+exception:
+    string_buffer_free(b);
+    JS_FreeValue(ctx, search_str);
+    JS_FreeValue(ctx, replaceValue_str);
+    JS_FreeValue(ctx, str);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_split(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    // split(sep, limit)
+    JSValueConst O = this_val, separator = argv[0], limit = argv[1];
+    JSValueConst args[2];
+    JSValue S, A, R, T;
+    uint32_t lim, lengthA;
+    int64_t p, q, s, r, e;
+    JSString *sp, *rp;
+
+    if (JS_IsUndefined(O) || JS_IsNull(O))
+        return JS_ThrowTypeError(ctx, "cannot convert to object");
+
+    S = JS_UNDEFINED;
+    A = JS_UNDEFINED;
+    R = JS_UNDEFINED;
+
+    if (!JS_IsUndefined(separator) && !JS_IsNull(separator)) {
+        JSValue splitter;
+        splitter = JS_GetProperty(ctx, separator, JS_ATOM_Symbol_split);
+        if (JS_IsException(splitter))
+            return JS_EXCEPTION;
+        if (!JS_IsUndefined(splitter) && !JS_IsNull(splitter)) {
+            args[0] = O;
+            args[1] = limit;
+            return JS_CallFree(ctx, splitter, separator, 2, args);
+        }
+    }
+    S = JS_ToString(ctx, O);
+    if (JS_IsException(S))
+        goto exception;
+    A = JS_NewArray(ctx);
+    if (JS_IsException(A))
+        goto exception;
+    lengthA = 0;
+    if (JS_IsUndefined(limit)) {
+        lim = 0xffffffff;
+    } else {
+        if (JS_ToUint32(ctx, &lim, limit) < 0)
+            goto exception;
+    }
+    sp = JS_VALUE_GET_STRING(S);
+    s = sp->len;
+    R = JS_ToString(ctx, separator);
+    if (JS_IsException(R))
+        goto exception;
+    rp = JS_VALUE_GET_STRING(R);
+    r = rp->len;
+    p = 0;
+    if (lim == 0)
+        goto done;
+    if (JS_IsUndefined(separator))
+        goto add_tail;
+    if (s == 0) {
+        if (r != 0)
+            goto add_tail;
+        goto done;
+    }
+    q = p;
+    for (q = p; (q += !r) <= s - r - !r; q = p = e + r) {
+        e = string_indexof(sp, rp, q);
+        if (e < 0)
+            break;
+        T = js_sub_string(ctx, sp, p, e);
+        if (JS_IsException(T))
+            goto exception;
+        if (JS_CreateDataPropertyUint32(ctx, A, lengthA++, T, 0) < 0)
+            goto exception;
+        if (lengthA == lim)
+            goto done;
+    }
+add_tail:
+    T = js_sub_string(ctx, sp, p, s);
+    if (JS_IsException(T))
+        goto exception;
+    if (JS_CreateDataPropertyUint32(ctx, A, lengthA++, T,0 ) < 0)
+        goto exception;
+done:
+    JS_FreeValue(ctx, S);
+    JS_FreeValue(ctx, R);
+    return A;
+
+exception:
+    JS_FreeValue(ctx, A);
+    JS_FreeValue(ctx, S);
+    JS_FreeValue(ctx, R);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_substring(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSValue str, ret;
+    int a, b, start, end;
+    JSString *p;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    p = JS_VALUE_GET_STRING(str);
+    if (JS_ToInt32Clamp(ctx, &a, argv[0], 0, p->len, 0)) {
+        JS_FreeValue(ctx, str);
+        return JS_EXCEPTION;
+    }
+    b = p->len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &b, argv[1], 0, p->len, 0)) {
+            JS_FreeValue(ctx, str);
+            return JS_EXCEPTION;
+        }
+    }
+    if (a < b) {
+        start = a;
+        end = b;
+    } else {
+        start = b;
+        end = a;
+    }
+    ret = js_sub_string(ctx, p, start, end);
+    JS_FreeValue(ctx, str);
+    return ret;
+}
+
+static JSValue js_string_substr(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue str, ret;
+    int a, len, n;
+    JSString *p;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    p = JS_VALUE_GET_STRING(str);
+    len = p->len;
+    if (JS_ToInt32Clamp(ctx, &a, argv[0], 0, len, len)) {
+        JS_FreeValue(ctx, str);
+        return JS_EXCEPTION;
+    }
+    n = len - a;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &n, argv[1], 0, len - a, 0)) {
+            JS_FreeValue(ctx, str);
+            return JS_EXCEPTION;
+        }
+    }
+    ret = js_sub_string(ctx, p, a, a + n);
+    JS_FreeValue(ctx, str);
+    return ret;
+}
+
+static JSValue js_string_slice(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    JSValue str, ret;
+    int len, start, end;
+    JSString *p;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    p = JS_VALUE_GET_STRING(str);
+    len = p->len;
+    if (JS_ToInt32Clamp(ctx, &start, argv[0], 0, len, len)) {
+        JS_FreeValue(ctx, str);
+        return JS_EXCEPTION;
+    }
+    end = len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &end, argv[1], 0, len, len)) {
+            JS_FreeValue(ctx, str);
+            return JS_EXCEPTION;
+        }
+    }
+    ret = js_sub_string(ctx, p, start, max_int(end, start));
+    JS_FreeValue(ctx, str);
+    return ret;
+}
+
+static JSValue js_string_pad(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int padEnd)
+{
+    JSValue str, v = JS_UNDEFINED;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p, *p1 = NULL;
+    int n, len, c = ' ';
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        goto fail1;
+    if (JS_ToInt32Sat(ctx, &n, argv[0]))
+        goto fail2;
+    p = JS_VALUE_GET_STRING(str);
+    len = p->len;
+    if (len >= n)
+        return str;
+    if (argc > 1 && !JS_IsUndefined(argv[1])) {
+        v = JS_ToString(ctx, argv[1]);
+        if (JS_IsException(v))
+            goto fail2;
+        p1 = JS_VALUE_GET_STRING(v);
+        if (p1->len == 0) {
+            JS_FreeValue(ctx, v);
+            return str;
+        }
+        if (p1->len == 1) {
+            c = string_get(p1, 0);
+            p1 = NULL;
+        }
+    }
+    if (n > JS_STRING_LEN_MAX) {
+        JS_ThrowRangeError(ctx, "invalid string length");
+        goto fail2;
+    }
+    if (string_buffer_init(ctx, b, n))
+        goto fail3;
+    n -= len;
+    if (padEnd) {
+        if (string_buffer_concat(b, p, 0, len))
+            goto fail;
+    }
+    if (p1) {
+        while (n > 0) {
+            int chunk = min_int(n, p1->len);
+            if (string_buffer_concat(b, p1, 0, chunk))
+                goto fail;
+            n -= chunk;
+        }
+    } else {
+        if (string_buffer_fill(b, c, n))
+            goto fail;
+    }
+    if (!padEnd) {
+        if (string_buffer_concat(b, p, 0, len))
+            goto fail;
+    }
+    JS_FreeValue(ctx, v);
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+fail:
+    string_buffer_free(b);
+fail3:
+    JS_FreeValue(ctx, v);
+fail2:
+    JS_FreeValue(ctx, str);
+fail1:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_repeat(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int64_t val;
+    int n, len;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        goto fail;
+    if (JS_ToInt64Sat(ctx, &val, argv[0]))
+        goto fail;
+    if (val < 0 || val > 2147483647) {
+        JS_ThrowRangeError(ctx, "invalid repeat count");
+        goto fail;
+    }
+    n = val;
+    p = JS_VALUE_GET_STRING(str);
+    len = p->len;
+    if (len == 0 || n == 1)
+        return str;
+    // XXX: potential arithmetic overflow
+    if (val * len > JS_STRING_LEN_MAX) {
+        JS_ThrowRangeError(ctx, "invalid string length");
+        goto fail;
+    }
+    if (string_buffer_init2(ctx, b, n * len, p->is_wide_char))
+        goto fail;
+    if (len == 1) {
+        string_buffer_fill(b, string_get(p, 0), n);
+    } else {
+        while (n-- > 0) {
+            string_buffer_concat(b, p, 0, len);
+        }
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+fail:
+    JS_FreeValue(ctx, str);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_trim(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic)
+{
+    JSValue str, ret;
+    int a, b, len;
+    JSString *p;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    p = JS_VALUE_GET_STRING(str);
+    a = 0;
+    b = len = p->len;
+    if (magic & 1) {
+        while (a < len && lre_is_space(string_get(p, a)))
+            a++;
+    }
+    if (magic & 2) {
+        while (b > a && lre_is_space(string_get(p, b - 1)))
+            b--;
+    }
+    ret = js_sub_string(ctx, p, a, b);
+    JS_FreeValue(ctx, str);
+    return ret;
+}
+
+static JSValue js_string___quote(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return JS_ToQuotedString(ctx, this_val);
+}
+
+/* return 0 if before the first char */
+static int string_prevc(JSString *p, int *pidx)
+{
+    int idx, c, c1;
+
+    idx = *pidx;
+    if (idx <= 0)
+        return 0;
+    idx--;
+    if (p->is_wide_char) {
+        c = p->u.str16[idx];
+        if (is_lo_surrogate(c) && idx > 0) {
+            c1 = p->u.str16[idx - 1];
+            if (is_hi_surrogate(c1)) {
+                c = from_surrogate(c1, c);
+                idx--;
+            }
+        }
+    } else {
+        c = p->u.str8[idx];
+    }
+    *pidx = idx;
+    return c;
+}
+
+static BOOL test_final_sigma(JSString *p, int sigma_pos)
+{
+    int k, c1;
+
+    /* before C: skip case ignorable chars and check there is
+       a cased letter */
+    k = sigma_pos;
+    for(;;) {
+        c1 = string_prevc(p, &k);
+        if (!lre_is_case_ignorable(c1))
+            break;
+    }
+    if (!lre_is_cased(c1))
+        return FALSE;
+
+    /* after C: skip case ignorable chars and check there is
+       no cased letter */
+    k = sigma_pos + 1;
+    for(;;) {
+        if (k >= p->len)
+            return TRUE;
+        c1 = string_getc(p, &k);
+        if (!lre_is_case_ignorable(c1))
+            break;
+    }
+    return !lre_is_cased(c1);
+}
+
+static JSValue js_string_toLowerCase(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv, int to_lower)
+{
+    JSValue val;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int i, c, j, l;
+    uint32_t res[LRE_CC_RES_LEN_MAX];
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+    if (p->len == 0)
+        return val;
+    if (string_buffer_init(ctx, b, p->len))
+        goto fail;
+    for(i = 0; i < p->len;) {
+        c = string_getc(p, &i);
+        if (c == 0x3a3 && to_lower && test_final_sigma(p, i - 1)) {
+            res[0] = 0x3c2; /* final sigma */
+            l = 1;
+        } else {
+            l = lre_case_conv(res, c, to_lower);
+        }
+        for(j = 0; j < l; j++) {
+            if (string_buffer_putc(b, res[j]))
+                goto fail;
+        }
+    }
+    JS_FreeValue(ctx, val);
+    return string_buffer_end(b);
+ fail:
+    JS_FreeValue(ctx, val);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+#ifdef CONFIG_ALL_UNICODE
+
+/* return (-1, NULL) if exception, otherwise (len, buf) */
+static int JS_ToUTF32String(JSContext *ctx, uint32_t **pbuf, JSValueConst val1)
+{
+    JSValue val;
+    JSString *p;
+    uint32_t *buf;
+    int i, j, len;
+
+    val = JS_ToString(ctx, val1);
+    if (JS_IsException(val))
+        return -1;
+    p = JS_VALUE_GET_STRING(val);
+    len = p->len;
+    /* UTF32 buffer length is len minus the number of correct surrogates pairs */
+    buf = js_malloc(ctx, sizeof(buf[0]) * max_int(len, 1));
+    if (!buf) {
+        JS_FreeValue(ctx, val);
+        goto fail;
+    }
+    for(i = j = 0; i < len;)
+        buf[j++] = string_getc(p, &i);
+    JS_FreeValue(ctx, val);
+    *pbuf = buf;
+    return j;
+ fail:
+    *pbuf = NULL;
+    return -1;
+}
+
+static JSValue JS_NewUTF32String(JSContext *ctx, const uint32_t *buf, int len)
+{
+    int i;
+    StringBuffer b_s, *b = &b_s;
+    if (string_buffer_init(ctx, b, len))
+        return JS_EXCEPTION;
+    for(i = 0; i < len; i++) {
+        if (string_buffer_putc(b, buf[i]))
+            goto fail;
+    }
+    return string_buffer_end(b);
+ fail:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static int js_string_normalize1(JSContext *ctx, uint32_t **pout_buf,
+                                JSValueConst val,
+                                UnicodeNormalizationEnum n_type)
+{
+    int buf_len, out_len;
+    uint32_t *buf, *out_buf;
+
+    buf_len = JS_ToUTF32String(ctx, &buf, val);
+    if (buf_len < 0)
+        return -1;
+    out_len = unicode_normalize(&out_buf, buf, buf_len, n_type,
+                                ctx->rt, (DynBufReallocFunc *)js_realloc_rt);
+    js_free(ctx, buf);
+    if (out_len < 0)
+        return -1;
+    *pout_buf = out_buf;
+    return out_len;
+}
+
+static JSValue js_string_normalize(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    const char *form, *p;
+    size_t form_len;
+    int is_compat, out_len;
+    UnicodeNormalizationEnum n_type;
+    JSValue val;
+    uint32_t *out_buf;
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+
+    if (argc == 0 || JS_IsUndefined(argv[0])) {
+        n_type = UNICODE_NFC;
+    } else {
+        form = JS_ToCStringLen(ctx, &form_len, argv[0]);
+        if (!form)
+            goto fail1;
+        p = form;
+        if (p[0] != 'N' || p[1] != 'F')
+            goto bad_form;
+        p += 2;
+        is_compat = FALSE;
+        if (*p == 'K') {
+            is_compat = TRUE;
+            p++;
+        }
+        if (*p == 'C' || *p == 'D') {
+            n_type = UNICODE_NFC + is_compat * 2 + (*p - 'C');
+            if ((p + 1 - form) != form_len)
+                goto bad_form;
+        } else {
+        bad_form:
+            JS_FreeCString(ctx, form);
+            JS_ThrowRangeError(ctx, "bad normalization form");
+        fail1:
+            JS_FreeValue(ctx, val);
+            return JS_EXCEPTION;
+        }
+        JS_FreeCString(ctx, form);
+    }
+
+    out_len = js_string_normalize1(ctx, &out_buf, val, n_type);
+    JS_FreeValue(ctx, val);
+    if (out_len < 0)
+        return JS_EXCEPTION;
+    val = JS_NewUTF32String(ctx, out_buf, out_len);
+    js_free(ctx, out_buf);
+    return val;
+}
+
+/* return < 0, 0 or > 0 */
+static int js_UTF32_compare(const uint32_t *buf1, int buf1_len,
+                            const uint32_t *buf2, int buf2_len)
+{
+    int i, len, c, res;
+    len = min_int(buf1_len, buf2_len);
+    for(i = 0; i < len; i++) {
+        /* Note: range is limited so a subtraction is valid */
+        c = buf1[i] - buf2[i];
+        if (c != 0)
+            return c;
+    }
+    if (buf1_len == buf2_len)
+        res = 0;
+    else if (buf1_len < buf2_len)
+        res = -1;
+    else
+        res = 1;
+    return res;
+}
+
+static JSValue js_string_localeCompare(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue a, b;
+    int cmp, a_len, b_len;
+    uint32_t *a_buf, *b_buf;
+
+    a = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(a))
+        return JS_EXCEPTION;
+    b = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(b)) {
+        JS_FreeValue(ctx, a);
+        return JS_EXCEPTION;
+    }
+    a_len = js_string_normalize1(ctx, &a_buf, a, UNICODE_NFC);
+    JS_FreeValue(ctx, a);
+    if (a_len < 0) {
+        JS_FreeValue(ctx, b);
+        return JS_EXCEPTION;
+    }
+
+    b_len = js_string_normalize1(ctx, &b_buf, b, UNICODE_NFC);
+    JS_FreeValue(ctx, b);
+    if (b_len < 0) {
+        js_free(ctx, a_buf);
+        return JS_EXCEPTION;
+    }
+    cmp = js_UTF32_compare(a_buf, a_len, b_buf, b_len);
+    js_free(ctx, a_buf);
+    js_free(ctx, b_buf);
+    return JS_NewInt32(ctx, cmp);
+}
+#else /* CONFIG_ALL_UNICODE */
+static JSValue js_string_localeCompare(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue a, b;
+    int cmp;
+
+    a = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(a))
+        return JS_EXCEPTION;
+    b = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(b)) {
+        JS_FreeValue(ctx, a);
+        return JS_EXCEPTION;
+    }
+    cmp = js_string_compare(ctx, JS_VALUE_GET_STRING(a), JS_VALUE_GET_STRING(b));
+    JS_FreeValue(ctx, a);
+    JS_FreeValue(ctx, b);
+    return JS_NewInt32(ctx, cmp);
+}
+#endif /* !CONFIG_ALL_UNICODE */
+
+/* also used for String.prototype.valueOf */
+static JSValue js_string_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    return js_thisStringValue(ctx, this_val);
+}
+
+#if 0
+static JSValue js_string___toStringCheckObject(JSContext *ctx, JSValueConst this_val,
+                                               int argc, JSValueConst *argv)
+{
+    return JS_ToStringCheckObject(ctx, argv[0]);
+}
+
+static JSValue js_string___toString(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    return JS_ToString(ctx, argv[0]);
+}
+
+static JSValue js_string___advanceStringIndex(JSContext *ctx, JSValueConst
+                                              this_val,
+                                              int argc, JSValueConst *argv)
+{
+    JSValue str;
+    int idx;
+    BOOL is_unicode;
+    JSString *p;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+    if (JS_ToInt32Sat(ctx, &idx, argv[1])) {
+        JS_FreeValue(ctx, str);
+        return JS_EXCEPTION;
+    }
+    is_unicode = JS_ToBool(ctx, argv[2]);
+    p = JS_VALUE_GET_STRING(str);
+    if (!is_unicode || (unsigned)idx >= p->len || !p->is_wide_char) {
+        idx++;
+    } else {
+        string_getc(p, &idx);
+    }
+    JS_FreeValue(ctx, str);
+    return JS_NewInt32(ctx, idx);
+}
+#endif
+
+/* String Iterator */
+
+static JSValue js_string_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv,
+                                       BOOL *pdone, int magic)
+{
+    JSArrayIteratorData *it;
+    uint32_t idx, c, start;
+    JSString *p;
+
+    it = JS_GetOpaque2(ctx, this_val, JS_CLASS_STRING_ITERATOR);
+    if (!it) {
+        *pdone = FALSE;
+        return JS_EXCEPTION;
+    }
+    if (JS_IsUndefined(it->obj))
+        goto done;
+    p = JS_VALUE_GET_STRING(it->obj);
+    idx = it->idx;
+    if (idx >= p->len) {
+        JS_FreeValue(ctx, it->obj);
+        it->obj = JS_UNDEFINED;
+    done:
+        *pdone = TRUE;
+        return JS_UNDEFINED;
+    }
+
+    start = idx;
+    c = string_getc(p, (int *)&idx);
+    it->idx = idx;
+    *pdone = FALSE;
+    if (c <= 0xffff) {
+        return js_new_string_char(ctx, c);
+    } else {
+        return js_new_string16(ctx, p->u.str16 + start, 2);
+    }
+}
+
+/* ES6 Annex B 2.3.2 etc. */
+enum {
+    magic_string_anchor,
+    magic_string_big,
+    magic_string_blink,
+    magic_string_bold,
+    magic_string_fixed,
+    magic_string_fontcolor,
+    magic_string_fontsize,
+    magic_string_italics,
+    magic_string_link,
+    magic_string_small,
+    magic_string_strike,
+    magic_string_sub,
+    magic_string_sup,
+};
+
+static JSValue js_string_CreateHTML(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv, int magic)
+{
+    JSValue str;
+    const JSString *p;
+    StringBuffer b_s, *b = &b_s;
+    static struct { const char *tag, *attr; } const defs[] = {
+        { "a", "name" }, { "big", NULL }, { "blink", NULL }, { "b", NULL },
+        { "tt", NULL }, { "font", "color" }, { "font", "size" }, { "i", NULL },
+        { "a", "href" }, { "small", NULL }, { "strike", NULL },
+        { "sub", NULL }, { "sup", NULL },
+    };
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return JS_EXCEPTION;
+    string_buffer_init(ctx, b, 7);
+    string_buffer_putc8(b, '<');
+    string_buffer_puts8(b, defs[magic].tag);
+    if (defs[magic].attr) {
+        // r += " " + attr + "=\"" + value + "\"";
+        JSValue value;
+        int i;
+
+        string_buffer_putc8(b, ' ');
+        string_buffer_puts8(b, defs[magic].attr);
+        string_buffer_puts8(b, "=\"");
+        value = JS_ToStringCheckObject(ctx, argv[0]);
+        if (JS_IsException(value)) {
+            JS_FreeValue(ctx, str);
+            string_buffer_free(b);
+            return JS_EXCEPTION;
+        }
+        p = JS_VALUE_GET_STRING(value);
+        for (i = 0; i < p->len; i++) {
+            int c = string_get(p, i);
+            if (c == '"') {
+                string_buffer_puts8(b, "&quot;");
+            } else {
+                string_buffer_putc16(b, c);
+            }
+        }
+        JS_FreeValue(ctx, value);
+        string_buffer_putc8(b, '\"');
+    }
+    // return r + ">" + str + "</" + tag + ">";
+    string_buffer_putc8(b, '>');
+    string_buffer_concat_value_free(b, str);
+    string_buffer_puts8(b, "</");
+    string_buffer_puts8(b, defs[magic].tag);
+    string_buffer_putc8(b, '>');
+    return string_buffer_end(b);
+}
+
+static const JSCFunctionListEntry js_string_funcs[] = {
+    JS_CFUNC_DEF("fromCharCode", 1, js_string_fromCharCode ),
+    JS_CFUNC_DEF("fromCodePoint", 1, js_string_fromCodePoint ),
+    JS_CFUNC_DEF("raw", 1, js_string_raw ),
+    //JS_CFUNC_DEF("__toString", 1, js_string___toString ),
+    //JS_CFUNC_DEF("__isSpace", 1, js_string___isSpace ),
+    //JS_CFUNC_DEF("__toStringCheckObject", 1, js_string___toStringCheckObject ),
+    //JS_CFUNC_DEF("__advanceStringIndex", 3, js_string___advanceStringIndex ),
+    //JS_CFUNC_DEF("__GetSubstitution", 6, js_string___GetSubstitution ),
+};
+
+static const JSCFunctionListEntry js_string_proto_funcs[] = {
+    JS_PROP_INT32_DEF("length", 0, JS_PROP_CONFIGURABLE ),
+    JS_CFUNC_MAGIC_DEF("at", 1, js_string_charAt, 1 ),
+    JS_CFUNC_DEF("charCodeAt", 1, js_string_charCodeAt ),
+    JS_CFUNC_MAGIC_DEF("charAt", 1, js_string_charAt, 0 ),
+    JS_CFUNC_DEF("concat", 1, js_string_concat ),
+    JS_CFUNC_DEF("codePointAt", 1, js_string_codePointAt ),
+    JS_CFUNC_DEF("isWellFormed", 0, js_string_isWellFormed ),
+    JS_CFUNC_DEF("toWellFormed", 0, js_string_toWellFormed ),
+    JS_CFUNC_MAGIC_DEF("indexOf", 1, js_string_indexOf, 0 ),
+    JS_CFUNC_MAGIC_DEF("lastIndexOf", 1, js_string_indexOf, 1 ),
+    JS_CFUNC_MAGIC_DEF("includes", 1, js_string_includes, 0 ),
+    JS_CFUNC_MAGIC_DEF("endsWith", 1, js_string_includes, 2 ),
+    JS_CFUNC_MAGIC_DEF("startsWith", 1, js_string_includes, 1 ),
+    JS_CFUNC_MAGIC_DEF("match", 1, js_string_match, JS_ATOM_Symbol_match ),
+    JS_CFUNC_MAGIC_DEF("matchAll", 1, js_string_match, JS_ATOM_Symbol_matchAll ),
+    JS_CFUNC_MAGIC_DEF("search", 1, js_string_match, JS_ATOM_Symbol_search ),
+    JS_CFUNC_DEF("split", 2, js_string_split ),
+    JS_CFUNC_DEF("substring", 2, js_string_substring ),
+    JS_CFUNC_DEF("substr", 2, js_string_substr ),
+    JS_CFUNC_DEF("slice", 2, js_string_slice ),
+    JS_CFUNC_DEF("repeat", 1, js_string_repeat ),
+    JS_CFUNC_MAGIC_DEF("replace", 2, js_string_replace, 0 ),
+    JS_CFUNC_MAGIC_DEF("replaceAll", 2, js_string_replace, 1 ),
+    JS_CFUNC_MAGIC_DEF("padEnd", 1, js_string_pad, 1 ),
+    JS_CFUNC_MAGIC_DEF("padStart", 1, js_string_pad, 0 ),
+    JS_CFUNC_MAGIC_DEF("trim", 0, js_string_trim, 3 ),
+    JS_CFUNC_MAGIC_DEF("trimEnd", 0, js_string_trim, 2 ),
+    JS_ALIAS_DEF("trimRight", "trimEnd" ),
+    JS_CFUNC_MAGIC_DEF("trimStart", 0, js_string_trim, 1 ),
+    JS_ALIAS_DEF("trimLeft", "trimStart" ),
+    JS_CFUNC_DEF("toString", 0, js_string_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_string_toString ),
+    JS_CFUNC_DEF("__quote", 1, js_string___quote ),
+    JS_CFUNC_DEF("localeCompare", 1, js_string_localeCompare ),
+    JS_CFUNC_MAGIC_DEF("toLowerCase", 0, js_string_toLowerCase, 1 ),
+    JS_CFUNC_MAGIC_DEF("toUpperCase", 0, js_string_toLowerCase, 0 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleLowerCase", 0, js_string_toLowerCase, 1 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleUpperCase", 0, js_string_toLowerCase, 0 ),
+    JS_CFUNC_MAGIC_DEF("[Symbol.iterator]", 0, js_create_array_iterator, JS_ITERATOR_KIND_VALUE | 4 ),
+    /* ES6 Annex B 2.3.2 etc. */
+    JS_CFUNC_MAGIC_DEF("anchor", 1, js_string_CreateHTML, magic_string_anchor ),
+    JS_CFUNC_MAGIC_DEF("big", 0, js_string_CreateHTML, magic_string_big ),
+    JS_CFUNC_MAGIC_DEF("blink", 0, js_string_CreateHTML, magic_string_blink ),
+    JS_CFUNC_MAGIC_DEF("bold", 0, js_string_CreateHTML, magic_string_bold ),
+    JS_CFUNC_MAGIC_DEF("fixed", 0, js_string_CreateHTML, magic_string_fixed ),
+    JS_CFUNC_MAGIC_DEF("fontcolor", 1, js_string_CreateHTML, magic_string_fontcolor ),
+    JS_CFUNC_MAGIC_DEF("fontsize", 1, js_string_CreateHTML, magic_string_fontsize ),
+    JS_CFUNC_MAGIC_DEF("italics", 0, js_string_CreateHTML, magic_string_italics ),
+    JS_CFUNC_MAGIC_DEF("link", 1, js_string_CreateHTML, magic_string_link ),
+    JS_CFUNC_MAGIC_DEF("small", 0, js_string_CreateHTML, magic_string_small ),
+    JS_CFUNC_MAGIC_DEF("strike", 0, js_string_CreateHTML, magic_string_strike ),
+    JS_CFUNC_MAGIC_DEF("sub", 0, js_string_CreateHTML, magic_string_sub ),
+    JS_CFUNC_MAGIC_DEF("sup", 0, js_string_CreateHTML, magic_string_sup ),
+};
+
+static const JSCFunctionListEntry js_string_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_string_iterator_next, 0 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "String Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+#ifdef CONFIG_ALL_UNICODE
+static const JSCFunctionListEntry js_string_proto_normalize[] = {
+    JS_CFUNC_DEF("normalize", 0, js_string_normalize ),
+};
+#endif
+
+void JS_AddIntrinsicStringNormalize(JSContext *ctx)
+{
+#ifdef CONFIG_ALL_UNICODE
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_STRING], js_string_proto_normalize,
+                               countof(js_string_proto_normalize));
+#endif
+}
+
+/* Math */
+
+/* precondition: a and b are not NaN */
+static double js_fmin(double a, double b)
+{
+    if (a == 0 && b == 0) {
+        JSFloat64Union a1, b1;
+        a1.d = a;
+        b1.d = b;
+        a1.u64 |= b1.u64;
+        return a1.d;
+    } else {
+        return fmin(a, b);
+    }
+}
+
+/* precondition: a and b are not NaN */
+static double js_fmax(double a, double b)
+{
+    if (a == 0 && b == 0) {
+        JSFloat64Union a1, b1;
+        a1.d = a;
+        b1.d = b;
+        a1.u64 &= b1.u64;
+        return a1.d;
+    } else {
+        return fmax(a, b);
+    }
+}
+
+static JSValue js_math_min_max(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv, int magic)
+{
+    BOOL is_max = magic;
+    double r, a;
+    int i;
+    uint32_t tag;
+
+    if (unlikely(argc == 0)) {
+        return __JS_NewFloat64(ctx, is_max ? INFINITY : -INFINITY);
+    }
+
+    tag = JS_VALUE_GET_TAG(argv[0]);
+    if (tag == JS_TAG_INT) {
+        int a1, r1 = JS_VALUE_GET_INT(argv[0]);
+        for(i = 1; i < argc; i++) {
+            tag = JS_VALUE_GET_TAG(argv[i]);
+            if (tag != JS_TAG_INT) {
+                r = r1;
+                goto generic_case;
+            }
+            a1 = JS_VALUE_GET_INT(argv[i]);
+            if (is_max)
+                r1 = max_int(r1, a1);
+            else
+                r1 = min_int(r1, a1);
+
+        }
+        return JS_NewInt32(ctx, r1);
+    } else {
+        if (JS_ToFloat64(ctx, &r, argv[0]))
+            return JS_EXCEPTION;
+        i = 1;
+    generic_case:
+        while (i < argc) {
+            if (JS_ToFloat64(ctx, &a, argv[i]))
+                return JS_EXCEPTION;
+            if (!isnan(r)) {
+                if (isnan(a)) {
+                    r = a;
+                } else {
+                    if (is_max)
+                        r = js_fmax(r, a);
+                    else
+                        r = js_fmin(r, a);
+                }
+            }
+            i++;
+        }
+        return JS_NewFloat64(ctx, r);
+    }
+}
+
+static double js_math_sign(double a)
+{
+    if (isnan(a) || a == 0.0)
+        return a;
+    if (a < 0)
+        return -1;
+    else
+        return 1;
+}
+
+static double js_math_round(double a)
+{
+    JSFloat64Union u;
+    uint64_t frac_mask, one;
+    unsigned int e, s;
+
+    u.d = a;
+    e = (u.u64 >> 52) & 0x7ff;
+    if (e < 1023) {
+        /* abs(a) < 1 */
+        if (e == (1023 - 1) && u.u64 != 0xbfe0000000000000) {
+            /* abs(a) > 0.5 or a = 0.5: return +/-1.0 */
+            u.u64 = (u.u64 & ((uint64_t)1 << 63)) | ((uint64_t)1023 << 52);
+        } else {
+            /* return +/-0.0 */
+            u.u64 &= (uint64_t)1 << 63;
+        }
+    } else if (e < (1023 + 52)) {
+        s = u.u64 >> 63;
+        one = (uint64_t)1 << (52 - (e - 1023));
+        frac_mask = one - 1;
+        u.u64 += (one >> 1) - s;
+        u.u64 &= ~frac_mask; /* truncate to an integer */
+    }
+    /* otherwise: abs(a) >= 2^52, or NaN, +/-Infinity: no change */
+    return u.d;
+}
+
+static JSValue js_math_hypot(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    double r, a;
+    int i;
+
+    r = 0;
+    if (argc > 0) {
+        if (JS_ToFloat64(ctx, &r, argv[0]))
+            return JS_EXCEPTION;
+        if (argc == 1) {
+            r = fabs(r);
+        } else {
+            /* use the built-in function to minimize precision loss */
+            for (i = 1; i < argc; i++) {
+                if (JS_ToFloat64(ctx, &a, argv[i]))
+                    return JS_EXCEPTION;
+                r = hypot(r, a);
+            }
+        }
+    }
+    return JS_NewFloat64(ctx, r);
+}
+
+static double js_math_fround(double a)
+{
+    return (float)a;
+}
+
+static JSValue js_math_imul(JSContext *ctx, JSValueConst this_val,
+                            int argc, JSValueConst *argv)
+{
+    uint32_t a, b, c;
+    int32_t d;
+
+    if (JS_ToUint32(ctx, &a, argv[0]))
+        return JS_EXCEPTION;
+    if (JS_ToUint32(ctx, &b, argv[1]))
+        return JS_EXCEPTION;
+    c = a * b;
+    memcpy(&d, &c, sizeof(d));
+    return JS_NewInt32(ctx, d);
+}
+
+static JSValue js_math_clz32(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    uint32_t a, r;
+
+    if (JS_ToUint32(ctx, &a, argv[0]))
+        return JS_EXCEPTION;
+    if (a == 0)
+        r = 32;
+    else
+        r = clz32(a);
+    return JS_NewInt32(ctx, r);
+}
+
+/* xorshift* random number generator by Marsaglia */
+static uint64_t xorshift64star(uint64_t *pstate)
+{
+    uint64_t x;
+    x = *pstate;
+    x ^= x >> 12;
+    x ^= x << 25;
+    x ^= x >> 27;
+    *pstate = x;
+    return x * 0x2545F4914F6CDD1D;
+}
+
+static void js_random_init(JSContext *ctx)
+{
+#ifdef _MSC_VER
+    ctx->random_state = time(NULL);
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    ctx->random_state = ((int64_t)tv.tv_sec * 1000000) + tv.tv_usec;
+#endif
+    /* the state must be non zero */
+    if (ctx->random_state == 0)
+        ctx->random_state = 1;
+}
+
+static JSValue js_math_random(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSFloat64Union u;
+    uint64_t v;
+
+    v = xorshift64star(&ctx->random_state);
+    /* 1.0 <= u.d < 2 */
+    u.u64 = ((uint64_t)0x3ff << 52) | (v >> 12);
+    return __JS_NewFloat64(ctx, u.d - 1.0);
+}
+
+// MSVC inexplicably refuses to initialize the array below with
+// these functions, so use wrappers.
+static double floorWrapper(double x) { return floor(x); }
+static double ceilWrapper(double x) { return ceil(x); }
+static double log2Wrapper(double x) { return log2(x); }
+
+static const JSCFunctionListEntry js_math_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("min", 2, js_math_min_max, 0 ),
+    JS_CFUNC_MAGIC_DEF("max", 2, js_math_min_max, 1 ),
+    JS_CFUNC_SPECIAL_DEF("abs", 1, f_f, fabs ),
+    JS_CFUNC_SPECIAL_DEF("floor", 1, f_f, floorWrapper ),
+    JS_CFUNC_SPECIAL_DEF("ceil", 1, f_f, ceilWrapper ),
+    JS_CFUNC_SPECIAL_DEF("round", 1, f_f, js_math_round ),
+    JS_CFUNC_SPECIAL_DEF("sqrt", 1, f_f, sqrt ),
+
+    JS_CFUNC_SPECIAL_DEF("acos", 1, f_f, acos ),
+    JS_CFUNC_SPECIAL_DEF("asin", 1, f_f, asin ),
+    JS_CFUNC_SPECIAL_DEF("atan", 1, f_f, atan ),
+    JS_CFUNC_SPECIAL_DEF("atan2", 2, f_f_f, atan2 ),
+    JS_CFUNC_SPECIAL_DEF("cos", 1, f_f, cos ),
+    JS_CFUNC_SPECIAL_DEF("exp", 1, f_f, exp ),
+    JS_CFUNC_SPECIAL_DEF("log", 1, f_f, log ),
+    JS_CFUNC_SPECIAL_DEF("pow", 2, f_f_f, js_pow ),
+    JS_CFUNC_SPECIAL_DEF("sin", 1, f_f, sin ),
+    JS_CFUNC_SPECIAL_DEF("tan", 1, f_f, tan ),
+    /* ES6 */
+    JS_CFUNC_SPECIAL_DEF("trunc", 1, f_f, trunc ),
+    JS_CFUNC_SPECIAL_DEF("sign", 1, f_f, js_math_sign ),
+    JS_CFUNC_SPECIAL_DEF("cosh", 1, f_f, cosh ),
+    JS_CFUNC_SPECIAL_DEF("sinh", 1, f_f, sinh ),
+    JS_CFUNC_SPECIAL_DEF("tanh", 1, f_f, tanh ),
+    JS_CFUNC_SPECIAL_DEF("acosh", 1, f_f, acosh ),
+    JS_CFUNC_SPECIAL_DEF("asinh", 1, f_f, asinh ),
+    JS_CFUNC_SPECIAL_DEF("atanh", 1, f_f, atanh ),
+    JS_CFUNC_SPECIAL_DEF("expm1", 1, f_f, expm1 ),
+    JS_CFUNC_SPECIAL_DEF("log1p", 1, f_f, log1p ),
+    JS_CFUNC_SPECIAL_DEF("log2", 1, f_f, log2Wrapper ),
+    JS_CFUNC_SPECIAL_DEF("log10", 1, f_f, log10 ),
+    JS_CFUNC_SPECIAL_DEF("cbrt", 1, f_f, cbrt ),
+    JS_CFUNC_DEF("hypot", 2, js_math_hypot ),
+    JS_CFUNC_DEF("random", 0, js_math_random ),
+    JS_CFUNC_SPECIAL_DEF("fround", 1, f_f, js_math_fround ),
+    JS_CFUNC_DEF("imul", 2, js_math_imul ),
+    JS_CFUNC_DEF("clz32", 1, js_math_clz32 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Math", JS_PROP_CONFIGURABLE ),
+    JS_PROP_DOUBLE_DEF("E", 2.718281828459045, 0 ),
+    JS_PROP_DOUBLE_DEF("LN10", 2.302585092994046, 0 ),
+    JS_PROP_DOUBLE_DEF("LN2", 0.6931471805599453, 0 ),
+    JS_PROP_DOUBLE_DEF("LOG2E", 1.4426950408889634, 0 ),
+    JS_PROP_DOUBLE_DEF("LOG10E", 0.4342944819032518, 0 ),
+    JS_PROP_DOUBLE_DEF("PI", 3.141592653589793, 0 ),
+    JS_PROP_DOUBLE_DEF("SQRT1_2", 0.7071067811865476, 0 ),
+    JS_PROP_DOUBLE_DEF("SQRT2", 1.4142135623730951, 0 ),
+};
+
+static const JSCFunctionListEntry js_math_obj[] = {
+    JS_OBJECT_DEF("Math", js_math_funcs, countof(js_math_funcs), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+/* Date */
+
+/* OS dependent. d = argv[0] is in ms from 1970. Return the difference
+   between UTC time and local time 'd' in minutes */
+static int getTimezoneOffset(int64_t time)
+{
+    time_t ti;
+    int res;
+
+    time /= 1000; /* convert to seconds */
+    if (sizeof(time_t) == 4) {
+        /* on 32-bit systems, we need to clamp the time value to the
+           range of `time_t`. This is better than truncating values to
+           32 bits and hopefully provides the same result as 64-bit
+           implementation of localtime_r.
+         */
+        if ((time_t)-1 < 0) {
+            if (time < INT32_MIN) {
+                time = INT32_MIN;
+            } else if (time > INT32_MAX) {
+                time = INT32_MAX;
+            }
+        } else {
+            if (time < 0) {
+                time = 0;
+            } else if (time > UINT32_MAX) {
+                time = UINT32_MAX;
+            }
+        }
+    }
+    ti = time;
+#if defined(_WIN32)
+    {
+        struct tm *tm;
+        time_t gm_ti, loc_ti;
+
+        tm = gmtime(&ti);
+        gm_ti = mktime(tm);
+
+        tm = localtime(&ti);
+        loc_ti = mktime(tm);
+
+        res = (gm_ti - loc_ti) / 60;
+    }
+#else
+    {
+        struct tm tm;
+        localtime_r(&ti, &tm);
+        res = -tm.tm_gmtoff / 60;
+    }
+#endif
+    return res;
+}
+
+#if 0
+static JSValue js___date_getTimezoneOffset(JSContext *ctx, JSValueConst this_val,
+                                           int argc, JSValueConst *argv)
+{
+    double dd;
+
+    if (JS_ToFloat64(ctx, &dd, argv[0]))
+        return JS_EXCEPTION;
+    if (isnan(dd))
+        return JS_NewFloat64(ctx, dd);
+    else
+        return JS_NewInt32(ctx, getTimezoneOffset((int64_t)dd));
+}
+
+static JSValue js_get_prototype_from_ctor(JSContext *ctx, JSValueConst ctor,
+                                          JSValueConst def_proto)
+{
+    JSValue proto;
+    proto = JS_GetProperty(ctx, ctor, JS_ATOM_prototype);
+    if (JS_IsException(proto))
+        return proto;
+    if (!JS_IsObject(proto)) {
+        JS_FreeValue(ctx, proto);
+        proto = JS_DupValue(ctx, def_proto);
+    }
+    return proto;
+}
+
+/* create a new date object */
+static JSValue js___date_create(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue obj, proto;
+    proto = js_get_prototype_from_ctor(ctx, argv[0], argv[1]);
+    if (JS_IsException(proto))
+        return proto;
+    obj = JS_NewObjectProtoClass(ctx, proto, JS_CLASS_DATE);
+    JS_FreeValue(ctx, proto);
+    if (!JS_IsException(obj))
+        JS_SetObjectData(ctx, obj, JS_DupValue(ctx, argv[2]));
+    return obj;
+}
+#endif
+
+/* RegExp */
+
+static void js_regexp_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSRegExp *re = &p->u.regexp;
+    JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_STRING, re->bytecode));
+    JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_STRING, re->pattern));
+}
+
+/* create a string containing the RegExp bytecode */
+static JSValue js_compile_regexp(JSContext *ctx, JSValueConst pattern,
+                                 JSValueConst flags)
+{
+    const char *str;
+    int re_flags, mask;
+    uint8_t *re_bytecode_buf;
+    size_t i, len;
+    int re_bytecode_len;
+    JSValue ret;
+    char error_msg[64];
+
+    re_flags = 0;
+    if (!JS_IsUndefined(flags)) {
+        str = JS_ToCStringLen(ctx, &len, flags);
+        if (!str)
+            return JS_EXCEPTION;
+        /* XXX: re_flags = LRE_FLAG_OCTAL unless strict mode? */
+        for (i = 0; i < len; i++) {
+            switch(str[i]) {
+            case 'd':
+                mask = LRE_FLAG_INDICES;
+                break;
+            case 'g':
+                mask = LRE_FLAG_GLOBAL;
+                break;
+            case 'i':
+                mask = LRE_FLAG_IGNORECASE;
+                break;
+            case 'm':
+                mask = LRE_FLAG_MULTILINE;
+                break;
+            case 's':
+                mask = LRE_FLAG_DOTALL;
+                break;
+            case 'u':
+                mask = LRE_FLAG_UNICODE;
+                break;
+            case 'y':
+                mask = LRE_FLAG_STICKY;
+                break;
+            default:
+                goto bad_flags;
+            }
+            if ((re_flags & mask) != 0) {
+            bad_flags:
+                JS_FreeCString(ctx, str);
+                return JS_ThrowSyntaxError(ctx, "invalid regular expression flags");
+            }
+            re_flags |= mask;
+        }
+        JS_FreeCString(ctx, str);
+    }
+
+    str = JS_ToCStringLen2(ctx, &len, pattern, !(re_flags & LRE_FLAG_UNICODE));
+    if (!str)
+        return JS_EXCEPTION;
+    re_bytecode_buf = lre_compile(&re_bytecode_len, error_msg,
+                                  sizeof(error_msg), str, len, re_flags, ctx);
+    JS_FreeCString(ctx, str);
+    if (!re_bytecode_buf) {
+        JS_ThrowSyntaxError(ctx, "%s", error_msg);
+        return JS_EXCEPTION;
+    }
+
+    ret = js_new_string8(ctx, re_bytecode_buf, re_bytecode_len);
+    js_free(ctx, re_bytecode_buf);
+    return ret;
+}
+
+/* create a RegExp object from a string containing the RegExp bytecode
+   and the source pattern */
+static JSValue js_regexp_constructor_internal(JSContext *ctx, JSValueConst ctor,
+                                              JSValue pattern, JSValue bc)
+{
+    JSValue obj;
+    JSObject *p;
+    JSRegExp *re;
+
+    /* sanity check */
+    if (JS_VALUE_GET_TAG(bc) != JS_TAG_STRING ||
+        JS_VALUE_GET_TAG(pattern) != JS_TAG_STRING) {
+        JS_ThrowTypeError(ctx, "string expected");
+    fail:
+        JS_FreeValue(ctx, bc);
+        JS_FreeValue(ctx, pattern);
+        return JS_EXCEPTION;
+    }
+
+    obj = js_create_from_ctor(ctx, ctor, JS_CLASS_REGEXP);
+    if (JS_IsException(obj))
+        goto fail;
+    p = JS_VALUE_GET_OBJ(obj);
+    re = &p->u.regexp;
+    re->pattern = JS_VALUE_GET_STRING(pattern);
+    re->bytecode = JS_VALUE_GET_STRING(bc);
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_lastIndex, JS_NewInt32(ctx, 0),
+                           JS_PROP_WRITABLE);
+    return obj;
+}
+
+static JSRegExp *js_get_regexp(JSContext *ctx, JSValueConst obj, BOOL throw_error)
+{
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(obj);
+        if (p->class_id == JS_CLASS_REGEXP)
+            return &p->u.regexp;
+    }
+    if (throw_error) {
+        JS_ThrowTypeErrorInvalidClass(ctx, JS_CLASS_REGEXP);
+    }
+    return NULL;
+}
+
+/* return < 0 if exception or TRUE/FALSE */
+static int js_is_regexp(JSContext *ctx, JSValueConst obj)
+{
+    JSValue m;
+
+    if (!JS_IsObject(obj))
+        return FALSE;
+    m = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_match);
+    if (JS_IsException(m))
+        return -1;
+    if (!JS_IsUndefined(m))
+        return JS_ToBoolFree(ctx, m);
+    return js_get_regexp(ctx, obj, FALSE) != NULL;
+}
+
+static JSValue js_regexp_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue pattern, flags, bc, val;
+    JSValueConst pat, flags1;
+    JSRegExp *re;
+    int pat_is_regexp;
+
+    pat = argv[0];
+    flags1 = argv[1];
+    pat_is_regexp = js_is_regexp(ctx, pat);
+    if (pat_is_regexp < 0)
+        return JS_EXCEPTION;
+    if (JS_IsUndefined(new_target)) {
+        /* called as a function */
+        new_target = JS_GetActiveFunction(ctx);
+        if (pat_is_regexp && JS_IsUndefined(flags1)) {
+            JSValue ctor;
+            BOOL res;
+            ctor = JS_GetProperty(ctx, pat, JS_ATOM_constructor);
+            if (JS_IsException(ctor))
+                return ctor;
+            res = js_same_value(ctx, ctor, new_target);
+            JS_FreeValue(ctx, ctor);
+            if (res)
+                return JS_DupValue(ctx, pat);
+        }
+    }
+    re = js_get_regexp(ctx, pat, FALSE);
+    if (re) {
+        pattern = JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re->pattern));
+        if (JS_IsUndefined(flags1)) {
+            bc = JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re->bytecode));
+            goto no_compilation;
+        } else {
+            flags = JS_ToString(ctx, flags1);
+            if (JS_IsException(flags))
+                goto fail;
+        }
+    } else {
+        flags = JS_UNDEFINED;
+        if (pat_is_regexp) {
+            pattern = JS_GetProperty(ctx, pat, JS_ATOM_source);
+            if (JS_IsException(pattern))
+                goto fail;
+            if (JS_IsUndefined(flags1)) {
+                flags = JS_GetProperty(ctx, pat, JS_ATOM_flags);
+                if (JS_IsException(flags))
+                    goto fail;
+            } else {
+                flags = JS_DupValue(ctx, flags1);
+            }
+        } else {
+            pattern = JS_DupValue(ctx, pat);
+            flags = JS_DupValue(ctx, flags1);
+        }
+        if (JS_IsUndefined(pattern)) {
+            pattern = JS_AtomToString(ctx, JS_ATOM_empty_string);
+        } else {
+            val = pattern;
+            pattern = JS_ToString(ctx, val);
+            JS_FreeValue(ctx, val);
+            if (JS_IsException(pattern))
+                goto fail;
+        }
+    }
+    bc = js_compile_regexp(ctx, pattern, flags);
+    if (JS_IsException(bc))
+        goto fail;
+    JS_FreeValue(ctx, flags);
+ no_compilation:
+    return js_regexp_constructor_internal(ctx, new_target, pattern, bc);
+ fail:
+    JS_FreeValue(ctx, pattern);
+    JS_FreeValue(ctx, flags);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_regexp_compile(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSRegExp *re1, *re;
+    JSValueConst pattern1, flags1;
+    JSValue bc, pattern;
+
+    re = js_get_regexp(ctx, this_val, TRUE);
+    if (!re)
+        return JS_EXCEPTION;
+    pattern1 = argv[0];
+    flags1 = argv[1];
+    re1 = js_get_regexp(ctx, pattern1, FALSE);
+    if (re1) {
+        if (!JS_IsUndefined(flags1))
+            return JS_ThrowTypeError(ctx, "flags must be undefined");
+        pattern = JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re1->pattern));
+        bc = JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re1->bytecode));
+    } else {
+        bc = JS_UNDEFINED;
+        if (JS_IsUndefined(pattern1))
+            pattern = JS_AtomToString(ctx, JS_ATOM_empty_string);
+        else
+            pattern = JS_ToString(ctx, pattern1);
+        if (JS_IsException(pattern))
+            goto fail;
+        bc = js_compile_regexp(ctx, pattern, flags1);
+        if (JS_IsException(bc))
+            goto fail;
+    }
+    JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, re->pattern));
+    JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, re->bytecode));
+    re->pattern = JS_VALUE_GET_STRING(pattern);
+    re->bytecode = JS_VALUE_GET_STRING(bc);
+    if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                       JS_NewInt32(ctx, 0)) < 0)
+        return JS_EXCEPTION;
+    return JS_DupValue(ctx, this_val);
+ fail:
+    JS_FreeValue(ctx, pattern);
+    JS_FreeValue(ctx, bc);
+    return JS_EXCEPTION;
+}
+
+#if 0
+static JSValue js_regexp_get___source(JSContext *ctx, JSValueConst this_val)
+{
+    JSRegExp *re = js_get_regexp(ctx, this_val, TRUE);
+    if (!re)
+        return JS_EXCEPTION;
+    return JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re->pattern));
+}
+
+static JSValue js_regexp_get___flags(JSContext *ctx, JSValueConst this_val)
+{
+    JSRegExp *re = js_get_regexp(ctx, this_val, TRUE);
+    int flags;
+
+    if (!re)
+        return JS_EXCEPTION;
+    flags = lre_get_flags(re->bytecode->u.str8);
+    return JS_NewInt32(ctx, flags);
+}
+#endif
+
+static JSValue js_regexp_get_source(JSContext *ctx, JSValueConst this_val)
+{
+    JSRegExp *re;
+    JSString *p;
+    StringBuffer b_s, *b = &b_s;
+    int i, n, c, c2, bra;
+
+    if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    if (js_same_value(ctx, this_val, ctx->class_proto[JS_CLASS_REGEXP]))
+        goto empty_regex;
+
+    re = js_get_regexp(ctx, this_val, TRUE);
+    if (!re)
+        return JS_EXCEPTION;
+
+    p = re->pattern;
+
+    if (p->len == 0) {
+    empty_regex:
+        return JS_NewString(ctx, "(?:)");
+    }
+    string_buffer_init2(ctx, b, p->len, p->is_wide_char);
+
+    /* Escape '/' and newline sequences as needed */
+    bra = 0;
+    for (i = 0, n = p->len; i < n;) {
+        c2 = -1;
+        switch (c = string_get(p, i++)) {
+        case '\\':
+            if (i < n)
+                c2 = string_get(p, i++);
+            break;
+        case ']':
+            bra = 0;
+            break;
+        case '[':
+            if (!bra) {
+                if (i < n && string_get(p, i) == ']')
+                    c2 = string_get(p, i++);
+                bra = 1;
+            }
+            break;
+        case '\n':
+            c = '\\';
+            c2 = 'n';
+            break;
+        case '\r':
+            c = '\\';
+            c2 = 'r';
+            break;
+        case '/':
+            if (!bra) {
+                c = '\\';
+                c2 = '/';
+            }
+            break;
+        }
+        string_buffer_putc16(b, c);
+        if (c2 >= 0)
+            string_buffer_putc16(b, c2);
+    }
+    return string_buffer_end(b);
+}
+
+static JSValue js_regexp_get_flag(JSContext *ctx, JSValueConst this_val, int mask)
+{
+    JSRegExp *re;
+    int flags;
+
+    if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    re = js_get_regexp(ctx, this_val, FALSE);
+    if (!re) {
+        if (js_same_value(ctx, this_val, ctx->class_proto[JS_CLASS_REGEXP]))
+            return JS_UNDEFINED;
+        else
+            return JS_ThrowTypeErrorInvalidClass(ctx, JS_CLASS_REGEXP);
+    }
+
+    flags = lre_get_flags(re->bytecode->u.str8);
+    return JS_NewBool(ctx, flags & mask);
+}
+
+static JSValue js_regexp_get_flags(JSContext *ctx, JSValueConst this_val)
+{
+    char str[8], *p = str;
+    int res;
+
+    if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "hasIndices"));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'd';
+    res = JS_ToBoolFree(ctx, JS_GetProperty(ctx, this_val, JS_ATOM_global));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'g';
+    res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "ignoreCase"));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'i';
+    res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "multiline"));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'm';
+    res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "dotAll"));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 's';
+    res = JS_ToBoolFree(ctx, JS_GetProperty(ctx, this_val, JS_ATOM_unicode));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'u';
+    res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "sticky"));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'y';
+    return JS_NewStringLen(ctx, str, p - str);
+
+exception:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_regexp_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue pattern, flags;
+    StringBuffer b_s, *b = &b_s;
+
+    if (!JS_IsObject(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    string_buffer_init(ctx, b, 0);
+    string_buffer_putc8(b, '/');
+    pattern = JS_GetProperty(ctx, this_val, JS_ATOM_source);
+    if (string_buffer_concat_value_free(b, pattern))
+        goto fail;
+    string_buffer_putc8(b, '/');
+    flags = JS_GetProperty(ctx, this_val, JS_ATOM_flags);
+    if (string_buffer_concat_value_free(b, flags))
+        goto fail;
+    return string_buffer_end(b);
+
+fail:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+BOOL lre_check_stack_overflow(void *opaque, size_t alloca_size)
+{
+    JSContext *ctx = opaque;
+    return js_check_stack_overflow(ctx->rt, alloca_size);
+}
+
+void *lre_realloc(void *opaque, void *ptr, size_t size)
+{
+    JSContext *ctx = opaque;
+    /* No JS exception is raised here */
+    return js_realloc_rt(ctx->rt, ptr, size);
+}
+
+static JSValue js_regexp_exec(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSRegExp *re = js_get_regexp(ctx, this_val, TRUE);
+    JSString *str;
+    JSValue t, ret, str_val, obj, val, groups;
+    JSValue indices, indices_groups;
+    uint8_t *re_bytecode;
+    uint8_t **capture, *str_buf;
+    int rc, capture_count, shift, i, re_flags;
+    int64_t last_index;
+    const char *group_name_ptr;
+
+    if (!re)
+        return JS_EXCEPTION;
+
+    str_val = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str_val))
+        return JS_EXCEPTION;
+
+    ret = JS_EXCEPTION;
+    obj = JS_NULL;
+    groups = JS_UNDEFINED;
+    indices = JS_UNDEFINED;
+    indices_groups = JS_UNDEFINED;
+    capture = NULL;
+
+    val = JS_GetProperty(ctx, this_val, JS_ATOM_lastIndex);
+    if (JS_IsException(val) || JS_ToLengthFree(ctx, &last_index, val))
+        goto fail;
+
+    re_bytecode = re->bytecode->u.str8;
+    re_flags = lre_get_flags(re_bytecode);
+    if ((re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) == 0) {
+        last_index = 0;
+    }
+    str = JS_VALUE_GET_STRING(str_val);
+    capture_count = lre_get_capture_count(re_bytecode);
+    if (capture_count > 0) {
+        capture = js_malloc(ctx, sizeof(capture[0]) * capture_count * 2);
+        if (!capture)
+            goto fail;
+    }
+    shift = str->is_wide_char;
+    str_buf = str->u.str8;
+    if (last_index > str->len) {
+        rc = 2;
+    } else {
+        rc = lre_exec(capture, re_bytecode,
+                      str_buf, last_index, str->len,
+                      shift, ctx);
+    }
+    if (rc != 1) {
+        if (rc >= 0) {
+            if (rc == 2 || (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY))) {
+                if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                                   JS_NewInt32(ctx, 0)) < 0)
+                    goto fail;
+            }
+        } else {
+            JS_ThrowInternalError(ctx, "out of memory in regexp execution");
+            goto fail;
+        }
+    } else {
+        int prop_flags;
+        if (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) {
+            if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                               JS_NewInt32(ctx, (capture[1] - str_buf) >> shift)) < 0)
+                goto fail;
+        }
+        obj = JS_NewArray(ctx);
+        if (JS_IsException(obj))
+            goto fail;
+        prop_flags = JS_PROP_C_W_E | JS_PROP_THROW;
+        group_name_ptr = lre_get_groupnames(re_bytecode);
+        if (group_name_ptr) {
+            groups = JS_NewObjectProto(ctx, JS_NULL);
+            if (JS_IsException(groups))
+                goto fail;
+        }
+        if (re_flags & LRE_FLAG_INDICES) {
+            indices = JS_NewArray(ctx);
+            if (JS_IsException(indices))
+                goto fail;
+            if (group_name_ptr) {
+                indices_groups = JS_NewObjectProto(ctx, JS_NULL);
+                if (JS_IsException(indices_groups))
+                    goto fail;
+            }
+        }
+
+        for(i = 0; i < capture_count; i++) {
+            const char *name = NULL;
+            uint8_t **match = &capture[2 * i];
+            int start = -1;
+            int end = -1;
+            JSValue val;
+
+            if (group_name_ptr && i > 0) {
+                if (*group_name_ptr) name = group_name_ptr;
+                group_name_ptr += strlen(group_name_ptr) + 1;
+            }
+
+            if (match[0] && match[1]) {
+                start = (match[0] - str_buf) >> shift;
+                end = (match[1] - str_buf) >> shift;
+            }
+
+            if (!JS_IsUndefined(indices)) {
+                val = JS_UNDEFINED;
+                if (start != -1) {
+                    val = JS_NewArray(ctx);
+                    if (JS_IsException(val))
+                        goto fail;
+                    if (JS_DefinePropertyValueUint32(ctx, val, 0,
+                                                     JS_NewInt32(ctx, start),
+                                                     prop_flags) < 0) {
+                        JS_FreeValue(ctx, val);
+                        goto fail;
+                    }
+                    if (JS_DefinePropertyValueUint32(ctx, val, 1,
+                                                     JS_NewInt32(ctx, end),
+                                                     prop_flags) < 0) {
+                        JS_FreeValue(ctx, val);
+                        goto fail;
+                    }
+                }
+                if (name && !JS_IsUndefined(indices_groups)) {
+                    val = JS_DupValue(ctx, val);
+                    if (JS_DefinePropertyValueStr(ctx, indices_groups,
+                                                  name, val, prop_flags) < 0) {
+                        JS_FreeValue(ctx, val);
+                        goto fail;
+                    }
+                }
+                if (JS_DefinePropertyValueUint32(ctx, indices, i, val,
+                                                 prop_flags) < 0) {
+                    goto fail;
+                }
+            }
+
+            val = JS_UNDEFINED;
+            if (start != -1) {
+                val = js_sub_string(ctx, str, start, end);
+                if (JS_IsException(val))
+                    goto fail;
+            }
+
+            if (name) {
+                if (JS_DefinePropertyValueStr(ctx, groups, name,
+                                              JS_DupValue(ctx, val),
+                                              prop_flags) < 0) {
+                    JS_FreeValue(ctx, val);
+                    goto fail;
+                }
+            }
+
+            if (JS_DefinePropertyValueUint32(ctx, obj, i, val, prop_flags) < 0)
+                goto fail;
+        }
+
+        t = groups, groups = JS_UNDEFINED;
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_groups,
+                                   t, prop_flags) < 0) {
+            goto fail;
+        }
+
+        t = JS_NewInt32(ctx, (capture[0] - str_buf) >> shift);
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_index, t, prop_flags) < 0)
+            goto fail;
+
+        t = str_val, str_val = JS_UNDEFINED;
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_input, t, prop_flags) < 0)
+            goto fail;
+
+        if (!JS_IsUndefined(indices)) {
+            t = indices_groups, indices_groups = JS_UNDEFINED;
+            if (JS_DefinePropertyValue(ctx, indices, JS_ATOM_groups,
+                                       t, prop_flags) < 0) {
+                goto fail;
+            }
+            t = indices, indices = JS_UNDEFINED;
+            if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_indices,
+                                       t, prop_flags) < 0) {
+                goto fail;
+            }
+        }
+    }
+    ret = obj;
+    obj = JS_UNDEFINED;
+fail:
+    JS_FreeValue(ctx, indices_groups);
+    JS_FreeValue(ctx, indices);
+    JS_FreeValue(ctx, str_val);
+    JS_FreeValue(ctx, groups);
+    JS_FreeValue(ctx, obj);
+    js_free(ctx, capture);
+    return ret;
+}
+
+/* delete portions of a string that match a given regex */
+static JSValue JS_RegExpDelete(JSContext *ctx, JSValueConst this_val, JSValueConst arg)
+{
+    JSRegExp *re = js_get_regexp(ctx, this_val, TRUE);
+    JSString *str;
+    JSValue str_val, val;
+    uint8_t *re_bytecode;
+    int ret;
+    uint8_t **capture, *str_buf;
+    int capture_count, shift, re_flags;
+    int next_src_pos, start, end;
+    int64_t last_index;
+    StringBuffer b_s, *b = &b_s;
+
+    if (!re)
+        return JS_EXCEPTION;
+
+    string_buffer_init(ctx, b, 0);
+
+    capture = NULL;
+    str_val = JS_ToString(ctx, arg);
+    if (JS_IsException(str_val))
+        goto fail;
+    str = JS_VALUE_GET_STRING(str_val);
+    re_bytecode = re->bytecode->u.str8;
+    re_flags = lre_get_flags(re_bytecode);
+    if ((re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) == 0) {
+        last_index = 0;
+    } else {
+        val = JS_GetProperty(ctx, this_val, JS_ATOM_lastIndex);
+        if (JS_IsException(val) || JS_ToLengthFree(ctx, &last_index, val))
+            goto fail;
+    }
+    capture_count = lre_get_capture_count(re_bytecode);
+    if (capture_count > 0) {
+        capture = js_malloc(ctx, sizeof(capture[0]) * capture_count * 2);
+        if (!capture)
+            goto fail;
+    }
+    shift = str->is_wide_char;
+    str_buf = str->u.str8;
+    next_src_pos = 0;
+    for (;;) {
+        if (last_index > str->len)
+            break;
+
+        ret = lre_exec(capture, re_bytecode,
+                       str_buf, last_index, str->len, shift, ctx);
+        if (ret != 1) {
+            if (ret >= 0) {
+                if (ret == 2 || (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY))) {
+                    if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                                       JS_NewInt32(ctx, 0)) < 0)
+                        goto fail;
+                }
+            } else {
+                JS_ThrowInternalError(ctx, "out of memory in regexp execution");
+                goto fail;
+            }
+            break;
+        }
+        start = (capture[0] - str_buf) >> shift;
+        end = (capture[1] - str_buf) >> shift;
+        last_index = end;
+        if (next_src_pos < start) {
+            if (string_buffer_concat(b, str, next_src_pos, start))
+                goto fail;
+        }
+        next_src_pos = end;
+        if (!(re_flags & LRE_FLAG_GLOBAL)) {
+            if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                               JS_NewInt32(ctx, end)) < 0)
+                goto fail;
+            break;
+        }
+        if (end == start) {
+            if (!(re_flags & LRE_FLAG_UNICODE) || (unsigned)end >= str->len || !str->is_wide_char) {
+                end++;
+            } else {
+                string_getc(str, &end);
+            }
+        }
+        last_index = end;
+    }
+    if (string_buffer_concat(b, str, next_src_pos, str->len))
+        goto fail;
+    JS_FreeValue(ctx, str_val);
+    js_free(ctx, capture);
+    return string_buffer_end(b);
+fail:
+    JS_FreeValue(ctx, str_val);
+    js_free(ctx, capture);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_RegExpExec(JSContext *ctx, JSValueConst r, JSValueConst s)
+{
+    JSValue method, ret;
+
+    method = JS_GetProperty(ctx, r, JS_ATOM_exec);
+    if (JS_IsException(method))
+        return method;
+    if (JS_IsFunction(ctx, method)) {
+        ret = JS_CallFree(ctx, method, r, 1, &s);
+        if (JS_IsException(ret))
+            return ret;
+        if (!JS_IsObject(ret) && !JS_IsNull(ret)) {
+            JS_FreeValue(ctx, ret);
+            return JS_ThrowTypeError(ctx, "RegExp exec method must return an object or null");
+        }
+        return ret;
+    }
+    JS_FreeValue(ctx, method);
+    return js_regexp_exec(ctx, r, 1, &s);
+}
+
+#if 0
+static JSValue js_regexp___RegExpExec(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    return JS_RegExpExec(ctx, argv[0], argv[1]);
+}
+static JSValue js_regexp___RegExpDelete(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    return JS_RegExpDelete(ctx, argv[0], argv[1]);
+}
+#endif
+
+static JSValue js_regexp_test(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSValue val;
+    BOOL ret;
+
+    val = JS_RegExpExec(ctx, this_val, argv[0]);
+    if (JS_IsException(val))
+        return JS_EXCEPTION;
+    ret = !JS_IsNull(val);
+    JS_FreeValue(ctx, val);
+    return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_regexp_Symbol_match(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    // [Symbol.match](str)
+    JSValueConst rx = this_val;
+    JSValue A, S, flags, result, matchStr;
+    int global, n, fullUnicode, isEmpty;
+    JSString *p;
+
+    if (!JS_IsObject(rx))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    A = JS_UNDEFINED;
+    flags = JS_UNDEFINED;
+    result = JS_UNDEFINED;
+    matchStr = JS_UNDEFINED;
+    S = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(S))
+        goto exception;
+
+    flags = JS_GetProperty(ctx, rx, JS_ATOM_flags);
+    if (JS_IsException(flags))
+        goto exception;
+    flags = JS_ToStringFree(ctx, flags);
+    if (JS_IsException(flags))
+        goto exception;
+    p = JS_VALUE_GET_STRING(flags);
+
+    // TODO(bnoordhuis) query 'u' flag the same way?
+    global = (-1 != string_indexof_char(p, 'g', 0));
+    if (!global) {
+        A = JS_RegExpExec(ctx, rx, S);
+    } else {
+        fullUnicode = JS_ToBoolFree(ctx, JS_GetProperty(ctx, rx, JS_ATOM_unicode));
+        if (fullUnicode < 0)
+            goto exception;
+
+        if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt32(ctx, 0)) < 0)
+            goto exception;
+        A = JS_NewArray(ctx);
+        if (JS_IsException(A))
+            goto exception;
+        n = 0;
+        for(;;) {
+            JS_FreeValue(ctx, result);
+            result = JS_RegExpExec(ctx, rx, S);
+            if (JS_IsException(result))
+                goto exception;
+            if (JS_IsNull(result))
+                break;
+            matchStr = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, result, 0));
+            if (JS_IsException(matchStr))
+                goto exception;
+            isEmpty = JS_IsEmptyString(matchStr);
+            if (JS_SetPropertyInt64(ctx, A, n++, matchStr) < 0)
+                goto exception;
+            if (isEmpty) {
+                int64_t thisIndex, nextIndex;
+                if (JS_ToLengthFree(ctx, &thisIndex,
+                                    JS_GetProperty(ctx, rx, JS_ATOM_lastIndex)) < 0)
+                    goto exception;
+                p = JS_VALUE_GET_STRING(S);
+                nextIndex = string_advance_index(p, thisIndex, fullUnicode);
+                if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt64(ctx, nextIndex)) < 0)
+                    goto exception;
+            }
+        }
+        if (n == 0) {
+            JS_FreeValue(ctx, A);
+            A = JS_NULL;
+        }
+    }
+    JS_FreeValue(ctx, result);
+    JS_FreeValue(ctx, flags);
+    JS_FreeValue(ctx, S);
+    return A;
+
+exception:
+    JS_FreeValue(ctx, A);
+    JS_FreeValue(ctx, result);
+    JS_FreeValue(ctx, flags);
+    JS_FreeValue(ctx, S);
+    return JS_EXCEPTION;
+}
+
+typedef struct JSRegExpStringIteratorData {
+    JSValue iterating_regexp;
+    JSValue iterated_string;
+    BOOL global;
+    BOOL unicode;
+    BOOL done;
+} JSRegExpStringIteratorData;
+
+static void js_regexp_string_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSRegExpStringIteratorData *it = p->u.regexp_string_iterator_data;
+    if (it) {
+        JS_FreeValueRT(rt, it->iterating_regexp);
+        JS_FreeValueRT(rt, it->iterated_string);
+        js_free_rt(rt, it);
+    }
+}
+
+static void js_regexp_string_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                           JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSRegExpStringIteratorData *it = p->u.regexp_string_iterator_data;
+    if (it) {
+        JS_MarkValue(rt, it->iterating_regexp, mark_func);
+        JS_MarkValue(rt, it->iterated_string, mark_func);
+    }
+}
+
+static JSValue js_regexp_string_iterator_next(JSContext *ctx,
+                                              JSValueConst this_val,
+                                              int argc, JSValueConst *argv,
+                                              BOOL *pdone, int magic)
+{
+    JSRegExpStringIteratorData *it;
+    JSValueConst R, S;
+    JSValue matchStr = JS_UNDEFINED, match = JS_UNDEFINED;
+    JSString *sp;
+
+    it = JS_GetOpaque2(ctx, this_val, JS_CLASS_REGEXP_STRING_ITERATOR);
+    if (!it)
+        goto exception;
+    if (it->done) {
+        *pdone = TRUE;
+        return JS_UNDEFINED;
+    }
+    R = it->iterating_regexp;
+    S = it->iterated_string;
+    match = JS_RegExpExec(ctx, R, S);
+    if (JS_IsException(match))
+        goto exception;
+    if (JS_IsNull(match)) {
+        it->done = TRUE;
+        *pdone = TRUE;
+        return JS_UNDEFINED;
+    } else if (it->global) {
+        matchStr = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, match, 0));
+        if (JS_IsException(matchStr))
+            goto exception;
+        if (JS_IsEmptyString(matchStr)) {
+            int64_t thisIndex, nextIndex;
+            if (JS_ToLengthFree(ctx, &thisIndex,
+                                JS_GetProperty(ctx, R, JS_ATOM_lastIndex)) < 0)
+                goto exception;
+            sp = JS_VALUE_GET_STRING(S);
+            nextIndex = string_advance_index(sp, thisIndex, it->unicode);
+            if (JS_SetProperty(ctx, R, JS_ATOM_lastIndex,
+                               JS_NewInt64(ctx, nextIndex)) < 0)
+                goto exception;
+        }
+        JS_FreeValue(ctx, matchStr);
+    } else {
+        it->done = TRUE;
+    }
+    *pdone = FALSE;
+    return match;
+ exception:
+    JS_FreeValue(ctx, match);
+    JS_FreeValue(ctx, matchStr);
+    *pdone = FALSE;
+    return JS_EXCEPTION;
+}
+
+static JSValue js_regexp_Symbol_matchAll(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    // [Symbol.matchAll](str)
+    JSValueConst R = this_val;
+    JSValue S, C, flags, matcher, iter;
+    JSValueConst args[2];
+    JSString *strp;
+    int64_t lastIndex;
+    JSRegExpStringIteratorData *it;
+
+    if (!JS_IsObject(R))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    C = JS_UNDEFINED;
+    flags = JS_UNDEFINED;
+    matcher = JS_UNDEFINED;
+    iter = JS_UNDEFINED;
+
+    S = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(S))
+        goto exception;
+    C = JS_SpeciesConstructor(ctx, R, ctx->regexp_ctor);
+    if (JS_IsException(C))
+        goto exception;
+    flags = JS_ToStringFree(ctx, JS_GetProperty(ctx, R, JS_ATOM_flags));
+    if (JS_IsException(flags))
+        goto exception;
+    args[0] = R;
+    args[1] = flags;
+    matcher = JS_CallConstructor(ctx, C, 2, args);
+    if (JS_IsException(matcher))
+        goto exception;
+    if (JS_ToLengthFree(ctx, &lastIndex,
+                        JS_GetProperty(ctx, R, JS_ATOM_lastIndex)))
+        goto exception;
+    if (JS_SetProperty(ctx, matcher, JS_ATOM_lastIndex,
+                       JS_NewInt64(ctx, lastIndex)) < 0)
+        goto exception;
+
+    iter = JS_NewObjectClass(ctx, JS_CLASS_REGEXP_STRING_ITERATOR);
+    if (JS_IsException(iter))
+        goto exception;
+    it = js_malloc(ctx, sizeof(*it));
+    if (!it)
+        goto exception;
+    it->iterating_regexp = matcher;
+    it->iterated_string = S;
+    strp = JS_VALUE_GET_STRING(flags);
+    it->global = string_indexof_char(strp, 'g', 0) >= 0;
+    it->unicode = string_indexof_char(strp, 'u', 0) >= 0;
+    it->done = FALSE;
+    JS_SetOpaque(iter, it);
+
+    JS_FreeValue(ctx, C);
+    JS_FreeValue(ctx, flags);
+    return iter;
+ exception:
+    JS_FreeValue(ctx, S);
+    JS_FreeValue(ctx, C);
+    JS_FreeValue(ctx, flags);
+    JS_FreeValue(ctx, matcher);
+    JS_FreeValue(ctx, iter);
+    return JS_EXCEPTION;
+}
+
+typedef struct ValueBuffer {
+    JSContext *ctx;
+    JSValue *arr;
+    JSValue def[4];
+    int len;
+    int size;
+    int error_status;
+} ValueBuffer;
+
+static int value_buffer_init(JSContext *ctx, ValueBuffer *b)
+{
+    b->ctx = ctx;
+    b->len = 0;
+    b->size = 4;
+    b->error_status = 0;
+    b->arr = b->def;
+    return 0;
+}
+
+static void value_buffer_free(ValueBuffer *b)
+{
+    while (b->len > 0)
+        JS_FreeValue(b->ctx, b->arr[--b->len]);
+    if (b->arr != b->def)
+        js_free(b->ctx, b->arr);
+    b->arr = b->def;
+    b->size = 4;
+}
+
+static int value_buffer_append(ValueBuffer *b, JSValue val)
+{
+    if (b->error_status)
+        return -1;
+
+    if (b->len >= b->size) {
+        int new_size = (b->len + (b->len >> 1) + 31) & ~16;
+        size_t slack;
+        JSValue *new_arr;
+
+        if (b->arr == b->def) {
+            new_arr = js_realloc2(b->ctx, NULL, sizeof(*b->arr) * new_size, &slack);
+            if (new_arr)
+                memcpy(new_arr, b->def, sizeof b->def);
+        } else {
+            new_arr = js_realloc2(b->ctx, b->arr, sizeof(*b->arr) * new_size, &slack);
+        }
+        if (!new_arr) {
+            value_buffer_free(b);
+            JS_FreeValue(b->ctx, val);
+            b->error_status = -1;
+            return -1;
+        }
+        new_size += slack / sizeof(*new_arr);
+        b->arr = new_arr;
+        b->size = new_size;
+    }
+    b->arr[b->len++] = val;
+    return 0;
+}
+
+static int js_is_standard_regexp(JSContext *ctx, JSValueConst rx)
+{
+    JSValue val;
+    int res;
+
+    val = JS_GetProperty(ctx, rx, JS_ATOM_constructor);
+    if (JS_IsException(val))
+        return -1;
+    // rx.constructor === RegExp
+    res = js_same_value(ctx, val, ctx->regexp_ctor);
+    JS_FreeValue(ctx, val);
+    if (res) {
+        val = JS_GetProperty(ctx, rx, JS_ATOM_exec);
+        if (JS_IsException(val))
+            return -1;
+        // rx.exec === RE_exec
+        res = JS_IsCFunction(ctx, val, js_regexp_exec, 0);
+        JS_FreeValue(ctx, val);
+    }
+    return res;
+}
+
+static JSValue js_regexp_Symbol_replace(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    // [Symbol.replace](str, rep)
+    JSValueConst rx = this_val, rep = argv[1];
+    JSValueConst args[6];
+    JSValue flags, str, rep_val, matched, tab, rep_str, namedCaptures, res;
+    JSString *p, *sp, *rp;
+    StringBuffer b_s, *b = &b_s;
+    ValueBuffer v_b, *results = &v_b;
+    int nextSourcePosition, n, j, functionalReplace, is_global, fullUnicode;
+    uint32_t nCaptures;
+    int64_t position;
+
+    if (!JS_IsObject(rx))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    string_buffer_init(ctx, b, 0);
+    value_buffer_init(ctx, results);
+
+    rep_val = JS_UNDEFINED;
+    matched = JS_UNDEFINED;
+    tab = JS_UNDEFINED;
+    flags = JS_UNDEFINED;
+    rep_str = JS_UNDEFINED;
+    namedCaptures = JS_UNDEFINED;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        goto exception;
+
+    sp = JS_VALUE_GET_STRING(str);
+    rp = NULL;
+    functionalReplace = JS_IsFunction(ctx, rep);
+    if (!functionalReplace) {
+        rep_val = JS_ToString(ctx, rep);
+        if (JS_IsException(rep_val))
+            goto exception;
+        rp = JS_VALUE_GET_STRING(rep_val);
+    }
+
+    flags = JS_GetProperty(ctx, rx, JS_ATOM_flags);
+    if (JS_IsException(flags))
+        goto exception;
+    flags = JS_ToStringFree(ctx, flags);
+    if (JS_IsException(flags))
+        goto exception;
+    p = JS_VALUE_GET_STRING(flags);
+
+    // TODO(bnoordhuis) query 'u' flag the same way?
+    fullUnicode = 0;
+    is_global = (-1 != string_indexof_char(p, 'g', 0));
+    if (is_global) {
+        fullUnicode = JS_ToBoolFree(ctx, JS_GetProperty(ctx, rx, JS_ATOM_unicode));
+        if (fullUnicode < 0)
+            goto exception;
+        if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt32(ctx, 0)) < 0)
+            goto exception;
+    }
+
+    if (rp && rp->len == 0 && is_global && js_is_standard_regexp(ctx, rx)) {
+        /* use faster version for simple cases */
+        res = JS_RegExpDelete(ctx, rx, str);
+        goto done;
+    }
+    for(;;) {
+        JSValue result;
+        result = JS_RegExpExec(ctx, rx, str);
+        if (JS_IsException(result))
+            goto exception;
+        if (JS_IsNull(result))
+            break;
+        if (value_buffer_append(results, result) < 0)
+            goto exception;
+        if (!is_global)
+            break;
+        JS_FreeValue(ctx, matched);
+        matched = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, result, 0));
+        if (JS_IsException(matched))
+            goto exception;
+        if (JS_IsEmptyString(matched)) {
+            /* always advance of at least one char */
+            int64_t thisIndex, nextIndex;
+            if (JS_ToLengthFree(ctx, &thisIndex, JS_GetProperty(ctx, rx, JS_ATOM_lastIndex)) < 0)
+                goto exception;
+            nextIndex = string_advance_index(sp, thisIndex, fullUnicode);
+            if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt64(ctx, nextIndex)) < 0)
+                goto exception;
+        }
+    }
+    nextSourcePosition = 0;
+    for(j = 0; j < results->len; j++) {
+        JSValueConst result;
+        result = results->arr[j];
+        if (js_get_length32(ctx, &nCaptures, result) < 0)
+            goto exception;
+        JS_FreeValue(ctx, matched);
+        matched = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, result, 0));
+        if (JS_IsException(matched))
+            goto exception;
+        if (JS_ToLengthFree(ctx, &position, JS_GetProperty(ctx, result, JS_ATOM_index)))
+            goto exception;
+        if (position > sp->len)
+            position = sp->len;
+        else if (position < 0)
+            position = 0;
+        /* ignore substition if going backward (can happen
+           with custom regexp object) */
+        JS_FreeValue(ctx, tab);
+        tab = JS_NewArray(ctx);
+        if (JS_IsException(tab))
+            goto exception;
+        if (JS_DefinePropertyValueInt64(ctx, tab, 0, JS_DupValue(ctx, matched),
+                                        JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+            goto exception;
+        for(n = 1; n < nCaptures; n++) {
+            JSValue capN;
+            capN = JS_GetPropertyInt64(ctx, result, n);
+            if (JS_IsException(capN))
+                goto exception;
+            if (!JS_IsUndefined(capN)) {
+                capN = JS_ToStringFree(ctx, capN);
+                if (JS_IsException(capN))
+                    goto exception;
+            }
+            if (JS_DefinePropertyValueInt64(ctx, tab, n, capN,
+                                            JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception;
+        }
+        JS_FreeValue(ctx, namedCaptures);
+        namedCaptures = JS_GetProperty(ctx, result, JS_ATOM_groups);
+        if (JS_IsException(namedCaptures))
+            goto exception;
+        if (functionalReplace) {
+            if (JS_DefinePropertyValueInt64(ctx, tab, n++, JS_NewInt32(ctx, position), JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception;
+            if (JS_DefinePropertyValueInt64(ctx, tab, n++, JS_DupValue(ctx, str), JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception;
+            if (!JS_IsUndefined(namedCaptures)) {
+                if (JS_DefinePropertyValueInt64(ctx, tab, n++, JS_DupValue(ctx, namedCaptures), JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                    goto exception;
+            }
+            args[0] = JS_UNDEFINED;
+            args[1] = tab;
+            JS_FreeValue(ctx, rep_str);
+            rep_str = JS_ToStringFree(ctx, js_function_apply(ctx, rep, 2, args, 0));
+        } else {
+            JSValue namedCaptures1;
+            if (!JS_IsUndefined(namedCaptures)) {
+                namedCaptures1 = JS_ToObject(ctx, namedCaptures);
+                if (JS_IsException(namedCaptures1))
+                    goto exception;
+            } else {
+                namedCaptures1 = JS_UNDEFINED;
+            }
+            args[0] = matched;
+            args[1] = str;
+            args[2] = JS_NewInt32(ctx, position);
+            args[3] = tab;
+            args[4] = namedCaptures1;
+            args[5] = rep_val;
+            JS_FreeValue(ctx, rep_str);
+            rep_str = js_string___GetSubstitution(ctx, JS_UNDEFINED, 6, args);
+            JS_FreeValue(ctx, namedCaptures1);
+        }
+        if (JS_IsException(rep_str))
+            goto exception;
+        if (position >= nextSourcePosition) {
+            string_buffer_concat(b, sp, nextSourcePosition, position);
+            string_buffer_concat_value(b, rep_str);
+            nextSourcePosition = position + JS_VALUE_GET_STRING(matched)->len;
+        }
+    }
+    string_buffer_concat(b, sp, nextSourcePosition, sp->len);
+    res = string_buffer_end(b);
+    goto done1;
+
+exception:
+    res = JS_EXCEPTION;
+done:
+    string_buffer_free(b);
+done1:
+    value_buffer_free(results);
+    JS_FreeValue(ctx, rep_val);
+    JS_FreeValue(ctx, matched);
+    JS_FreeValue(ctx, flags);
+    JS_FreeValue(ctx, tab);
+    JS_FreeValue(ctx, rep_str);
+    JS_FreeValue(ctx, namedCaptures);
+    JS_FreeValue(ctx, str);
+    return res;
+}
+
+static JSValue js_regexp_Symbol_search(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValueConst rx = this_val;
+    JSValue str, previousLastIndex, currentLastIndex, result, index;
+
+    if (!JS_IsObject(rx))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    result = JS_UNDEFINED;
+    currentLastIndex = JS_UNDEFINED;
+    previousLastIndex = JS_UNDEFINED;
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        goto exception;
+
+    previousLastIndex = JS_GetProperty(ctx, rx, JS_ATOM_lastIndex);
+    if (JS_IsException(previousLastIndex))
+        goto exception;
+
+    if (!js_same_value(ctx, previousLastIndex, JS_NewInt32(ctx, 0))) {
+        if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt32(ctx, 0)) < 0) {
+            goto exception;
+        }
+    }
+    result = JS_RegExpExec(ctx, rx, str);
+    if (JS_IsException(result))
+        goto exception;
+    currentLastIndex = JS_GetProperty(ctx, rx, JS_ATOM_lastIndex);
+    if (JS_IsException(currentLastIndex))
+        goto exception;
+    if (js_same_value(ctx, currentLastIndex, previousLastIndex)) {
+        JS_FreeValue(ctx, previousLastIndex);
+    } else {
+        if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, previousLastIndex) < 0) {
+            previousLastIndex = JS_UNDEFINED;
+            goto exception;
+        }
+    }
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, currentLastIndex);
+
+    if (JS_IsNull(result)) {
+        return JS_NewInt32(ctx, -1);
+    } else {
+        index = JS_GetProperty(ctx, result, JS_ATOM_index);
+        JS_FreeValue(ctx, result);
+        return index;
+    }
+
+exception:
+    JS_FreeValue(ctx, result);
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, currentLastIndex);
+    JS_FreeValue(ctx, previousLastIndex);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_regexp_Symbol_split(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    // [Symbol.split](str, limit)
+    JSValueConst rx = this_val;
+    JSValueConst args[2];
+    JSValue str, ctor, splitter, A, flags, z, sub;
+    JSString *strp;
+    uint32_t lim, size, p, q;
+    int unicodeMatching;
+    int64_t lengthA, e, numberOfCaptures, i;
+
+    if (!JS_IsObject(rx))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    ctor = JS_UNDEFINED;
+    splitter = JS_UNDEFINED;
+    A = JS_UNDEFINED;
+    flags = JS_UNDEFINED;
+    z = JS_UNDEFINED;
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        goto exception;
+    ctor = JS_SpeciesConstructor(ctx, rx, ctx->regexp_ctor);
+    if (JS_IsException(ctor))
+        goto exception;
+    flags = JS_ToStringFree(ctx, JS_GetProperty(ctx, rx, JS_ATOM_flags));
+    if (JS_IsException(flags))
+        goto exception;
+    strp = JS_VALUE_GET_STRING(flags);
+    unicodeMatching = string_indexof_char(strp, 'u', 0) >= 0;
+    if (string_indexof_char(strp, 'y', 0) < 0) {
+        flags = JS_ConcatString3(ctx, "", flags, "y");
+        if (JS_IsException(flags))
+            goto exception;
+    }
+    args[0] = rx;
+    args[1] = flags;
+    splitter = JS_CallConstructor(ctx, ctor, 2, args);
+    if (JS_IsException(splitter))
+        goto exception;
+    A = JS_NewArray(ctx);
+    if (JS_IsException(A))
+        goto exception;
+    lengthA = 0;
+    if (JS_IsUndefined(argv[1])) {
+        lim = 0xffffffff;
+    } else {
+        if (JS_ToUint32(ctx, &lim, argv[1]) < 0)
+            goto exception;
+        if (lim == 0)
+            goto done;
+    }
+    strp = JS_VALUE_GET_STRING(str);
+    p = q = 0;
+    size = strp->len;
+    if (size == 0) {
+        z = JS_RegExpExec(ctx, splitter, str);
+        if (JS_IsException(z))
+            goto exception;
+        if (JS_IsNull(z))
+            goto add_tail;
+        goto done;
+    }
+    while (q < size) {
+        if (JS_SetProperty(ctx, splitter, JS_ATOM_lastIndex, JS_NewInt32(ctx, q)) < 0)
+            goto exception;
+        JS_FreeValue(ctx, z);
+        z = JS_RegExpExec(ctx, splitter, str);
+        if (JS_IsException(z))
+            goto exception;
+        if (JS_IsNull(z)) {
+            q = string_advance_index(strp, q, unicodeMatching);
+        } else {
+            if (JS_ToLengthFree(ctx, &e, JS_GetProperty(ctx, splitter, JS_ATOM_lastIndex)))
+                goto exception;
+            if (e > size)
+                e = size;
+            if (e == p) {
+                q = string_advance_index(strp, q, unicodeMatching);
+            } else {
+                sub = js_sub_string(ctx, strp, p, q);
+                if (JS_IsException(sub))
+                    goto exception;
+                if (JS_DefinePropertyValueInt64(ctx, A, lengthA++, sub,
+                                                JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                    goto exception;
+                if (lengthA == lim)
+                    goto done;
+                p = e;
+                if (js_get_length64(ctx, &numberOfCaptures, z))
+                    goto exception;
+                for(i = 1; i < numberOfCaptures; i++) {
+                    sub = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, z, i));
+                    if (JS_IsException(sub))
+                        goto exception;
+                    if (JS_DefinePropertyValueInt64(ctx, A, lengthA++, sub, JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                        goto exception;
+                    if (lengthA == lim)
+                        goto done;
+                }
+                q = p;
+            }
+        }
+    }
+add_tail:
+    if (p > size)
+        p = size;
+    sub = js_sub_string(ctx, strp, p, size);
+    if (JS_IsException(sub))
+        goto exception;
+    if (JS_DefinePropertyValueInt64(ctx, A, lengthA++, sub, JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+        goto exception;
+    goto done;
+exception:
+    JS_FreeValue(ctx, A);
+    A = JS_EXCEPTION;
+done:
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, ctor);
+    JS_FreeValue(ctx, splitter);
+    JS_FreeValue(ctx, flags);
+    JS_FreeValue(ctx, z);
+    return A;
+}
+
+static const JSCFunctionListEntry js_regexp_funcs[] = {
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+    //JS_CFUNC_DEF("__RegExpExec", 2, js_regexp___RegExpExec ),
+    //JS_CFUNC_DEF("__RegExpDelete", 2, js_regexp___RegExpDelete ),
+};
+
+static const JSCFunctionListEntry js_regexp_proto_funcs[] = {
+    JS_CGETSET_DEF("flags", js_regexp_get_flags, NULL ),
+    JS_CGETSET_DEF("source", js_regexp_get_source, NULL ),
+    JS_CGETSET_MAGIC_DEF("global", js_regexp_get_flag, NULL, LRE_FLAG_GLOBAL ),
+    JS_CGETSET_MAGIC_DEF("ignoreCase", js_regexp_get_flag, NULL, LRE_FLAG_IGNORECASE ),
+    JS_CGETSET_MAGIC_DEF("multiline", js_regexp_get_flag, NULL, LRE_FLAG_MULTILINE ),
+    JS_CGETSET_MAGIC_DEF("dotAll", js_regexp_get_flag, NULL, LRE_FLAG_DOTALL ),
+    JS_CGETSET_MAGIC_DEF("unicode", js_regexp_get_flag, NULL, LRE_FLAG_UNICODE ),
+    JS_CGETSET_MAGIC_DEF("sticky", js_regexp_get_flag, NULL, LRE_FLAG_STICKY ),
+    JS_CGETSET_MAGIC_DEF("hasIndices", js_regexp_get_flag, NULL, LRE_FLAG_INDICES ),
+    JS_CFUNC_DEF("exec", 1, js_regexp_exec ),
+    JS_CFUNC_DEF("compile", 2, js_regexp_compile ),
+    JS_CFUNC_DEF("test", 1, js_regexp_test ),
+    JS_CFUNC_DEF("toString", 0, js_regexp_toString ),
+    JS_CFUNC_DEF("[Symbol.replace]", 2, js_regexp_Symbol_replace ),
+    JS_CFUNC_DEF("[Symbol.match]", 1, js_regexp_Symbol_match ),
+    JS_CFUNC_DEF("[Symbol.matchAll]", 1, js_regexp_Symbol_matchAll ),
+    JS_CFUNC_DEF("[Symbol.search]", 1, js_regexp_Symbol_search ),
+    JS_CFUNC_DEF("[Symbol.split]", 2, js_regexp_Symbol_split ),
+    //JS_CGETSET_DEF("__source", js_regexp_get___source, NULL ),
+    //JS_CGETSET_DEF("__flags", js_regexp_get___flags, NULL ),
+};
+
+static const JSCFunctionListEntry js_regexp_string_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_regexp_string_iterator_next, 0 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "RegExp String Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+void JS_AddIntrinsicRegExpCompiler(JSContext *ctx)
+{
+    ctx->compile_regexp = js_compile_regexp;
+}
+
+void JS_AddIntrinsicRegExp(JSContext *ctx)
+{
+    JSValueConst obj;
+
+    JS_AddIntrinsicRegExpCompiler(ctx);
+
+    ctx->class_proto[JS_CLASS_REGEXP] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_REGEXP], js_regexp_proto_funcs,
+                               countof(js_regexp_proto_funcs));
+    obj = JS_NewGlobalCConstructor(ctx, "RegExp", js_regexp_constructor, 2,
+                                   ctx->class_proto[JS_CLASS_REGEXP]);
+    ctx->regexp_ctor = JS_DupValue(ctx, obj);
+    JS_SetPropertyFunctionList(ctx, obj, js_regexp_funcs, countof(js_regexp_funcs));
+
+    ctx->class_proto[JS_CLASS_REGEXP_STRING_ITERATOR] =
+        JS_NewObjectProto(ctx, ctx->iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_REGEXP_STRING_ITERATOR],
+                               js_regexp_string_iterator_proto_funcs,
+                               countof(js_regexp_string_iterator_proto_funcs));
+}
+
+/* JSON */
+
+static int json_parse_expect(JSParseState *s, int tok)
+{
+    if (s->token.val != tok) {
+        /* XXX: dump token correctly in all cases */
+        return js_parse_error(s, "expecting '%c'", tok);
+    }
+    return json_next_token(s);
+}
+
+static JSValue json_parse_value(JSParseState *s)
+{
+    JSContext *ctx = s->ctx;
+    JSValue val = JS_NULL;
+    int ret;
+
+    switch(s->token.val) {
+    case '{':
+        {
+            JSValue prop_val;
+            JSAtom prop_name;
+
+            if (json_next_token(s))
+                goto fail;
+            val = JS_NewObject(ctx);
+            if (JS_IsException(val))
+                goto fail;
+            if (s->token.val != '}') {
+                for(;;) {
+                    if (s->token.val == TOK_STRING) {
+                        prop_name = JS_ValueToAtom(ctx, s->token.u.str.str);
+                        if (prop_name == JS_ATOM_NULL)
+                            goto fail;
+                    } else if (s->ext_json && s->token.val == TOK_IDENT) {
+                        prop_name = JS_DupAtom(ctx, s->token.u.ident.atom);
+                    } else {
+                        js_parse_error(s, "expecting property name");
+                        goto fail;
+                    }
+                    if (json_next_token(s))
+                        goto fail1;
+                    if (json_parse_expect(s, ':'))
+                        goto fail1;
+                    prop_val = json_parse_value(s);
+                    if (JS_IsException(prop_val)) {
+                    fail1:
+                        JS_FreeAtom(ctx, prop_name);
+                        goto fail;
+                    }
+                    ret = JS_DefinePropertyValue(ctx, val, prop_name,
+                                                 prop_val, JS_PROP_C_W_E);
+                    JS_FreeAtom(ctx, prop_name);
+                    if (ret < 0)
+                        goto fail;
+
+                    if (s->token.val != ',')
+                        break;
+                    if (json_next_token(s))
+                        goto fail;
+                    if (s->ext_json && s->token.val == '}')
+                        break;
+                }
+            }
+            if (json_parse_expect(s, '}'))
+                goto fail;
+        }
+        break;
+    case '[':
+        {
+            JSValue el;
+            uint32_t idx;
+
+            if (json_next_token(s))
+                goto fail;
+            val = JS_NewArray(ctx);
+            if (JS_IsException(val))
+                goto fail;
+            if (s->token.val != ']') {
+                idx = 0;
+                for(;;) {
+                    el = json_parse_value(s);
+                    if (JS_IsException(el))
+                        goto fail;
+                    ret = JS_DefinePropertyValueUint32(ctx, val, idx, el, JS_PROP_C_W_E);
+                    if (ret < 0)
+                        goto fail;
+                    if (s->token.val != ',')
+                        break;
+                    if (json_next_token(s))
+                        goto fail;
+                    idx++;
+                    if (s->ext_json && s->token.val == ']')
+                        break;
+                }
+            }
+            if (json_parse_expect(s, ']'))
+                goto fail;
+        }
+        break;
+    case TOK_STRING:
+        val = JS_DupValue(ctx, s->token.u.str.str);
+        if (json_next_token(s))
+            goto fail;
+        break;
+    case TOK_NUMBER:
+        val = s->token.u.num.val;
+        if (json_next_token(s))
+            goto fail;
+        break;
+    case TOK_IDENT:
+        if (s->token.u.ident.atom == JS_ATOM_false ||
+            s->token.u.ident.atom == JS_ATOM_true) {
+            val = JS_NewBool(ctx, s->token.u.ident.atom == JS_ATOM_true);
+        } else if (s->token.u.ident.atom == JS_ATOM_null) {
+            val = JS_NULL;
+        } else {
+            goto def_token;
+        }
+        if (json_next_token(s))
+            goto fail;
+        break;
+    default:
+    def_token:
+        if (s->token.val == TOK_EOF) {
+            js_parse_error(s, "Unexpected end of JSON input");
+        } else {
+            js_parse_error(s, "unexpected token: '%.*s'",
+                           (int)(s->buf_ptr - s->token.ptr), s->token.ptr);
+        }
+        goto fail;
+    }
+    return val;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+JSValue JS_ParseJSON2(JSContext *ctx, const char *buf, size_t buf_len,
+                      const char *filename, int flags)
+{
+    JSParseState s1, *s = &s1;
+    JSValue val = JS_UNDEFINED;
+
+    js_parse_init(ctx, s, buf, buf_len, filename, 1);
+    s->ext_json = ((flags & JS_PARSE_JSON_EXT) != 0);
+    if (json_next_token(s))
+        goto fail;
+    val = json_parse_value(s);
+    if (JS_IsException(val))
+        goto fail;
+    if (s->token.val != TOK_EOF) {
+        if (js_parse_error(s, "unexpected data at the end"))
+            goto fail;
+    }
+    return val;
+ fail:
+    JS_FreeValue(ctx, val);
+    free_token(s, &s->token);
+    return JS_EXCEPTION;
+}
+
+JSValue JS_ParseJSON(JSContext *ctx, const char *buf, size_t buf_len,
+                     const char *filename)
+{
+    return JS_ParseJSON2(ctx, buf, buf_len, filename, 0);
+}
+
+static JSValue internalize_json_property(JSContext *ctx, JSValueConst holder,
+                                         JSAtom name, JSValueConst reviver)
+{
+    JSValue val, new_el, name_val, res;
+    JSValueConst args[2];
+    int ret, is_array;
+    uint32_t i, len = 0;
+    JSAtom prop;
+    JSPropertyEnum *atoms = NULL;
+
+    if (js_check_stack_overflow(ctx->rt, 0)) {
+        return JS_ThrowStackOverflow(ctx);
+    }
+
+    val = JS_GetProperty(ctx, holder, name);
+    if (JS_IsException(val))
+        return val;
+    if (JS_IsObject(val)) {
+        is_array = JS_IsArray(ctx, val);
+        if (is_array < 0)
+            goto fail;
+        if (is_array) {
+            if (js_get_length32(ctx, &len, val))
+                goto fail;
+        } else {
+            ret = JS_GetOwnPropertyNamesInternal(ctx, &atoms, &len, JS_VALUE_GET_OBJ(val), JS_GPN_ENUM_ONLY | JS_GPN_STRING_MASK);
+            if (ret < 0)
+                goto fail;
+        }
+        for(i = 0; i < len; i++) {
+            if (is_array) {
+                prop = JS_NewAtomUInt32(ctx, i);
+                if (prop == JS_ATOM_NULL)
+                    goto fail;
+            } else {
+                prop = JS_DupAtom(ctx, atoms[i].atom);
+            }
+            new_el = internalize_json_property(ctx, val, prop, reviver);
+            if (JS_IsException(new_el)) {
+                JS_FreeAtom(ctx, prop);
+                goto fail;
+            }
+            if (JS_IsUndefined(new_el)) {
+                ret = JS_DeleteProperty(ctx, val, prop, 0);
+            } else {
+                ret = JS_DefinePropertyValue(ctx, val, prop, new_el, JS_PROP_C_W_E);
+            }
+            JS_FreeAtom(ctx, prop);
+            if (ret < 0)
+                goto fail;
+        }
+    }
+    js_free_prop_enum(ctx, atoms, len);
+    atoms = NULL;
+    name_val = JS_AtomToValue(ctx, name);
+    if (JS_IsException(name_val))
+        goto fail;
+    args[0] = name_val;
+    args[1] = val;
+    res = JS_Call(ctx, reviver, holder, 2, args);
+    JS_FreeValue(ctx, name_val);
+    JS_FreeValue(ctx, val);
+    return res;
+ fail:
+    js_free_prop_enum(ctx, atoms, len);
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_json_parse(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    JSValue obj, root;
+    JSValueConst reviver;
+    const char *str;
+    size_t len;
+
+    str = JS_ToCStringLen(ctx, &len, argv[0]);
+    if (!str)
+        return JS_EXCEPTION;
+    obj = JS_ParseJSON(ctx, str, len, "<input>");
+    JS_FreeCString(ctx, str);
+    if (JS_IsException(obj))
+        return obj;
+    if (argc > 1 && JS_IsFunction(ctx, argv[1])) {
+        reviver = argv[1];
+        root = JS_NewObject(ctx);
+        if (JS_IsException(root)) {
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+        if (JS_DefinePropertyValue(ctx, root, JS_ATOM_empty_string, obj,
+                                   JS_PROP_C_W_E) < 0) {
+            JS_FreeValue(ctx, root);
+            return JS_EXCEPTION;
+        }
+        obj = internalize_json_property(ctx, root, JS_ATOM_empty_string,
+                                        reviver);
+        JS_FreeValue(ctx, root);
+    }
+    return obj;
+}
+
+typedef struct JSONStringifyContext {
+    JSValueConst replacer_func;
+    JSValue stack;
+    JSValue property_list;
+    JSValue gap;
+    JSValue empty;
+    StringBuffer *b;
+} JSONStringifyContext;
+
+static JSValue JS_ToQuotedStringFree(JSContext *ctx, JSValue val) {
+    JSValue r = JS_ToQuotedString(ctx, val);
+    JS_FreeValue(ctx, val);
+    return r;
+}
+
+static JSValue js_json_check(JSContext *ctx, JSONStringifyContext *jsc,
+                             JSValueConst holder, JSValue val, JSValueConst key)
+{
+    JSValue v;
+    JSValueConst args[2];
+
+    /* check for object.toJSON method */
+    /* ECMA specifies this is done only for Object and BigInt */
+    /* we do it for BigFloat and BigDecimal as an extension */
+    if (JS_IsObject(val) || JS_IsBigInt(ctx, val)
+#ifdef CONFIG_BIGNUM
+    ||  JS_IsBigFloat(val) || JS_IsBigDecimal(val)
+#endif
+        ) {
+        JSValue f = JS_GetProperty(ctx, val, JS_ATOM_toJSON);
+        if (JS_IsException(f))
+            goto exception;
+        if (JS_IsFunction(ctx, f)) {
+            v = JS_CallFree(ctx, f, val, 1, &key);
+            JS_FreeValue(ctx, val);
+            val = v;
+            if (JS_IsException(val))
+                goto exception;
+        } else {
+            JS_FreeValue(ctx, f);
+        }
+    }
+
+    if (!JS_IsUndefined(jsc->replacer_func)) {
+        args[0] = key;
+        args[1] = val;
+        v = JS_Call(ctx, jsc->replacer_func, holder, 2, args);
+        JS_FreeValue(ctx, val);
+        val = v;
+        if (JS_IsException(val))
+            goto exception;
+    }
+
+    switch (JS_VALUE_GET_NORM_TAG(val)) {
+    case JS_TAG_OBJECT:
+        if (JS_IsFunction(ctx, val))
+            break;
+    case JS_TAG_STRING:
+    case JS_TAG_INT:
+    case JS_TAG_FLOAT64:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+    case JS_TAG_BIG_DECIMAL:
+#endif
+    case JS_TAG_EXCEPTION:
+        return val;
+    default:
+        break;
+    }
+    JS_FreeValue(ctx, val);
+    return JS_UNDEFINED;
+
+exception:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static int js_json_to_str(JSContext *ctx, JSONStringifyContext *jsc,
+                          JSValueConst holder, JSValue val,
+                          JSValueConst indent)
+{
+    JSValue indent1, sep, sep1, tab, v, prop;
+    JSObject *p;
+    int64_t i, len;
+    int cl, ret;
+    BOOL has_content;
+
+    indent1 = JS_UNDEFINED;
+    sep = JS_UNDEFINED;
+    sep1 = JS_UNDEFINED;
+    tab = JS_UNDEFINED;
+    prop = JS_UNDEFINED;
+
+    if (JS_IsObject(val)) {
+        p = JS_VALUE_GET_OBJ(val);
+        cl = p->class_id;
+        if (cl == JS_CLASS_STRING) {
+            val = JS_ToStringFree(ctx, val);
+            if (JS_IsException(val))
+                goto exception;
+            goto concat_primitive;
+        } else if (cl == JS_CLASS_NUMBER) {
+            val = JS_ToNumberFree(ctx, val);
+            if (JS_IsException(val))
+                goto exception;
+            goto concat_primitive;
+        } else if (cl == JS_CLASS_BOOLEAN || cl == JS_CLASS_BIG_INT
+#ifdef CONFIG_BIGNUM
+               || cl == JS_CLASS_BIG_FLOAT
+               || cl == JS_CLASS_BIG_DECIMAL
+#endif
+                   )
+        {
+            /* This will thow the same error as for the primitive object */
+            set_value(ctx, &val, JS_DupValue(ctx, p->u.object_data));
+            goto concat_primitive;
+        }
+        v = js_array_includes(ctx, jsc->stack, 1, (JSValueConst *)&val);
+        if (JS_IsException(v))
+            goto exception;
+        if (JS_ToBoolFree(ctx, v)) {
+            JS_ThrowTypeError(ctx, "circular reference");
+            goto exception;
+        }
+        indent1 = JS_ConcatString(ctx, JS_DupValue(ctx, indent), JS_DupValue(ctx, jsc->gap));
+        if (JS_IsException(indent1))
+            goto exception;
+        if (!JS_IsEmptyString(jsc->gap)) {
+            sep = JS_ConcatString3(ctx, "\n", JS_DupValue(ctx, indent1), "");
+            if (JS_IsException(sep))
+                goto exception;
+            sep1 = JS_NewString(ctx, " ");
+            if (JS_IsException(sep1))
+                goto exception;
+        } else {
+            sep = JS_DupValue(ctx, jsc->empty);
+            sep1 = JS_DupValue(ctx, jsc->empty);
+        }
+        v = js_array_push(ctx, jsc->stack, 1, (JSValueConst *)&val, 0);
+        if (check_exception_free(ctx, v))
+            goto exception;
+        ret = JS_IsArray(ctx, val);
+        if (ret < 0)
+            goto exception;
+        if (ret) {
+            if (js_get_length64(ctx, &len, val))
+                goto exception;
+            string_buffer_putc8(jsc->b, '[');
+            for(i = 0; i < len; i++) {
+                if (i > 0)
+                    string_buffer_putc8(jsc->b, ',');
+                string_buffer_concat_value(jsc->b, sep);
+                v = JS_GetPropertyInt64(ctx, val, i);
+                if (JS_IsException(v))
+                    goto exception;
+                /* XXX: could do this string conversion only when needed */
+                prop = JS_ToStringFree(ctx, JS_NewInt64(ctx, i));
+                if (JS_IsException(prop))
+                    goto exception;
+                v = js_json_check(ctx, jsc, val, v, prop);
+                JS_FreeValue(ctx, prop);
+                prop = JS_UNDEFINED;
+                if (JS_IsException(v))
+                    goto exception;
+                if (JS_IsUndefined(v))
+                    v = JS_NULL;
+                if (js_json_to_str(ctx, jsc, val, v, indent1))
+                    goto exception;
+            }
+            if (len > 0 && !JS_IsEmptyString(jsc->gap)) {
+                string_buffer_putc8(jsc->b, '\n');
+                string_buffer_concat_value(jsc->b, indent);
+            }
+            string_buffer_putc8(jsc->b, ']');
+        } else {
+            if (!JS_IsUndefined(jsc->property_list))
+                tab = JS_DupValue(ctx, jsc->property_list);
+            else
+                tab = js_object_keys(ctx, JS_UNDEFINED, 1, (JSValueConst *)&val, JS_ITERATOR_KIND_KEY);
+            if (JS_IsException(tab))
+                goto exception;
+            if (js_get_length64(ctx, &len, tab))
+                goto exception;
+            string_buffer_putc8(jsc->b, '{');
+            has_content = FALSE;
+            for(i = 0; i < len; i++) {
+                JS_FreeValue(ctx, prop);
+                prop = JS_GetPropertyInt64(ctx, tab, i);
+                if (JS_IsException(prop))
+                    goto exception;
+                v = JS_GetPropertyValue(ctx, val, JS_DupValue(ctx, prop));
+                if (JS_IsException(v))
+                    goto exception;
+                v = js_json_check(ctx, jsc, val, v, prop);
+                if (JS_IsException(v))
+                    goto exception;
+                if (!JS_IsUndefined(v)) {
+                    if (has_content)
+                        string_buffer_putc8(jsc->b, ',');
+                    prop = JS_ToQuotedStringFree(ctx, prop);
+                    if (JS_IsException(prop)) {
+                        JS_FreeValue(ctx, v);
+                        goto exception;
+                    }
+                    string_buffer_concat_value(jsc->b, sep);
+                    string_buffer_concat_value(jsc->b, prop);
+                    string_buffer_putc8(jsc->b, ':');
+                    string_buffer_concat_value(jsc->b, sep1);
+                    if (js_json_to_str(ctx, jsc, val, v, indent1))
+                        goto exception;
+                    has_content = TRUE;
+                }
+            }
+            if (has_content && !JS_IsEmptyString(jsc->gap)) {
+                string_buffer_putc8(jsc->b, '\n');
+                string_buffer_concat_value(jsc->b, indent);
+            }
+            string_buffer_putc8(jsc->b, '}');
+        }
+        if (check_exception_free(ctx, js_array_pop(ctx, jsc->stack, 0, NULL, 0)))
+            goto exception;
+        JS_FreeValue(ctx, val);
+        JS_FreeValue(ctx, tab);
+        JS_FreeValue(ctx, sep);
+        JS_FreeValue(ctx, sep1);
+        JS_FreeValue(ctx, indent1);
+        JS_FreeValue(ctx, prop);
+        return 0;
+    }
+ concat_primitive:
+    switch (JS_VALUE_GET_NORM_TAG(val)) {
+    case JS_TAG_STRING:
+        val = JS_ToQuotedStringFree(ctx, val);
+        if (JS_IsException(val))
+            goto exception;
+        goto concat_value;
+    case JS_TAG_FLOAT64:
+        if (!isfinite(JS_VALUE_GET_FLOAT64(val))) {
+            val = JS_NULL;
+        }
+        goto concat_value;
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    concat_value:
+        return string_buffer_concat_value_free(jsc->b, val);
+    case JS_TAG_BIG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+    case JS_TAG_BIG_DECIMAL:
+#endif
+        /* reject big numbers: use toJSON method to override */
+        JS_ThrowTypeError(ctx, "Do not know how to serialize a BigInt");
+        goto exception;
+    default:
+        JS_FreeValue(ctx, val);
+        return 0;
+    }
+
+exception:
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, tab);
+    JS_FreeValue(ctx, sep);
+    JS_FreeValue(ctx, sep1);
+    JS_FreeValue(ctx, indent1);
+    JS_FreeValue(ctx, prop);
+    return -1;
+}
+
+JSValue JS_JSONStringify(JSContext *ctx, JSValueConst obj,
+                         JSValueConst replacer, JSValueConst space0)
+{
+    StringBuffer b_s;
+    JSONStringifyContext jsc_s, *jsc = &jsc_s;
+    JSValue val, v, space, ret, wrapper;
+    int res;
+    int64_t i, j, n;
+
+    jsc->replacer_func = JS_UNDEFINED;
+    jsc->stack = JS_UNDEFINED;
+    jsc->property_list = JS_UNDEFINED;
+    jsc->gap = JS_UNDEFINED;
+    jsc->b = &b_s;
+    jsc->empty = JS_AtomToString(ctx, JS_ATOM_empty_string);
+    ret = JS_UNDEFINED;
+    wrapper = JS_UNDEFINED;
+
+    string_buffer_init(ctx, jsc->b, 0);
+    jsc->stack = JS_NewArray(ctx);
+    if (JS_IsException(jsc->stack))
+        goto exception;
+    if (JS_IsFunction(ctx, replacer)) {
+        jsc->replacer_func = replacer;
+    } else {
+        res = JS_IsArray(ctx, replacer);
+        if (res < 0)
+            goto exception;
+        if (res) {
+            /* XXX: enumeration is not fully correct */
+            jsc->property_list = JS_NewArray(ctx);
+            if (JS_IsException(jsc->property_list))
+                goto exception;
+            if (js_get_length64(ctx, &n, replacer))
+                goto exception;
+            for (i = j = 0; i < n; i++) {
+                JSValue present;
+                v = JS_GetPropertyInt64(ctx, replacer, i);
+                if (JS_IsException(v))
+                    goto exception;
+                if (JS_IsObject(v)) {
+                    JSObject *p = JS_VALUE_GET_OBJ(v);
+                    if (p->class_id == JS_CLASS_STRING ||
+                        p->class_id == JS_CLASS_NUMBER) {
+                        v = JS_ToStringFree(ctx, v);
+                        if (JS_IsException(v))
+                            goto exception;
+                    } else {
+                        JS_FreeValue(ctx, v);
+                        continue;
+                    }
+                } else if (JS_IsNumber(v)) {
+                    v = JS_ToStringFree(ctx, v);
+                    if (JS_IsException(v))
+                        goto exception;
+                } else if (!JS_IsString(v)) {
+                    JS_FreeValue(ctx, v);
+                    continue;
+                }
+                present = js_array_includes(ctx, jsc->property_list,
+                                            1, (JSValueConst *)&v);
+                if (JS_IsException(present)) {
+                    JS_FreeValue(ctx, v);
+                    goto exception;
+                }
+                if (!JS_ToBoolFree(ctx, present)) {
+                    JS_SetPropertyInt64(ctx, jsc->property_list, j++, v);
+                } else {
+                    JS_FreeValue(ctx, v);
+                }
+            }
+        }
+    }
+    space = JS_DupValue(ctx, space0);
+    if (JS_IsObject(space)) {
+        JSObject *p = JS_VALUE_GET_OBJ(space);
+        if (p->class_id == JS_CLASS_NUMBER) {
+            space = JS_ToNumberFree(ctx, space);
+        } else if (p->class_id == JS_CLASS_STRING) {
+            space = JS_ToStringFree(ctx, space);
+        }
+        if (JS_IsException(space)) {
+            JS_FreeValue(ctx, space);
+            goto exception;
+        }
+    }
+    if (JS_IsNumber(space)) {
+        int n;
+        if (JS_ToInt32Clamp(ctx, &n, space, 0, 10, 0))
+            goto exception;
+        jsc->gap = JS_NewStringLen(ctx, "          ", n);
+    } else if (JS_IsString(space)) {
+        JSString *p = JS_VALUE_GET_STRING(space);
+        jsc->gap = js_sub_string(ctx, p, 0, min_int(p->len, 10));
+    } else {
+        jsc->gap = JS_DupValue(ctx, jsc->empty);
+    }
+    JS_FreeValue(ctx, space);
+    if (JS_IsException(jsc->gap))
+        goto exception;
+    wrapper = JS_NewObject(ctx);
+    if (JS_IsException(wrapper))
+        goto exception;
+    if (JS_DefinePropertyValue(ctx, wrapper, JS_ATOM_empty_string,
+                               JS_DupValue(ctx, obj), JS_PROP_C_W_E) < 0)
+        goto exception;
+    val = JS_DupValue(ctx, obj);
+
+    val = js_json_check(ctx, jsc, wrapper, val, jsc->empty);
+    if (JS_IsException(val))
+        goto exception;
+    if (JS_IsUndefined(val)) {
+        ret = JS_UNDEFINED;
+        goto done1;
+    }
+    if (js_json_to_str(ctx, jsc, wrapper, val, jsc->empty))
+        goto exception;
+
+    ret = string_buffer_end(jsc->b);
+    goto done;
+
+exception:
+    ret = JS_EXCEPTION;
+done1:
+    string_buffer_free(jsc->b);
+done:
+    JS_FreeValue(ctx, wrapper);
+    JS_FreeValue(ctx, jsc->empty);
+    JS_FreeValue(ctx, jsc->gap);
+    JS_FreeValue(ctx, jsc->property_list);
+    JS_FreeValue(ctx, jsc->stack);
+    return ret;
+}
+
+static JSValue js_json_stringify(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    // stringify(val, replacer, space)
+    return JS_JSONStringify(ctx, argv[0], argv[1], argv[2]);
+}
+
+static const JSCFunctionListEntry js_json_funcs[] = {
+    JS_CFUNC_DEF("parse", 2, js_json_parse ),
+    JS_CFUNC_DEF("stringify", 3, js_json_stringify ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "JSON", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_json_obj[] = {
+    JS_OBJECT_DEF("JSON", js_json_funcs, countof(js_json_funcs), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+void JS_AddIntrinsicJSON(JSContext *ctx)
+{
+    /* add JSON as autoinit object */
+    JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_json_obj, countof(js_json_obj));
+}
+
+/* Reflect */
+
+static JSValue js_reflect_apply(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    return js_function_apply(ctx, argv[0], max_int(0, argc - 1), argv + 1, 2);
+}
+
+static JSValue js_reflect_construct(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValueConst func, array_arg, new_target;
+    JSValue *tab, ret;
+    uint32_t len;
+
+    func = argv[0];
+    array_arg = argv[1];
+    if (argc > 2) {
+        new_target = argv[2];
+        if (!JS_IsConstructor(ctx, new_target))
+            return JS_ThrowTypeError(ctx, "not a constructor");
+    } else {
+        new_target = func;
+    }
+    tab = build_arg_list(ctx, &len, array_arg);
+    if (!tab)
+        return JS_EXCEPTION;
+    ret = JS_CallConstructor2(ctx, func, new_target, len, (JSValueConst *)tab);
+    free_arg_list(ctx, tab, len);
+    return ret;
+}
+
+static JSValue js_reflect_deleteProperty(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    JSValueConst obj;
+    JSAtom atom;
+    int ret;
+
+    obj = argv[0];
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    atom = JS_ValueToAtom(ctx, argv[1]);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    ret = JS_DeleteProperty(ctx, obj, atom, 0);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_reflect_get(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSValueConst obj, prop, receiver;
+    JSAtom atom;
+    JSValue ret;
+
+    obj = argv[0];
+    prop = argv[1];
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    if (argc > 2)
+        receiver = argv[2];
+    else
+        receiver = obj;
+    atom = JS_ValueToAtom(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    ret = JS_GetPropertyInternal(ctx, obj, atom, receiver, FALSE);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+static JSValue js_reflect_has(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSValueConst obj, prop;
+    JSAtom atom;
+    int ret;
+
+    obj = argv[0];
+    prop = argv[1];
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    atom = JS_ValueToAtom(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    ret = JS_HasProperty(ctx, obj, atom);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_reflect_set(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSValueConst obj, prop, val, receiver;
+    int ret;
+    JSAtom atom;
+
+    obj = argv[0];
+    prop = argv[1];
+    val = argv[2];
+    if (argc > 3)
+        receiver = argv[3];
+    else
+        receiver = obj;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    atom = JS_ValueToAtom(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    ret = JS_SetPropertyInternal(ctx, obj, atom,
+                                 JS_DupValue(ctx, val), receiver, 0);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_reflect_setPrototypeOf(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    int ret;
+    ret = JS_SetPrototypeInternal(ctx, argv[0], argv[1], FALSE);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_reflect_ownKeys(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    if (JS_VALUE_GET_TAG(argv[0]) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    return JS_GetOwnPropertyNames2(ctx, argv[0],
+                                   JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK,
+                                   JS_ITERATOR_KIND_KEY);
+}
+
+static const JSCFunctionListEntry js_reflect_funcs[] = {
+    JS_CFUNC_DEF("apply", 3, js_reflect_apply ),
+    JS_CFUNC_DEF("construct", 2, js_reflect_construct ),
+    JS_CFUNC_MAGIC_DEF("defineProperty", 3, js_object_defineProperty, 1 ),
+    JS_CFUNC_DEF("deleteProperty", 2, js_reflect_deleteProperty ),
+    JS_CFUNC_DEF("get", 2, js_reflect_get ),
+    JS_CFUNC_MAGIC_DEF("getOwnPropertyDescriptor", 2, js_object_getOwnPropertyDescriptor, 1 ),
+    JS_CFUNC_MAGIC_DEF("getPrototypeOf", 1, js_object_getPrototypeOf, 1 ),
+    JS_CFUNC_DEF("has", 2, js_reflect_has ),
+    JS_CFUNC_MAGIC_DEF("isExtensible", 1, js_object_isExtensible, 1 ),
+    JS_CFUNC_DEF("ownKeys", 1, js_reflect_ownKeys ),
+    JS_CFUNC_MAGIC_DEF("preventExtensions", 1, js_object_preventExtensions, 1 ),
+    JS_CFUNC_DEF("set", 3, js_reflect_set ),
+    JS_CFUNC_DEF("setPrototypeOf", 2, js_reflect_setPrototypeOf ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Reflect", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_reflect_obj[] = {
+    JS_OBJECT_DEF("Reflect", js_reflect_funcs, countof(js_reflect_funcs), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+/* Proxy */
+
+static void js_proxy_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSProxyData *s = JS_GetOpaque(val, JS_CLASS_PROXY);
+    if (s) {
+        JS_FreeValueRT(rt, s->target);
+        JS_FreeValueRT(rt, s->handler);
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_proxy_mark(JSRuntime *rt, JSValueConst val,
+                          JS_MarkFunc *mark_func)
+{
+    JSProxyData *s = JS_GetOpaque(val, JS_CLASS_PROXY);
+    if (s) {
+        JS_MarkValue(rt, s->target, mark_func);
+        JS_MarkValue(rt, s->handler, mark_func);
+    }
+}
+
+static JSValue JS_ThrowTypeErrorRevokedProxy(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "revoked proxy");
+}
+
+static JSProxyData *get_proxy_method(JSContext *ctx, JSValue *pmethod,
+                                     JSValueConst obj, JSAtom name)
+{
+    JSProxyData *s = JS_GetOpaque(obj, JS_CLASS_PROXY);
+    JSValue method;
+
+    /* safer to test recursion in all proxy methods */
+    if (js_check_stack_overflow(ctx->rt, 0)) {
+        JS_ThrowStackOverflow(ctx);
+        return NULL;
+    }
+
+    /* 's' should never be NULL */
+    if (s->is_revoked) {
+        JS_ThrowTypeErrorRevokedProxy(ctx);
+        return NULL;
+    }
+    method = JS_GetProperty(ctx, s->handler, name);
+    if (JS_IsException(method))
+        return NULL;
+    if (JS_IsNull(method))
+        method = JS_UNDEFINED;
+    *pmethod = method;
+    return s;
+}
+
+static JSValue js_proxy_getPrototypeOf(JSContext *ctx, JSValueConst obj)
+{
+    JSProxyData *s;
+    JSValue method, ret, proto1;
+    int res;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_getPrototypeOf);
+    if (!s)
+        return JS_EXCEPTION;
+    if (JS_IsUndefined(method))
+        return JS_GetPrototype(ctx, s->target);
+    ret = JS_CallFree(ctx, method, s->handler, 1, (JSValueConst *)&s->target);
+    if (JS_IsException(ret))
+        return ret;
+    if (JS_VALUE_GET_TAG(ret) != JS_TAG_NULL &&
+        JS_VALUE_GET_TAG(ret) != JS_TAG_OBJECT) {
+        goto fail;
+    }
+    res = JS_IsExtensible(ctx, s->target);
+    if (res < 0) {
+        JS_FreeValue(ctx, ret);
+        return JS_EXCEPTION;
+    }
+    if (!res) {
+        /* check invariant */
+        proto1 = JS_GetPrototype(ctx, s->target);
+        if (JS_IsException(proto1)) {
+            JS_FreeValue(ctx, ret);
+            return JS_EXCEPTION;
+        }
+        if (JS_VALUE_GET_OBJ(proto1) != JS_VALUE_GET_OBJ(ret)) {
+            JS_FreeValue(ctx, proto1);
+        fail:
+            JS_FreeValue(ctx, ret);
+            return JS_ThrowTypeError(ctx, "proxy: inconsistent prototype");
+        }
+        JS_FreeValue(ctx, proto1);
+    }
+    return ret;
+}
+
+static int js_proxy_setPrototypeOf(JSContext *ctx, JSValueConst obj,
+                                   JSValueConst proto_val, BOOL throw_flag)
+{
+    JSProxyData *s;
+    JSValue method, ret, proto1;
+    JSValueConst args[2];
+    BOOL res;
+    int res2;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_setPrototypeOf);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method))
+        return JS_SetPrototypeInternal(ctx, s->target, proto_val, throw_flag);
+    args[0] = s->target;
+    args[1] = proto_val;
+    ret = JS_CallFree(ctx, method, s->handler, 2, args);
+    if (JS_IsException(ret))
+        return -1;
+    res = JS_ToBoolFree(ctx, ret);
+    if (!res) {
+        if (throw_flag) {
+            JS_ThrowTypeError(ctx, "proxy: bad prototype");
+            return -1;
+        } else {
+            return FALSE;
+        }
+    }
+    res2 = JS_IsExtensible(ctx, s->target);
+    if (res2 < 0)
+        return -1;
+    if (!res2) {
+        proto1 = JS_GetPrototype(ctx, s->target);
+        if (JS_IsException(proto1))
+            return -1;
+        if (JS_VALUE_GET_OBJ(proto_val) != JS_VALUE_GET_OBJ(proto1)) {
+            JS_FreeValue(ctx, proto1);
+            JS_ThrowTypeError(ctx, "proxy: inconsistent prototype");
+            return -1;
+        }
+        JS_FreeValue(ctx, proto1);
+    }
+    return TRUE;
+}
+
+static int js_proxy_isExtensible(JSContext *ctx, JSValueConst obj)
+{
+    JSProxyData *s;
+    JSValue method, ret;
+    BOOL res;
+    int res2;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_isExtensible);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method))
+        return JS_IsExtensible(ctx, s->target);
+    ret = JS_CallFree(ctx, method, s->handler, 1, (JSValueConst *)&s->target);
+    if (JS_IsException(ret))
+        return -1;
+    res = JS_ToBoolFree(ctx, ret);
+    res2 = JS_IsExtensible(ctx, s->target);
+    if (res2 < 0)
+        return res2;
+    if (res != res2) {
+        JS_ThrowTypeError(ctx, "proxy: inconsistent isExtensible");
+        return -1;
+    }
+    return res;
+}
+
+static int js_proxy_preventExtensions(JSContext *ctx, JSValueConst obj)
+{
+    JSProxyData *s;
+    JSValue method, ret;
+    BOOL res;
+    int res2;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_preventExtensions);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method))
+        return JS_PreventExtensions(ctx, s->target);
+    ret = JS_CallFree(ctx, method, s->handler, 1, (JSValueConst *)&s->target);
+    if (JS_IsException(ret))
+        return -1;
+    res = JS_ToBoolFree(ctx, ret);
+    if (res) {
+        res2 = JS_IsExtensible(ctx, s->target);
+        if (res2 < 0)
+            return res2;
+        if (res2) {
+            JS_ThrowTypeError(ctx, "proxy: inconsistent preventExtensions");
+            return -1;
+        }
+    }
+    return res;
+}
+
+static int js_proxy_has(JSContext *ctx, JSValueConst obj, JSAtom atom)
+{
+    JSProxyData *s;
+    JSValue method, ret1, atom_val;
+    int ret, res;
+    JSObject *p;
+    JSValueConst args[2];
+    BOOL res2;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_has);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method))
+        return JS_HasProperty(ctx, s->target, atom);
+    atom_val = JS_AtomToValue(ctx, atom);
+    if (JS_IsException(atom_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = atom_val;
+    ret1 = JS_CallFree(ctx, method, s->handler, 2, args);
+    JS_FreeValue(ctx, atom_val);
+    if (JS_IsException(ret1))
+        return -1;
+    ret = JS_ToBoolFree(ctx, ret1);
+    if (!ret) {
+        JSPropertyDescriptor desc;
+        p = JS_VALUE_GET_OBJ(s->target);
+        res = JS_GetOwnPropertyInternal(ctx, &desc, p, atom);
+        if (res < 0)
+            return -1;
+        if (res) {
+            res2 = !(desc.flags & JS_PROP_CONFIGURABLE);
+            js_free_desc(ctx, &desc);
+            if (res2 || !p->extensible) {
+                JS_ThrowTypeError(ctx, "proxy: inconsistent has");
+                return -1;
+            }
+        }
+    }
+    return ret;
+}
+
+static JSValue js_proxy_get(JSContext *ctx, JSValueConst obj, JSAtom atom,
+                            JSValueConst receiver)
+{
+    JSProxyData *s;
+    JSValue method, ret, atom_val;
+    int res;
+    JSValueConst args[3];
+    JSPropertyDescriptor desc;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_get);
+    if (!s)
+        return JS_EXCEPTION;
+    /* Note: recursion is possible thru the prototype of s->target */
+    if (JS_IsUndefined(method))
+        return JS_GetPropertyInternal(ctx, s->target, atom, receiver, FALSE);
+    atom_val = JS_AtomToValue(ctx, atom);
+    if (JS_IsException(atom_val)) {
+        JS_FreeValue(ctx, method);
+        return JS_EXCEPTION;
+    }
+    args[0] = s->target;
+    args[1] = atom_val;
+    args[2] = receiver;
+    ret = JS_CallFree(ctx, method, s->handler, 3, args);
+    JS_FreeValue(ctx, atom_val);
+    if (JS_IsException(ret))
+        return JS_EXCEPTION;
+    res = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(s->target), atom);
+    if (res < 0)
+        return JS_EXCEPTION;
+    if (res) {
+        if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) == 0) {
+            if (!js_same_value(ctx, desc.value, ret)) {
+                goto fail;
+            }
+        } else if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE)) == JS_PROP_GETSET) {
+            if (JS_IsUndefined(desc.getter) && !JS_IsUndefined(ret)) {
+            fail:
+                js_free_desc(ctx, &desc);
+                JS_FreeValue(ctx, ret);
+                return JS_ThrowTypeError(ctx, "proxy: inconsistent get");
+            }
+        }
+        js_free_desc(ctx, &desc);
+    }
+    return ret;
+}
+
+static int js_proxy_set(JSContext *ctx, JSValueConst obj, JSAtom atom,
+                        JSValueConst value, JSValueConst receiver, int flags)
+{
+    JSProxyData *s;
+    JSValue method, ret1, atom_val;
+    int ret, res;
+    JSValueConst args[4];
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_set);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method)) {
+        return JS_SetPropertyInternal(ctx, s->target, atom,
+                                      JS_DupValue(ctx, value), receiver,
+                                      flags);
+    }
+    atom_val = JS_AtomToValue(ctx, atom);
+    if (JS_IsException(atom_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = atom_val;
+    args[2] = value;
+    args[3] = receiver;
+    ret1 = JS_CallFree(ctx, method, s->handler, 4, args);
+    JS_FreeValue(ctx, atom_val);
+    if (JS_IsException(ret1))
+        return -1;
+    ret = JS_ToBoolFree(ctx, ret1);
+    if (ret) {
+        JSPropertyDescriptor desc;
+        res = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(s->target), atom);
+        if (res < 0)
+            return -1;
+        if (res) {
+            if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) == 0) {
+                if (!js_same_value(ctx, desc.value, value)) {
+                    goto fail;
+                }
+            } else if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE)) == JS_PROP_GETSET && JS_IsUndefined(desc.setter)) {
+                fail:
+                    js_free_desc(ctx, &desc);
+                    JS_ThrowTypeError(ctx, "proxy: inconsistent set");
+                    return -1;
+            }
+            js_free_desc(ctx, &desc);
+        }
+    } else {
+        if ((flags & JS_PROP_THROW) ||
+            ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
+            JS_ThrowTypeError(ctx, "proxy: cannot set property");
+            return -1;
+        }
+    }
+    return ret;
+}
+
+static JSValue js_create_desc(JSContext *ctx, JSValueConst val,
+                              JSValueConst getter, JSValueConst setter,
+                              int flags)
+{
+    JSValue ret;
+    ret = JS_NewObject(ctx);
+    if (JS_IsException(ret))
+        return ret;
+    if (flags & JS_PROP_HAS_GET) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_get, JS_DupValue(ctx, getter),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_SET) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_set, JS_DupValue(ctx, setter),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_VALUE) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_value, JS_DupValue(ctx, val),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_WRITABLE) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_writable,
+                               JS_NewBool(ctx, flags & JS_PROP_WRITABLE),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_ENUMERABLE) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_enumerable,
+                               JS_NewBool(ctx, flags & JS_PROP_ENUMERABLE),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_CONFIGURABLE) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_configurable,
+                               JS_NewBool(ctx, flags & JS_PROP_CONFIGURABLE),
+                               JS_PROP_C_W_E);
+    }
+    return ret;
+}
+
+static int js_proxy_get_own_property(JSContext *ctx, JSPropertyDescriptor *pdesc,
+                                     JSValueConst obj, JSAtom prop)
+{
+    JSProxyData *s;
+    JSValue method, trap_result_obj, prop_val;
+    int res, target_desc_ret, ret;
+    JSObject *p;
+    JSValueConst args[2];
+    JSPropertyDescriptor result_desc, target_desc;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_getOwnPropertyDescriptor);
+    if (!s)
+        return -1;
+    p = JS_VALUE_GET_OBJ(s->target);
+    if (JS_IsUndefined(method)) {
+        return JS_GetOwnPropertyInternal(ctx, pdesc, p, prop);
+    }
+    prop_val = JS_AtomToValue(ctx, prop);
+    if (JS_IsException(prop_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = prop_val;
+    trap_result_obj = JS_CallFree(ctx, method, s->handler, 2, args);
+    JS_FreeValue(ctx, prop_val);
+    if (JS_IsException(trap_result_obj))
+        return -1;
+    if (!JS_IsObject(trap_result_obj) && !JS_IsUndefined(trap_result_obj)) {
+        JS_FreeValue(ctx, trap_result_obj);
+        goto fail;
+    }
+    target_desc_ret = JS_GetOwnPropertyInternal(ctx, &target_desc, p, prop);
+    if (target_desc_ret < 0) {
+        JS_FreeValue(ctx, trap_result_obj);
+        return -1;
+    }
+    if (target_desc_ret)
+        js_free_desc(ctx, &target_desc);
+    if (JS_IsUndefined(trap_result_obj)) {
+        if (target_desc_ret) {
+            if (!(target_desc.flags & JS_PROP_CONFIGURABLE) || !p->extensible)
+                goto fail;
+        }
+        ret = FALSE;
+    } else {
+        int flags1, extensible_target;
+        extensible_target = JS_IsExtensible(ctx, s->target);
+        if (extensible_target < 0) {
+            JS_FreeValue(ctx, trap_result_obj);
+            return -1;
+        }
+        res = js_obj_to_desc(ctx, &result_desc, trap_result_obj);
+        JS_FreeValue(ctx, trap_result_obj);
+        if (res < 0)
+            return -1;
+
+        if (target_desc_ret) {
+            /* convert result_desc.flags to defineProperty flags */
+            flags1 = result_desc.flags | JS_PROP_HAS_CONFIGURABLE | JS_PROP_HAS_ENUMERABLE;
+            if (result_desc.flags & JS_PROP_GETSET)
+                flags1 |= JS_PROP_HAS_GET | JS_PROP_HAS_SET;
+            else
+                flags1 |= JS_PROP_HAS_VALUE | JS_PROP_HAS_WRITABLE;
+            /* XXX: not complete check: need to compare value &
+               getter/setter as in defineproperty */
+            if (!check_define_prop_flags(target_desc.flags, flags1))
+                goto fail1;
+        } else {
+            if (!extensible_target)
+                goto fail1;
+        }
+        if (!(result_desc.flags & JS_PROP_CONFIGURABLE)) {
+            if (!target_desc_ret || (target_desc.flags & JS_PROP_CONFIGURABLE))
+                goto fail1;
+            if ((result_desc.flags &
+                 (JS_PROP_GETSET | JS_PROP_WRITABLE)) == 0 &&
+                target_desc_ret &&
+                (target_desc.flags & JS_PROP_WRITABLE) != 0) {
+                /* proxy-missing-checks */
+            fail1:
+                js_free_desc(ctx, &result_desc);
+            fail:
+                JS_ThrowTypeError(ctx, "proxy: inconsistent getOwnPropertyDescriptor");
+                return -1;
+            }
+        }
+        ret = TRUE;
+        if (pdesc) {
+            *pdesc = result_desc;
+        } else {
+            js_free_desc(ctx, &result_desc);
+        }
+    }
+    return ret;
+}
+
+static int js_proxy_define_own_property(JSContext *ctx, JSValueConst obj,
+                                        JSAtom prop, JSValueConst val,
+                                        JSValueConst getter, JSValueConst setter,
+                                        int flags)
+{
+    JSProxyData *s;
+    JSValue method, ret1, prop_val, desc_val;
+    int res, ret;
+    JSObject *p;
+    JSValueConst args[3];
+    JSPropertyDescriptor desc;
+    BOOL setting_not_configurable;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_defineProperty);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method)) {
+        return JS_DefineProperty(ctx, s->target, prop, val, getter, setter, flags);
+    }
+    prop_val = JS_AtomToValue(ctx, prop);
+    if (JS_IsException(prop_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    desc_val = js_create_desc(ctx, val, getter, setter, flags);
+    if (JS_IsException(desc_val)) {
+        JS_FreeValue(ctx, prop_val);
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = prop_val;
+    args[2] = desc_val;
+    ret1 = JS_CallFree(ctx, method, s->handler, 3, args);
+    JS_FreeValue(ctx, prop_val);
+    JS_FreeValue(ctx, desc_val);
+    if (JS_IsException(ret1))
+        return -1;
+    ret = JS_ToBoolFree(ctx, ret1);
+    if (!ret) {
+        if (flags & JS_PROP_THROW) {
+            JS_ThrowTypeError(ctx, "proxy: defineProperty exception");
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+    p = JS_VALUE_GET_OBJ(s->target);
+    res = JS_GetOwnPropertyInternal(ctx, &desc, p, prop);
+    if (res < 0)
+        return -1;
+    setting_not_configurable = ((flags & (JS_PROP_HAS_CONFIGURABLE |
+                                          JS_PROP_CONFIGURABLE)) ==
+                                JS_PROP_HAS_CONFIGURABLE);
+    if (!res) {
+        if (!p->extensible || setting_not_configurable)
+            goto fail;
+    } else {
+        if (!check_define_prop_flags(desc.flags, flags) ||
+            ((desc.flags & JS_PROP_CONFIGURABLE) && setting_not_configurable)) {
+            goto fail1;
+        }
+        if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+            if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE)) ==
+                JS_PROP_GETSET) {
+                if ((flags & JS_PROP_HAS_GET) &&
+                    !js_same_value(ctx, getter, desc.getter)) {
+                    goto fail1;
+                }
+                if ((flags & JS_PROP_HAS_SET) &&
+                    !js_same_value(ctx, setter, desc.setter)) {
+                    goto fail1;
+                }
+            }
+        } else if (flags & JS_PROP_HAS_VALUE) {
+            if ((desc.flags & (JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) ==
+                JS_PROP_WRITABLE && !(flags & JS_PROP_WRITABLE)) {
+                /* missing-proxy-check feature */
+                goto fail1;
+            } else if ((desc.flags & (JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) == 0 &&
+                !js_same_value(ctx, val, desc.value)) {
+                goto fail1;
+            }
+        }
+        if (flags & JS_PROP_HAS_WRITABLE) {
+            if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE |
+                               JS_PROP_WRITABLE)) == JS_PROP_WRITABLE) {
+                /* proxy-missing-checks */
+            fail1:
+                js_free_desc(ctx, &desc);
+            fail:
+                JS_ThrowTypeError(ctx, "proxy: inconsistent defineProperty");
+                return -1;
+            }
+        }
+        js_free_desc(ctx, &desc);
+    }
+    return 1;
+}
+
+static int js_proxy_delete_property(JSContext *ctx, JSValueConst obj,
+                                    JSAtom atom)
+{
+    JSProxyData *s;
+    JSValue method, ret, atom_val;
+    int res, res2, is_extensible;
+    JSValueConst args[2];
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_deleteProperty);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method)) {
+        return JS_DeleteProperty(ctx, s->target, atom, 0);
+    }
+    atom_val = JS_AtomToValue(ctx, atom);;
+    if (JS_IsException(atom_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = atom_val;
+    ret = JS_CallFree(ctx, method, s->handler, 2, args);
+    JS_FreeValue(ctx, atom_val);
+    if (JS_IsException(ret))
+        return -1;
+    res = JS_ToBoolFree(ctx, ret);
+    if (res) {
+        JSPropertyDescriptor desc;
+        res2 = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(s->target), atom);
+        if (res2 < 0)
+            return -1;
+        if (res2) {
+            if (!(desc.flags & JS_PROP_CONFIGURABLE))
+                goto fail;
+            is_extensible = JS_IsExtensible(ctx, s->target);
+            if (is_extensible < 0)
+                goto fail1;
+            if (!is_extensible) {
+                /* proxy-missing-checks */
+            fail:
+                JS_ThrowTypeError(ctx, "proxy: inconsistent deleteProperty");
+            fail1:
+                js_free_desc(ctx, &desc);
+                return -1;
+            }
+            js_free_desc(ctx, &desc);
+        }
+    }
+    return res;
+}
+
+/* return the index of the property or -1 if not found */
+static int find_prop_key(const JSPropertyEnum *tab, int n, JSAtom atom)
+{
+    int i;
+    for(i = 0; i < n; i++) {
+        if (tab[i].atom == atom)
+            return i;
+    }
+    return -1;
+}
+
+static int js_proxy_get_own_property_names(JSContext *ctx,
+                                           JSPropertyEnum **ptab,
+                                           uint32_t *plen,
+                                           JSValueConst obj)
+{
+    JSProxyData *s;
+    JSValue method, prop_array, val;
+    uint32_t len, i, len2;
+    JSPropertyEnum *tab, *tab2;
+    JSAtom atom;
+    JSPropertyDescriptor desc;
+    int res, is_extensible, idx;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_ownKeys);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method)) {
+        return JS_GetOwnPropertyNamesInternal(ctx, ptab, plen,
+                                      JS_VALUE_GET_OBJ(s->target),
+                                      JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK);
+    }
+    prop_array = JS_CallFree(ctx, method, s->handler, 1, (JSValueConst *)&s->target);
+    if (JS_IsException(prop_array))
+        return -1;
+    tab = NULL;
+    len = 0;
+    tab2 = NULL;
+    len2 = 0;
+    if (js_get_length32(ctx, &len, prop_array))
+        goto fail;
+    if (len > 0) {
+        tab = js_mallocz(ctx, sizeof(tab[0]) * len);
+        if (!tab)
+            goto fail;
+    }
+    for(i = 0; i < len; i++) {
+        val = JS_GetPropertyUint32(ctx, prop_array, i);
+        if (JS_IsException(val))
+            goto fail;
+        if (!JS_IsString(val) && !JS_IsSymbol(val)) {
+            JS_FreeValue(ctx, val);
+            JS_ThrowTypeError(ctx, "proxy: properties must be strings or symbols");
+            goto fail;
+        }
+        atom = JS_ValueToAtom(ctx, val);
+        JS_FreeValue(ctx, val);
+        if (atom == JS_ATOM_NULL)
+            goto fail;
+        tab[i].atom = atom;
+        tab[i].is_enumerable = FALSE; /* XXX: redundant? */
+    }
+
+    /* check duplicate properties (XXX: inefficient, could store the
+     * properties an a temporary object to use the hash) */
+    for(i = 1; i < len; i++) {
+        if (find_prop_key(tab, i, tab[i].atom) >= 0) {
+            JS_ThrowTypeError(ctx, "proxy: duplicate property");
+            goto fail;
+        }
+    }
+
+    is_extensible = JS_IsExtensible(ctx, s->target);
+    if (is_extensible < 0)
+        goto fail;
+
+    /* check if there are non configurable properties */
+    if (s->is_revoked) {
+        JS_ThrowTypeErrorRevokedProxy(ctx);
+        goto fail;
+    }
+    if (JS_GetOwnPropertyNamesInternal(ctx, &tab2, &len2, JS_VALUE_GET_OBJ(s->target),
+                               JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK))
+        goto fail;
+    for(i = 0; i < len2; i++) {
+        if (s->is_revoked) {
+            JS_ThrowTypeErrorRevokedProxy(ctx);
+            goto fail;
+        }
+        res = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(s->target),
+                                tab2[i].atom);
+        if (res < 0)
+            goto fail;
+        if (res) {  /* safety, property should be found */
+            js_free_desc(ctx, &desc);
+            if (!(desc.flags & JS_PROP_CONFIGURABLE) || !is_extensible) {
+                idx = find_prop_key(tab, len, tab2[i].atom);
+                if (idx < 0) {
+                    JS_ThrowTypeError(ctx, "proxy: target property must be present in proxy ownKeys");
+                    goto fail;
+                }
+                /* mark the property as found */
+                if (!is_extensible)
+                    tab[idx].is_enumerable = TRUE;
+            }
+        }
+    }
+    if (!is_extensible) {
+        /* check that all property in 'tab' were checked */
+        for(i = 0; i < len; i++) {
+            if (!tab[i].is_enumerable) {
+                JS_ThrowTypeError(ctx, "proxy: property not present in target were returned by non extensible proxy");
+                goto fail;
+            }
+        }
+    }
+
+    js_free_prop_enum(ctx, tab2, len2);
+    JS_FreeValue(ctx, prop_array);
+    *ptab = tab;
+    *plen = len;
+    return 0;
+ fail:
+    js_free_prop_enum(ctx, tab2, len2);
+    js_free_prop_enum(ctx, tab, len);
+    JS_FreeValue(ctx, prop_array);
+    return -1;
+}
+
+static JSValue js_proxy_call_constructor(JSContext *ctx, JSValueConst func_obj,
+                                         JSValueConst new_target,
+                                         int argc, JSValueConst *argv)
+{
+    JSProxyData *s;
+    JSValue method, arg_array, ret;
+    JSValueConst args[3];
+
+    s = get_proxy_method(ctx, &method, func_obj, JS_ATOM_construct);
+    if (!s)
+        return JS_EXCEPTION;
+    if (!JS_IsConstructor(ctx, s->target))
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    if (JS_IsUndefined(method))
+        return JS_CallConstructor2(ctx, s->target, new_target, argc, argv);
+    arg_array = js_create_array(ctx, argc, argv);
+    if (JS_IsException(arg_array)) {
+        ret = JS_EXCEPTION;
+        goto fail;
+    }
+    args[0] = s->target;
+    args[1] = arg_array;
+    args[2] = new_target;
+    ret = JS_Call(ctx, method, s->handler, 3, args);
+    if (!JS_IsException(ret) && JS_VALUE_GET_TAG(ret) != JS_TAG_OBJECT) {
+        JS_FreeValue(ctx, ret);
+        ret = JS_ThrowTypeErrorNotAnObject(ctx);
+    }
+ fail:
+    JS_FreeValue(ctx, method);
+    JS_FreeValue(ctx, arg_array);
+    return ret;
+}
+
+static JSValue js_proxy_call(JSContext *ctx, JSValueConst func_obj,
+                             JSValueConst this_obj,
+                             int argc, JSValueConst *argv, int flags)
+{
+    JSProxyData *s;
+    JSValue method, arg_array, ret;
+    JSValueConst args[3];
+
+    if (flags & JS_CALL_FLAG_CONSTRUCTOR)
+        return js_proxy_call_constructor(ctx, func_obj, this_obj, argc, argv);
+
+    s = get_proxy_method(ctx, &method, func_obj, JS_ATOM_apply);
+    if (!s)
+        return JS_EXCEPTION;
+    if (!s->is_func) {
+        JS_FreeValue(ctx, method);
+        return JS_ThrowTypeError(ctx, "not a function");
+    }
+    if (JS_IsUndefined(method))
+        return JS_Call(ctx, s->target, this_obj, argc, argv);
+    arg_array = js_create_array(ctx, argc, argv);
+    if (JS_IsException(arg_array)) {
+        ret = JS_EXCEPTION;
+        goto fail;
+    }
+    args[0] = s->target;
+    args[1] = this_obj;
+    args[2] = arg_array;
+    ret = JS_Call(ctx, method, s->handler, 3, args);
+ fail:
+    JS_FreeValue(ctx, method);
+    JS_FreeValue(ctx, arg_array);
+    return ret;
+}
+
+/* `js_resolve_proxy`: resolve the proxy chain
+   `*pval` is updated with to ultimate proxy target
+   `throw_exception` controls whether exceptions are thown or not
+   - return -1 in case of error
+   - otherwise return 0
+ */
+static int js_resolve_proxy(JSContext *ctx, JSValueConst *pval, BOOL throw_exception) {
+    int depth = 0;
+    JSObject *p;
+    JSProxyData *s;
+
+    while (JS_VALUE_GET_TAG(*pval) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(*pval);
+        if (p->class_id != JS_CLASS_PROXY)
+            break;
+        if (depth++ > 1000) {
+            if (throw_exception)
+                JS_ThrowStackOverflow(ctx);
+            return -1;
+        }
+        s = p->u.opaque;
+        if (s->is_revoked) {
+            if (throw_exception)
+                JS_ThrowTypeErrorRevokedProxy(ctx);
+            return -1;
+        }
+        *pval = s->target;
+    }
+    return 0;
+}
+
+static const JSClassExoticMethods js_proxy_exotic_methods = {
+    .get_own_property = js_proxy_get_own_property,
+    .define_own_property = js_proxy_define_own_property,
+    .delete_property = js_proxy_delete_property,
+    .get_own_property_names = js_proxy_get_own_property_names,
+    .has_property = js_proxy_has,
+    .get_property = js_proxy_get,
+    .set_property = js_proxy_set,
+};
+
+static JSValue js_proxy_constructor(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValueConst target, handler;
+    JSValue obj;
+    JSProxyData *s;
+
+    target = argv[0];
+    handler = argv[1];
+    if (JS_VALUE_GET_TAG(target) != JS_TAG_OBJECT ||
+        JS_VALUE_GET_TAG(handler) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    obj = JS_NewObjectProtoClass(ctx, JS_NULL, JS_CLASS_PROXY);
+    if (JS_IsException(obj))
+        return obj;
+    s = js_malloc(ctx, sizeof(JSProxyData));
+    if (!s) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    s->target = JS_DupValue(ctx, target);
+    s->handler = JS_DupValue(ctx, handler);
+    s->is_func = JS_IsFunction(ctx, target);
+    s->is_revoked = FALSE;
+    JS_SetOpaque(obj, s);
+    JS_SetConstructorBit(ctx, obj, JS_IsConstructor(ctx, target));
+    return obj;
+}
+
+static JSValue js_proxy_revoke(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv, int magic,
+                               JSValue *func_data)
+{
+    JSProxyData *s = JS_GetOpaque(func_data[0], JS_CLASS_PROXY);
+    if (s) {
+        /* We do not free the handler and target in case they are
+           referenced as constants in the C call stack */
+        s->is_revoked = TRUE;
+        JS_FreeValue(ctx, func_data[0]);
+        func_data[0] = JS_NULL;
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_proxy_revoke_constructor(JSContext *ctx,
+                                           JSValueConst proxy_obj)
+{
+    return JS_NewCFunctionData(ctx, js_proxy_revoke, 0, 0, 1, &proxy_obj);
+}
+
+static JSValue js_proxy_revocable(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue proxy_obj, revoke_obj = JS_UNDEFINED, obj;
+
+    proxy_obj = js_proxy_constructor(ctx, JS_UNDEFINED, argc, argv);
+    if (JS_IsException(proxy_obj))
+        goto fail;
+    revoke_obj = js_proxy_revoke_constructor(ctx, proxy_obj);
+    if (JS_IsException(revoke_obj))
+        goto fail;
+    obj = JS_NewObject(ctx);
+    if (JS_IsException(obj))
+        goto fail;
+    // XXX: exceptions?
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_proxy, proxy_obj, JS_PROP_C_W_E);
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_revoke, revoke_obj, JS_PROP_C_W_E);
+    return obj;
+ fail:
+    JS_FreeValue(ctx, proxy_obj);
+    JS_FreeValue(ctx, revoke_obj);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_proxy_funcs[] = {
+    JS_CFUNC_DEF("revocable", 2, js_proxy_revocable ),
+};
+
+static const JSClassShortDef js_proxy_class_def[] = {
+    { JS_ATOM_Object, js_proxy_finalizer, js_proxy_mark }, /* JS_CLASS_PROXY */
+};
+
+void JS_AddIntrinsicProxy(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValue obj1;
+
+    if (!JS_IsRegisteredClass(rt, JS_CLASS_PROXY)) {
+        init_class_range(rt, js_proxy_class_def, JS_CLASS_PROXY,
+                         countof(js_proxy_class_def));
+        rt->class_array[JS_CLASS_PROXY].exotic = &js_proxy_exotic_methods;
+        rt->class_array[JS_CLASS_PROXY].call = js_proxy_call;
+    }
+
+    obj1 = JS_NewCFunction2(ctx, js_proxy_constructor, "Proxy", 2,
+                            JS_CFUNC_constructor, 0);
+    JS_SetConstructorBit(ctx, obj1, TRUE);
+    JS_SetPropertyFunctionList(ctx, obj1, js_proxy_funcs,
+                               countof(js_proxy_funcs));
+    JS_DefinePropertyValueStr(ctx, ctx->global_obj, "Proxy",
+                              obj1, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+}
+
+/* Symbol */
+
+static JSValue js_symbol_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue str;
+    JSString *p;
+
+    if (!JS_IsUndefined(new_target))
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    if (argc == 0 || JS_IsUndefined(argv[0])) {
+        p = NULL;
+    } else {
+        str = JS_ToString(ctx, argv[0]);
+        if (JS_IsException(str))
+            return JS_EXCEPTION;
+        p = JS_VALUE_GET_STRING(str);
+    }
+    return JS_NewSymbol(ctx, p, JS_ATOM_TYPE_SYMBOL);
+}
+
+static JSValue js_thisSymbolValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_SYMBOL)
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_SYMBOL) {
+            if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_SYMBOL)
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a symbol");
+}
+
+static JSValue js_symbol_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    val = js_thisSymbolValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    /* XXX: use JS_ToStringInternal() with a flags */
+    ret = js_string_constructor(ctx, JS_UNDEFINED, 1, (JSValueConst *)&val);
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue js_symbol_valueOf(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return js_thisSymbolValue(ctx, this_val);
+}
+
+static JSValue js_symbol_get_description(JSContext *ctx, JSValueConst this_val)
+{
+    JSValue val, ret;
+    JSAtomStruct *p;
+
+    val = js_thisSymbolValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_PTR(val);
+    if (p->len == 0 && p->is_wide_char != 0) {
+        ret = JS_UNDEFINED;
+    } else {
+        ret = JS_AtomToString(ctx, js_get_atom_index(ctx->rt, p));
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static const JSCFunctionListEntry js_symbol_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_symbol_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_symbol_valueOf ),
+    // XXX: should have writable: false
+    JS_CFUNC_DEF("[Symbol.toPrimitive]", 1, js_symbol_valueOf ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Symbol", JS_PROP_CONFIGURABLE ),
+    JS_CGETSET_DEF("description", js_symbol_get_description, NULL ),
+};
+
+static JSValue js_symbol_for(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    JSValue str;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return JS_EXCEPTION;
+    return JS_NewSymbol(ctx, JS_VALUE_GET_STRING(str), JS_ATOM_TYPE_GLOBAL_SYMBOL);
+}
+
+static JSValue js_symbol_keyFor(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSAtomStruct *p;
+
+    if (!JS_IsSymbol(argv[0]))
+        return JS_ThrowTypeError(ctx, "not a symbol");
+    p = JS_VALUE_GET_PTR(argv[0]);
+    if (p->atom_type != JS_ATOM_TYPE_GLOBAL_SYMBOL)
+        return JS_UNDEFINED;
+    return JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+}
+
+static const JSCFunctionListEntry js_symbol_funcs[] = {
+    JS_CFUNC_DEF("for", 1, js_symbol_for ),
+    JS_CFUNC_DEF("keyFor", 1, js_symbol_keyFor ),
+};
+
+/* Set/Map/WeakSet/WeakMap */
+
+typedef struct JSMapRecord {
+    int ref_count; /* used during enumeration to avoid freeing the record */
+    BOOL empty; /* TRUE if the record is deleted */
+    struct JSMapState *map;
+    struct JSMapRecord *next_weak_ref;
+    struct list_head link;
+    struct list_head hash_link;
+    JSValue key;
+    JSValue value;
+} JSMapRecord;
+
+typedef struct JSMapState {
+    BOOL is_weak; /* TRUE if WeakSet/WeakMap */
+    struct list_head records; /* list of JSMapRecord.link */
+    uint32_t record_count;
+    struct list_head *hash_table;
+    uint32_t hash_size; /* must be a power of two */
+    uint32_t record_count_threshold; /* count at which a hash table
+                                        resize is needed */
+} JSMapState;
+
+#define MAGIC_SET (1 << 0)
+#define MAGIC_WEAK (1 << 1)
+
+static JSValue js_map_constructor(JSContext *ctx, JSValueConst new_target,
+                                  int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s;
+    JSValue obj, adder = JS_UNDEFINED, iter = JS_UNDEFINED, next_method = JS_UNDEFINED;
+    JSValueConst arr;
+    BOOL is_set, is_weak;
+
+    is_set = magic & MAGIC_SET;
+    is_weak = ((magic & MAGIC_WEAK) != 0);
+    obj = js_create_from_ctor(ctx, new_target, JS_CLASS_MAP + magic);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        goto fail;
+    init_list_head(&s->records);
+    s->is_weak = is_weak;
+    JS_SetOpaque(obj, s);
+    s->hash_size = 1;
+    s->hash_table = js_malloc(ctx, sizeof(s->hash_table[0]) * s->hash_size);
+    if (!s->hash_table)
+        goto fail;
+    init_list_head(&s->hash_table[0]);
+    s->record_count_threshold = 4;
+
+    arr = JS_UNDEFINED;
+    if (argc > 0)
+        arr = argv[0];
+    if (!JS_IsUndefined(arr) && !JS_IsNull(arr)) {
+        JSValue item, ret;
+        BOOL done;
+
+        adder = JS_GetProperty(ctx, obj, is_set ? JS_ATOM_add : JS_ATOM_set);
+        if (JS_IsException(adder))
+            goto fail;
+        if (!JS_IsFunction(ctx, adder)) {
+            JS_ThrowTypeError(ctx, "set/add is not a function");
+            goto fail;
+        }
+
+        iter = JS_GetIterator(ctx, arr, FALSE);
+        if (JS_IsException(iter))
+            goto fail;
+        next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+        if (JS_IsException(next_method))
+            goto fail;
+
+        for(;;) {
+            item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+            if (JS_IsException(item))
+                goto fail;
+            if (done) {
+                JS_FreeValue(ctx, item);
+                break;
+            }
+            if (is_set) {
+                ret = JS_Call(ctx, adder, obj, 1, (JSValueConst *)&item);
+                if (JS_IsException(ret)) {
+                    JS_FreeValue(ctx, item);
+                    goto fail;
+                }
+            } else {
+                JSValue key, value;
+                JSValueConst args[2];
+                key = JS_UNDEFINED;
+                value = JS_UNDEFINED;
+                if (!JS_IsObject(item)) {
+                    JS_ThrowTypeErrorNotAnObject(ctx);
+                    goto fail1;
+                }
+                key = JS_GetPropertyUint32(ctx, item, 0);
+                if (JS_IsException(key))
+                    goto fail1;
+                value = JS_GetPropertyUint32(ctx, item, 1);
+                if (JS_IsException(value))
+                    goto fail1;
+                args[0] = key;
+                args[1] = value;
+                ret = JS_Call(ctx, adder, obj, 2, args);
+                if (JS_IsException(ret)) {
+                fail1:
+                    JS_FreeValue(ctx, item);
+                    JS_FreeValue(ctx, key);
+                    JS_FreeValue(ctx, value);
+                    goto fail;
+                }
+                JS_FreeValue(ctx, key);
+                JS_FreeValue(ctx, value);
+            }
+            JS_FreeValue(ctx, ret);
+            JS_FreeValue(ctx, item);
+        }
+        JS_FreeValue(ctx, next_method);
+        JS_FreeValue(ctx, iter);
+        JS_FreeValue(ctx, adder);
+    }
+    return obj;
+ fail:
+    if (JS_IsObject(iter)) {
+        /* close the iterator object, preserving pending exception */
+        JS_IteratorClose(ctx, iter, TRUE);
+    }
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, adder);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+/* XXX: could normalize strings to speed up comparison */
+static JSValueConst map_normalize_key(JSContext *ctx, JSValueConst key)
+{
+    uint32_t tag = JS_VALUE_GET_TAG(key);
+    /* convert -0.0 to +0.0 */
+    if (JS_TAG_IS_FLOAT64(tag) && JS_VALUE_GET_FLOAT64(key) == 0.0) {
+        key = JS_NewInt32(ctx, 0);
+    }
+    return key;
+}
+
+/* XXX: better hash ? */
+static uint32_t map_hash_key(JSContext *ctx, JSValueConst key)
+{
+    uint32_t tag = JS_VALUE_GET_NORM_TAG(key);
+    uint32_t h;
+    double d;
+    JSFloat64Union u;
+
+    switch(tag) {
+    case JS_TAG_BOOL:
+        h = JS_VALUE_GET_INT(key);
+        break;
+    case JS_TAG_STRING:
+        h = hash_string(JS_VALUE_GET_STRING(key), 0);
+        break;
+    case JS_TAG_OBJECT:
+    case JS_TAG_SYMBOL:
+        h = (uintptr_t)JS_VALUE_GET_PTR(key) * 3163;
+        break;
+    case JS_TAG_INT:
+        d = JS_VALUE_GET_INT(key);
+        goto hash_float64;
+    case JS_TAG_FLOAT64:
+        d = JS_VALUE_GET_FLOAT64(key);
+        /* normalize the NaN */
+        if (isnan(d))
+            d = JS_FLOAT64_NAN;
+    hash_float64:
+        u.d = d;
+        h = (u.u32[0] ^ u.u32[1]) * 3163;
+        return h ^= JS_TAG_FLOAT64;
+    default:
+        h = 0; /* XXX: bignum support */
+        break;
+    }
+    h ^= tag;
+    return h;
+}
+
+static JSMapRecord *map_find_record(JSContext *ctx, JSMapState *s,
+                                    JSValueConst key)
+{
+    struct list_head *el;
+    JSMapRecord *mr;
+    uint32_t h;
+    h = map_hash_key(ctx, key) & (s->hash_size - 1);
+    list_for_each(el, &s->hash_table[h]) {
+        mr = list_entry(el, JSMapRecord, hash_link);
+        if (js_same_value_zero(ctx, mr->key, key))
+            return mr;
+    }
+    return NULL;
+}
+
+static void map_hash_resize(JSContext *ctx, JSMapState *s)
+{
+    uint32_t new_hash_size, i, h;
+    size_t slack;
+    struct list_head *new_hash_table, *el;
+    JSMapRecord *mr;
+
+    /* XXX: no reporting of memory allocation failure */
+    if (s->hash_size == 1)
+        new_hash_size = 4;
+    else
+        new_hash_size = s->hash_size * 2;
+    new_hash_table = js_realloc2(ctx, s->hash_table,
+                                 sizeof(new_hash_table[0]) * new_hash_size, &slack);
+    if (!new_hash_table)
+        return;
+    new_hash_size += slack / sizeof(*new_hash_table);
+
+    for(i = 0; i < new_hash_size; i++)
+        init_list_head(&new_hash_table[i]);
+
+    list_for_each(el, &s->records) {
+        mr = list_entry(el, JSMapRecord, link);
+        if (!mr->empty) {
+            h = map_hash_key(ctx, mr->key) & (new_hash_size - 1);
+            list_add_tail(&mr->hash_link, &new_hash_table[h]);
+        }
+    }
+    s->hash_table = new_hash_table;
+    s->hash_size = new_hash_size;
+    s->record_count_threshold = new_hash_size * 2;
+}
+
+static JSMapRecord *map_add_record(JSContext *ctx, JSMapState *s,
+                                   JSValueConst key)
+{
+    uint32_t h;
+    JSMapRecord *mr;
+
+    mr = js_malloc(ctx, sizeof(*mr));
+    if (!mr)
+        return NULL;
+    mr->ref_count = 1;
+    mr->map = s;
+    mr->empty = FALSE;
+    if (s->is_weak) {
+        JSObject *p = JS_VALUE_GET_OBJ(key);
+        /* Add the weak reference */
+        mr->next_weak_ref = p->first_weak_ref;
+        p->first_weak_ref = mr;
+    } else {
+        JS_DupValue(ctx, key);
+    }
+    mr->key = key;
+    h = map_hash_key(ctx, key) & (s->hash_size - 1);
+    list_add_tail(&mr->hash_link, &s->hash_table[h]);
+    list_add_tail(&mr->link, &s->records);
+    s->record_count++;
+    if (s->record_count >= s->record_count_threshold) {
+        map_hash_resize(ctx, s);
+    }
+    return mr;
+}
+
+/* Remove the weak reference from the object weak
+   reference list. we don't use a doubly linked list to
+   save space, assuming a given object has few weak
+       references to it */
+static void delete_weak_ref(JSRuntime *rt, JSMapRecord *mr)
+{
+    JSMapRecord **pmr, *mr1;
+    JSObject *p;
+
+    p = JS_VALUE_GET_OBJ(mr->key);
+    pmr = &p->first_weak_ref;
+    for(;;) {
+        mr1 = *pmr;
+        assert(mr1 != NULL);
+        if (mr1 == mr)
+            break;
+        pmr = &mr1->next_weak_ref;
+    }
+    *pmr = mr1->next_weak_ref;
+}
+
+static void map_delete_record(JSRuntime *rt, JSMapState *s, JSMapRecord *mr)
+{
+    if (mr->empty)
+        return;
+    list_del(&mr->hash_link);
+    if (s->is_weak) {
+        delete_weak_ref(rt, mr);
+    } else {
+        JS_FreeValueRT(rt, mr->key);
+    }
+    JS_FreeValueRT(rt, mr->value);
+    if (--mr->ref_count == 0) {
+        list_del(&mr->link);
+        js_free_rt(rt, mr);
+    } else {
+        /* keep a zombie record for iterators */
+        mr->empty = TRUE;
+        mr->key = JS_UNDEFINED;
+        mr->value = JS_UNDEFINED;
+    }
+    s->record_count--;
+}
+
+static void map_decref_record(JSRuntime *rt, JSMapRecord *mr)
+{
+    if (--mr->ref_count == 0) {
+        /* the record can be safely removed */
+        assert(mr->empty);
+        list_del(&mr->link);
+        js_free_rt(rt, mr);
+    }
+}
+
+static void reset_weak_ref(JSRuntime *rt, JSObject *p)
+{
+    JSMapRecord *mr, *mr_next;
+    JSMapState *s;
+
+    /* first pass to remove the records from the WeakMap/WeakSet
+       lists */
+    for(mr = p->first_weak_ref; mr != NULL; mr = mr->next_weak_ref) {
+        s = mr->map;
+        assert(s->is_weak);
+        assert(!mr->empty); /* no iterator on WeakMap/WeakSet */
+        list_del(&mr->hash_link);
+        list_del(&mr->link);
+    }
+
+    /* second pass to free the values to avoid modifying the weak
+       reference list while traversing it. */
+    for(mr = p->first_weak_ref; mr != NULL; mr = mr_next) {
+        mr_next = mr->next_weak_ref;
+        JS_FreeValueRT(rt, mr->value);
+        js_free_rt(rt, mr);
+    }
+
+    p->first_weak_ref = NULL; /* fail safe */
+}
+
+static JSValue js_map_set(JSContext *ctx, JSValueConst this_val,
+                          int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSMapRecord *mr;
+    JSValueConst key, value;
+
+    if (!s)
+        return JS_EXCEPTION;
+    key = map_normalize_key(ctx, argv[0]);
+    if (s->is_weak && !JS_IsObject(key))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    if (magic & MAGIC_SET)
+        value = JS_UNDEFINED;
+    else
+        value = argv[1];
+    mr = map_find_record(ctx, s, key);
+    if (mr) {
+        JS_FreeValue(ctx, mr->value);
+    } else {
+        mr = map_add_record(ctx, s, key);
+        if (!mr)
+            return JS_EXCEPTION;
+    }
+    mr->value = JS_DupValue(ctx, value);
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue js_map_get(JSContext *ctx, JSValueConst this_val,
+                          int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSMapRecord *mr;
+    JSValueConst key;
+
+    if (!s)
+        return JS_EXCEPTION;
+    key = map_normalize_key(ctx, argv[0]);
+    mr = map_find_record(ctx, s, key);
+    if (!mr)
+        return JS_UNDEFINED;
+    else
+        return JS_DupValue(ctx, mr->value);
+}
+
+static JSValue js_map_has(JSContext *ctx, JSValueConst this_val,
+                          int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSMapRecord *mr;
+    JSValueConst key;
+
+    if (!s)
+        return JS_EXCEPTION;
+    key = map_normalize_key(ctx, argv[0]);
+    mr = map_find_record(ctx, s, key);
+    return JS_NewBool(ctx, mr != NULL);
+}
+
+static JSValue js_map_delete(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSMapRecord *mr;
+    JSValueConst key;
+
+    if (!s)
+        return JS_EXCEPTION;
+    key = map_normalize_key(ctx, argv[0]);
+    mr = map_find_record(ctx, s, key);
+    if (!mr)
+        return JS_FALSE;
+    map_delete_record(ctx->rt, s, mr);
+    return JS_TRUE;
+}
+
+static JSValue js_map_clear(JSContext *ctx, JSValueConst this_val,
+                            int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    struct list_head *el, *el1;
+    JSMapRecord *mr;
+
+    if (!s)
+        return JS_EXCEPTION;
+    list_for_each_safe(el, el1, &s->records) {
+        mr = list_entry(el, JSMapRecord, link);
+        map_delete_record(ctx->rt, s, mr);
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_map_get_size(JSContext *ctx, JSValueConst this_val, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    if (!s)
+        return JS_EXCEPTION;
+    return JS_NewUint32(ctx, s->record_count);
+}
+
+static JSValue js_map_forEach(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSValueConst func, this_arg;
+    JSValue ret, args[3];
+    struct list_head *el;
+    JSMapRecord *mr;
+
+    if (!s)
+        return JS_EXCEPTION;
+    func = argv[0];
+    if (argc > 1)
+        this_arg = argv[1];
+    else
+        this_arg = JS_UNDEFINED;
+    if (check_function(ctx, func))
+        return JS_EXCEPTION;
+    /* Note: the list can be modified while traversing it, but the
+       current element is locked */
+    el = s->records.next;
+    while (el != &s->records) {
+        mr = list_entry(el, JSMapRecord, link);
+        if (!mr->empty) {
+            mr->ref_count++;
+            /* must duplicate in case the record is deleted */
+            args[1] = JS_DupValue(ctx, mr->key);
+            if (magic)
+                args[0] = args[1];
+            else
+                args[0] = JS_DupValue(ctx, mr->value);
+            args[2] = this_val;
+            ret = JS_Call(ctx, func, this_arg, 3, (JSValueConst *)args);
+            JS_FreeValue(ctx, args[0]);
+            if (!magic)
+                JS_FreeValue(ctx, args[1]);
+            el = el->next;
+            map_decref_record(ctx->rt, mr);
+            if (JS_IsException(ret))
+                return ret;
+            JS_FreeValue(ctx, ret);
+        } else {
+            el = el->next;
+        }
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_object_groupBy(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int is_map)
+{
+    JSValueConst cb, args[2];
+    JSValue res, iter, next, groups, key, v, prop;
+    JSAtom key_atom = JS_ATOM_NULL;
+    int64_t idx;
+    BOOL done;
+
+    // "is function?" check must be observed before argv[0] is accessed
+    cb = argv[1];
+    if (check_function(ctx, cb))
+        return JS_EXCEPTION;
+
+    iter = JS_GetIterator(ctx, argv[0], /*is_async*/FALSE);
+    if (JS_IsException(iter))
+        return JS_EXCEPTION;
+
+    key = JS_UNDEFINED;
+    key_atom = JS_ATOM_NULL;
+    v = JS_UNDEFINED;
+    prop = JS_UNDEFINED;
+    groups = JS_UNDEFINED;
+
+    next = JS_GetProperty(ctx, iter, JS_ATOM_next);
+    if (JS_IsException(next))
+        goto exception;
+
+    if (is_map) {
+        groups = js_map_constructor(ctx, JS_UNDEFINED, 0, NULL, 0);
+    } else {
+        groups = JS_NewObjectProto(ctx, JS_NULL);
+    }
+    if (JS_IsException(groups))
+        goto exception;
+
+    for (idx = 0; ; idx++) {
+        if (idx >= MAX_SAFE_INTEGER) {
+            JS_ThrowTypeError(ctx, "too many elements");
+            goto iterator_close_exception;
+        }
+        v = JS_IteratorNext(ctx, iter, next, 0, NULL, &done);
+        if (JS_IsException(v))
+            goto exception;
+        if (done)
+            break; // v is JS_UNDEFINED
+
+        args[0] = v;
+        args[1] = JS_NewInt64(ctx, idx);
+        key = JS_Call(ctx, cb, ctx->global_obj, 2, args);
+        if (JS_IsException(key))
+            goto iterator_close_exception;
+
+        if (is_map) {
+            prop = js_map_get(ctx, groups, 1, (JSValueConst *)&key, 0);
+        } else {
+            key_atom = JS_ValueToAtom(ctx, key);
+            JS_FreeValue(ctx, key);
+            key = JS_UNDEFINED;
+            if (key_atom == JS_ATOM_NULL)
+                goto iterator_close_exception;
+            prop = JS_GetProperty(ctx, groups, key_atom);
+        }
+        if (JS_IsException(prop))
+            goto exception;
+
+        if (JS_IsUndefined(prop)) {
+            prop = JS_NewArray(ctx);
+            if (JS_IsException(prop))
+                goto exception;
+            if (is_map) {
+                args[0] = key;
+                args[1] = prop;
+                res = js_map_set(ctx, groups, 2, args, 0);
+                if (JS_IsException(res))
+                    goto exception;
+                JS_FreeValue(ctx, res);
+            } else {
+                prop = JS_DupValue(ctx, prop);
+                if (JS_DefinePropertyValue(ctx, groups, key_atom, prop,
+                                           JS_PROP_C_W_E) < 0) {
+                    goto exception;
+                }
+            }
+        }
+        res = js_array_push(ctx, prop, 1, (JSValueConst *)&v, /*unshift*/0);
+        if (JS_IsException(res))
+            goto exception;
+        // res is an int64
+
+        JS_FreeValue(ctx, prop);
+        JS_FreeValue(ctx, key);
+        JS_FreeAtom(ctx, key_atom);
+        JS_FreeValue(ctx, v);
+        prop = JS_UNDEFINED;
+        key = JS_UNDEFINED;
+        key_atom = JS_ATOM_NULL;
+        v = JS_UNDEFINED;
+    }
+
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, next);
+    return groups;
+
+ iterator_close_exception:
+    JS_IteratorClose(ctx, iter, TRUE);
+ exception:
+    JS_FreeAtom(ctx, key_atom);
+    JS_FreeValue(ctx, prop);
+    JS_FreeValue(ctx, key);
+    JS_FreeValue(ctx, v);
+    JS_FreeValue(ctx, groups);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, next);
+    return JS_EXCEPTION;
+}
+
+static void js_map_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p;
+    JSMapState *s;
+    struct list_head *el, *el1;
+    JSMapRecord *mr;
+
+    p = JS_VALUE_GET_OBJ(val);
+    s = p->u.map_state;
+    if (s) {
+        /* if the object is deleted we are sure that no iterator is
+           using it */
+        list_for_each_safe(el, el1, &s->records) {
+            mr = list_entry(el, JSMapRecord, link);
+            if (!mr->empty) {
+                if (s->is_weak)
+                    delete_weak_ref(rt, mr);
+                else
+                    JS_FreeValueRT(rt, mr->key);
+                JS_FreeValueRT(rt, mr->value);
+            }
+            js_free_rt(rt, mr);
+        }
+        js_free_rt(rt, s->hash_table);
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_map_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSMapState *s;
+    struct list_head *el;
+    JSMapRecord *mr;
+
+    s = p->u.map_state;
+    if (s) {
+        list_for_each(el, &s->records) {
+            mr = list_entry(el, JSMapRecord, link);
+            if (!s->is_weak)
+                JS_MarkValue(rt, mr->key, mark_func);
+            JS_MarkValue(rt, mr->value, mark_func);
+        }
+    }
+}
+
+/* Map Iterator */
+
+typedef struct JSMapIteratorData {
+    JSValue obj;
+    JSIteratorKindEnum kind;
+    JSMapRecord *cur_record;
+} JSMapIteratorData;
+
+static void js_map_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p;
+    JSMapIteratorData *it;
+
+    p = JS_VALUE_GET_OBJ(val);
+    it = p->u.map_iterator_data;
+    if (it) {
+        /* During the GC sweep phase the Map finalizer may be
+           called before the Map iterator finalizer */
+        if (JS_IsLiveObject(rt, it->obj) && it->cur_record) {
+            map_decref_record(rt, it->cur_record);
+        }
+        JS_FreeValueRT(rt, it->obj);
+        js_free_rt(rt, it);
+    }
+}
+
+static void js_map_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                 JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSMapIteratorData *it;
+    it = p->u.map_iterator_data;
+    if (it) {
+        /* the record is already marked by the object */
+        JS_MarkValue(rt, it->obj, mark_func);
+    }
+}
+
+static JSValue js_create_map_iterator(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv, int magic)
+{
+    JSIteratorKindEnum kind;
+    JSMapState *s;
+    JSMapIteratorData *it;
+    JSValue enum_obj;
+
+    kind = magic >> 2;
+    magic &= 3;
+    s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    if (!s)
+        return JS_EXCEPTION;
+    enum_obj = JS_NewObjectClass(ctx, JS_CLASS_MAP_ITERATOR + magic);
+    if (JS_IsException(enum_obj))
+        goto fail;
+    it = js_malloc(ctx, sizeof(*it));
+    if (!it) {
+        JS_FreeValue(ctx, enum_obj);
+        goto fail;
+    }
+    it->obj = JS_DupValue(ctx, this_val);
+    it->kind = kind;
+    it->cur_record = NULL;
+    JS_SetOpaque(enum_obj, it);
+    return enum_obj;
+ fail:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_map_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv,
+                                    BOOL *pdone, int magic)
+{
+    JSMapIteratorData *it;
+    JSMapState *s;
+    JSMapRecord *mr;
+    struct list_head *el;
+
+    it = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP_ITERATOR + magic);
+    if (!it) {
+        *pdone = FALSE;
+        return JS_EXCEPTION;
+    }
+    if (JS_IsUndefined(it->obj))
+        goto done;
+    s = JS_GetOpaque(it->obj, JS_CLASS_MAP + magic);
+    assert(s != NULL);
+    if (!it->cur_record) {
+        el = s->records.next;
+    } else {
+        mr = it->cur_record;
+        el = mr->link.next;
+        map_decref_record(ctx->rt, mr); /* the record can be freed here */
+    }
+    for(;;) {
+        if (el == &s->records) {
+            /* no more record  */
+            it->cur_record = NULL;
+            JS_FreeValue(ctx, it->obj);
+            it->obj = JS_UNDEFINED;
+        done:
+            /* end of enumeration */
+            *pdone = TRUE;
+            return JS_UNDEFINED;
+        }
+        mr = list_entry(el, JSMapRecord, link);
+        if (!mr->empty)
+            break;
+        /* get the next record */
+        el = mr->link.next;
+    }
+
+    /* lock the record so that it won't be freed */
+    mr->ref_count++;
+    it->cur_record = mr;
+    *pdone = FALSE;
+
+    if (it->kind == JS_ITERATOR_KIND_KEY) {
+        return JS_DupValue(ctx, mr->key);
+    } else {
+        JSValueConst args[2];
+        args[0] = mr->key;
+        if (magic)
+            args[1] = mr->key;
+        else
+            args[1] = mr->value;
+        if (it->kind == JS_ITERATOR_KIND_VALUE) {
+            return JS_DupValue(ctx, args[1]);
+        } else {
+            return js_create_array(ctx, 2, args);
+        }
+    }
+}
+
+static const JSCFunctionListEntry js_map_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("groupBy", 2, js_object_groupBy, 1 ),
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+};
+
+static const JSCFunctionListEntry js_map_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("set", 2, js_map_set, 0 ),
+    JS_CFUNC_MAGIC_DEF("get", 1, js_map_get, 0 ),
+    JS_CFUNC_MAGIC_DEF("has", 1, js_map_has, 0 ),
+    JS_CFUNC_MAGIC_DEF("delete", 1, js_map_delete, 0 ),
+    JS_CFUNC_MAGIC_DEF("clear", 0, js_map_clear, 0 ),
+    JS_CGETSET_MAGIC_DEF("size", js_map_get_size, NULL, 0),
+    JS_CFUNC_MAGIC_DEF("forEach", 1, js_map_forEach, 0 ),
+    JS_CFUNC_MAGIC_DEF("values", 0, js_create_map_iterator, (JS_ITERATOR_KIND_VALUE << 2) | 0 ),
+    JS_CFUNC_MAGIC_DEF("keys", 0, js_create_map_iterator, (JS_ITERATOR_KIND_KEY << 2) | 0 ),
+    JS_CFUNC_MAGIC_DEF("entries", 0, js_create_map_iterator, (JS_ITERATOR_KIND_KEY_AND_VALUE << 2) | 0 ),
+    JS_ALIAS_DEF("[Symbol.iterator]", "entries" ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Map", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_map_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_map_iterator_next, 0 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Map Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_set_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("add", 1, js_map_set, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("has", 1, js_map_has, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("delete", 1, js_map_delete, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("clear", 0, js_map_clear, MAGIC_SET ),
+    JS_CGETSET_MAGIC_DEF("size", js_map_get_size, NULL, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("forEach", 1, js_map_forEach, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("values", 0, js_create_map_iterator, (JS_ITERATOR_KIND_KEY << 2) | MAGIC_SET ),
+    JS_ALIAS_DEF("keys", "values" ),
+    JS_ALIAS_DEF("[Symbol.iterator]", "values" ),
+    JS_CFUNC_MAGIC_DEF("entries", 0, js_create_map_iterator, (JS_ITERATOR_KIND_KEY_AND_VALUE << 2) | MAGIC_SET ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Set", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_set_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_map_iterator_next, MAGIC_SET ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Set Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_weak_map_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("set", 2, js_map_set, MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("get", 1, js_map_get, MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("has", 1, js_map_has, MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("delete", 1, js_map_delete, MAGIC_WEAK ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "WeakMap", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_weak_set_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("add", 1, js_map_set, MAGIC_SET | MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("has", 1, js_map_has, MAGIC_SET | MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("delete", 1, js_map_delete, MAGIC_SET | MAGIC_WEAK ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "WeakSet", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry * const js_map_proto_funcs_ptr[6] = {
+    js_map_proto_funcs,
+    js_set_proto_funcs,
+    js_weak_map_proto_funcs,
+    js_weak_set_proto_funcs,
+    js_map_iterator_proto_funcs,
+    js_set_iterator_proto_funcs,
+};
+
+static const uint8_t js_map_proto_funcs_count[6] = {
+    countof(js_map_proto_funcs),
+    countof(js_set_proto_funcs),
+    countof(js_weak_map_proto_funcs),
+    countof(js_weak_set_proto_funcs),
+    countof(js_map_iterator_proto_funcs),
+    countof(js_set_iterator_proto_funcs),
+};
+
+void JS_AddIntrinsicMapSet(JSContext *ctx)
+{
+    int i;
+    JSValue obj1;
+    char buf[ATOM_GET_STR_BUF_SIZE];
+
+    for(i = 0; i < 4; i++) {
+        const char *name = JS_AtomGetStr(ctx, buf, sizeof(buf),
+                                         JS_ATOM_Map + i);
+        ctx->class_proto[JS_CLASS_MAP + i] = JS_NewObject(ctx);
+        JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_MAP + i],
+                                   js_map_proto_funcs_ptr[i],
+                                   js_map_proto_funcs_count[i]);
+        obj1 = JS_NewCFunctionMagic(ctx, js_map_constructor, name, 0,
+                                    JS_CFUNC_constructor_magic, i);
+        if (i < 2) {
+            JS_SetPropertyFunctionList(ctx, obj1, js_map_funcs,
+                                       countof(js_map_funcs));
+        }
+        JS_NewGlobalCConstructor2(ctx, obj1, name, ctx->class_proto[JS_CLASS_MAP + i]);
+    }
+
+    for(i = 0; i < 2; i++) {
+        ctx->class_proto[JS_CLASS_MAP_ITERATOR + i] =
+            JS_NewObjectProto(ctx, ctx->iterator_proto);
+        JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_MAP_ITERATOR + i],
+                                   js_map_proto_funcs_ptr[i + 4],
+                                   js_map_proto_funcs_count[i + 4]);
+    }
+}
+
+/* Generator */
+static const JSCFunctionListEntry js_generator_function_proto_funcs[] = {
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "GeneratorFunction", JS_PROP_CONFIGURABLE),
+};
+
+static const JSCFunctionListEntry js_generator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 1, js_generator_next, GEN_MAGIC_NEXT ),
+    JS_ITERATOR_NEXT_DEF("return", 1, js_generator_next, GEN_MAGIC_RETURN ),
+    JS_ITERATOR_NEXT_DEF("throw", 1, js_generator_next, GEN_MAGIC_THROW ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Generator", JS_PROP_CONFIGURABLE),
+};
+
+/* Promise */
+
+typedef struct JSPromiseData {
+    JSPromiseStateEnum promise_state;
+    /* 0=fulfill, 1=reject, list of JSPromiseReactionData.link */
+    struct list_head promise_reactions[2];
+    BOOL is_handled; /* Note: only useful to debug */
+    JSValue promise_result;
+} JSPromiseData;
+
+typedef struct JSPromiseFunctionDataResolved {
+    int ref_count;
+    BOOL already_resolved;
+} JSPromiseFunctionDataResolved;
+
+typedef struct JSPromiseFunctionData {
+    JSValue promise;
+    JSPromiseFunctionDataResolved *presolved;
+} JSPromiseFunctionData;
+
+typedef struct JSPromiseReactionData {
+    struct list_head link; /* not used in promise_reaction_job */
+    JSValue resolving_funcs[2];
+    JSValue handler;
+} JSPromiseReactionData;
+
+JSPromiseStateEnum JS_PromiseState(JSContext *ctx, JSValue promise)
+{
+    JSPromiseData *s = JS_GetOpaque(promise, JS_CLASS_PROMISE);
+    if (!s)
+        return -1;
+    return s->promise_state;
+}
+
+JSValue JS_PromiseResult(JSContext *ctx, JSValue promise)
+{
+    JSPromiseData *s = JS_GetOpaque(promise, JS_CLASS_PROMISE);
+    if (!s)
+        return JS_UNDEFINED;
+    return JS_DupValue(ctx, s->promise_result);
+}
+
+static int js_create_resolving_functions(JSContext *ctx, JSValue *args,
+                                         JSValueConst promise);
+
+static void promise_reaction_data_free(JSRuntime *rt,
+                                       JSPromiseReactionData *rd)
+{
+    JS_FreeValueRT(rt, rd->resolving_funcs[0]);
+    JS_FreeValueRT(rt, rd->resolving_funcs[1]);
+    JS_FreeValueRT(rt, rd->handler);
+    js_free_rt(rt, rd);
+}
+
+static JSValue promise_reaction_job(JSContext *ctx, int argc,
+                                    JSValueConst *argv)
+{
+    JSValueConst handler, arg, func;
+    JSValue res, res2;
+    BOOL is_reject;
+
+    assert(argc == 5);
+    handler = argv[2];
+    is_reject = JS_ToBool(ctx, argv[3]);
+    arg = argv[4];
+#ifdef DUMP_PROMISE
+    printf("promise_reaction_job: is_reject=%d\n", is_reject);
+#endif
+
+    if (JS_IsUndefined(handler)) {
+        if (is_reject) {
+            res = JS_Throw(ctx, JS_DupValue(ctx, arg));
+        } else {
+            res = JS_DupValue(ctx, arg);
+        }
+    } else {
+        res = JS_Call(ctx, handler, JS_UNDEFINED, 1, &arg);
+    }
+    is_reject = JS_IsException(res);
+    if (is_reject)
+        res = JS_GetException(ctx);
+    func = argv[is_reject];
+    /* as an extension, we support undefined as value to avoid
+       creating a dummy promise in the 'await' implementation of async
+       functions */
+    if (!JS_IsUndefined(func)) {
+        res2 = JS_Call(ctx, func, JS_UNDEFINED,
+                       1, (JSValueConst *)&res);
+    } else {
+        res2 = JS_UNDEFINED;
+    }
+    JS_FreeValue(ctx, res);
+
+    return res2;
+}
+
+void JS_SetHostPromiseRejectionTracker(JSRuntime *rt,
+                                       JSHostPromiseRejectionTracker *cb,
+                                       void *opaque)
+{
+    rt->host_promise_rejection_tracker = cb;
+    rt->host_promise_rejection_tracker_opaque = opaque;
+}
+
+static void fulfill_or_reject_promise(JSContext *ctx, JSValueConst promise,
+                                      JSValueConst value, BOOL is_reject)
+{
+    JSPromiseData *s = JS_GetOpaque(promise, JS_CLASS_PROMISE);
+    struct list_head *el, *el1;
+    JSPromiseReactionData *rd;
+    JSValueConst args[5];
+
+    if (!s || s->promise_state != JS_PROMISE_PENDING)
+        return; /* should never happen */
+    set_value(ctx, &s->promise_result, JS_DupValue(ctx, value));
+    s->promise_state = JS_PROMISE_FULFILLED + is_reject;
+#ifdef DUMP_PROMISE
+    printf("fulfill_or_reject_promise: is_reject=%d\n", is_reject);
+#endif
+    if (s->promise_state == JS_PROMISE_REJECTED && !s->is_handled) {
+        JSRuntime *rt = ctx->rt;
+        if (rt->host_promise_rejection_tracker) {
+            rt->host_promise_rejection_tracker(ctx, promise, value, FALSE,
+                                               rt->host_promise_rejection_tracker_opaque);
+        }
+    }
+
+    list_for_each_safe(el, el1, &s->promise_reactions[is_reject]) {
+        rd = list_entry(el, JSPromiseReactionData, link);
+        args[0] = rd->resolving_funcs[0];
+        args[1] = rd->resolving_funcs[1];
+        args[2] = rd->handler;
+        args[3] = JS_NewBool(ctx, is_reject);
+        args[4] = value;
+        JS_EnqueueJob(ctx, promise_reaction_job, 5, args);
+        list_del(&rd->link);
+        promise_reaction_data_free(ctx->rt, rd);
+    }
+
+    list_for_each_safe(el, el1, &s->promise_reactions[1 - is_reject]) {
+        rd = list_entry(el, JSPromiseReactionData, link);
+        list_del(&rd->link);
+        promise_reaction_data_free(ctx->rt, rd);
+    }
+}
+
+static void reject_promise(JSContext *ctx, JSValueConst promise,
+                           JSValueConst value)
+{
+    fulfill_or_reject_promise(ctx, promise, value, TRUE);
+}
+
+static JSValue js_promise_resolve_thenable_job(JSContext *ctx,
+                                               int argc, JSValueConst *argv)
+{
+    JSValueConst promise, thenable, then;
+    JSValue args[2], res;
+
+#ifdef DUMP_PROMISE
+    printf("js_promise_resolve_thenable_job\n");
+#endif
+    assert(argc == 3);
+    promise = argv[0];
+    thenable = argv[1];
+    then = argv[2];
+    if (js_create_resolving_functions(ctx, args, promise) < 0)
+        return JS_EXCEPTION;
+    res = JS_Call(ctx, then, thenable, 2, (JSValueConst *)args);
+    if (JS_IsException(res)) {
+        JSValue error = JS_GetException(ctx);
+        res = JS_Call(ctx, args[1], JS_UNDEFINED, 1, (JSValueConst *)&error);
+        JS_FreeValue(ctx, error);
+    }
+    JS_FreeValue(ctx, args[0]);
+    JS_FreeValue(ctx, args[1]);
+    return res;
+}
+
+static void js_promise_resolve_function_free_resolved(JSRuntime *rt,
+                                                      JSPromiseFunctionDataResolved *sr)
+{
+    if (--sr->ref_count == 0) {
+        js_free_rt(rt, sr);
+    }
+}
+
+static int js_create_resolving_functions(JSContext *ctx,
+                                         JSValue *resolving_funcs,
+                                         JSValueConst promise)
+
+{
+    JSValue obj;
+    JSPromiseFunctionData *s;
+    JSPromiseFunctionDataResolved *sr;
+    int i, ret;
+
+    sr = js_malloc(ctx, sizeof(*sr));
+    if (!sr)
+        return -1;
+    sr->ref_count = 1;
+    sr->already_resolved = FALSE; /* must be shared between the two functions */
+    ret = 0;
+    for(i = 0; i < 2; i++) {
+        obj = JS_NewObjectProtoClass(ctx, ctx->function_proto,
+                                     JS_CLASS_PROMISE_RESOLVE_FUNCTION + i);
+        if (JS_IsException(obj))
+            goto fail;
+        s = js_malloc(ctx, sizeof(*s));
+        if (!s) {
+            JS_FreeValue(ctx, obj);
+        fail:
+
+            if (i != 0)
+                JS_FreeValue(ctx, resolving_funcs[0]);
+            ret = -1;
+            break;
+        }
+        sr->ref_count++;
+        s->presolved = sr;
+        s->promise = JS_DupValue(ctx, promise);
+        JS_SetOpaque(obj, s);
+        js_function_set_properties(ctx, obj, JS_ATOM_empty_string, 1);
+        resolving_funcs[i] = obj;
+    }
+    js_promise_resolve_function_free_resolved(ctx->rt, sr);
+    return ret;
+}
+
+static void js_promise_resolve_function_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSPromiseFunctionData *s = JS_VALUE_GET_OBJ(val)->u.promise_function_data;
+    if (s) {
+        js_promise_resolve_function_free_resolved(rt, s->presolved);
+        JS_FreeValueRT(rt, s->promise);
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_promise_resolve_function_mark(JSRuntime *rt, JSValueConst val,
+                                             JS_MarkFunc *mark_func)
+{
+    JSPromiseFunctionData *s = JS_VALUE_GET_OBJ(val)->u.promise_function_data;
+    if (s) {
+        JS_MarkValue(rt, s->promise, mark_func);
+    }
+}
+
+static JSValue js_promise_resolve_function_call(JSContext *ctx,
+                                                JSValueConst func_obj,
+                                                JSValueConst this_val,
+                                                int argc, JSValueConst *argv,
+                                                int flags)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(func_obj);
+    JSPromiseFunctionData *s;
+    JSValueConst resolution, args[3];
+    JSValue then;
+    BOOL is_reject;
+
+    s = p->u.promise_function_data;
+    if (!s || s->presolved->already_resolved)
+        return JS_UNDEFINED;
+    s->presolved->already_resolved = TRUE;
+    is_reject = p->class_id - JS_CLASS_PROMISE_RESOLVE_FUNCTION;
+    if (argc > 0)
+        resolution = argv[0];
+    else
+        resolution = JS_UNDEFINED;
+#ifdef DUMP_PROMISE
+    printf("js_promise_resolving_function_call: is_reject=%d resolution=", is_reject);
+    JS_DumpValue(ctx, resolution);
+    printf("\n");
+#endif
+    if (is_reject || !JS_IsObject(resolution)) {
+        goto done;
+    } else if (js_same_value(ctx, resolution, s->promise)) {
+        JS_ThrowTypeError(ctx, "promise self resolution");
+        goto fail_reject;
+    }
+    then = JS_GetProperty(ctx, resolution, JS_ATOM_then);
+    if (JS_IsException(then)) {
+        JSValue error;
+    fail_reject:
+        error = JS_GetException(ctx);
+        reject_promise(ctx, s->promise, error);
+        JS_FreeValue(ctx, error);
+    } else if (!JS_IsFunction(ctx, then)) {
+        JS_FreeValue(ctx, then);
+    done:
+        fulfill_or_reject_promise(ctx, s->promise, resolution, is_reject);
+    } else {
+        args[0] = s->promise;
+        args[1] = resolution;
+        args[2] = then;
+        JS_EnqueueJob(ctx, js_promise_resolve_thenable_job, 3, args);
+        JS_FreeValue(ctx, then);
+    }
+    return JS_UNDEFINED;
+}
+
+static void js_promise_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSPromiseData *s = JS_GetOpaque(val, JS_CLASS_PROMISE);
+    struct list_head *el, *el1;
+    int i;
+
+    if (!s)
+        return;
+    for(i = 0; i < 2; i++) {
+        list_for_each_safe(el, el1, &s->promise_reactions[i]) {
+            JSPromiseReactionData *rd =
+                list_entry(el, JSPromiseReactionData, link);
+            promise_reaction_data_free(rt, rd);
+        }
+    }
+    JS_FreeValueRT(rt, s->promise_result);
+    js_free_rt(rt, s);
+}
+
+static void js_promise_mark(JSRuntime *rt, JSValueConst val,
+                            JS_MarkFunc *mark_func)
+{
+    JSPromiseData *s = JS_GetOpaque(val, JS_CLASS_PROMISE);
+    struct list_head *el;
+    int i;
+
+    if (!s)
+        return;
+    for(i = 0; i < 2; i++) {
+        list_for_each(el, &s->promise_reactions[i]) {
+            JSPromiseReactionData *rd =
+                list_entry(el, JSPromiseReactionData, link);
+            JS_MarkValue(rt, rd->resolving_funcs[0], mark_func);
+            JS_MarkValue(rt, rd->resolving_funcs[1], mark_func);
+            JS_MarkValue(rt, rd->handler, mark_func);
+        }
+    }
+    JS_MarkValue(rt, s->promise_result, mark_func);
+}
+
+static JSValue js_promise_constructor(JSContext *ctx, JSValueConst new_target,
+                                      int argc, JSValueConst *argv)
+{
+    JSValueConst executor;
+    JSValue obj;
+    JSPromiseData *s;
+    JSValue args[2], ret;
+    int i;
+
+    executor = argv[0];
+    if (check_function(ctx, executor))
+        return JS_EXCEPTION;
+    obj = js_create_from_ctor(ctx, new_target, JS_CLASS_PROMISE);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        goto fail;
+    s->promise_state = JS_PROMISE_PENDING;
+    s->is_handled = FALSE;
+    for(i = 0; i < 2; i++)
+        init_list_head(&s->promise_reactions[i]);
+    s->promise_result = JS_UNDEFINED;
+    JS_SetOpaque(obj, s);
+    if (js_create_resolving_functions(ctx, args, obj))
+        goto fail;
+    ret = JS_Call(ctx, executor, JS_UNDEFINED, 2, (JSValueConst *)args);
+    if (JS_IsException(ret)) {
+        JSValue ret2, error;
+        error = JS_GetException(ctx);
+        ret2 = JS_Call(ctx, args[1], JS_UNDEFINED, 1, (JSValueConst *)&error);
+        JS_FreeValue(ctx, error);
+        if (JS_IsException(ret2))
+            goto fail1;
+        JS_FreeValue(ctx, ret2);
+    }
+    JS_FreeValue(ctx, ret);
+    JS_FreeValue(ctx, args[0]);
+    JS_FreeValue(ctx, args[1]);
+    return obj;
+ fail1:
+    JS_FreeValue(ctx, args[0]);
+    JS_FreeValue(ctx, args[1]);
+ fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_promise_executor(JSContext *ctx,
+                                   JSValueConst this_val,
+                                   int argc, JSValueConst *argv,
+                                   int magic, JSValue *func_data)
+{
+    int i;
+
+    for(i = 0; i < 2; i++) {
+        if (!JS_IsUndefined(func_data[i]))
+            return JS_ThrowTypeError(ctx, "resolving function already set");
+        func_data[i] = JS_DupValue(ctx, argv[i]);
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_promise_executor_new(JSContext *ctx)
+{
+    JSValueConst func_data[2];
+
+    func_data[0] = JS_UNDEFINED;
+    func_data[1] = JS_UNDEFINED;
+    return JS_NewCFunctionData(ctx, js_promise_executor, 2,
+                               0, 2, func_data);
+}
+
+static JSValue js_new_promise_capability(JSContext *ctx,
+                                         JSValue *resolving_funcs,
+                                         JSValueConst ctor)
+{
+    JSValue executor, result_promise;
+    JSCFunctionDataRecord *s;
+    int i;
+
+    executor = js_promise_executor_new(ctx);
+    if (JS_IsException(executor))
+        return executor;
+
+    if (JS_IsUndefined(ctor)) {
+        result_promise = js_promise_constructor(ctx, ctor, 1,
+                                                (JSValueConst *)&executor);
+    } else {
+        result_promise = JS_CallConstructor(ctx, ctor, 1,
+                                            (JSValueConst *)&executor);
+    }
+    if (JS_IsException(result_promise))
+        goto fail;
+    s = JS_GetOpaque(executor, JS_CLASS_C_FUNCTION_DATA);
+    for(i = 0; i < 2; i++) {
+        if (check_function(ctx, s->data[i]))
+            goto fail;
+    }
+    for(i = 0; i < 2; i++)
+        resolving_funcs[i] = JS_DupValue(ctx, s->data[i]);
+    JS_FreeValue(ctx, executor);
+    return result_promise;
+ fail:
+    JS_FreeValue(ctx, executor);
+    JS_FreeValue(ctx, result_promise);
+    return JS_EXCEPTION;
+}
+
+JSValue JS_NewPromiseCapability(JSContext *ctx, JSValue *resolving_funcs)
+{
+    return js_new_promise_capability(ctx, resolving_funcs, JS_UNDEFINED);
+}
+
+static JSValue js_promise_resolve(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int magic)
+{
+    JSValue result_promise, resolving_funcs[2], ret;
+    BOOL is_reject = magic;
+
+    if (!JS_IsObject(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    if (!is_reject && JS_GetOpaque(argv[0], JS_CLASS_PROMISE)) {
+        JSValue ctor;
+        BOOL is_same;
+        ctor = JS_GetProperty(ctx, argv[0], JS_ATOM_constructor);
+        if (JS_IsException(ctor))
+            return ctor;
+        is_same = js_same_value(ctx, ctor, this_val);
+        JS_FreeValue(ctx, ctor);
+        if (is_same)
+            return JS_DupValue(ctx, argv[0]);
+    }
+    result_promise = js_new_promise_capability(ctx, resolving_funcs, this_val);
+    if (JS_IsException(result_promise))
+        return result_promise;
+    ret = JS_Call(ctx, resolving_funcs[is_reject], JS_UNDEFINED, 1, argv);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    if (JS_IsException(ret)) {
+        JS_FreeValue(ctx, result_promise);
+        return ret;
+    }
+    JS_FreeValue(ctx, ret);
+    return result_promise;
+}
+
+static JSValue js_promise_withResolvers(JSContext *ctx,
+                                        JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    JSValue result_promise, resolving_funcs[2], obj;
+    if (!JS_IsObject(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    result_promise = js_new_promise_capability(ctx, resolving_funcs, this_val);
+    if (JS_IsException(result_promise))
+        return result_promise;
+    obj = JS_NewObject(ctx);
+    if (JS_IsException(obj)) {
+        JS_FreeValue(ctx, resolving_funcs[0]);
+        JS_FreeValue(ctx, resolving_funcs[1]);
+        JS_FreeValue(ctx, result_promise);
+        return JS_EXCEPTION;
+    }
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_promise, result_promise, JS_PROP_C_W_E);
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_resolve, resolving_funcs[0], JS_PROP_C_W_E);
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_reject, resolving_funcs[1], JS_PROP_C_W_E);
+    return obj;
+}
+
+static __exception int remainingElementsCount_add(JSContext *ctx,
+                                                  JSValueConst resolve_element_env,
+                                                  int addend)
+{
+    JSValue val;
+    int remainingElementsCount;
+
+    val = JS_GetPropertyUint32(ctx, resolve_element_env, 0);
+    if (JS_IsException(val))
+        return -1;
+    if (JS_ToInt32Free(ctx, &remainingElementsCount, val))
+        return -1;
+    remainingElementsCount += addend;
+    if (JS_SetPropertyUint32(ctx, resolve_element_env, 0,
+                             JS_NewInt32(ctx, remainingElementsCount)) < 0)
+        return -1;
+    return (remainingElementsCount == 0);
+}
+
+#define PROMISE_MAGIC_all        0
+#define PROMISE_MAGIC_allSettled 1
+#define PROMISE_MAGIC_any        2
+
+static JSValue js_promise_all_resolve_element(JSContext *ctx,
+                                              JSValueConst this_val,
+                                              int argc, JSValueConst *argv,
+                                              int magic,
+                                              JSValue *func_data)
+{
+    int resolve_type = magic & 3;
+    int is_reject = magic & 4;
+    BOOL alreadyCalled = JS_ToBool(ctx, func_data[0]);
+    JSValueConst values = func_data[2];
+    JSValueConst resolve = func_data[3];
+    JSValueConst resolve_element_env = func_data[4];
+    JSValue ret, obj;
+    int is_zero, index;
+
+    if (JS_ToInt32(ctx, &index, func_data[1]))
+        return JS_EXCEPTION;
+    if (alreadyCalled)
+        return JS_UNDEFINED;
+    func_data[0] = JS_NewBool(ctx, TRUE);
+
+    if (resolve_type == PROMISE_MAGIC_allSettled) {
+        JSValue str;
+
+        obj = JS_NewObject(ctx);
+        if (JS_IsException(obj))
+            return JS_EXCEPTION;
+        str = JS_NewString(ctx, is_reject ? "rejected" : "fulfilled");
+        if (JS_IsException(str))
+            goto fail1;
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_status,
+                                   str,
+                                   JS_PROP_C_W_E) < 0)
+            goto fail1;
+        if (JS_DefinePropertyValue(ctx, obj,
+                                   is_reject ? JS_ATOM_reason : JS_ATOM_value,
+                                   JS_DupValue(ctx, argv[0]),
+                                   JS_PROP_C_W_E) < 0) {
+        fail1:
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+    } else {
+        obj = JS_DupValue(ctx, argv[0]);
+    }
+    if (JS_DefinePropertyValueUint32(ctx, values, index,
+                                     obj, JS_PROP_C_W_E) < 0)
+        return JS_EXCEPTION;
+
+    is_zero = remainingElementsCount_add(ctx, resolve_element_env, -1);
+    if (is_zero < 0)
+        return JS_EXCEPTION;
+    if (is_zero) {
+        if (resolve_type == PROMISE_MAGIC_any) {
+            JSValue error;
+            error = js_aggregate_error_constructor(ctx, values);
+            if (JS_IsException(error))
+                return JS_EXCEPTION;
+            ret = JS_Call(ctx, resolve, JS_UNDEFINED, 1, (JSValueConst *)&error);
+            JS_FreeValue(ctx, error);
+        } else {
+            ret = JS_Call(ctx, resolve, JS_UNDEFINED, 1, (JSValueConst *)&values);
+        }
+        if (JS_IsException(ret))
+            return ret;
+        JS_FreeValue(ctx, ret);
+    }
+    return JS_UNDEFINED;
+}
+
+/* magic = 0: Promise.all 1: Promise.allSettled */
+static JSValue js_promise_all(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic)
+{
+    JSValue result_promise, resolving_funcs[2], item, next_promise, ret;
+    JSValue next_method = JS_UNDEFINED, values = JS_UNDEFINED;
+    JSValue resolve_element_env = JS_UNDEFINED, resolve_element, reject_element;
+    JSValue promise_resolve = JS_UNDEFINED, iter = JS_UNDEFINED;
+    JSValueConst then_args[2], resolve_element_data[5];
+    BOOL done;
+    int index, is_zero, is_promise_any = (magic == PROMISE_MAGIC_any);
+
+    if (!JS_IsObject(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    result_promise = js_new_promise_capability(ctx, resolving_funcs, this_val);
+    if (JS_IsException(result_promise))
+        return result_promise;
+    promise_resolve = JS_GetProperty(ctx, this_val, JS_ATOM_resolve);
+    if (JS_IsException(promise_resolve) ||
+        check_function(ctx, promise_resolve))
+        goto fail_reject;
+    iter = JS_GetIterator(ctx, argv[0], FALSE);
+    if (JS_IsException(iter)) {
+        JSValue error;
+    fail_reject:
+        error = JS_GetException(ctx);
+        ret = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED, 1,
+                      (JSValueConst *)&error);
+        JS_FreeValue(ctx, error);
+        if (JS_IsException(ret))
+            goto fail;
+        JS_FreeValue(ctx, ret);
+    } else {
+        next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+        if (JS_IsException(next_method))
+            goto fail_reject;
+        values = JS_NewArray(ctx);
+        if (JS_IsException(values))
+            goto fail_reject;
+        resolve_element_env = JS_NewArray(ctx);
+        if (JS_IsException(resolve_element_env))
+            goto fail_reject;
+        /* remainingElementsCount field */
+        if (JS_DefinePropertyValueUint32(ctx, resolve_element_env, 0,
+                                         JS_NewInt32(ctx, 1),
+                                         JS_PROP_CONFIGURABLE | JS_PROP_ENUMERABLE | JS_PROP_WRITABLE) < 0)
+            goto fail_reject;
+
+        index = 0;
+        for(;;) {
+            /* XXX: conformance: should close the iterator if error on 'done'
+               access, but not on 'value' access */
+            item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+            if (JS_IsException(item))
+                goto fail_reject;
+            if (done)
+                break;
+            next_promise = JS_Call(ctx, promise_resolve,
+                                   this_val, 1, (JSValueConst *)&item);
+            JS_FreeValue(ctx, item);
+            if (JS_IsException(next_promise)) {
+            fail_reject1:
+                JS_IteratorClose(ctx, iter, TRUE);
+                goto fail_reject;
+            }
+            resolve_element_data[0] = JS_NewBool(ctx, FALSE);
+            resolve_element_data[1] = JS_NewInt32(ctx, index);
+            resolve_element_data[2] = values;
+            resolve_element_data[3] = resolving_funcs[is_promise_any];
+            resolve_element_data[4] = resolve_element_env;
+            resolve_element =
+                JS_NewCFunctionData(ctx, js_promise_all_resolve_element, 1,
+                                    magic, 5, resolve_element_data);
+            if (JS_IsException(resolve_element)) {
+                JS_FreeValue(ctx, next_promise);
+                goto fail_reject1;
+            }
+
+            if (magic == PROMISE_MAGIC_allSettled) {
+                reject_element =
+                    JS_NewCFunctionData(ctx, js_promise_all_resolve_element, 1,
+                                        magic | 4, 5, resolve_element_data);
+                if (JS_IsException(reject_element)) {
+                    JS_FreeValue(ctx, next_promise);
+                    goto fail_reject1;
+                }
+            } else if (magic == PROMISE_MAGIC_any) {
+                if (JS_DefinePropertyValueUint32(ctx, values, index,
+                                                 JS_UNDEFINED, JS_PROP_C_W_E) < 0)
+                    goto fail_reject1;
+                reject_element = resolve_element;
+                resolve_element = JS_DupValue(ctx, resolving_funcs[0]);
+            } else {
+                reject_element = JS_DupValue(ctx, resolving_funcs[1]);
+            }
+
+            if (remainingElementsCount_add(ctx, resolve_element_env, 1) < 0) {
+                JS_FreeValue(ctx, next_promise);
+                JS_FreeValue(ctx, resolve_element);
+                JS_FreeValue(ctx, reject_element);
+                goto fail_reject1;
+            }
+
+            then_args[0] = resolve_element;
+            then_args[1] = reject_element;
+            ret = JS_InvokeFree(ctx, next_promise, JS_ATOM_then, 2, then_args);
+            JS_FreeValue(ctx, resolve_element);
+            JS_FreeValue(ctx, reject_element);
+            if (check_exception_free(ctx, ret))
+                goto fail_reject1;
+            index++;
+        }
+
+        is_zero = remainingElementsCount_add(ctx, resolve_element_env, -1);
+        if (is_zero < 0)
+            goto fail_reject;
+        if (is_zero) {
+            if (magic == PROMISE_MAGIC_any) {
+                JSValue error;
+                error = js_aggregate_error_constructor(ctx, values);
+                if (JS_IsException(error))
+                    goto fail_reject;
+                JS_FreeValue(ctx, values);
+                values = error;
+            }
+            ret = JS_Call(ctx, resolving_funcs[is_promise_any], JS_UNDEFINED,
+                          1, (JSValueConst *)&values);
+            if (check_exception_free(ctx, ret))
+                goto fail_reject;
+        }
+    }
+ done:
+    JS_FreeValue(ctx, promise_resolve);
+    JS_FreeValue(ctx, resolve_element_env);
+    JS_FreeValue(ctx, values);
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    return result_promise;
+ fail:
+    JS_FreeValue(ctx, result_promise);
+    result_promise = JS_EXCEPTION;
+    goto done;
+}
+
+static JSValue js_promise_race(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    JSValue result_promise, resolving_funcs[2], item, next_promise, ret;
+    JSValue next_method = JS_UNDEFINED, iter = JS_UNDEFINED;
+    JSValue promise_resolve = JS_UNDEFINED;
+    BOOL done;
+
+    if (!JS_IsObject(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    result_promise = js_new_promise_capability(ctx, resolving_funcs, this_val);
+    if (JS_IsException(result_promise))
+        return result_promise;
+    promise_resolve = JS_GetProperty(ctx, this_val, JS_ATOM_resolve);
+    if (JS_IsException(promise_resolve) ||
+        check_function(ctx, promise_resolve))
+        goto fail_reject;
+    iter = JS_GetIterator(ctx, argv[0], FALSE);
+    if (JS_IsException(iter)) {
+        JSValue error;
+    fail_reject:
+        error = JS_GetException(ctx);
+        ret = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED, 1,
+                       (JSValueConst *)&error);
+        JS_FreeValue(ctx, error);
+        if (JS_IsException(ret))
+            goto fail;
+        JS_FreeValue(ctx, ret);
+    } else {
+        next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+        if (JS_IsException(next_method))
+            goto fail_reject;
+
+        for(;;) {
+            /* XXX: conformance: should close the iterator if error on 'done'
+               access, but not on 'value' access */
+            item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+            if (JS_IsException(item))
+                goto fail_reject;
+            if (done)
+                break;
+            next_promise = JS_Call(ctx, promise_resolve,
+                                   this_val, 1, (JSValueConst *)&item);
+            JS_FreeValue(ctx, item);
+            if (JS_IsException(next_promise)) {
+            fail_reject1:
+                JS_IteratorClose(ctx, iter, TRUE);
+                goto fail_reject;
+            }
+            ret = JS_InvokeFree(ctx, next_promise, JS_ATOM_then, 2,
+                                (JSValueConst *)resolving_funcs);
+            if (check_exception_free(ctx, ret))
+                goto fail_reject1;
+        }
+    }
+ done:
+    JS_FreeValue(ctx, promise_resolve);
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    return result_promise;
+ fail:
+    //JS_FreeValue(ctx, next_method); // why not???
+    JS_FreeValue(ctx, result_promise);
+    result_promise = JS_EXCEPTION;
+    goto done;
+}
+
+static __exception int perform_promise_then(JSContext *ctx,
+                                            JSValueConst promise,
+                                            JSValueConst *resolve_reject,
+                                            JSValueConst *cap_resolving_funcs)
+{
+    JSPromiseData *s = JS_GetOpaque(promise, JS_CLASS_PROMISE);
+    JSPromiseReactionData *rd_array[2], *rd;
+    int i, j;
+
+    rd_array[0] = NULL;
+    rd_array[1] = NULL;
+    for(i = 0; i < 2; i++) {
+        JSValueConst handler;
+        rd = js_mallocz(ctx, sizeof(*rd));
+        if (!rd) {
+            if (i == 1)
+                promise_reaction_data_free(ctx->rt, rd_array[0]);
+            return -1;
+        }
+        for(j = 0; j < 2; j++)
+            rd->resolving_funcs[j] = JS_DupValue(ctx, cap_resolving_funcs[j]);
+        handler = resolve_reject[i];
+        if (!JS_IsFunction(ctx, handler))
+            handler = JS_UNDEFINED;
+        rd->handler = JS_DupValue(ctx, handler);
+        rd_array[i] = rd;
+    }
+
+    if (s->promise_state == JS_PROMISE_PENDING) {
+        for(i = 0; i < 2; i++)
+            list_add_tail(&rd_array[i]->link, &s->promise_reactions[i]);
+    } else {
+        JSValueConst args[5];
+        if (s->promise_state == JS_PROMISE_REJECTED && !s->is_handled) {
+            JSRuntime *rt = ctx->rt;
+            if (rt->host_promise_rejection_tracker) {
+                rt->host_promise_rejection_tracker(ctx, promise, s->promise_result,
+                                                   TRUE, rt->host_promise_rejection_tracker_opaque);
+            }
+        }
+        i = s->promise_state - JS_PROMISE_FULFILLED;
+        rd = rd_array[i];
+        args[0] = rd->resolving_funcs[0];
+        args[1] = rd->resolving_funcs[1];
+        args[2] = rd->handler;
+        args[3] = JS_NewBool(ctx, i);
+        args[4] = s->promise_result;
+        JS_EnqueueJob(ctx, promise_reaction_job, 5, args);
+        for(i = 0; i < 2; i++)
+            promise_reaction_data_free(ctx->rt, rd_array[i]);
+    }
+    s->is_handled = TRUE;
+    return 0;
+}
+
+static JSValue js_promise_then(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    JSValue ctor, result_promise, resolving_funcs[2];
+    JSPromiseData *s;
+    int i, ret;
+
+    s = JS_GetOpaque2(ctx, this_val, JS_CLASS_PROMISE);
+    if (!s)
+        return JS_EXCEPTION;
+
+    ctor = JS_SpeciesConstructor(ctx, this_val, JS_UNDEFINED);
+    if (JS_IsException(ctor))
+        return ctor;
+    result_promise = js_new_promise_capability(ctx, resolving_funcs, ctor);
+    JS_FreeValue(ctx, ctor);
+    if (JS_IsException(result_promise))
+        return result_promise;
+    ret = perform_promise_then(ctx, this_val, argv,
+                               (JSValueConst *)resolving_funcs);
+    for(i = 0; i < 2; i++)
+        JS_FreeValue(ctx, resolving_funcs[i]);
+    if (ret) {
+        JS_FreeValue(ctx, result_promise);
+        return JS_EXCEPTION;
+    }
+    return result_promise;
+}
+
+static JSValue js_promise_catch(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValueConst args[2];
+    args[0] = JS_UNDEFINED;
+    args[1] = argv[0];
+    return JS_Invoke(ctx, this_val, JS_ATOM_then, 2, args);
+}
+
+static JSValue js_promise_finally_value_thunk(JSContext *ctx, JSValueConst this_val,
+                                              int argc, JSValueConst *argv,
+                                              int magic, JSValue *func_data)
+{
+    return JS_DupValue(ctx, func_data[0]);
+}
+
+static JSValue js_promise_finally_thrower(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv,
+                                          int magic, JSValue *func_data)
+{
+    return JS_Throw(ctx, JS_DupValue(ctx, func_data[0]));
+}
+
+static JSValue js_promise_then_finally_func(JSContext *ctx, JSValueConst this_val,
+                                            int argc, JSValueConst *argv,
+                                            int magic, JSValue *func_data)
+{
+    JSValueConst ctor = func_data[0];
+    JSValueConst onFinally = func_data[1];
+    JSValue res, promise, ret, then_func;
+
+    res = JS_Call(ctx, onFinally, JS_UNDEFINED, 0, NULL);
+    if (JS_IsException(res))
+        return res;
+    promise = js_promise_resolve(ctx, ctor, 1, (JSValueConst *)&res, 0);
+    JS_FreeValue(ctx, res);
+    if (JS_IsException(promise))
+        return promise;
+    if (magic == 0) {
+        then_func = JS_NewCFunctionData(ctx, js_promise_finally_value_thunk, 0,
+                                        0, 1, argv);
+    } else {
+        then_func = JS_NewCFunctionData(ctx, js_promise_finally_thrower, 0,
+                                        0, 1, argv);
+    }
+    if (JS_IsException(then_func)) {
+        JS_FreeValue(ctx, promise);
+        return then_func;
+    }
+    ret = JS_InvokeFree(ctx, promise, JS_ATOM_then, 1, (JSValueConst *)&then_func);
+    JS_FreeValue(ctx, then_func);
+    return ret;
+}
+
+static JSValue js_promise_finally(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValueConst onFinally = argv[0];
+    JSValue ctor, ret;
+    JSValue then_funcs[2];
+    JSValueConst func_data[2];
+    int i;
+
+    ctor = JS_SpeciesConstructor(ctx, this_val, JS_UNDEFINED);
+    if (JS_IsException(ctor))
+        return ctor;
+    if (!JS_IsFunction(ctx, onFinally)) {
+        then_funcs[0] = JS_DupValue(ctx, onFinally);
+        then_funcs[1] = JS_DupValue(ctx, onFinally);
+    } else {
+        func_data[0] = ctor;
+        func_data[1] = onFinally;
+        for(i = 0; i < 2; i++) {
+            then_funcs[i] = JS_NewCFunctionData(ctx, js_promise_then_finally_func, 1, i, 2, func_data);
+            if (JS_IsException(then_funcs[i])) {
+                if (i == 1)
+                    JS_FreeValue(ctx, then_funcs[0]);
+                JS_FreeValue(ctx, ctor);
+                return JS_EXCEPTION;
+            }
+        }
+    }
+    JS_FreeValue(ctx, ctor);
+    ret = JS_Invoke(ctx, this_val, JS_ATOM_then, 2, (JSValueConst *)then_funcs);
+    JS_FreeValue(ctx, then_funcs[0]);
+    JS_FreeValue(ctx, then_funcs[1]);
+    return ret;
+}
+
+static const JSCFunctionListEntry js_promise_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("resolve", 1, js_promise_resolve, 0 ),
+    JS_CFUNC_MAGIC_DEF("reject", 1, js_promise_resolve, 1 ),
+    JS_CFUNC_MAGIC_DEF("all", 1, js_promise_all, PROMISE_MAGIC_all ),
+    JS_CFUNC_MAGIC_DEF("allSettled", 1, js_promise_all, PROMISE_MAGIC_allSettled ),
+    JS_CFUNC_MAGIC_DEF("any", 1, js_promise_all, PROMISE_MAGIC_any ),
+    JS_CFUNC_DEF("race", 1, js_promise_race ),
+    JS_CFUNC_DEF("withResolvers", 0, js_promise_withResolvers ),
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL),
+};
+
+static const JSCFunctionListEntry js_promise_proto_funcs[] = {
+    JS_CFUNC_DEF("then", 2, js_promise_then ),
+    JS_CFUNC_DEF("catch", 1, js_promise_catch ),
+    JS_CFUNC_DEF("finally", 1, js_promise_finally ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Promise", JS_PROP_CONFIGURABLE ),
+};
+
+/* AsyncFunction */
+static const JSCFunctionListEntry js_async_function_proto_funcs[] = {
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "AsyncFunction", JS_PROP_CONFIGURABLE ),
+};
+
+static JSValue js_async_from_sync_iterator_unwrap(JSContext *ctx,
+                                                  JSValueConst this_val,
+                                                  int argc, JSValueConst *argv,
+                                                  int magic, JSValue *func_data)
+{
+    return js_create_iterator_result(ctx, JS_DupValue(ctx, argv[0]),
+                                     JS_ToBool(ctx, func_data[0]));
+}
+
+static JSValue js_async_from_sync_iterator_unwrap_func_create(JSContext *ctx,
+                                                              BOOL done)
+{
+    JSValueConst func_data[1];
+
+    func_data[0] = JS_NewBool(ctx, done);
+    return JS_NewCFunctionData(ctx, js_async_from_sync_iterator_unwrap,
+                               1, 0, 1, func_data);
+}
+
+/* AsyncIteratorPrototype */
+
+static const JSCFunctionListEntry js_async_iterator_proto_funcs[] = {
+    JS_CFUNC_DEF("[Symbol.asyncIterator]", 0, js_iterator_proto_iterator ),
+};
+
+/* AsyncFromSyncIteratorPrototype */
+
+typedef struct JSAsyncFromSyncIteratorData {
+    JSValue sync_iter;
+    JSValue next_method;
+} JSAsyncFromSyncIteratorData;
+
+static void js_async_from_sync_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSAsyncFromSyncIteratorData *s =
+        JS_GetOpaque(val, JS_CLASS_ASYNC_FROM_SYNC_ITERATOR);
+    if (s) {
+        JS_FreeValueRT(rt, s->sync_iter);
+        JS_FreeValueRT(rt, s->next_method);
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_async_from_sync_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                             JS_MarkFunc *mark_func)
+{
+    JSAsyncFromSyncIteratorData *s =
+        JS_GetOpaque(val, JS_CLASS_ASYNC_FROM_SYNC_ITERATOR);
+    if (s) {
+        JS_MarkValue(rt, s->sync_iter, mark_func);
+        JS_MarkValue(rt, s->next_method, mark_func);
+    }
+}
+
+static JSValue JS_CreateAsyncFromSyncIterator(JSContext *ctx,
+                                              JSValueConst sync_iter)
+{
+    JSValue async_iter, next_method;
+    JSAsyncFromSyncIteratorData *s;
+
+    next_method = JS_GetProperty(ctx, sync_iter, JS_ATOM_next);
+    if (JS_IsException(next_method))
+        return JS_EXCEPTION;
+    async_iter = JS_NewObjectClass(ctx, JS_CLASS_ASYNC_FROM_SYNC_ITERATOR);
+    if (JS_IsException(async_iter)) {
+        JS_FreeValue(ctx, next_method);
+        return async_iter;
+    }
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s) {
+        JS_FreeValue(ctx, async_iter);
+        JS_FreeValue(ctx, next_method);
+        return JS_EXCEPTION;
+    }
+    s->sync_iter = JS_DupValue(ctx, sync_iter);
+    s->next_method = next_method;
+    JS_SetOpaque(async_iter, s);
+    return async_iter;
+}
+
+static JSValue js_async_from_sync_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                                int argc, JSValueConst *argv,
+                                                int magic)
+{
+    JSValue promise, resolving_funcs[2], value, err, method;
+    JSAsyncFromSyncIteratorData *s;
+    int done;
+    int is_reject;
+
+    promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+    if (JS_IsException(promise))
+        return JS_EXCEPTION;
+    s = JS_GetOpaque(this_val, JS_CLASS_ASYNC_FROM_SYNC_ITERATOR);
+    if (!s) {
+        JS_ThrowTypeError(ctx, "not an Async-from-Sync Iterator");
+        goto reject;
+    }
+
+    if (magic == GEN_MAGIC_NEXT) {
+        method = JS_DupValue(ctx, s->next_method);
+    } else {
+        method = JS_GetProperty(ctx, s->sync_iter,
+                                magic == GEN_MAGIC_RETURN ? JS_ATOM_return :
+                                JS_ATOM_throw);
+        if (JS_IsException(method))
+            goto reject;
+        if (JS_IsUndefined(method) || JS_IsNull(method)) {
+            if (magic == GEN_MAGIC_RETURN) {
+                err = js_create_iterator_result(ctx, JS_DupValue(ctx, argv[0]), TRUE);
+                is_reject = 0;
+            } else {
+                err = JS_DupValue(ctx, argv[0]);
+                is_reject = 1;
+            }
+            goto done_resolve;
+        }
+    }
+    value = JS_IteratorNext2(ctx, s->sync_iter, method,
+                             argc >= 1 ? 1 : 0, argv, &done);
+    JS_FreeValue(ctx, method);
+    if (JS_IsException(value))
+        goto reject;
+    if (done == 2) {
+        JSValue obj = value;
+        value = JS_IteratorGetCompleteValue(ctx, obj, &done);
+        JS_FreeValue(ctx, obj);
+        if (JS_IsException(value))
+            goto reject;
+    }
+
+    if (JS_IsException(value)) {
+        JSValue res2;
+    reject:
+        err = JS_GetException(ctx);
+        is_reject = 1;
+    done_resolve:
+        res2 = JS_Call(ctx, resolving_funcs[is_reject], JS_UNDEFINED,
+                       1, (JSValueConst *)&err);
+        JS_FreeValue(ctx, err);
+        JS_FreeValue(ctx, res2);
+        JS_FreeValue(ctx, resolving_funcs[0]);
+        JS_FreeValue(ctx, resolving_funcs[1]);
+        return promise;
+    }
+    {
+        JSValue value_wrapper_promise, resolve_reject[2];
+        int res;
+
+        value_wrapper_promise = js_promise_resolve(ctx, ctx->promise_ctor,
+                                                   1, (JSValueConst *)&value, 0);
+        if (JS_IsException(value_wrapper_promise)) {
+            JS_FreeValue(ctx, value);
+            goto reject;
+        }
+
+        resolve_reject[0] =
+            js_async_from_sync_iterator_unwrap_func_create(ctx, done);
+        if (JS_IsException(resolve_reject[0])) {
+            JS_FreeValue(ctx, value_wrapper_promise);
+            goto fail;
+        }
+        JS_FreeValue(ctx, value);
+        resolve_reject[1] = JS_UNDEFINED;
+
+        res = perform_promise_then(ctx, value_wrapper_promise,
+                                   (JSValueConst *)resolve_reject,
+                                   (JSValueConst *)resolving_funcs);
+        JS_FreeValue(ctx, resolve_reject[0]);
+        JS_FreeValue(ctx, value_wrapper_promise);
+        JS_FreeValue(ctx, resolving_funcs[0]);
+        JS_FreeValue(ctx, resolving_funcs[1]);
+        if (res) {
+            JS_FreeValue(ctx, promise);
+            return JS_EXCEPTION;
+        }
+    }
+    return promise;
+ fail:
+    JS_FreeValue(ctx, value);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    JS_FreeValue(ctx, promise);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_async_from_sync_iterator_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("next", 1, js_async_from_sync_iterator_next, GEN_MAGIC_NEXT ),
+    JS_CFUNC_MAGIC_DEF("return", 1, js_async_from_sync_iterator_next, GEN_MAGIC_RETURN ),
+    JS_CFUNC_MAGIC_DEF("throw", 1, js_async_from_sync_iterator_next, GEN_MAGIC_THROW ),
+};
+
+/* AsyncGeneratorFunction */
+
+static const JSCFunctionListEntry js_async_generator_function_proto_funcs[] = {
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "AsyncGeneratorFunction", JS_PROP_CONFIGURABLE ),
+};
+
+/* AsyncGenerator prototype */
+
+static const JSCFunctionListEntry js_async_generator_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("next", 1, js_async_generator_next, GEN_MAGIC_NEXT ),
+    JS_CFUNC_MAGIC_DEF("return", 1, js_async_generator_next, GEN_MAGIC_RETURN ),
+    JS_CFUNC_MAGIC_DEF("throw", 1, js_async_generator_next, GEN_MAGIC_THROW ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "AsyncGenerator", JS_PROP_CONFIGURABLE ),
+};
+
+static JSClassShortDef const js_async_class_def[] = {
+    { JS_ATOM_Promise, js_promise_finalizer, js_promise_mark },                      /* JS_CLASS_PROMISE */
+    { JS_ATOM_PromiseResolveFunction, js_promise_resolve_function_finalizer, js_promise_resolve_function_mark }, /* JS_CLASS_PROMISE_RESOLVE_FUNCTION */
+    { JS_ATOM_PromiseRejectFunction, js_promise_resolve_function_finalizer, js_promise_resolve_function_mark }, /* JS_CLASS_PROMISE_REJECT_FUNCTION */
+    { JS_ATOM_AsyncFunction, js_bytecode_function_finalizer, js_bytecode_function_mark },  /* JS_CLASS_ASYNC_FUNCTION */
+    { JS_ATOM_AsyncFunctionResolve, js_async_function_resolve_finalizer, js_async_function_resolve_mark }, /* JS_CLASS_ASYNC_FUNCTION_RESOLVE */
+    { JS_ATOM_AsyncFunctionReject, js_async_function_resolve_finalizer, js_async_function_resolve_mark }, /* JS_CLASS_ASYNC_FUNCTION_REJECT */
+    { JS_ATOM_empty_string, js_async_from_sync_iterator_finalizer, js_async_from_sync_iterator_mark }, /* JS_CLASS_ASYNC_FROM_SYNC_ITERATOR */
+    { JS_ATOM_AsyncGeneratorFunction, js_bytecode_function_finalizer, js_bytecode_function_mark },  /* JS_CLASS_ASYNC_GENERATOR_FUNCTION */
+    { JS_ATOM_AsyncGenerator, js_async_generator_finalizer, js_async_generator_mark },  /* JS_CLASS_ASYNC_GENERATOR */
+};
+
+void JS_AddIntrinsicPromise(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValue obj1;
+
+    if (!JS_IsRegisteredClass(rt, JS_CLASS_PROMISE)) {
+        init_class_range(rt, js_async_class_def, JS_CLASS_PROMISE,
+                         countof(js_async_class_def));
+        rt->class_array[JS_CLASS_PROMISE_RESOLVE_FUNCTION].call = js_promise_resolve_function_call;
+        rt->class_array[JS_CLASS_PROMISE_REJECT_FUNCTION].call = js_promise_resolve_function_call;
+        rt->class_array[JS_CLASS_ASYNC_FUNCTION].call = js_async_function_call;
+        rt->class_array[JS_CLASS_ASYNC_FUNCTION_RESOLVE].call = js_async_function_resolve_call;
+        rt->class_array[JS_CLASS_ASYNC_FUNCTION_REJECT].call = js_async_function_resolve_call;
+        rt->class_array[JS_CLASS_ASYNC_GENERATOR_FUNCTION].call = js_async_generator_function_call;
+    }
+
+    /* Promise */
+    ctx->class_proto[JS_CLASS_PROMISE] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_PROMISE],
+                               js_promise_proto_funcs,
+                               countof(js_promise_proto_funcs));
+    obj1 = JS_NewCFunction2(ctx, js_promise_constructor, "Promise", 1,
+                            JS_CFUNC_constructor, 0);
+    ctx->promise_ctor = JS_DupValue(ctx, obj1);
+    JS_SetPropertyFunctionList(ctx, obj1,
+                               js_promise_funcs,
+                               countof(js_promise_funcs));
+    JS_NewGlobalCConstructor2(ctx, obj1, "Promise",
+                              ctx->class_proto[JS_CLASS_PROMISE]);
+
+    /* AsyncFunction */
+    ctx->class_proto[JS_CLASS_ASYNC_FUNCTION] = JS_NewObjectProto(ctx, ctx->function_proto);
+    obj1 = JS_NewCFunction3(ctx, (JSCFunction *)js_function_constructor,
+                            "AsyncFunction", 1,
+                            JS_CFUNC_constructor_or_func_magic, JS_FUNC_ASYNC,
+                            ctx->function_ctor);
+    JS_SetPropertyFunctionList(ctx,
+                               ctx->class_proto[JS_CLASS_ASYNC_FUNCTION],
+                               js_async_function_proto_funcs,
+                               countof(js_async_function_proto_funcs));
+    JS_SetConstructor2(ctx, obj1, ctx->class_proto[JS_CLASS_ASYNC_FUNCTION],
+                       0, JS_PROP_CONFIGURABLE);
+    JS_FreeValue(ctx, obj1);
+
+    /* AsyncIteratorPrototype */
+    ctx->async_iterator_proto = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->async_iterator_proto,
+                               js_async_iterator_proto_funcs,
+                               countof(js_async_iterator_proto_funcs));
+
+    /* AsyncFromSyncIteratorPrototype */
+    ctx->class_proto[JS_CLASS_ASYNC_FROM_SYNC_ITERATOR] =
+        JS_NewObjectProto(ctx, ctx->async_iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ASYNC_FROM_SYNC_ITERATOR],
+                               js_async_from_sync_iterator_proto_funcs,
+                               countof(js_async_from_sync_iterator_proto_funcs));
+
+    /* AsyncGeneratorPrototype */
+    ctx->class_proto[JS_CLASS_ASYNC_GENERATOR] =
+        JS_NewObjectProto(ctx, ctx->async_iterator_proto);
+    JS_SetPropertyFunctionList(ctx,
+                               ctx->class_proto[JS_CLASS_ASYNC_GENERATOR],
+                               js_async_generator_proto_funcs,
+                               countof(js_async_generator_proto_funcs));
+
+    /* AsyncGeneratorFunction */
+    ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION] =
+        JS_NewObjectProto(ctx, ctx->function_proto);
+    obj1 = JS_NewCFunction3(ctx, (JSCFunction *)js_function_constructor,
+                            "AsyncGeneratorFunction", 1,
+                            JS_CFUNC_constructor_or_func_magic,
+                            JS_FUNC_ASYNC_GENERATOR,
+                            ctx->function_ctor);
+    JS_SetPropertyFunctionList(ctx,
+                               ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION],
+                               js_async_generator_function_proto_funcs,
+                               countof(js_async_generator_function_proto_funcs));
+    JS_SetConstructor2(ctx, ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION],
+                       ctx->class_proto[JS_CLASS_ASYNC_GENERATOR],
+                       JS_PROP_CONFIGURABLE, JS_PROP_CONFIGURABLE);
+    JS_SetConstructor2(ctx, obj1, ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION],
+                       0, JS_PROP_CONFIGURABLE);
+    JS_FreeValue(ctx, obj1);
+}
+
+/* URI handling */
+
+static int string_get_hex(JSString *p, int k, int n) {
+    int c = 0, h;
+    while (n-- > 0) {
+        if ((h = from_hex(string_get(p, k++))) < 0)
+            return -1;
+        c = (c << 4) | h;
+    }
+    return c;
+}
+
+static int isURIReserved(int c) {
+    return c < 0x100 && memchr(";/?:@&=+$,#", c, sizeof(";/?:@&=+$,#") - 1) != NULL;
+}
+
+static int FORMAT_ATTR(2, 3) js_throw_URIError(JSContext *ctx, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    JS_ThrowError(ctx, JS_URI_ERROR, fmt, ap);
+    va_end(ap);
+    return -1;
+}
+
+static int hex_decode(JSContext *ctx, JSString *p, int k) {
+    int c;
+
+    if (k >= p->len || string_get(p, k) != '%')
+        return js_throw_URIError(ctx, "expecting %%");
+    if (k + 2 >= p->len || (c = string_get_hex(p, k + 1, 2)) < 0)
+        return js_throw_URIError(ctx, "expecting hex digit");
+
+    return c;
+}
+
+static JSValue js_global_decodeURI(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv, int isComponent)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int k, c, c1, n, c_min;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+
+    string_buffer_init(ctx, b, 0);
+
+    p = JS_VALUE_GET_STRING(str);
+    for (k = 0; k < p->len;) {
+        c = string_get(p, k);
+        if (c == '%') {
+            c = hex_decode(ctx, p, k);
+            if (c < 0)
+                goto fail;
+            k += 3;
+            if (c < 0x80) {
+                if (!isComponent && isURIReserved(c)) {
+                    c = '%';
+                    k -= 2;
+                }
+            } else {
+                /* Decode URI-encoded UTF-8 sequence */
+                if (c >= 0xc0 && c <= 0xdf) {
+                    n = 1;
+                    c_min = 0x80;
+                    c &= 0x1f;
+                } else if (c >= 0xe0 && c <= 0xef) {
+                    n = 2;
+                    c_min = 0x800;
+                    c &= 0xf;
+                } else if (c >= 0xf0 && c <= 0xf7) {
+                    n = 3;
+                    c_min = 0x10000;
+                    c &= 0x7;
+                } else {
+                    n = 0;
+                    c_min = 1;
+                    c = 0;
+                }
+                while (n-- > 0) {
+                    c1 = hex_decode(ctx, p, k);
+                    if (c1 < 0)
+                        goto fail;
+                    k += 3;
+                    if ((c1 & 0xc0) != 0x80) {
+                        c = 0;
+                        break;
+                    }
+                    c = (c << 6) | (c1 & 0x3f);
+                }
+                if (c < c_min || c > 0x10FFFF || is_surrogate(c)) {
+                    js_throw_URIError(ctx, "malformed UTF-8");
+                    goto fail;
+                }
+            }
+        } else {
+            k++;
+        }
+        string_buffer_putc(b, c);
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+fail:
+    JS_FreeValue(ctx, str);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static int isUnescaped(int c) {
+    static char const unescaped_chars[] =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "abcdefghijklmnopqrstuvwxyz"
+        "0123456789"
+        "@*_+-./";
+    return c < 0x100 &&
+        memchr(unescaped_chars, c, sizeof(unescaped_chars) - 1);
+}
+
+static int isURIUnescaped(int c, int isComponent) {
+    return c < 0x100 &&
+        ((c >= 0x61 && c <= 0x7a) ||
+         (c >= 0x41 && c <= 0x5a) ||
+         (c >= 0x30 && c <= 0x39) ||
+         memchr("-_.!~*'()", c, sizeof("-_.!~*'()") - 1) != NULL ||
+         (!isComponent && isURIReserved(c)));
+}
+
+static int encodeURI_hex(StringBuffer *b, int c) {
+    uint8_t buf[6];
+    int n = 0;
+    const char *hex = "0123456789ABCDEF";
+
+    buf[n++] = '%';
+    if (c >= 256) {
+        buf[n++] = 'u';
+        buf[n++] = hex[(c >> 12) & 15];
+        buf[n++] = hex[(c >>  8) & 15];
+    }
+    buf[n++] = hex[(c >> 4) & 15];
+    buf[n++] = hex[(c >> 0) & 15];
+    return string_buffer_write8(b, buf, n);
+}
+
+static JSValue js_global_encodeURI(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv,
+                                   int isComponent)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int k, c, c1;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+
+    p = JS_VALUE_GET_STRING(str);
+    string_buffer_init(ctx, b, p->len);
+    for (k = 0; k < p->len;) {
+        c = string_get(p, k);
+        k++;
+        if (isURIUnescaped(c, isComponent)) {
+            string_buffer_putc16(b, c);
+        } else {
+            if (is_lo_surrogate(c)) {
+                js_throw_URIError(ctx, "invalid character");
+                goto fail;
+            } else if (is_hi_surrogate(c)) {
+                if (k >= p->len) {
+                    js_throw_URIError(ctx, "expecting surrogate pair");
+                    goto fail;
+                }
+                c1 = string_get(p, k);
+                k++;
+                if (!is_lo_surrogate(c1)) {
+                    js_throw_URIError(ctx, "expecting surrogate pair");
+                    goto fail;
+                }
+                c = from_surrogate(c, c1);
+            }
+            if (c < 0x80) {
+                encodeURI_hex(b, c);
+            } else {
+                /* XXX: use C UTF-8 conversion ? */
+                if (c < 0x800) {
+                    encodeURI_hex(b, (c >> 6) | 0xc0);
+                } else {
+                    if (c < 0x10000) {
+                        encodeURI_hex(b, (c >> 12) | 0xe0);
+                    } else {
+                        encodeURI_hex(b, (c >> 18) | 0xf0);
+                        encodeURI_hex(b, ((c >> 12) & 0x3f) | 0x80);
+                    }
+                    encodeURI_hex(b, ((c >> 6) & 0x3f) | 0x80);
+                }
+                encodeURI_hex(b, (c & 0x3f) | 0x80);
+            }
+        }
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+fail:
+    JS_FreeValue(ctx, str);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_global_escape(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int i, len, c;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+
+    p = JS_VALUE_GET_STRING(str);
+    string_buffer_init(ctx, b, p->len);
+    for (i = 0, len = p->len; i < len; i++) {
+        c = string_get(p, i);
+        if (isUnescaped(c)) {
+            string_buffer_putc16(b, c);
+        } else {
+            encodeURI_hex(b, c);
+        }
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+}
+
+static JSValue js_global_unescape(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int i, len, c, n;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+
+    string_buffer_init(ctx, b, 0);
+    p = JS_VALUE_GET_STRING(str);
+    for (i = 0, len = p->len; i < len; i++) {
+        c = string_get(p, i);
+        if (c == '%') {
+            if (i + 6 <= len
+            &&  string_get(p, i + 1) == 'u'
+            &&  (n = string_get_hex(p, i + 2, 4)) >= 0) {
+                c = n;
+                i += 6 - 1;
+            } else
+            if (i + 3 <= len
+            &&  (n = string_get_hex(p, i + 1, 2)) >= 0) {
+                c = n;
+                i += 3 - 1;
+            }
+        }
+        string_buffer_putc16(b, c);
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+}
+
+/* global object */
+
+static const JSCFunctionListEntry js_global_funcs[] = {
+    JS_CFUNC_DEF("parseInt", 2, js_parseInt ),
+    JS_CFUNC_DEF("parseFloat", 1, js_parseFloat ),
+    JS_CFUNC_DEF("isNaN", 1, js_global_isNaN ),
+    JS_CFUNC_DEF("isFinite", 1, js_global_isFinite ),
+
+    JS_CFUNC_MAGIC_DEF("decodeURI", 1, js_global_decodeURI, 0 ),
+    JS_CFUNC_MAGIC_DEF("decodeURIComponent", 1, js_global_decodeURI, 1 ),
+    JS_CFUNC_MAGIC_DEF("encodeURI", 1, js_global_encodeURI, 0 ),
+    JS_CFUNC_MAGIC_DEF("encodeURIComponent", 1, js_global_encodeURI, 1 ),
+    JS_CFUNC_DEF("escape", 1, js_global_escape ),
+    JS_CFUNC_DEF("unescape", 1, js_global_unescape ),
+    JS_PROP_DOUBLE_DEF("Infinity", 1.0 / 0.0, 0 ),
+    JS_PROP_DOUBLE_DEF("NaN", NAN, 0 ),
+    JS_PROP_UNDEFINED_DEF("undefined", 0 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "global", JS_PROP_CONFIGURABLE ),
+};
+
+/* Date */
+
+static int64_t math_mod(int64_t a, int64_t b) {
+    /* return positive modulo */
+    int64_t m = a % b;
+    return m + (m < 0) * b;
+}
+
+static int64_t floor_div(int64_t a, int64_t b) {
+    /* integer division rounding toward -Infinity */
+    int64_t m = a % b;
+    return (a - (m + (m < 0) * b)) / b;
+}
+
+static JSValue js_Date_parse(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv);
+
+static __exception int JS_ThisTimeValue(JSContext *ctx, double *valp, JSValueConst this_val)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_DATE && JS_IsNumber(p->u.object_data))
+            return JS_ToFloat64(ctx, valp, p->u.object_data);
+    }
+    JS_ThrowTypeError(ctx, "not a Date object");
+    return -1;
+}
+
+static JSValue JS_SetThisTimeValue(JSContext *ctx, JSValueConst this_val, double v)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_DATE) {
+            JS_FreeValue(ctx, p->u.object_data);
+            p->u.object_data = JS_NewFloat64(ctx, v);
+            return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a Date object");
+}
+
+static int64_t days_from_year(int64_t y) {
+    return 365 * (y - 1970) + floor_div(y - 1969, 4) -
+        floor_div(y - 1901, 100) + floor_div(y - 1601, 400);
+}
+
+static int64_t days_in_year(int64_t y) {
+    return 365 + !(y % 4) - !(y % 100) + !(y % 400);
+}
+
+/* return the year, update days */
+static int64_t year_from_days(int64_t *days) {
+    int64_t y, d1, nd, d = *days;
+    y = floor_div(d * 10000, 3652425) + 1970;
+    /* the initial approximation is very good, so only a few
+       iterations are necessary */
+    for(;;) {
+        d1 = d - days_from_year(y);
+        if (d1 < 0) {
+            y--;
+            d1 += days_in_year(y);
+        } else {
+            nd = days_in_year(y);
+            if (d1 < nd)
+                break;
+            d1 -= nd;
+            y++;
+        }
+    }
+    *days = d1;
+    return y;
+}
+
+static int const month_days[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+static char const month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
+static char const day_names[] = "SunMonTueWedThuFriSat";
+
+static __exception int get_date_fields(JSContext *ctx, JSValueConst obj,
+                                       double fields[minimum_length(9)], int is_local, int force)
+{
+    double dval;
+    int64_t d, days, wd, y, i, md, h, m, s, ms, tz = 0;
+
+    if (JS_ThisTimeValue(ctx, &dval, obj))
+        return -1;
+
+    if (isnan(dval)) {
+        if (!force)
+            return FALSE; /* NaN */
+        d = 0;        /* initialize all fields to 0 */
+    } else {
+        d = dval;     /* assuming -8.64e15 <= dval <= -8.64e15 */
+        if (is_local) {
+            tz = -getTimezoneOffset(d);
+            d += tz * 60000;
+        }
+    }
+
+    /* result is >= 0, we can use % */
+    h = math_mod(d, 86400000);
+    days = (d - h) / 86400000;
+    ms = h % 1000;
+    h = (h - ms) / 1000;
+    s = h % 60;
+    h = (h - s) / 60;
+    m = h % 60;
+    h = (h - m) / 60;
+    wd = math_mod(days + 4, 7); /* week day */
+    y = year_from_days(&days);
+
+    for(i = 0; i < 11; i++) {
+        md = month_days[i];
+        if (i == 1)
+            md += days_in_year(y) - 365;
+        if (days < md)
+            break;
+        days -= md;
+    }
+    fields[0] = y;
+    fields[1] = i;
+    fields[2] = days + 1;
+    fields[3] = h;
+    fields[4] = m;
+    fields[5] = s;
+    fields[6] = ms;
+    fields[7] = wd;
+    fields[8] = tz;
+    return TRUE;
+}
+
+static double time_clip(double t) {
+    if (t >= -8.64e15 && t <= 8.64e15)
+        return trunc(t) + 0.0;  /* convert -0 to +0 */
+    else
+        return NAN;
+}
+
+/* The spec mandates the use of 'double' and it specifies the order
+   of the operations */
+static double set_date_fields(double fields[minimum_length(7)], int is_local) {
+    double y, m, dt, ym, mn, day, h, s, milli, time, tv;
+    int yi, mi, i;
+    int64_t days;
+    volatile double temp;  /* enforce evaluation order */
+
+    /* emulate 21.4.1.15 MakeDay ( year, month, date ) */
+    y = fields[0];
+    m = fields[1];
+    dt = fields[2];
+    ym = y + floor(m / 12);
+    mn = fmod(m, 12);
+    if (mn < 0)
+        mn += 12;
+    if (ym < -271821 || ym > 275760)
+        return NAN;
+
+    yi = ym;
+    mi = mn;
+    days = days_from_year(yi);
+    for(i = 0; i < mi; i++) {
+        days += month_days[i];
+        if (i == 1)
+            days += days_in_year(yi) - 365;
+    }
+    day = days + dt - 1;
+
+    /* emulate 21.4.1.14 MakeTime ( hour, min, sec, ms ) */
+    h = fields[3];
+    m = fields[4];
+    s = fields[5];
+    milli = fields[6];
+    /* Use a volatile intermediary variable to ensure order of evaluation
+     * as specified in ECMA. This fixes a test262 error on
+     * test262/test/built-ins/Date/UTC/fp-evaluation-order.js.
+     * Without the volatile qualifier, the compile can generate code
+     * that performs the computation in a different order or with instructions
+     * that produce a different result such as FMA (float multiply and add).
+     */
+    time = h * 3600000;
+    time += (temp = m * 60000);
+    time += (temp = s * 1000);
+    time += milli;
+
+    /* emulate 21.4.1.16 MakeDate ( day, time ) */
+    tv = (temp = day * 86400000) + time;   /* prevent generation of FMA */
+    if (!isfinite(tv))
+        return NAN;
+
+    /* adjust for local time and clip */
+    if (is_local) {
+        int64_t ti = tv < INT64_MIN ? INT64_MIN : tv >= 0x1p63 ? INT64_MAX : (int64_t)tv;
+        tv += getTimezoneOffset(ti) * 60000;
+    }
+    return time_clip(tv);
+}
+
+static JSValue get_date_field(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic)
+{
+    // get_date_field(obj, n, is_local)
+    double fields[9];
+    int res, n, is_local;
+
+    is_local = magic & 0x0F;
+    n = (magic >> 4) & 0x0F;
+    res = get_date_fields(ctx, this_val, fields, is_local, 0);
+    if (res < 0)
+        return JS_EXCEPTION;
+    if (!res)
+        return JS_NAN;
+
+    if (magic & 0x100) {    // getYear
+        fields[0] -= 1900;
+    }
+    return JS_NewFloat64(ctx, fields[n]);
+}
+
+static JSValue set_date_field(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic)
+{
+    // _field(obj, first_field, end_field, args, is_local)
+    double fields[9];
+    int res, first_field, end_field, is_local, i, n;
+    double d, a;
+
+    d = NAN;
+    first_field = (magic >> 8) & 0x0F;
+    end_field = (magic >> 4) & 0x0F;
+    is_local = magic & 0x0F;
+
+    res = get_date_fields(ctx, this_val, fields, is_local, first_field == 0);
+    if (res < 0)
+        return JS_EXCEPTION;
+
+    // Argument coercion is observable and must be done unconditionally.
+    n = min_int(argc, end_field - first_field);
+    for(i = 0; i < n; i++) {
+        if (JS_ToFloat64(ctx, &a, argv[i]))
+            return JS_EXCEPTION;
+        if (!isfinite(a))
+            res = FALSE;
+        fields[first_field + i] = trunc(a);
+    }
+    if (res && argc > 0)
+        d = set_date_fields(fields, is_local);
+
+    return JS_SetThisTimeValue(ctx, this_val, d);
+}
+
+/* fmt:
+   0: toUTCString: "Tue, 02 Jan 2018 23:04:46 GMT"
+   1: toString: "Wed Jan 03 2018 00:05:22 GMT+0100 (CET)"
+   2: toISOString: "2018-01-02T23:02:56.927Z"
+   3: toLocaleString: "1/2/2018, 11:40:40 PM"
+   part: 1=date, 2=time 3=all
+   XXX: should use a variant of strftime().
+ */
+static JSValue get_date_string(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv, int magic)
+{
+    // _string(obj, fmt, part)
+    char buf[64];
+    double fields[9];
+    int res, fmt, part, pos;
+    int y, mon, d, h, m, s, ms, wd, tz;
+
+    fmt = (magic >> 4) & 0x0F;
+    part = magic & 0x0F;
+
+    res = get_date_fields(ctx, this_val, fields, fmt & 1, 0);
+    if (res < 0)
+        return JS_EXCEPTION;
+    if (!res) {
+        if (fmt == 2)
+            return JS_ThrowRangeError(ctx, "Date value is NaN");
+        else
+            return JS_NewString(ctx, "Invalid Date");
+    }
+
+    y = fields[0];
+    mon = fields[1];
+    d = fields[2];
+    h = fields[3];
+    m = fields[4];
+    s = fields[5];
+    ms = fields[6];
+    wd = fields[7];
+    tz = fields[8];
+
+    pos = 0;
+
+    if (part & 1) { /* date part */
+        switch(fmt) {
+        case 0:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%.3s, %02d %.3s %0*d ",
+                            day_names + wd * 3, d,
+                            month_names + mon * 3, 4 + (y < 0), y);
+            break;
+        case 1:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%.3s %.3s %02d %0*d",
+                            day_names + wd * 3,
+                            month_names + mon * 3, d, 4 + (y < 0), y);
+            if (part == 3) {
+                buf[pos++] = ' ';
+            }
+            break;
+        case 2:
+            if (y >= 0 && y <= 9999) {
+                pos += snprintf(buf + pos, sizeof(buf) - pos,
+                                "%04d", y);
+            } else {
+                pos += snprintf(buf + pos, sizeof(buf) - pos,
+                                "%+07d", y);
+            }
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "-%02d-%02dT", mon + 1, d);
+            break;
+        case 3:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d/%02d/%0*d", mon + 1, d, 4 + (y < 0), y);
+            if (part == 3) {
+                buf[pos++] = ',';
+                buf[pos++] = ' ';
+            }
+            break;
+        }
+    }
+    if (part & 2) { /* time part */
+        switch(fmt) {
+        case 0:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d:%02d:%02d GMT", h, m, s);
+            break;
+        case 1:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d:%02d:%02d GMT", h, m, s);
+            if (tz < 0) {
+                buf[pos++] = '-';
+                tz = -tz;
+            } else {
+                buf[pos++] = '+';
+            }
+            /* tz is >= 0, can use % */
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d%02d", tz / 60, tz % 60);
+            /* XXX: tack the time zone code? */
+            break;
+        case 2:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d:%02d:%02d.%03dZ", h, m, s, ms);
+            break;
+        case 3:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d:%02d:%02d %cM", (h + 11) % 12 + 1, m, s,
+                            (h < 12) ? 'A' : 'P');
+            break;
+        }
+    }
+    return JS_NewStringLen(ctx, buf, pos);
+}
+
+/* OS dependent: return the UTC time in ms since 1970. */
+static int64_t date_now(void) {
+#ifdef _MSC_VER
+    SYSTEMTIME st;
+    GetSystemTime(&st);
+    int64_t d;
+    SystemTimeToFileTime(&st, (FILETIME *) &d);
+    return (d - 116444736000000000ULL) / 10000;
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (int64_t)tv.tv_sec * 1000 + (tv.tv_usec / 1000);
+#endif
+}
+
+static JSValue js_date_constructor(JSContext *ctx, JSValueConst new_target,
+                                   int argc, JSValueConst *argv)
+{
+    // Date(y, mon, d, h, m, s, ms)
+    JSValue rv;
+    int i, n;
+    double a, val;
+
+    if (JS_IsUndefined(new_target)) {
+        /* invoked as function */
+        argc = 0;
+    }
+    n = argc;
+    if (n == 0) {
+        val = date_now();
+    } else if (n == 1) {
+        JSValue v, dv;
+        if (JS_VALUE_GET_TAG(argv[0]) == JS_TAG_OBJECT) {
+            JSObject *p = JS_VALUE_GET_OBJ(argv[0]);
+            if (p->class_id == JS_CLASS_DATE && JS_IsNumber(p->u.object_data)) {
+                if (JS_ToFloat64(ctx, &val, p->u.object_data))
+                    return JS_EXCEPTION;
+                val = time_clip(val);
+                goto has_val;
+            }
+        }
+        v = JS_ToPrimitive(ctx, argv[0], HINT_NONE);
+        if (JS_IsString(v)) {
+            dv = js_Date_parse(ctx, JS_UNDEFINED, 1, (JSValueConst *)&v);
+            JS_FreeValue(ctx, v);
+            if (JS_IsException(dv))
+                return JS_EXCEPTION;
+            if (JS_ToFloat64Free(ctx, &val, dv))
+                return JS_EXCEPTION;
+        } else {
+            if (JS_ToFloat64Free(ctx, &val, v))
+                return JS_EXCEPTION;
+        }
+        val = time_clip(val);
+    } else {
+        double fields[] = { 0, 0, 1, 0, 0, 0, 0 };
+        if (n > 7)
+            n = 7;
+        for(i = 0; i < n; i++) {
+            if (JS_ToFloat64(ctx, &a, argv[i]))
+                return JS_EXCEPTION;
+            if (!isfinite(a))
+                break;
+            fields[i] = trunc(a);
+            if (i == 0 && fields[0] >= 0 && fields[0] < 100)
+                fields[0] += 1900;
+        }
+        val = (i == n) ? set_date_fields(fields, 1) : NAN;
+    }
+has_val:
+#if 0
+    JSValueConst args[3];
+    args[0] = new_target;
+    args[1] = ctx->class_proto[JS_CLASS_DATE];
+    args[2] = JS_NewFloat64(ctx, val);
+    rv = js___date_create(ctx, JS_UNDEFINED, 3, args);
+#else
+    rv = js_create_from_ctor(ctx, new_target, JS_CLASS_DATE);
+    if (!JS_IsException(rv))
+        JS_SetObjectData(ctx, rv, JS_NewFloat64(ctx, val));
+#endif
+    if (!JS_IsException(rv) && JS_IsUndefined(new_target)) {
+        /* invoked as a function, return (new Date()).toString(); */
+        JSValue s;
+        s = get_date_string(ctx, rv, 0, NULL, 0x13);
+        JS_FreeValue(ctx, rv);
+        rv = s;
+    }
+    return rv;
+}
+
+static JSValue js_Date_UTC(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv)
+{
+    // UTC(y, mon, d, h, m, s, ms)
+    double fields[] = { 0, 0, 1, 0, 0, 0, 0 };
+    int i, n;
+    double a;
+
+    n = argc;
+    if (n == 0)
+        return JS_NAN;
+    if (n > 7)
+        n = 7;
+    for(i = 0; i < n; i++) {
+        if (JS_ToFloat64(ctx, &a, argv[i]))
+            return JS_EXCEPTION;
+        if (!isfinite(a))
+            return JS_NAN;
+        fields[i] = trunc(a);
+        if (i == 0 && fields[0] >= 0 && fields[0] < 100)
+            fields[0] += 1900;
+    }
+    return JS_NewFloat64(ctx, set_date_fields(fields, 0));
+}
+
+/* Date string parsing */
+
+static BOOL string_skip_char(const uint8_t *sp, int *pp, int c) {
+    if (sp[*pp] == c) {
+        *pp += 1;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+/* skip spaces, update offset, return next char */
+static int string_skip_spaces(const uint8_t *sp, int *pp) {
+    int c;
+    while ((c = sp[*pp]) == ' ')
+        *pp += 1;
+    return c;
+}
+
+/* skip dashes dots and commas */
+static int string_skip_separators(const uint8_t *sp, int *pp) {
+    int c;
+    while ((c = sp[*pp]) == '-' || c == '/' || c == '.' || c == ',')
+        *pp += 1;
+    return c;
+}
+
+/* skip a word, stop on spaces, digits and separators, update offset */
+static int string_skip_until(const uint8_t *sp, int *pp, const char *stoplist) {
+    int c;
+    while (!strchr(stoplist, c = sp[*pp]))
+        *pp += 1;
+    return c;
+}
+
+/* parse a numeric field (max_digits = 0 -> no maximum) */
+static BOOL string_get_digits(const uint8_t *sp, int *pp, int *pval,
+                              int min_digits, int max_digits)
+{
+    int v = 0;
+    int c, p = *pp, p_start;
+
+    p_start = p;
+    while ((c = sp[p]) >= '0' && c <= '9') {
+        v = v * 10 + c - '0';
+        p++;
+        if (p - p_start == max_digits)
+            break;
+    }
+    if (p - p_start < min_digits)
+        return FALSE;
+    *pval = v;
+    *pp = p;
+    return TRUE;
+}
+
+static BOOL string_get_milliseconds(const uint8_t *sp, int *pp, int *pval) {
+    /* parse optional fractional part as milliseconds and truncate. */
+    /* spec does not indicate which rounding should be used */
+    int mul = 100, ms = 0, c, p_start, p = *pp;
+
+    c = sp[p];
+    if (c == '.' || c == ',') {
+        p++;
+        p_start = p;
+        while ((c = sp[p]) >= '0' && c <= '9') {
+            ms += (c - '0') * mul;
+            mul /= 10;
+            p++;
+            if (p - p_start == 9)
+                break;
+        }
+        if (p > p_start) {
+            /* only consume the separator if digits are present */
+            *pval = ms;
+            *pp = p;
+        }
+    }
+    return TRUE;
+}
+
+static uint8_t upper_ascii(uint8_t c) {
+    return c >= 'a' && c <= 'z' ? c - 'a' + 'A' : c;
+}
+
+static BOOL string_get_tzoffset(const uint8_t *sp, int *pp, int *tzp, BOOL strict) {
+    int tz = 0, sgn, hh, mm, p = *pp;
+
+    sgn = sp[p++];
+    if (sgn == '+' || sgn == '-') {
+        int n = p;
+        if (!string_get_digits(sp, &p, &hh, 1, 9))
+            return FALSE;
+        n = p - n;
+        if (strict && n != 2 && n != 4)
+            return FALSE;
+        while (n > 4) {
+            n -= 2;
+            hh /= 100;
+        }
+        if (n > 2) {
+            mm = hh % 100;
+            hh = hh / 100;
+        } else {
+            mm = 0;
+            if (string_skip_char(sp, &p, ':')  /* optional separator */
+            &&  !string_get_digits(sp, &p, &mm, 2, 2))
+                return FALSE;
+        }
+        if (hh > 23 || mm > 59)
+            return FALSE;
+        tz = hh * 60 + mm;
+        if (sgn != '+')
+            tz = -tz;
+    } else
+    if (sgn != 'Z') {
+        return FALSE;
+    }
+    *pp = p;
+    *tzp = tz;
+    return TRUE;
+}
+
+static BOOL string_match(const uint8_t *sp, int *pp, const char *s) {
+    int p = *pp;
+    while (*s != '\0') {
+        if (upper_ascii(sp[p]) != upper_ascii(*s++))
+            return FALSE;
+        p++;
+    }
+    *pp = p;
+    return TRUE;
+}
+
+static int find_abbrev(const uint8_t *sp, int p, const char *list, int count) {
+    int n, i;
+
+    for (n = 0; n < count; n++) {
+        for (i = 0;; i++) {
+            if (upper_ascii(sp[p + i]) != upper_ascii(list[n * 3 + i]))
+                break;
+            if (i == 2)
+                return n;
+        }
+    }
+    return -1;
+}
+
+static BOOL string_get_month(const uint8_t *sp, int *pp, int *pval) {
+    int n;
+
+    n = find_abbrev(sp, *pp, month_names, 12);
+    if (n < 0)
+        return FALSE;
+
+    *pval = n + 1;
+    *pp += 3;
+    return TRUE;
+}
+
+/* parse toISOString format */
+static BOOL js_date_parse_isostring(const uint8_t *sp, int fields[9], BOOL *is_local) {
+    int sgn, i, p = 0;
+
+    /* initialize fields to the beginning of the Epoch */
+    for (i = 0; i < 9; i++) {
+        fields[i] = (i == 2);
+    }
+    *is_local = FALSE;
+
+    /* year is either yyyy digits or [+-]yyyyyy */
+    sgn = sp[p];
+    if (sgn == '-' || sgn == '+') {
+        p++;
+        if (!string_get_digits(sp, &p, &fields[0], 6, 6))
+            return FALSE;
+        if (sgn == '-') {
+            if (fields[0] == 0)
+                return FALSE; // reject -000000
+            fields[0] = -fields[0];
+        }
+    } else {
+        if (!string_get_digits(sp, &p, &fields[0], 4, 4))
+            return FALSE;
+    }
+    if (string_skip_char(sp, &p, '-')) {
+        if (!string_get_digits(sp, &p, &fields[1], 2, 2))  /* month */
+            return FALSE;
+        if (fields[1] < 1)
+            return FALSE;
+        fields[1] -= 1;
+        if (string_skip_char(sp, &p, '-')) {
+            if (!string_get_digits(sp, &p, &fields[2], 2, 2))  /* day */
+                return FALSE;
+            if (fields[2] < 1)
+                return FALSE;
+        }
+    }
+    if (string_skip_char(sp, &p, 'T')) {
+        *is_local = TRUE;
+        if (!string_get_digits(sp, &p, &fields[3], 2, 2)  /* hour */
+        ||  !string_skip_char(sp, &p, ':')
+        ||  !string_get_digits(sp, &p, &fields[4], 2, 2)) {  /* minute */
+            fields[3] = 100;  // reject unconditionally
+            return TRUE;
+        }
+        if (string_skip_char(sp, &p, ':')) {
+            if (!string_get_digits(sp, &p, &fields[5], 2, 2))  /* second */
+                return FALSE;
+            string_get_milliseconds(sp, &p, &fields[6]);
+        }
+    }
+    /* parse the time zone offset if present: [+-]HH:mm or [+-]HHmm */
+    if (sp[p]) {
+        *is_local = FALSE;
+        if (!string_get_tzoffset(sp, &p, &fields[8], TRUE))
+            return FALSE;
+    }
+    /* error if extraneous characters */
+    return sp[p] == '\0';
+}
+
+static struct {
+    char name[6];
+    int16_t offset;
+} const js_tzabbr[] = {
+    { "GMT",   0 },         // Greenwich Mean Time
+    { "UTC",   0 },         // Coordinated Universal Time
+    { "UT",    0 },         // Universal Time
+    { "Z",     0 },         // Zulu Time
+    { "EDT",  -4 * 60 },    // Eastern Daylight Time
+    { "EST",  -5 * 60 },    // Eastern Standard Time
+    { "CDT",  -5 * 60 },    // Central Daylight Time
+    { "CST",  -6 * 60 },    // Central Standard Time
+    { "MDT",  -6 * 60 },    // Mountain Daylight Time
+    { "MST",  -7 * 60 },    // Mountain Standard Time
+    { "PDT",  -7 * 60 },    // Pacific Daylight Time
+    { "PST",  -8 * 60 },    // Pacific Standard Time
+    { "WET",  +0 * 60 },    // Western European Time
+    { "WEST", +1 * 60 },    // Western European Summer Time
+    { "CET",  +1 * 60 },    // Central European Time
+    { "CEST", +2 * 60 },    // Central European Summer Time
+    { "EET",  +2 * 60 },    // Eastern European Time
+    { "EEST", +3 * 60 },    // Eastern European Summer Time
+};
+
+static BOOL string_get_tzabbr(const uint8_t *sp, int *pp, int *offset) {
+    for (size_t i = 0; i < countof(js_tzabbr); i++) {
+        if (string_match(sp, pp, js_tzabbr[i].name)) {
+            *offset = js_tzabbr[i].offset;
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+/* parse toString, toUTCString and other formats */
+static BOOL js_date_parse_otherstring(const uint8_t *sp,
+                                      int fields[minimum_length(9)],
+                                      BOOL *is_local) {
+    int c, i, val, p = 0, p_start;
+    int num[3];
+    BOOL has_year = FALSE;
+    BOOL has_mon = FALSE;
+    BOOL has_time = FALSE;
+    int num_index = 0;
+
+    /* initialize fields to the beginning of 2001-01-01 */
+    fields[0] = 2001;
+    fields[1] = 1;
+    fields[2] = 1;
+    for (i = 3; i < 9; i++) {
+        fields[i] = 0;
+    }
+    *is_local = TRUE;
+
+    while (string_skip_spaces(sp, &p)) {
+        p_start = p;
+        if ((c = sp[p]) == '+' || c == '-') {
+            if (has_time && string_get_tzoffset(sp, &p, &fields[8], FALSE)) {
+                *is_local = FALSE;
+            } else {
+                p++;
+                if (string_get_digits(sp, &p, &val, 1, 9)) {
+                    if (c == '-') {
+                        if (val == 0)
+                            return FALSE;
+                        val = -val;
+                    }
+                    fields[0] = val;
+                    has_year = TRUE;
+                }
+            }
+        } else
+        if (string_get_digits(sp, &p, &val, 1, 9)) {
+            if (string_skip_char(sp, &p, ':')) {
+                /* time part */
+                fields[3] = val;
+                if (!string_get_digits(sp, &p, &fields[4], 1, 2))
+                    return FALSE;
+                if (string_skip_char(sp, &p, ':')) {
+                    if (!string_get_digits(sp, &p, &fields[5], 1, 2))
+                        return FALSE;
+                    string_get_milliseconds(sp, &p, &fields[6]);
+                }
+                has_time = TRUE;
+            } else {
+                if (p - p_start > 2) {
+                    fields[0] = val;
+                    has_year = TRUE;
+                } else
+                if (val < 1 || val > 31) {
+                    fields[0] = val + (val < 100) * 1900 + (val < 50) * 100;
+                    has_year = TRUE;
+                } else {
+                    if (num_index == 3)
+                        return FALSE;
+                    num[num_index++] = val;
+                }
+            }
+        } else
+        if (string_get_month(sp, &p, &fields[1])) {
+            has_mon = TRUE;
+            string_skip_until(sp, &p, "0123456789 -/(");
+        } else
+        if (has_time && string_match(sp, &p, "PM")) {
+            if (fields[3] < 12)
+                fields[3] += 12;
+            continue;
+        } else
+        if (has_time && string_match(sp, &p, "AM")) {
+            if (fields[3] == 12)
+                fields[3] -= 12;
+            continue;
+        } else
+        if (string_get_tzabbr(sp, &p, &fields[8])) {
+            *is_local = FALSE;
+            continue;
+        } else
+        if (c == '(') {  /* skip parenthesized phrase */
+            int level = 0;
+            while ((c = sp[p]) != '\0') {
+                p++;
+                level += (c == '(');
+                level -= (c == ')');
+                if (!level)
+                    break;
+            }
+            if (level > 0)
+                return FALSE;
+        } else
+        if (c == ')') {
+            return FALSE;
+        } else {
+            if (has_year + has_mon + has_time + num_index)
+                return FALSE;
+            /* skip a word */
+            string_skip_until(sp, &p, " -/(");
+        }
+        string_skip_separators(sp, &p);
+    }
+    if (num_index + has_year + has_mon > 3)
+        return FALSE;
+
+    switch (num_index) {
+    case 0:
+        if (!has_year)
+            return FALSE;
+        break;
+    case 1:
+        if (has_mon)
+            fields[2] = num[0];
+        else
+            fields[1] = num[0];
+        break;
+    case 2:
+        if (has_year) {
+            fields[1] = num[0];
+            fields[2] = num[1];
+        } else
+        if (has_mon) {
+            fields[0] = num[1] + (num[1] < 100) * 1900 + (num[1] < 50) * 100;
+            fields[2] = num[0];
+        } else {
+            fields[1] = num[0];
+            fields[2] = num[1];
+        }
+        break;
+    case 3:
+        fields[0] = num[2] + (num[2] < 100) * 1900 + (num[2] < 50) * 100;
+        fields[1] = num[0];
+        fields[2] = num[1];
+        break;
+    default:
+        return FALSE;
+    }
+    if (fields[1] < 1 || fields[2] < 1)
+        return FALSE;
+    fields[1] -= 1;
+    return TRUE;
+}
+
+static JSValue js_Date_parse(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    JSValue s, rv;
+    int fields[9];
+    double fields1[9];
+    double d;
+    int i, c;
+    JSString *sp;
+    uint8_t buf[128];
+    BOOL is_local;
+
+    rv = JS_NAN;
+
+    s = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(s))
+        return JS_EXCEPTION;
+
+    sp = JS_VALUE_GET_STRING(s);
+    /* convert the string as a byte array */
+    for (i = 0; i < sp->len && i < (int)countof(buf) - 1; i++) {
+        c = string_get(sp, i);
+        if (c > 255)
+            c = (c == 0x2212) ? '-' : 'x';
+        buf[i] = c;
+    }
+    buf[i] = '\0';
+    if (js_date_parse_isostring(buf, fields, &is_local)
+    ||  js_date_parse_otherstring(buf, fields, &is_local)) {
+        static int const field_max[6] = { 0, 11, 31, 24, 59, 59 };
+        BOOL valid = TRUE;
+        /* check field maximum values */
+        for (i = 1; i < 6; i++) {
+            if (fields[i] > field_max[i])
+                valid = FALSE;
+        }
+        /* special case 24:00:00.000 */
+        if (fields[3] == 24 && (fields[4] | fields[5] | fields[6]))
+            valid = FALSE;
+        if (valid) {
+            for(i = 0; i < 7; i++)
+                fields1[i] = fields[i];
+            d = set_date_fields(fields1, is_local) - fields[8] * 60000;
+            rv = JS_NewFloat64(ctx, d);
+        }
+    }
+    JS_FreeValue(ctx, s);
+    return rv;
+}
+
+static JSValue js_Date_now(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv)
+{
+    // now()
+    return JS_NewInt64(ctx, date_now());
+}
+
+static JSValue js_date_Symbol_toPrimitive(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv)
+{
+    // Symbol_toPrimitive(hint)
+    JSValueConst obj = this_val;
+    JSAtom hint = JS_ATOM_NULL;
+    int hint_num;
+
+    if (!JS_IsObject(obj))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    if (JS_IsString(argv[0])) {
+        hint = JS_ValueToAtom(ctx, argv[0]);
+        if (hint == JS_ATOM_NULL)
+            return JS_EXCEPTION;
+        JS_FreeAtom(ctx, hint);
+    }
+    switch (hint) {
+    case JS_ATOM_number:
+    case JS_ATOM_integer:
+        hint_num = HINT_NUMBER;
+        break;
+    case JS_ATOM_string:
+    case JS_ATOM_default:
+        hint_num = HINT_STRING;
+        break;
+    default:
+        return JS_ThrowTypeError(ctx, "invalid hint");
+    }
+    return JS_ToPrimitive(ctx, obj, hint_num | HINT_FORCE_ORDINARY);
+}
+
+static JSValue js_date_getTimezoneOffset(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    // getTimezoneOffset()
+    double v;
+
+    if (JS_ThisTimeValue(ctx, &v, this_val))
+        return JS_EXCEPTION;
+    if (isnan(v))
+        return JS_NAN;
+    else
+        /* assuming -8.64e15 <= v <= -8.64e15 */
+        return JS_NewInt64(ctx, getTimezoneOffset((int64_t)trunc(v)));
+}
+
+static JSValue js_date_getTime(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    // getTime()
+    double v;
+
+    if (JS_ThisTimeValue(ctx, &v, this_val))
+        return JS_EXCEPTION;
+    return JS_NewFloat64(ctx, v);
+}
+
+static JSValue js_date_setTime(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    // setTime(v)
+    double v;
+
+    if (JS_ThisTimeValue(ctx, &v, this_val) || JS_ToFloat64(ctx, &v, argv[0]))
+        return JS_EXCEPTION;
+    return JS_SetThisTimeValue(ctx, this_val, time_clip(v));
+}
+
+static JSValue js_date_setYear(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    // setYear(y)
+    double y;
+    JSValueConst args[1];
+
+    if (JS_ThisTimeValue(ctx, &y, this_val) || JS_ToFloat64(ctx, &y, argv[0]))
+        return JS_EXCEPTION;
+    y = +y;
+    if (isfinite(y)) {
+        y = trunc(y);
+        if (y >= 0 && y < 100)
+            y += 1900;
+    }
+    args[0] = JS_NewFloat64(ctx, y);
+    return set_date_field(ctx, this_val, 1, args, 0x011);
+}
+
+static JSValue js_date_toJSON(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    // toJSON(key)
+    JSValue obj, tv, method, rv;
+    double d;
+
+    rv = JS_EXCEPTION;
+    tv = JS_UNDEFINED;
+
+    obj = JS_ToObject(ctx, this_val);
+    tv = JS_ToPrimitive(ctx, obj, HINT_NUMBER);
+    if (JS_IsException(tv))
+        goto exception;
+    if (JS_IsNumber(tv)) {
+        if (JS_ToFloat64(ctx, &d, tv) < 0)
+            goto exception;
+        if (!isfinite(d)) {
+            rv = JS_NULL;
+            goto done;
+        }
+    }
+    method = JS_GetPropertyStr(ctx, obj, "toISOString");
+    if (JS_IsException(method))
+        goto exception;
+    if (!JS_IsFunction(ctx, method)) {
+        JS_ThrowTypeError(ctx, "object needs toISOString method");
+        JS_FreeValue(ctx, method);
+        goto exception;
+    }
+    rv = JS_CallFree(ctx, method, obj, 0, NULL);
+exception:
+done:
+    JS_FreeValue(ctx, obj);
+    JS_FreeValue(ctx, tv);
+    return rv;
+}
+
+static const JSCFunctionListEntry js_date_funcs[] = {
+    JS_CFUNC_DEF("now", 0, js_Date_now ),
+    JS_CFUNC_DEF("parse", 1, js_Date_parse ),
+    JS_CFUNC_DEF("UTC", 7, js_Date_UTC ),
+};
+
+static const JSCFunctionListEntry js_date_proto_funcs[] = {
+    JS_CFUNC_DEF("valueOf", 0, js_date_getTime ),
+    JS_CFUNC_MAGIC_DEF("toString", 0, get_date_string, 0x13 ),
+    JS_CFUNC_DEF("[Symbol.toPrimitive]", 1, js_date_Symbol_toPrimitive ),
+    JS_CFUNC_MAGIC_DEF("toUTCString", 0, get_date_string, 0x03 ),
+    JS_ALIAS_DEF("toGMTString", "toUTCString" ),
+    JS_CFUNC_MAGIC_DEF("toISOString", 0, get_date_string, 0x23 ),
+    JS_CFUNC_MAGIC_DEF("toDateString", 0, get_date_string, 0x11 ),
+    JS_CFUNC_MAGIC_DEF("toTimeString", 0, get_date_string, 0x12 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleString", 0, get_date_string, 0x33 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleDateString", 0, get_date_string, 0x31 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleTimeString", 0, get_date_string, 0x32 ),
+    JS_CFUNC_DEF("getTimezoneOffset", 0, js_date_getTimezoneOffset ),
+    JS_CFUNC_DEF("getTime", 0, js_date_getTime ),
+    JS_CFUNC_MAGIC_DEF("getYear", 0, get_date_field, 0x101 ),
+    JS_CFUNC_MAGIC_DEF("getFullYear", 0, get_date_field, 0x01 ),
+    JS_CFUNC_MAGIC_DEF("getUTCFullYear", 0, get_date_field, 0x00 ),
+    JS_CFUNC_MAGIC_DEF("getMonth", 0, get_date_field, 0x11 ),
+    JS_CFUNC_MAGIC_DEF("getUTCMonth", 0, get_date_field, 0x10 ),
+    JS_CFUNC_MAGIC_DEF("getDate", 0, get_date_field, 0x21 ),
+    JS_CFUNC_MAGIC_DEF("getUTCDate", 0, get_date_field, 0x20 ),
+    JS_CFUNC_MAGIC_DEF("getHours", 0, get_date_field, 0x31 ),
+    JS_CFUNC_MAGIC_DEF("getUTCHours", 0, get_date_field, 0x30 ),
+    JS_CFUNC_MAGIC_DEF("getMinutes", 0, get_date_field, 0x41 ),
+    JS_CFUNC_MAGIC_DEF("getUTCMinutes", 0, get_date_field, 0x40 ),
+    JS_CFUNC_MAGIC_DEF("getSeconds", 0, get_date_field, 0x51 ),
+    JS_CFUNC_MAGIC_DEF("getUTCSeconds", 0, get_date_field, 0x50 ),
+    JS_CFUNC_MAGIC_DEF("getMilliseconds", 0, get_date_field, 0x61 ),
+    JS_CFUNC_MAGIC_DEF("getUTCMilliseconds", 0, get_date_field, 0x60 ),
+    JS_CFUNC_MAGIC_DEF("getDay", 0, get_date_field, 0x71 ),
+    JS_CFUNC_MAGIC_DEF("getUTCDay", 0, get_date_field, 0x70 ),
+    JS_CFUNC_DEF("setTime", 1, js_date_setTime ),
+    JS_CFUNC_MAGIC_DEF("setMilliseconds", 1, set_date_field, 0x671 ),
+    JS_CFUNC_MAGIC_DEF("setUTCMilliseconds", 1, set_date_field, 0x670 ),
+    JS_CFUNC_MAGIC_DEF("setSeconds", 2, set_date_field, 0x571 ),
+    JS_CFUNC_MAGIC_DEF("setUTCSeconds", 2, set_date_field, 0x570 ),
+    JS_CFUNC_MAGIC_DEF("setMinutes", 3, set_date_field, 0x471 ),
+    JS_CFUNC_MAGIC_DEF("setUTCMinutes", 3, set_date_field, 0x470 ),
+    JS_CFUNC_MAGIC_DEF("setHours", 4, set_date_field, 0x371 ),
+    JS_CFUNC_MAGIC_DEF("setUTCHours", 4, set_date_field, 0x370 ),
+    JS_CFUNC_MAGIC_DEF("setDate", 1, set_date_field, 0x231 ),
+    JS_CFUNC_MAGIC_DEF("setUTCDate", 1, set_date_field, 0x230 ),
+    JS_CFUNC_MAGIC_DEF("setMonth", 2, set_date_field, 0x131 ),
+    JS_CFUNC_MAGIC_DEF("setUTCMonth", 2, set_date_field, 0x130 ),
+    JS_CFUNC_DEF("setYear", 1, js_date_setYear ),
+    JS_CFUNC_MAGIC_DEF("setFullYear", 3, set_date_field, 0x031 ),
+    JS_CFUNC_MAGIC_DEF("setUTCFullYear", 3, set_date_field, 0x030 ),
+    JS_CFUNC_DEF("toJSON", 1, js_date_toJSON ),
+};
+
+JSValue JS_NewDate(JSContext *ctx, double epoch_ms)
+{
+    JSValue obj = js_create_from_ctor(ctx, JS_UNDEFINED, JS_CLASS_DATE);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    JS_SetObjectData(ctx, obj, __JS_NewFloat64(ctx, time_clip(epoch_ms)));
+    return obj;
+}
+
+JS_BOOL JS_IsDate(JSValue v)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(v) != JS_TAG_OBJECT)
+        return FALSE;
+    return JS_VALUE_GET_OBJ(v)->class_id == JS_CLASS_DATE;
+}
+
+void JS_AddIntrinsicDate(JSContext *ctx)
+{
+    JSValueConst obj;
+
+    /* Date */
+    ctx->class_proto[JS_CLASS_DATE] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_DATE], js_date_proto_funcs,
+                               countof(js_date_proto_funcs));
+    obj = JS_NewGlobalCConstructor(ctx, "Date", js_date_constructor, 7,
+                                   ctx->class_proto[JS_CLASS_DATE]);
+    JS_SetPropertyFunctionList(ctx, obj, js_date_funcs, countof(js_date_funcs));
+}
+
+/* eval */
+
+void JS_AddIntrinsicEval(JSContext *ctx)
+{
+    ctx->eval_internal = __JS_EvalInternal;
+}
+
+#ifdef CONFIG_BIGNUM
+
+/* Operators */
+
+static void js_operator_set_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSOperatorSetData *opset = JS_GetOpaque(val, JS_CLASS_OPERATOR_SET);
+    int i, j;
+    JSBinaryOperatorDefEntry *ent;
+
+    if (opset) {
+        for(i = 0; i < JS_OVOP_COUNT; i++) {
+            if (opset->self_ops[i])
+                JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, opset->self_ops[i]));
+        }
+        for(j = 0; j < opset->left.count; j++) {
+            ent = &opset->left.tab[j];
+            for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+                if (ent->ops[i])
+                    JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, ent->ops[i]));
+            }
+        }
+        js_free_rt(rt, opset->left.tab);
+        for(j = 0; j < opset->right.count; j++) {
+            ent = &opset->right.tab[j];
+            for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+                if (ent->ops[i])
+                    JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, ent->ops[i]));
+            }
+        }
+        js_free_rt(rt, opset->right.tab);
+        js_free_rt(rt, opset);
+    }
+}
+
+static void js_operator_set_mark(JSRuntime *rt, JSValueConst val,
+                                 JS_MarkFunc *mark_func)
+{
+    JSOperatorSetData *opset = JS_GetOpaque(val, JS_CLASS_OPERATOR_SET);
+    int i, j;
+    JSBinaryOperatorDefEntry *ent;
+
+    if (opset) {
+        for(i = 0; i < JS_OVOP_COUNT; i++) {
+            if (opset->self_ops[i])
+                JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, opset->self_ops[i]),
+                             mark_func);
+        }
+        for(j = 0; j < opset->left.count; j++) {
+            ent = &opset->left.tab[j];
+            for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+                if (ent->ops[i])
+                    JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, ent->ops[i]),
+                                 mark_func);
+            }
+        }
+        for(j = 0; j < opset->right.count; j++) {
+            ent = &opset->right.tab[j];
+            for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+                if (ent->ops[i])
+                    JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, ent->ops[i]),
+                                 mark_func);
+            }
+        }
+    }
+}
+
+
+/* create an OperatorSet object */
+static JSValue js_operators_create_internal(JSContext *ctx,
+                                            int argc, JSValueConst *argv,
+                                            BOOL is_primitive)
+{
+    JSValue opset_obj, prop, obj;
+    JSOperatorSetData *opset, *opset1;
+    JSBinaryOperatorDef *def;
+    JSValueConst arg;
+    int i, j;
+    JSBinaryOperatorDefEntry *new_tab;
+    JSBinaryOperatorDefEntry *ent;
+    uint32_t op_count;
+
+    if (ctx->rt->operator_count == UINT32_MAX) {
+        return JS_ThrowTypeError(ctx, "too many operators");
+    }
+    opset_obj = JS_NewObjectProtoClass(ctx, JS_NULL, JS_CLASS_OPERATOR_SET);
+    if (JS_IsException(opset_obj))
+        goto fail;
+    opset = js_mallocz(ctx, sizeof(*opset));
+    if (!opset)
+        goto fail;
+    JS_SetOpaque(opset_obj, opset);
+    if (argc >= 1) {
+        arg = argv[0];
+        /* self operators */
+        for(i = 0; i < JS_OVOP_COUNT; i++) {
+            prop = JS_GetPropertyStr(ctx, arg, js_overloadable_operator_names[i]);
+            if (JS_IsException(prop))
+                goto fail;
+            if (!JS_IsUndefined(prop)) {
+                if (check_function(ctx, prop)) {
+                    JS_FreeValue(ctx, prop);
+                    goto fail;
+                }
+                opset->self_ops[i] = JS_VALUE_GET_OBJ(prop);
+            }
+        }
+    }
+    /* left & right operators */
+    for(j = 1; j < argc; j++) {
+        arg = argv[j];
+        prop = JS_GetPropertyStr(ctx, arg, "left");
+        if (JS_IsException(prop))
+            goto fail;
+        def = &opset->right;
+        if (JS_IsUndefined(prop)) {
+            prop = JS_GetPropertyStr(ctx, arg, "right");
+            if (JS_IsException(prop))
+                goto fail;
+            if (JS_IsUndefined(prop)) {
+                JS_ThrowTypeError(ctx, "left or right property must be present");
+                goto fail;
+            }
+            def = &opset->left;
+        }
+        /* get the operator set */
+        obj = JS_GetProperty(ctx, prop, JS_ATOM_prototype);
+        JS_FreeValue(ctx, prop);
+        if (JS_IsException(obj))
+            goto fail;
+        prop = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_operatorSet);
+        JS_FreeValue(ctx, obj);
+        if (JS_IsException(prop))
+            goto fail;
+        opset1 = JS_GetOpaque2(ctx, prop, JS_CLASS_OPERATOR_SET);
+        if (!opset1) {
+            JS_FreeValue(ctx, prop);
+            goto fail;
+        }
+        op_count = opset1->operator_counter;
+        JS_FreeValue(ctx, prop);
+
+        /* we assume there are few entries */
+        new_tab = js_realloc(ctx, def->tab,
+                             (def->count + 1) * sizeof(def->tab[0]));
+        if (!new_tab)
+            goto fail;
+        def->tab = new_tab;
+        def->count++;
+        ent = def->tab + def->count - 1;
+        memset(ent, 0, sizeof(def->tab[0]));
+        ent->operator_index = op_count;
+
+        for(i = 0; i < JS_OVOP_BINARY_COUNT; i++) {
+            prop = JS_GetPropertyStr(ctx, arg,
+                                     js_overloadable_operator_names[i]);
+            if (JS_IsException(prop))
+                goto fail;
+            if (!JS_IsUndefined(prop)) {
+                if (check_function(ctx, prop)) {
+                    JS_FreeValue(ctx, prop);
+                    goto fail;
+                }
+                ent->ops[i] = JS_VALUE_GET_OBJ(prop);
+            }
+        }
+    }
+    opset->is_primitive = is_primitive;
+    opset->operator_counter = ctx->rt->operator_count++;
+    return opset_obj;
+ fail:
+    JS_FreeValue(ctx, opset_obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_operators_create(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    return js_operators_create_internal(ctx, argc, argv, FALSE);
+}
+
+static JSValue js_operators_updateBigIntOperators(JSContext *ctx, JSValueConst this_val,
+                                                  int argc, JSValueConst *argv)
+{
+    JSValue opset_obj, prop;
+    JSOperatorSetData *opset;
+    const JSOverloadableOperatorEnum ops[2] = { JS_OVOP_DIV, JS_OVOP_POW };
+    JSOverloadableOperatorEnum op;
+    int i;
+
+    opset_obj = JS_GetProperty(ctx, ctx->class_proto[JS_CLASS_BIG_INT],
+                               JS_ATOM_Symbol_operatorSet);
+    if (JS_IsException(opset_obj))
+        goto fail;
+    opset = JS_GetOpaque2(ctx, opset_obj, JS_CLASS_OPERATOR_SET);
+    if (!opset)
+        goto fail;
+    for(i = 0; i < countof(ops); i++) {
+        op = ops[i];
+        prop = JS_GetPropertyStr(ctx, argv[0],
+                                 js_overloadable_operator_names[op]);
+        if (JS_IsException(prop))
+            goto fail;
+        if (!JS_IsUndefined(prop)) {
+            if (!JS_IsNull(prop) && check_function(ctx, prop)) {
+                JS_FreeValue(ctx, prop);
+                goto fail;
+            }
+            if (opset->self_ops[op])
+                JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, opset->self_ops[op]));
+            if (JS_IsNull(prop)) {
+                opset->self_ops[op] = NULL;
+            } else {
+                opset->self_ops[op] = JS_VALUE_GET_PTR(prop);
+            }
+        }
+    }
+    JS_FreeValue(ctx, opset_obj);
+    return JS_UNDEFINED;
+ fail:
+    JS_FreeValue(ctx, opset_obj);
+    return JS_EXCEPTION;
+}
+
+static int js_operators_set_default(JSContext *ctx, JSValueConst obj)
+{
+    JSValue opset_obj;
+
+    if (!JS_IsObject(obj)) /* in case the prototype is not defined */
+        return 0;
+    opset_obj = js_operators_create_internal(ctx, 0, NULL, TRUE);
+    if (JS_IsException(opset_obj))
+        return -1;
+    /* cannot be modified by the user */
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_Symbol_operatorSet,
+                           opset_obj, 0);
+    return 0;
+}
+
+static JSValue js_dummy_operators_ctor(JSContext *ctx, JSValueConst new_target,
+                                       int argc, JSValueConst *argv)
+{
+    return js_create_from_ctor(ctx, new_target, JS_CLASS_OBJECT);
+}
+
+static JSValue js_global_operators(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSValue func_obj, proto, opset_obj;
+
+    func_obj = JS_UNDEFINED;
+    proto = JS_NewObject(ctx);
+    if (JS_IsException(proto))
+        return JS_EXCEPTION;
+    opset_obj = js_operators_create_internal(ctx, argc, argv, FALSE);
+    if (JS_IsException(opset_obj))
+        goto fail;
+    JS_DefinePropertyValue(ctx, proto, JS_ATOM_Symbol_operatorSet,
+                           opset_obj, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    func_obj = JS_NewCFunction2(ctx, js_dummy_operators_ctor, "Operators",
+                                0, JS_CFUNC_constructor, 0);
+    if (JS_IsException(func_obj))
+        goto fail;
+    JS_SetConstructor2(ctx, func_obj, proto,
+                       0, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    JS_FreeValue(ctx, proto);
+    return func_obj;
+ fail:
+    JS_FreeValue(ctx, proto);
+    JS_FreeValue(ctx, func_obj);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_operators_funcs[] = {
+    JS_CFUNC_DEF("create", 1, js_operators_create ),
+    JS_CFUNC_DEF("updateBigIntOperators", 2, js_operators_updateBigIntOperators ),
+};
+
+/* must be called after all overloadable base types are initialized */
+void JS_AddIntrinsicOperators(JSContext *ctx)
+{
+    JSValue obj;
+
+    ctx->allow_operator_overloading = TRUE;
+    obj = JS_NewCFunction(ctx, js_global_operators, "Operators", 1);
+    JS_SetPropertyFunctionList(ctx, obj,
+                               js_operators_funcs,
+                               countof(js_operators_funcs));
+    JS_DefinePropertyValue(ctx, ctx->global_obj, JS_ATOM_Operators,
+                           obj,
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    /* add default operatorSets */
+    js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_BOOLEAN]);
+    js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_NUMBER]);
+    js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_STRING]);
+    js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_BIG_INT]);
+    js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_BIG_FLOAT]);
+    js_operators_set_default(ctx, ctx->class_proto[JS_CLASS_BIG_DECIMAL]);
+}
+#endif /* CONFIG_BIGNUM */
+
+/* BigInt */
+
+static JSValue JS_ToBigIntCtorFree(JSContext *ctx, JSValue val)
+{
+    uint32_t tag;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+        val = JS_NewBigInt64(ctx, JS_VALUE_GET_INT(val));
+        break;
+    case JS_TAG_BIG_INT:
+        break;
+    case JS_TAG_FLOAT64:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+#endif
+        {
+            bf_t *a, a_s;
+
+            a = JS_ToBigFloat(ctx, &a_s, val);
+            if (!a) {
+                JS_FreeValue(ctx, val);
+                return JS_EXCEPTION;
+            }
+            if (!bf_is_finite(a)) {
+                JS_FreeValue(ctx, val);
+                val = JS_ThrowRangeError(ctx, "cannot convert NaN or Infinity to BigInt");
+            } else {
+                JSValue val1 = JS_NewBigInt(ctx);
+                bf_t *r;
+                int ret;
+                if (JS_IsException(val1)) {
+                    JS_FreeValue(ctx, val);
+                    return JS_EXCEPTION;
+                }
+                r = JS_GetBigInt(val1);
+                ret = bf_set(r, a);
+                ret |= bf_rint(r, BF_RNDZ);
+                JS_FreeValue(ctx, val);
+                if (ret & BF_ST_MEM_ERROR) {
+                    JS_FreeValue(ctx, val1);
+                    val = JS_ThrowOutOfMemory(ctx);
+                } else if (ret & BF_ST_INEXACT) {
+                    JS_FreeValue(ctx, val1);
+                    val = JS_ThrowRangeError(ctx, "cannot convert to BigInt: not an integer");
+                } else {
+                    val = JS_CompactBigInt(ctx, val1);
+                }
+            }
+            if (a == &a_s)
+                bf_delete(a);
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_DECIMAL:
+        val = JS_ToStringFree(ctx, val);
+        if (JS_IsException(val))
+            break;
+        goto redo;
+#endif
+    case JS_TAG_STRING:
+        val = JS_StringToBigIntErr(ctx, val);
+        break;
+    case JS_TAG_OBJECT:
+        val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
+        if (JS_IsException(val))
+            break;
+        goto redo;
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+    default:
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeError(ctx, "cannot convert to BigInt");
+    }
+    return val;
+}
+
+static JSValue js_bigint_constructor(JSContext *ctx,
+                                     JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    if (!JS_IsUndefined(new_target))
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    return JS_ToBigIntCtorFree(ctx, JS_DupValue(ctx, argv[0]));
+}
+
+static JSValue js_thisBigIntValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_IsBigInt(ctx, this_val))
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_BIG_INT) {
+            if (JS_IsBigInt(ctx, p->u.object_data))
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a BigInt");
+}
+
+static JSValue js_bigint_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int base;
+    JSValue ret;
+
+    val = js_thisBigIntValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (argc == 0 || JS_IsUndefined(argv[0])) {
+        base = 10;
+    } else {
+        base = js_get_radix(ctx, argv[0]);
+        if (base < 0)
+            goto fail;
+    }
+    ret = js_bigint_to_string1(ctx, val, base);
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigint_valueOf(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return js_thisBigIntValue(ctx, this_val);
+}
+
+#ifdef CONFIG_BIGNUM
+static JSValue js_bigint_div(JSContext *ctx,
+                              JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic)
+{
+    bf_t a_s, b_s, *a, *b, *r, *q;
+    int status;
+    JSValue q_val, r_val;
+
+    q_val = JS_NewBigInt(ctx);
+    if (JS_IsException(q_val))
+        return JS_EXCEPTION;
+    r_val = JS_NewBigInt(ctx);
+    if (JS_IsException(r_val))
+        goto fail;
+    b = NULL;
+    a = JS_ToBigInt(ctx, &a_s, argv[0]);
+    if (!a)
+        goto fail;
+    b = JS_ToBigInt(ctx, &b_s, argv[1]);
+    if (!b) {
+        JS_FreeBigInt(ctx, a, &a_s);
+        goto fail;
+    }
+    q = JS_GetBigInt(q_val);
+    r = JS_GetBigInt(r_val);
+    status = bf_divrem(q, r, a, b, BF_PREC_INF, BF_RNDZ, magic & 0xf);
+    JS_FreeBigInt(ctx, a, &a_s);
+    JS_FreeBigInt(ctx, b, &b_s);
+    if (unlikely(status)) {
+        throw_bf_exception(ctx, status);
+        goto fail;
+    }
+    q_val = JS_CompactBigInt(ctx, q_val);
+    if (magic & 0x10) {
+        JSValue ret;
+        ret = JS_NewArray(ctx);
+        if (JS_IsException(ret))
+            goto fail;
+        JS_SetPropertyUint32(ctx, ret, 0, q_val);
+        JS_SetPropertyUint32(ctx, ret, 1, JS_CompactBigInt(ctx, r_val));
+        return ret;
+    } else {
+        JS_FreeValue(ctx, r_val);
+        return q_val;
+    }
+ fail:
+    JS_FreeValue(ctx, q_val);
+    JS_FreeValue(ctx, r_val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigint_sqrt(JSContext *ctx,
+                               JSValueConst this_val,
+                               int argc, JSValueConst *argv, int magic)
+{
+    bf_t a_s, *a, *r, *rem;
+    int status;
+    JSValue r_val, rem_val;
+
+    r_val = JS_NewBigInt(ctx);
+    if (JS_IsException(r_val))
+        return JS_EXCEPTION;
+    rem_val = JS_NewBigInt(ctx);
+    if (JS_IsException(rem_val))
+        return JS_EXCEPTION;
+    r = JS_GetBigInt(r_val);
+    rem = JS_GetBigInt(rem_val);
+
+    a = JS_ToBigInt(ctx, &a_s, argv[0]);
+    if (!a)
+        goto fail;
+    status = bf_sqrtrem(r, rem, a);
+    JS_FreeBigInt(ctx, a, &a_s);
+    if (unlikely(status & ~BF_ST_INEXACT)) {
+        throw_bf_exception(ctx, status);
+        goto fail;
+    }
+    r_val = JS_CompactBigInt(ctx, r_val);
+    if (magic) {
+        JSValue ret;
+        ret = JS_NewArray(ctx);
+        if (JS_IsException(ret))
+            goto fail;
+        JS_SetPropertyUint32(ctx, ret, 0, r_val);
+        JS_SetPropertyUint32(ctx, ret, 1, JS_CompactBigInt(ctx, rem_val));
+        return ret;
+    } else {
+        JS_FreeValue(ctx, rem_val);
+        return r_val;
+    }
+ fail:
+    JS_FreeValue(ctx, r_val);
+    JS_FreeValue(ctx, rem_val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigint_op1(JSContext *ctx,
+                              JSValueConst this_val,
+                              int argc, JSValueConst *argv,
+                              int magic)
+{
+    bf_t a_s, *a;
+    int64_t res;
+
+    a = JS_ToBigInt(ctx, &a_s, argv[0]);
+    if (!a)
+        return JS_EXCEPTION;
+    switch(magic) {
+    case 0: /* floorLog2 */
+        if (a->sign || a->expn <= 0) {
+            res = -1;
+        } else {
+            res = a->expn - 1;
+        }
+        break;
+    case 1: /* ctz */
+        if (bf_is_zero(a)) {
+            res = -1;
+        } else {
+            res = bf_get_exp_min(a);
+        }
+        break;
+    default:
+        abort();
+    }
+    JS_FreeBigInt(ctx, a, &a_s);
+    return JS_NewBigInt64(ctx, res);
+}
+#endif
+
+static JSValue js_bigint_asUintN(JSContext *ctx,
+                                  JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int asIntN)
+{
+    uint64_t bits;
+    bf_t a_s, *a = &a_s, *r, mask_s, *mask = &mask_s;
+    JSValue res;
+
+    if (JS_ToIndex(ctx, &bits, argv[0]))
+        return JS_EXCEPTION;
+    res = JS_NewBigInt(ctx);
+    if (JS_IsException(res))
+        return JS_EXCEPTION;
+    r = JS_GetBigInt(res);
+    a = JS_ToBigInt(ctx, &a_s, argv[1]);
+    if (!a) {
+        JS_FreeValue(ctx, res);
+        return JS_EXCEPTION;
+    }
+    /* XXX: optimize */
+    r = JS_GetBigInt(res);
+    bf_init(ctx->bf_ctx, mask);
+    bf_set_ui(mask, 1);
+    bf_mul_2exp(mask, bits, BF_PREC_INF, BF_RNDZ);
+    bf_add_si(mask, mask, -1, BF_PREC_INF, BF_RNDZ);
+    bf_logic_and(r, a, mask);
+    if (asIntN && bits != 0) {
+        bf_set_ui(mask, 1);
+        bf_mul_2exp(mask, bits - 1, BF_PREC_INF, BF_RNDZ);
+        if (bf_cmpu(r, mask) >= 0) {
+            bf_set_ui(mask, 1);
+            bf_mul_2exp(mask, bits, BF_PREC_INF, BF_RNDZ);
+            bf_sub(r, r, mask, BF_PREC_INF, BF_RNDZ);
+        }
+    }
+    bf_delete(mask);
+    JS_FreeBigInt(ctx, a, &a_s);
+    return JS_CompactBigInt(ctx, res);
+}
+
+static const JSCFunctionListEntry js_bigint_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("asUintN", 2, js_bigint_asUintN, 0 ),
+    JS_CFUNC_MAGIC_DEF("asIntN", 2, js_bigint_asUintN, 1 ),
+#ifdef CONFIG_BIGNUM
+    /* QuickJS extensions */
+    JS_CFUNC_MAGIC_DEF("tdiv", 2, js_bigint_div, BF_RNDZ ),
+    JS_CFUNC_MAGIC_DEF("fdiv", 2, js_bigint_div, BF_RNDD ),
+    JS_CFUNC_MAGIC_DEF("cdiv", 2, js_bigint_div, BF_RNDU ),
+    JS_CFUNC_MAGIC_DEF("ediv", 2, js_bigint_div, BF_DIVREM_EUCLIDIAN ),
+    JS_CFUNC_MAGIC_DEF("tdivrem", 2, js_bigint_div, BF_RNDZ | 0x10 ),
+    JS_CFUNC_MAGIC_DEF("fdivrem", 2, js_bigint_div, BF_RNDD | 0x10 ),
+    JS_CFUNC_MAGIC_DEF("cdivrem", 2, js_bigint_div, BF_RNDU | 0x10 ),
+    JS_CFUNC_MAGIC_DEF("edivrem", 2, js_bigint_div, BF_DIVREM_EUCLIDIAN | 0x10 ),
+    JS_CFUNC_MAGIC_DEF("sqrt", 1, js_bigint_sqrt, 0 ),
+    JS_CFUNC_MAGIC_DEF("sqrtrem", 1, js_bigint_sqrt, 1 ),
+    JS_CFUNC_MAGIC_DEF("floorLog2", 1, js_bigint_op1, 0 ),
+    JS_CFUNC_MAGIC_DEF("ctz", 1, js_bigint_op1, 1 ),
+#endif
+};
+
+static const JSCFunctionListEntry js_bigint_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_bigint_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_bigint_valueOf ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "BigInt", JS_PROP_CONFIGURABLE ),
+};
+
+void JS_AddIntrinsicBigInt(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValueConst obj1;
+
+    rt->bigint_ops.to_string = js_bigint_to_string;
+    rt->bigint_ops.from_string = js_string_to_bigint;
+    rt->bigint_ops.unary_arith = js_unary_arith_bigint;
+    rt->bigint_ops.binary_arith = js_binary_arith_bigint;
+    rt->bigint_ops.compare = js_compare_bigfloat;
+
+    ctx->class_proto[JS_CLASS_BIG_INT] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_BIG_INT],
+                               js_bigint_proto_funcs,
+                               countof(js_bigint_proto_funcs));
+    obj1 = JS_NewGlobalCConstructor(ctx, "BigInt", js_bigint_constructor, 1,
+                                    ctx->class_proto[JS_CLASS_BIG_INT]);
+    JS_SetPropertyFunctionList(ctx, obj1, js_bigint_funcs,
+                               countof(js_bigint_funcs));
+}
+
+#ifdef CONFIG_BIGNUM
+
+/* BigFloat */
+
+static JSValue js_thisBigFloatValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_IsBigFloat(this_val))
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_BIG_FLOAT) {
+            if (JS_IsBigFloat(p->u.object_data))
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a bigfloat");
+}
+
+static JSValue js_bigfloat_toString(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int base;
+    JSValue ret;
+
+    val = js_thisBigFloatValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (argc == 0 || JS_IsUndefined(argv[0])) {
+        base = 10;
+    } else {
+        base = js_get_radix(ctx, argv[0]);
+        if (base < 0)
+            goto fail;
+    }
+    ret = js_ftoa(ctx, val, base, 0, BF_RNDN | BF_FTOA_FORMAT_FREE_MIN);
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigfloat_valueOf(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    return js_thisBigFloatValue(ctx, this_val);
+}
+
+static int bigfloat_get_rnd_mode(JSContext *ctx, JSValueConst val)
+{
+    int rnd_mode;
+    if (JS_ToInt32Sat(ctx, &rnd_mode, val))
+        return -1;
+    if (rnd_mode < BF_RNDN || rnd_mode > BF_RNDF) {
+        JS_ThrowRangeError(ctx, "invalid rounding mode");
+        return -1;
+    }
+    return rnd_mode;
+}
+
+static JSValue js_bigfloat_toFixed(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    int64_t f;
+    int rnd_mode, radix;
+
+    val = js_thisBigFloatValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToInt64Sat(ctx, &f, argv[0]))
+        goto fail;
+    if (f < 0 || f > BF_PREC_MAX) {
+        JS_ThrowRangeError(ctx, "invalid number of digits");
+        goto fail;
+    }
+    rnd_mode = BF_RNDNA;
+    radix = 10;
+    /* XXX: swap parameter order for rounding mode and radix */
+    if (argc > 1) {
+        rnd_mode = bigfloat_get_rnd_mode(ctx, argv[1]);
+        if (rnd_mode < 0)
+            goto fail;
+    }
+    if (argc > 2) {
+        radix = js_get_radix(ctx, argv[2]);
+        if (radix < 0)
+            goto fail;
+    }
+    ret = js_ftoa(ctx, val, radix, f, rnd_mode | BF_FTOA_FORMAT_FRAC);
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static BOOL js_bigfloat_is_finite(JSContext *ctx, JSValueConst val)
+{
+    BOOL res;
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            res = bf_is_finite(&p->num);
+        }
+        break;
+    default:
+        res = FALSE;
+        break;
+    }
+    return res;
+}
+
+static JSValue js_bigfloat_toExponential(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    int64_t f;
+    int rnd_mode, radix;
+
+    val = js_thisBigFloatValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToInt64Sat(ctx, &f, argv[0]))
+        goto fail;
+    if (!js_bigfloat_is_finite(ctx, val)) {
+        ret = JS_ToString(ctx, val);
+    } else if (JS_IsUndefined(argv[0])) {
+        ret = js_ftoa(ctx, val, 10, 0,
+                      BF_RNDN | BF_FTOA_FORMAT_FREE_MIN | BF_FTOA_FORCE_EXP);
+    } else {
+        if (f < 0 || f > BF_PREC_MAX) {
+            JS_ThrowRangeError(ctx, "invalid number of digits");
+            goto fail;
+        }
+        rnd_mode = BF_RNDNA;
+        radix = 10;
+        if (argc > 1) {
+            rnd_mode = bigfloat_get_rnd_mode(ctx, argv[1]);
+            if (rnd_mode < 0)
+                goto fail;
+        }
+        if (argc > 2) {
+            radix = js_get_radix(ctx, argv[2]);
+            if (radix < 0)
+                goto fail;
+        }
+        ret = js_ftoa(ctx, val, radix, f + 1,
+                      rnd_mode | BF_FTOA_FORMAT_FIXED | BF_FTOA_FORCE_EXP);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigfloat_toPrecision(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    int64_t p;
+    int rnd_mode, radix;
+
+    val = js_thisBigFloatValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_IsUndefined(argv[0]))
+        goto to_string;
+    if (JS_ToInt64Sat(ctx, &p, argv[0]))
+        goto fail;
+    if (!js_bigfloat_is_finite(ctx, val)) {
+    to_string:
+        ret = JS_ToString(ctx, this_val);
+    } else {
+        if (p < 1 || p > BF_PREC_MAX) {
+            JS_ThrowRangeError(ctx, "invalid number of digits");
+            goto fail;
+        }
+        rnd_mode = BF_RNDNA;
+        radix = 10;
+        if (argc > 1) {
+            rnd_mode = bigfloat_get_rnd_mode(ctx, argv[1]);
+            if (rnd_mode < 0)
+                goto fail;
+        }
+        if (argc > 2) {
+            radix = js_get_radix(ctx, argv[2]);
+            if (radix < 0)
+                goto fail;
+        }
+        ret = js_ftoa(ctx, val, radix, p, rnd_mode | BF_FTOA_FORMAT_FIXED);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_bigfloat_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_bigfloat_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_bigfloat_valueOf ),
+    JS_CFUNC_DEF("toPrecision", 1, js_bigfloat_toPrecision ),
+    JS_CFUNC_DEF("toFixed", 1, js_bigfloat_toFixed ),
+    JS_CFUNC_DEF("toExponential", 1, js_bigfloat_toExponential ),
+};
+
+static JSValue js_bigfloat_constructor(JSContext *ctx,
+                                       JSValueConst new_target,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue val;
+    if (!JS_IsUndefined(new_target))
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    if (argc == 0) {
+        bf_t *r;
+        val = JS_NewBigFloat(ctx);
+        if (JS_IsException(val))
+            return val;
+        r = JS_GetBigFloat(val);
+        bf_set_zero(r, 0);
+    } else {
+        val = JS_DupValue(ctx, argv[0]);
+    redo:
+        switch(JS_VALUE_GET_NORM_TAG(val)) {
+        case JS_TAG_BIG_FLOAT:
+            break;
+        case JS_TAG_FLOAT64:
+            {
+                bf_t *r;
+                double d = JS_VALUE_GET_FLOAT64(val);
+                val = JS_NewBigFloat(ctx);
+                if (JS_IsException(val))
+                    break;
+                r = JS_GetBigFloat(val);
+                if (bf_set_float64(r, d))
+                    goto fail;
+            }
+            break;
+        case JS_TAG_INT:
+            {
+                bf_t *r;
+                int32_t v = JS_VALUE_GET_INT(val);
+                val = JS_NewBigFloat(ctx);
+                if (JS_IsException(val))
+                    break;
+                r = JS_GetBigFloat(val);
+                if (bf_set_si(r, v))
+                    goto fail;
+            }
+            break;
+        case JS_TAG_BIG_INT:
+            /* We keep the full precision of the integer */
+            {
+                JSBigFloat *p = JS_VALUE_GET_PTR(val);
+                val = JS_MKPTR(JS_TAG_BIG_FLOAT, p);
+            }
+            break;
+        case JS_TAG_BIG_DECIMAL:
+            val = JS_ToStringFree(ctx, val);
+            if (JS_IsException(val))
+                break;
+            goto redo;
+        case JS_TAG_STRING:
+            {
+                const char *str, *p;
+                size_t len;
+                int err;
+
+                str = JS_ToCStringLen(ctx, &len, val);
+                JS_FreeValue(ctx, val);
+                if (!str)
+                    return JS_EXCEPTION;
+                p = str;
+                p += skip_spaces(p);
+                if ((p - str) == len) {
+                    bf_t *r;
+                    val = JS_NewBigFloat(ctx);
+                    if (JS_IsException(val))
+                        break;
+                    r = JS_GetBigFloat(val);
+                    bf_set_zero(r, 0);
+                    err = 0;
+                } else {
+                    val = js_atof(ctx, p, &p, 0, ATOD_ACCEPT_BIN_OCT |
+                                  ATOD_TYPE_BIG_FLOAT |
+                                  ATOD_ACCEPT_PREFIX_AFTER_SIGN);
+                    if (JS_IsException(val)) {
+                        JS_FreeCString(ctx, str);
+                        return JS_EXCEPTION;
+                    }
+                    p += skip_spaces(p);
+                    err = ((p - str) != len);
+                }
+                JS_FreeCString(ctx, str);
+                if (err) {
+                    JS_FreeValue(ctx, val);
+                    return JS_ThrowSyntaxError(ctx, "invalid bigfloat literal");
+                }
+            }
+            break;
+        case JS_TAG_OBJECT:
+            val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
+            if (JS_IsException(val))
+                break;
+            goto redo;
+        case JS_TAG_NULL:
+        case JS_TAG_UNDEFINED:
+        default:
+            JS_FreeValue(ctx, val);
+            return JS_ThrowTypeError(ctx, "cannot convert to bigfloat");
+        }
+    }
+    return val;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigfloat_get_const(JSContext *ctx,
+                                     JSValueConst this_val, int magic)
+{
+    bf_t *r;
+    JSValue val;
+    val = JS_NewBigFloat(ctx);
+    if (JS_IsException(val))
+        return val;
+    r = JS_GetBigFloat(val);
+    switch(magic) {
+    case 0: /* PI */
+        bf_const_pi(r, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case 1: /* LN2 */
+        bf_const_log2(r, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case 2: /* MIN_VALUE */
+    case 3: /* MAX_VALUE */
+        {
+            slimb_t e_range, e;
+            e_range = (limb_t)1 << (bf_get_exp_bits(ctx->fp_env.flags) - 1);
+            bf_set_ui(r, 1);
+            if (magic == 2) {
+                e = -e_range + 2;
+                if (ctx->fp_env.flags & BF_FLAG_SUBNORMAL)
+                    e -= ctx->fp_env.prec - 1;
+                bf_mul_2exp(r, e, ctx->fp_env.prec, ctx->fp_env.flags);
+            } else {
+                bf_mul_2exp(r, ctx->fp_env.prec, ctx->fp_env.prec,
+                            ctx->fp_env.flags);
+                bf_add_si(r, r, -1, ctx->fp_env.prec, ctx->fp_env.flags);
+                bf_mul_2exp(r, e_range - ctx->fp_env.prec, ctx->fp_env.prec,
+                            ctx->fp_env.flags);
+            }
+        }
+        break;
+    case 4: /* EPSILON */
+        bf_set_ui(r, 1);
+        bf_mul_2exp(r, 1 - ctx->fp_env.prec,
+                    ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    default:
+        abort();
+    }
+    return val;
+}
+
+static JSValue js_bigfloat_parseFloat(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    bf_t *a;
+    const char *str;
+    JSValue ret;
+    int radix;
+    JSFloatEnv *fe;
+
+    str = JS_ToCString(ctx, argv[0]);
+    if (!str)
+        return JS_EXCEPTION;
+    if (JS_ToInt32(ctx, &radix, argv[1])) {
+    fail:
+        JS_FreeCString(ctx, str);
+        return JS_EXCEPTION;
+    }
+    if (radix != 0 && (radix < 2 || radix > 36)) {
+        JS_ThrowRangeError(ctx, "radix must be between 2 and 36");
+        goto fail;
+    }
+    fe = &ctx->fp_env;
+    if (argc > 2) {
+        fe = JS_GetOpaque2(ctx, argv[2], JS_CLASS_FLOAT_ENV);
+        if (!fe)
+            goto fail;
+    }
+    ret = JS_NewBigFloat(ctx);
+    if (JS_IsException(ret))
+        goto done;
+    a = JS_GetBigFloat(ret);
+    /* XXX: use js_atof() */
+    bf_atof(a, str, NULL, radix, fe->prec, fe->flags);
+ done:
+    JS_FreeCString(ctx, str);
+    return ret;
+}
+
+static JSValue js_bigfloat_isFinite(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValueConst val = argv[0];
+    JSBigFloat *p;
+
+    if (JS_VALUE_GET_NORM_TAG(val) != JS_TAG_BIG_FLOAT)
+        return JS_FALSE;
+    p = JS_VALUE_GET_PTR(val);
+    return JS_NewBool(ctx, bf_is_finite(&p->num));
+}
+
+static JSValue js_bigfloat_isNaN(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValueConst val = argv[0];
+    JSBigFloat *p;
+
+    if (JS_VALUE_GET_NORM_TAG(val) != JS_TAG_BIG_FLOAT)
+        return JS_FALSE;
+    p = JS_VALUE_GET_PTR(val);
+    return JS_NewBool(ctx, bf_is_nan(&p->num));
+}
+
+enum {
+    MATH_OP_ABS,
+    MATH_OP_FLOOR,
+    MATH_OP_CEIL,
+    MATH_OP_ROUND,
+    MATH_OP_TRUNC,
+    MATH_OP_SQRT,
+    MATH_OP_FPROUND,
+    MATH_OP_ACOS,
+    MATH_OP_ASIN,
+    MATH_OP_ATAN,
+    MATH_OP_ATAN2,
+    MATH_OP_COS,
+    MATH_OP_EXP,
+    MATH_OP_LOG,
+    MATH_OP_POW,
+    MATH_OP_SIN,
+    MATH_OP_TAN,
+    MATH_OP_FMOD,
+    MATH_OP_REM,
+    MATH_OP_SIGN,
+
+    MATH_OP_ADD,
+    MATH_OP_SUB,
+    MATH_OP_MUL,
+    MATH_OP_DIV,
+};
+
+static JSValue js_bigfloat_fop(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv, int magic)
+{
+    bf_t a_s, *a, *r;
+    JSFloatEnv *fe;
+    int rnd_mode;
+    JSValue op1, res;
+
+    op1 = JS_ToNumeric(ctx, argv[0]);
+    if (JS_IsException(op1))
+        return op1;
+    a = JS_ToBigFloat(ctx, &a_s, op1);
+    if (!a) {
+        JS_FreeValue(ctx, op1);
+        return JS_EXCEPTION;
+    }
+    fe = &ctx->fp_env;
+    if (argc > 1) {
+        fe = JS_GetOpaque2(ctx, argv[1], JS_CLASS_FLOAT_ENV);
+        if (!fe)
+            goto fail;
+    }
+    res = JS_NewBigFloat(ctx);
+    if (JS_IsException(res)) {
+    fail:
+        if (a == &a_s)
+            bf_delete(a);
+        JS_FreeValue(ctx, op1);
+        return JS_EXCEPTION;
+    }
+    r = JS_GetBigFloat(res);
+    switch (magic) {
+    case MATH_OP_ABS:
+        bf_set(r, a);
+        r->sign = 0;
+        break;
+    case MATH_OP_FLOOR:
+        rnd_mode = BF_RNDD;
+        goto rint;
+    case MATH_OP_CEIL:
+        rnd_mode = BF_RNDU;
+        goto rint;
+    case MATH_OP_ROUND:
+        rnd_mode = BF_RNDNA;
+        goto rint;
+    case MATH_OP_TRUNC:
+        rnd_mode = BF_RNDZ;
+    rint:
+        bf_set(r, a);
+        fe->status |= bf_rint(r, rnd_mode);
+        break;
+    case MATH_OP_SQRT:
+        fe->status |= bf_sqrt(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_FPROUND:
+        bf_set(r, a);
+        fe->status |= bf_round(r, fe->prec, fe->flags);
+        break;
+    case MATH_OP_ACOS:
+        fe->status |= bf_acos(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_ASIN:
+        fe->status |= bf_asin(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_ATAN:
+        fe->status |= bf_atan(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_COS:
+        fe->status |= bf_cos(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_EXP:
+        fe->status |= bf_exp(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_LOG:
+        fe->status |= bf_log(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_SIN:
+        fe->status |= bf_sin(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_TAN:
+        fe->status |= bf_tan(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_SIGN:
+        if (bf_is_nan(a) || bf_is_zero(a)) {
+            bf_set(r, a);
+        } else {
+            bf_set_si(r, 1 - 2 * a->sign);
+        }
+        break;
+    default:
+        abort();
+    }
+    if (a == &a_s)
+        bf_delete(a);
+    JS_FreeValue(ctx, op1);
+    return res;
+}
+
+static JSValue js_bigfloat_fop2(JSContext *ctx, JSValueConst this_val,
+                            int argc, JSValueConst *argv, int magic)
+{
+    bf_t a_s, *a, b_s, *b, r_s, *r = &r_s;
+    JSFloatEnv *fe;
+    JSValue op1, op2, res;
+
+    op1 = JS_ToNumeric(ctx, argv[0]);
+    if (JS_IsException(op1))
+        return op1;
+    op2 = JS_ToNumeric(ctx, argv[1]);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        return op2;
+    }
+    a = JS_ToBigFloat(ctx, &a_s, op1);
+    if (!a)
+        goto fail1;
+    b = JS_ToBigFloat(ctx, &b_s, op2);
+    if (!b)
+        goto fail2;
+    fe = &ctx->fp_env;
+    if (argc > 2) {
+        fe = JS_GetOpaque2(ctx, argv[2], JS_CLASS_FLOAT_ENV);
+        if (!fe)
+            goto fail;
+    }
+    res = JS_NewBigFloat(ctx);
+    if (JS_IsException(res)) {
+    fail:
+        if (b == &b_s)
+            bf_delete(b);
+    fail2:
+        if (a == &a_s)
+            bf_delete(a);
+    fail1:
+        JS_FreeValue(ctx, op1);
+        JS_FreeValue(ctx, op2);
+        return JS_EXCEPTION;
+    }
+    r = JS_GetBigFloat(res);
+    switch (magic) {
+    case MATH_OP_ATAN2:
+        fe->status |= bf_atan2(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_POW:
+        fe->status |= bf_pow(r, a, b, fe->prec, fe->flags | BF_POW_JS_QUIRKS);
+        break;
+    case MATH_OP_FMOD:
+        fe->status |= bf_rem(r, a, b, fe->prec, fe->flags, BF_RNDZ);
+        break;
+    case MATH_OP_REM:
+        fe->status |= bf_rem(r, a, b, fe->prec, fe->flags, BF_RNDN);
+        break;
+    case MATH_OP_ADD:
+        fe->status |= bf_add(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_SUB:
+        fe->status |= bf_sub(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_MUL:
+        fe->status |= bf_mul(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_DIV:
+        fe->status |= bf_div(r, a, b, fe->prec, fe->flags);
+        break;
+    default:
+        abort();
+    }
+    if (a == &a_s)
+        bf_delete(a);
+    if (b == &b_s)
+        bf_delete(b);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return res;
+}
+
+static const JSCFunctionListEntry js_bigfloat_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("PI", js_bigfloat_get_const, NULL, 0 ),
+    JS_CGETSET_MAGIC_DEF("LN2", js_bigfloat_get_const, NULL, 1 ),
+    JS_CGETSET_MAGIC_DEF("MIN_VALUE", js_bigfloat_get_const, NULL, 2 ),
+    JS_CGETSET_MAGIC_DEF("MAX_VALUE", js_bigfloat_get_const, NULL, 3 ),
+    JS_CGETSET_MAGIC_DEF("EPSILON", js_bigfloat_get_const, NULL, 4 ),
+    JS_CFUNC_DEF("parseFloat", 1, js_bigfloat_parseFloat ),
+    JS_CFUNC_DEF("isFinite", 1, js_bigfloat_isFinite ),
+    JS_CFUNC_DEF("isNaN", 1, js_bigfloat_isNaN ),
+    JS_CFUNC_MAGIC_DEF("abs", 1, js_bigfloat_fop, MATH_OP_ABS ),
+    JS_CFUNC_MAGIC_DEF("fpRound", 1, js_bigfloat_fop, MATH_OP_FPROUND ),
+    JS_CFUNC_MAGIC_DEF("floor", 1, js_bigfloat_fop, MATH_OP_FLOOR ),
+    JS_CFUNC_MAGIC_DEF("ceil", 1, js_bigfloat_fop, MATH_OP_CEIL ),
+    JS_CFUNC_MAGIC_DEF("round", 1, js_bigfloat_fop, MATH_OP_ROUND ),
+    JS_CFUNC_MAGIC_DEF("trunc", 1, js_bigfloat_fop, MATH_OP_TRUNC ),
+    JS_CFUNC_MAGIC_DEF("sqrt", 1, js_bigfloat_fop, MATH_OP_SQRT ),
+    JS_CFUNC_MAGIC_DEF("acos", 1, js_bigfloat_fop, MATH_OP_ACOS ),
+    JS_CFUNC_MAGIC_DEF("asin", 1, js_bigfloat_fop, MATH_OP_ASIN ),
+    JS_CFUNC_MAGIC_DEF("atan", 1, js_bigfloat_fop, MATH_OP_ATAN ),
+    JS_CFUNC_MAGIC_DEF("atan2", 2, js_bigfloat_fop2, MATH_OP_ATAN2 ),
+    JS_CFUNC_MAGIC_DEF("cos", 1, js_bigfloat_fop, MATH_OP_COS ),
+    JS_CFUNC_MAGIC_DEF("exp", 1, js_bigfloat_fop, MATH_OP_EXP ),
+    JS_CFUNC_MAGIC_DEF("log", 1, js_bigfloat_fop, MATH_OP_LOG ),
+    JS_CFUNC_MAGIC_DEF("pow", 2, js_bigfloat_fop2, MATH_OP_POW ),
+    JS_CFUNC_MAGIC_DEF("sin", 1, js_bigfloat_fop, MATH_OP_SIN ),
+    JS_CFUNC_MAGIC_DEF("tan", 1, js_bigfloat_fop, MATH_OP_TAN ),
+    JS_CFUNC_MAGIC_DEF("sign", 1, js_bigfloat_fop, MATH_OP_SIGN ),
+    JS_CFUNC_MAGIC_DEF("add", 2, js_bigfloat_fop2, MATH_OP_ADD ),
+    JS_CFUNC_MAGIC_DEF("sub", 2, js_bigfloat_fop2, MATH_OP_SUB ),
+    JS_CFUNC_MAGIC_DEF("mul", 2, js_bigfloat_fop2, MATH_OP_MUL ),
+    JS_CFUNC_MAGIC_DEF("div", 2, js_bigfloat_fop2, MATH_OP_DIV ),
+    JS_CFUNC_MAGIC_DEF("fmod", 2, js_bigfloat_fop2, MATH_OP_FMOD ),
+    JS_CFUNC_MAGIC_DEF("remainder", 2, js_bigfloat_fop2, MATH_OP_REM ),
+};
+
+/* FloatEnv */
+
+static JSValue js_float_env_constructor(JSContext *ctx,
+                                        JSValueConst new_target,
+                                        int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    JSFloatEnv *fe;
+    int64_t prec;
+    int flags, rndmode;
+
+    prec = ctx->fp_env.prec;
+    flags = ctx->fp_env.flags;
+    if (!JS_IsUndefined(argv[0])) {
+        if (JS_ToInt64Sat(ctx, &prec, argv[0]))
+            return JS_EXCEPTION;
+        if (prec < BF_PREC_MIN || prec > BF_PREC_MAX)
+            return JS_ThrowRangeError(ctx, "invalid precision");
+        flags = BF_RNDN; /* RNDN, max exponent size, no subnormal */
+        if (argc > 1 && !JS_IsUndefined(argv[1])) {
+            if (JS_ToInt32Sat(ctx, &rndmode, argv[1]))
+                return JS_EXCEPTION;
+            if (rndmode < BF_RNDN || rndmode > BF_RNDF)
+                return JS_ThrowRangeError(ctx, "invalid rounding mode");
+            flags = rndmode;
+        }
+    }
+
+    obj = JS_NewObjectClass(ctx, JS_CLASS_FLOAT_ENV);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    fe = js_malloc(ctx, sizeof(*fe));
+    if (!fe)
+        return JS_EXCEPTION;
+    fe->prec = prec;
+    fe->flags = flags;
+    fe->status = 0;
+    JS_SetOpaque(obj, fe);
+    return obj;
+}
+
+static void js_float_env_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSFloatEnv *fe = JS_GetOpaque(val, JS_CLASS_FLOAT_ENV);
+    js_free_rt(rt, fe);
+}
+
+static JSValue js_float_env_get_prec(JSContext *ctx, JSValueConst this_val)
+{
+    return JS_NewInt64(ctx, ctx->fp_env.prec);
+}
+
+static JSValue js_float_env_get_expBits(JSContext *ctx, JSValueConst this_val)
+{
+    return JS_NewInt32(ctx, bf_get_exp_bits(ctx->fp_env.flags));
+}
+
+static JSValue js_float_env_setPrec(JSContext *ctx,
+                                    JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValueConst func;
+    int exp_bits, flags, saved_flags;
+    JSValue ret;
+    limb_t saved_prec;
+    int64_t prec;
+
+    func = argv[0];
+    if (JS_ToInt64Sat(ctx, &prec, argv[1]))
+        return JS_EXCEPTION;
+    if (prec < BF_PREC_MIN || prec > BF_PREC_MAX)
+        return JS_ThrowRangeError(ctx, "invalid precision");
+    exp_bits = BF_EXP_BITS_MAX;
+
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        if (JS_ToInt32Sat(ctx, &exp_bits, argv[2]))
+            return JS_EXCEPTION;
+        if (exp_bits < BF_EXP_BITS_MIN || exp_bits > BF_EXP_BITS_MAX)
+            return JS_ThrowRangeError(ctx, "invalid number of exponent bits");
+    }
+
+    flags = BF_RNDN | BF_FLAG_SUBNORMAL | bf_set_exp_bits(exp_bits);
+
+    saved_prec = ctx->fp_env.prec;
+    saved_flags = ctx->fp_env.flags;
+
+    ctx->fp_env.prec = prec;
+    ctx->fp_env.flags = flags;
+
+    ret = JS_Call(ctx, func, JS_UNDEFINED, 0, NULL);
+    /* always restore the floating point precision */
+    ctx->fp_env.prec = saved_prec;
+    ctx->fp_env.flags = saved_flags;
+    return ret;
+}
+
+#define FE_PREC      (-1)
+#define FE_EXP       (-2)
+#define FE_RNDMODE   (-3)
+#define FE_SUBNORMAL (-4)
+
+static JSValue js_float_env_proto_get_status(JSContext *ctx, JSValueConst this_val, int magic)
+{
+    JSFloatEnv *fe;
+    fe = JS_GetOpaque2(ctx, this_val, JS_CLASS_FLOAT_ENV);
+    if (!fe)
+        return JS_EXCEPTION;
+    switch(magic) {
+    case FE_PREC:
+        return JS_NewInt64(ctx, fe->prec);
+    case FE_EXP:
+        return JS_NewInt32(ctx, bf_get_exp_bits(fe->flags));
+    case FE_RNDMODE:
+        return JS_NewInt32(ctx, fe->flags & BF_RND_MASK);
+    case FE_SUBNORMAL:
+        return JS_NewBool(ctx, fe->flags & BF_FLAG_SUBNORMAL);
+    default:
+        return JS_NewBool(ctx, fe->status & magic);
+    }
+}
+
+static JSValue js_float_env_proto_set_status(JSContext *ctx, JSValueConst this_val, JSValueConst val, int magic)
+{
+    JSFloatEnv *fe;
+    int b;
+    int64_t prec;
+
+    fe = JS_GetOpaque2(ctx, this_val, JS_CLASS_FLOAT_ENV);
+    if (!fe)
+        return JS_EXCEPTION;
+    switch(magic) {
+    case FE_PREC:
+        if (JS_ToInt64Sat(ctx, &prec, val))
+            return JS_EXCEPTION;
+        if (prec < BF_PREC_MIN || prec > BF_PREC_MAX)
+            return JS_ThrowRangeError(ctx, "invalid precision");
+        fe->prec = prec;
+        break;
+    case FE_EXP:
+        if (JS_ToInt32Sat(ctx, &b, val))
+            return JS_EXCEPTION;
+        if (b < BF_EXP_BITS_MIN || b > BF_EXP_BITS_MAX)
+            return JS_ThrowRangeError(ctx, "invalid number of exponent bits");
+        fe->flags = (fe->flags & ~(BF_EXP_BITS_MASK << BF_EXP_BITS_SHIFT)) |
+            bf_set_exp_bits(b);
+        break;
+    case FE_RNDMODE:
+        b = bigfloat_get_rnd_mode(ctx, val);
+        if (b < 0)
+            return JS_EXCEPTION;
+        fe->flags = (fe->flags & ~BF_RND_MASK) | b;
+        break;
+    case FE_SUBNORMAL:
+        b = JS_ToBool(ctx, val);
+        fe->flags = (fe->flags & ~BF_FLAG_SUBNORMAL) | (b ? BF_FLAG_SUBNORMAL: 0);
+        break;
+    default:
+        b = JS_ToBool(ctx, val);
+        fe->status = (fe->status & ~magic) & ((-b) & magic);
+        break;
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_float_env_clearStatus(JSContext *ctx,
+                                        JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    JSFloatEnv *fe = JS_GetOpaque2(ctx, this_val, JS_CLASS_FLOAT_ENV);
+    if (!fe)
+        return JS_EXCEPTION;
+    fe->status = 0;
+    return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry js_float_env_funcs[] = {
+    JS_CGETSET_DEF("prec", js_float_env_get_prec, NULL ),
+    JS_CGETSET_DEF("expBits", js_float_env_get_expBits, NULL ),
+    JS_CFUNC_DEF("setPrec", 2, js_float_env_setPrec ),
+    JS_PROP_INT32_DEF("RNDN", BF_RNDN, 0 ),
+    JS_PROP_INT32_DEF("RNDZ", BF_RNDZ, 0 ),
+    JS_PROP_INT32_DEF("RNDU", BF_RNDU, 0 ),
+    JS_PROP_INT32_DEF("RNDD", BF_RNDD, 0 ),
+    JS_PROP_INT32_DEF("RNDNA", BF_RNDNA, 0 ),
+    JS_PROP_INT32_DEF("RNDA", BF_RNDA, 0 ),
+    JS_PROP_INT32_DEF("RNDF", BF_RNDF, 0 ),
+    JS_PROP_INT32_DEF("precMin", BF_PREC_MIN, 0 ),
+    JS_PROP_INT64_DEF("precMax", BF_PREC_MAX, 0 ),
+    JS_PROP_INT32_DEF("expBitsMin", BF_EXP_BITS_MIN, 0 ),
+    JS_PROP_INT32_DEF("expBitsMax", BF_EXP_BITS_MAX, 0 ),
+};
+
+static const JSCFunctionListEntry js_float_env_proto_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("prec", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, FE_PREC ),
+    JS_CGETSET_MAGIC_DEF("expBits", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, FE_EXP ),
+    JS_CGETSET_MAGIC_DEF("rndMode", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, FE_RNDMODE ),
+    JS_CGETSET_MAGIC_DEF("subnormal", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, FE_SUBNORMAL ),
+    JS_CGETSET_MAGIC_DEF("invalidOperation", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_INVALID_OP ),
+    JS_CGETSET_MAGIC_DEF("divideByZero", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_DIVIDE_ZERO ),
+    JS_CGETSET_MAGIC_DEF("overflow", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_OVERFLOW ),
+    JS_CGETSET_MAGIC_DEF("underflow", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_UNDERFLOW ),
+    JS_CGETSET_MAGIC_DEF("inexact", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_INEXACT ),
+    JS_CFUNC_DEF("clearStatus", 0, js_float_env_clearStatus ),
+};
+
+void JS_AddIntrinsicBigFloat(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValueConst obj1;
+
+    rt->bigfloat_ops.to_string = js_bigfloat_to_string;
+    rt->bigfloat_ops.from_string = js_string_to_bigfloat;
+    rt->bigfloat_ops.unary_arith = js_unary_arith_bigfloat;
+    rt->bigfloat_ops.binary_arith = js_binary_arith_bigfloat;
+    rt->bigfloat_ops.compare = js_compare_bigfloat;
+    rt->bigfloat_ops.mul_pow10_to_float64 = js_mul_pow10_to_float64;
+    rt->bigfloat_ops.mul_pow10 = js_mul_pow10;
+
+    ctx->class_proto[JS_CLASS_BIG_FLOAT] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_BIG_FLOAT],
+                               js_bigfloat_proto_funcs,
+                               countof(js_bigfloat_proto_funcs));
+    obj1 = JS_NewGlobalCConstructor(ctx, "BigFloat", js_bigfloat_constructor, 1,
+                                    ctx->class_proto[JS_CLASS_BIG_FLOAT]);
+    JS_SetPropertyFunctionList(ctx, obj1, js_bigfloat_funcs,
+                               countof(js_bigfloat_funcs));
+
+    ctx->class_proto[JS_CLASS_FLOAT_ENV] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_FLOAT_ENV],
+                               js_float_env_proto_funcs,
+                               countof(js_float_env_proto_funcs));
+    obj1 = JS_NewGlobalCConstructorOnly(ctx, "BigFloatEnv",
+                                        js_float_env_constructor, 1,
+                                        ctx->class_proto[JS_CLASS_FLOAT_ENV]);
+    JS_SetPropertyFunctionList(ctx, obj1, js_float_env_funcs,
+                               countof(js_float_env_funcs));
+}
+
+/* BigDecimal */
+
+static JSValue JS_ToBigDecimalFree(JSContext *ctx, JSValue val,
+                                   BOOL allow_null_or_undefined)
+{
+ redo:
+    switch(JS_VALUE_GET_NORM_TAG(val)) {
+    case JS_TAG_BIG_DECIMAL:
+        break;
+    case JS_TAG_NULL:
+        if (!allow_null_or_undefined)
+            goto fail;
+        /* fall thru */
+    case JS_TAG_BOOL:
+    case JS_TAG_INT:
+        {
+            bfdec_t *r;
+            int32_t v = JS_VALUE_GET_INT(val);
+
+            val = JS_NewBigDecimal(ctx);
+            if (JS_IsException(val))
+                break;
+            r = JS_GetBigDecimal(val);
+            if (bfdec_set_si(r, v)) {
+                JS_FreeValue(ctx, val);
+                val = JS_EXCEPTION;
+                break;
+            }
+        }
+        break;
+    case JS_TAG_FLOAT64:
+    case JS_TAG_BIG_INT:
+    case JS_TAG_BIG_FLOAT:
+        val = JS_ToStringFree(ctx, val);
+        if (JS_IsException(val))
+            break;
+        goto redo;
+    case JS_TAG_STRING:
+        {
+            const char *str, *p;
+            size_t len;
+            int err;
+
+            str = JS_ToCStringLen(ctx, &len, val);
+            JS_FreeValue(ctx, val);
+            if (!str)
+                return JS_EXCEPTION;
+            p = str;
+            p += skip_spaces(p);
+            if ((p - str) == len) {
+                bfdec_t *r;
+                val = JS_NewBigDecimal(ctx);
+                if (JS_IsException(val))
+                    break;
+                r = JS_GetBigDecimal(val);
+                bfdec_set_zero(r, 0);
+                err = 0;
+            } else {
+                val = js_atof(ctx, p, &p, 0, ATOD_TYPE_BIG_DECIMAL);
+                if (JS_IsException(val)) {
+                    JS_FreeCString(ctx, str);
+                    return JS_EXCEPTION;
+                }
+                p += skip_spaces(p);
+                err = ((p - str) != len);
+            }
+            JS_FreeCString(ctx, str);
+            if (err) {
+                JS_FreeValue(ctx, val);
+                return JS_ThrowSyntaxError(ctx, "invalid bigdecimal literal");
+            }
+        }
+        break;
+    case JS_TAG_OBJECT:
+        val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
+        if (JS_IsException(val))
+            break;
+        goto redo;
+    case JS_TAG_UNDEFINED:
+        {
+            bfdec_t *r;
+            if (!allow_null_or_undefined)
+                goto fail;
+            val = JS_NewBigDecimal(ctx);
+            if (JS_IsException(val))
+                break;
+            r = JS_GetBigDecimal(val);
+            bfdec_set_nan(r);
+        }
+        break;
+    default:
+    fail:
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeError(ctx, "cannot convert to bigdecimal");
+    }
+    return val;
+}
+
+static JSValue js_bigdecimal_constructor(JSContext *ctx,
+                                         JSValueConst new_target,
+                                         int argc, JSValueConst *argv)
+{
+    JSValue val;
+    if (!JS_IsUndefined(new_target))
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    if (argc == 0) {
+        bfdec_t *r;
+        val = JS_NewBigDecimal(ctx);
+        if (JS_IsException(val))
+            return val;
+        r = JS_GetBigDecimal(val);
+        bfdec_set_zero(r, 0);
+    } else {
+        val = JS_ToBigDecimalFree(ctx, JS_DupValue(ctx, argv[0]), FALSE);
+    }
+    return val;
+}
+
+static JSValue js_thisBigDecimalValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_IsBigDecimal(this_val))
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_BIG_DECIMAL) {
+            if (JS_IsBigDecimal(p->u.object_data))
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a bigdecimal");
+}
+
+static JSValue js_bigdecimal_toString(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    JSValue val;
+
+    val = js_thisBigDecimalValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    return JS_ToStringFree(ctx, val);
+}
+
+static JSValue js_bigdecimal_valueOf(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    return js_thisBigDecimalValue(ctx, this_val);
+}
+
+static int js_bigdecimal_get_rnd_mode(JSContext *ctx, JSValueConst obj)
+{
+    const char *str;
+    size_t size;
+    int rnd_mode;
+
+    str = JS_ToCStringLen(ctx, &size, obj);
+    if (!str)
+        return -1;
+    if (strlen(str) != size)
+        goto invalid_rounding_mode;
+    if (!strcmp(str, "floor")) {
+        rnd_mode = BF_RNDD;
+    } else if (!strcmp(str, "ceiling")) {
+        rnd_mode = BF_RNDU;
+    } else if (!strcmp(str, "down")) {
+        rnd_mode = BF_RNDZ;
+    } else if (!strcmp(str, "up")) {
+        rnd_mode = BF_RNDA;
+    } else if (!strcmp(str, "half-even")) {
+        rnd_mode = BF_RNDN;
+    } else if (!strcmp(str, "half-up")) {
+        rnd_mode = BF_RNDNA;
+    } else {
+    invalid_rounding_mode:
+        JS_FreeCString(ctx, str);
+        JS_ThrowTypeError(ctx, "invalid rounding mode");
+        return -1;
+    }
+    JS_FreeCString(ctx, str);
+    return rnd_mode;
+}
+
+typedef struct {
+    int64_t prec;
+    bf_flags_t flags;
+} BigDecimalEnv;
+
+static int js_bigdecimal_get_env(JSContext *ctx, BigDecimalEnv *fe,
+                                 JSValueConst obj)
+{
+    JSValue prop;
+    int64_t val;
+    BOOL has_prec;
+    int rnd_mode;
+
+    if (!JS_IsObject(obj)) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    prop = JS_GetProperty(ctx, obj, JS_ATOM_roundingMode);
+    if (JS_IsException(prop))
+        return -1;
+    rnd_mode = js_bigdecimal_get_rnd_mode(ctx, prop);
+    JS_FreeValue(ctx, prop);
+    if (rnd_mode < 0)
+        return -1;
+    fe->flags = rnd_mode;
+
+    prop = JS_GetProperty(ctx, obj, JS_ATOM_maximumSignificantDigits);
+    if (JS_IsException(prop))
+        return -1;
+    has_prec = FALSE;
+    if (!JS_IsUndefined(prop)) {
+        if (JS_ToInt64SatFree(ctx, &val, prop))
+            return -1;
+        if (val < 1 || val > BF_PREC_MAX)
+            goto invalid_precision;
+        fe->prec = val;
+        has_prec = TRUE;
+    }
+
+    prop = JS_GetProperty(ctx, obj, JS_ATOM_maximumFractionDigits);
+    if (JS_IsException(prop))
+        return -1;
+    if (!JS_IsUndefined(prop)) {
+        if (has_prec) {
+            JS_FreeValue(ctx, prop);
+            JS_ThrowTypeError(ctx, "cannot provide both maximumSignificantDigits and maximumFractionDigits");
+            return -1;
+        }
+        if (JS_ToInt64SatFree(ctx, &val, prop))
+            return -1;
+        if (val < 0 || val > BF_PREC_MAX) {
+        invalid_precision:
+            JS_ThrowTypeError(ctx, "invalid precision");
+            return -1;
+        }
+        fe->prec = val;
+        fe->flags |= BF_FLAG_RADPNT_PREC;
+        has_prec = TRUE;
+    }
+    if (!has_prec) {
+        JS_ThrowTypeError(ctx, "precision must be present");
+        return -1;
+    }
+    return 0;
+}
+
+
+static JSValue js_bigdecimal_fop(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int magic)
+{
+    bfdec_t *a, *b, r_s, *r = &r_s;
+    JSValue op1, op2, res;
+    BigDecimalEnv fe_s, *fe = &fe_s;
+    int op_count, ret;
+
+    if (magic == MATH_OP_SQRT ||
+        magic == MATH_OP_ROUND)
+        op_count = 1;
+    else
+        op_count = 2;
+
+    op1 = JS_ToNumeric(ctx, argv[0]);
+    if (JS_IsException(op1))
+        return op1;
+    a = JS_ToBigDecimal(ctx, op1);
+    if (!a) {
+        JS_FreeValue(ctx, op1);
+        return JS_EXCEPTION;
+    }
+    if (op_count >= 2) {
+        op2 = JS_ToNumeric(ctx, argv[1]);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            return op2;
+        }
+        b = JS_ToBigDecimal(ctx, op2);
+        if (!b)
+            goto fail;
+    } else {
+        op2 = JS_UNDEFINED;
+        b = NULL;
+    }
+    fe->flags = BF_RNDZ;
+    fe->prec = BF_PREC_INF;
+    if (op_count < argc) {
+        if (js_bigdecimal_get_env(ctx, fe, argv[op_count]))
+            goto fail;
+    }
+
+    res = JS_NewBigDecimal(ctx);
+    if (JS_IsException(res)) {
+    fail:
+        JS_FreeValue(ctx, op1);
+        JS_FreeValue(ctx, op2);
+        return JS_EXCEPTION;
+    }
+    r = JS_GetBigDecimal(res);
+    switch (magic) {
+    case MATH_OP_ADD:
+        ret = bfdec_add(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_SUB:
+        ret = bfdec_sub(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_MUL:
+        ret = bfdec_mul(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_DIV:
+        ret = bfdec_div(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_FMOD:
+        ret = bfdec_rem(r, a, b, fe->prec, fe->flags, BF_RNDZ);
+        break;
+    case MATH_OP_SQRT:
+        ret = bfdec_sqrt(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_ROUND:
+        ret = bfdec_set(r, a);
+        if (!(ret & BF_ST_MEM_ERROR))
+            ret = bfdec_round(r, fe->prec, fe->flags);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    ret &= BF_ST_MEM_ERROR | BF_ST_DIVIDE_ZERO | BF_ST_INVALID_OP |
+        BF_ST_OVERFLOW;
+    if (ret != 0) {
+        JS_FreeValue(ctx, res);
+        return throw_bf_exception(ctx, ret);
+    } else {
+        return res;
+    }
+}
+
+static JSValue js_bigdecimal_toFixed(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    int64_t f;
+    int rnd_mode;
+
+    val = js_thisBigDecimalValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToInt64Sat(ctx, &f, argv[0]))
+        goto fail;
+    if (f < 0 || f > BF_PREC_MAX) {
+        JS_ThrowRangeError(ctx, "invalid number of digits");
+        goto fail;
+    }
+    rnd_mode = BF_RNDNA;
+    if (argc > 1) {
+        rnd_mode = js_bigdecimal_get_rnd_mode(ctx, argv[1]);
+        if (rnd_mode < 0)
+            goto fail;
+    }
+    ret = js_bigdecimal_to_string1(ctx, val, f, rnd_mode | BF_FTOA_FORMAT_FRAC);
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigdecimal_toExponential(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    int64_t f;
+    int rnd_mode;
+
+    val = js_thisBigDecimalValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToInt64Sat(ctx, &f, argv[0]))
+        goto fail;
+    if (JS_IsUndefined(argv[0])) {
+        ret = js_bigdecimal_to_string1(ctx, val, 0,
+                  BF_RNDN | BF_FTOA_FORMAT_FREE_MIN | BF_FTOA_FORCE_EXP);
+    } else {
+        if (f < 0 || f > BF_PREC_MAX) {
+            JS_ThrowRangeError(ctx, "invalid number of digits");
+            goto fail;
+        }
+        rnd_mode = BF_RNDNA;
+        if (argc > 1) {
+            rnd_mode = js_bigdecimal_get_rnd_mode(ctx, argv[1]);
+            if (rnd_mode < 0)
+                goto fail;
+        }
+        ret = js_bigdecimal_to_string1(ctx, val, f + 1,
+                      rnd_mode | BF_FTOA_FORMAT_FIXED | BF_FTOA_FORCE_EXP);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigdecimal_toPrecision(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    int64_t p;
+    int rnd_mode;
+
+    val = js_thisBigDecimalValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_IsUndefined(argv[0])) {
+        return JS_ToStringFree(ctx, val);
+    }
+    if (JS_ToInt64Sat(ctx, &p, argv[0]))
+        goto fail;
+    if (p < 1 || p > BF_PREC_MAX) {
+        JS_ThrowRangeError(ctx, "invalid number of digits");
+        goto fail;
+    }
+    rnd_mode = BF_RNDNA;
+    if (argc > 1) {
+        rnd_mode = js_bigdecimal_get_rnd_mode(ctx, argv[1]);
+        if (rnd_mode < 0)
+            goto fail;
+    }
+    ret = js_bigdecimal_to_string1(ctx, val, p,
+                                   rnd_mode | BF_FTOA_FORMAT_FIXED);
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_bigdecimal_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_bigdecimal_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_bigdecimal_valueOf ),
+    JS_CFUNC_DEF("toPrecision", 1, js_bigdecimal_toPrecision ),
+    JS_CFUNC_DEF("toFixed", 1, js_bigdecimal_toFixed ),
+    JS_CFUNC_DEF("toExponential", 1, js_bigdecimal_toExponential ),
+};
+
+static const JSCFunctionListEntry js_bigdecimal_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("add", 2, js_bigdecimal_fop, MATH_OP_ADD ),
+    JS_CFUNC_MAGIC_DEF("sub", 2, js_bigdecimal_fop, MATH_OP_SUB ),
+    JS_CFUNC_MAGIC_DEF("mul", 2, js_bigdecimal_fop, MATH_OP_MUL ),
+    JS_CFUNC_MAGIC_DEF("div", 2, js_bigdecimal_fop, MATH_OP_DIV ),
+    JS_CFUNC_MAGIC_DEF("mod", 2, js_bigdecimal_fop, MATH_OP_FMOD ),
+    JS_CFUNC_MAGIC_DEF("round", 1, js_bigdecimal_fop, MATH_OP_ROUND ),
+    JS_CFUNC_MAGIC_DEF("sqrt", 1, js_bigdecimal_fop, MATH_OP_SQRT ),
+};
+
+void JS_AddIntrinsicBigDecimal(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValueConst obj1;
+
+    rt->bigdecimal_ops.to_string = js_bigdecimal_to_string;
+    rt->bigdecimal_ops.from_string = js_string_to_bigdecimal;
+    rt->bigdecimal_ops.unary_arith = js_unary_arith_bigdecimal;
+    rt->bigdecimal_ops.binary_arith = js_binary_arith_bigdecimal;
+    rt->bigdecimal_ops.compare = js_compare_bigdecimal;
+
+    ctx->class_proto[JS_CLASS_BIG_DECIMAL] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_BIG_DECIMAL],
+                               js_bigdecimal_proto_funcs,
+                               countof(js_bigdecimal_proto_funcs));
+    obj1 = JS_NewGlobalCConstructor(ctx, "BigDecimal",
+                                    js_bigdecimal_constructor, 1,
+                                    ctx->class_proto[JS_CLASS_BIG_DECIMAL]);
+    JS_SetPropertyFunctionList(ctx, obj1, js_bigdecimal_funcs,
+                               countof(js_bigdecimal_funcs));
+}
+
+void JS_EnableBignumExt(JSContext *ctx, BOOL enable)
+{
+    ctx->bignum_ext = enable;
+}
+
+#endif /* CONFIG_BIGNUM */
+
+static const char * const native_error_name[JS_NATIVE_ERROR_COUNT] = {
+    "EvalError", "RangeError", "ReferenceError",
+    "SyntaxError", "TypeError", "URIError",
+    "InternalError", "AggregateError",
+};
+
+/* Minimum amount of objects to be able to compile code and display
+   error messages. No JSAtom should be allocated by this function. */
+static void JS_AddIntrinsicBasicObjects(JSContext *ctx)
+{
+    JSValue proto;
+    int i;
+
+    ctx->class_proto[JS_CLASS_OBJECT] = JS_NewObjectProto(ctx, JS_NULL);
+    ctx->function_proto = JS_NewCFunction3(ctx, js_function_proto, "", 0,
+                                           JS_CFUNC_generic, 0,
+                                           ctx->class_proto[JS_CLASS_OBJECT]);
+    ctx->class_proto[JS_CLASS_BYTECODE_FUNCTION] = JS_DupValue(ctx, ctx->function_proto);
+    ctx->class_proto[JS_CLASS_ERROR] = JS_NewObject(ctx);
+#if 0
+    /* these are auto-initialized from js_error_proto_funcs,
+       but delaying might be a problem */
+    JS_DefinePropertyValue(ctx, ctx->class_proto[JS_CLASS_ERROR], JS_ATOM_name,
+                           JS_AtomToString(ctx, JS_ATOM_Error),
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    JS_DefinePropertyValue(ctx, ctx->class_proto[JS_CLASS_ERROR], JS_ATOM_message,
+                           JS_AtomToString(ctx, JS_ATOM_empty_string),
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+#endif
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ERROR],
+                               js_error_proto_funcs,
+                               countof(js_error_proto_funcs));
+
+    for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
+        proto = JS_NewObjectProto(ctx, ctx->class_proto[JS_CLASS_ERROR]);
+        JS_DefinePropertyValue(ctx, proto, JS_ATOM_name,
+                               JS_NewAtomString(ctx, native_error_name[i]),
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+        JS_DefinePropertyValue(ctx, proto, JS_ATOM_message,
+                               JS_AtomToString(ctx, JS_ATOM_empty_string),
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+        ctx->native_error_proto[i] = proto;
+    }
+
+    /* the array prototype is an array */
+    ctx->class_proto[JS_CLASS_ARRAY] =
+        JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                               JS_CLASS_ARRAY);
+
+    ctx->array_shape = js_new_shape2(ctx, get_proto_obj(ctx->class_proto[JS_CLASS_ARRAY]),
+                                     JS_PROP_INITIAL_HASH_SIZE, 1);
+    add_shape_property(ctx, &ctx->array_shape, NULL,
+                       JS_ATOM_length, JS_PROP_WRITABLE | JS_PROP_LENGTH);
+
+    /* XXX: could test it on first context creation to ensure that no
+       new atoms are created in JS_AddIntrinsicBasicObjects(). It is
+       necessary to avoid useless renumbering of atoms after
+       JS_EvalBinary() if it is done just after
+       JS_AddIntrinsicBasicObjects(). */
+    //    assert(ctx->rt->atom_count == JS_ATOM_END);
+}
+
+void JS_AddIntrinsicBaseObjects(JSContext *ctx)
+{
+    int i;
+    JSValueConst obj, number_obj;
+    JSValue obj1;
+
+    ctx->throw_type_error = JS_NewCFunction(ctx, js_throw_type_error, NULL, 0);
+
+    /* add caller and arguments properties to throw a TypeError */
+    obj1 = JS_NewCFunction(ctx, js_function_proto_caller, NULL, 0);
+    JS_DefineProperty(ctx, ctx->function_proto, JS_ATOM_caller, JS_UNDEFINED,
+                      obj1, ctx->throw_type_error,
+                      JS_PROP_HAS_GET | JS_PROP_HAS_SET |
+                      JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE);
+    JS_DefineProperty(ctx, ctx->function_proto, JS_ATOM_arguments, JS_UNDEFINED,
+                      obj1, ctx->throw_type_error,
+                      JS_PROP_HAS_GET | JS_PROP_HAS_SET |
+                      JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE);
+    JS_FreeValue(ctx, obj1);
+    JS_FreeValue(ctx, js_object_seal(ctx, JS_UNDEFINED, 1, (JSValueConst *)&ctx->throw_type_error, 1));
+
+    ctx->global_obj = JS_NewObject(ctx);
+    ctx->global_var_obj = JS_NewObjectProto(ctx, JS_NULL);
+
+    /* Object */
+    obj = JS_NewGlobalCConstructor(ctx, "Object", js_object_constructor, 1,
+                                   ctx->class_proto[JS_CLASS_OBJECT]);
+    JS_SetPropertyFunctionList(ctx, obj, js_object_funcs, countof(js_object_funcs));
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                               js_object_proto_funcs, countof(js_object_proto_funcs));
+
+    /* Function */
+    JS_SetPropertyFunctionList(ctx, ctx->function_proto, js_function_proto_funcs, countof(js_function_proto_funcs));
+    ctx->function_ctor = JS_NewCFunctionMagic(ctx, js_function_constructor,
+                                              "Function", 1, JS_CFUNC_constructor_or_func_magic,
+                                              JS_FUNC_NORMAL);
+    JS_NewGlobalCConstructor2(ctx, JS_DupValue(ctx, ctx->function_ctor), "Function",
+                              ctx->function_proto);
+
+    /* Error */
+    obj1 = JS_NewCFunctionMagic(ctx, js_error_constructor,
+                                "Error", 1, JS_CFUNC_constructor_or_func_magic, -1);
+    JS_NewGlobalCConstructor2(ctx, obj1,
+                              "Error", ctx->class_proto[JS_CLASS_ERROR]);
+
+    /* Used to squelch a -Wcast-function-type warning. */
+    JSCFunctionType ft = { .generic_magic = js_error_constructor };
+    for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
+        JSValue func_obj;
+        int n_args;
+        n_args = 1 + (i == JS_AGGREGATE_ERROR);
+        func_obj = JS_NewCFunction3(ctx, ft.generic,
+                                    native_error_name[i], n_args,
+                                    JS_CFUNC_constructor_or_func_magic, i, obj1);
+        JS_NewGlobalCConstructor2(ctx, func_obj, native_error_name[i],
+                                  ctx->native_error_proto[i]);
+    }
+
+    /* Iterator prototype */
+    ctx->iterator_proto = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->iterator_proto,
+                               js_iterator_proto_funcs,
+                               countof(js_iterator_proto_funcs));
+
+    /* Array */
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ARRAY],
+                               js_array_proto_funcs,
+                               countof(js_array_proto_funcs));
+
+    obj = JS_NewGlobalCConstructor(ctx, "Array", js_array_constructor, 1,
+                                   ctx->class_proto[JS_CLASS_ARRAY]);
+    ctx->array_ctor = JS_DupValue(ctx, obj);
+    JS_SetPropertyFunctionList(ctx, obj, js_array_funcs,
+                               countof(js_array_funcs));
+
+    /* XXX: create auto_initializer */
+    {
+        /* initialize Array.prototype[Symbol.unscopables] */
+        static const char unscopables[] =
+            "copyWithin" "\0"
+            "entries" "\0"
+            "fill" "\0"
+            "find" "\0"
+            "findIndex" "\0"
+            "findLast" "\0"
+            "findLastIndex" "\0"
+            "flat" "\0"
+            "flatMap" "\0"
+            "includes" "\0"
+            "keys" "\0"
+            "toReversed" "\0"
+            "toSorted" "\0"
+            "toSpliced" "\0"
+            "values" "\0";
+        const char *p = unscopables;
+        obj1 = JS_NewObjectProto(ctx, JS_NULL);
+        for(p = unscopables; *p; p += strlen(p) + 1) {
+            JS_DefinePropertyValueStr(ctx, obj1, p, JS_TRUE, JS_PROP_C_W_E);
+        }
+        JS_DefinePropertyValue(ctx, ctx->class_proto[JS_CLASS_ARRAY],
+                               JS_ATOM_Symbol_unscopables, obj1,
+                               JS_PROP_CONFIGURABLE);
+    }
+
+    /* needed to initialize arguments[Symbol.iterator] */
+    ctx->array_proto_values =
+        JS_GetProperty(ctx, ctx->class_proto[JS_CLASS_ARRAY], JS_ATOM_values);
+
+    ctx->class_proto[JS_CLASS_ARRAY_ITERATOR] = JS_NewObjectProto(ctx, ctx->iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ARRAY_ITERATOR],
+                               js_array_iterator_proto_funcs,
+                               countof(js_array_iterator_proto_funcs));
+
+    /* parseFloat and parseInteger must be defined before Number
+       because of the Number.parseFloat and Number.parseInteger
+       aliases */
+    JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_global_funcs,
+                               countof(js_global_funcs));
+
+    /* Number */
+    ctx->class_proto[JS_CLASS_NUMBER] = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                                               JS_CLASS_NUMBER);
+    JS_SetObjectData(ctx, ctx->class_proto[JS_CLASS_NUMBER], JS_NewInt32(ctx, 0));
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_NUMBER],
+                               js_number_proto_funcs,
+                               countof(js_number_proto_funcs));
+    number_obj = JS_NewGlobalCConstructor(ctx, "Number", js_number_constructor, 1,
+                                          ctx->class_proto[JS_CLASS_NUMBER]);
+    JS_SetPropertyFunctionList(ctx, number_obj, js_number_funcs, countof(js_number_funcs));
+
+    /* Boolean */
+    ctx->class_proto[JS_CLASS_BOOLEAN] = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                                                JS_CLASS_BOOLEAN);
+    JS_SetObjectData(ctx, ctx->class_proto[JS_CLASS_BOOLEAN], JS_NewBool(ctx, FALSE));
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_BOOLEAN], js_boolean_proto_funcs,
+                               countof(js_boolean_proto_funcs));
+    JS_NewGlobalCConstructor(ctx, "Boolean", js_boolean_constructor, 1,
+                             ctx->class_proto[JS_CLASS_BOOLEAN]);
+
+    /* String */
+    ctx->class_proto[JS_CLASS_STRING] = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                                               JS_CLASS_STRING);
+    JS_SetObjectData(ctx, ctx->class_proto[JS_CLASS_STRING], JS_AtomToString(ctx, JS_ATOM_empty_string));
+    obj = JS_NewGlobalCConstructor(ctx, "String", js_string_constructor, 1,
+                                   ctx->class_proto[JS_CLASS_STRING]);
+    JS_SetPropertyFunctionList(ctx, obj, js_string_funcs,
+                               countof(js_string_funcs));
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_STRING], js_string_proto_funcs,
+                               countof(js_string_proto_funcs));
+
+    ctx->class_proto[JS_CLASS_STRING_ITERATOR] = JS_NewObjectProto(ctx, ctx->iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_STRING_ITERATOR],
+                               js_string_iterator_proto_funcs,
+                               countof(js_string_iterator_proto_funcs));
+
+    /* Math: create as autoinit object */
+    js_random_init(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_math_obj, countof(js_math_obj));
+
+    /* ES6 Reflect: create as autoinit object */
+    JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_reflect_obj, countof(js_reflect_obj));
+
+    /* ES6 Symbol */
+    ctx->class_proto[JS_CLASS_SYMBOL] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_SYMBOL], js_symbol_proto_funcs,
+                               countof(js_symbol_proto_funcs));
+    obj = JS_NewGlobalCConstructor(ctx, "Symbol", js_symbol_constructor, 0,
+                                   ctx->class_proto[JS_CLASS_SYMBOL]);
+    JS_SetPropertyFunctionList(ctx, obj, js_symbol_funcs,
+                               countof(js_symbol_funcs));
+    for(i = JS_ATOM_Symbol_toPrimitive; i < JS_ATOM_END; i++) {
+        char buf[ATOM_GET_STR_BUF_SIZE];
+        const char *str, *p;
+        str = JS_AtomGetStr(ctx, buf, sizeof(buf), i);
+        /* skip "Symbol." */
+        p = strchr(str, '.');
+        if (p)
+            str = p + 1;
+        JS_DefinePropertyValueStr(ctx, obj, str, JS_AtomToValue(ctx, i), 0);
+    }
+
+    /* ES6 Generator */
+    ctx->class_proto[JS_CLASS_GENERATOR] = JS_NewObjectProto(ctx, ctx->iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_GENERATOR],
+                               js_generator_proto_funcs,
+                               countof(js_generator_proto_funcs));
+
+    ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION] = JS_NewObjectProto(ctx, ctx->function_proto);
+    obj1 = JS_NewCFunctionMagic(ctx, js_function_constructor,
+                                "GeneratorFunction", 1,
+                                JS_CFUNC_constructor_or_func_magic, JS_FUNC_GENERATOR);
+    JS_SetPropertyFunctionList(ctx,
+                               ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION],
+                               js_generator_function_proto_funcs,
+                               countof(js_generator_function_proto_funcs));
+    JS_SetConstructor2(ctx, ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION],
+                       ctx->class_proto[JS_CLASS_GENERATOR],
+                       JS_PROP_CONFIGURABLE, JS_PROP_CONFIGURABLE);
+    JS_SetConstructor2(ctx, obj1, ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION],
+                       0, JS_PROP_CONFIGURABLE);
+    JS_FreeValue(ctx, obj1);
+
+    /* global properties */
+    ctx->eval_obj = JS_NewCFunction(ctx, js_global_eval, "eval", 1);
+    JS_DefinePropertyValue(ctx, ctx->global_obj, JS_ATOM_eval,
+                           JS_DupValue(ctx, ctx->eval_obj),
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+
+    JS_DefinePropertyValue(ctx, ctx->global_obj, JS_ATOM_globalThis,
+                           JS_DupValue(ctx, ctx->global_obj),
+                           JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE);
+}
+
+/* Typed Arrays */
+
+static uint8_t const typed_array_size_log2[JS_TYPED_ARRAY_COUNT] = {
+    0, 0, 0, 1, 1, 2, 2,
+    3, 3, /* BigInt64Array, BigUint64Array */
+    2, 3
+};
+
+static JSValue js_array_buffer_constructor3(JSContext *ctx,
+                                            JSValueConst new_target,
+                                            uint64_t len, JSClassID class_id,
+                                            uint8_t *buf,
+                                            JSFreeArrayBufferDataFunc *free_func,
+                                            void *opaque, BOOL alloc_flag)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValue obj;
+    JSArrayBuffer *abuf = NULL;
+
+    obj = js_create_from_ctor(ctx, new_target, class_id);
+    if (JS_IsException(obj))
+        return obj;
+    /* XXX: we are currently limited to 2 GB */
+    if (len > INT32_MAX) {
+        JS_ThrowRangeError(ctx, "invalid array buffer length");
+        goto fail;
+    }
+    abuf = js_malloc(ctx, sizeof(*abuf));
+    if (!abuf)
+        goto fail;
+    abuf->byte_length = len;
+    if (alloc_flag) {
+        if (class_id == JS_CLASS_SHARED_ARRAY_BUFFER &&
+            rt->sab_funcs.sab_alloc) {
+            abuf->data = rt->sab_funcs.sab_alloc(rt->sab_funcs.sab_opaque,
+                                                 max_int(len, 1));
+            if (!abuf->data)
+                goto fail;
+            memset(abuf->data, 0, len);
+        } else {
+            /* the allocation must be done after the object creation */
+            abuf->data = js_mallocz(ctx, max_int(len, 1));
+            if (!abuf->data)
+                goto fail;
+        }
+    } else {
+        if (class_id == JS_CLASS_SHARED_ARRAY_BUFFER &&
+            rt->sab_funcs.sab_dup) {
+            rt->sab_funcs.sab_dup(rt->sab_funcs.sab_opaque, buf);
+        }
+        abuf->data = buf;
+    }
+    init_list_head(&abuf->array_list);
+    abuf->detached = FALSE;
+    abuf->shared = (class_id == JS_CLASS_SHARED_ARRAY_BUFFER);
+    abuf->opaque = opaque;
+    abuf->free_func = free_func;
+    if (alloc_flag && buf)
+        memcpy(abuf->data, buf, len);
+    JS_SetOpaque(obj, abuf);
+    return obj;
+ fail:
+    JS_FreeValue(ctx, obj);
+    js_free(ctx, abuf);
+    return JS_EXCEPTION;
+}
+
+static void js_array_buffer_free(JSRuntime *rt, void *opaque, void *ptr)
+{
+    js_free_rt(rt, ptr);
+}
+
+static JSValue js_array_buffer_constructor2(JSContext *ctx,
+                                            JSValueConst new_target,
+                                            uint64_t len, JSClassID class_id)
+{
+    return js_array_buffer_constructor3(ctx, new_target, len, class_id,
+                                        NULL, js_array_buffer_free, NULL,
+                                        TRUE);
+}
+
+static JSValue js_array_buffer_constructor1(JSContext *ctx,
+                                            JSValueConst new_target,
+                                            uint64_t len)
+{
+    return js_array_buffer_constructor2(ctx, new_target, len,
+                                        JS_CLASS_ARRAY_BUFFER);
+}
+
+JSValue JS_NewArrayBuffer(JSContext *ctx, uint8_t *buf, size_t len,
+                          JSFreeArrayBufferDataFunc *free_func, void *opaque,
+                          BOOL is_shared)
+{
+    return js_array_buffer_constructor3(ctx, JS_UNDEFINED, len,
+                                        is_shared ? JS_CLASS_SHARED_ARRAY_BUFFER : JS_CLASS_ARRAY_BUFFER,
+                                        buf, free_func, opaque, FALSE);
+}
+
+/* create a new ArrayBuffer of length 'len' and copy 'buf' to it */
+JSValue JS_NewArrayBufferCopy(JSContext *ctx, const uint8_t *buf, size_t len)
+{
+    return js_array_buffer_constructor3(ctx, JS_UNDEFINED, len,
+                                        JS_CLASS_ARRAY_BUFFER,
+                                        (uint8_t *)buf,
+                                        js_array_buffer_free, NULL,
+                                        TRUE);
+}
+
+static JSValue js_array_buffer_constructor(JSContext *ctx,
+                                           JSValueConst new_target,
+                                           int argc, JSValueConst *argv)
+{
+    uint64_t len;
+    if (JS_ToIndex(ctx, &len, argv[0]))
+        return JS_EXCEPTION;
+    return js_array_buffer_constructor1(ctx, new_target, len);
+}
+
+static JSValue js_shared_array_buffer_constructor(JSContext *ctx,
+                                                  JSValueConst new_target,
+                                                  int argc, JSValueConst *argv)
+{
+    uint64_t len;
+    if (JS_ToIndex(ctx, &len, argv[0]))
+        return JS_EXCEPTION;
+    return js_array_buffer_constructor2(ctx, new_target, len,
+                                        JS_CLASS_SHARED_ARRAY_BUFFER);
+}
+
+/* also used for SharedArrayBuffer */
+static void js_array_buffer_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSArrayBuffer *abuf = p->u.array_buffer;
+    struct list_head *el, *el1;
+
+    if (abuf) {
+        /* The ArrayBuffer finalizer may be called before the typed
+           array finalizers using it, so abuf->array_list is not
+           necessarily empty. */
+        list_for_each_safe(el, el1, &abuf->array_list) {
+            JSTypedArray *ta;
+            JSObject *p1;
+
+            ta = list_entry(el, JSTypedArray, link);
+            ta->link.prev = NULL;
+            ta->link.next = NULL;
+            p1 = ta->obj;
+            /* Note: the typed array length and offset fields are not modified */
+            if (p1->class_id != JS_CLASS_DATAVIEW) {
+                p1->u.array.count = 0;
+                p1->u.array.u.ptr = NULL;
+            }
+        }
+        if (abuf->shared && rt->sab_funcs.sab_free) {
+            rt->sab_funcs.sab_free(rt->sab_funcs.sab_opaque, abuf->data);
+        } else {
+            if (abuf->free_func)
+                abuf->free_func(rt, abuf->opaque, abuf->data);
+        }
+        js_free_rt(rt, abuf);
+    }
+}
+
+static JSValue js_array_buffer_isView(JSContext *ctx,
+                                      JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    BOOL res;
+    res = FALSE;
+    if (JS_VALUE_GET_TAG(argv[0]) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(argv[0]);
+        if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+            p->class_id <= JS_CLASS_DATAVIEW) {
+            res = TRUE;
+        }
+    }
+    return JS_NewBool(ctx, res);
+}
+
+static const JSCFunctionListEntry js_array_buffer_funcs[] = {
+    JS_CFUNC_DEF("isView", 1, js_array_buffer_isView ),
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+};
+
+static JSValue JS_ThrowTypeErrorDetachedArrayBuffer(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "ArrayBuffer is detached");
+}
+
+static JSValue js_array_buffer_get_byteLength(JSContext *ctx,
+                                              JSValueConst this_val,
+                                              int class_id)
+{
+    JSArrayBuffer *abuf = JS_GetOpaque2(ctx, this_val, class_id);
+    if (!abuf)
+        return JS_EXCEPTION;
+    /* return 0 if detached */
+    return JS_NewUint32(ctx, abuf->byte_length);
+}
+
+void JS_DetachArrayBuffer(JSContext *ctx, JSValueConst obj)
+{
+    JSArrayBuffer *abuf = JS_GetOpaque(obj, JS_CLASS_ARRAY_BUFFER);
+    struct list_head *el;
+
+    if (!abuf || abuf->detached)
+        return;
+    if (abuf->free_func)
+        abuf->free_func(ctx->rt, abuf->opaque, abuf->data);
+    abuf->data = NULL;
+    abuf->byte_length = 0;
+    abuf->detached = TRUE;
+
+    list_for_each(el, &abuf->array_list) {
+        JSTypedArray *ta;
+        JSObject *p;
+
+        ta = list_entry(el, JSTypedArray, link);
+        p = ta->obj;
+        /* Note: the typed array length and offset fields are not modified */
+        if (p->class_id != JS_CLASS_DATAVIEW) {
+            p->u.array.count = 0;
+            p->u.array.u.ptr = NULL;
+        }
+    }
+}
+
+/* get an ArrayBuffer or SharedArrayBuffer */
+static JSArrayBuffer *js_get_array_buffer(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        goto fail;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (p->class_id != JS_CLASS_ARRAY_BUFFER &&
+        p->class_id != JS_CLASS_SHARED_ARRAY_BUFFER) {
+    fail:
+        JS_ThrowTypeErrorInvalidClass(ctx, JS_CLASS_ARRAY_BUFFER);
+        return NULL;
+    }
+    return p->u.array_buffer;
+}
+
+/* return NULL if exception. WARNING: any JS call can detach the
+   buffer and render the returned pointer invalid */
+uint8_t *JS_GetArrayBuffer(JSContext *ctx, size_t *psize, JSValueConst obj)
+{
+    JSArrayBuffer *abuf = js_get_array_buffer(ctx, obj);
+    if (!abuf)
+        goto fail;
+    if (abuf->detached) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    *psize = abuf->byte_length;
+    return abuf->data;
+ fail:
+    *psize = 0;
+    return NULL;
+}
+
+static JSValue js_array_buffer_slice(JSContext *ctx,
+                                     JSValueConst this_val,
+                                     int argc, JSValueConst *argv, int class_id)
+{
+    JSArrayBuffer *abuf, *new_abuf;
+    int64_t len, start, end, new_len;
+    JSValue ctor, new_obj;
+
+    abuf = JS_GetOpaque2(ctx, this_val, class_id);
+    if (!abuf)
+        return JS_EXCEPTION;
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    len = abuf->byte_length;
+
+    if (JS_ToInt64Clamp(ctx, &start, argv[0], 0, len, len))
+        return JS_EXCEPTION;
+
+    end = len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt64Clamp(ctx, &end, argv[1], 0, len, len))
+            return JS_EXCEPTION;
+    }
+    new_len = max_int64(end - start, 0);
+    ctor = JS_SpeciesConstructor(ctx, this_val, JS_UNDEFINED);
+    if (JS_IsException(ctor))
+        return ctor;
+    if (JS_IsUndefined(ctor)) {
+        new_obj = js_array_buffer_constructor2(ctx, JS_UNDEFINED, new_len,
+                                               class_id);
+    } else {
+        JSValue args[1];
+        args[0] = JS_NewInt64(ctx, new_len);
+        new_obj = JS_CallConstructor(ctx, ctor, 1, (JSValueConst *)args);
+        JS_FreeValue(ctx, ctor);
+        JS_FreeValue(ctx, args[0]);
+    }
+    if (JS_IsException(new_obj))
+        return new_obj;
+    new_abuf = JS_GetOpaque2(ctx, new_obj, class_id);
+    if (!new_abuf)
+        goto fail;
+    if (js_same_value(ctx, new_obj, this_val)) {
+        JS_ThrowTypeError(ctx, "cannot use identical ArrayBuffer");
+        goto fail;
+    }
+    if (new_abuf->detached) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    if (new_abuf->byte_length < new_len) {
+        JS_ThrowTypeError(ctx, "new ArrayBuffer is too small");
+        goto fail;
+    }
+    /* must test again because of side effects */
+    if (abuf->detached) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    memcpy(new_abuf->data, abuf->data + start, new_len);
+    return new_obj;
+ fail:
+    JS_FreeValue(ctx, new_obj);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_array_buffer_proto_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("byteLength", js_array_buffer_get_byteLength, NULL, JS_CLASS_ARRAY_BUFFER ),
+    JS_CFUNC_MAGIC_DEF("slice", 2, js_array_buffer_slice, JS_CLASS_ARRAY_BUFFER ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "ArrayBuffer", JS_PROP_CONFIGURABLE ),
+};
+
+/* SharedArrayBuffer */
+
+static const JSCFunctionListEntry js_shared_array_buffer_funcs[] = {
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+};
+
+static const JSCFunctionListEntry js_shared_array_buffer_proto_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("byteLength", js_array_buffer_get_byteLength, NULL, JS_CLASS_SHARED_ARRAY_BUFFER ),
+    JS_CFUNC_MAGIC_DEF("slice", 2, js_array_buffer_slice, JS_CLASS_SHARED_ARRAY_BUFFER ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "SharedArrayBuffer", JS_PROP_CONFIGURABLE ),
+};
+
+static JSObject *get_typed_array(JSContext *ctx,
+                                 JSValueConst this_val,
+                                 int is_dataview)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
+        goto fail;
+    p = JS_VALUE_GET_OBJ(this_val);
+    if (is_dataview) {
+        if (p->class_id != JS_CLASS_DATAVIEW)
+            goto fail;
+    } else {
+        if (!(p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+              p->class_id <= JS_CLASS_FLOAT64_ARRAY)) {
+        fail:
+            JS_ThrowTypeError(ctx, "not a %s", is_dataview ? "DataView" : "TypedArray");
+            return NULL;
+        }
+    }
+    return p;
+}
+
+/* WARNING: 'p' must be a typed array */
+static BOOL typed_array_is_detached(JSContext *ctx, JSObject *p)
+{
+    JSTypedArray *ta = p->u.typed_array;
+    JSArrayBuffer *abuf = ta->buffer->u.array_buffer;
+    /* XXX: could simplify test by ensuring that
+       p->u.array.u.ptr is NULL iff it is detached */
+    return abuf->detached;
+}
+
+/* WARNING: 'p' must be a typed array. Works even if the array buffer
+   is detached */
+static uint32_t typed_array_get_length(JSContext *ctx, JSObject *p)
+{
+    JSTypedArray *ta = p->u.typed_array;
+    int size_log2 = typed_array_size_log2(p->class_id);
+    return ta->length >> size_log2;
+}
+
+static int validate_typed_array(JSContext *ctx, JSValueConst this_val)
+{
+    JSObject *p;
+    p = get_typed_array(ctx, this_val, 0);
+    if (!p)
+        return -1;
+    if (typed_array_is_detached(ctx, p)) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        return -1;
+    }
+    return 0;
+}
+
+static JSValue js_typed_array_get_length(JSContext *ctx,
+                                         JSValueConst this_val)
+{
+    JSObject *p;
+    p = get_typed_array(ctx, this_val, 0);
+    if (!p)
+        return JS_EXCEPTION;
+    return JS_NewInt32(ctx, p->u.array.count);
+}
+
+static JSValue js_typed_array_get_buffer(JSContext *ctx,
+                                         JSValueConst this_val, int is_dataview)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    p = get_typed_array(ctx, this_val, is_dataview);
+    if (!p)
+        return JS_EXCEPTION;
+    ta = p->u.typed_array;
+    return JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, ta->buffer));
+}
+
+static JSValue js_typed_array_get_byteLength(JSContext *ctx,
+                                             JSValueConst this_val,
+                                             int is_dataview)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    p = get_typed_array(ctx, this_val, is_dataview);
+    if (!p)
+        return JS_EXCEPTION;
+    if (typed_array_is_detached(ctx, p)) {
+        if (is_dataview) {
+            return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        } else {
+            return JS_NewInt32(ctx, 0);
+        }
+    }
+    ta = p->u.typed_array;
+    return JS_NewInt32(ctx, ta->length);
+}
+
+static JSValue js_typed_array_get_byteOffset(JSContext *ctx,
+                                             JSValueConst this_val,
+                                             int is_dataview)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    p = get_typed_array(ctx, this_val, is_dataview);
+    if (!p)
+        return JS_EXCEPTION;
+    if (typed_array_is_detached(ctx, p)) {
+        if (is_dataview) {
+            return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        } else {
+            return JS_NewInt32(ctx, 0);
+        }
+    }
+    ta = p->u.typed_array;
+    return JS_NewInt32(ctx, ta->offset);
+}
+
+JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValueConst *argv,
+                         JSTypedArrayEnum type)
+{
+    if (type < JS_TYPED_ARRAY_UINT8C || type > JS_TYPED_ARRAY_FLOAT64)
+        return JS_ThrowRangeError(ctx, "invalid typed array type");
+
+    return js_typed_array_constructor(ctx, JS_UNDEFINED, argc, argv,
+                                      JS_CLASS_UINT8C_ARRAY + type);
+}
+
+/* Return the buffer associated to the typed array or an exception if
+   it is not a typed array or if the buffer is detached. pbyte_offset,
+   pbyte_length or pbytes_per_element can be NULL. */
+JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValueConst obj,
+                               size_t *pbyte_offset,
+                               size_t *pbyte_length,
+                               size_t *pbytes_per_element)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    p = get_typed_array(ctx, obj, FALSE);
+    if (!p)
+        return JS_EXCEPTION;
+    if (typed_array_is_detached(ctx, p))
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    ta = p->u.typed_array;
+    if (pbyte_offset)
+        *pbyte_offset = ta->offset;
+    if (pbyte_length)
+        *pbyte_length = ta->length;
+    if (pbytes_per_element) {
+        *pbytes_per_element = 1 << typed_array_size_log2(p->class_id);
+    }
+    return JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, ta->buffer));
+}
+
+static JSValue js_typed_array_get_toStringTag(JSContext *ctx,
+                                              JSValueConst this_val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
+        return JS_UNDEFINED;
+    p = JS_VALUE_GET_OBJ(this_val);
+    if (!(p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+          p->class_id <= JS_CLASS_FLOAT64_ARRAY))
+        return JS_UNDEFINED;
+    return JS_AtomToString(ctx, ctx->rt->class_array[p->class_id].class_name);
+}
+
+static JSValue js_typed_array_set_internal(JSContext *ctx,
+                                           JSValueConst dst,
+                                           JSValueConst src,
+                                           JSValueConst off)
+{
+    JSObject *p;
+    JSObject *src_p;
+    uint32_t i;
+    int64_t src_len, offset;
+    JSValue val, src_obj = JS_UNDEFINED;
+
+    p = get_typed_array(ctx, dst, 0);
+    if (!p)
+        goto fail;
+    if (JS_ToInt64Sat(ctx, &offset, off))
+        goto fail;
+    if (offset < 0)
+        goto range_error;
+    if (typed_array_is_detached(ctx, p)) {
+    detached:
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    src_obj = JS_ToObject(ctx, src);
+    if (JS_IsException(src_obj))
+        goto fail;
+    src_p = JS_VALUE_GET_OBJ(src_obj);
+    if (src_p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+        src_p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+        JSTypedArray *dest_ta = p->u.typed_array;
+        JSArrayBuffer *dest_abuf = dest_ta->buffer->u.array_buffer;
+        JSTypedArray *src_ta = src_p->u.typed_array;
+        JSArrayBuffer *src_abuf = src_ta->buffer->u.array_buffer;
+        int shift = typed_array_size_log2(p->class_id);
+
+        if (src_abuf->detached)
+            goto detached;
+
+        src_len = src_p->u.array.count;
+        if (offset > (int64_t)(p->u.array.count - src_len))
+            goto range_error;
+
+        /* copying between typed objects */
+        if (src_p->class_id == p->class_id) {
+            /* same type, use memmove */
+            memmove(dest_abuf->data + dest_ta->offset + (offset << shift),
+                    src_abuf->data + src_ta->offset, src_len << shift);
+            goto done;
+        }
+        if (dest_abuf->data == src_abuf->data) {
+            /* copying between the same buffer using different types of mappings
+               would require a temporary buffer */
+        }
+        /* otherwise, default behavior is slow but correct */
+    } else {
+        if (js_get_length64(ctx, &src_len, src_obj))
+            goto fail;
+        if (offset > (int64_t)(p->u.array.count - src_len)) {
+        range_error:
+            JS_ThrowRangeError(ctx, "invalid array length");
+            goto fail;
+        }
+    }
+    for(i = 0; i < src_len; i++) {
+        val = JS_GetPropertyUint32(ctx, src_obj, i);
+        if (JS_IsException(val))
+            goto fail;
+        if (JS_SetPropertyUint32(ctx, dst, offset + i, val) < 0)
+            goto fail;
+    }
+done:
+    JS_FreeValue(ctx, src_obj);
+    return JS_UNDEFINED;
+fail:
+    JS_FreeValue(ctx, src_obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_at(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    int64_t idx, len;
+
+    p = get_typed_array(ctx, this_val, 0);
+    if (!p)
+        return JS_EXCEPTION;
+
+    if (typed_array_is_detached(ctx, p)) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        return JS_EXCEPTION;
+    }
+
+    if (JS_ToInt64Sat(ctx, &idx, argv[0]))
+        return JS_EXCEPTION;
+
+    len = p->u.array.count;
+    if (idx < 0)
+        idx = len + idx;
+    if (idx < 0 || idx >= len)
+        return JS_UNDEFINED;
+    return JS_GetPropertyInt64(ctx, this_val, idx);
+}
+
+static JSValue js_typed_array_with(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSValue arr, val;
+    JSObject *p;
+    int64_t idx, len;
+
+    p = get_typed_array(ctx, this_val, /*is_dataview*/0);
+    if (!p)
+        return JS_EXCEPTION;
+
+    if (JS_ToInt64Sat(ctx, &idx, argv[0]))
+        return JS_EXCEPTION;
+
+    len = p->u.array.count;
+    if (idx < 0)
+        idx = len + idx;
+    if (idx < 0 || idx >= len)
+        return JS_ThrowRangeError(ctx, "invalid array index");
+
+    val = JS_ToPrimitive(ctx, argv[1], HINT_NUMBER);
+    if (JS_IsException(val))
+        return JS_EXCEPTION;
+
+    arr = js_typed_array_constructor_ta(ctx, JS_UNDEFINED, this_val,
+                                        p->class_id);
+    if (JS_IsException(arr)) {
+        JS_FreeValue(ctx, val);
+        return JS_EXCEPTION;
+    }
+    if (JS_SetPropertyInt64(ctx, arr, idx, val) < 0) {
+        JS_FreeValue(ctx, arr);
+        return JS_EXCEPTION;
+    }
+    return arr;
+}
+
+static JSValue js_typed_array_set(JSContext *ctx,
+                                  JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValueConst offset = JS_UNDEFINED;
+    if (argc > 1) {
+        offset = argv[1];
+    }
+    return js_typed_array_set_internal(ctx, this_val, argv[0], offset);
+}
+
+static JSValue js_create_typed_array_iterator(JSContext *ctx, JSValueConst this_val,
+                                              int argc, JSValueConst *argv, int magic)
+{
+    if (validate_typed_array(ctx, this_val))
+        return JS_EXCEPTION;
+    return js_create_array_iterator(ctx, this_val, argc, argv, magic);
+}
+
+/* return < 0 if exception */
+static int js_typed_array_get_length_internal(JSContext *ctx,
+                                              JSValueConst obj)
+{
+    JSObject *p;
+    p = get_typed_array(ctx, obj, 0);
+    if (!p)
+        return -1;
+    if (typed_array_is_detached(ctx, p)) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        return -1;
+    }
+    return p->u.array.count;
+}
+
+#if 0
+/* validate a typed array and return its length */
+static JSValue js_typed_array___getLength(JSContext *ctx,
+                                          JSValueConst this_val,
+                                          int argc, JSValueConst *argv)
+{
+    BOOL ignore_detached = JS_ToBool(ctx, argv[1]);
+
+    if (ignore_detached) {
+        return js_typed_array_get_length(ctx, argv[0]);
+    } else {
+        int len;
+        len = js_typed_array_get_length_internal(ctx, argv[0]);
+        if (len < 0)
+            return JS_EXCEPTION;
+        return JS_NewInt32(ctx, len);
+    }
+}
+#endif
+
+static JSValue js_typed_array_create(JSContext *ctx, JSValueConst ctor,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue ret;
+    int new_len;
+    int64_t len;
+
+    ret = JS_CallConstructor(ctx, ctor, argc, argv);
+    if (JS_IsException(ret))
+        return ret;
+    /* validate the typed array */
+    new_len = js_typed_array_get_length_internal(ctx, ret);
+    if (new_len < 0)
+        goto fail;
+    if (argc == 1) {
+        /* ensure that it is large enough */
+        if (JS_ToLengthFree(ctx, &len, JS_DupValue(ctx, argv[0])))
+            goto fail;
+        if (new_len < len) {
+            JS_ThrowTypeError(ctx, "TypedArray length is too small");
+        fail:
+            JS_FreeValue(ctx, ret);
+            return JS_EXCEPTION;
+        }
+    }
+    return ret;
+}
+
+#if 0
+static JSValue js_typed_array___create(JSContext *ctx,
+                                       JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    return js_typed_array_create(ctx, argv[0], max_int(argc - 1, 0), argv + 1);
+}
+#endif
+
+static JSValue js_typed_array___speciesCreate(JSContext *ctx,
+                                              JSValueConst this_val,
+                                              int argc, JSValueConst *argv)
+{
+    JSValueConst obj;
+    JSObject *p;
+    JSValue ctor, ret;
+    int argc1;
+
+    obj = argv[0];
+    p = get_typed_array(ctx, obj, 0);
+    if (!p)
+        return JS_EXCEPTION;
+    ctor = JS_SpeciesConstructor(ctx, obj, JS_UNDEFINED);
+    if (JS_IsException(ctor))
+        return ctor;
+    argc1 = max_int(argc - 1, 0);
+    if (JS_IsUndefined(ctor)) {
+        ret = js_typed_array_constructor(ctx, JS_UNDEFINED, argc1, argv + 1,
+                                         p->class_id);
+    } else {
+        ret = js_typed_array_create(ctx, ctor, argc1, argv + 1);
+        JS_FreeValue(ctx, ctor);
+    }
+    return ret;
+}
+
+static JSValue js_typed_array_from(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    // from(items, mapfn = void 0, this_arg = void 0)
+    JSValueConst items = argv[0], mapfn, this_arg;
+    JSValueConst args[2];
+    JSValue stack[2];
+    JSValue iter, arr, r, v, v2;
+    int64_t k, len;
+    int done, mapping;
+
+    mapping = FALSE;
+    mapfn = JS_UNDEFINED;
+    this_arg = JS_UNDEFINED;
+    r = JS_UNDEFINED;
+    arr = JS_UNDEFINED;
+    stack[0] = JS_UNDEFINED;
+    stack[1] = JS_UNDEFINED;
+
+    if (argc > 1) {
+        mapfn = argv[1];
+        if (!JS_IsUndefined(mapfn)) {
+            if (check_function(ctx, mapfn))
+                goto exception;
+            mapping = 1;
+            if (argc > 2)
+                this_arg = argv[2];
+        }
+    }
+    iter = JS_GetProperty(ctx, items, JS_ATOM_Symbol_iterator);
+    if (JS_IsException(iter))
+        goto exception;
+    if (!JS_IsUndefined(iter)) {
+        JS_FreeValue(ctx, iter);
+        arr = JS_NewArray(ctx);
+        if (JS_IsException(arr))
+            goto exception;
+        stack[0] = JS_DupValue(ctx, items);
+        if (js_for_of_start(ctx, &stack[1], FALSE))
+            goto exception;
+        for (k = 0;; k++) {
+            v = JS_IteratorNext(ctx, stack[0], stack[1], 0, NULL, &done);
+            if (JS_IsException(v))
+                goto exception_close;
+            if (done)
+                break;
+            if (JS_DefinePropertyValueInt64(ctx, arr, k, v, JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception_close;
+        }
+    } else {
+        arr = JS_ToObject(ctx, items);
+        if (JS_IsException(arr))
+            goto exception;
+    }
+    if (js_get_length64(ctx, &len, arr) < 0)
+        goto exception;
+    v = JS_NewInt64(ctx, len);
+    args[0] = v;
+    r = js_typed_array_create(ctx, this_val, 1, args);
+    JS_FreeValue(ctx, v);
+    if (JS_IsException(r))
+        goto exception;
+    for(k = 0; k < len; k++) {
+        v = JS_GetPropertyInt64(ctx, arr, k);
+        if (JS_IsException(v))
+            goto exception;
+        if (mapping) {
+            args[0] = v;
+            args[1] = JS_NewInt32(ctx, k);
+            v2 = JS_Call(ctx, mapfn, this_arg, 2, args);
+            JS_FreeValue(ctx, v);
+            v = v2;
+            if (JS_IsException(v))
+                goto exception;
+        }
+        if (JS_SetPropertyInt64(ctx, r, k, v) < 0)
+            goto exception;
+    }
+    goto done;
+
+ exception_close:
+    if (!JS_IsUndefined(stack[0]))
+        JS_IteratorClose(ctx, stack[0], TRUE);
+ exception:
+    JS_FreeValue(ctx, r);
+    r = JS_EXCEPTION;
+ done:
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, stack[0]);
+    JS_FreeValue(ctx, stack[1]);
+    return r;
+}
+
+static JSValue js_typed_array_of(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    JSValueConst args[1];
+    int i;
+
+    args[0] = JS_NewInt32(ctx, argc);
+    obj = js_typed_array_create(ctx, this_val, 1, args);
+    if (JS_IsException(obj))
+        return obj;
+
+    for(i = 0; i < argc; i++) {
+        if (JS_SetPropertyUint32(ctx, obj, i, JS_DupValue(ctx, argv[i])) < 0) {
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+    }
+    return obj;
+}
+
+static JSValue js_typed_array_copyWithin(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    int len, to, from, final, count, shift;
+
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        return JS_EXCEPTION;
+
+    if (JS_ToInt32Clamp(ctx, &to, argv[0], 0, len, len))
+        return JS_EXCEPTION;
+
+    if (JS_ToInt32Clamp(ctx, &from, argv[1], 0, len, len))
+        return JS_EXCEPTION;
+
+    final = len;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        if (JS_ToInt32Clamp(ctx, &final, argv[2], 0, len, len))
+            return JS_EXCEPTION;
+    }
+
+    count = min_int(final - from, len - to);
+    if (count > 0) {
+        p = JS_VALUE_GET_OBJ(this_val);
+        if (typed_array_is_detached(ctx, p))
+            return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        shift = typed_array_size_log2(p->class_id);
+        memmove(p->u.array.u.uint8_ptr + (to << shift),
+                p->u.array.u.uint8_ptr + (from << shift),
+                count << shift);
+    }
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue js_typed_array_fill(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    int len, k, final, shift;
+    uint64_t v64;
+
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        return JS_EXCEPTION;
+    p = JS_VALUE_GET_OBJ(this_val);
+
+    if (p->class_id == JS_CLASS_UINT8C_ARRAY) {
+        int32_t v;
+        if (JS_ToUint8ClampFree(ctx, &v, JS_DupValue(ctx, argv[0])))
+            return JS_EXCEPTION;
+        v64 = v;
+    } else if (p->class_id <= JS_CLASS_UINT32_ARRAY) {
+        uint32_t v;
+        if (JS_ToUint32(ctx, &v, argv[0]))
+            return JS_EXCEPTION;
+        v64 = v;
+    } else if (p->class_id <= JS_CLASS_BIG_UINT64_ARRAY) {
+        if (JS_ToBigInt64(ctx, (int64_t *)&v64, argv[0]))
+            return JS_EXCEPTION;
+    } else {
+        double d;
+        if (JS_ToFloat64(ctx, &d, argv[0]))
+            return JS_EXCEPTION;
+        if (p->class_id == JS_CLASS_FLOAT32_ARRAY) {
+            union {
+                float f;
+                uint32_t u32;
+            } u;
+            u.f = d;
+            v64 = u.u32;
+        } else {
+            JSFloat64Union u;
+            u.d = d;
+            v64 = u.u64;
+        }
+    }
+
+    k = 0;
+    if (argc > 1) {
+        if (JS_ToInt32Clamp(ctx, &k, argv[1], 0, len, len))
+            return JS_EXCEPTION;
+    }
+
+    final = len;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        if (JS_ToInt32Clamp(ctx, &final, argv[2], 0, len, len))
+            return JS_EXCEPTION;
+    }
+
+    if (typed_array_is_detached(ctx, p))
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+
+    shift = typed_array_size_log2(p->class_id);
+    switch(shift) {
+    case 0:
+        if (k < final) {
+            memset(p->u.array.u.uint8_ptr + k, v64, final - k);
+        }
+        break;
+    case 1:
+        for(; k < final; k++) {
+            p->u.array.u.uint16_ptr[k] = v64;
+        }
+        break;
+    case 2:
+        for(; k < final; k++) {
+            p->u.array.u.uint32_ptr[k] = v64;
+        }
+        break;
+    case 3:
+        for(; k < final; k++) {
+            p->u.array.u.uint64_ptr[k] = v64;
+        }
+        break;
+    default:
+        abort();
+    }
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue js_typed_array_find(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv, int mode)
+{
+    JSValueConst func, this_arg;
+    JSValueConst args[3];
+    JSValue val, index_val, res;
+    int len, k, end;
+    int dir;
+
+    val = JS_UNDEFINED;
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        goto exception;
+
+    func = argv[0];
+    if (check_function(ctx, func))
+        goto exception;
+
+    this_arg = JS_UNDEFINED;
+    if (argc > 1)
+        this_arg = argv[1];
+
+    k = 0;
+    dir = 1;
+    end = len;
+    if (mode == ArrayFindLast || mode == ArrayFindLastIndex) {
+        k = len - 1;
+        dir = -1;
+        end = -1;
+    }
+
+    for(; k != end; k += dir) {
+        index_val = JS_NewInt32(ctx, k);
+        val = JS_GetPropertyValue(ctx, this_val, index_val);
+        if (JS_IsException(val))
+            goto exception;
+        args[0] = val;
+        args[1] = index_val;
+        args[2] = this_val;
+        res = JS_Call(ctx, func, this_arg, 3, args);
+        if (JS_IsException(res))
+            goto exception;
+        if (JS_ToBoolFree(ctx, res)) {
+            if (mode == ArrayFindIndex || mode == ArrayFindLastIndex) {
+                JS_FreeValue(ctx, val);
+                return index_val;
+            } else {
+                return val;
+            }
+        }
+        JS_FreeValue(ctx, val);
+    }
+    if (mode == ArrayFindIndex || mode == ArrayFindLastIndex)
+        return JS_NewInt32(ctx, -1);
+    else
+        return JS_UNDEFINED;
+
+exception:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+#define special_indexOf 0
+#define special_lastIndexOf 1
+#define special_includes -1
+
+static JSValue js_typed_array_indexOf(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv, int special)
+{
+    JSObject *p;
+    int len, tag, is_int, is_bigint, k, stop, inc, res = -1;
+    int64_t v64;
+    double d;
+    float f;
+
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        goto exception;
+    if (len == 0)
+        goto done;
+
+    if (special == special_lastIndexOf) {
+        k = len - 1;
+        if (argc > 1) {
+            if (JS_ToFloat64(ctx, &d, argv[1]))
+                goto exception;
+            if (isnan(d)) {
+                k = 0;
+            } else {
+                if (d >= 0) {
+                    if (d < k) {
+                        k = d;
+                    }
+                } else {
+                    d += len;
+                    if (d < 0)
+                        goto done;
+                    k = d;
+                }
+            }
+        }
+        stop = -1;
+        inc = -1;
+    } else {
+        k = 0;
+        if (argc > 1) {
+            if (JS_ToInt32Clamp(ctx, &k, argv[1], 0, len, len))
+                goto exception;
+        }
+        stop = len;
+        inc = 1;
+    }
+
+    p = JS_VALUE_GET_OBJ(this_val);
+    /* if the array was detached, no need to go further (but no
+       exception is raised) */
+    if (typed_array_is_detached(ctx, p)) {
+        /* "includes" scans all the properties, so "undefined" can match */
+        if (special == special_includes && JS_IsUndefined(argv[0]) && len > 0)
+            res = 0;
+        goto done;
+    }
+
+    is_bigint = 0;
+    is_int = 0; /* avoid warning */
+    v64 = 0; /* avoid warning */
+    tag = JS_VALUE_GET_NORM_TAG(argv[0]);
+    if (tag == JS_TAG_INT) {
+        is_int = 1;
+        v64 = JS_VALUE_GET_INT(argv[0]);
+        d = v64;
+    } else
+    if (tag == JS_TAG_FLOAT64) {
+        d = JS_VALUE_GET_FLOAT64(argv[0]);
+        if (d >= INT64_MIN && d < 0x1p63) {
+            v64 = d;
+            is_int = (v64 == d);
+        }
+    } else if (tag == JS_TAG_BIG_INT) {
+        JSBigFloat *p1 = JS_VALUE_GET_PTR(argv[0]);
+
+        if (p->class_id == JS_CLASS_BIG_INT64_ARRAY) {
+            if (bf_get_int64(&v64, &p1->num, 0) != 0)
+                goto done;
+        } else if (p->class_id == JS_CLASS_BIG_UINT64_ARRAY) {
+            if (bf_get_uint64((uint64_t *)&v64, &p1->num) != 0)
+                goto done;
+        } else {
+            goto done;
+        }
+        d = 0;
+        is_bigint = 1;
+    } else {
+        goto done;
+    }
+
+    switch (p->class_id) {
+    case JS_CLASS_INT8_ARRAY:
+        if (is_int && (int8_t)v64 == v64)
+            goto scan8;
+        break;
+    case JS_CLASS_UINT8C_ARRAY:
+    case JS_CLASS_UINT8_ARRAY:
+        if (is_int && (uint8_t)v64 == v64) {
+            const uint8_t *pv, *pp;
+            uint16_t v;
+        scan8:
+            pv = p->u.array.u.uint8_ptr;
+            v = v64;
+            if (inc > 0) {
+                pp = memchr(pv + k, v, len - k);
+                if (pp)
+                    res = pp - pv;
+            } else {
+                for (; k != stop; k += inc) {
+                    if (pv[k] == v) {
+                        res = k;
+                        break;
+                    }
+                }
+            }
+        }
+        break;
+    case JS_CLASS_INT16_ARRAY:
+        if (is_int && (int16_t)v64 == v64)
+            goto scan16;
+        break;
+    case JS_CLASS_UINT16_ARRAY:
+        if (is_int && (uint16_t)v64 == v64) {
+            const uint16_t *pv;
+            uint16_t v;
+        scan16:
+            pv = p->u.array.u.uint16_ptr;
+            v = v64;
+            for (; k != stop; k += inc) {
+                if (pv[k] == v) {
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+    case JS_CLASS_INT32_ARRAY:
+        if (is_int && (int32_t)v64 == v64)
+            goto scan32;
+        break;
+    case JS_CLASS_UINT32_ARRAY:
+        if (is_int && (uint32_t)v64 == v64) {
+            const uint32_t *pv;
+            uint32_t v;
+        scan32:
+            pv = p->u.array.u.uint32_ptr;
+            v = v64;
+            for (; k != stop; k += inc) {
+                if (pv[k] == v) {
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+    case JS_CLASS_FLOAT32_ARRAY:
+        if (is_bigint)
+            break;
+        if (isnan(d)) {
+            const float *pv = p->u.array.u.float_ptr;
+            /* special case: indexOf returns -1, includes finds NaN */
+            if (special != special_includes)
+                goto done;
+            for (; k != stop; k += inc) {
+                if (isnan(pv[k])) {
+                    res = k;
+                    break;
+                }
+            }
+        } else if ((f = (float)d) == d) {
+            const float *pv = p->u.array.u.float_ptr;
+            for (; k != stop; k += inc) {
+                if (pv[k] == f) {
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+    case JS_CLASS_FLOAT64_ARRAY:
+        if (is_bigint)
+            break;
+        if (isnan(d)) {
+            const double *pv = p->u.array.u.double_ptr;
+            /* special case: indexOf returns -1, includes finds NaN */
+            if (special != special_includes)
+                goto done;
+            for (; k != stop; k += inc) {
+                if (isnan(pv[k])) {
+                    res = k;
+                    break;
+                }
+            }
+        } else {
+            const double *pv = p->u.array.u.double_ptr;
+            for (; k != stop; k += inc) {
+                if (pv[k] == d) {
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+    case JS_CLASS_BIG_INT64_ARRAY:
+        if (is_bigint || (is_math_mode(ctx) && is_int &&
+                          v64 >= -MAX_SAFE_INTEGER &&
+                          v64 <= MAX_SAFE_INTEGER)) {
+            goto scan64;
+        }
+        break;
+    case JS_CLASS_BIG_UINT64_ARRAY:
+        if (is_bigint || (is_math_mode(ctx) && is_int &&
+                          v64 >= 0 && v64 <= MAX_SAFE_INTEGER)) {
+            const uint64_t *pv;
+            uint64_t v;
+        scan64:
+            pv = p->u.array.u.uint64_ptr;
+            v = v64;
+            for (; k != stop; k += inc) {
+                if (pv[k] == v) {
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+    }
+
+done:
+    if (special == special_includes)
+        return JS_NewBool(ctx, res >= 0);
+    else
+        return JS_NewInt32(ctx, res);
+
+exception:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_join(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv, int toLocaleString)
+{
+    JSValue sep = JS_UNDEFINED, el;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p = NULL;
+    int i, n;
+    int c;
+
+    n = js_typed_array_get_length_internal(ctx, this_val);
+    if (n < 0)
+        goto exception;
+
+    c = ',';    /* default separator */
+    if (!toLocaleString && argc > 0 && !JS_IsUndefined(argv[0])) {
+        sep = JS_ToString(ctx, argv[0]);
+        if (JS_IsException(sep))
+            goto exception;
+        p = JS_VALUE_GET_STRING(sep);
+        if (p->len == 1 && !p->is_wide_char)
+            c = p->u.str8[0];
+        else
+            c = -1;
+    }
+    string_buffer_init(ctx, b, 0);
+
+    /* XXX: optimize with direct access */
+    for(i = 0; i < n; i++) {
+        if (i > 0) {
+            if (c >= 0) {
+                if (string_buffer_putc8(b, c))
+                    goto fail;
+            } else {
+                if (string_buffer_concat(b, p, 0, p->len))
+                    goto fail;
+            }
+        }
+        el = JS_GetPropertyUint32(ctx, this_val, i);
+        /* Can return undefined for example if the typed array is detached */
+        if (!JS_IsNull(el) && !JS_IsUndefined(el)) {
+            if (JS_IsException(el))
+                goto fail;
+            if (toLocaleString) {
+                el = JS_ToLocaleStringFree(ctx, el);
+            }
+            if (string_buffer_concat_value_free(b, el))
+                goto fail;
+        }
+    }
+    JS_FreeValue(ctx, sep);
+    return string_buffer_end(b);
+
+fail:
+    string_buffer_free(b);
+    JS_FreeValue(ctx, sep);
+exception:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_reverse(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    int len;
+
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        return JS_EXCEPTION;
+    if (len > 0) {
+        p = JS_VALUE_GET_OBJ(this_val);
+        switch (typed_array_size_log2(p->class_id)) {
+        case 0:
+            {
+                uint8_t *p1 = p->u.array.u.uint8_ptr;
+                uint8_t *p2 = p1 + len - 1;
+                while (p1 < p2) {
+                    uint8_t v = *p1;
+                    *p1++ = *p2;
+                    *p2-- = v;
+                }
+            }
+            break;
+        case 1:
+            {
+                uint16_t *p1 = p->u.array.u.uint16_ptr;
+                uint16_t *p2 = p1 + len - 1;
+                while (p1 < p2) {
+                    uint16_t v = *p1;
+                    *p1++ = *p2;
+                    *p2-- = v;
+                }
+            }
+            break;
+        case 2:
+            {
+                uint32_t *p1 = p->u.array.u.uint32_ptr;
+                uint32_t *p2 = p1 + len - 1;
+                while (p1 < p2) {
+                    uint32_t v = *p1;
+                    *p1++ = *p2;
+                    *p2-- = v;
+                }
+            }
+            break;
+        case 3:
+            {
+                uint64_t *p1 = p->u.array.u.uint64_ptr;
+                uint64_t *p2 = p1 + len - 1;
+                while (p1 < p2) {
+                    uint64_t v = *p1;
+                    *p1++ = *p2;
+                    *p2-- = v;
+                }
+            }
+            break;
+        default:
+            abort();
+        }
+    }
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue js_typed_array_toReversed(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    JSValue arr, ret;
+    JSObject *p;
+
+    p = get_typed_array(ctx, this_val, /*is_dataview*/0);
+    if (!p)
+        return JS_EXCEPTION;
+    arr = js_typed_array_constructor_ta(ctx, JS_UNDEFINED, this_val,
+                                        p->class_id);
+    if (JS_IsException(arr))
+        return JS_EXCEPTION;
+    ret = js_typed_array_reverse(ctx, arr, argc, argv);
+    JS_FreeValue(ctx, arr);
+    return ret;
+}
+
+static JSValue js_typed_array_slice(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValueConst args[2];
+    JSValue arr, val;
+    JSObject *p, *p1;
+    int n, len, start, final, count, shift;
+
+    arr = JS_UNDEFINED;
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        goto exception;
+
+    if (JS_ToInt32Clamp(ctx, &start, argv[0], 0, len, len))
+        goto exception;
+    final = len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &final, argv[1], 0, len, len))
+            goto exception;
+    }
+    count = max_int(final - start, 0);
+
+    p = get_typed_array(ctx, this_val, 0);
+    if (p == NULL)
+        goto exception;
+    shift = typed_array_size_log2(p->class_id);
+
+    args[0] = this_val;
+    args[1] = JS_NewInt32(ctx, count);
+    arr = js_typed_array___speciesCreate(ctx, JS_UNDEFINED, 2, args);
+    if (JS_IsException(arr))
+        goto exception;
+
+    if (count > 0) {
+        if (validate_typed_array(ctx, this_val)
+        ||  validate_typed_array(ctx, arr))
+            goto exception;
+
+        p1 = get_typed_array(ctx, arr, 0);
+        if (p1 != NULL && p->class_id == p1->class_id &&
+            typed_array_get_length(ctx, p1) >= count &&
+            typed_array_get_length(ctx, p) >= start + count) {
+            memcpy(p1->u.array.u.uint8_ptr,
+                   p->u.array.u.uint8_ptr + (start << shift),
+                   count << shift);
+        } else {
+            for (n = 0; n < count; n++) {
+                val = JS_GetPropertyValue(ctx, this_val, JS_NewInt32(ctx, start + n));
+                if (JS_IsException(val))
+                    goto exception;
+                if (JS_SetPropertyValue(ctx, arr, JS_NewInt32(ctx, n), val,
+                                        JS_PROP_THROW) < 0)
+                    goto exception;
+            }
+        }
+    }
+    return arr;
+
+ exception:
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_subarray(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValueConst args[4];
+    JSValue arr, byteOffset, ta_buffer;
+    JSObject *p;
+    int len, start, final, count, shift, offset;
+
+    p = get_typed_array(ctx, this_val, 0);
+    if (!p)
+        goto exception;
+    len = p->u.array.count;
+    if (JS_ToInt32Clamp(ctx, &start, argv[0], 0, len, len))
+        goto exception;
+
+    final = len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &final, argv[1], 0, len, len))
+            goto exception;
+    }
+    count = max_int(final - start, 0);
+    byteOffset = js_typed_array_get_byteOffset(ctx, this_val, 0);
+    if (JS_IsException(byteOffset))
+        goto exception;
+    shift = typed_array_size_log2(p->class_id);
+    offset = JS_VALUE_GET_INT(byteOffset) + (start << shift);
+    JS_FreeValue(ctx, byteOffset);
+    ta_buffer = js_typed_array_get_buffer(ctx, this_val, 0);
+    if (JS_IsException(ta_buffer))
+        goto exception;
+    args[0] = this_val;
+    args[1] = ta_buffer;
+    args[2] = JS_NewInt32(ctx, offset);
+    args[3] = JS_NewInt32(ctx, count);
+    arr = js_typed_array___speciesCreate(ctx, JS_UNDEFINED, 4, args);
+    JS_FreeValue(ctx, ta_buffer);
+    return arr;
+
+ exception:
+    return JS_EXCEPTION;
+}
+
+/* TypedArray.prototype.sort */
+
+static int js_cmp_doubles(double x, double y)
+{
+    if (isnan(x))    return isnan(y) ? 0 : +1;
+    if (isnan(y))    return -1;
+    if (x < y)       return -1;
+    if (x > y)       return 1;
+    if (x != 0)      return 0;
+    if (signbit(x))  return signbit(y) ? 0 : -1;
+    else             return signbit(y) ? 1 : 0;
+}
+
+static int js_TA_cmp_int8(const void *a, const void *b, void *opaque) {
+    return *(const int8_t *)a - *(const int8_t *)b;
+}
+
+static int js_TA_cmp_uint8(const void *a, const void *b, void *opaque) {
+    return *(const uint8_t *)a - *(const uint8_t *)b;
+}
+
+static int js_TA_cmp_int16(const void *a, const void *b, void *opaque) {
+    return *(const int16_t *)a - *(const int16_t *)b;
+}
+
+static int js_TA_cmp_uint16(const void *a, const void *b, void *opaque) {
+    return *(const uint16_t *)a - *(const uint16_t *)b;
+}
+
+static int js_TA_cmp_int32(const void *a, const void *b, void *opaque) {
+    int32_t x = *(const int32_t *)a;
+    int32_t y = *(const int32_t *)b;
+    return (y < x) - (y > x);
+}
+
+static int js_TA_cmp_uint32(const void *a, const void *b, void *opaque) {
+    uint32_t x = *(const uint32_t *)a;
+    uint32_t y = *(const uint32_t *)b;
+    return (y < x) - (y > x);
+}
+
+static int js_TA_cmp_int64(const void *a, const void *b, void *opaque) {
+    int64_t x = *(const int64_t *)a;
+    int64_t y = *(const int64_t *)b;
+    return (y < x) - (y > x);
+}
+
+static int js_TA_cmp_uint64(const void *a, const void *b, void *opaque) {
+    uint64_t x = *(const uint64_t *)a;
+    uint64_t y = *(const uint64_t *)b;
+    return (y < x) - (y > x);
+}
+
+static int js_TA_cmp_float32(const void *a, const void *b, void *opaque) {
+    return js_cmp_doubles(*(const float *)a, *(const float *)b);
+}
+
+static int js_TA_cmp_float64(const void *a, const void *b, void *opaque) {
+    return js_cmp_doubles(*(const double *)a, *(const double *)b);
+}
+
+static JSValue js_TA_get_int8(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const int8_t *)a);
+}
+
+static JSValue js_TA_get_uint8(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const uint8_t *)a);
+}
+
+static JSValue js_TA_get_int16(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const int16_t *)a);
+}
+
+static JSValue js_TA_get_uint16(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const uint16_t *)a);
+}
+
+static JSValue js_TA_get_int32(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const int32_t *)a);
+}
+
+static JSValue js_TA_get_uint32(JSContext *ctx, const void *a) {
+    return JS_NewUint32(ctx, *(const uint32_t *)a);
+}
+
+static JSValue js_TA_get_int64(JSContext *ctx, const void *a) {
+    return JS_NewBigInt64(ctx, *(int64_t *)a);
+}
+
+static JSValue js_TA_get_uint64(JSContext *ctx, const void *a) {
+    return JS_NewBigUint64(ctx, *(uint64_t *)a);
+}
+
+static JSValue js_TA_get_float32(JSContext *ctx, const void *a) {
+    return __JS_NewFloat64(ctx, *(const float *)a);
+}
+
+static JSValue js_TA_get_float64(JSContext *ctx, const void *a) {
+    return __JS_NewFloat64(ctx, *(const double *)a);
+}
+
+struct TA_sort_context {
+    JSContext *ctx;
+    int exception; /* 1 = exception, 2 = detached typed array */
+    JSValueConst arr;
+    JSValueConst cmp;
+    JSValue (*getfun)(JSContext *ctx, const void *a);
+    uint8_t *array_ptr; /* cannot change unless the array is detached */
+    int elt_size;
+};
+
+static int js_TA_cmp_generic(const void *a, const void *b, void *opaque) {
+    struct TA_sort_context *psc = opaque;
+    JSContext *ctx = psc->ctx;
+    uint32_t a_idx, b_idx;
+    JSValueConst argv[2];
+    JSValue res;
+    int cmp;
+
+    cmp = 0;
+    if (!psc->exception) {
+        /* Note: the typed array can be detached without causing an
+           error */
+        a_idx = *(uint32_t *)a;
+        b_idx = *(uint32_t *)b;
+        argv[0] = psc->getfun(ctx, psc->array_ptr +
+                              a_idx * (size_t)psc->elt_size);
+        argv[1] = psc->getfun(ctx, psc->array_ptr +
+                              b_idx * (size_t)(psc->elt_size));
+        res = JS_Call(ctx, psc->cmp, JS_UNDEFINED, 2, argv);
+        if (JS_IsException(res)) {
+            psc->exception = 1;
+            goto done;
+        }
+        if (JS_VALUE_GET_TAG(res) == JS_TAG_INT) {
+            int val = JS_VALUE_GET_INT(res);
+            cmp = (val > 0) - (val < 0);
+        } else {
+            double val;
+            if (JS_ToFloat64Free(ctx, &val, res) < 0) {
+                psc->exception = 1;
+                goto done;
+            } else {
+                cmp = (val > 0) - (val < 0);
+            }
+        }
+        if (cmp == 0) {
+            /* make sort stable: compare array offsets */
+            cmp = (a_idx > b_idx) - (a_idx < b_idx);
+        }
+        if (unlikely(typed_array_is_detached(ctx,
+                                             JS_VALUE_GET_PTR(psc->arr)))) {
+            psc->exception = 2;
+        }
+    done:
+        JS_FreeValue(ctx, argv[0]);
+        JS_FreeValue(ctx, argv[1]);
+    }
+    return cmp;
+}
+
+static JSValue js_typed_array_sort(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    int len;
+    size_t elt_size;
+    struct TA_sort_context tsc;
+    void *array_ptr;
+    int (*cmpfun)(const void *a, const void *b, void *opaque);
+
+    tsc.ctx = ctx;
+    tsc.exception = 0;
+    tsc.arr = this_val;
+    tsc.cmp = argv[0];
+
+    if (!JS_IsUndefined(tsc.cmp) && check_function(ctx, tsc.cmp))
+        return JS_EXCEPTION;
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        return JS_EXCEPTION;
+
+    if (len > 1) {
+        p = JS_VALUE_GET_OBJ(this_val);
+        switch (p->class_id) {
+        case JS_CLASS_INT8_ARRAY:
+            tsc.getfun = js_TA_get_int8;
+            cmpfun = js_TA_cmp_int8;
+            break;
+        case JS_CLASS_UINT8C_ARRAY:
+        case JS_CLASS_UINT8_ARRAY:
+            tsc.getfun = js_TA_get_uint8;
+            cmpfun = js_TA_cmp_uint8;
+            break;
+        case JS_CLASS_INT16_ARRAY:
+            tsc.getfun = js_TA_get_int16;
+            cmpfun = js_TA_cmp_int16;
+            break;
+        case JS_CLASS_UINT16_ARRAY:
+            tsc.getfun = js_TA_get_uint16;
+            cmpfun = js_TA_cmp_uint16;
+            break;
+        case JS_CLASS_INT32_ARRAY:
+            tsc.getfun = js_TA_get_int32;
+            cmpfun = js_TA_cmp_int32;
+            break;
+        case JS_CLASS_UINT32_ARRAY:
+            tsc.getfun = js_TA_get_uint32;
+            cmpfun = js_TA_cmp_uint32;
+            break;
+        case JS_CLASS_BIG_INT64_ARRAY:
+            tsc.getfun = js_TA_get_int64;
+            cmpfun = js_TA_cmp_int64;
+            break;
+        case JS_CLASS_BIG_UINT64_ARRAY:
+            tsc.getfun = js_TA_get_uint64;
+            cmpfun = js_TA_cmp_uint64;
+            break;
+        case JS_CLASS_FLOAT32_ARRAY:
+            tsc.getfun = js_TA_get_float32;
+            cmpfun = js_TA_cmp_float32;
+            break;
+        case JS_CLASS_FLOAT64_ARRAY:
+            tsc.getfun = js_TA_get_float64;
+            cmpfun = js_TA_cmp_float64;
+            break;
+        default:
+            abort();
+        }
+        array_ptr = p->u.array.u.ptr;
+        elt_size = 1 << typed_array_size_log2(p->class_id);
+        if (!JS_IsUndefined(tsc.cmp)) {
+            uint32_t *array_idx;
+            void *array_tmp;
+            size_t i, j;
+
+            /* XXX: a stable sort would use less memory */
+            array_idx = js_malloc(ctx, len * sizeof(array_idx[0]));
+            if (!array_idx)
+                return JS_EXCEPTION;
+            for(i = 0; i < len; i++)
+                array_idx[i] = i;
+            tsc.array_ptr = array_ptr;
+            tsc.elt_size = elt_size;
+            rqsort(array_idx, len, sizeof(array_idx[0]),
+                   js_TA_cmp_generic, &tsc);
+            if (tsc.exception) {
+                if (tsc.exception == 1)
+                    goto fail;
+                /* detached typed array during the sort: no error */
+            } else {
+                array_tmp = js_malloc(ctx, len * elt_size);
+                if (!array_tmp) {
+                fail:
+                    js_free(ctx, array_idx);
+                    return JS_EXCEPTION;
+                }
+                memcpy(array_tmp, array_ptr, len * elt_size);
+                switch(elt_size) {
+                case 1:
+                    for(i = 0; i < len; i++) {
+                        j = array_idx[i];
+                        ((uint8_t *)array_ptr)[i] = ((uint8_t *)array_tmp)[j];
+                    }
+                    break;
+                case 2:
+                    for(i = 0; i < len; i++) {
+                        j = array_idx[i];
+                        ((uint16_t *)array_ptr)[i] = ((uint16_t *)array_tmp)[j];
+                    }
+                    break;
+                case 4:
+                    for(i = 0; i < len; i++) {
+                        j = array_idx[i];
+                        ((uint32_t *)array_ptr)[i] = ((uint32_t *)array_tmp)[j];
+                    }
+                    break;
+                case 8:
+                    for(i = 0; i < len; i++) {
+                        j = array_idx[i];
+                        ((uint64_t *)array_ptr)[i] = ((uint64_t *)array_tmp)[j];
+                    }
+                    break;
+                default:
+                    abort();
+                }
+                js_free(ctx, array_tmp);
+            }
+            js_free(ctx, array_idx);
+        } else {
+            rqsort(array_ptr, len, elt_size, cmpfun, &tsc);
+            if (tsc.exception)
+                return JS_EXCEPTION;
+        }
+    }
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue js_typed_array_toSorted(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue arr, ret;
+    JSObject *p;
+
+    p = get_typed_array(ctx, this_val, /*is_dataview*/0);
+    if (!p)
+        return JS_EXCEPTION;
+    arr = js_typed_array_constructor_ta(ctx, JS_UNDEFINED, this_val,
+                                        p->class_id);
+    if (JS_IsException(arr))
+        return JS_EXCEPTION;
+    ret = js_typed_array_sort(ctx, arr, argc, argv);
+    JS_FreeValue(ctx, arr);
+    return ret;
+}
+
+static const JSCFunctionListEntry js_typed_array_base_funcs[] = {
+    JS_CFUNC_DEF("from", 1, js_typed_array_from ),
+    JS_CFUNC_DEF("of", 0, js_typed_array_of ),
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+    //JS_CFUNC_DEF("__getLength", 2, js_typed_array___getLength ),
+    //JS_CFUNC_DEF("__create", 2, js_typed_array___create ),
+    //JS_CFUNC_DEF("__speciesCreate", 2, js_typed_array___speciesCreate ),
+};
+
+static const JSCFunctionListEntry js_typed_array_base_proto_funcs[] = {
+    JS_CGETSET_DEF("length", js_typed_array_get_length, NULL ),
+    JS_CFUNC_DEF("at", 1, js_typed_array_at ),
+    JS_CFUNC_DEF("with", 2, js_typed_array_with ),
+    JS_CGETSET_MAGIC_DEF("buffer", js_typed_array_get_buffer, NULL, 0 ),
+    JS_CGETSET_MAGIC_DEF("byteLength", js_typed_array_get_byteLength, NULL, 0 ),
+    JS_CGETSET_MAGIC_DEF("byteOffset", js_typed_array_get_byteOffset, NULL, 0 ),
+    JS_CFUNC_DEF("set", 1, js_typed_array_set ),
+    JS_CFUNC_MAGIC_DEF("values", 0, js_create_typed_array_iterator, JS_ITERATOR_KIND_VALUE ),
+    JS_ALIAS_DEF("[Symbol.iterator]", "values" ),
+    JS_CFUNC_MAGIC_DEF("keys", 0, js_create_typed_array_iterator, JS_ITERATOR_KIND_KEY ),
+    JS_CFUNC_MAGIC_DEF("entries", 0, js_create_typed_array_iterator, JS_ITERATOR_KIND_KEY_AND_VALUE ),
+    JS_CGETSET_DEF("[Symbol.toStringTag]", js_typed_array_get_toStringTag, NULL ),
+    JS_CFUNC_DEF("copyWithin", 2, js_typed_array_copyWithin ),
+    JS_CFUNC_MAGIC_DEF("every", 1, js_array_every, special_every | special_TA ),
+    JS_CFUNC_MAGIC_DEF("some", 1, js_array_every, special_some | special_TA ),
+    JS_CFUNC_MAGIC_DEF("forEach", 1, js_array_every, special_forEach | special_TA ),
+    JS_CFUNC_MAGIC_DEF("map", 1, js_array_every, special_map | special_TA ),
+    JS_CFUNC_MAGIC_DEF("filter", 1, js_array_every, special_filter | special_TA ),
+    JS_CFUNC_MAGIC_DEF("reduce", 1, js_array_reduce, special_reduce | special_TA ),
+    JS_CFUNC_MAGIC_DEF("reduceRight", 1, js_array_reduce, special_reduceRight | special_TA ),
+    JS_CFUNC_DEF("fill", 1, js_typed_array_fill ),
+    JS_CFUNC_MAGIC_DEF("find", 1, js_typed_array_find, ArrayFind ),
+    JS_CFUNC_MAGIC_DEF("findIndex", 1, js_typed_array_find, ArrayFindIndex ),
+    JS_CFUNC_MAGIC_DEF("findLast", 1, js_typed_array_find, ArrayFindLast ),
+    JS_CFUNC_MAGIC_DEF("findLastIndex", 1, js_typed_array_find, ArrayFindLastIndex ),
+    JS_CFUNC_DEF("reverse", 0, js_typed_array_reverse ),
+    JS_CFUNC_DEF("toReversed", 0, js_typed_array_toReversed ),
+    JS_CFUNC_DEF("slice", 2, js_typed_array_slice ),
+    JS_CFUNC_DEF("subarray", 2, js_typed_array_subarray ),
+    JS_CFUNC_DEF("sort", 1, js_typed_array_sort ),
+    JS_CFUNC_DEF("toSorted", 1, js_typed_array_toSorted ),
+    JS_CFUNC_MAGIC_DEF("join", 1, js_typed_array_join, 0 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleString", 0, js_typed_array_join, 1 ),
+    JS_CFUNC_MAGIC_DEF("indexOf", 1, js_typed_array_indexOf, special_indexOf ),
+    JS_CFUNC_MAGIC_DEF("lastIndexOf", 1, js_typed_array_indexOf, special_lastIndexOf ),
+    JS_CFUNC_MAGIC_DEF("includes", 1, js_typed_array_indexOf, special_includes ),
+    //JS_ALIAS_BASE_DEF("toString", "toString", 2 /* Array.prototype. */), @@@
+};
+
+static JSValue js_typed_array_base_constructor(JSContext *ctx,
+                                               JSValueConst this_val,
+                                               int argc, JSValueConst *argv)
+{
+    return JS_ThrowTypeError(ctx, "cannot be called");
+}
+
+/* 'obj' must be an allocated typed array object */
+static int typed_array_init(JSContext *ctx, JSValueConst obj,
+                            JSValue buffer, uint64_t offset, uint64_t len)
+{
+    JSTypedArray *ta;
+    JSObject *p, *pbuffer;
+    JSArrayBuffer *abuf;
+    int size_log2;
+
+    p = JS_VALUE_GET_OBJ(obj);
+    size_log2 = typed_array_size_log2(p->class_id);
+    ta = js_malloc(ctx, sizeof(*ta));
+    if (!ta) {
+        JS_FreeValue(ctx, buffer);
+        return -1;
+    }
+    pbuffer = JS_VALUE_GET_OBJ(buffer);
+    abuf = pbuffer->u.array_buffer;
+    ta->obj = p;
+    ta->buffer = pbuffer;
+    ta->offset = offset;
+    ta->length = len << size_log2;
+    list_add_tail(&ta->link, &abuf->array_list);
+    p->u.typed_array = ta;
+    p->u.array.count = len;
+    p->u.array.u.ptr = abuf->data + offset;
+    return 0;
+}
+
+
+static JSValue js_array_from_iterator(JSContext *ctx, uint32_t *plen,
+                                      JSValueConst obj, JSValueConst method)
+{
+    JSValue arr, iter, next_method = JS_UNDEFINED, val;
+    BOOL done;
+    uint32_t k;
+
+    *plen = 0;
+    arr = JS_NewArray(ctx);
+    if (JS_IsException(arr))
+        return arr;
+    iter = JS_GetIterator2(ctx, obj, method);
+    if (JS_IsException(iter))
+        goto fail;
+    next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+    if (JS_IsException(next_method))
+        goto fail;
+    k = 0;
+    for(;;) {
+        val = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+        if (JS_IsException(val))
+            goto fail;
+        if (done) {
+            JS_FreeValue(ctx, val);
+            break;
+        }
+        if (JS_CreateDataPropertyUint32(ctx, arr, k, val, JS_PROP_THROW) < 0)
+            goto fail;
+        k++;
+    }
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    *plen = k;
+    return arr;
+ fail:
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_constructor_obj(JSContext *ctx,
+                                              JSValueConst new_target,
+                                              JSValueConst obj,
+                                              int classid)
+{
+    JSValue iter, ret, arr = JS_UNDEFINED, val, buffer;
+    uint32_t i;
+    int size_log2;
+    int64_t len;
+
+    size_log2 = typed_array_size_log2(classid);
+    ret = js_create_from_ctor(ctx, new_target, classid);
+    if (JS_IsException(ret))
+        return JS_EXCEPTION;
+
+    iter = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_iterator);
+    if (JS_IsException(iter))
+        goto fail;
+    if (!JS_IsUndefined(iter) && !JS_IsNull(iter)) {
+        uint32_t len1;
+        arr = js_array_from_iterator(ctx, &len1, obj, iter);
+        JS_FreeValue(ctx, iter);
+        if (JS_IsException(arr))
+            goto fail;
+        len = len1;
+    } else {
+        if (js_get_length64(ctx, &len, obj))
+            goto fail;
+        arr = JS_DupValue(ctx, obj);
+    }
+
+    buffer = js_array_buffer_constructor1(ctx, JS_UNDEFINED,
+                                          len << size_log2);
+    if (JS_IsException(buffer))
+        goto fail;
+    if (typed_array_init(ctx, ret, buffer, 0, len))
+        goto fail;
+
+    for(i = 0; i < len; i++) {
+        val = JS_GetPropertyUint32(ctx, arr, i);
+        if (JS_IsException(val))
+            goto fail;
+        if (JS_SetPropertyUint32(ctx, ret, i, val) < 0)
+            goto fail;
+    }
+    JS_FreeValue(ctx, arr);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, ret);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_constructor_ta(JSContext *ctx,
+                                             JSValueConst new_target,
+                                             JSValueConst src_obj,
+                                             int classid)
+{
+    JSObject *p, *src_buffer;
+    JSTypedArray *ta;
+    JSValue obj, buffer;
+    uint32_t len, i;
+    int size_log2;
+    JSArrayBuffer *src_abuf, *abuf;
+
+    obj = js_create_from_ctor(ctx, new_target, classid);
+    if (JS_IsException(obj))
+        return obj;
+    p = JS_VALUE_GET_OBJ(src_obj);
+    if (typed_array_is_detached(ctx, p)) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    ta = p->u.typed_array;
+    len = p->u.array.count;
+    src_buffer = ta->buffer;
+    src_abuf = src_buffer->u.array_buffer;
+    size_log2 = typed_array_size_log2(classid);
+    buffer = js_array_buffer_constructor1(ctx, JS_UNDEFINED,
+                                          (uint64_t)len << size_log2);
+    if (JS_IsException(buffer))
+        goto fail;
+    /* necessary because it could have been detached */
+    if (typed_array_is_detached(ctx, p)) {
+        JS_FreeValue(ctx, buffer);
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    abuf = JS_GetOpaque(buffer, JS_CLASS_ARRAY_BUFFER);
+    if (typed_array_init(ctx, obj, buffer, 0, len))
+        goto fail;
+    if (p->class_id == classid) {
+        /* same type: copy the content */
+        memcpy(abuf->data, src_abuf->data + ta->offset, abuf->byte_length);
+    } else {
+        for(i = 0; i < len; i++) {
+            JSValue val;
+            val = JS_GetPropertyUint32(ctx, src_obj, i);
+            if (JS_IsException(val))
+                goto fail;
+            if (JS_SetPropertyUint32(ctx, obj, i, val) < 0)
+                goto fail;
+        }
+    }
+    return obj;
+ fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_constructor(JSContext *ctx,
+                                          JSValueConst new_target,
+                                          int argc, JSValueConst *argv,
+                                          int classid)
+{
+    JSValue buffer, obj;
+    JSArrayBuffer *abuf;
+    int size_log2;
+    uint64_t len, offset;
+
+    size_log2 = typed_array_size_log2(classid);
+    if (JS_VALUE_GET_TAG(argv[0]) != JS_TAG_OBJECT) {
+        if (JS_ToIndex(ctx, &len, argv[0]))
+            return JS_EXCEPTION;
+        buffer = js_array_buffer_constructor1(ctx, JS_UNDEFINED,
+                                              len << size_log2);
+        if (JS_IsException(buffer))
+            return JS_EXCEPTION;
+        offset = 0;
+    } else {
+        JSObject *p = JS_VALUE_GET_OBJ(argv[0]);
+        if (p->class_id == JS_CLASS_ARRAY_BUFFER ||
+            p->class_id == JS_CLASS_SHARED_ARRAY_BUFFER) {
+            abuf = p->u.array_buffer;
+            if (JS_ToIndex(ctx, &offset, argv[1]))
+                return JS_EXCEPTION;
+            if (abuf->detached)
+                return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+            if ((offset & ((1 << size_log2) - 1)) != 0 ||
+                offset > abuf->byte_length)
+                return JS_ThrowRangeError(ctx, "invalid offset");
+            if (JS_IsUndefined(argv[2])) {
+                if ((abuf->byte_length & ((1 << size_log2) - 1)) != 0)
+                    goto invalid_length;
+                len = (abuf->byte_length - offset) >> size_log2;
+            } else {
+                if (JS_ToIndex(ctx, &len, argv[2]))
+                    return JS_EXCEPTION;
+                if (abuf->detached)
+                    return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+                if ((offset + (len << size_log2)) > abuf->byte_length) {
+                invalid_length:
+                    return JS_ThrowRangeError(ctx, "invalid length");
+                }
+            }
+            buffer = JS_DupValue(ctx, argv[0]);
+        } else {
+            if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+                return js_typed_array_constructor_ta(ctx, new_target, argv[0], classid);
+            } else {
+                return js_typed_array_constructor_obj(ctx, new_target, argv[0], classid);
+            }
+        }
+    }
+
+    obj = js_create_from_ctor(ctx, new_target, classid);
+    if (JS_IsException(obj)) {
+        JS_FreeValue(ctx, buffer);
+        return JS_EXCEPTION;
+    }
+    if (typed_array_init(ctx, obj, buffer, offset, len)) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    return obj;
+}
+
+static void js_typed_array_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSTypedArray *ta = p->u.typed_array;
+    if (ta) {
+        /* during the GC the finalizers are called in an arbitrary
+           order so the ArrayBuffer finalizer may have been called */
+        if (ta->link.next) {
+            list_del(&ta->link);
+        }
+        JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, ta->buffer));
+        js_free_rt(rt, ta);
+    }
+}
+
+static void js_typed_array_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSTypedArray *ta = p->u.typed_array;
+    if (ta) {
+        JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, ta->buffer), mark_func);
+    }
+}
+
+static JSValue js_dataview_constructor(JSContext *ctx,
+                                       JSValueConst new_target,
+                                       int argc, JSValueConst *argv)
+{
+    JSArrayBuffer *abuf;
+    uint64_t offset;
+    uint32_t len;
+    JSValueConst buffer;
+    JSValue obj;
+    JSTypedArray *ta;
+    JSObject *p;
+
+    buffer = argv[0];
+    abuf = js_get_array_buffer(ctx, buffer);
+    if (!abuf)
+        return JS_EXCEPTION;
+    offset = 0;
+    if (argc > 1) {
+        if (JS_ToIndex(ctx, &offset, argv[1]))
+            return JS_EXCEPTION;
+    }
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    if (offset > abuf->byte_length)
+        return JS_ThrowRangeError(ctx, "invalid byteOffset");
+    len = abuf->byte_length - offset;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        uint64_t l;
+        if (JS_ToIndex(ctx, &l, argv[2]))
+            return JS_EXCEPTION;
+        if (l > len)
+            return JS_ThrowRangeError(ctx, "invalid byteLength");
+        len = l;
+    }
+
+    obj = js_create_from_ctor(ctx, new_target, JS_CLASS_DATAVIEW);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    if (abuf->detached) {
+        /* could have been detached in js_create_from_ctor() */
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    ta = js_malloc(ctx, sizeof(*ta));
+    if (!ta) {
+    fail:
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    p = JS_VALUE_GET_OBJ(obj);
+    ta->obj = p;
+    ta->buffer = JS_VALUE_GET_OBJ(JS_DupValue(ctx, buffer));
+    ta->offset = offset;
+    ta->length = len;
+    list_add_tail(&ta->link, &abuf->array_list);
+    p->u.typed_array = ta;
+    return obj;
+}
+
+static JSValue js_dataview_getValue(JSContext *ctx,
+                                    JSValueConst this_obj,
+                                    int argc, JSValueConst *argv, int class_id)
+{
+    JSTypedArray *ta;
+    JSArrayBuffer *abuf;
+    BOOL littleEndian, is_swap;
+    int size;
+    uint8_t *ptr;
+    uint32_t v;
+    uint64_t pos;
+
+    ta = JS_GetOpaque2(ctx, this_obj, JS_CLASS_DATAVIEW);
+    if (!ta)
+        return JS_EXCEPTION;
+    size = 1 << typed_array_size_log2(class_id);
+    if (JS_ToIndex(ctx, &pos, argv[0]))
+        return JS_EXCEPTION;
+    littleEndian = argc > 1 && JS_ToBool(ctx, argv[1]);
+    is_swap = littleEndian ^ !is_be();
+    abuf = ta->buffer->u.array_buffer;
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    if ((pos + size) > ta->length)
+        return JS_ThrowRangeError(ctx, "out of bound");
+    ptr = abuf->data + ta->offset + pos;
+
+    switch(class_id) {
+    case JS_CLASS_INT8_ARRAY:
+        return JS_NewInt32(ctx, *(int8_t *)ptr);
+    case JS_CLASS_UINT8_ARRAY:
+        return JS_NewInt32(ctx, *(uint8_t *)ptr);
+    case JS_CLASS_INT16_ARRAY:
+        v = get_u16(ptr);
+        if (is_swap)
+            v = bswap16(v);
+        return JS_NewInt32(ctx, (int16_t)v);
+    case JS_CLASS_UINT16_ARRAY:
+        v = get_u16(ptr);
+        if (is_swap)
+            v = bswap16(v);
+        return JS_NewInt32(ctx, v);
+    case JS_CLASS_INT32_ARRAY:
+        v = get_u32(ptr);
+        if (is_swap)
+            v = bswap32(v);
+        return JS_NewInt32(ctx, v);
+    case JS_CLASS_UINT32_ARRAY:
+        v = get_u32(ptr);
+        if (is_swap)
+            v = bswap32(v);
+        return JS_NewUint32(ctx, v);
+    case JS_CLASS_BIG_INT64_ARRAY:
+        {
+            uint64_t v;
+            v = get_u64(ptr);
+            if (is_swap)
+                v = bswap64(v);
+            return JS_NewBigInt64(ctx, v);
+        }
+        break;
+    case JS_CLASS_BIG_UINT64_ARRAY:
+        {
+            uint64_t v;
+            v = get_u64(ptr);
+            if (is_swap)
+                v = bswap64(v);
+            return JS_NewBigUint64(ctx, v);
+        }
+        break;
+    case JS_CLASS_FLOAT32_ARRAY:
+        {
+            union {
+                float f;
+                uint32_t i;
+            } u;
+            v = get_u32(ptr);
+            if (is_swap)
+                v = bswap32(v);
+            u.i = v;
+            return __JS_NewFloat64(ctx, u.f);
+        }
+    case JS_CLASS_FLOAT64_ARRAY:
+        {
+            union {
+                double f;
+                uint64_t i;
+            } u;
+            u.i = get_u64(ptr);
+            if (is_swap)
+                u.i = bswap64(u.i);
+            return __JS_NewFloat64(ctx, u.f);
+        }
+    default:
+        abort();
+    }
+}
+
+static JSValue js_dataview_setValue(JSContext *ctx,
+                                    JSValueConst this_obj,
+                                    int argc, JSValueConst *argv, int class_id)
+{
+    JSTypedArray *ta;
+    JSArrayBuffer *abuf;
+    BOOL littleEndian, is_swap;
+    int size;
+    uint8_t *ptr;
+    uint64_t v64;
+    uint32_t v;
+    uint64_t pos;
+    JSValueConst val;
+
+    ta = JS_GetOpaque2(ctx, this_obj, JS_CLASS_DATAVIEW);
+    if (!ta)
+        return JS_EXCEPTION;
+    size = 1 << typed_array_size_log2(class_id);
+    if (JS_ToIndex(ctx, &pos, argv[0]))
+        return JS_EXCEPTION;
+    val = argv[1];
+    v = 0; /* avoid warning */
+    v64 = 0; /* avoid warning */
+    if (class_id <= JS_CLASS_UINT32_ARRAY) {
+        if (JS_ToUint32(ctx, &v, val))
+            return JS_EXCEPTION;
+    } else if (class_id <= JS_CLASS_BIG_UINT64_ARRAY) {
+        if (JS_ToBigInt64(ctx, (int64_t *)&v64, val))
+            return JS_EXCEPTION;
+    } else {
+        double d;
+        if (JS_ToFloat64(ctx, &d, val))
+            return JS_EXCEPTION;
+        if (class_id == JS_CLASS_FLOAT32_ARRAY) {
+            union {
+                float f;
+                uint32_t i;
+            } u;
+            u.f = d;
+            v = u.i;
+        } else {
+            JSFloat64Union u;
+            u.d = d;
+            v64 = u.u64;
+        }
+    }
+    littleEndian = argc > 2 && JS_ToBool(ctx, argv[2]);
+    is_swap = littleEndian ^ !is_be();
+    abuf = ta->buffer->u.array_buffer;
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    if ((pos + size) > ta->length)
+        return JS_ThrowRangeError(ctx, "out of bound");
+    ptr = abuf->data + ta->offset + pos;
+
+    switch(class_id) {
+    case JS_CLASS_INT8_ARRAY:
+    case JS_CLASS_UINT8_ARRAY:
+        *ptr = v;
+        break;
+    case JS_CLASS_INT16_ARRAY:
+    case JS_CLASS_UINT16_ARRAY:
+        if (is_swap)
+            v = bswap16(v);
+        put_u16(ptr, v);
+        break;
+    case JS_CLASS_INT32_ARRAY:
+    case JS_CLASS_UINT32_ARRAY:
+    case JS_CLASS_FLOAT32_ARRAY:
+        if (is_swap)
+            v = bswap32(v);
+        put_u32(ptr, v);
+        break;
+    case JS_CLASS_BIG_INT64_ARRAY:
+    case JS_CLASS_BIG_UINT64_ARRAY:
+    case JS_CLASS_FLOAT64_ARRAY:
+        if (is_swap)
+            v64 = bswap64(v64);
+        put_u64(ptr, v64);
+        break;
+    default:
+        abort();
+    }
+    return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry js_dataview_proto_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("buffer", js_typed_array_get_buffer, NULL, 1 ),
+    JS_CGETSET_MAGIC_DEF("byteLength", js_typed_array_get_byteLength, NULL, 1 ),
+    JS_CGETSET_MAGIC_DEF("byteOffset", js_typed_array_get_byteOffset, NULL, 1 ),
+    JS_CFUNC_MAGIC_DEF("getInt8", 1, js_dataview_getValue, JS_CLASS_INT8_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getUint8", 1, js_dataview_getValue, JS_CLASS_UINT8_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getInt16", 1, js_dataview_getValue, JS_CLASS_INT16_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getUint16", 1, js_dataview_getValue, JS_CLASS_UINT16_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getInt32", 1, js_dataview_getValue, JS_CLASS_INT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getUint32", 1, js_dataview_getValue, JS_CLASS_UINT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getBigInt64", 1, js_dataview_getValue, JS_CLASS_BIG_INT64_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getBigUint64", 1, js_dataview_getValue, JS_CLASS_BIG_UINT64_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getFloat32", 1, js_dataview_getValue, JS_CLASS_FLOAT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getFloat64", 1, js_dataview_getValue, JS_CLASS_FLOAT64_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setInt8", 2, js_dataview_setValue, JS_CLASS_INT8_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setUint8", 2, js_dataview_setValue, JS_CLASS_UINT8_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setInt16", 2, js_dataview_setValue, JS_CLASS_INT16_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setUint16", 2, js_dataview_setValue, JS_CLASS_UINT16_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setInt32", 2, js_dataview_setValue, JS_CLASS_INT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setUint32", 2, js_dataview_setValue, JS_CLASS_UINT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setBigInt64", 2, js_dataview_setValue, JS_CLASS_BIG_INT64_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setBigUint64", 2, js_dataview_setValue, JS_CLASS_BIG_UINT64_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setFloat32", 2, js_dataview_setValue, JS_CLASS_FLOAT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setFloat64", 2, js_dataview_setValue, JS_CLASS_FLOAT64_ARRAY ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "DataView", JS_PROP_CONFIGURABLE ),
+};
+
+/* Atomics */
+#ifdef CONFIG_ATOMICS
+
+typedef enum AtomicsOpEnum {
+    ATOMICS_OP_ADD,
+    ATOMICS_OP_AND,
+    ATOMICS_OP_OR,
+    ATOMICS_OP_SUB,
+    ATOMICS_OP_XOR,
+    ATOMICS_OP_EXCHANGE,
+    ATOMICS_OP_COMPARE_EXCHANGE,
+    ATOMICS_OP_LOAD,
+} AtomicsOpEnum;
+
+static void *js_atomics_get_ptr(JSContext *ctx,
+                                JSArrayBuffer **pabuf,
+                                int *psize_log2, JSClassID *pclass_id,
+                                JSValueConst obj, JSValueConst idx_val,
+                                int is_waitable)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    JSArrayBuffer *abuf;
+    void *ptr;
+    uint64_t idx;
+    BOOL err;
+    int size_log2;
+
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        goto fail;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (is_waitable)
+        err = (p->class_id != JS_CLASS_INT32_ARRAY &&
+               p->class_id != JS_CLASS_BIG_INT64_ARRAY);
+    else
+        err = !(p->class_id >= JS_CLASS_INT8_ARRAY &&
+                p->class_id <= JS_CLASS_BIG_UINT64_ARRAY);
+    if (err) {
+    fail:
+        JS_ThrowTypeError(ctx, "integer TypedArray expected");
+        return NULL;
+    }
+    ta = p->u.typed_array;
+    abuf = ta->buffer->u.array_buffer;
+    if (!abuf->shared) {
+        if (is_waitable == 2) {
+            JS_ThrowTypeError(ctx, "not a SharedArrayBuffer TypedArray");
+            return NULL;
+        }
+        if (abuf->detached) {
+            JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+            return NULL;
+        }
+    }
+    if (JS_ToIndex(ctx, &idx, idx_val)) {
+        return NULL;
+    }
+    /* if the array buffer is detached, p->u.array.count = 0 */
+    if (idx >= p->u.array.count) {
+        JS_ThrowRangeError(ctx, "out-of-bound access");
+        return NULL;
+    }
+    size_log2 = typed_array_size_log2(p->class_id);
+    ptr = p->u.array.u.uint8_ptr + ((uintptr_t)idx << size_log2);
+    if (pabuf)
+        *pabuf = abuf;
+    if (psize_log2)
+        *psize_log2 = size_log2;
+    if (pclass_id)
+        *pclass_id = p->class_id;
+    return ptr;
+}
+
+static JSValue js_atomics_op(JSContext *ctx,
+                             JSValueConst this_obj,
+                             int argc, JSValueConst *argv, int op)
+{
+    int size_log2;
+    uint64_t v, a, rep_val;
+    void *ptr;
+    JSValue ret;
+    JSClassID class_id;
+    JSArrayBuffer *abuf;
+
+    ptr = js_atomics_get_ptr(ctx, &abuf, &size_log2, &class_id,
+                             argv[0], argv[1], 0);
+    if (!ptr)
+        return JS_EXCEPTION;
+    rep_val = 0;
+    if (op == ATOMICS_OP_LOAD) {
+        v = 0;
+    } else {
+        if (size_log2 == 3) {
+            int64_t v64;
+            if (JS_ToBigInt64(ctx, &v64, argv[2]))
+                return JS_EXCEPTION;
+            v = v64;
+            if (op == ATOMICS_OP_COMPARE_EXCHANGE) {
+                if (JS_ToBigInt64(ctx, &v64, argv[3]))
+                    return JS_EXCEPTION;
+                rep_val = v64;
+            }
+        } else {
+                uint32_t v32;
+                if (JS_ToUint32(ctx, &v32, argv[2]))
+                    return JS_EXCEPTION;
+                v = v32;
+                if (op == ATOMICS_OP_COMPARE_EXCHANGE) {
+                    if (JS_ToUint32(ctx, &v32, argv[3]))
+                        return JS_EXCEPTION;
+                    rep_val = v32;
+                }
+        }
+        if (abuf->detached)
+            return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+   }
+
+   switch(op | (size_log2 << 3)) {
+
+#define OP(op_name, func_name)                          \
+    case ATOMICS_OP_ ## op_name | (0 << 3):             \
+       a = func_name((_Atomic(uint8_t) *)ptr, v);       \
+       break;                                           \
+    case ATOMICS_OP_ ## op_name | (1 << 3):             \
+        a = func_name((_Atomic(uint16_t) *)ptr, v);     \
+        break;                                          \
+    case ATOMICS_OP_ ## op_name | (2 << 3):             \
+        a = func_name((_Atomic(uint32_t) *)ptr, v);     \
+        break;                                          \
+    case ATOMICS_OP_ ## op_name | (3 << 3):             \
+        a = func_name((_Atomic(uint64_t) *)ptr, v);     \
+        break;
+
+        OP(ADD, atomic_fetch_add)
+        OP(AND, atomic_fetch_and)
+        OP(OR, atomic_fetch_or)
+        OP(SUB, atomic_fetch_sub)
+        OP(XOR, atomic_fetch_xor)
+        OP(EXCHANGE, atomic_exchange)
+#undef OP
+
+    case ATOMICS_OP_LOAD | (0 << 3):
+        a = atomic_load((_Atomic(uint8_t) *)ptr);
+        break;
+    case ATOMICS_OP_LOAD | (1 << 3):
+        a = atomic_load((_Atomic(uint16_t) *)ptr);
+        break;
+    case ATOMICS_OP_LOAD | (2 << 3):
+        a = atomic_load((_Atomic(uint32_t) *)ptr);
+        break;
+    case ATOMICS_OP_LOAD | (3 << 3):
+        a = atomic_load((_Atomic(uint64_t) *)ptr);
+        break;
+
+    case ATOMICS_OP_COMPARE_EXCHANGE | (0 << 3):
+        {
+            uint8_t v1 = v;
+            atomic_compare_exchange_strong((_Atomic(uint8_t) *)ptr, &v1, rep_val);
+            a = v1;
+        }
+        break;
+    case ATOMICS_OP_COMPARE_EXCHANGE | (1 << 3):
+        {
+            uint16_t v1 = v;
+            atomic_compare_exchange_strong((_Atomic(uint16_t) *)ptr, &v1, rep_val);
+            a = v1;
+        }
+        break;
+    case ATOMICS_OP_COMPARE_EXCHANGE | (2 << 3):
+        {
+            uint32_t v1 = v;
+            atomic_compare_exchange_strong((_Atomic(uint32_t) *)ptr, &v1, rep_val);
+            a = v1;
+        }
+        break;
+    case ATOMICS_OP_COMPARE_EXCHANGE | (3 << 3):
+        {
+            uint64_t v1 = v;
+            atomic_compare_exchange_strong((_Atomic(uint64_t) *)ptr, &v1, rep_val);
+            a = v1;
+        }
+        break;
+    default:
+        abort();
+    }
+
+    switch(class_id) {
+    case JS_CLASS_INT8_ARRAY:
+        a = (int8_t)a;
+        goto done;
+    case JS_CLASS_UINT8_ARRAY:
+        a = (uint8_t)a;
+        goto done;
+    case JS_CLASS_INT16_ARRAY:
+        a = (int16_t)a;
+        goto done;
+    case JS_CLASS_UINT16_ARRAY:
+        a = (uint16_t)a;
+        goto done;
+    case JS_CLASS_INT32_ARRAY:
+    done:
+        ret = JS_NewInt32(ctx, a);
+        break;
+    case JS_CLASS_UINT32_ARRAY:
+        ret = JS_NewUint32(ctx, a);
+        break;
+    case JS_CLASS_BIG_INT64_ARRAY:
+        ret = JS_NewBigInt64(ctx, a);
+        break;
+    case JS_CLASS_BIG_UINT64_ARRAY:
+        ret = JS_NewBigUint64(ctx, a);
+        break;
+    default:
+        abort();
+    }
+    return ret;
+}
+
+static JSValue js_atomics_store(JSContext *ctx,
+                                JSValueConst this_obj,
+                                int argc, JSValueConst *argv)
+{
+    int size_log2;
+    void *ptr;
+    JSValue ret;
+    JSArrayBuffer *abuf;
+
+    ptr = js_atomics_get_ptr(ctx, &abuf, &size_log2, NULL,
+                             argv[0], argv[1], 0);
+    if (!ptr)
+        return JS_EXCEPTION;
+    if (size_log2 == 3) {
+        int64_t v64;
+        ret = JS_ToBigIntValueFree(ctx, JS_DupValue(ctx, argv[2]));
+        if (JS_IsException(ret))
+            return ret;
+        if (JS_ToBigInt64(ctx, &v64, ret)) {
+            JS_FreeValue(ctx, ret);
+            return JS_EXCEPTION;
+        }
+        if (abuf->detached)
+            return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        atomic_store((_Atomic(uint64_t) *)ptr, v64);
+    } else {
+        uint32_t v;
+        /* XXX: spec, would be simpler to return the written value */
+        ret = JS_ToIntegerFree(ctx, JS_DupValue(ctx, argv[2]));
+        if (JS_IsException(ret))
+            return ret;
+        if (JS_ToUint32(ctx, &v, ret)) {
+            JS_FreeValue(ctx, ret);
+            return JS_EXCEPTION;
+        }
+        if (abuf->detached)
+            return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        switch(size_log2) {
+        case 0:
+            atomic_store((_Atomic(uint8_t) *)ptr, v);
+            break;
+        case 1:
+            atomic_store((_Atomic(uint16_t) *)ptr, v);
+            break;
+        case 2:
+            atomic_store((_Atomic(uint32_t) *)ptr, v);
+            break;
+        default:
+            abort();
+        }
+    }
+    return ret;
+}
+
+static JSValue js_atomics_isLockFree(JSContext *ctx,
+                                     JSValueConst this_obj,
+                                     int argc, JSValueConst *argv)
+{
+    int v, ret;
+    if (JS_ToInt32Sat(ctx, &v, argv[0]))
+        return JS_EXCEPTION;
+    ret = (v == 1 || v == 2 || v == 4 || v == 8);
+    return JS_NewBool(ctx, ret);
+}
+
+typedef struct JSAtomicsWaiter {
+    struct list_head link;
+    BOOL linked;
+    pthread_cond_t cond;
+    int32_t *ptr;
+} JSAtomicsWaiter;
+
+static pthread_mutex_t js_atomics_mutex = PTHREAD_MUTEX_INITIALIZER;
+static struct list_head js_atomics_waiter_list =
+    LIST_HEAD_INIT(js_atomics_waiter_list);
+
+static JSValue js_atomics_wait(JSContext *ctx,
+                               JSValueConst this_obj,
+                               int argc, JSValueConst *argv)
+{
+    int64_t v;
+    int32_t v32;
+    void *ptr;
+    int64_t timeout;
+    struct timespec ts;
+    JSAtomicsWaiter waiter_s, *waiter;
+    int ret, size_log2, res;
+    double d;
+
+    ptr = js_atomics_get_ptr(ctx, NULL, &size_log2, NULL,
+                             argv[0], argv[1], 2);
+    if (!ptr)
+        return JS_EXCEPTION;
+    if (size_log2 == 3) {
+        if (JS_ToBigInt64(ctx, &v, argv[2]))
+            return JS_EXCEPTION;
+    } else {
+        if (JS_ToInt32(ctx, &v32, argv[2]))
+            return JS_EXCEPTION;
+        v = v32;
+    }
+    if (JS_ToFloat64(ctx, &d, argv[3]))
+        return JS_EXCEPTION;
+    /* must use INT64_MAX + 1 because INT64_MAX cannot be exactly represented as a double */
+    if (isnan(d) || d >= 0x1p63)
+        timeout = INT64_MAX;
+    else if (d < 0)
+        timeout = 0;
+    else
+        timeout = (int64_t)d;
+    if (!ctx->rt->can_block)
+        return JS_ThrowTypeError(ctx, "cannot block in this thread");
+
+    /* XXX: inefficient if large number of waiters, should hash on
+       'ptr' value */
+    /* XXX: use Linux futexes when available ? */
+    pthread_mutex_lock(&js_atomics_mutex);
+    if (size_log2 == 3) {
+        res = *(int64_t *)ptr != v;
+    } else {
+        res = *(int32_t *)ptr != v;
+    }
+    if (res) {
+        pthread_mutex_unlock(&js_atomics_mutex);
+        return JS_AtomToString(ctx, JS_ATOM_not_equal);
+    }
+
+    waiter = &waiter_s;
+    waiter->ptr = ptr;
+    pthread_cond_init(&waiter->cond, NULL);
+    waiter->linked = TRUE;
+    list_add_tail(&waiter->link, &js_atomics_waiter_list);
+
+    if (timeout == INT64_MAX) {
+        pthread_cond_wait(&waiter->cond, &js_atomics_mutex);
+        ret = 0;
+    } else {
+        /* XXX: use clock monotonic */
+        clock_gettime(CLOCK_REALTIME, &ts);
+        ts.tv_sec += timeout / 1000;
+        ts.tv_nsec += (timeout % 1000) * 1000000;
+        if (ts.tv_nsec >= 1000000000) {
+            ts.tv_nsec -= 1000000000;
+            ts.tv_sec++;
+        }
+        ret = pthread_cond_timedwait(&waiter->cond, &js_atomics_mutex,
+                                     &ts);
+    }
+    if (waiter->linked)
+        list_del(&waiter->link);
+    pthread_mutex_unlock(&js_atomics_mutex);
+    pthread_cond_destroy(&waiter->cond);
+    if (ret == ETIMEDOUT) {
+        return JS_AtomToString(ctx, JS_ATOM_timed_out);
+    } else {
+        return JS_AtomToString(ctx, JS_ATOM_ok);
+    }
+}
+
+static JSValue js_atomics_notify(JSContext *ctx,
+                                 JSValueConst this_obj,
+                                 int argc, JSValueConst *argv)
+{
+    struct list_head *el, *el1, waiter_list;
+    int32_t count, n;
+    void *ptr;
+    JSAtomicsWaiter *waiter;
+    JSArrayBuffer *abuf;
+
+    ptr = js_atomics_get_ptr(ctx, &abuf, NULL, NULL, argv[0], argv[1], 1);
+    if (!ptr)
+        return JS_EXCEPTION;
+
+    if (JS_IsUndefined(argv[2])) {
+        count = INT32_MAX;
+    } else {
+        if (JS_ToInt32Clamp(ctx, &count, argv[2], 0, INT32_MAX, 0))
+            return JS_EXCEPTION;
+    }
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+
+    n = 0;
+    if (abuf->shared && count > 0) {
+        pthread_mutex_lock(&js_atomics_mutex);
+        init_list_head(&waiter_list);
+        list_for_each_safe(el, el1, &js_atomics_waiter_list) {
+            waiter = list_entry(el, JSAtomicsWaiter, link);
+            if (waiter->ptr == ptr) {
+                list_del(&waiter->link);
+                waiter->linked = FALSE;
+                list_add_tail(&waiter->link, &waiter_list);
+                n++;
+                if (n >= count)
+                    break;
+            }
+        }
+        list_for_each(el, &waiter_list) {
+            waiter = list_entry(el, JSAtomicsWaiter, link);
+            pthread_cond_signal(&waiter->cond);
+        }
+        pthread_mutex_unlock(&js_atomics_mutex);
+    }
+    return JS_NewInt32(ctx, n);
+}
+
+static const JSCFunctionListEntry js_atomics_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("add", 3, js_atomics_op, ATOMICS_OP_ADD ),
+    JS_CFUNC_MAGIC_DEF("and", 3, js_atomics_op, ATOMICS_OP_AND ),
+    JS_CFUNC_MAGIC_DEF("or", 3, js_atomics_op, ATOMICS_OP_OR ),
+    JS_CFUNC_MAGIC_DEF("sub", 3, js_atomics_op, ATOMICS_OP_SUB ),
+    JS_CFUNC_MAGIC_DEF("xor", 3, js_atomics_op, ATOMICS_OP_XOR ),
+    JS_CFUNC_MAGIC_DEF("exchange", 3, js_atomics_op, ATOMICS_OP_EXCHANGE ),
+    JS_CFUNC_MAGIC_DEF("compareExchange", 4, js_atomics_op, ATOMICS_OP_COMPARE_EXCHANGE ),
+    JS_CFUNC_MAGIC_DEF("load", 2, js_atomics_op, ATOMICS_OP_LOAD ),
+    JS_CFUNC_DEF("store", 3, js_atomics_store ),
+    JS_CFUNC_DEF("isLockFree", 1, js_atomics_isLockFree ),
+    JS_CFUNC_DEF("wait", 4, js_atomics_wait ),
+    JS_CFUNC_DEF("notify", 3, js_atomics_notify ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Atomics", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_atomics_obj[] = {
+    JS_OBJECT_DEF("Atomics", js_atomics_funcs, countof(js_atomics_funcs), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+void JS_AddIntrinsicAtomics(JSContext *ctx)
+{
+    /* add Atomics as autoinit object */
+    JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_atomics_obj, countof(js_atomics_obj));
+}
+
+#endif /* CONFIG_ATOMICS */
+
+void JS_AddIntrinsicTypedArrays(JSContext *ctx)
+{
+    JSValue typed_array_base_proto, typed_array_base_func;
+    JSValueConst array_buffer_func, shared_array_buffer_func;
+    int i;
+
+    ctx->class_proto[JS_CLASS_ARRAY_BUFFER] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ARRAY_BUFFER],
+                               js_array_buffer_proto_funcs,
+                               countof(js_array_buffer_proto_funcs));
+
+    array_buffer_func = JS_NewGlobalCConstructorOnly(ctx, "ArrayBuffer",
+                                                 js_array_buffer_constructor, 1,
+                                                 ctx->class_proto[JS_CLASS_ARRAY_BUFFER]);
+    JS_SetPropertyFunctionList(ctx, array_buffer_func,
+                               js_array_buffer_funcs,
+                               countof(js_array_buffer_funcs));
+
+    ctx->class_proto[JS_CLASS_SHARED_ARRAY_BUFFER] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_SHARED_ARRAY_BUFFER],
+                               js_shared_array_buffer_proto_funcs,
+                               countof(js_shared_array_buffer_proto_funcs));
+
+    shared_array_buffer_func = JS_NewGlobalCConstructorOnly(ctx, "SharedArrayBuffer",
+                                                 js_shared_array_buffer_constructor, 1,
+                                                 ctx->class_proto[JS_CLASS_SHARED_ARRAY_BUFFER]);
+    JS_SetPropertyFunctionList(ctx, shared_array_buffer_func,
+                               js_shared_array_buffer_funcs,
+                               countof(js_shared_array_buffer_funcs));
+
+    typed_array_base_proto = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, typed_array_base_proto,
+                               js_typed_array_base_proto_funcs,
+                               countof(js_typed_array_base_proto_funcs));
+
+    /* TypedArray.prototype.toString must be the same object as Array.prototype.toString */
+    JSValue obj = JS_GetProperty(ctx, ctx->class_proto[JS_CLASS_ARRAY], JS_ATOM_toString);
+    /* XXX: should use alias method in JSCFunctionListEntry */ //@@@
+    JS_DefinePropertyValue(ctx, typed_array_base_proto, JS_ATOM_toString, obj,
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+
+    typed_array_base_func = JS_NewCFunction(ctx, js_typed_array_base_constructor,
+                                            "TypedArray", 0);
+    JS_SetPropertyFunctionList(ctx, typed_array_base_func,
+                               js_typed_array_base_funcs,
+                               countof(js_typed_array_base_funcs));
+    JS_SetConstructor(ctx, typed_array_base_func, typed_array_base_proto);
+
+    /* Used to squelch a -Wcast-function-type warning. */
+    JSCFunctionType ft = { .generic_magic = js_typed_array_constructor };
+    for(i = JS_CLASS_UINT8C_ARRAY; i < JS_CLASS_UINT8C_ARRAY + JS_TYPED_ARRAY_COUNT; i++) {
+        JSValue func_obj;
+        char buf[ATOM_GET_STR_BUF_SIZE];
+        const char *name;
+
+        ctx->class_proto[i] = JS_NewObjectProto(ctx, typed_array_base_proto);
+        JS_DefinePropertyValueStr(ctx, ctx->class_proto[i],
+                                  "BYTES_PER_ELEMENT",
+                                  JS_NewInt32(ctx, 1 << typed_array_size_log2(i)),
+                                  0);
+        name = JS_AtomGetStr(ctx, buf, sizeof(buf),
+                             JS_ATOM_Uint8ClampedArray + i - JS_CLASS_UINT8C_ARRAY);
+        func_obj = JS_NewCFunction3(ctx, ft.generic,
+                                    name, 3, JS_CFUNC_constructor_magic, i,
+                                    typed_array_base_func);
+        JS_NewGlobalCConstructor2(ctx, func_obj, name, ctx->class_proto[i]);
+        JS_DefinePropertyValueStr(ctx, func_obj,
+                                  "BYTES_PER_ELEMENT",
+                                  JS_NewInt32(ctx, 1 << typed_array_size_log2(i)),
+                                  0);
+    }
+    JS_FreeValue(ctx, typed_array_base_proto);
+    JS_FreeValue(ctx, typed_array_base_func);
+
+    /* DataView */
+    ctx->class_proto[JS_CLASS_DATAVIEW] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_DATAVIEW],
+                               js_dataview_proto_funcs,
+                               countof(js_dataview_proto_funcs));
+    JS_NewGlobalCConstructorOnly(ctx, "DataView",
+                                 js_dataview_constructor, 1,
+                                 ctx->class_proto[JS_CLASS_DATAVIEW]);
+    /* Atomics */
+#ifdef CONFIG_ATOMICS
+    JS_AddIntrinsicAtomics(ctx);
+#endif
+}
+
+#ifndef NDEBUG
+static void *watchedRefCount = NULL;
+
+void notifyRefCountIncrease(JSRefCountHeader *p)
+{
+    if (p == watchedRefCount)
+        fprintf(stderr, "increasing ref count %d for %p\n", p->ref_count, watchedRefCount);
+}
+
+void notifyRefCountDecrease(JSRefCountHeader *p)
+{
+    if (p == watchedRefCount)
+        fprintf(stderr, "decreasing ref count %d for %p\n", p->ref_count, watchedRefCount);
+}
+
+void watchRefCount(void *p)
+{
+    watchedRefCount = p;
+}
+#endif
+
+void setScopeLookup(JSContext *ctx, ScopeLookup *scopeLookup)
+{
+    ctx->scopeLookup = scopeLookup;
+}
+
+void setFoundUndefinedHandler(JSContext *ctx, FoundUndefinedHandler *handler)
+{
+    ctx->handleUndefined = handler;
+}
+
+void setFunctionEnteredHandler(JSContext *ctx, FunctionEnteredHandler *handler)
+{
+    ctx->handleFunctionEntered = handler;
+}
+
+void setFunctionExitedHandler(JSContext *ctx, FunctionExitedHandler *handler)
+{
+    ctx->handleFunctionExited = handler;
+}
+
+int isSimpleValue(JSValue v)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(v) != JS_TAG_OBJECT)
+        return 1;
+    p = JS_VALUE_GET_OBJ(v);
+    return p->class_id >= JS_CLASS_OBJECT && p->class_id <= JS_CLASS_BOOLEAN;
+}
+
+JSValue JS_NewCFunctionMagic(JSContext *ctx, JSCFunctionMagic *func,
+                             const char *name, int length,
+                             JSCFunctionEnum cproto, int magic)
+{
+    return JS_NewCFunction2(ctx, (JSCFunction *)func, name, length, cproto,
+                            magic);
+}
+
+#ifdef JS_NAN_BOXING
+JSValue mkVal(int32_t tag, int32_t val)
+{
+    return ((uint64_t)(tag) << 32) | (uint32_t)(val);
+}
+
+JSValue mkPtr(int32_t tag, void *p)
+{
+    return ((uint64_t)(tag) << 32) | (uintptr_t)(p);
+}
+#else
+JSValue mkVal(int32_t tag, int32_t val)
+{
+    return (JSValue){ (JSValueUnion){ .int32 = val }, tag };
+}
+
+JSValue mkPtr(int32_t tag, void *p)
+{
+    return (JSValue){ (JSValueUnion){ .ptr = p }, tag };
+}
+#endif
+
+void JS_FreeValue(JSContext *ctx, JSValue v) {
+    if (JS_VALUE_HAS_REF_COUNT(v)) {
+        JSRefCountHeader *p = (JSRefCountHeader *)JS_VALUE_GET_PTR(v);
+#ifndef NDEBUG
+        notifyRefCountDecrease(p);
+#endif
+        if (--p->ref_count <= 0) {
+            __JS_FreeValue(ctx, v);
+        }
+    }
+}
+void JS_FreeValueRT(JSRuntime *rt, JSValue v) {
+    if (JS_VALUE_HAS_REF_COUNT(v)) {
+        JSRefCountHeader *p = (JSRefCountHeader *)JS_VALUE_GET_PTR(v);
+#ifndef NDEBUG
+        notifyRefCountDecrease(p);
+#endif
+        if (--p->ref_count <= 0) {
+            __JS_FreeValueRT(rt, v);
+        }
+    }
+}
+JSValue JS_NewBool(JSContext *ctx, JS_BOOL val) {
+    (void)ctx;
+    return JS_MKVAL(JS_TAG_BOOL, (val != 0));
+}
+JSValue JS_NewInt32(JSContext *ctx, int32_t val) {
+    (void)ctx;
+    return JS_MKVAL(JS_TAG_INT, val);
+}
+JSValue JS_NewCatchOffset(JSContext *ctx, int32_t val) {
+    (void)ctx;
+    return JS_MKVAL(JS_TAG_CATCH_OFFSET, val);
+}
+JSValue JS_NewInt64(JSContext *ctx, int64_t val) {
+    JSValue v;
+    if (val == (int32_t)val) {
+        v = JS_NewInt32(ctx, (int32_t)val);
+    } else {
+        v = __JS_NewFloat64(ctx, (double)val);
+    }
+    return v;
+}
+JSValue JS_NewUint32(JSContext *ctx, uint32_t val) {
+    JSValue v;
+    if (val <= 0x7fffffff) {
+        v = JS_NewInt32(ctx, val);
+    } else {
+        v = __JS_NewFloat64(ctx, val);
+    }
+    return v;
+}
+JSValue JS_NewFloat64(JSContext *ctx, double d)
+{
+    int32_t val;
+    union {
+        double d;
+        uint64_t u;
+    } u, t;
+    if (d >= INT32_MIN && d <= INT32_MAX) {
+        u.d = d;
+        val = (int32_t)d;
+        t.d = val;
+        /* -0 cannot be represented as integer, so we compare the bit
+           representation */
+        if (u.u == t.u)
+            return JS_MKVAL(JS_TAG_INT, val);
+    }
+    return __JS_NewFloat64(ctx, d);
+}
+
+JSValue JS_NewCFunction(JSContext *ctx, JSCFunction *func, const char *name,
+                        int length) {
+    return JS_NewCFunction2(ctx, func, name, length, JS_CFUNC_generic, 0);
+}
+
+JS_BOOL JS_IsRegExp(JSContext *ctx, JSValue val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    return JS_VALUE_GET_OBJ(val)->class_id == JS_CLASS_REGEXP;
+}
diff --git a/src/shared/quickjs/quickjs.h b/src/shared/quickjs/quickjs.h
new file mode 100644
index 000000000..3a22f5b7b
--- /dev/null
+++ b/src/shared/quickjs/quickjs.h
@@ -0,0 +1,1066 @@
+/*
+ * QuickJS Javascript Engine
+ *
+ * Copyright (c) 2017-2021 Fabrice Bellard
+ * Copyright (c) 2017-2021 Charlie Gordon
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef QUICKJS_H
+#define QUICKJS_H
+
+#include <stdio.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define js_likely(x)          __builtin_expect(!!(x), 1)
+#define js_unlikely(x)        __builtin_expect(!!(x), 0)
+#define js_force_inline       inline __attribute__((always_inline))
+#define __js_printf_like(f, a)   __attribute__((format(printf, f, a)))
+#else
+#define js_likely(x)     (x)
+#define js_unlikely(x)   (x)
+#define js_force_inline  inline
+#define __js_printf_like(a, b)
+#endif
+
+#define JS_BOOL int
+
+typedef struct JSRuntime JSRuntime;
+typedef struct JSContext JSContext;
+typedef struct JSObject JSObject;
+typedef struct JSClass JSClass;
+typedef uint32_t JSClassID;
+typedef uint32_t JSAtom;
+
+#if INTPTR_MAX >= INT64_MAX
+#define JS_PTR64
+#define JS_PTR64_DEF(a) a
+#else
+#define JS_PTR64_DEF(a)
+#endif
+
+#ifndef JS_PTR64
+#define JS_NAN_BOXING
+#endif
+
+enum {
+    /* all tags with a reference count are negative */
+    JS_TAG_FIRST       = -11, /* first negative tag */
+    JS_TAG_BIG_DECIMAL = -11,
+    JS_TAG_BIG_INT     = -10,
+    JS_TAG_BIG_FLOAT   = -9,
+    JS_TAG_SYMBOL      = -8,
+    JS_TAG_STRING      = -7,
+    JS_TAG_MODULE      = -3, /* used internally */
+    JS_TAG_FUNCTION_BYTECODE = -2, /* used internally */
+    JS_TAG_OBJECT      = -1,
+
+    JS_TAG_INT         = 0,
+    JS_TAG_BOOL        = 1,
+    JS_TAG_NULL        = 2,
+    JS_TAG_UNDEFINED   = 3,
+    JS_TAG_UNINITIALIZED = 4,
+    JS_TAG_CATCH_OFFSET = 5,
+    JS_TAG_EXCEPTION   = 6,
+    JS_TAG_FLOAT64     = 7,
+    /* any larger tag is FLOAT64 if JS_NAN_BOXING */
+};
+
+typedef struct JSRefCountHeader {
+    int ref_count;
+} JSRefCountHeader;
+
+#define JS_FLOAT64_NAN NAN
+
+#ifdef CONFIG_CHECK_JSVALUE
+/* JSValue consistency : it is not possible to run the code in this
+   mode, but it is useful to detect simple reference counting
+   errors. It would be interesting to modify a static C analyzer to
+   handle specific annotations (clang has such annotations but only
+   for objective C) */
+typedef struct __JSValue *JSValue;
+typedef const struct __JSValue *JSValueConst;
+
+#define JS_VALUE_GET_TAG(v) (int)((uintptr_t)(v) & 0xf)
+/* same as JS_VALUE_GET_TAG, but return JS_TAG_FLOAT64 with NaN boxing */
+#define JS_VALUE_GET_NORM_TAG(v) JS_VALUE_GET_TAG(v)
+#define JS_VALUE_GET_INT(v) (int)((intptr_t)(v) >> 4)
+#define JS_VALUE_GET_BOOL(v) JS_VALUE_GET_INT(v)
+#define JS_VALUE_GET_FLOAT64(v) (double)JS_VALUE_GET_INT(v)
+#define JS_VALUE_GET_PTR(v) (void *)((intptr_t)(v) & ~0xf)
+
+#define JS_MKVAL(tag, val) (JSValue)(intptr_t)(((val) << 4) | (tag))
+#define JS_MKPTR(tag, p) (JSValue)((intptr_t)(p) | (tag))
+
+#define JS_TAG_IS_FLOAT64(tag) ((unsigned)(tag) == JS_TAG_FLOAT64)
+
+#define JS_NAN JS_MKVAL(JS_TAG_FLOAT64, 1)
+
+static inline JSValue __JS_NewFloat64(JSContext *ctx, double d)
+{
+    return JS_MKVAL(JS_TAG_FLOAT64, (int)d);
+}
+
+static inline JS_BOOL JS_VALUE_IS_NAN(JSValue v)
+{
+    return 0;
+}
+
+#elif defined(JS_NAN_BOXING)
+
+typedef uint64_t JSValue;
+
+#define JSValueConst JSValue
+
+#define JS_VALUE_GET_TAG(v) (int)((v) >> 32)
+#define JS_VALUE_GET_INT(v) (int)(v)
+#define JS_VALUE_GET_BOOL(v) (int)(v)
+#define JS_VALUE_GET_PTR(v) (void *)(intptr_t)(v)
+
+#define JS_MKVAL(tag, val) (((uint64_t)(tag) << 32) | (uint32_t)(val))
+#define JS_MKPTR(tag, ptr) (((uint64_t)(tag) << 32) | (uintptr_t)(ptr))
+
+#define JS_FLOAT64_TAG_ADDEND (0x7ff80000 - JS_TAG_FIRST + 1) /* quiet NaN encoding */
+
+static inline double JS_VALUE_GET_FLOAT64(JSValue v)
+{
+    union {
+        JSValue v;
+        double d;
+    } u;
+    u.v = v;
+    u.v += (uint64_t)JS_FLOAT64_TAG_ADDEND << 32;
+    return u.d;
+}
+
+#define JS_NAN (0x7ff8000000000000 - ((uint64_t)JS_FLOAT64_TAG_ADDEND << 32))
+
+static inline JSValue __JS_NewFloat64(JSContext *ctx, double d)
+{
+    (void) ctx;
+    union {
+        double d;
+        uint64_t u64;
+    } u;
+    JSValue v;
+    u.d = d;
+    /* normalize NaN */
+    if (js_unlikely((u.u64 & 0x7fffffffffffffff) > 0x7ff0000000000000))
+        v = JS_NAN;
+    else
+        v = u.u64 - ((uint64_t)JS_FLOAT64_TAG_ADDEND << 32);
+    return v;
+}
+
+#define JS_TAG_IS_FLOAT64(tag) ((unsigned)((tag) - JS_TAG_FIRST) >= (JS_TAG_FLOAT64 - JS_TAG_FIRST))
+
+/* same as JS_VALUE_GET_TAG, but return JS_TAG_FLOAT64 with NaN boxing */
+static inline int JS_VALUE_GET_NORM_TAG(JSValue v)
+{
+    uint32_t tag;
+    tag = JS_VALUE_GET_TAG(v);
+    if (JS_TAG_IS_FLOAT64(tag))
+        return JS_TAG_FLOAT64;
+    else
+        return tag;
+}
+
+static inline JS_BOOL JS_VALUE_IS_NAN(JSValue v)
+{
+    uint32_t tag;
+    tag = JS_VALUE_GET_TAG(v);
+    return tag == (JS_NAN >> 32);
+}
+
+#else /* !JS_NAN_BOXING */
+
+typedef union JSValueUnion {
+    int32_t int32;
+    double float64;
+    void *ptr;
+} JSValueUnion;
+
+typedef struct JSValue {
+    JSValueUnion u;
+    int64_t tag;
+} JSValue;
+
+#define JSValueConst JSValue
+
+#define JS_VALUE_GET_TAG(v) ((int32_t)(v).tag)
+/* same as JS_VALUE_GET_TAG, but return JS_TAG_FLOAT64 with NaN boxing */
+#define JS_VALUE_GET_NORM_TAG(v) JS_VALUE_GET_TAG(v)
+#define JS_VALUE_GET_INT(v) ((v).u.int32)
+#define JS_VALUE_GET_BOOL(v) ((v).u.int32)
+#define JS_VALUE_GET_FLOAT64(v) ((v).u.float64)
+#define JS_VALUE_GET_PTR(v) ((v).u.ptr)
+
+JSValue mkVal(int32_t tag, int32_t val);
+JSValue mkPtr(int32_t tag, void *p);
+
+#define JS_MKVAL(tag, val) mkVal(tag, val)
+#define JS_MKPTR(tag, p) mkPtr(tag, p)
+
+#define JS_TAG_IS_FLOAT64(tag) ((unsigned)(tag) == JS_TAG_FLOAT64)
+
+#define JS_NAN (JSValue){ .u.float64 = JS_FLOAT64_NAN, JS_TAG_FLOAT64 }
+
+static inline JSValue __JS_NewFloat64(JSContext *ctx, double d)
+{
+    (void) ctx;
+    JSValue v;
+    v.tag = JS_TAG_FLOAT64;
+    v.u.float64 = d;
+    return v;
+}
+
+static inline JS_BOOL JS_VALUE_IS_NAN(JSValue v)
+{
+    union {
+        double d;
+        uint64_t u64;
+    } u;
+    if (v.tag != JS_TAG_FLOAT64)
+        return 0;
+    u.d = v.u.float64;
+    return (u.u64 & 0x7fffffffffffffff) > 0x7ff0000000000000;
+}
+
+#endif /* !JS_NAN_BOXING */
+
+#define JS_VALUE_IS_BOTH_INT(v1, v2) ((JS_VALUE_GET_TAG(v1) | JS_VALUE_GET_TAG(v2)) == 0)
+#define JS_VALUE_IS_BOTH_FLOAT(v1, v2) (JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(v1)) && JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(v2)))
+
+#define JS_VALUE_GET_OBJ(v) ((JSObject *)JS_VALUE_GET_PTR(v))
+#define JS_VALUE_GET_STRING(v) ((JSString *)JS_VALUE_GET_PTR(v))
+#define JS_VALUE_HAS_REF_COUNT(v) ((unsigned)JS_VALUE_GET_TAG(v) >= (unsigned)JS_TAG_FIRST)
+
+/* special values */
+#define JS_NULL      JS_MKVAL(JS_TAG_NULL, 0)
+#define JS_UNDEFINED JS_MKVAL(JS_TAG_UNDEFINED, 0)
+#define JS_FALSE     JS_MKVAL(JS_TAG_BOOL, 0)
+#define JS_TRUE      JS_MKVAL(JS_TAG_BOOL, 1)
+#define JS_EXCEPTION JS_MKVAL(JS_TAG_EXCEPTION, 0)
+#define JS_UNINITIALIZED JS_MKVAL(JS_TAG_UNINITIALIZED, 0)
+
+/* flags for object properties */
+#define JS_PROP_CONFIGURABLE  (1 << 0)
+#define JS_PROP_WRITABLE      (1 << 1)
+#define JS_PROP_ENUMERABLE    (1 << 2)
+#define JS_PROP_C_W_E         (JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE | JS_PROP_ENUMERABLE)
+#define JS_PROP_LENGTH        (1 << 3) /* used internally in Arrays */
+#define JS_PROP_TMASK         (3 << 4) /* mask for NORMAL, GETSET, VARREF, AUTOINIT */
+#define JS_PROP_NORMAL         (0 << 4)
+#define JS_PROP_GETSET         (1 << 4)
+#define JS_PROP_VARREF         (2 << 4) /* used internally */
+#define JS_PROP_AUTOINIT       (3 << 4) /* used internally */
+
+/* flags for JS_DefineProperty */
+#define JS_PROP_HAS_SHIFT        8
+#define JS_PROP_HAS_CONFIGURABLE (1 << 8)
+#define JS_PROP_HAS_WRITABLE     (1 << 9)
+#define JS_PROP_HAS_ENUMERABLE   (1 << 10)
+#define JS_PROP_HAS_GET          (1 << 11)
+#define JS_PROP_HAS_SET          (1 << 12)
+#define JS_PROP_HAS_VALUE        (1 << 13)
+
+/* throw an exception if false would be returned
+   (JS_DefineProperty/JS_SetProperty) */
+#define JS_PROP_THROW            (1 << 14)
+/* throw an exception if false would be returned in strict mode
+   (JS_SetProperty) */
+#define JS_PROP_THROW_STRICT     (1 << 15)
+
+#define JS_PROP_NO_ADD           (1 << 16) /* internal use */
+#define JS_PROP_NO_EXOTIC        (1 << 17) /* internal use */
+
+#define JS_DEFAULT_STACK_SIZE (256 * 1024)
+
+/* JS_Eval() flags */
+#define JS_EVAL_TYPE_GLOBAL   (0 << 0) /* global code (default) */
+#define JS_EVAL_TYPE_MODULE   (1 << 0) /* module code */
+#define JS_EVAL_TYPE_DIRECT   (2 << 0) /* direct call (internal use) */
+#define JS_EVAL_TYPE_INDIRECT (3 << 0) /* indirect call (internal use) */
+#define JS_EVAL_TYPE_MASK     (3 << 0)
+
+#define JS_EVAL_FLAG_STRICT   (1 << 3) /* force 'strict' mode */
+#define JS_EVAL_FLAG_STRIP    (1 << 4) /* force 'strip' mode */
+/* compile but do not run. The result is an object with a
+   JS_TAG_FUNCTION_BYTECODE or JS_TAG_MODULE tag. It can be executed
+   with JS_EvalFunction(). */
+#define JS_EVAL_FLAG_COMPILE_ONLY (1 << 5)
+/* don't include the stack frames before this eval in the Error() backtraces */
+#define JS_EVAL_FLAG_BACKTRACE_BARRIER (1 << 6)
+/* allow top-level await in normal script. JS_Eval() returns a
+   promise. Only allowed with JS_EVAL_TYPE_GLOBAL */
+#define JS_EVAL_FLAG_ASYNC (1 << 7)
+
+typedef JSValue JSCFunction(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+typedef JSValue JSCFunctionMagic(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, int magic);
+typedef JSValue JSCFunctionData(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, int magic, JSValue *func_data);
+
+typedef struct JSMallocState {
+    size_t malloc_count;
+    size_t malloc_size;
+    size_t malloc_limit;
+    void *opaque; /* user opaque */
+} JSMallocState;
+
+typedef struct JSMallocFunctions {
+    void *(*js_malloc)(JSMallocState *s, size_t size);
+    void (*js_free)(JSMallocState *s, void *ptr);
+    void *(*js_realloc)(JSMallocState *s, void *ptr, size_t size);
+    size_t (*js_malloc_usable_size)(const void *ptr);
+} JSMallocFunctions;
+
+typedef struct JSGCObjectHeader JSGCObjectHeader;
+
+JSRuntime *JS_NewRuntime(void);
+/* info lifetime must exceed that of rt */
+void JS_SetRuntimeInfo(JSRuntime *rt, const char *info);
+void JS_SetMemoryLimit(JSRuntime *rt, size_t limit);
+void JS_SetGCThreshold(JSRuntime *rt, size_t gc_threshold);
+/* use 0 to disable maximum stack size check */
+void JS_SetMaxStackSize(JSRuntime *rt, size_t stack_size);
+/* should be called when changing thread to update the stack top value
+   used to check stack overflow. */
+void JS_UpdateStackTop(JSRuntime *rt);
+JSRuntime *JS_NewRuntime2(const JSMallocFunctions *mf, void *opaque);
+void JS_FreeRuntime(JSRuntime *rt);
+void *JS_GetRuntimeOpaque(JSRuntime *rt);
+void JS_SetRuntimeOpaque(JSRuntime *rt, void *opaque);
+typedef void JS_MarkFunc(JSRuntime *rt, JSGCObjectHeader *gp);
+void JS_MarkValue(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func);
+void JS_RunGC(JSRuntime *rt);
+JS_BOOL JS_IsLiveObject(JSRuntime *rt, JSValueConst obj);
+
+JSContext *JS_NewContext(JSRuntime *rt);
+void JS_FreeContext(JSContext *s);
+JSContext *JS_DupContext(JSContext *ctx);
+void *JS_GetContextOpaque(JSContext *ctx);
+void JS_SetContextOpaque(JSContext *ctx, void *opaque);
+JSRuntime *JS_GetRuntime(JSContext *ctx);
+void JS_SetClassProto(JSContext *ctx, JSClassID class_id, JSValue obj);
+JSValue JS_GetClassProto(JSContext *ctx, JSClassID class_id);
+
+/* the following functions are used to select the intrinsic object to
+   save memory */
+JSContext *JS_NewContextRaw(JSRuntime *rt);
+void JS_AddIntrinsicBaseObjects(JSContext *ctx);
+void JS_AddIntrinsicDate(JSContext *ctx);
+void JS_AddIntrinsicEval(JSContext *ctx);
+void JS_AddIntrinsicStringNormalize(JSContext *ctx);
+void JS_AddIntrinsicRegExpCompiler(JSContext *ctx);
+void JS_AddIntrinsicRegExp(JSContext *ctx);
+void JS_AddIntrinsicJSON(JSContext *ctx);
+void JS_AddIntrinsicProxy(JSContext *ctx);
+void JS_AddIntrinsicMapSet(JSContext *ctx);
+void JS_AddIntrinsicTypedArrays(JSContext *ctx);
+void JS_AddIntrinsicPromise(JSContext *ctx);
+void JS_AddIntrinsicBigInt(JSContext *ctx);
+void JS_AddIntrinsicBigFloat(JSContext *ctx);
+void JS_AddIntrinsicBigDecimal(JSContext *ctx);
+/* enable operator overloading */
+void JS_AddIntrinsicOperators(JSContext *ctx);
+/* enable "use math" */
+void JS_EnableBignumExt(JSContext *ctx, JS_BOOL enable);
+
+JSValue js_string_codePointRange(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv);
+
+void *js_malloc_rt(JSRuntime *rt, size_t size);
+void js_free_rt(JSRuntime *rt, void *ptr);
+void *js_realloc_rt(JSRuntime *rt, void *ptr, size_t size);
+size_t js_malloc_usable_size_rt(JSRuntime *rt, const void *ptr);
+void *js_mallocz_rt(JSRuntime *rt, size_t size);
+
+void *js_malloc(JSContext *ctx, size_t size);
+void js_free(JSContext *ctx, void *ptr);
+void *js_realloc(JSContext *ctx, void *ptr, size_t size);
+size_t js_malloc_usable_size(JSContext *ctx, const void *ptr);
+void *js_realloc2(JSContext *ctx, void *ptr, size_t size, size_t *pslack);
+void *js_mallocz(JSContext *ctx, size_t size);
+char *js_strdup(JSContext *ctx, const char *str);
+char *js_strndup(JSContext *ctx, const char *s, size_t n);
+
+typedef struct JSMemoryUsage {
+    int64_t malloc_size, malloc_limit, memory_used_size;
+    int64_t malloc_count;
+    int64_t memory_used_count;
+    int64_t atom_count, atom_size;
+    int64_t str_count, str_size;
+    int64_t obj_count, obj_size;
+    int64_t prop_count, prop_size;
+    int64_t shape_count, shape_size;
+    int64_t js_func_count, js_func_size, js_func_code_size;
+    int64_t js_func_pc2line_count, js_func_pc2line_size;
+    int64_t c_func_count, array_count;
+    int64_t fast_array_count, fast_array_elements;
+    int64_t binary_object_count, binary_object_size;
+} JSMemoryUsage;
+
+void JS_ComputeMemoryUsage(JSRuntime *rt, JSMemoryUsage *s);
+void JS_DumpMemoryUsage(FILE *fp, const JSMemoryUsage *s, JSRuntime *rt);
+
+/* atom support */
+#define JS_ATOM_NULL 0
+
+JSAtom JS_NewAtomLen(JSContext *ctx, const char *str, size_t len);
+JSAtom JS_NewAtom(JSContext *ctx, const char *str);
+JSAtom JS_NewAtomUInt32(JSContext *ctx, uint32_t n);
+JSAtom JS_DupAtom(JSContext *ctx, JSAtom v);
+void JS_FreeAtom(JSContext *ctx, JSAtom v);
+void JS_FreeAtomRT(JSRuntime *rt, JSAtom v);
+JSValue JS_AtomToValue(JSContext *ctx, JSAtom atom);
+JSValue JS_AtomToString(JSContext *ctx, JSAtom atom);
+const char *JS_AtomToCString(JSContext *ctx, JSAtom atom);
+JSAtom JS_ValueToAtom(JSContext *ctx, JSValueConst val);
+
+/* object class support */
+
+typedef struct JSPropertyEnum {
+    JS_BOOL is_enumerable;
+    JSAtom atom;
+} JSPropertyEnum;
+
+typedef struct JSPropertyDescriptor {
+    int flags;
+    JSValue value;
+    JSValue getter;
+    JSValue setter;
+} JSPropertyDescriptor;
+
+typedef struct JSClassExoticMethods {
+    /* Return -1 if exception (can only happen in case of Proxy object),
+       FALSE if the property does not exists, TRUE if it exists. If 1 is
+       returned, the property descriptor 'desc' is filled if != NULL. */
+    int (*get_own_property)(JSContext *ctx, JSPropertyDescriptor *desc,
+                             JSValueConst obj, JSAtom prop);
+    /* '*ptab' should hold the '*plen' property keys. Return 0 if OK,
+       -1 if exception. The 'is_enumerable' field is ignored.
+    */
+    int (*get_own_property_names)(JSContext *ctx, JSPropertyEnum **ptab,
+                                  uint32_t *plen,
+                                  JSValueConst obj);
+    /* return < 0 if exception, or TRUE/FALSE */
+    int (*delete_property)(JSContext *ctx, JSValueConst obj, JSAtom prop);
+    /* return < 0 if exception or TRUE/FALSE */
+    int (*define_own_property)(JSContext *ctx, JSValueConst this_obj,
+                               JSAtom prop, JSValueConst val,
+                               JSValueConst getter, JSValueConst setter,
+                               int flags);
+    /* The following methods can be emulated with the previous ones,
+       so they are usually not needed */
+    /* return < 0 if exception or TRUE/FALSE */
+    int (*has_property)(JSContext *ctx, JSValueConst obj, JSAtom atom);
+    JSValue (*get_property)(JSContext *ctx, JSValueConst obj, JSAtom atom,
+                            JSValueConst receiver);
+    /* return < 0 if exception or TRUE/FALSE */
+    int (*set_property)(JSContext *ctx, JSValueConst obj, JSAtom atom,
+                        JSValueConst value, JSValueConst receiver, int flags);
+} JSClassExoticMethods;
+
+typedef void JSClassFinalizer(JSRuntime *rt, JSValue val);
+typedef void JSClassGCMark(JSRuntime *rt, JSValueConst val,
+                           JS_MarkFunc *mark_func);
+#define JS_CALL_FLAG_CONSTRUCTOR (1 << 0)
+typedef JSValue JSClassCall(JSContext *ctx, JSValueConst func_obj,
+                            JSValueConst this_val, int argc, JSValueConst *argv,
+                            int flags);
+
+typedef struct JSClassDef {
+    const char *class_name;
+    JSClassFinalizer *finalizer;
+    JSClassGCMark *gc_mark;
+    /* if call != NULL, the object is a function. If (flags &
+       JS_CALL_FLAG_CONSTRUCTOR) != 0, the function is called as a
+       constructor. In this case, 'this_val' is new.target. A
+       constructor call only happens if the object constructor bit is
+       set (see JS_SetConstructorBit()). */
+    JSClassCall *call;
+    /* XXX: suppress this indirection ? It is here only to save memory
+       because only a few classes need these methods */
+    JSClassExoticMethods *exotic;
+} JSClassDef;
+
+#define JS_INVALID_CLASS_ID 0
+JSClassID JS_NewClassID(JSClassID *pclass_id);
+/* Returns the class ID if `v` is an object, otherwise returns JS_INVALID_CLASS_ID. */
+JSClassID JS_GetClassID(JSValue v);
+int JS_NewClass(JSRuntime *rt, JSClassID class_id, const JSClassDef *class_def);
+int JS_IsRegisteredClass(JSRuntime *rt, JSClassID class_id);
+
+/* value handling */
+
+JSValue JS_NewBool(JSContext *ctx, JS_BOOL val);
+JSValue JS_NewInt32(JSContext *ctx, int32_t val);
+JSValue JS_NewCatchOffset(JSContext *ctx, int32_t val);
+JSValue JS_NewInt64(JSContext *ctx, int64_t val);
+JSValue JS_NewUint32(JSContext *ctx, uint32_t val);
+JSValue JS_NewBigInt64(JSContext *ctx, int64_t v);
+JSValue JS_NewBigUint64(JSContext *ctx, uint64_t v);
+
+JSValue JS_NewFloat64(JSContext *ctx, double d);
+
+static inline JS_BOOL JS_IsNumber(JSValueConst v)
+{
+    int tag = JS_VALUE_GET_TAG(v);
+    return tag == JS_TAG_INT || JS_TAG_IS_FLOAT64(tag);
+}
+
+static inline JS_BOOL JS_IsBigInt(JSContext *ctx, JSValueConst v)
+{
+    (void) ctx;
+    int tag = JS_VALUE_GET_TAG(v);
+    return tag == JS_TAG_BIG_INT;
+}
+
+static inline JS_BOOL JS_IsBigFloat(JSValueConst v)
+{
+    int tag = JS_VALUE_GET_TAG(v);
+    return tag == JS_TAG_BIG_FLOAT;
+}
+
+static inline JS_BOOL JS_IsBigDecimal(JSValueConst v)
+{
+    int tag = JS_VALUE_GET_TAG(v);
+    return tag == JS_TAG_BIG_DECIMAL;
+}
+
+static inline JS_BOOL JS_IsBool(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_BOOL;
+}
+
+static inline JS_BOOL JS_IsNull(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_NULL;
+}
+
+static inline JS_BOOL JS_IsUndefined(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_UNDEFINED;
+}
+
+static inline JS_BOOL JS_IsException(JSValueConst v)
+{
+    return js_unlikely(JS_VALUE_GET_TAG(v) == JS_TAG_EXCEPTION);
+}
+
+static inline JS_BOOL JS_IsUninitialized(JSValueConst v)
+{
+    return js_unlikely(JS_VALUE_GET_TAG(v) == JS_TAG_UNINITIALIZED);
+}
+
+static inline JS_BOOL JS_IsString(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_STRING;
+}
+
+static inline JS_BOOL JS_IsSymbol(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_SYMBOL;
+}
+
+static inline JS_BOOL JS_IsObject(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_OBJECT;
+}
+
+JSValue JS_Throw(JSContext *ctx, JSValue obj);
+JSValue JS_GetException(JSContext *ctx);
+JS_BOOL JS_HasException(JSContext *ctx);
+JS_BOOL JS_IsError(JSContext *ctx, JSValueConst val);
+void JS_SetUncatchableError(JSContext *ctx, JSValueConst val, JS_BOOL flag);
+void JS_ResetUncatchableError(JSContext *ctx);
+JSValue JS_NewError(JSContext *ctx);
+JSValue __js_printf_like(2, 3) JS_ThrowSyntaxError(JSContext *ctx, const char *fmt, ...);
+JSValue __js_printf_like(2, 3) JS_ThrowTypeError(JSContext *ctx, const char *fmt, ...);
+JSValue __js_printf_like(2, 3) JS_ThrowReferenceError(JSContext *ctx, const char *fmt, ...);
+JSValue __js_printf_like(2, 3) JS_ThrowRangeError(JSContext *ctx, const char *fmt, ...);
+JSValue __js_printf_like(2, 3) JS_ThrowInternalError(JSContext *ctx, const char *fmt, ...);
+JSValue JS_ThrowOutOfMemory(JSContext *ctx);
+
+#ifndef NDEBUG
+void notifyRefCountIncrease(JSRefCountHeader *p);
+void notifyRefCountDecrease(JSRefCountHeader *p);
+#endif
+
+void JS_FreeValue(JSContext *ctx, JSValue v);
+void JS_FreeValueRT(JSRuntime *rt, JSValue v);
+
+static inline JSValue JS_DupValue(JSContext *ctx, JSValueConst v)
+{
+    (void) ctx;
+    if (JS_VALUE_HAS_REF_COUNT(v)) {
+        JSRefCountHeader *p = (JSRefCountHeader *)JS_VALUE_GET_PTR(v);
+#ifndef NDEBUG
+        notifyRefCountIncrease(p);
+#endif
+        p->ref_count++;
+    }
+    return v;
+}
+
+static inline JSValue JS_DupValueRT(JSRuntime *rt, JSValueConst v)
+{
+    (void) rt;
+    if (JS_VALUE_HAS_REF_COUNT(v)) {
+        JSRefCountHeader *p = (JSRefCountHeader *)JS_VALUE_GET_PTR(v);
+#ifndef NDEBUG
+        notifyRefCountIncrease(p);
+#endif
+        p->ref_count++;
+    }
+    return v;
+}
+
+JS_BOOL JS_StrictEq(JSContext *ctx, JSValueConst op1, JSValueConst op2);
+JS_BOOL JS_SameValue(JSContext *ctx, JSValueConst op1, JSValueConst op2);
+JS_BOOL JS_SameValueZero(JSContext *ctx, JSValueConst op1, JSValueConst op2);
+
+int JS_ToBool(JSContext *ctx, JSValueConst val); /* return -1 for JS_EXCEPTION */
+int JS_ToInt32(JSContext *ctx, int32_t *pres, JSValueConst val);
+static inline int JS_ToUint32(JSContext *ctx, uint32_t *pres, JSValueConst val)
+{
+    return JS_ToInt32(ctx, (int32_t*)pres, val);
+}
+int JS_ToInt64(JSContext *ctx, int64_t *pres, JSValueConst val);
+int JS_ToIndex(JSContext *ctx, uint64_t *plen, JSValueConst val);
+int JS_ToFloat64(JSContext *ctx, double *pres, JSValueConst val);
+/* return an exception if 'val' is a Number */
+int JS_ToBigInt64(JSContext *ctx, int64_t *pres, JSValueConst val);
+/* same as JS_ToInt64() but allow BigInt */
+int JS_ToInt64Ext(JSContext *ctx, int64_t *pres, JSValueConst val);
+
+JSValue JS_NewStringLen(JSContext *ctx, const char *str1, size_t len1);
+JSValue JS_NewString(JSContext *ctx, const char *str);
+JSValue JS_NewAtomString(JSContext *ctx, const char *str);
+JSValue JS_ToString(JSContext *ctx, JSValueConst val);
+JSValue JS_ToPropertyKey(JSContext *ctx, JSValueConst val);
+const char *JS_ToCStringLen2(JSContext *ctx, size_t *plen, JSValueConst val1, JS_BOOL cesu8);
+static inline const char *JS_ToCStringLen(JSContext *ctx, size_t *plen, JSValueConst val1)
+{
+    return JS_ToCStringLen2(ctx, plen, val1, 0);
+}
+static inline const char *JS_ToCString(JSContext *ctx, JSValueConst val1)
+{
+    return JS_ToCStringLen2(ctx, NULL, val1, 0);
+}
+void JS_FreeCString(JSContext *ctx, const char *ptr);
+
+JSValue JS_NewObjectProtoClass(JSContext *ctx, JSValueConst proto, JSClassID class_id);
+JSValue JS_NewObjectClass(JSContext *ctx, int class_id);
+JSValue JS_NewObjectProto(JSContext *ctx, JSValueConst proto);
+JSValue JS_NewObject(JSContext *ctx);
+
+JS_BOOL JS_IsFunction(JSContext* ctx, JSValueConst val);
+JS_BOOL JS_IsRegExp(JSContext* ctx, JSValueConst val);
+JS_BOOL JS_IsConstructor(JSContext* ctx, JSValueConst val);
+JS_BOOL JS_SetConstructorBit(JSContext *ctx, JSValueConst func_obj, JS_BOOL val);
+JS_BOOL JS_IsArrayBuffer(JSValueConst v);
+
+JSValue JS_NewArray(JSContext *ctx);
+int JS_IsArray(JSContext *ctx, JSValueConst val);
+
+JSValue JS_NewDate(JSContext *ctx, double epoch_ms);
+JS_BOOL JS_IsDate(JSValueConst v);
+
+JSValue JS_GetPropertyInternal(JSContext *ctx, JSValueConst obj,
+                               JSAtom prop, JSValueConst receiver,
+                               JS_BOOL throw_ref_error);
+static js_force_inline JSValue JS_GetProperty(JSContext *ctx, JSValueConst this_obj,
+                                              JSAtom prop)
+{
+    return JS_GetPropertyInternal(ctx, this_obj, prop, this_obj, 0);
+}
+JSValue JS_GetPropertyStr(JSContext *ctx, JSValueConst this_obj,
+                          const char *prop);
+JSValue JS_GetPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                             uint32_t idx);
+
+int JS_SetPropertyInternal(JSContext *ctx, JSValueConst obj,
+                           JSAtom prop, JSValue val, JSValueConst this_obj,
+                           int flags);
+static inline int JS_SetProperty(JSContext *ctx, JSValueConst this_obj,
+                                 JSAtom prop, JSValue val)
+{
+    return JS_SetPropertyInternal(ctx, this_obj, prop, val, this_obj, JS_PROP_THROW);
+}
+int JS_SetPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                         uint32_t idx, JSValue val);
+int JS_SetPropertyInt64(JSContext *ctx, JSValueConst this_obj,
+                        int64_t idx, JSValue val);
+int JS_SetPropertyStr(JSContext *ctx, JSValueConst this_obj,
+                      const char *prop, JSValue val);
+int JS_HasProperty(JSContext *ctx, JSValueConst this_obj, JSAtom prop);
+int JS_IsExtensible(JSContext *ctx, JSValueConst obj);
+int JS_PreventExtensions(JSContext *ctx, JSValueConst obj);
+int JS_DeleteProperty(JSContext *ctx, JSValueConst obj, JSAtom prop, int flags);
+int JS_SetPrototype(JSContext *ctx, JSValueConst obj, JSValueConst proto_val);
+JSValue JS_GetPrototype(JSContext *ctx, JSValueConst val);
+
+JSValue JS_ObjectSeal(JSContext *ctx, JSValueConst obj, int freeze);
+
+#define JS_GPN_STRING_MASK  (1 << 0)
+#define JS_GPN_SYMBOL_MASK  (1 << 1)
+#define JS_GPN_PRIVATE_MASK (1 << 2)
+/* only include the enumerable properties */
+#define JS_GPN_ENUM_ONLY    (1 << 4)
+/* set theJSPropertyEnum.is_enumerable field */
+#define JS_GPN_SET_ENUM     (1 << 5)
+
+int JS_GetOwnPropertyNames(JSContext *ctx, JSPropertyEnum **ptab,
+                           uint32_t *plen, JSValueConst obj, int flags);
+int JS_GetOwnProperty(JSContext *ctx, JSPropertyDescriptor *desc,
+                      JSValueConst obj, JSAtom prop);
+
+JSValue JS_Call(JSContext *ctx, JSValueConst func_obj, JSValueConst this_obj,
+                int argc, JSValueConst *argv);
+JSValue JS_Invoke(JSContext *ctx, JSValueConst this_val, JSAtom atom,
+                  int argc, JSValueConst *argv);
+JSValue JS_CallConstructor(JSContext *ctx, JSValueConst func_obj,
+                           int argc, JSValueConst *argv);
+JSValue JS_CallConstructor2(JSContext *ctx, JSValueConst func_obj,
+                            JSValueConst new_target,
+                            int argc, JSValueConst *argv);
+JS_BOOL JS_DetectModule(const char *input, size_t input_len);
+/* 'input' must be zero terminated i.e. input[input_len] = '\0'. */
+JSValue JS_Eval(JSContext *ctx, const char *input, size_t input_len,
+                const char *filename, int eval_flags);
+/* same as JS_Eval() but with an explicit 'this_obj' parameter */
+JSValue JS_EvalThis(JSContext *ctx, JSValueConst this_obj,
+                    const char *input, size_t input_len,
+                    const char *filename, int line, int eval_flags);
+JSValue JS_GetGlobalObject(JSContext *ctx);
+int JS_IsInstanceOf(JSContext *ctx, JSValueConst val, JSValueConst obj);
+int JS_DefineProperty(JSContext *ctx, JSValueConst this_obj,
+                      JSAtom prop, JSValueConst val,
+                      JSValueConst getter, JSValueConst setter, int flags);
+int JS_DefinePropertyValue(JSContext *ctx, JSValueConst this_obj,
+                           JSAtom prop, JSValue val, int flags);
+int JS_DefinePropertyValueUint32(JSContext *ctx, JSValueConst this_obj,
+                                 uint32_t idx, JSValue val, int flags);
+int JS_DefinePropertyValueStr(JSContext *ctx, JSValueConst this_obj,
+                              const char *prop, JSValue val, int flags);
+int JS_DefinePropertyGetSet(JSContext *ctx, JSValueConst this_obj,
+                            JSAtom prop, JSValue getter, JSValue setter,
+                            int flags);
+void JS_SetOpaque(JSValue obj, void *opaque);
+void *JS_GetOpaque(JSValueConst obj, JSClassID class_id);
+void *JS_GetOpaque2(JSContext *ctx, JSValueConst obj, JSClassID class_id);
+
+/* 'buf' must be zero terminated i.e. buf[buf_len] = '\0'. */
+JSValue JS_ParseJSON(JSContext *ctx, const char *buf, size_t buf_len,
+                     const char *filename);
+#define JS_PARSE_JSON_EXT (1 << 0) /* allow extended JSON */
+JSValue JS_ParseJSON2(JSContext *ctx, const char *buf, size_t buf_len,
+                      const char *filename, int flags);
+JSValue JS_JSONStringify(JSContext *ctx, JSValueConst obj,
+                         JSValueConst replacer, JSValueConst space0);
+
+typedef void JSFreeArrayBufferDataFunc(JSRuntime *rt, void *opaque, void *ptr);
+JSValue JS_NewArrayBuffer(JSContext *ctx, uint8_t *buf, size_t len,
+                          JSFreeArrayBufferDataFunc *free_func, void *opaque,
+                          JS_BOOL is_shared);
+JSValue JS_NewArrayBufferCopy(JSContext *ctx, const uint8_t *buf, size_t len);
+void JS_DetachArrayBuffer(JSContext *ctx, JSValueConst obj);
+uint8_t *JS_GetArrayBuffer(JSContext *ctx, size_t *psize, JSValueConst obj);
+
+typedef enum JSTypedArrayEnum {
+    JS_TYPED_ARRAY_UINT8C = 0,
+    JS_TYPED_ARRAY_INT8,
+    JS_TYPED_ARRAY_UINT8,
+    JS_TYPED_ARRAY_INT16,
+    JS_TYPED_ARRAY_UINT16,
+    JS_TYPED_ARRAY_INT32,
+    JS_TYPED_ARRAY_UINT32,
+    JS_TYPED_ARRAY_BIG_INT64,
+    JS_TYPED_ARRAY_BIG_UINT64,
+    JS_TYPED_ARRAY_FLOAT32,
+    JS_TYPED_ARRAY_FLOAT64,
+} JSTypedArrayEnum;
+
+JSValue JS_NewTypedArray(JSContext *ctx, int argc, JSValueConst *argv,
+                         JSTypedArrayEnum array_type);
+JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValueConst obj,
+                               size_t *pbyte_offset,
+                               size_t *pbyte_length,
+                               size_t *pbytes_per_element);
+typedef struct {
+    void *(*sab_alloc)(void *opaque, size_t size);
+    void (*sab_free)(void *opaque, void *ptr);
+    void (*sab_dup)(void *opaque, void *ptr);
+    void *sab_opaque;
+} JSSharedArrayBufferFunctions;
+void JS_SetSharedArrayBufferFunctions(JSRuntime *rt,
+                                      const JSSharedArrayBufferFunctions *sf);
+
+typedef enum JSPromiseStateEnum {
+    JS_PROMISE_PENDING,
+    JS_PROMISE_FULFILLED,
+    JS_PROMISE_REJECTED,
+} JSPromiseStateEnum;
+
+JSValue JS_NewPromiseCapability(JSContext *ctx, JSValue *resolving_funcs);
+JSPromiseStateEnum JS_PromiseState(JSContext *ctx, JSValue promise);
+JSValue JS_PromiseResult(JSContext *ctx, JSValue promise);
+
+/* is_handled = TRUE means that the rejection is handled */
+typedef void JSHostPromiseRejectionTracker(JSContext *ctx, JSValueConst promise,
+                                           JSValueConst reason,
+                                           JS_BOOL is_handled, void *opaque);
+void JS_SetHostPromiseRejectionTracker(JSRuntime *rt, JSHostPromiseRejectionTracker *cb, void *opaque);
+
+/* return != 0 if the JS code needs to be interrupted */
+typedef int JSInterruptHandler(JSRuntime *rt, void *opaque);
+void JS_SetInterruptHandler(JSRuntime *rt, JSInterruptHandler *cb, void *opaque);
+/* if can_block is TRUE, Atomics.wait() can be used */
+void JS_SetCanBlock(JSRuntime *rt, JS_BOOL can_block);
+/* set the [IsHTMLDDA] internal slot */
+void JS_SetIsHTMLDDA(JSContext *ctx, JSValueConst obj);
+
+typedef struct JSModuleDef JSModuleDef;
+
+/* return the module specifier (allocated with js_malloc()) or NULL if
+   exception */
+typedef char *JSModuleNormalizeFunc(JSContext *ctx,
+                                    const char *module_base_name,
+                                    const char *module_name, void *opaque);
+typedef JSModuleDef *JSModuleLoaderFunc(JSContext *ctx,
+                                        const char *module_name, void *opaque);
+
+/* module_normalize = NULL is allowed and invokes the default module
+   filename normalizer */
+void JS_SetModuleLoaderFunc(JSRuntime *rt,
+                            JSModuleNormalizeFunc *module_normalize,
+                            JSModuleLoaderFunc *module_loader, void *opaque);
+/* return the import.meta object of a module */
+JSValue JS_GetImportMeta(JSContext *ctx, JSModuleDef *m);
+JSAtom JS_GetModuleName(JSContext *ctx, JSModuleDef *m);
+JSValue JS_GetModuleNamespace(JSContext *ctx, JSModuleDef *m);
+
+/* JS Job support */
+
+typedef JSValue JSJobFunc(JSContext *ctx, int argc, JSValueConst *argv);
+int JS_EnqueueJob(JSContext *ctx, JSJobFunc *job_func, int argc, JSValueConst *argv);
+
+JS_BOOL JS_IsJobPending(JSRuntime *rt);
+int JS_ExecutePendingJob(JSRuntime *rt, JSContext **pctx);
+
+/* Object Writer/Reader (currently only used to handle precompiled code) */
+#define JS_WRITE_OBJ_BYTECODE  (1 << 0) /* allow function/module */
+#define JS_WRITE_OBJ_BSWAP     (1 << 1) /* byte swapped output */
+#define JS_WRITE_OBJ_SAB       (1 << 2) /* allow SharedArrayBuffer */
+#define JS_WRITE_OBJ_REFERENCE (1 << 3) /* allow object references to
+                                           encode arbitrary object
+                                           graph */
+uint8_t *JS_WriteObject(JSContext *ctx, size_t *psize, JSValueConst obj,
+                        int flags);
+uint8_t *JS_WriteObject2(JSContext *ctx, size_t *psize, JSValueConst obj,
+                         int flags, uint8_t ***psab_tab, size_t *psab_tab_len);
+
+#define JS_READ_OBJ_BYTECODE  (1 << 0) /* allow function/module */
+#define JS_READ_OBJ_ROM_DATA  (1 << 1) /* avoid duplicating 'buf' data */
+#define JS_READ_OBJ_SAB       (1 << 2) /* allow SharedArrayBuffer */
+#define JS_READ_OBJ_REFERENCE (1 << 3) /* allow object references */
+JSValue JS_ReadObject(JSContext *ctx, const uint8_t *buf, size_t buf_len,
+                      int flags);
+/* instantiate and evaluate a bytecode function. Only used when
+   reading a script or module with JS_ReadObject() */
+JSValue JS_EvalFunction(JSContext *ctx, JSValue fun_obj);
+/* load the dependencies of the module 'obj'. Useful when JS_ReadObject()
+   returns a module. */
+int JS_ResolveModule(JSContext *ctx, JSValueConst obj);
+
+/* only exported for os.Worker() */
+JSAtom JS_GetScriptOrModuleName(JSContext *ctx, int n_stack_levels);
+/* only exported for os.Worker() */
+JSValue JS_LoadModule(JSContext *ctx, const char *basename,
+                      const char *filename);
+
+/* C function definition */
+typedef enum JSCFunctionEnum {  /* XXX: should rename for namespace isolation */
+    JS_CFUNC_generic,
+    JS_CFUNC_generic_magic,
+    JS_CFUNC_constructor,
+    JS_CFUNC_constructor_magic,
+    JS_CFUNC_constructor_or_func,
+    JS_CFUNC_constructor_or_func_magic,
+    JS_CFUNC_f_f,
+    JS_CFUNC_f_f_f,
+    JS_CFUNC_getter,
+    JS_CFUNC_setter,
+    JS_CFUNC_getter_magic,
+    JS_CFUNC_setter_magic,
+    JS_CFUNC_iterator_next,
+} JSCFunctionEnum;
+
+typedef union JSCFunctionType {
+    JSCFunction *generic;
+    JSValue (*generic_magic)(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, int magic);
+    JSCFunction *constructor;
+    JSValue (*constructor_magic)(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv, int magic);
+    JSCFunction *constructor_or_func;
+    double (*f_f)(double);
+    double (*f_f_f)(double, double);
+    JSValue (*getter)(JSContext *ctx, JSValueConst this_val);
+    JSValue (*setter)(JSContext *ctx, JSValueConst this_val, JSValueConst val);
+    JSValue (*getter_magic)(JSContext *ctx, JSValueConst this_val, int magic);
+    JSValue (*setter_magic)(JSContext *ctx, JSValueConst this_val, JSValueConst val, int magic);
+    JSValue (*iterator_next)(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int *pdone, int magic);
+} JSCFunctionType;
+
+JSValue JS_NewCFunction2(JSContext *ctx, JSCFunction *func,
+                         const char *name,
+                         int length, JSCFunctionEnum cproto, int magic);
+JSValue JS_NewCFunctionData(JSContext *ctx, JSCFunctionData *func,
+                            int length, int magic, int data_len,
+                            JSValueConst *data);
+
+JSValue JS_NewCFunction(JSContext *ctx, JSCFunction *func, const char *name,
+                        int length);
+
+JSValue JS_NewCFunctionMagic(JSContext *ctx, JSCFunctionMagic *func,
+                             const char *name, int length, JSCFunctionEnum cproto, int magic);
+void JS_SetConstructor(JSContext *ctx, JSValueConst func_obj,
+                       JSValueConst proto);
+
+/* C property definition */
+
+typedef struct JSCFunctionListEntry {
+    const char *name;
+    uint8_t prop_flags;
+    uint8_t def_type;
+    int16_t magic;
+    union {
+        struct {
+            uint8_t length; /* XXX: should move outside union */
+            uint8_t cproto; /* XXX: should move outside union */
+            JSCFunctionType cfunc;
+        } func;
+        struct {
+            JSCFunctionType get;
+            JSCFunctionType set;
+        } getset;
+        struct {
+            const char *name;
+            int base;
+        } alias;
+        struct {
+            const struct JSCFunctionListEntry *tab;
+            int len;
+        } prop_list;
+        const char *str;
+        int32_t i32;
+        int64_t i64;
+        double f64;
+    } u;
+} JSCFunctionListEntry;
+
+#define JS_DEF_CFUNC          0
+#define JS_DEF_CGETSET        1
+#define JS_DEF_CGETSET_MAGIC  2
+#define JS_DEF_PROP_STRING    3
+#define JS_DEF_PROP_INT32     4
+#define JS_DEF_PROP_INT64     5
+#define JS_DEF_PROP_DOUBLE    6
+#define JS_DEF_PROP_UNDEFINED 7
+#define JS_DEF_OBJECT         8
+#define JS_DEF_ALIAS          9
+
+/* Note: c++ does not like nested designators */
+#define JS_CFUNC_DEF(name, length, func1) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_CFUNC, 0, .u = { .func = { length, JS_CFUNC_generic, { .generic = func1 } } } }
+#define JS_CFUNC_MAGIC_DEF(name, length, func1, magic) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_CFUNC, magic, .u = { .func = { length, JS_CFUNC_generic_magic, { .generic_magic = func1 } } } }
+#define JS_CFUNC_SPECIAL_DEF(name, length, cproto, func1) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_CFUNC, 0, .u = { .func = { length, JS_CFUNC_ ## cproto, { .cproto = func1 } } } }
+#define JS_ITERATOR_NEXT_DEF(name, length, func1, magic) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_CFUNC, magic, .u = { .func = { length, JS_CFUNC_iterator_next, { .iterator_next = func1 } } } }
+#define JS_CGETSET_DEF(name, fgetter, fsetter) { name, JS_PROP_CONFIGURABLE, JS_DEF_CGETSET, 0, .u = { .getset = { .get = { .getter = fgetter }, .set = { .setter = fsetter } } } }
+#define JS_CGETSET_MAGIC_DEF(name, fgetter, fsetter, magic) { name, JS_PROP_CONFIGURABLE, JS_DEF_CGETSET_MAGIC, magic, .u = { .getset = { .get = { .getter_magic = fgetter }, .set = { .setter_magic = fsetter } } } }
+#define JS_PROP_STRING_DEF(name, cstr, prop_flags) { name, prop_flags, JS_DEF_PROP_STRING, 0, .u = { .str = cstr } }
+#define JS_PROP_INT32_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_INT32, 0, .u = { .i32 = val } }
+#define JS_PROP_INT64_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_INT64, 0, .u = { .i64 = val } }
+#define JS_PROP_DOUBLE_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_DOUBLE, 0, .u = { .f64 = val } }
+#define JS_PROP_UNDEFINED_DEF(name, prop_flags) { name, prop_flags, JS_DEF_PROP_UNDEFINED, 0, .u = { .i32 = 0 } }
+#define JS_OBJECT_DEF(name, tab, len, prop_flags) { name, prop_flags, JS_DEF_OBJECT, 0, .u = { .prop_list = { tab, len } } }
+#define JS_ALIAS_DEF(name, from) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_ALIAS, 0, .u = { .alias = { from, -1 } } }
+#define JS_ALIAS_BASE_DEF(name, from, base) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_ALIAS, 0, .u = { .alias = { from, base } } }
+
+void JS_SetPropertyFunctionList(JSContext *ctx, JSValueConst obj,
+                                const JSCFunctionListEntry *tab,
+                                int len);
+
+/* C module definition */
+
+typedef int JSModuleInitFunc(JSContext *ctx, JSModuleDef *m);
+
+JSModuleDef *JS_NewCModule(JSContext *ctx, const char *name_str,
+                           JSModuleInitFunc *func);
+/* can only be called before the module is instantiated */
+int JS_AddModuleExport(JSContext *ctx, JSModuleDef *m, const char *name_str);
+int JS_AddModuleExportList(JSContext *ctx, JSModuleDef *m,
+                           const JSCFunctionListEntry *tab, int len);
+/* can only be called after the module is instantiated */
+int JS_SetModuleExport(JSContext *ctx, JSModuleDef *m, const char *export_name,
+                       JSValue val);
+int JS_SetModuleExportList(JSContext *ctx, JSModuleDef *m,
+                           const JSCFunctionListEntry *tab, int len);
+
+
+/* Qbs extensions */
+struct LookupResult
+{
+    JSValue value;
+    JSValue scope;
+    int useResult;
+};
+typedef struct LookupResult ScopeLookup(JSContext *ctx, JSAtom prop);
+void setScopeLookup(JSContext *ctx, ScopeLookup *scopeLookup);
+
+// Alternative: Request with throw in script engine
+typedef void FoundUndefinedHandler(JSContext *ctx);
+void setFoundUndefinedHandler(JSContext *ctx, FoundUndefinedHandler *handler);
+
+typedef void FunctionEnteredHandler(JSContext *ctx, JSValue this_val);
+typedef void FunctionExitedHandler(JSContext *ctx);
+void setFunctionEnteredHandler(JSContext *ctx, FunctionEnteredHandler *handler);
+void setFunctionExitedHandler(JSContext *ctx, FunctionExitedHandler *handler);
+int isSimpleValue(JSValue v);
+
+#ifndef NDEBUG
+void watchRefCount(void *p);
+#endif
+
+void build_backtrace(JSContext *ctx, JSValueConst error_obj,
+                     const char *filename, int line_num,
+                     int backtrace_flags);
+
+#undef js_unlikely
+#undef js_force_inline
+
+#ifdef __cplusplus
+} /* extern "C" { */
+#endif
+
+#endif /* QUICKJS_H */
diff --git a/src/shared/quickjs/quickjs.qbs b/src/shared/quickjs/quickjs.qbs
new file mode 100644
index 000000000..bdce37979
--- /dev/null
+++ b/src/shared/quickjs/quickjs.qbs
@@ -0,0 +1,34 @@
+StaticLibrary {
+    name: "quickjs"
+
+    Depends { name: "qbsbuildconfig" }
+    Depends { name: "cpp" }
+
+    cpp.cLanguageVersion: qbs.toolchain.contains("msvc") ? "c99" : "gnu99"
+    cpp.defines: ['CONFIG_VERSION="2021-03-27"'].concat(qbsbuildconfig.dumpJsLeaks
+                                                        ? "DUMP_LEAKS" : [])
+    cpp.warningLevel: "none"
+
+    files: [
+        "cutils.c",
+        "cutils.h",
+        "libbf.c",
+        "libbf.h",
+        "libregexp-opcode.h",
+        "libregexp.c",
+        "libregexp.h",
+        "libunicode-table.h",
+        "libunicode.c",
+        "libunicode.h",
+        "list.h",
+        "quickjs-atom.h",
+        "quickjs-opcode.h",
+        "quickjs.c",
+        "quickjs.h",
+    ]
+
+    Export {
+        Depends { name: "cpp" }
+        cpp.systemIncludePaths: [exportingProduct.sourceDirectory]
+    }
+}
diff --git a/src/shared/variant/CMakeLists.txt b/src/shared/variant/CMakeLists.txt
index 5b2ccfb11..ac73231d4 100644
--- a/src/shared/variant/CMakeLists.txt
+++ b/src/shared/variant/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_qbs_library(qbsvariant
-    INTERFACE
-    SOURCES variant.h variant.hpp
-    )
+add_library(qbsvariant INTERFACE)
+target_include_directories(
+    qbsvariant
+    INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/>)
diff --git a/src/shared/variant/variant.pri b/src/shared/variant/variant.pri
deleted file mode 100644
index aba082dde..000000000
--- a/src/shared/variant/variant.pri
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDEPATH += $$PWD
diff --git a/src/src.qbs b/src/src.qbs
index 39cb18730..f5a5ae5a1 100644
--- a/src/src.qbs
+++ b/src/src.qbs
@@ -5,8 +5,10 @@ Project {
         "libexec/libexec.qbs",
         "packages/packages.qbs",
         "plugins/plugins.qbs",
-        "shared/json/json.qbs",
         "shared/bundledqt/bundledqt.qbs",
+        "shared/json/json.qbs",
+        "shared/lsp/lsp.qbs",
+        "shared/quickjs/quickjs.qbs",
         "shared/variant/variant.qbs",
     ]
 }