Revert "Revert "Upgrade v8 to 6.9.427.19""

This reverts commit aa7b961.

Author: darind

build-artifacts/project-template-gradle/settings.json

@@ -1,3 +1,3 @@
 {
-    "v8Version": "6.8.275.26"
+    "v8Version": "6.9.427.19"
 }

test-app/app/src/main/assets/app/modules/libCalc-arm.so

@@ -54,7 +54,7 @@ namespace v8 {
  */
 class V8_EXPORT TracingCpuProfiler {
     public:
-        V8_DEPRECATE_SOON(
+        V8_DEPRECATED(
             "The profiler is created automatically with the isolate.\n"
             "No need to create it explicitly.",
             static std::unique_ptr<TracingCpuProfiler> Create(Isolate*));
@@ -278,6 +278,16 @@ class V8_EXPORT CpuProfile {
         void Delete();
 };
 
+enum CpuProfilingMode {
+    // In the resulting CpuProfile tree, intermediate nodes in a stack trace
+    // (from the root to a leaf) will have line numbers that point to the start
+    // line of the function, rather than the line of the callsite of the child.
+    kLeafNodeLineNumbers,
+    // In the resulting CpuProfile tree, nodes are separated based on the line
+    // number of their callsite in their parent.
+    kCallerLineNumbers,
+};
+
 /**
  * Interface for controlling CPU profiling. Instance of the
  * profiler can be created using v8::CpuProfiler::New method.
@@ -321,6 +331,13 @@ class V8_EXPORT CpuProfiler {
          * |record_samples| parameter controls whether individual samples should
          * be recorded in addition to the aggregated tree.
          */
+        void StartProfiling(Local<String> title, CpuProfilingMode mode,
+                            bool record_samples = false);
+        /**
+         * The same as StartProfiling above, but the CpuProfilingMode defaults to
+         * kLeafNodeLineNumbers mode, which was the previous default behavior of the
+         * profiler.
+         */
         void StartProfiling(Local<String> title, bool record_samples = false);
 
         /**
@@ -643,7 +660,7 @@ class V8_EXPORT AllocationProfile {
  * Usage:
  * 1) Define derived class of EmbedderGraph::Node for embedder objects.
  * 2) Set the build embedder graph callback on the heap profiler using
- *    HeapProfiler::SetBuildEmbedderGraphCallback.
+ *    HeapProfiler::AddBuildEmbedderGraphCallback.
  * 3) In the callback use graph->AddEdge(node1, node2) to add an edge from
  *    node1 to node2.
  * 4) To represent references from/to V8 object, construct V8 nodes using
@@ -697,11 +714,14 @@ class V8_EXPORT EmbedderGraph {
         virtual Node* AddNode(std::unique_ptr<Node> node) = 0;
 
         /**
-         * Adds an edge that represents a strong reference from the given node
-         * |from| to the given node |to|. The nodes must be added to the graph
+         * Adds an edge that represents a strong reference from the given
+         * node |from| to the given node |to|. The nodes must be added to the graph
          * before calling this function.
+         *
+         * If name is nullptr, the edge will have auto-increment indexes, otherwise
+         * it will be named accordingly.
          */
-        virtual void AddEdge(Node* from, Node* to) = 0;
+        virtual void AddEdge(Node* from, Node* to, const char* name = nullptr) = 0;
 
         virtual ~EmbedderGraph() = default;
 };
@@ -751,6 +771,11 @@ class V8_EXPORT HeapProfiler {
          * The callback must not trigger garbage collection in V8.
          */
         typedef void (*BuildEmbedderGraphCallback)(v8::Isolate* isolate,
+                v8::EmbedderGraph* graph,
+                void* data);
+
+        /** TODO(addaleax): Remove */
+        typedef void (*LegacyBuildEmbedderGraphCallback)(v8::Isolate* isolate,
                 v8::EmbedderGraph* graph);
 
         /** Returns the number of snapshots taken. */
@@ -893,15 +918,22 @@ class V8_EXPORT HeapProfiler {
 
         /** Binds a callback to embedder's class ID. */
         V8_DEPRECATED(
-            "Use SetBuildEmbedderGraphCallback to provide info about embedder nodes",
+            "Use AddBuildEmbedderGraphCallback to provide info about embedder nodes",
             void SetWrapperClassInfoProvider(uint16_t class_id,
                                              WrapperInfoCallback callback));
 
         V8_DEPRECATED(
-            "Use SetBuildEmbedderGraphCallback to provide info about embedder nodes",
+            "Use AddBuildEmbedderGraphCallback to provide info about embedder nodes",
             void SetGetRetainerInfosCallback(GetRetainerInfosCallback callback));
 
-        void SetBuildEmbedderGraphCallback(BuildEmbedderGraphCallback callback);
+        V8_DEPRECATE_SOON(
+            "Use AddBuildEmbedderGraphCallback to provide info about embedder nodes",
+            void SetBuildEmbedderGraphCallback(
+                LegacyBuildEmbedderGraphCallback callback));
+        void AddBuildEmbedderGraphCallback(BuildEmbedderGraphCallback callback,
+                                           void* data);
+        void RemoveBuildEmbedderGraphCallback(BuildEmbedderGraphCallback callback,
+                                              void* data);
 
         /**
          * Default value of persistent handle class ID. Must not be used to
@@ -1009,6 +1041,76 @@ struct HeapStatsUpdate {
     uint32_t size;  // New value of size field for the interval with this index.
 };
 
+#define CODE_EVENTS_LIST(V) \
+  V(Builtin)                \
+  V(Callback)               \
+  V(Eval)                   \
+  V(Function)               \
+  V(InterpretedFunction)    \
+  V(Handler)                \
+  V(BytecodeHandler)        \
+  V(LazyCompile)            \
+  V(RegExp)                 \
+  V(Script)                 \
+  V(Stub)
+
+/**
+ * Note that this enum may be extended in the future. Please include a default
+ * case if this enum is used in a switch statement.
+ */
+enum CodeEventType {
+    kUnknownType = 0
+#define V(Name) , k##Name##Type
+                   CODE_EVENTS_LIST(V)
+#undef V
+};
+
+/**
+ * Representation of a code creation event
+ */
+class V8_EXPORT CodeEvent {
+    public:
+        uintptr_t GetCodeStartAddress();
+        size_t GetCodeSize();
+        Local<String> GetFunctionName();
+        Local<String> GetScriptName();
+        int GetScriptLine();
+        int GetScriptColumn();
+        /**
+         * NOTE (mmarchini): We can't allocate objects in the heap when we collect
+         * existing code, and both the code type and the comment are not stored in the
+         * heap, so we return those as const char*.
+         */
+        CodeEventType GetCodeType();
+        const char* GetComment();
+
+        static const char* GetCodeEventTypeName(CodeEventType code_event_type);
+};
+
+/**
+ * Interface to listen to code creation events.
+ */
+class V8_EXPORT CodeEventHandler {
+    public:
+        /**
+         * Creates a new listener for the |isolate|. The isolate must be initialized.
+         * The listener object must be disposed after use by calling |Dispose| method.
+         * Multiple listeners can be created for the same isolate.
+         */
+        explicit CodeEventHandler(Isolate* isolate);
+        virtual ~CodeEventHandler();
+
+        virtual void Handle(CodeEvent* code_event) = 0;
+
+        void Enable();
+        void Disable();
+
+    private:
+        CodeEventHandler();
+        CodeEventHandler(const CodeEventHandler&);
+        CodeEventHandler& operator=(const CodeEventHandler&);
+        void* internal_listener_;
+};
 
 }  // namespace v8
 

test-app/app/src/main/assets/app/modules/libCalc-arm64.so

@@ -9,9 +9,9 @@
 // NOTE these macros are used by some of the tool scripts and the build
 // system so their names cannot be changed without changing the scripts.
 #define V8_MAJOR_VERSION 6
-#define V8_MINOR_VERSION 8
-#define V8_BUILD_NUMBER 275
-#define V8_PATCH_LEVEL 26
+#define V8_MINOR_VERSION 9
+#define V8_BUILD_NUMBER 427
+#define V8_PATCH_LEVEL 19
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)