Minor fixes

JerryScript-DCO-1.0-Signed-off-by: László Langó [email protected]

Author: LaszloLango

jerry-core/ecma/operations/ecma-regexp-object.h

@@ -29,6 +29,11 @@
  * @{
  */
 
+/**
+  * RegExp flags mask (first 10 bits are for reference count and the rest for the actual RegExp flags)
+  */
+#define RE_FLAGS_MASK 0xFF
+
 /**
  * RegExp flags
  */

jerry-core/parser/js/js-lexer.c

@@ -1812,7 +1812,6 @@ lexer_construct_regexp_object (parser_context_t *context_p, /**< context */
   ecma_value_t completion_value;
 
   ecma_string_t *pattern_str_p = ecma_new_ecma_string_from_utf8 (regex_start_p, length);
-  // FIXME: check return value of 're_compile_bytecode' and throw an error
   completion_value = re_compile_bytecode (&re_bytecode_p,
                                           pattern_str_p,
                                           current_flags);

jerry-core/parser/regexp/re-compiler.c

@@ -444,16 +444,20 @@ re_parse_alternative (re_compiler_ctx_t *re_ctx_p, /**< RegExp compiler context
   return ret_value;
 } /* re_parse_alternative */
 
+/**
+ * RegExp cache
+ */
 static const re_compiled_code_t *re_cache[RE_CHACHE_SIZE];
 
 /**
  * Search for the given pattern in the RegExp cache
  *
  * @return compiled bytecode - if found
- *         NULL - otherwise
+ *         NULL              - otherwise
  */
 static re_compiled_code_t *
 re_find_bytecode_in_cache (ecma_string_t *pattern_str_p, /**< pattern string */
+                           uint16_t flags, /**< flags */
                            uint32_t *idx) /**< [out] index */
 {
   uint32_t free_idx = RE_CHACHE_SIZE;
@@ -467,7 +471,8 @@ re_find_bytecode_in_cache (ecma_string_t *pattern_str_p, /**< pattern string */
       ecma_string_t *cached_pattern_str_p;
       cached_pattern_str_p = ECMA_GET_NON_NULL_POINTER (ecma_string_t, cached_bytecode_p->pattern_cp);
 
-      if (ecma_compare_ecma_strings (cached_pattern_str_p, pattern_str_p))
+      if ((cached_bytecode_p->flags & RE_FLAGS_MASK) == flags
+          && ecma_compare_ecma_strings (cached_pattern_str_p, pattern_str_p))
       {
         return re_cache[*idx];
       }
@@ -511,7 +516,7 @@ re_compile_bytecode (re_compiled_code_t **out_bytecode_p, /**< [out] pointer to
   re_ctx.bytecode_ctx_p = &bc_ctx;
 
   uint32_t cache_idx;
-  *out_bytecode_p = re_find_bytecode_in_cache (pattern_str_p, &cache_idx);
+  *out_bytecode_p = re_find_bytecode_in_cache (pattern_str_p, flags, &cache_idx);
 
   if (*out_bytecode_p != NULL)
   {