Cleanup: we are not patching entries any longer

runtime/vm/instructions_ia32.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 // Classes that describe assembly patterns as used by inline caches.
 
 #ifndef VM_INSTRUCTIONS_IA32_H_
 #define VM_INSTRUCTIONS_IA32_H_
 
 #ifndef VM_INSTRUCTIONS_H_
 #error Do not include instructions_ia32.h directly; use instructions.h instead.
@@ skipping 44 matching lines @@
     }
     return true;
   }
 
   const uword start_;
 
   DISALLOW_COPY_AND_ASSIGN(InstructionPattern);
 };
 
 
-template<class P>
-class CallOrJumpPattern : public InstructionPattern<P> {
+class CallPattern : public InstructionPattern<CallPattern> {
  public:
+  explicit CallPattern(uword pc) : InstructionPattern(pc) {}
   uword TargetAddress() const {
     ASSERT(this->IsValid());
     return this->start() +
-        P::pattern_length_in_bytes() +
+        CallPattern::pattern_length_in_bytes() +
         *reinterpret_cast<uword*>(this->start() + 1);
   }
 
   void SetTargetAddress(uword new_target) const {
     ASSERT(this->IsValid());
     *reinterpret_cast<uword*>(this->start() + 1) =
-        new_target - this->start() - P::pattern_length_in_bytes();
+        new_target - this->start() - CallPattern::pattern_length_in_bytes();
     CPU::FlushICache(this->start() + 1, kWordSize);
   }
 
- protected:
-  explicit CallOrJumpPattern(uword pc) : InstructionPattern<P>(pc) {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CallOrJumpPattern);
-};
-
-
-class CallPattern : public CallOrJumpPattern<CallPattern> {
- public:
-  explicit CallPattern(uword pc) : CallOrJumpPattern(pc) {}
-
   static int pattern_length_in_bytes() { return kLengthInBytes; }
   static const int* pattern() {
     static const int kCallPattern[kLengthInBytes] = {0xE8, -1, -1, -1, -1};
     return kCallPattern;
   }
 
+
  private:
   static const int kLengthInBytes = 5;
-
   DISALLOW_COPY_AND_ASSIGN(CallPattern);
 };
 
 
 class ReturnPattern : public InstructionPattern<ReturnPattern> {
  public:
   explicit ReturnPattern(uword pc) : InstructionPattern(pc) {}
 
   static const int* pattern() {
     static const int kReturnPattern[kLengthInBytes] = { 0xC3 };
@@ skipping 37 matching lines @@
 
   static int pattern_length_in_bytes() { return kLengthInBytes; }
 
  private:
   static const int kLengthInBytes = 2;
 };
 
 }  // namespace dart
 
 #endif  // VM_INSTRUCTIONS_IA32_H_