--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Fri Jan 08 11:41:04 2016 +0100
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Fri Jan 08 21:06:50 2016 -0800
@@ -862,6 +862,8 @@
      static_field(StubRoutines,                _dexp,                                         address)                               \
      static_field(StubRoutines,                _dlog,                                         address)                               \
      static_field(StubRoutines,                _dpow,                                         address)                               \
+     static_field(StubRoutines,                _dsin,                                         address)                               \
+     static_field(StubRoutines,                _dcos,                                         address)                               \
      static_field(StubRoutines,                _vectorizedMismatch,                           address)                               \
      static_field(StubRoutines,                _jbyte_arraycopy,                              address)                               \
      static_field(StubRoutines,                _jshort_arraycopy,                             address)                               \
@@ -2056,8 +2058,6 @@
   declare_c2_type(NegNode, Node)                                          \
   declare_c2_type(NegFNode, NegNode)                                      \
   declare_c2_type(NegDNode, NegNode)                                      \
-  declare_c2_type(CosDNode, Node)                                         \
-  declare_c2_type(SinDNode, Node)                                         \
   declare_c2_type(TanDNode, Node)                                         \
   declare_c2_type(AtanDNode, Node)                                        \
   declare_c2_type(SqrtDNode, Node)                                        \