Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 23 insertions, 2 deletions

diff --git a/Source/JavaScriptCore/runtime/Intrinsic.h b/Source/JavaScriptCore/runtime/Intrinsic.h
index 313826edb..218d2efd6 100644
--- a/Source/JavaScriptCore/runtime/Intrinsic.h
+++ b/Source/JavaScriptCore/runtime/Intrinsic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,11 +29,15 @@
 namespace JSC {
 
 enum Intrinsic {
+    // Call intrinsics.
     NoIntrinsic,
     AbsIntrinsic,
     MinIntrinsic,
     MaxIntrinsic,
     SqrtIntrinsic,
+    SinIntrinsic,
+    Clz32Intrinsic,
+    CosIntrinsic,
     ArrayPushIntrinsic,
     ArrayPopIntrinsic,
     CharCodeAtIntrinsic,
@@ -48,7 +52,24 @@ enum Intrinsic {
     RegExpExecIntrinsic,
     RegExpTestIntrinsic,
     StringPrototypeValueOfIntrinsic,
-    IMulIntrinsic
+    StringPrototypeReplaceIntrinsic,
+    IMulIntrinsic,
+    RandomIntrinsic,
+    FRoundIntrinsic,
+
+    // Getter intrinsics.
+    TypedArrayLengthIntrinsic,
+    TypedArrayByteLengthIntrinsic,
+    TypedArrayByteOffsetIntrinsic,
+
+    // Debugging intrinsics. These are meant to be used as testing hacks within
+    // jsc.cpp and should never be exposed to users.
+    DFGTrueIntrinsic,
+    OSRExitIntrinsic,
+    IsFinalTierIntrinsic,
+    SetInt32HeapPredictionIntrinsic,
+    CheckInt32Intrinsic,
+    FiatInt52Intrinsic,
 };
 
 } // namespace JSC